diff --git a/ME/SOO.refso3/README b/ME/SOO.refso3/README deleted file mode 100644 index 309a846059..0000000000 --- a/ME/SOO.refso3/README +++ /dev/null @@ -1 +0,0 @@ -This directory contains the ITB of the SOO.refso3_64 ME. diff --git a/ME/SOO.refso3_64/README b/ME/SOO.refso3_64/README deleted file mode 100644 index 309a846059..0000000000 --- a/ME/SOO.refso3_64/README +++ /dev/null @@ -1 +0,0 @@ -This directory contains the ITB of the SOO.refso3_64 ME. diff --git a/ME/soo/so3/so3/dts/Makefile b/ME/soo/so3/so3/dts/Makefile index 192f9e6825..28c6625942 100644 --- a/ME/soo/so3/so3/dts/Makefile +++ b/ME/soo/so3/so3/dts/Makefile @@ -1,8 +1,8 @@ dtb-$(CONFIG_RPI4) += rpi4.dtb rpi4_avz.dtb -dtb-$(CONFIG_RPI4_64) += rpi4_64.dtb rpi4_64_avz_pv.dtb rpi4_64_avz_vt.dtb -dtb-$(CONFIG_VIRT64) += virt64.dtb virt64_avz_pv.dtb virt64_avz_vt.dtb -dtb-$(CONFIG_VIRT32) += virt32.dtb virt32_avz.dtb +dtb-$(CONFIG_RPI4_64) += rpi4_64.dtb rpi4_64_avz_vt.dtb +dtb-$(CONFIG_VIRT64) += virt64.dtb virt64_avz_vt.dtb +dtb-$(CONFIG_VIRT32) += virt32.dtb ifeq ($(CONFIG_SOO),y) ifeq ($(CONFIG_AVZ),) diff --git a/buildroot/.clang-format b/buildroot/.clang-format deleted file mode 100644 index 1758a23f32..0000000000 --- a/buildroot/.clang-format +++ /dev/null @@ -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 -... diff --git a/buildroot/.defconfig b/buildroot/.defconfig deleted file mode 100644 index 7ab0c3fbf0..0000000000 --- a/buildroot/.defconfig +++ /dev/null @@ -1,51 +0,0 @@ -# -# Automatically generated make config: don't edit -# Mon Feb 18 09:11:56 2008 -# -BR2_HAVE_DOT_CONFIG=y -# BR2_alpha is not set -# BR2_arm is not set -# BR2_armeb is not set -# BR2_cris is not set -# BR2_ia64 is not set -BR2_i386=y -# BR2_m68k is not set -# BR2_mips is not set -# BR2_mipsel is not set -# BR2_nios2 is not set -# BR2_powerpc is not set -# BR2_sh is not set -# BR2_sparc is not set -# BR2_sparc64 is not set -# BR2_x86_64 is not set -# BR2_x86_i486 is not set -# BR2_x86_i586 is not set -BR2_x86_i686=y -# BR2_x86_pentiumpro is not set -# BR2_x86_pentium_mmx is not set -# BR2_x86_pentium_m is not set -# BR2_x86_pentium2 is not set -# BR2_x86_pentium3 is not set -# BR2_x86_pentium4 is not set -# BR2_x86_prescott is not set -# BR2_x86_nocona is not set -# BR2_x86_core2 is not set -# BR2_x86_k6 is not set -# BR2_x86_k6_2 is not set -# BR2_x86_athlon is not set -# BR2_x86_athlon_4 is not set -# BR2_x86_opteron is not set -# BR2_x86_opteron_sse3 is not set -# BR2_x86_barcelona is not set -# BR2_x86_geode is not set -# BR2_x86_c3 is not set -# BR2_x86_winchip_c6 is not set -# BR2_x86_winchip2 is not set -BR2_ARCH="i686" -BR2_ENDIAN="LITTLE" -BR2_GCC_TARGET_TUNE="i686" -BR2_GCC_TARGET_ARCH="i686" - -# -# Target options -# diff --git a/buildroot/.flake8 b/buildroot/.flake8 deleted file mode 100644 index 7dd7b541cc..0000000000 --- a/buildroot/.flake8 +++ /dev/null @@ -1,5 +0,0 @@ -[flake8] -exclude= - # copied from the kernel sources - utils/diffconfig -max-line-length=132 diff --git a/buildroot/.gitignore b/buildroot/.gitignore deleted file mode 100644 index bb02d9f572..0000000000 --- a/buildroot/.gitignore +++ /dev/null @@ -1,15 +0,0 @@ -/output -/dl -/.auto.deps -/.config.cmd -/.config.old -/..config.tmp -/.config -*.depend -*.o -/*.patch -/*.diff -*.orig -*.rej -*~ -*.pyc diff --git a/buildroot/.gitlab-ci.yml b/buildroot/.gitlab-ci.yml deleted file mode 100644 index cad35c96bc..0000000000 --- a/buildroot/.gitlab-ci.yml +++ /dev/null @@ -1,28 +0,0 @@ -# Configuration for Gitlab-CI. -# Builds appear on https://gitlab.com/buildroot.org/buildroot/pipelines - -image: $CI_REGISTRY/buildroot.org/buildroot/base:20220206.1756 - -stages: - - generate-gitlab-ci - - build - -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 - trigger: - include: - - artifact: generated-gitlab-ci.yml - job: generate-gitlab-ci-yml - strategy: depend - variables: - PARENT_PIPELINE_ID: $CI_PIPELINE_ID diff --git a/buildroot/CHANGES b/buildroot/CHANGES index 4d7076e908..cf49ce56b3 100644 --- a/buildroot/CHANGES +++ b/buildroot/CHANGES @@ -1,3 +1,2731 @@ +2024.11, released December 8th, 2024 + + Various fixes. + + Updated/fixed packages: eza, foot, gnutls, ibm-sw-tpm2, + mosquitto, pixman + + Issues resolved: + - procps-ng: builderror in 2024.08 + https://gitlab.com/buildroot.org/buildroot/-/issues/38 + +2024.11-rc3, released Decemmber 5th, 2024 + + Fixes all over the tree. + + Updated/fixed packages: alsa-lib, android-tools, bats-core, + doxygen, frr, gnutls, libvpl, linux-tools, lmbench, lrzsz, + musl, nfs-utils, opkg, polkit, postgresql, procps-ng, + python-psycopg2, quagga, rt-tests, rust, sexpect + +2024.11-rc2, released November 23rd, 2024 + + Fixes all over the tree. + + Updated/fixed packages: bmap-tools, go, intel-microcode, + libblockdev, libcurl, libkrb5, libnvme, libpng, php, + postgresql, python-sip, skopeo, tiff, util-linux-libs + +2024.11-rc1, released November 13th, 2024 + + Fixes all over the tree and package updates. + + Toolchain: + + - binutils 2.43 added, binutils 2.42 becomes the default. + - glibc updated to 2.40 + - ARM, Bootlin and Synopsys external toolchains updated + - Support added for ARM FDPIC, which allows to use shared + libraries on ARM noMMU targets + + Go support: allow using a pre-built Go compiler, using the new + go-bin package. + + New defconfigs: friendlyarm_nanopi_neo, nvidia_bf3, + stm32f746_disco_sd, ti_am62px_sk, versal_vek280 + + Removed defconfigs: qemu_nios2_10m50 + + New packages: andes-spi-burn, bfscripts, cpp-httplib, dlib, + dpdk, evilwm, go-bin, iana-assignments, iotools, lua-uuid, + oath-toolkit, perl-mime-base32, python-aiohappyeyeballs, + python-aiomqtt, python-argcomplete, python-dotenv, + python-dunamai, python-immutabledict, python-iterable-io, + python-path, python-poetry-dynamic-versioning, + python-propcache, python-proto-plus, python-psygnal, + python-pyaml, python-pydantic-settings, python-pyqt5-sip, + python-pysnmpcrypto, python-rgbmatrix, python-sdbus, + python-sdbus-networkmanager, python-simple-websocket, + python-tinyhtml5, python-zipstream-ng, qt6charts, qt6scxml, + superiotool, tailscale, tinyinit, uefisettings + + Removed packages: bsdiff, popperjs + + Added tests: erofs filesystem, audit, dosfstools, dtc, + exfatprogs, go-bin, iputils, oath-toolkit, parted, pppd, pv, + pyqt5, python-sdbus, python-sdbus-networkmanager, rrdtool, + unbound, which + + Issues resolved: + - host rpath fixups misses needed directory + https://gitlab.com/buildroot.org/buildroot/-/issues/39 + - procps-ng: build failure when linking to systemd + https://gitlab.com/buildroot.org/buildroot/-/issues/28 + - ripgrep leaves /usr/crates2.json / .crates.toml files + https://gitlab.com/buildroot.org/buildroot/-/issues/17 + +2024.08.2, released November 14th, 2024 + + Important / security related fixes. + + Updated/fixed packages: apache, asterisk, bind, cmake, criu, + file, fluidsynth, ghostscript, heimdal, intel-microcode, + iproute2, jailhouse, jsoncpp, libarchive, libcurl, libldns, + libgit2, liblinear, libmdbx, libopenh264, libpng, + libtraceevent, libxml2, ltrace, nethogs, nghttp2, ntp, + openjdk, php, postgresql,procps-ng, python-pyqt5, python3, + qemu, ruby, sqlite, sysvinit, tor, trace-cmd, wpebackend-fdo + + New packages: python-pyqt5-sip + +2024.08.1, released October 20th, 2024 + + Important / security related fixes. + + Per-package-directories fixes for the .gdbinit file and RPATH + fixups for SDK. + + Legal-info: Ensure host-tar and redist directory exists when + using override-srcdir, as otherwise the tarball generation + (silently) fails. + + utils/check-package: Also check for correct indentation of + help lines. + + A large number of typo fixes. + + Defconfigs: imx6slevk: Bump Linux kernel to 6.6.51 to fix + build issue with GCC 13 + + Updated/fixed packages: asterisk, aubio, bind, busybox, cairo, + cryptsetup, cups, expat, ffmpeg, genpart, glibc, gnutls, go, + grub2, libarchive, libcurl, libilbc, libpcap, lighttpd, linux, + linux-pam, mosquitto, mtd, nginx, php, procps-ng, pure-ftpd, + python-django, python3, qt6core5compat, qt6svg, qt6tools, + rp-pppoe, samba4, sysklogd, wireplumber, wpewebkit, xenomai + + Issues resolved: + - procps-ng: build failure when linking to systemd + https://gitlab.com/buildroot.org/buildroot/-/issues/28 + - orange pi 2w does not boot + https://gitlab.com/buildroot.org/buildroot/-/issues/36 + - glibc configure fails on aarch64 with mathvec SVE ACLE error + https://gitlab.com/buildroot.org/buildroot/-/issues/40 + - Kernel Build from Custom Git Repo fails with hash-error + https://gitlab.com/buildroot.org/buildroot/-/issues/46 + - package/linux-pam: Remove unneeded flex dependency + https://gitlab.com/buildroot.org/buildroot/-/issues/47 + +2024.08, released September 6th, 2024 + + Various fixes. + + Fixed defconfigs: imx8mqevk: Bump TF-A, U-Boot and Linux to + fix build with gcc 13.x + + Removed defconfigs: pandaboard + + Updated/fixed packages: aer-inject, arm-trusted-firmware, + armadillo, babeld, cache-calibrator, clamav, fbdump, gerbera, + libgtk4, libopenssl, mender, p910nd, tllist, wpa_supplicant + + Removed packages: midori + +2024.08-rc3, released September 1st, 2024 + + Fixes all over the tree. + + Removed defconfigs: mx25pdk + + Updated/fixed packages: chicken, comix-cursors, dovecot, + dovecot-pigeonhole, elf2flt, enscript, fbset, freeipmi, gcc, + grub2, libcuefile, libcurl, libglob, libuecc, norm, php, + postgresql, proftpd, python-sqlparse, python3, sofia-sip, + szip, unbound, x264, xserver_xorg-server, zabbix + + Removed packages: frotz + +2024.08-rc2, released August 22nd, 2024 + + Fixes all over the tree. + + Infrastructure: use "-ztext" rather than "-z text" in LDFLAGS + to work around buggy build systems + + Defconfigs: Beaglev fire / Microchip mpfs icicle: Correct + Linux/U-Boot tarballs, Raspberryi 5: Correct CPU setting, + Zynqmp zcu106: use v1.0 DDR config, Zynqmp zcu10* / kria*: + Correct U-Boot dependency + + Updated/fixed packages: aer-inject, asterisk, atop, aumix, + avahi, botan, chicken, dc3dd, ffmpeg, flashrom, gnuradio, + gnu-efi, gnutls, hiawatha, iperf3, iproute2, ledmon, libffi, + libgpg-error, libkcapi, libpcap, mariadb, mdadm, ncurses, + nginx, ntpsec, python-huepy, python-tpm2-pytss, + python-unittest-xml-reporting, qt6base, qt6tools, skopeo, + strongswan, systemd, uboot, uclibc, unbound, vboot-utils, + wpa_supplicant, wpebackend-fdo + + Removed packages: fan-ctrl + +2024.08-rc1, released August 8th, 2024 + + Fixes all over the tree (especially related to GCC 14.x + compatibility) and package updates. + + Toolchains: + - uClibc updated to 1.0.49 + - GDB 15.x added, GDB 14.x now the default + - GCC 14.x updated to GCC 14.2.0 + - Support for Linux 6.9/6.10 headers added + + Infrastructure: + - Patches on packages are now applied with -F0, which means no + fuzz is accepted anymore. + - Improvements to the canonical example of SysV init script + + New defconfigs: arm_fvp_ebbr, beagleplay, beaglev_fire, + cubieboard1, imx6ulz_bsh_smm_m2_defconfig, raspberrypi5, + spike_riscv32. ti_am62ax_sk, versal_vpk180 + + Removed defconfigs: beagleboardx15, beaglev, imx8mpico + + New packages: blake3, chicken, cloudfared, docker-cli-buildx, + espflash, fd, freescale-imx/firmware-upower, fwupd, fwupd-efi, + gtkiostream, graphene, kmon, libavif, libdex, libgtk4, + libjcat, libopenmpt, libtpms, mxt-app, nethogs, openconnect, + parsec-tool, pico-sdk, picotool, python-aerich, + python-autocommand, python-betterproto, python-configobj, + python-grpclib, python-inflect, python-jaraco-collections, + python-jaraco-context, python-jaraco-text, python-pyasynchat, + python-pyasyncore, python-dictdiffer, python-pkgconfig, + python-pypika-tortoise, python-ruamel-yaml-clib, + python-tomlkit, python-tomli-w, python-tpm2-pytss, + python-tortoise-orm, python-uswid, qt6declarative, + qt6languageserver, qt6mqtt, qt6opcua, qt6shadertools, + qt6tools, qt6virtualkeyboard, qt6wayland, qt6websockets, + skopeo, sqlitecpp, swipl, swtpm, tig, tipidee, tpm2-openssl, + xilinx-prebuilt, zoxide + + Removed packages: beaglev-ddrinit, beaglev-secondboot, + beecrypt, cgic, dvb-apps, gamin + + New runtime tests: 4th, attr, atftp, bcc, btrfs, btrfsprogs, + dmidecode, go, gpsd, iproute2, kmod, lame, make, mariadb, + mawk, mosquitto, nmap, ntp, python-asn1crypto, python-pymupdf, + python-ruamel-yaml, rt-tests, swipl, vorbis-tools, xfsprogs + + Issues resolved: + - Are there plans to add raspberrypizero2w_64_defconfig config? + https://gitlab.com/buildroot.org/buildroot/-/issues/1 + - Some folders can't visit and some file is missing while running + https://gitlab.com/buildroot.org/buildroot/-/issues/2 + - wpewebkit build fails on ARM Neon + https://gitlab.com/buildroot.org/buildroot/-/issues/3 + - TAR-1.35 will not build for target (host-variant will build) + https://gitlab.com/buildroot.org/buildroot/-/issues/4 + - package/xz without shared libraries breaks Python build + https://gitlab.com/buildroot.org/buildroot/-/issues/5 + - unable to build - 404 at sources.buildroot.net + https://gitlab.com/buildroot.org/buildroot/-/issues/10 + - OpenSSH 9.8 broken + https://gitlab.com/buildroot.org/buildroot/-/issues/11 + - Update Openssh to Version 9.8p1 (CVE-2024-6387) in Long Term + Support Release 2024.02.x + https://gitlab.com/buildroot.org/buildroot/-/issues/14 + - Toolchain (host-gcc-final-14.1.0) build failure with + y2038/BR2_TIME_BITS_64 enabled + https://gitlab.com/buildroot.org/buildroot/-/issues/16 + - building go/golang gives error + https://gitlab.com/buildroot.org/buildroot/-/issues/18 + - GCC 13.3 is missing + https://gitlab.com/buildroot.org/buildroot/-/issues/20 + - package containerd update to avoid hanging docker exec + commands + https://gitlab.com/buildroot.org/buildroot/-/issues/21 + - "BR2_EXTERNAL broken missing srctree error Config.in" + https://gitlab.com/buildroot.org/buildroot/-/issues/24 + - Can't subscribe buildroot mailing list + https://gitlab.com/buildroot.org/buildroot/-/issues/25 + +2024.05.3, released September 9th, 2024 + + Important / security related fixes. + + A large number of GCC 14.x compilation fixes and additional + runtime tests. + + Infrastructure: + - Be more robust against text files (for package hashes and + users) incorrectly missing a terminating newline. + + - Fix various issues with the pkg-kconfig infrastructure and + per-package-directories builds + (BR2_PER_PACKAGE_DIRECTORIES). + + Updated/fixed packages: aer-inject, am335x-pru-package, + apache, apr, apr-util, attr, augeas, autossh, bandwidthd, + bcusdk, boost, brcm-patchram-plus, btrfs-progs, busybox, + can-utils, coreutils, cpuload, cryptsetup, cwiid, dhrystone, + dvb-apps, elfutils, faifa, fetchmail, ffmpeg, fluent-bit, + fluidsynth, freerdp, gcc, gcc-bare-metal, gdb, gnutls, gpsd, + hiawatha, hostapd, htop, ibm-sw-tpm2, intel-microcode, iperf3, + iproute2, ksmbd-tools, libcli, libcoap, libcurl, libest, + libfreefare, libgtk3, libngs, libpwquality, libressl, libupnp, + libxml2, libxslt, lrzsz, mdio-tools, micropython, + mjpg-streamer, mokutil, mpir, ncftp, nginx, nodejs, odb, + open-iscsi, openldap, openswan, openvpn, pistache, procps-ng, + python-django, quotatool, rtty, ruby, sconeserver, speex, + swaybg, tar, tftpd, tinyssh, uclibc, uclibc-ng-test, unbound, + uuu, vorbus-tools, wpewebkit, zfs, zsh + + Issues resolved: + - TAR-1.35 will not build for target (host-variant will build) + https://gitlab.com/buildroot.org/buildroot/-/issues/4 + - Toolchain (host-gcc-final-14.1.0) build failure with + y2038/BR2_TIME_BITS_64 enabled + https://gitlab.com/buildroot.org/buildroot/-/issues/16 + +2024.05.2, released August 14th, 2024 + + Important / security related fixes. + + Various minor improvements to utils/check-package + + Defconfigs: Add download hashes for chromebook-elm, + chromebook-snow and stm32mp157a_dk1 + + Updated/fixed packages: android-tools, bcc, bitcoin, boost, + btrfs-progs, c-ares, cdrkit, check, containerd, directfb, + dump1090, ed, exim, fail2ban, frotz, fwts, gcc, gdb, go, gpm, + kexec, libarchive, libgeos, libressl, llvm, mupdf, ncftp, + nodejs, ntpsec, octave, openssh, pppd, python-mupdf, + python-ruamel-yaml, qt5webkit, rawk-hawkbit-updater, + rtl8188eu, snappy, squid, sunxi-tools, syslinux, systemd, + tcf-agent, tftpd, ubus, util-linux, uvw, webkitgtk, wolfssl, + wpewebkit, x265, xlib_libxshmfence, xvisor + + Issues resolved (http://bugs.uclibc.org): + + #15231: gcc --help -v doesn't work correctly with gcc>=10 and.. + +2024.05.1, released July 13th, 2024 + + Important / security related fixes. + + Infrastructure: Ensure support/scripts/apply-patches can be + used outside Buildroot (regression in 2024.05). + + Defconfig: Pine64 rockpro64: Build ethernet driver in kernel + rather than as module. QEMU sh4: Change to initramfs to + workaround regression in QEMU. Visionfive2: Correct kernel + headers version + + Updated/fixed packages: apache, avro-c, daq, dav1d, + fluent-bit, ghostscript, glibc, libmad, libopenssl, + linux-firmware, mesa3d, network-manager, ntp, nut, octave, + openssh, openvpn, php, raspberrypi-usbboot, redis, sentry-cli, + tor, uuu, vlc, xmrig, znc + +2024.05, released June 12th, 2024 + + Various fixes. + + Infrastructure: Ensure a custom tar program specified with + make TAR=/path/to/custom/tar is used everwhere. + + Defconfigs: Fix build issues and runtime warnings for + Beaglebone qt5, Qemu ppc64/le pseries, TI am62x/am64x. + + Add hashes for Beaglebone qt5, imx8mn bsh sm s2 / pro, + stm32f429 disco XIP, stm32f769 disco sd. + + Updated/fixed packages: bc, collectd, composer, cvs, + docker-compose, flutter-engine, git, liblockfile, libzenoh-c, + lightning, nginx, p11-kit, python-lxml, python3, qt6base, + rrdtool, sofia-sip, syslog-ng, systemd, uclibc, unixodbc + +2024.05-rc2, released June 4th, 2024 + + Fixes all over the tree. + + Download: + - Dropped the (noop) --passive-ftp option from default wget + options for compatibility with wget2 + + - Fixed an issue with the generated archives (for + git/svn/cargo/go) when multiple packages share an archive + (E.G. linux vs linux-headers). + + Defconfigs: Fix build issue with binutils 2.41+ for + Acmesystems Aria / Arietta, add download hashes for a number + of defconfigs. Fix FIT external position for i.MX8 boards + + Updated/fixed packages: dnsmasq, docker-compose, doom-wad, + ebtables, esp-hosted, file, freeradius-client, + freeradius-server, go, kmod, libmnl, libnetfilter_acct, + libnetfilter_log, linux, luarocks, lynx, makedumpfile, + micropython, mtd, ncftp, newlib-bare-metal, nfacct, ntp, + octave, proftpd, qt5base, systemd, tpm2-tss, uboot-tools, + ulogd, vala, zip + + Removed packages: at91bootstrap, at91dataflashboot, + on2-8170-libs, on2-8170-modules + + Issues resolved (http://bugs.uclibc.org): + + #15973: imx8m bootloader image generation broken since update.. + #16093: kmod and gcc-14 build error + +2024.05-rc1, released May 30th, 2024 + + Fixes all over the tree and new features. + + Toolchains: + - Binutils 2.24 added, 2.39 dropped, 2.41 is now default + - GCC 14.x added, 11.x dropped, 13.x is now default + - uClibc-ng bumped to 1.0.48 + - Musl bumped to 1.2.5, adds riscv32 support + - Glibc bumped to 2.39, libcrypt no longer available (see + libxcrypt package) + - External glibc based toolchains no longer install libcrypt + files (except for libcrypt.so.1) to not conflict with the + libxcrypt package + - Bootlin external toolchains updated to 2024.02 + - Support for external toolchains using GCC version 14 + - Old external Codesourcery ARM/AARCH64 toolchains removed + - Old external Codesourcery niosII toolchain removed + - Old external Codescape mips toolchains removed + - Support for Linux 6.7 / 6.8 kernel headers added + + Architecture: + - Support for riscv32 noMMU added + - Internal toolchains for SPARC (re-)added + - Support for the Motorola m68k specific shared library + support for the FLAT binary format dropped, as support has + been removed from the Linux kernel as of v5.19. + + Download (notice, Buildroot generated tarballs have changed): + - Tar 1.35 is now required (will be automatically built if not + available on the host). Notice that tar 1.35 changes the way + devmajor/minor is stored, so tarballs created with 1.35 are + not binary identical to <1.35 + - The tarball creation logic has now been extended to + correctly handle when ACLs are set on the download + directory. + - An issue with conflicting git tags between (different + versions of) a package has been fixes + - Git attributes are now handled correctly + + Security: + - The /dev/shm entry in the default /etc/fstab used for + busybox and sysv init systems was missing the sticky bit, + allowing users to delete and replace other users files. + + Infrastructure: + - kconfig/menuconfig can now be built with GCC 14.x + - Git is now used to to fetch CVE data from the FKIE + repository to work around an issue with missing meta files + in the releases. + - utils/check-package now also checks if defconfigs use + BR2_DOWNLOAD_FORCE_CHECK_HASHES to ensure custom + bootloader/kernels are correctly downloaded. + + New defconfigs: Beagleboneai64, Orangepi Zero2w, Pine64 star64 + + New packages: basu, bats-assert, bats-file, bats-support, bcc, + bpftrace, export-subst, flutter-adaptive-scaffold-example, + flutter-animations-example, flutter-dynamic-layouts-example, + flutter-go-router-example, flutter-image-example, + flutter-markdown-example, flutter-packages, + flutter-rfw-local-example, go-bootstrap-stage3, igt-gpu-tools, + libgpiod2, libxmlb, libzenoh-c, lmdb, lua-lightningmdb, + lua-lsdbus, mokutil, python-email-validator, + python-expandvars, python-fastui, python-hid, python-jc, + python-mpmath, python-poetry-core, python-sympy, + python-yamllint, qbee-agent, starfive-spltool, ustreamer + + Removed packages: flutter-gallery, omxplayer, ti-k3-image-gen + + Issues resolved (http://bugs.uclibc.org): + + #14416: Mesa3D missing DRI3 support for various Gallium drivers + #15766: BR2_PACKAGE_WESTON_XWAYLAND -- 12.0.1 -- fails to build.. + #15997: Build Squid with GCC12.3 in Buildroot 2024.02 will fail + #16009: 'select' does not work with 'choice' + #16036: android-tools version is too old + #16075: Cannot use linux kernel extensions from external tree.. + +2024.02.8, released November 14th, 2024 + + Important / security related fixes. + + Updated/fixed packages: apache, asterisk, bind, bootgen, criu, + file, fluidsynth, ghostscript, heimdal, intel-microcode, + jailhouse, jsoncpp, libarchive, libcurl, libldns, liblinear, + libmdbx, libopenh264, ltrace, lightning, nghttp2, ntp, php, + postgresql, procps-ng, python-pyqt5, ruby, sysvinit, tor, + wpebackend-fdo + + New packages: python-pyqt5-sip + +2024.02.7, released October 21th, 2024 + + Important / security related fixes. + + Per-package-directories fixes for the .gdbinit file and RPATH + fixups for SDK. + + utils/check-package: Also check for correct indentation of + help lines. + + A large number of typo fixes. + + Updated/fixed packages: aer-inject, armadillo, asterisk, + aumix, babeld, bind, botan, cache-calibrator, clamav, + comix-cursors, cryptsetup, cups, dovecot, dovecot-pigeonhole, + expat, fbset, genpart, glibc, gnu-efi, gnutls, go, grub2, + libarchive, libcuefile, libcurl, libglob, libgpg-error, + libilbc, libkcapi, libopenssl, libpcap, libuecc, linux-pam, + mosquitto, nginx, ntpsec, p910nd, php, postgresql, procps-ng, + proftpd, pure-ftpd, python-django, python-huepy, + python-sqlparse, python-unittest-xml-reporting, python3, + qt6base, qt6svg, rp-pppoe, sofia-sip, strongswan, szip, + tllist, unbound, wpebackend-fdo, wpewebkit, x264, xenomai, + xserver_xorg-server, zabbix + + New packages: go-bootstrap-stage3 + + Issues resolved: + - procps-ng: build failure when linking to systemd + https://gitlab.com/buildroot.org/buildroot/-/issues/28 + - orange pi 2w does not boot + https://gitlab.com/buildroot.org/buildroot/-/issues/36 + - glibc configure fails on aarch64 with mathvec SVE ACLE error + https://gitlab.com/buildroot.org/buildroot/-/issues/40 + - Kernel Build from Custom Git Repo fails with hash-error + https://gitlab.com/buildroot.org/buildroot/-/issues/46 + - package/linux-pam: Remove unneeded flex dependency + https://gitlab.com/buildroot.org/buildroot/-/issues/47 + +2024.02.6, released September 9th, 2024 + + Important / security related fixes. + + Added a large number of additional runtime tests. + + Infrastructure: + - Be more robust against text files (for package hashes and + users) incorrectly missing a terminating newline. + + - Fix various issues with the pkg-kconfig infrastructure and + per-package-directories builds + (BR2_PER_PACKAGE_DIRECTORIES). + + Updated/fixed packages: aer-inject, am335x-pru-package, + apache, apr, apr-util, attr, boost, btrfs-progs, busybox, + cryptsetup, dropbear, elfutils, fetchmail, ffmpeg, fluidsynth, + freerdp, gcc, gdb, gnutls, gpsd, hiawatha, hostapd, htop, + intel-microcode, iperf3, ksmbd-tools, libcoap, libcurl, + libest, libgtk3, libpwquality, libressl, libupnp, libxml2, + libxslt, lrzsz, mdio-tools, micropython, mjpg-streamer, mpir, + ncftp, nginx, nodejs, open-iscsi, openldap, openvpn, pistache, + procps-ng, python-django, ruby, speex, swaybg, tinyssh, + uclibc, uclibc-ng-test, unbound, uuu, wpewebkit, zfs + + Issues resolved: + - Toolchain (host-gcc-final-14.1.0) build failure with + y2038/BR2_TIME_BITS_64 enabled + https://gitlab.com/buildroot.org/buildroot/-/issues/16 + +2024.02.5, released August 14th, 2024 + + Important / security related fixes. + + Various minor improvements to utils/check-package + + Defconfigs: Add download hashes for chromebook-elm, + chromebook-snow and stm32mp157a_dk1 + + Updated/fixed packages: bitcoin, boost, btrfs-progs, c-ares, + cdrkit, check, containerd, directfb, ed, exim, fwts, gcc, gdb, + go, kexec, libarchive, libgeos, libressl, mupdf, nodejs, + ntpsec, octave, openssh, pppd, python-mupdf, + python-ruamel-yaml, qt5webkit, rauc-hawkbit-updater, snappy, + squid, sunxi-tools, syslinux, systemd, tcf-agent, ubus, + util-linux, uvw, webkitgtk, wolfssl, wpewebkit, x265, + xlib_libxshmfence, xvisor + + Issues resolved (http://bugs.uclibc.org): + + #15231: gcc --help -v doesn't work correctly with gcc>=10 and.. + +2024.02.4, released July 13th, 2024 + + Important / security related fixes. + + Infrastructure: Ensure a custom tar program specified with + make TAR=/path/to/custom/tar is used everwhere. + + Defconfig: Pine64 rockpro64: Build ethernet driver in kernel + rather than as module. + + Updated/fixed packages: apache, composer, daq, fluent-bit, + ghostscript, glibc, liblockfile, libmad, libopenssl, mesa3d, + network-manager, ntp, octave, openssh, openvpn, php, python3, + qt6base, raspberrypi-usbboot, redis, sentry-cli, systemd, tor, + vlc, xmrig, znc + +2024.02.3, released June 10th, 2024 + + Important / security related fixes. + + Misc: + - Fixed a number of compilation issues for hosts using GCC + 14.x, including for kconfig. + + Download: + - Drop redundant --passive-ftp from default wget options and + migrate a number of packages using FTP upstreams to HTTP(S) + for compatibility with wget2 which does not have FTP support + + - Ensure downloads are correctly shared for host packages that + try to do so using _DL_SUBDIR and ensure the correct + toplevel directory name is used in generated tarballs when + downloads are shared. + + Arch: Enable SSE2 support for x86 Pentium M variant. + + Defconfigs: Orangepi PC/R1, Raspberrypi zero2w, Sipeed + licheepi nano, Wandboard: Fix compilation issues. PC x86-64 + bios/efi: add wireless regdb to fix kernel warning during + boot, iMX.8 boards: Adjust FIT external data position to match + imx-mkimage changes, fixing boot issues. + + Updated/fixed packages: am33x-cm, apcupsd, + arm-trusted-firmware, binutils-bare-metal, bpftool, catch2, + ccache, cjson, clamav, cog, coreutils, cryptodev-linux, + dhcpcd, dmraid, dnsmasq, docker-cli, docker-compose, + docker-engine, doom-wad, duma, elf2flt, ebtables, elfutils, + evemu, file, fluidsynth, freeradius-client, freeradius-server, + freerdp, fwts, gcc, gcc-bare-metal, git, gnuplot, go, + gr-osmosdr, gst1-plugins-good, hidapi, imagemagick, + intel-gmmlib, ivi-homescreen, janus-gateway, kexec, kmod, + kodi, libarchive, libdrm, libedit, libffi, libglib2, libhtp, + libjwt, libkrb5, libmanette, libmdbx, libmnl, + libnetfilter_acct, libnetfilter_log, libnpth, libopenssl, + libpng, libuhttpd, liburiparser, libutempter, libvncserver, + libwpe, lightning, linux-firmware, linux-pam, lua-cffi, + luajit, lvm2, lynx, mariadb, mesa3d, micropython, minisign, + musl, mutt, ncftp, network-manager, newlib-bare-metal, nfacct, + nfs-utils, octave, openjpeg, openocd, oprofile, + perl-dbd-mysql, php, postgresql, pppd, privoxy, procps-ng, + proftpd, proj, putty, python-ml-dtypes, python-pillow, + python-rds-py, qemu, qt5base, redis-plus-plus, rtl8189fs, + ruby, samba4, shadow, smcroute, speech, squid, sscep, + suricata, swupdate, systemd, ti-sgx-km, tinycbor, tinyproxy, + tor, tpm2-tss, ttyd, uboot-tools, ulogd, vala, weston, + wpewebkit, x11vnc, zbar, zeromq, zfs, zip, zxing-cpp + + Issues resolved (http://bugs.uclibc.org): + + #15766: BR2_PACKAGE_WESTON_XWAYLAND -- 12.0.1 -- fails to build.. + #15973: imx8m bootloader image generation broken since update.. + #16075: Cannot use linux kernel extensions from external tree.. + #16093: kmod and gcc-14 build error + +2024.02.2, released May 7th, 2024 + + Important / security related fixes. + + Security: The /dev/shm entry in the default /etc/fstab used + for busybox and sysv init systems was missing the sticky bit, + allowing users to delete and replace other users files. + + Defconfigs: Mangopi mq1rdw1: Lock kernel headers to 6.6.x. + + Updated/fixed packages: apache, botan, + brcmfmac_sdio-firmware-rpi, clamav, cmake, containerd, + crucible, dmenu-wayland, dmraid, docker-cli, docker-engine, + domoticz, fmc, freeipmi, gdal, gdb, giflib, gnupg2, go, + google-breakpad, googlefontdirectory, imx-gpu-viv, inih, + libassuan, libblockdev, libcurl, libdrm, libgpg-error, + libksba, libnpth, libressl, libtracefs, lxc, mbedtls, mesa3d, + oatpp, opensc, oprofile, perl-net-ssleay, petitboot, + php-xdebug, psplash, python-pypng, python-segno, + python-service-identity, python3, skeleton-init-sysv, systemd, + tcf-agent, tiff, uuu, wolfssl, xmrig, zic + + Issues resolved (http://bugs.uclibc.org): + + #14416: Mesa3D missing DRI3 support for various Gallium drivers + #16009: 'select' does not work with 'choice' + #16036: android-tools version is too old + +2024.02.1, released March 26th, 2024 + + Important / security related fixes. + + Toolchain: Dropped old Codesourcery ARM / AARCH64 and + Codescape MIPS external toolchains as they use old Glibc + versions not compatible with 64-bit time_t + + Defconfigs: Starfive visionfive2: Use correct genimage + configuration. TI am62x_sk / am64_sk: Use correct optee-os + platform setting and use a fixed ti-k3-r5-loader version. + + Infrastructure: Use git to fetch CVE data from the FKIE + repository to work around an issue with missing meta files in + the releases. + + Updated/fixed packages: axel, bash, bitcoin, botan, busybox, + containerd, cryptsetup, cvs, docker-compose, docker-engine, + ell, expat, giflib, gmp, go, harfbuzz, intel-gmmlib, + intel-mediadriver, iwd, kodi, kodi-pvr-hts, libcgroup, libdrm, + libgit2, libkrb5, libnfs, libunwind, libvpl, + libtorrent-rasterbar, libxml2, linux, mariadb, mesa3d, + mmc-utils, msmtp, multipath-tools, neon, onevpl-intel-gpu, + openssh, openvpn, osm2pgsql, owfs, php, poco, policycoreutils, + postgis, privoxy, pulseaudio, pure-ftpd, putty, + python-configshell-fb, python-rtslib-fb, rauc, restorecond, + spice, squid, targetcli-fb, tzdata, util-linux, vdr, xmrig, + xvisor, zic + + Issues resolved (http://bugs.uclibc.org): + + #15997: Build Squid with GCC12.3 in Buildroot 2024.02 will fail + +2024.02, released March 5th, 2024 + + Various fixes. + + Updated/fixed packages: botan, conmon, dash, efivar, expat, + fluent-bit, gcc, gst1-vaapi, libcoap, libselinux, liburing, + libva, libxml2, ltp-testsuite, luvi, newlib-bare-metal, + nginx-naxsi, octave, openblas, openvmtools, parted, poco, + powertop, python-aiohttp, python-cheroot, python-django, + python-grpcio, rauc, rauc-hawkbit-updater, rtl8822cs, rust, + sdl2, shadow, spirv-tools, strace, strongswan, tar, tllist, + vim + + Removed packages: mysql (virtual), oracle-mysql, + python-setuptools-scm-git-archive + +2024.02-rc2, released March 1st, 2024 + + Fixes all over the tree. + + Infrastructure: Various fixes for pkg-stats after moving to + the FKIE CVE feed and support for older python/ijson versions. + + Updated/fixed packages: ccache, dracut, erlang, freetype, + libheif, libpthsem, micropython, newlib-bare-metal, openssh, + poco, python3, redis, rhash, shim, squid, syslinux + +2024.02-rc1, released February 25th, 2024 + + Fixes all over the tree and new features. + + Toolchain: + + - GDB: Add version 14.1, default to 13.2. + + - uClibc-ng updated to 1.0.45 + + - Bootlin external toolchains updated to 2023.11-1, moving the + stable toolchains to GCC 12.3 / binutils 2.40 / GDB 13.2 / + glibc 2.38 / musl 1.2.4 / uClibc-ng 1.0.45 + + - Add support for building a bare metal toolchain suitable for + building firmware for certain (co-)processors, possibly + using a different CPU architecture than the main Buildroot + configuration. + + Default optimization level changed from optimize for size + (-Os) to optimize for speed (-O2). + + Support: Use the Fraunhofer FKIE JSON files for CVE matching + now that NVD is about to deprecate its feeds. + + New defconfigs: AMD Zynqmp kria kd240 and kr260, zcu104, Avnet + RZBoard V2L, Mangopi MQ1RDW2, NXP i.MX 93 11x11 EVK, QEMU + Riscv64 virt-efi, TI AM574x Industrial Development Kit + + Removed defconfigs: Zynq qmtech + + New packages: binutils-bare-metal, dmenu-wayland, fcft, foot, + firmware-ele-imx, ivi-homescreen, libjwt, libtraceevent, + libtracefs, libutempter, lua-ansicolors, lua-argparse, + lua-conciseserialization, lua-ubjson, minisign, + newlib-bare-metal, python-aiosqlite, python-annotated-types, + python-anyio, python-asyncssh, python-bitarray, + python-cachetools, python-contourpy, python-decouple, + python-fastapi-sessions, python-fastapi, + python-google-api-core, python-google-auth, + python-googleapis-common-protos, python-grpc-requests, + python-grpcio-reflection, python-grpcio, python-httpcore, + python-httpx, python-matplotlib-inline, python-ml-dtypes, + python-multipart, python-pydantic-core, python-pypng, + python-starlette, python-tcolorpy, python-trafaret, + python-urwid-readline, python-uvicorn, rlwrap, tllist + + Removed packages: davinci-bootcount (renamed to + uboot-bootcount), flickcurl, gmpc, libmpd, micropython-lib, + python-crossbar, python-pygame, tinymembench + + Issues resolved (http://bugs.uclibc.org): + + #10096: SH4 toolchain does not build Linux kernel magicpanelr2_.. + #15889: please update meson + #15898: Unable to boot syslinux.efi produced by buildroot (EFI 64-.. + #15910: USB keyboard is not working by default "raspberrypicm4io_.. + #15952: Grub fails to load large rootfs files + +2023.11.3, released March 26th, 2024 + + Important / security related fixes. + + Defconfigs: Starfive visionfive2: Use correct genimage + configuration. + + Updated/fixed packages: bind, bitcoin, botan, c-ares, clamav, + conmon, containerd, cvs, dash, dnsmasq, docker-engine, dracut, + ell, expat, fluent-bit, freetype, gcc, ghostscript, gmp, + gnupg2, go, google-breakpad, gst1-python, gst1-vaapi, iwd, + libcoap, libcurl, libdnet, libgit2, libheif, libkrb5, + libmodsecurity, libnfs, libopenssl, libselinux, libunwind, + liburing, libuv, libva, libxml2, ltris, lua-http, luvi, + mmc-utils, nginx-naxsi, nodejs, octave, openssh, openvmtools, + parted, petitboot, php, poco, postgresql, powertop, privoxy, + pure-ftpd, putty, python-cheroot, python-configshell-fb, + python-django, python-rtslib-fb, python3, + rauc-hawkbit-updater, redis, redis-plus-plus, rsync, + s390-tools, sdl2, shim, spice, spirv-tools, squid, strace, + strongswan, sudo, systemd, targetcli-fb, uhd, unbound, + util-linux, v4l2loopback, vim, webkitgtk, wpewebkit, xvisor, + zlib-ng + + Issues resolved (http://bugs.uclibc.org): + + #15997: Build Squid with GCC12.3 in Buildroot 2024.02 will fail + +2023.11.2, released March 1st, 2024 + + Important / security related fixes. + + Added CPE identifiers for a large number of packages. + + Updated/fixed packages: bayer2rgb-neon, brltty, c-ares, cog, + containerd, cpio, crda, criu, darkhttpd, davinci-bootcount, + dbus, depot-tools, dhcpcd, domoticz, environment-setup, expat, + faad2, falcosecurity-libs, flex, flutter-engine, + flutter-gallery, flutter-pi, flutter-sdk-bin, + freeradius-server, freerdp, frr, gesftpserver, glibc, gnutls, + go, gst1-devtools, gst1-libav, gst1-python, gst1-vaapi, + gst-omx, gstreamer1, haproxy, hiredis, joe, json-c, leptonica, + libcurl, libp11, libuwsc, libvips, libzenoh-pico, + linux-firmware, linux-headers, localedef, lua-http, lvm2, + lynx, mbedtls, micropython, minizip, mpfr, netatalk, ngrep, + onevpl, opencv4, opencv4-contrib, openssh, opus, petitboot, + php, python-aiohttp, python-bitarray, python-bitstring, + python-esptool, python-gunicorn, python-hpack, + python-html5lib, python-lmdb, python-mako, python-numpy, + python-oauthlib, python-sqlparse, python-wheel, qt5base, + qt6base, redis, runc, sdl2, sqlite, syslog-ng, sysstat, + util-linux, vulkan-loader, webkitgtk, weston, wireless-regdb, + wlroots, wpewebkit, xlib_libXpm, xterm, xwayland, yasm + + New packages: python-bitarray + + Issues resolved (http://bugs.uclibc.org): + + #10096: SH4 toolchain does not build Linux kernel magicpa.. + #15952: Grub fails to load large rootfs files + +2023.11.1, released January 15th, 2024 + + Important / security related fixes. + + Infrastructure: + + - Download: Revert a permission fixup step in the tarball + creation logic, which lead to a hash mismatch issue in two + cargo-vendored packages, ripgrep and sentry-cli. + + - Build: Pass GIT_DIR=. in the environment (through + HOST_MAKE_ENV/TARGET_MAKE_ENV) to the build steps to + workaround packages trying to detect if they are building in + a git checkout and getting confused when building in a sub + directory of a Buildroot git checkout. + + Defconfigs: Rock5b: Add download hashes for U-Boot and Linux + + Updated/fixed packages: apcupsd, arm-trusted-firmware, botan, + cjson, criu, cryptodev-linux, cups, dahdi-linux, dahdi-tools, + dbus, docker, dropbear, duktape, edk2, erlang, exim, faad2, + freeswitch, gcc, gdal, gdb, giflib, glibc, gnuplot, gnutls, + go, google-breakpad, gst-omx, gstd, 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, ipcalc, jq, + json-for-modern-cpp, ksmbd-tools, libaio, libarchive, + libcamera, libcamera-apps, libcap-ng, libcgroup, libcurl, + libde265, libebml, libgtk3, libheif, libiec61850, libndns, + libostree, libraw, libsigsegv, libssh, libssh2, libuev, + libwebsockets, libzenoh-pico, liquid-dsp, lvm2, madplay, + mesa3d, micropython, minizip, mp4v2, nushell, + onevpl-intel-gpu, opensc, openssh, optee-client, orc, php, + pipewire, postgis, postgresql, proftpd, putty, python-brotli, + python-pysensors, python-sip, python-werkzeug, shim, squid, + strongswan, sway, tinyssh, tor, transmission, tree, udev, + uftp, valijson, wireshark, wlroots, wolfssl, + xserver_xorg-server, xwayland, + +2023.11, released December 4th, 2023 + + Various fixes. + + Defconfigs: Toradex apalis i.mx6: Add download hashes for + Linux and U-Boot. + + Updated/fixed packages: cog, freescale-imx, imagemagick, + libde265, libmemcached, libpjsip, libusb-compat, + libzenoh-pico, linux-tools, lttng-modules, mariadb, monit, + openfpgaloader, perl, putty, python-numpy, rtty, speechd, + wireshark, xenomai, xtables-addons, zfs + +2023.11-rc2, released November 29th, 2023 + + Fixes all over the tree. + + Defconfigs: Raspberry pi: Fix bluetooth autoprobing, + rockpro64: Fix U-Boot build, bump rootfs size, vim3: Use + device tree from Linux rather than from U-Boot. + + Updated/fixed packages: erlang, exfatprogs, flutter-engine, + flutter-sdk-bin, gcc, gsl, intel-microcode, janet, + kodi-pvr-hts, libgdiplus, libpam-tacplus, libxml2, + libzenoh-pico, memcached, motion, netsnmp, nodejs, oatpp, + openrc, opensc, perl, postgresql, python-msgpack, qemu, + refpolicy, samba4, squid, vim, vlc, xwayland, zfs + + Issues resolved (http://bugs.uclibc.org): + + #15856: Using BR2_CONFIG= on a different file-system... + +2023.11-rc1, released November 14th, 2023 + + Fixes all over the tree and new features. + + Architecture: MIPS IV (re-)added. The mutually exclusive ABI + selection dropped for PowerPC. + + Toolchain: + + - Support for GDB 13.2, make GDB 12.x the default + + - Glibc bumped to 2.38 + + - Bootlin external toolchains updated to 2023.08, bringing + support for Aarch64 BE with musl. + + - Motorola 68K w/MMU support added for glibc and musl. + + - License info added for GCC + + Infrastructure: + + - The CMake infrastructure now supports building packages with + ninja instead of make (based on _CMAKE_BACKEND). + + - The RPATH fixup done at the end of the build is now done in + parallel (according to BR2_JLEVEL). + + - Packages downloaded from Subversion repos no longer + retrieves svn:externals unless _SVN_EXTERNALS is set to + YES. + + - Packages where a free-form version/site can be specified + (E.G. Linux, U-Boot, ..) can now have the corresponding + tarballs of these custom downloads checked by the download + infrastructure based on .hash files in the global patch + directory. These hashes are optional unless + BR2_DOWNLOAD_FORCE_CHECK_HASHES is enabled. + + A utils/add-custom-hashes helper script has been added to + assist in managing such hash files. + + - Various improvements to utils/docker-run to handle external + (BR2_DL_DIR defined in environment) download directory, + proxy configuration, SELinux and out of tree (O=) builds. + + New defconfigs: AMD Zynq ZC702, ASUS Tinker-s rk3288, ICnova + A20-adb4006, Khadas vim3, Libre Computer ROC-RK3399-PC, + Microchip PolarFire SoC Icicle Kit, NXP imxrt1050-evk, Pine64 + pinecube, Sipeed LicheePi Nano, Synopsys ARC700 nSIM, TI + SK-AM62 and TI SK-AM64 + + New packages: ti-k3-boot-firmware, ti-k3-image-gen, + amlogic-boot-fip, criu, cutekeyboard, depot-tools, fft-eval, + firewalld, flutter-engine, flutter-gallery, flutter-pi, + flutter-sdk-bin, ledmon, libcanberra, libnvme, libsoup3, + libspdm, libucontext, libzenoh-pico, + microchip-hss-payload-generator, nodejs-bin, nushell, + nvidia-persistenced, oatpp, onevpl-intel-gpu, onevpl, + python-calver, python-distlib, python-jeepney, + python-jsonschema-specifications, python-kmod, + python-pysensors, python-referencing, python-segno, + python-tftpy, python-trove-classifiers, + python-types-python-dateutil, python-versioneer, + qoriq-fm-ucode, qt6core5compat, rauc-hawkbit-updater, + rust-bindgen, spirv-headers, spirv-tools, vulkan-loader, + vulkan-tools + + Removed packages: google-material-design-icons, libtextstyle, + python-pyxb + + Issues resolved (http://bugs.uclibc.org): + + #14366: Nodejs fails with "version `GLIBC_2.34' not found".. + #14741: e2fsck is failing during cronjob build where fail... + #15628: Missing dependencies in BR2_PACKAGE_PYTHON_MAKO + #15733: xfsprogs outdated + #15772: lz4 failed to compile with gcc 10.4.0 + #15778: strace comilation fails on Fedora39/gcc13 + #15787: atmel_sama5d3_xplained_mmc_defconfig: Missing... + #15790: at91sam9x5ek_dev_defconfig: Missing... + #15808: connman is not supported on musl + #15814: C++ not supported by bootlin toolchain + #15820: make linux-menuconfig does not modify correct .config.. + #15823: Installing nodejs modules with native extensions ... + #15826: nodejs modules with native extensions fail to install + #15835: Incompatibility between network-manager and libcurl 8.4 + +2023.08.4, released December 4th, 2023 + + Important / security related fixes. + + Defconfigs: Raspberrypi: Fix DT overlay for autoproving of + bluetooth driver, Toradex apalis i.mx6: Add download hashes + for Linux and U-Boot. + + Updated/fixed packages: gcc, erlang, exfatprogs, gsl, + imagemagick, intel-microcode, libde265, libmemcached, + libpjsip, libxml2, mariadb, memcached, motion, netsnmp, perl, + postgresql, putty, rtty, samba4, speechd, squid, vim, vlc, + xenomai, xtables-addons, zfs + + Issues resolved (http://bugs.uclibc.org): + + #15856: Using BR2_CONFIG= on a different file-system... + +2023.08.3, released November 14th, 2023 + + Important / security related fixes. + + Per-package builds: Unbreak SDK relocation logic. Only drop + the hard links for the final host / target directory, fixing a + build time / size regression in 2023.08.2. + + Packages where a free-form version/site can be specified + (E.G. Linux, U-Boot, ..) can now have the corresponding + tarballs of these custom downloads checked by the download + infrastructure based on .hash files in the global patch + directory. These hashes are optional unless + BR2_DOWNLOAD_FORCE_CHECK_HASHES is enabled. + + A utils/add-custom-hashes helper script has been added to + assist in managing such hash files. + + Defconfigs: Avenger96: Downgrade to TF-A v2.5 to fix boot + issue since 2023.08, stm32mp157a-dk1, stm32mp157c-dk2: Unbreak + TF-A build, stm32mp157c-odessey: Use a fixed TF-A version for + reproducibility + + Updated/fixed packages: apache, arm-trusted-firmware, aufs, + aufs-util, azure-iot-sdk, casync, cjson, clamav, conmon, + cups-filters, dhcpcd, docker-cli, docker-engine, + freeradius-server, go, inadyn, ksmbd-tools, kvmtool, + libgdiplus, libgeos, libmemcached, libmdbx, libopenssl, + libosmium, libtommath, libupnp, libzlib, lightning, linux-pam, + lxc, mender, minizip-zlib, mpd, mxsldr, nano, nettle, + network-manager, nghttp2, nodejs-src, opencv4, + opencv4-contrib, openjdk-bin, openvpn, opusfile, paho-mqtt-c, + pango, perl-lwp-protocol-https, petitboot, php, pistache, + python-django, python-pycryptodomex, python-urllib3, + python-web2py, rabbitmq-c, redis, reproc, + riscv64-elf-toolchain, sedutil, snort3, suricata, tar, tiff, + tor, traceroute, vim, websocketpp, wireshark, wolfssl, + xdg-dbus-proxy, xen, xlib_libX11, xlib_libXpm, zabbix, zchunk + + Issues resolved (http://bugs.uclibc.org): + + #14741: e2fsck is failing during cronjob build where fail... + #15772: lz4 failed to compile with gcc 10.4.0 + #15787: atmel_sama5d3_xplained_mmc_defconfig: Missing... + #15790: at91sam9x5ek_dev_defconfig: Missing... + #15820: make linux-menuconfig does not modify correct .config.. + #15823: Installing nodejs modules with native extensions ... + #15835: Incompatibility between network-manager and libcurl 8.4 + +2023.08.2, released October 15th, 2023 + + Important / security related fixes. + + Defconfigs: Freescale ARM: Add ATF patch to fix build issue + with binutils 2.39+. QEMU Aarch64-virt: Enable ACPI support + for EDK2. Visionfive2: Bump kernel to fix build issue with GCC + 13. + + Per-package builds: Do not use hard links for host / target + dirs, fixing issues with package rebuilds or post-build + scripts modifications. + + Infrastructure: Explicitly disable shuffle mode for Make >= + 4.4 where needed. + + Urandom-scripts: Move seedrng init script to S01 for earlier + random number entrophy initialization. + + Updated/fixed packages: at91bootstrap, batman-adv, bind, cups, + efl, enlightenment, exim, gcc, glibc, gnu-efi, go, gptfdisk, + grub2, gst-omx, gst1-devtools, gst1-libav, gst1-plugins-bad, + gst1-plugins-base, gst1-plugins-good, gst1-plugins-ugly, + gst1-python, gst1-rstp-server, gst1-rtsp-vaapi, gstreamer1, + gstreamer1-editing-services, gtkmm3, libcue, libcurl, + libfastjson, libhtp, libmodplug, librsvg, libvpx, libyang, + linux-pam, linux-tools, mbedtls, mosquitto, mutt, neon, + netsnmp, nmap, nodejs, olsr, openblas, opkg-utils, php, pound, + powertop, python-mako, python3, rauc, rockchip-mali, samba4, + sslh, stress-ng, suricata, syslog-ng, systemd, tar, unifdef, + urandom-scripts, usbguard, webkitgtk, wilc-driver, + wireless-regdb, wpewebkit + + Issues resolved (http://bugs.uclibc.org): + + #15628: Missing dependencies in BR2_PACKAGE_PYTHON_MAKO + #15808: connman is not supported on musl + #15814: C++ not supported by bootlin toolchain + +2023.08.1, released September 27th, 2023 + + Important / security related fixes. + + Updated/fixed packages: agentpp, asterisk, bind, binutils, + conmon, cpio, docker-cli, docker-engine, e2fsprogs, erlang, + esp-hosted, expect, fail2ban, fio, freerdp, fstrcmp, gcc, gdb, + ghostscript, go, haproxy, hwloc, icu, irssi, libcoap, libcurl, + libde265, libheif, libiec61850, libjxl, libopenssl, libpjsip, + libqb, libraw, libssh, libuv, lldpd, mdadm, mutt, ne10, + netatalk, nodejs, nut, openblas, opensc, openvpn, petitboot, + php, pound, pppd, python-pytest, python3, qt5, + rtl8812au-aircrack-ng, sngrep, stress-ng, strongswan, sysstat, + tar, tcl, timescaledb, util-linux, vim, webkitgtk, webp, + wireshark, xserver_xorg-server, xterm, zbar, zxing-cpp, + zynaddsubfx + + Issues resolved (http://bugs.uclibc.org): + + #14366: Nodejs fails with "version `GLIBC_2.34' not found".. + #15787: atmel_sama5d3_xplained_mmc_defconfig: Missing... + #15790: at91sam9x5ek_dev_defconfig: Missing... + +2023.08, released September 6th, 2023 + + Various fixes. + + Defconfigs: BeagleV: Fix build issue with binutils >= + 2.38. Hifive unleashed: U-Boot needs OpenSSL + + Updated/fixed packages: dt, grub2, heirloom-mailx, libgpgme, + libtommath, libxcrypt, log4cxx, mesa3d-demos, openjdk, + openjdk-bin, pam, pcm-tools, pixman, poppler, python-django, + python-ipython, python-pip, python-tornado, zeromq + + New packages: libdecor + +2023.08-rc3, released August 29th, 2023 + + Fixes all over the tree. + + Defconfigs: Avenger96: Bump ATF to 2.9 to fix build warnings + with binutils >= 2.39. CI20: Bump kernel to 5.4.254 to fix + build issue with GCC 12. Hifive unleashed: Add missing + pylibfdt dependency / bump kernel to 5.10.109 to fix build + issue GCC 12. PC x86-64 bios/elf: Add missing libelf + dependency. Sipeed maix sdcard: Fix build issues with + binutils >= 2.38 + + Updated/fixed packages: check, clamav, cups, esp-hosted, + f2fs-tools, freeswitch, gcc, gmp, libks, libmodsecurity, + mosquitto, mpg123, network-manager, php, postgresql, python3, + ramspeed, rtl8189fs, rust, rust-bin, samba4, screen, zlib-ng + +2023.08-rc2, released August 20th, 2023 + + Fixes all over the tree. + + Toolchains: Only show external toolchains based on a GCC + version supporting the selected architecture + variant. Correctly mark Codescape MIPS external toolchains as + not providing a gdbserver. + + Defconfigs: Andes ae350_45: Drop custom U-Boot march setting, + breaking builds with GCC 12. Nitrogen*: Bump + U-Boot/Linux. Nitrogen8*: Use ATF 2.8, fixing array bounds + errors. QEMU m68k: Add Linux patch to fix build issue with + binutils >= 2.41. Raspberrypi*: Enable console on HDMI when + using systemd as well. + + Updated/fixed packages: at91dataflashboot, aubio, berkeleydb, + bwm-ng, ccache, check, chocolate-doom, compiler-rt, composer, + conmon, connman, dav1d, diffutils, dracut, e2fsprogs, elf2flt, + esp-hosted, flite, gcc, gdb, go-bootstrap-stage2, + intel-microcode, kodi-imagedecoder-heif, less, libcoap, + libedit, libglib2, libksba, liblo, libserial, log4cxx, lsof, + luvi, meson, mosquitto, mpd, mpv, mv-ddr-marvell, nftables, + ntpsec, openssh, optee-test, perftest, python-botocore, + python-docker, python-pylibfdt, python3, screenfetch, + sentry-cli, sngrep, stellarium, trinity, tvheadend, uboot, + uclibc, util-linux, xfsprogs, yajl + + New packages: nftables-python, xlib_libXpresent + + Removed packages: lpc32xxcdl + +2023.08-rc1, released August 5, 2023 + + Numerous package updates and fixes, additional runtime tests. + + Toolchain: + - Toolchains from ARM (for ARM, AArch64 and AArch64 BE) + updated to 12.2. + - Support for binutils 2.40 and 2.41 added, binutils 2.37 and + 2.38 removed, binutils 2.40 is now the default + - Support for gcc 13 added, gcc 10 removed, gcc 12 is now the + default + + Architectures: + - Additional x86-64 variants added + - RISC-V vector extension support added + + Infrastructure: + - Go now built in 3 stages to be able to update to Go 1.20.x. + + New defconfigs: rock5b + + Removed defconfigs: qemu_sparc_ss10 + + New packages: composer, conmon, dfu-programmer, esp-hosted, + kodi-imagedecoder-heif, kodi-imagedecoder-raw, libde2654, + libdisplay-info, libheif, llvm-cmake, llvm-libunwind, + lua-dkjson, mbpoll, mdnsd, mhz, opencsd, python-libconf, + python-blinker, python-midiutil, python-rdps-py, python-wheel, + qt6svg, redis-plus-plus, rockchip-rkbin, rtl8822cs, swaybg, + swugenerator + + Removed packages: libasplib, ocf-linux, tovid + +2023.05.3, released September 26th, 2023 + + Important / security related fixes. + + Defconfigs: PC x86-64 bios/efi: Needs libelf. Raspberrypi: + Also enable HDMI console when systemd is used. + + Updated/fixed packages: agentpp, asterisk, at91dataflashboot, + aubio, berkeleydb, bind, bwm-ng, chocolate-doom, clamav, + compiler-rt, connman, cpio, cups, dav1d, diffutils, dracut, + dt, expect, fail2ban, fio, flite, freerdp, freeswitch, + fstrcmp, gcc, gdb, ghostscript, gmp, go, grub2, haproxy, + heirloom-mailx, hwloc, icu, intel-microcode, irssi, less, + libcoap, libcurl, libglib2, libiec61850, libjxl, libks, + libksba, libmodsecurity, libpjsip, libqb, libraw, libssh, + libtommath, lldpd, log4cxx, lsof, mdadm, mosquitto, mpd, mpv, + mutt, mv-ddr-marvell, ne10, netatalk, network-manager, + nftables, nodejs, ntpsec, nut, openblas, openjdk, openjdk-bin, + opensc, openssh, pcm-tools, perftest, petitboot, php, pixman, + poppler, postgresql, python-django, python-ipython, + python-pip, python-pylibfdt, python-tornado, python3, qt5, + ramspeed, rtl8189fs, rtl8812au-aircrack-ng, samba4, screen, + screenfetch, sngrep, sofia-sip, stellarium, stress-ng, + strongswan, sysstat, tar, tcl, uboot, uclibc, vim, webkitgtk, + webp, wireshark, xfsprogs, xserver_xorg-server, xterm, yajl, + zbar, zxing-cpp + + New packages: xlib_libXpresent + +2023.05.2, released August 31th, 2023 + + Important / security related fixes. + + Toolchains: Correctly mark Bootlin external toolchains as + having OpenMP support. + + Arch: Mark Alderlake x86 variants as no AVX512 support. + + Utils: Ensure utils/docker-run correctly supports git + worktrees. + + Defconfigs: Beaglebone: U-Boot needs OpenSSL. Beaglebone qt5: + Enable support for green wireless variant. + + Updated/fixed packages: arm-trusted-firmware, bind, cairo, + cmocka, containerd, crudini, cryptodev-linux, dmidecode, + ffmpeg, firmware-imx, gcc, gdb, ghostscript, gkrellm, + gnuradio, go, igh-ethercat, iperf3, kodi, libcurl, libopenssl, + libssh, libubootenv, libuhttpd, linux-tools, mali-driver, + nfs-utils, ntp, openssh, php, pipewire, python-pysmb, + python-iniparse, python-iptables, rtl8189es, rtl8189fs, + sam-ba, samba4, seatd, shadow, speex, + sunxi-mali-utgard-driver, supertuxkart, sysdig, systemd, tor, + tpm2-tss, transmission, uboot, unzip, webkitgtk, + wireless-regdb, wolfssl, wpebackend-fdo, wpewebkit, xenomai, + yaml-cpp, yavta + + Issues resolved (http://bugs.uclibc.org): + + #15634: fluidsynths refers to missing libgomp.so.1 + +2023.05.1, released July 17th, 2023 + + Important / security related fixes. + + Defconfigs: Chiliboard, mx53loco: fix build on hosts without + openssl development headers. + Nitrogen*: fix build on hosts without openssl or pylibfdt. + Hifive unleased: Bump OpenSBI to 1.2 to fix a build issue. + Raspberrypi: Handle DTB overlays for all variants + + Updated/fixed packages: agentpp, alsa-plugins, assimp, audit, + bind, busybox, c-ares, check, cups, dav1d, dbus, fftw, + fluidsynth, freetype, fwts, ghostscript, gnupg2, gnuradio, + graphicsmagick, gupnp, haproxy, heimdal, hwdata, jhead, kodi, + libcap, libgcrypt, libgpg-error, libgtk3, libmdbx, libxslt, + mesa3d, mesa3d-demos, mpir, nodejs, php, pkgconf, + python-cryptography, python-dbus-fast, python-django, + python-docker, python-pyicu, python-requests, python3, qemu, + qt6, quickjs, rtl8192eu, samba4, sconeserver, syslog-ng, + taglib, tiff, wine, wireshark, xdriver_xf86-video-dummy, + xlib_libX11, + + Issues resolved (http://bugs.uclibc.org): + + #15643: ERROR: No hash found for linux-6.3.8.tar.xz + #15658: hifive_unleashed_defconfig: Linker errors in opensbi-0.9 + #15661: mx53loco_defconfig: Dependency on OpenSSL missing + #15664: Can't compile mesa3d with v3d driver + #15673: PKGCONF_SITE in pkgconf.mk points to parked domain + #15682: pkgconf: no longer able to download source from... + +2023.05, released June 7th, 2023 + + Fixes all over the tree. + + Infrastructure: Add BR2_HOST_CMAKE_AT_LEAST_* for packages + needing a newer host-cmake than what is currently enforced + (3.18) - Up to the version provided by the cmake package (3.22). + + Defconfigs: QEMU s390x: Bump rootfs size to 120MB to make room + for kernel modules. + + Updated/fixed packages: at-spi2-core, go, libdeflate, libjxl, + perl-http-message, php, redis + +2023.05-rc3, released June 4th, 2023 + + Fixes all over the tree. + + Updated/fixed packages: bird, containerd, earlyoom, gcc, + ipython, kexec, kodi-skin-confluence, libcurl, libopenssl, + mesa3d, minidlna, mpd, openjdk, openjdk-bin, + python-matplotlib, sdl2_net, vdr + + New packages: python-asttokens, python-executing, + python-pure-eval, python-stack-data + +2023.05-rc2, released May 28th, 2023 + + Fixes all over the tree. + + Updated/fixed packages: busybox, clamav, crudini, + kodi-pvr-vbox, libcurl, libmnl, libpqxx, libressl, libssh, + llvm, lua, mesa3d, perl-http-message, python-can, + python-django, sdl2_mixer, webkitgtk, zfs, znc + + New packages: perl-clone + + Issues resolved (http://bugs.uclibc.org): + + #15421: qemu_aarch64_ebbr_defconfig: Missing Linux kernel source.. + #15581: qemu_ppc_mpc8544ds_defconfig: Fails due to non-working patch + +2023.05-rc1, released May 15th, 2023 + + Fixes all over the tree and new features. + + Toolchain: + - glibc update to 2.37, uClibc-ng updated to 1.0.43 + - suppoert 6.2.x / 6.3.x kernel headers + + Infrastucture: + - go: Ensure go versions of os/user and net are used for + static builds so CGO is not used + + - rust / cargo: Correctly split up rust flags for host and + target builds + + New defconfigs: STM32F769 discovery + + New packages: petitboot, python-evdev, python-hwdata, + python-pyproject-hooks, shadow + + Removed packages: atk, at-spi2-atk, optee-benchmark, + python-pep517 + + Issues resolved (http://bugs.uclibc.org): + + #14356: cronstamp jobs are not performed with bumped version of... + #15191: pc_x86_64_efi_defconfig doesn't run on real hardware + #15306: glibc build fails in Docker container + #15321: docker-engine now requires libseccomp by default + #15376: Libiconv config + #15461: QtVirtualKeyboard segfaults + +2023.02.11, released March 26th, 2024 + + Important / security related fixes. + + Defconfigs: Starfive visionfive2: Use correct genimage + configuration. + + Updated/fixed packages: bind, bitcoin, botan, c-ares, clamav, + cvs, dash, dnsmasq, ell, exim, expat, freetype, ghostscript, + gnupg2, google-breakpad, gst1-python, gst1-vaapi, iwd, + libcoap, libcurl, libgit2, libkrb5, libmodsecurity, libunwind, + libuv, libxml2, lua-http, luvi, nginx-naxsi, nodejs, openssh, + openvmtools, parted, php, poco, postgresql, privoxy, + pure-ftpd, putty, python-cheroot, python-configshell-fb, + python-django, python-rtslib-fb, python3, rsync, sdl2, shim, + spice, squid, strace, strongswan, sudo, systemd, targetcli-fb, + unbound, uvw, v4l2loopback, vim, webkitgtk, wpewebkit, xvisor, + zlib-ng + + Issues resolved (http://bugs.uclibc.org): + + #15997: Build Squid with GCC12.3 in Buildroot 2024.02 will fail + +2023.02.10, released March 1st, 2024 + + Important / security related fixes. + + Added CPE identifiers for a large number of packages. + + Updated/fixed packages: bayer2rgb-neon, brltty, c-ares, + containerd, crda, darkhttpd, davinci-bootcount, dbus, + domoticz, environment-setup, expat, faad2, falcosecurity-libs, + flex, freeradius-server, freerdp, frr, gesftpserver, glibc, + gnutls, go, gst1-devtools, gst1-libav, gst1-python, + gst1-vaapi, gst-omx, gstreamer1, haproxy, joe, json-c, + leptonica, libcurl, libuwsc, libvips, linux-firmware, + linux-headers, localedef, lua-http, lvm2, lynx, mbedtls, + micropython, minizip, mpfr, netatalk, ngrep, opencv4, + opencv4-contrib, openssh, opus, php, python-aiohttp, + python-esptool, python-gunicorn, python-hpack, + python-html5lib, python-lmdb, python-mako, python-numpy, + python-oauthlib, python-sqlparse, qt5base, qt6base, redis, + runc, sdl2, sqlite, sysstat, uuu, webkitgtk, wireless-regdb, + wpewebkit, xlib_libXpm, xterm, xwayland, yasm + + Issues resolved (http://bugs.uclibc.org): + + #10096: SH4 toolchain does not build Linux kernel magicpa.. + #15952: Grub fails to load large rootfs files + +2023.02.9, released January 15th, 2024 + + Important / security related fixes. + + Infrastructure: + + - Download: Revert a permission fixup step in the tarball + creation logic, which lead to a hash mismatch issue in two + cargo-vendored packages, ripgrep and sentry-cli. + + - Build: Pass GIT_DIR=. in the environment (through + HOST_MAKE_ENV/TARGET_MAKE_ENV) to the build steps to + workaround packages trying to detect if they are building in + a git checkout and getting confused when building in a sub + directory of a Buildroot git checkout. + + Updated/fixed packages: apcupsd, arm-trusted-firmware, botan, + cjson, cups, dropbear, duktape, edk2, exim, faad2, freeswitch, + gcc, gdal, gdb, giflib, glibc, go, google-breakpad, gst-omx, + gstd, 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, ipcalc, jq, json-for-modern-cpp, + ksmbd-tools, libaio, libcamera, libcap-ng, libcurl, libebml, + libgtk3, libiec61850, libraw, libsigsegv, libssh, libssh2, + libuev, libwebsockets, liquid-dsp, lvm2, madplay, mesa3d, + micropython, mp4v2, opensc, openssh, orc, php, pipewire, + postgis, postgresql, proftpd, putty, python-sip, + python-werkzeug, rng-tools, shim, squid, strongswan, sway, + tinyssh, tor, tree, uftp, valijson, wireshark, wolfssl, + xserver_xorg-server, xwayland + +2023.02.8, released December 4th, 2023 + + Important / security related fixes. + + Defconfigs: Raspberrypi: Fix DT overlay for autoproving of + bluetooth driver, Toradex apalis i.mx6: Add download hashes + for Linux and U-Boot. + + Updated/fixed packages: exfatprogs, gcc, imagemagick, + intel-microcode, libpjsip, libxml2, mariadb, memcached, + motion, netsnmp, perl, postgresql, rtty, samba4, speech, + squid, vim, vlc, xenomai, xtables-addons, zfs + + Issues resolved (http://bugs.uclibc.org): + + #15856: Using BR2_CONFIG= on a different file-system... + +2023.02.7, released November 14th, 2023 + + Important / security related fixes. + + Per-package builds: Unbreak SDK relocation logic. Only drop + the hard links for the final host / target directory, fixing a + build time / size regression in 2023.02.6. + + Packages where a free-form version/site can be specified + (E.G. Linux, U-Boot, ..) can now have the corresponding + tarballs of these custom downloads checked by the download + infrastructure based on .hash files in the global patch + directory. These hashes are optional unless + BR2_DOWNLOAD_FORCE_CHECK_HASHES is enabled. + + A utils/add-custom-hashes helper script has been added to + assist in managing such hash files. + + Defconfigs: stm32mp157a-dk1, stm32mp157c-dk2: Unbreak TF-A + build, stm32mp157c-odessey: Use a fixed TF-A version for + reproducibility + + Updated/fixed packages: apache, arm-trusted-firmware, aufs, + aufs-util, azure-iot-sdk, cjson, cups-filters, clamav, dhcpcd, + freeradius-server, go, htop, ksmbd-tools, kvmtool, libgdiplus, + libopenssl, libosmium, libtommath, libupnp, libzlib, lxc, + mender, minizip-zlib, mpd, mxsldr, nano, nettle, + network-manager, nghttp2, nodejs, opencv4, opencv4-contrib, + openjdk-bin, openvpn, opusfile, paho-mqtt-c, + perl-lwp-protocol-https, php, python-django, python-urllib3, + python-web2py, rabbitmq-c, redis, riscv64-elf-toolchain, + suricata, tar, tiff, tor, traceroute, vim, websocketpp, + wireshark, wolfssl, xdg-dbus-proxy, xen, xlib_libX11, + xlib_libXpm, zabbix, zchunk + + Issues resolved (http://bugs.uclibc.org): + + #14741: e2fsck is failing during cronjob build where fail... + #15772: lz4 failed to compile with gcc 10.4.0 + #15787: atmel_sama5d3_xplained_mmc_defconfig: Missing... + #15790: at91sam9x5ek_dev_defconfig: Missing... + #15820: make linux-menuconfig does not modify correct .config.. + #15823: Installing nodejs modules with native extensions ... + #15835: Incompatibility between network-manager and libcurl 8.4 + +2023.02.6, released October 16th, 2023 + + Important / security related fixes. + + Per-package builds: Do not use hard links for host / target + dirs, fixing issues with package rebuilds or post-build + scripts modifications. + + Infrastructure: Explicitly disable shuffle mode for Make >= + 4.4 where needed. + + Urandom-scripts: Move seedrng init script to S01 for earlier + random number entrophy initialization. + + Go: Bump to 1.20.x as 1.19.x is now EOL and affected by + security issues. + + Updated/fixed packages: at91bootstrap, bind, cups, efl, + enlightenment, exim, gcc, glibc, gnu-efi, go, go-bootstrap, + gptfdisk, gst-omx, gst1-devtools, gst1-libav, + gst1-plugins-bad, gst1-plugins-base, gst1-plugins-good, + gst1-plugins-ugly, gst1-python, gst1-rstp-server, + gst1-rtsp-vaapi, gstreamer1, gstreamer1-editing-services, + libcue, libcurl, libfastjson, libhtp, libmodplug, librsvg, + libvpx, libyang, linux-tools, mbedtls, mosquitto, mutt, neon, + netsnmp, nmap, nodejs, olsr, openblas, opkg-utils, php, + powertop, python-mako, python3, rockchip-mali, samba4, sslh, + suricata, tar, unifdef, unrandom-scripts, webkitgtk, + wireless-regdb, wpewebkit + + Issues resolved (http://bugs.uclibc.org): + + #15628: Missing dependencies in BR2_PACKAGE_PYTHON_MAKO + #15808: connman is not supported on musl + #15814: C++ not supported by bootlin toolchain + +2023.02.5, released September 27th, 2023 + + Important / security related fixes. + + Updated/fixed packages: agentpp, asterisk, at91dataflashboot, + aubio, berkeleydb, bind, bwm-ng, chocolate-doom, clamav, + compiler-rt, connman, cups, dav1d, diffutils, dracut, dt, + expect, fail2ban, fio, flite, freerdp, freeswitch, fstrcmp, + gcc, gdb, ghostscript, gmp, go, grub2, haproxy, + heirloom-mailx, hwloc, icu, intel-microcode, irssi, libcoap, + libcurl, libiec61850, libjxl, libks, libksba, libmodsecurity, + libpjsip, libqb, libraw, libssh, libtommath, less, lldpd, + log4cxx, lsof, mdadm, mosquitto, mpd, mutt, mv-ddr-marvell, + ne10, netatalk, network-manager, nftables, nodejs, ntpsec, + nut, openblas, openjdk, openjdk-bin, opensc, openssh, + pcm-tools, perftest, php, pixman, poppler, postgresql, pppd, + python-django, python-ipython, python-pip, python-pylibfdt, + python-tornado, python3, qt5, ramspeed, rtl8189fs, samba4, + screen, screenfetch, sngrep, sofia-sip, stellarium, + strongswan, sysstat, tar, tcl, uboot, uclibc, vim, webkitgtk, + webp, wireshark, xfsprogs, xserver_xorg-server, xterm, yajl, + zbar, zxing-cpp + + Issues resolved (http://bugs.uclibc.org): + + #14366: Nodejs fails with "version `GLIBC_2.34' not found".. + #15754: The docker-engine and docker-cli versions are not... + #15787: atmel_sama5d3_xplained_mmc_defconfig: Missing... + #15790: at91sam9x5ek_dev_defconfig: Missing... + +2023.02.4, released August 31th, 2023 + + Important / security related fixes. + + Toolchains: Correctly mark Bootlin external toolchains as + having OpenMP support. + + Arch: Mark Alderlake x86 variants as having no AVX512 support. + + Utils: Ensure utils/docker-run correctly supports git + worktrees. + + Defconfigs: Beaglebone qt5: Enable support for green wireless + variant. + + Updated/fixed packages: arm-trusted-firmware, bind, cairo, + cmocka, containerd, crudini, dmidecode, ffmpeg, freescale-imx, + gcc, gdb, ghostscript, gkrellm, gnuradio, go, heimdall, + iperf3, libcurl, libmodsecurity, libopenssl, libssh, + libubootenv, libuhttpd, linux-tools, ntp, openssh, php, + pipewire, python-iniparse, python-iptables, python-pysmb, + rtl8189fs, sam-ba, samba4, seatd, speex, supertuxkart, sysdig, + tor, tpm2-tss, uboot, unzip, webkitgtk, wireless-regdb, + wolfssl, wpebackend-fdo wpewebkit, xenomai, yaml-cpp, yavta + + Issues resolved (http://bugs.uclibc.org): + + #15634: fluidsynths refers to missing libgomp.so.1 + +2023.02.3, released July 17th, 2023 + + Important / security related fixes. + + Defconfigs: Chiliboard: fix build on hosts without openssl + development headers. + Nitrogen*: fix build on hosts without openssl or pylibfdt. + Raspberrypi: Handle DTB overlays for all variants + + Updated/fixed packages: agentpp, alsa-plugins, assimp, bind, + busybox, dbus, c-ares, check, dav1d, fluidsynth, fftw, fwts, + ghostscript, gnupg2, gnuradio, gupnp, haproxy, heimdal, + hwdata, jhead, libcap, libgcrypt, libgpg-error, libgtk3, + libxslt, mesa3d-demos, mpir, nodejs, php, pkgconf, + python-cryptography, python-dbus-fast, python-django, + python-pyicu, python-requests, python3, qt6, quickjs, + sconeserver, taglib, tiff, wireshark, xdriver_xf86-video-dummy + + Issues resolved (http://bugs.uclibc.org): + + #15643: ERROR: No hash found for linux-6.3.8.tar.xz + #15673: PKGCONF_SITE in pkgconf.mk points to parked domain + #15682: pkgconf: no longer able to download source from... + +2023.02.2, released June 16th, 2023 + + Important / security related fixes. + + Infrastructure: Add BR2_HOST_CMAKE_AT_LEAST_* for packages + needing a newer host-cmake than what is currently enforced + (3.18) - Up to the version provided by the cmake package (3.22). + + utils/docker-run: Now correctly handles git + workdirs/worktrees. + + Defconfigs: QEMU s390x: Bump rootfs size to make room for + kernel modules, Stm32f4xx: Tweak config to save RAM, Xilinx + Versal vck190: Use correct (A72) CPU variant + + Updated/fixed packages: atkmm, bird, busybox, cairomm1_14, + cmake, containerd, crudini, cups, delve, docker-cli, + docker-engine, earlyoom, edid-decode, fluent-bit, freeswitch, + gcc, gdb, glibmm_2_66, gnupg2, go, gptfdisk, graphicsmagick, + intel-microcode, libass, libcurl, libdeflate, libgeos, + libgtk3, libjxl, libnftl, libopenssl, libressl, libssh, llvm, + lua, mesa3d, micropython, minidlna, moby-buildkit, mpd, mupdf, + ncurses, nftables, openjdk, openjdk-bin, php, postgresql, + python-can, python-django, python-django, python-ipython, + python-matplotlib, python-mupdf, python-requests, python3, + qemu, redis, rpm, runc, sdl2_mixer, tzdata, uclibc, vdr, + wilc-firmware, xapp_xcalc, xapp_xdpyinfo, xapp_xinput, + xapp_xwininfo, xdata_xbitmaps, xdata_xcursor-themes, + xdriver_xf86-input-mouse, xdriver_xf86-video-ark, + xdriver_xf86-video-geode, xdriver_xf86-video-neomagic, + xfont_encodings, xlib_libX11, xlib_libXaw, xlib_libXi, + xlib_libXfixes, xlib_libXft, xlib_libXpm, zfs, znc + + New packages: perl-clone, perl-http-message, python-asttokens, + python-executing, python-pure-eval, python-stack-data + + Issues resolved (http://bugs.uclibc.org): + + #15421: qemu_aarch64_ebbr_defconfig: Missing Linux kernel source code + +2023.02.1, released May 9th, 2023 + + Important / security related fixes. + + Infrastucture: + - go: Ensure go versions of os/user and net are used for + static builds so CGO is not used + + - rust / cargo: Correctly split up rust flags for host and + target builds + + Defconfigs: Olimex a20 olinuxino lime*: Bring up network at + boot, stmf469 disco sd: Lock U-Boot version + + Updated/fixed packages: agentpp, apache, bluez5_utils, + ca-certificates, containerd, coremark, dcron, dnsmasq, + docker-cli, docker-engine, efivar, eudev, ffmpeg, flann, + fluidsynth, git, 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, intel-microcode, + kexec, libcurl, libite, libgtk3, libmicrohttpd, libxml2, + linux-tools, lua, mali-driver, matio, mdadm, nginx, openocd, + openssh, php, poppler, postgresql, python-web2py, qt6base, + readline, rtl8189fs, rtl8723ds, rtl8812au-aircrack-ng, runc, + rust, rust-bin, s390-tools, samba4, sdl2, snmppp, sudo, + systemd, tcpdump, uclibc, vim, webkitgtk, wireshark, + wpewebkit, xr819-radio, xserver_xorg-server, zeek + + Issues resolved (http://bugs.uclibc.org): + + #14356: cronstamp jobs are not performed with bumped version of... + #15306: glibc build fails in Docker container + #15376: Libiconv config + #15461: QtVirtualKeyboard segfaults + +2023.02, released March 12th, 2023 + + Fixes all over the tree. + + Updated/fixed packages: ace, apache, audit, bridge-utils, + docker-engine, go, gtkmm3, janet, libbpf, libev, libgcrypt, + libgpg-error, libmad, linux, mesa3d, network-manager, nut, + pcre2, php, rdma-core, rsync, rtl8821cu, rtl_433, + s6-linux-utils, speechd, uqmi, xdriver_xf86-video-qxl, znc + + New packages: atkmm2_28, cairomm1_14, glibmm2_66, libsigc2, + pangomm2_46, python-glslang + + Issues resolved (http://bugs.uclibc.org): + + #15306: glibc build fails in Docker container + #15321: docker-engine now requires libseccomp by default + +2023.02-rc3, released March 8th, 2023 + + Fixes all over the tree. + + Updated/fixed packages: apr, bash, docker-engine, exfat, + exfat-utils, f2fs-tools, gensio, gr-osmosdr, libcurl, libglfw, + libolm, libpcap, libpjsip, linux, mender, mpv, + multipath-tools, opus, paho-mqtt-c, proftpd, pugixml, + pulseaudio, qemu, quazip, quickjs, rtl8189es, rtl8821cu, + uacme, uqmi, wpebackend-fdo, + +2023.02-rc2, released February 27th, 2023 + + Fixes all over the tree. + + Updated/fixed packages: asterisk, at91dataflashboot, bind, + efivar, erlang, flac, fluent-bit, freerdp, gcc, gdal, gerbera, + gnuradio, gqrx, haproxy, hawktracer, imx-gpu-g2d, + intel-gmmlib, libarchive, libblockdev, libcamera-apps, libjxl, + libmodsecurity, libsigrokdecode, lightning, lirc-tools, + lttng-babeltrace, modem-manager, modsecurity2, + multipath-tools, mutt, mxs-bootlets, netsurf, network-manager, + nginx-naxsi, ntpsec, opensbi, optee-client, pcm-tools, + php-xdebug, pistache, postgresql, proxychains-ng, + python-m2crypto, python-numpy, python-webargs, + python-werkzeug, rtl8723bu, rtty, speechd, sudo, systemd, + tiff, tmux, wilc-driver, wpa_supplicant, xerces, + xtables-addons, xwayland, zabbix + + Removed packages: uccp420wlan + +2023.02-rc1, released February 20th, 2023 + + Numerous package updates and many (62) new packages. + + Toolchain: + + - The check for access to "unsafe" (E.G. from the build host) + header files and libraries by the cross compiler is now + unconditionally enabled. + + - Bootlin external toolchains updated to 2022.08 + + - The handling of the CCACHE_* environment variables by the + toolchain wrapper is now more strict, causing the variables + to only be exported when BR2_CCACHE is enabled. + + Infrastructure: + + - Br2-external: Fix make performance issue when many (> 6) + external trees are used together. + + - Legal-info: Stop warning about not saving sources for local + / override packages if _REDISTRIBUTE is set to NO. + + - Go: Ensure our go build and module cache is used, even for the + download step. + + - Cargo: CARGO_HOME (the location where cargo stores it + downloaded artifacts) is now located under DL_DIR rather + than in HOST_DIR/share/cargo, ensuring it is shared between + builds. + + Misc: + + - Erofs: Use fixed timestamp and UUID when BR2_REPRODUCIBLE is + used. + + - Ext2: Year 2038+ compatible inodes are now used by default, + independently of the filesystem size. + + - Linux: Fix build of < 5.6 kernels with host-gcc >= 10. + + A large number of NXP related packages and defconfigs have + been updated as upstream moved the git repositories to Github. + + New defconfigs: i.MX8mn BSH SMM S2 / pro, QEMU ARM EBBR, + Sipeed Lichee rv / rv dock, Starfive Visionfive2, Xilinx Versal + VCK190. + + New packages: catch2, cli11, dotconf, edk2-non-osi, + fluent-bit, fxdiv, hddtemp, highway, imx-vpu-hantro-daemon, + libjxl, libsolv, libunibreak, neon-2-sse, open-iscsi, + opencv4-contrib, perftest, perl-image-exiftool, + python-apispec, python-async-generator, python-cppy, + python-dbus-fast, python-dicttoxml2, python-flask-smorest, + python-h11, python-hkdf, python-magic-wormhole, + python-magic-wormhole-mailbox-server, + python-magic-wormhole-transit-relay, python-marshmallow, + python-munch, python-outcome, python-pycrate, python-pyspnego, + python-reedsolo, python-selenium, python-smbprotocol, + python-sniffio, python-spake2, python-trio, + python-trio-websocket, python-uhid, python-webargs, + python-wsproto, qt5speech, qt6serialbus, rdma-core, reproc, + rtl8723ds-bt, rtl8821cu, sexpect, speechd, sscep, stb, sway, + termcolor, ti-k3-r5-loader, tl-expected, unifdef, + versal-firmware, xwayland, z3 + + Removed packages: docker-proxy, elixir, gummiboot, + python-bunch, python-m2r, sun20i-d1-spl, ucl, + xdriver_xf86-input-keyboard, xdriver_xf86-video-glint, + xdriver_xf86-video-imx-viv, xdriver_xf86-video-tga + + Issues resolved (http://bugs.uclibc.org): + + #14971: Kernel 3.10.108 fail to build in Buildroot 2022.08-rc1 + #14996: Too many directories in BR2_EXTERNAL causes hang during make + #15161: kernel can't support SUBDIR + #15196: Setting BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE does not work + #15226: lsblk: not found + #15271: no start-qemu.sh + #15281: Error compiling GDAL library for RPi-64 if libgdal-dev install.. + #15291: BR2_PACKAGE_GNU_EFI_ARCH_SUPPORTS without location + #15301: Selecting NAND Flash boot media (NAND_BOOT) breaks the uboot.. + #15331: Warning on python-flit-core license when generating legal info + +2022.11.3, released March 18th, 2023 + + Important / security related fixes. + + Updated/fixed packages: ace, apache, apr, apr-util, asterisk, + at91dataflashboot, audit, bash, bind, bridge-utils, clamav, + dmalloc, efivar, erlang, exfat, exfat-utils, f2fs-tools, gcc, + gdal, gensio, gerbera, git, glslsandbox-player, go, haproxy, + hawktracer, intel-gmmlib, ipmiutil, less, libblockdev, + libcurl, libev, libgcrypt, libglfw, libmad, libmdbx, + libmodsecurity, libolm, libpjsip, lirc-tools, + lttng-babeltrace, mender, mpv, mutt, mxs-bootlets, netsurf, + ntpsec, nut, opensbi, opus, paho-mqtt-c, pcm-tools, php, + pistache, proftpd, proxychains-ng, pulseaudio, + python-cryptography, python-django, python-m2crypto, + python-numpy, python-werkzeug, qemu, quazip, quickjs, + rockchip-mali, rsync, s6-linux-utils, sudo, tiff, uacme, uqmi, + webkitgtk, wilc-driver, wpa_supplicant, wpewebkit, + xdriver_xf86-video-qxl, znc + + Issues resolved (http://bugs.uclibc.org): + + #15306: glibc build fails in Docker container + #15361: Buildroot linking error on Apple Silicon + +2022.11.2, released March 1st, 2023 + + Important / security related fixes. + + Fix make O=..._defconfig builds (regression in 2022.11.1). + + A number of additional/stricter checks have been added to + ./utils/check-package. + + Build host dependencies check extended to check for a number + of specific perl modules to better handle distributions (like + Fedora) with very fine grained perl packages. Also ensure + build host has git >= 2.0.0 when using packages written in + go/rust because the vendoring may need it. + + Defconfigs: ASUS tinker rk3288: Fix boot issue related to TPL + + Updated/fixed packages: afboot-stm32, apache, barebox, c-ares, + elf2flt, freeswitch, fwts, gcc, gdal, git, gitlab-runner, + ipmitool, kodi, libgit2, libks, libopenssl, libressl, live555, + lua, lxc, mariadb, mesa3d-headers, modsecurity2, mongoose, + netopeer2, nodejs, openjdk, openpowerlink, openvpn, opusfile, + postgresql, proftpd, pugixml, python-future, python-idna, qt5, + rtl8192eu, rtl8723ds, sdl2, sofia-sip, ssdp-responder, sudo, + sunxi-mali-utgard, thermald, ti-sgx-km, tmux, uboot, upx, vim, + webkitgtk, wolfssl, wpewebkit, xlib_libXpm, + xserver_xorg-server, xxhash, xz, yajl, zabbix + + Issues resolved (http://bugs.uclibc.org): + + #15271: no start-qemu.sh + #15281: Error compiling GDAL library for RPi-64 if libgdal-dev install.. + #15291: BR2_PACKAGE_GNU_EFI_ARCH_SUPPORTS without location + #15301: Selecting NAND Flash boot media (NAND_BOOT) breaks the uboot.. + #15331: Warning on python-flit-core license when generating legal info + +2022.11.1, released January 18th, 2023 + + Important / security related fixes. + + Br2-external: Fix make performance issue when many (> 6) + external trees are used together. + + Erofs: Use fixed timestamp and UUID when BR2_REPRODUCIBLE is + used. + + Go: Ensure our go build and module cache is used, even for the + download step. + + Legal-info: Stop warning about not saving sources for local / + override packages if _REDISTRIBUTE is set to NO. + + Linux: Fix build of < 5.6 kernels with host-gcc >= 10. + + A large number of NXP related packages and defconfigs have + been updated as upstream moved the git repositories to Github. + + Defconfigs: zcu106, kria kv260: Fix U-Boot build + + Updated/fixed packages: asterisk, bearssl, botan, cairo, + capnproto, check, checkpolicy, connman, containerd, crun, + dbus-cxx, docker-cli, docker-engine, exempi, exfat, + exfat-utils, falcosecurity-libs, fluidsynth, fmc, fmlib, + freeradius-server, gcc, glib-networking, go, + gobject-introspection, gperf, i2pd, ima-evm-utils, + imx-alsa-plugins, imx-kobs, imx-lib, imx-m4fwloader, + imx-mkimage, intel-microcode, janus-gateway, libcurl, + libdeflate, libftdi1, libkcapi, libksba, libmbim, libmng, + libpjsip, libtalloc, libuwsc, libxkbcommon, lpeg, lrzsz, + lttng-tools, lua-cqueues, mali-driver, mbedtls, mfgtools, + moby-buildkit, mutt, opensc, php, policycoreutils, polkit, + postgresql, pptp-linux, qcom-db410c-firmware, qemu, qoriq-rcw, + qt5virtualkeyboard, redis, rhash, rtl8189es, rtl8192eu, + rtl_433, ruby, sqlite, swupdate, tealdeer, tekui, tiff, + tinyxml, tor, webkitgtk, wireshark, wpasupplicant, wpewebkit, + xr819-xradio, xdriver_xf86-video-imx-viv, xserver_xorg-server, + xxhash, zip + + Issues resolved (http://bugs.uclibc.org): + + #14971: Kernel 3.10.108 fail to build in Buildroot 2022.08-rc1 + #14996: Too many directories in BR2_EXTERNAL causes hang during make + #15161: kernel can't support SUBDIR + #15196: Setting BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE does not work + #15226: lsblk: not found + +2022.11, released December 5th, 2022 + + Fixes all over the tree. + + Defconfigs: Nitrogen8*: Bump rootfs size, Zynqmp + kv260/zcu102/zcu106: Update to Xilinx 2022.2, + + Updated/fixed packages: dash, dovecot, elf2flt, exim, gcc, + gdb, git, kodi, libarchive, libmdbx, linuxptp, lxc, + matchbox-keyboard, memcached, netsnmp, optee-client, + python-scipy, python3, qt6base, qt6serialport, rtl8188eu, + rtl8723bu, rtl8723ds, rtl8821au, vim, vlc, wilc-driver + + Removed packages: rabbitmq-server + + Issues resolved (http://bugs.uclibc.org): + + #15131: Target GDB uses internal zlib + #15151: Busybox /etc/init.d scripts are not executable + +2022.11-rc3, released November 24th, 2022 + + Fixes all over the tree. + + Updated/fixed packages: asterisk, edk2, edk2-platforms, + freerdp, gitlab-runner, gnupg2, gptfdisk, heimdal, + igh-ethercat, iwd, libkrb5, libksba, libnss, libopenssl, + mesa3d, nginx, nodejs, openpgm, python3, rsync, rtl8189es, + rtl8723ds, samba4, sdl, sdl2, swupdate, sysstat, systemd, + uboot, xen, xterm + + Issues resolved (http://bugs.uclibc.org): + + #15141: kernel 5.16.2 (realtime patch 19) fails to build + +2022.11-rc2, released November 16th, 2022 + + Fixes all over the tree. + + Removed defconfigs: Amarule a64 relic, ARM Juno, Bananapi M1 / + M1 plus / M2 plus / M64, FriendlyARM NanoPC T4 / A64 / M1 / M1 + plus / M4 / Neo2 / Neo4 / Neo plus2 / R1 / Orangepi PC2 / Plus + / Prime / rk3399 / Win, Rock PC rk3399 / PI4 / N10. + + Updated/fixed packages: alsa-utils, arm-trusted-firmware, + bdwgc, boost, botan, ca-certificates, crun, dbus-broker, + docopt-cpp, dracut, efivar, freeipmi, gawk, gensio, gptfdisk, + gsl, guile, imagemagick, ipmitool, libidn2, libkcapi, + libopenssl, libqb, libuhttpd, libvncserver, linux, + linux-tools, lxc, makedumpfile, matchbox-startup-monitor, + mdio-tools, multipath-tools, mupdf, ntfs-3g, numactl, + perl-net-ssleay, pixman, procps-ng, rpi-userland, rsync, + s6-linux-init, socat, strongswan, sudo, swupdate, systemd, + udisks, vlc, wavemon, wolfssl, zlib-ng + + Removed packages: libdcadec + + Issues resolved (http://bugs.uclibc.org): + + #15121: make nconfig failes with nvidia drivers and mesa3d selected + +2022.11-rc1, released November 3rd, 2022 + + Fixes all over the tree and new features. + + Architecture: + + - PowerPC: add Power9 CPU type + - ARM: support dropped for iWMMXt processors + + Toolchain: + + - binutils 2.39 added, binutils 2.38 is now the default + - gdb 12 added, gdb 11 is now the default + - support for 5.18, 5.19 and 6.0 kernel headers + - glibc updated to 2.36 + + Filesystem: + + - Ability to use dracut to create an initramfs that contains a + subset of the root filesystem contents. + + New packages: agent-proxy, catatonit, cni-plugins, crun, + docopt-cpp, dracut, forge, kmemd, libmanette, mdio-tools, + open-isns, python-editables, python-hatch-fancy-pypi-readme, + python-hatch-vcs, python-hatchling, python-libevdev, + python-minimalmodbus, python-pathspec, qt6-serialport, + rtl8192eu, signal-estimator, slirp4netns, tinycompress + + More than 400 packages have been updated to a newer version. + + New defconfigs: ls1028ardb, qemu_aarch64_ebbr, visionfive. + + Issues resolved: + + #11776: qt5webengine 5.12.2 build failed with arm toolchain + and linaro toolchain + #12131: qt5webengine builderror in the latest stable Buildroot + 2019.05.01 version + #13216: 2020.02.6 requires GNU find utils + #14601: Python build fails on 2022.02-rc2 + #14746: Lack of management after loading + #14796: 64 bit time and seccomp conflict (OpenSSH server crash) + #14921: wpewebkit build fails because of internal build order + #14936: nodejs does not build + #15006: toolchain Arm AArch64 toolchain 11.2-2022.02 + #15021: Buildroot not compiling with systemd and glibc. + #15026: package/udisks: install to staging + #15061: Node.js Package fails to build against musl i386 + #15071: RTL8723BS library is outdated + +2022.08.3, released December 10th, 2022 + + Important / security related fixes. + + Updated/fixed packages: asterisk, dash, dovecot, edk2, + edk2-platforms, elf2flt, exim, freerdp, gcc, gdb, git, gnupg2, + heimdal, iwd, kodi, libarchive, libkrb5, libksba, libmdbx, + libopenssl, matchbox-keyboard, memcached, netsnmp, nginx, + nodejs, openpgm, optee-client, python-scipy, python3, rsync, + rtl8723bu, samba4, sdl, sdl2, swupdate, sysstat, systemd, + uboot, vim, vlc, wilc-driver, xen, xterm + + Issues resolved (http://bugs.uclibc.org): + + 15131: Target GDB uses internal zlib + +2022.08.2, released November 16th, 2022 + + Important / security related fixes. + + Defconfig: Aspeed ast2600evb: Correct FPU config, Kontron bl + imx8mm: Bump U-Boot to fix build issue, Pine64: Change to + mainline ATF to fix build issue, Zynqmp zcu102 / zcu106 / kria + kv260: Fix pmufw reset issue + + Updated/fixed packages: arm-trusted-firmware, bind, botan, + ca-certificates, collectd, darkhttpd, dbus, dbus-broker, dhcp, + dnsmasq, docker-cli, docker-engine, exfatprogs, expat, + f2fs-tools, faad2, ffmpeg, freerdp, gitlab-runner, glibc, + gnutls, go, gpsd, gptfdisk, grub2, gsl, 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, hdparm, hostapd, imagemagick, + iwd, jack2, libbpf, libcurl, libidn2, libinput, libmdbx, + libopenssl, libosip2, libpng, libtasn1, libtorrent-rasterbar, + libuhttpd, libvncserver, libxml2, linux, linux-tools, lldpd, + lrzip, lz4, matchbox-startup-monitor, meson, msmtp, + multipath-tools, mupdf, musl, mv-ddr-marvell, mxml, nodejs, + ntfs-3g, numactl, openssh, openvmtools, oracle-mysql, + paho-mqtt-c, perl-net-ssleay, php, pixman, poppler, procps-ng, + python-django, python3, qdecoder, redis, rpi-userland, rsync, + rtl8189es, rtl8189fs, rtl8723bu, rtl8723ds, + rtl8812au-aircrack-ng, rtl8821au, rtl_433, samba4, shapelib, + socat, sqlite, squashfs, squid, strongswan, sudo, swupdate, + timescaledb, uclibc-ng-test, udisks, uftp, uhd, umtprd, + usbguard, vim, vlc, volk, wavemon, wilc-driver, + wireguard-linux-compat, wolfssl, wpa_supplicant, wpewebkit, + zlib-ng, zsh + + Issues resolved (http://bugs.uclibc.org): + + #14936: nodejs does not build + #15026: package/udisks: install to staging + #15061: Node.js Package fails to build against musl i386 + +2022.08.1, released October 2nd, 2022 + + Important / security related fixes. + + Updated/fixed packages: botan, busybox, docker-cli, + docker-engine, expat, git, haproxy, heirloom-mailx, icu, + imx-gpu-viv, libconfuse, libmdbx, libupnp, libxml2, + ltp-testsuite, m4, makedevs, mariadb, mesa3d, meson, + mosquitto, ncurses, openssh, pango, python3, qlibc, + qt5xmlpatterns, rtl8189es, rtl8723bu, rt8723ds, + rtl8812au-aircrack-ng, runc, sox, tinyproxy, uacme, unbound, + unzip, vim, xtables-addons + + Issues resolved (http://bugs.uclibc.org): + + #14796: 64 bit time and seccomp conflict (OpenSSH server crash) + #14921: wpewebkit build fails because of internal build order + +2022.08, released September 10th, 2022 + + Fixes all over the tree. + + Autotools: Drop --runstatedir=/run as it causes build issues + with older packages + + Defconfigs: rockpro64: Change to mainline ATF to fix build issue + + Updated/fixed packages: dhcpd, fwup, gcc, gdb, go, linux-tools, + minidlna, mosquitto, mv-ddr-mervell, networkd-dispatcher, + optee-os, polkit, python-pillow, python3, sconeserver, uuu, + wolfssl + +2022.08-rc2, released September 1st, 2022 + + Fixes all over the tree. + + dependencies: Ensure 'find' and 'xargs' are available on the + build host. + + A large number of typo fixes. + + Defconfigs: bananapi m1, olimex a20/a33/lime: Use standard FPU + configuration, pine64_sopine: Use mainline ATF to fix build + + Updated/fixed packages: ace, alsa-utils, busybox, cups, + dbus-broker, directfb, domoticz, drbd-utils, edk2, + edk2-platforms, ffmpeg, freeradius-server, freeswitch, gauche, + gcc, gdb, glibc, gnutls, gst1-plugins-bad, gst1-plugins-good, + hawktracer, igd-ethercat, imagemagick, intel-mediadriver, + jack2, jose, jpeg, jquery-ui-themes, kodi, libcamera, libdill, + libgit2, libglvnd, libgpg-error, libgpgme, libinput, libp11, + libsepol, libtirpc, libvirtd, libvncserver, libwpe, libzlib, + linux, linux-tools-perf, llvm, lshw, makedumpfile, + mali-driver, memcached, minetest, mutt, ne10, netsniff-ng, + ntpsec, ocrad, ola, opencv4, openocd, opensc, optee-os, + pcsc-lite, postgresql, protobuf, pulseaudio, python-autobahn, + python-paho-mqtt, python-protobuf, python-pygame, python3, qemu, + qoriq-cadence-dp-firmware, qt5doc, qt6base, ranger, rng-tools, + rsync, rustc, sconeserver, sdl2, snort, sqlite, squid, + stress-ng, strongswan, sunxi-mali-utgard-driver, sysdig, + sysklogd, syslinux, syslog-ng, tcf-agent, tcpreplay, + tesseract-ocr, uacme, uboot-tools, uclibc, udpcast, usbguard, + v4l2loopback, vim, webkitgtk, wolftpm, wpewebkit, xenomai, + xserver_xorg-server, zeek, zerofree + +2022.08-rc1, released August 12th, 2022 + + Fixes all over the tree and new features. + + Architecture + + - Support for NDS32 removed + - Support for C-SKY removed + - Support for configurable page size on ARM64 added + - Architecture menu re-organized: the MMU selection now + appears in this architecture menu. + + Toolchain: + + - GCC 12.x support added, GCC 11.x is now the default + compiler, and support for building a GCC 9.x toolchain has + been removed. + - glibc bumped to 2.35-134-gb6aade18a7e5719c942aa2da6cf3157aca993fa4 + - uclibc bumped to 1.0.42 + - BR2_GCC_ENABLE_LTO option removed, the toolchain is now + always built with LTO support. The new option BR2_ENABLE_LTO + enables the use of LTO in a subset of packages that have + explicit handling for LTO. + - GDB enabled on OpenRISC. + - Toolchain menu now appears before "Build options". The + selection of the C library now determines whether static + library (BR2_STATIC_LIBS) will be available or not, instead + of the other way around. + + Filesystem: + + - genimage.cfg files now use shortcuts from genimage for the + GUID of well-known GPT partitions. + + Bootloaders: + + - U-Boot can now be built with host-gnutls as a dependency, + needed for some configurations + - OP-TEE can now be built with host-python-pillow as a + dependency, needed for some configurations. + - OP-TEE source can now be retrieved from a custom tarball + URL. + - Grub has been bumped to 2.06. + + Over 390 packages updated. + + New defconfigs: aspeed_ast2500evb, aspeed_ast2600evb, + broadcom_northstar, canaan_kd233, qemu_riscv64_nommu_virt, + sipeed_maix_bit, sipeed_maix_bit_sdcard, sipeed_maix_dock, + sipeed_maix_dock_sdcard, sipeed_maix_go, + sipeed_maix_go_sdcard, sipeed_maixduino, + sipeed_maixduino_sdcard + + Removed defconfigs: andes_ae300, csky_gx6605s, + friendlyarm_nanopi_neo, minnowboard_max-graphical + + New packages: clpeak, compiler-rt, crucible, dbus-broker, dht, + double-conversion, dust, freeradius-server, gdal, hawktracer, + hyperfine, libb2, libdeflate, libdill, mbw, mender-connect, + minizip-zlib, nerdctl, ntpsec, opencl-hpp, opensc, + python-alembic, python-appdirs, python-beniget, + python-construct, python-dtschema, python-gast, python-kflash, + python-lark, python-maturin, python-mypy-extensions, + python-pylibfdt, python-pythran, python-pyrsistent, + python-qrcode, python-rfc3987, python-rtoml, + python-ruamel-yaml, python-scipy, python-typeguard, + python-typing-inspect, python-zlmdb, qt6base, rtl8723ds, + spirv-llvm-translator, tealdeer, uuu, vis-network, volk, + wolftpm, zeek, zerofree + + Removed packages: rtl8723bs + + Issues resolved: + + #14556: python-crossbar fails to build + #14951: boost compile error when running make silently + #14646: OpenSSH 8.9p1 compiler error under mipsel + #14841: support/download/git fails with "fatal: No such remote + 'origin'" due to incorrect check for origin remote + #13356: libabseil-cpp: not building for raspberry pi + #14911: host-python3 build needs python3 on the host + #13831: mesa3d - kmsro driver requires dri3 + #13816: xstart failed since update the x11 libraries + #13796: Problems compiling package gst-plugins-good + #14191: patchelf v0.9 corrupt Nvidia shared libraries + #14891: sudo: group setup fails since commit 9b7f8da96b + #14881: Watchdogd Package missing INSTALL_STAGING + #14876: arm-trusted-firmware can no longer be compiled with fPIE + +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: + + #13216: [Documentation] 2020.02.6 requires GNU find utils + #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.12, released May 5th, 2023 + + Important / security related fixes. + + Updated/fixed packages: agentpp, apache, ca-certificates, + containerd, coremark, dcron, eudev, ffmpeg, git, + intel-microcode, kexec, lcdproc, libmicrohttpd, libosmium, + libxml2, linux-tools, matio, osm2pgsql, poppler, postgresql, + protozero, python-web2py, runc, s390-tools, samba4, snmppp, + sudo, tcpdump, uclibc, vim, webkitgtk, wpewebkit, + xserver_xorg-server + +2022.02.11, released March 19th, 2023 + + Important / security related fixes. + + Updated/fixed packages: apache, apr, apr-util, asterisk, + at91dataflashboot, audit, bash, bind, bridge-utils, clamav, + dmalloc, exfat, exfat-utils, f2fs-tools, gcc, git, + glslsandbox-player, go, haproxy, intel-gmmlib, ipmiutil, less, + libblockdev, libcurl, libev, libgcrypt, libmad, libmdbx, + libmodsecurity, libolm, libpjsip, lttng-babeltrace, mender, + mpv, mutt, mxs-bootlets, opensbi, opus, paho-mqtt-c, + pcm-tools, php, proxychains-ng, python-django, + python-m2crypto, python-werkzeug, quazip, quickjs, + rockchip-mali, rsync, sudo, tiff, uacme, uqmi, webkitgtk, + wpebackend-fdo, wpewebkit, xdriver_xf86-video-qxl, znc + + Issues resolved (http://bugs.uclibc.org): + + #15306: glibc build fails in Docker container + #15361: Buildroot linking error on Apple Silicon + +2022.02.10, released March 1st, 2023 + + Important / security related fixes. + + Fix make O=..._defconfig builds (regression in 2022.02.9). + + A number of additional/stricter checks have been added to + ./utils/check-package. + + Build host dependencies check extended to check for a number + of specific perl modules to better handle distributions (like + Fedora) with very fine grained perl packages. Also ensure + build host has git >= 2.0.0 when using packages written in + go/rust because the vendoring may need it. + + Defconfigs: ASUS tinker rk3288: Fix boot issue related to TPL + + Updated/fixed packages: afboot-stm32, apache, barebox, c-ares, + elf2flt, freeswitch, fwts, gcc, git, kodi, libgit2, libks, + libopenssl, live555, lua, lxc, mesa3d-headers, modsecurity2, + netopeer2, openjdk, openpowerlink, openvpn, opusfile, + postgresql, pugixml, python-future, qt5, sdl2, sofia-sip, + ssdp-responder, sudo, sunxi-mali-utgard, ti-sgx-km, tmux, + uboot, upx, vim, webkitgtk, wolfssl, wpewebkit, xlib_libXpm, + xserver_xorg-server, xxhash, xz, yajl, zabbix + + Issues resolved (http://bugs.uclibc.org): + + #15271: no start-qemu.sh + #15291: BR2_PACKAGE_GNU_EFI_ARCH_SUPPORTS without location + #15301: Selecting NAND Flash boot media (NAND_BOOT) breaks the uboot.. + +2022.02.9, released January 18th, 2023 + + Important / security related fixes. + + Br2-external: Fix make performance issue when many (> 6) + external trees are used together. + + Erofs: Use fixed timestamp and UUID when BR2_REPRODUCIBLE is + used. + + Go: Ensure our go build and module cache is used, even for the + download step. + + Legal-info: Stop warning about not saving sources for local / + override packages if _REDISTRIBUTE is set to NO. + + Linux: Fix build of < 5.6 kernels with host-gcc >= 10. + + A large number of NXP related packages and defconfigs have + been updated as upstream moved the git repositories to Github. + + Updated/fixed packages: asterisk, bearssl, botan, cairo, + capnproto, check, checkpolicy, connman, containerd, + docker-cli, docker-engine, exempi, exfat, exfat-utils, fmc, + fmlib, glib-networking, go, gobject-introspection, gperf, + i2pd, ima-evm-utils, imx-alsa-plugins, imx-kobs, imx-lib, + imx-m4fwloader, imx-mkimage, intel-microcode, janus-gateway, + libcurl, libftdi1, libksba, libmbim, libmng, libpjsip, + libtalloc, libuwsc, libxkbcommon, linux, lpeg, lrzsz, + lttng-tools, lua-cqueues, mbedtls, mfgtools, mutt, php, + policycoreutils, polkit, postgresql, pptp-linux, + qcom-db410c-firmware, qemu, qoriq-rcw, qt5virtualkeyboard, + rhash, rtl_433, ruby, sqlite, swupdate, tekui, tiff, tinyxml, + tor, wayland, wireshark, wpa_supplicant, + xdriver_xf86-video-imx-viv, xserver_xorg-server, xxhash, zip + + Issues resolved (http://bugs.uclibc.org): + + #14971: Kernel 3.10.108 fail to build in Buildroot 2022.08-rc1 + #14996: Too many directories in BR2_EXTERNAL causes hang during make + #15161: kernel can't support SUBDIR + #15196: Setting BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE does not work + #15226: lsblk: not found + +2022.02.8, released December 10th, 2022 + + Important / security related fixes. + + Updated/fixed packages: asterisk, dash, dovecot, + dovecot-pigeonhole, edk2, edk2-platforms, elf2flt, exim, + freerdp, gcc, gdb, git, gnupg2, heimdal, iwd, kodi, + libarchive, libmdbx, libkrb5, libksba, libopenssl, memcached, + netsnmp, nginx, openpgm, optee-client, python3, rsync, + rtl8723bu, samba4, sdl, sdl2, swupdate, sysstat, systemd, + uboot, vim, vlc, xen, xterm + + Issues resolved (http://bugs.uclibc.org): + + #15131: Target GDB uses internal zlib + +2022.02.7, released November 17th, 2022 + + Important / security related fixes. + + Defconfig: Pine64: Change to mainline ATF to fix build + issue, Zynqmp zcu102 / zcu106: Fix pmufw reset issue + + Updated/fixed packages: arm-trusted-firmware, bind, botan, + collectd, darkhttpd, dbus, dhcp, dnsmasq, docker-cli, + docker-engine, exfatprogs, expat, f2fs-tools, faad2, ffmpeg, + freerdp, gnutls, go, gpsd, grub2, gsl, 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, hdparm, hostapd, imagemagick, + iwd, jack2, libbpf, libcurl, libfribi, libidn2, libinput, + libmdbx, libopenssl, libosip2, libpng, libtasn1, + libtorrent-rasterbar, libuhttpd, libvncserver, libxml2, linux, + linux-tools, lldpd, lrzip, lz4, matchbox-startup-monitor, + msmtp, multipath-tools, mupdf, musl, mv-ddr-marvell, mxml, + nodejs, ntfs-3g, numactl, openvmtools, oracle-mysql, + paho-mqtt-c, perl-net-ssleay, php, pixman, poppler, procps-ng, + python-django, python3, qdecoder, rpi-userland, rsync, + rtl8189es, rtl8189fs, rtl8723bu, rtl8812au-aircrack-ng, + rtl8821au, rtl_433, samba4, shapelib, socat, squid, sqlite, + squashfs, strongswan, sudo, swupdate, timescaledb, u-boot, + uclibc-ng-test, udisks, uftp, uhd, umtprd, vim, wavemon, + wireguard-linux-compat, wolfssl, wpa_supplicant, wpewebkit, + zlib-ng, zsh + + Issues resolved (http://bugs.uclibc.org): + + #15026: package/udisks: install to staging + #15061: Node.js Package fails to build against musl i386 + +2022.02.6, 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, connman, + containerd, cups, dhcpcd, directfb, docker-cli, docker-engine, + edk2, edk2-platforms, elf2flt, expat, ffmpeg, ficl, + freeswitch, freetype, gcc, gdb, git, gnutls, go, + graphicsmagic, grub2, gst1-plugins-bad, gst1-plugins-good, + heirloom-mailx, icu, igh-ethercat, imagemagick, imx-gpu-viv, + jose, jpeg, jquery-ui-themes, kodi, libconfuse, libfreeimage, + libglvnd, libgpg-error, libinput, libmdbx, libsepol, libtirpc, + libupnp, libvirt, libvncserver, libwpe, libxml2, libzlib, + linux, linux-tools, lshw, m4, makedevs, makedumpfile, + mali-driver, mariadb, memcached, mesa3d, minidlna, mosquitto, + mutt, mv-ddr-marvell, ncurses, ne10, netsniff-ng, + networkd-dispatcher, ocrad, opencv4, openocd, openssh, pango, + pcsc-lite, polkit, postgis, postgresql, python-paho-mqtt, + python-pygame, python3, qemu, qlibc, + qoriq-cadence-dp-firmware, qt5xmlpatterns, ranger, rng-tools, + rsync, rsyslog, rtl8189es, rtl8723be, runc, rustc, + sconeserver, sdl2, snort, sox, sqlite, squid, stress-ng, + strongswan, sunxi-mali-utgard-driver, syslinux, syslog-ng, + tcf-agent, tcpreplay, tesseract-ocr, tinyproxy, uacme, + uboot-tools, uclibc, unzip, usbguard, v4l2loopback, vim, + webkitgtk, wolfssl, wpewebkit, xfsprogs, xserver_xorg-server, + xtables-addons, zziplib + + Issues resolved: + + #13216: [Documentation] 2020.02.6 requires GNU find utils + #14796: 64 bit time and seccomp conflict (OpenSSH server crash) + #14951: boost compile error when running make silently + 2022.02.5, released August 31st, 2022 Important / security related fixes. @@ -166,7 +2894,7 @@ 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, haproxym htop, intel-gmmlib, + 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, @@ -330,6 +3058,29 @@ #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. @@ -979,6 +3730,41 @@ #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. @@ -6954,7 +9740,7 @@ Architecture: Default to bf532 CPU variant for blackfin, Fix flat one memory region support for m68k and disable flat - seperate data support because of compatibility issues. + separate data support because of compatibility issues. Defconfigs: Minnowboard and Raspberrypi: Fix errors with post-build scripts when systemd is used. @@ -7490,7 +10276,7 @@ Minor fixes. - Merged/seperate /usr handling is now also performed for + Merged/separate /usr handling is now also performed for staging so cross-gdb / gdbserver can find the libraries. Updated/fixed packages: autossh, conntrack-tools, dcron, diff --git a/buildroot/Config.in b/buildroot/Config.in index f0cd6f48ed..d7a8dc6848 100644 --- a/buildroot/Config.in +++ b/buildroot/Config.in @@ -55,6 +55,16 @@ config BR2_HOST_GCC_AT_LEAST_9 default y if BR2_HOST_GCC_VERSION = "9" select BR2_HOST_GCC_AT_LEAST_8 +config BR2_HOST_GCC_AT_LEAST_10 + bool + default y if BR2_HOST_GCC_VERSION = "10" + select BR2_HOST_GCC_AT_LEAST_9 + +config BR2_HOST_GCC_AT_LEAST_11 + bool + default y if BR2_HOST_GCC_VERSION = "11" + select BR2_HOST_GCC_AT_LEAST_10 + # When adding new entries above, be sure to update # the HOSTCC_MAX_VERSION variable in the Makefile. @@ -65,7 +75,7 @@ config BR2_NEEDS_HOST_JAVA # Hidden boolean selected by pre-built packages for x86, when they # need to run on x86-64 machines (example: pre-built external -# toolchains, binary tools like SAM-BA, etc.). +# toolchains, binary tools, etc.). config BR2_HOSTARCH_NEEDS_IA32_LIBS bool @@ -87,13 +97,19 @@ config BR2_NEEDS_HOST_GCC_PLUGIN_SUPPORT source "arch/Config.in" +source "toolchain/Config.in" + menu "Build options" menu "Commands" +config BR2_CURL + string "Curl command" + default "curl -q --ftp-pasv --retry 3" + config BR2_WGET string "Wget command" - default "wget --passive-ftp -nd -t 3" + default "wget -nd -t 3" config BR2_SVN string "Subversion (svn) command" @@ -161,6 +177,13 @@ config BR2_LZCAT Command to be used to extract a lzip'ed file to stdout. Default is "lzip -d -c" +config BR2_ZSTDCAT + string "zstdcat command" + default "zstdcat" + help + Command to be used to extract a zstd'ed file to stdout. + Default is "zstdcat" + config BR2_TAR_OPTIONS string "Tar options" default "" @@ -239,7 +262,7 @@ if !BR2_PRIMARY_SITE_ONLY config BR2_BACKUP_SITE string "Backup download site" - default "http://sources.buildroot.net" + default "https://sources.buildroot.net" help Backup site to download from. If this option is set then buildroot will fall back to download package sources from here @@ -285,14 +308,15 @@ config BR2_LUAROCKS_MIRROR config BR2_CPAN_MIRROR string "CPAN mirror (Perl packages)" - default "http://cpan.metacpan.org" + default "https://cpan.metacpan.org" help CPAN (Comprehensive Perl Archive Network) is a repository of Perl packages. It has multiple software mirrors scattered around the world. This option allows you to select a mirror. The list of mirrors is available at: - http://search.cpan.org/mirror + http://mirrors.cpan.org/ (tabular) + http://mirrors.cpan.org/map.html (clickable world map) endif @@ -305,8 +329,12 @@ config BR2_JLEVEL Number of jobs to run simultaneously. If 0, determine automatically according to number of CPUs on the host system. +comment "ccache needs a host gcc >= 8" + depends on !BR2_HOST_GCC_AT_LEAST_8 + config BR2_CCACHE bool "Enable compiler cache" + depends on BR2_HOST_GCC_AT_LEAST_8 help This option will enable the use of ccache, a compiler cache. It will cache the result of previous builds to speed up future @@ -432,7 +460,7 @@ config BR2_ENABLE_RUNTIME_DEBUG config BR2_STRIP_strip bool "strip target binaries" default y - depends on !BR2_PACKAGE_HOST_ELF2FLT + depends on BR2_BINFMT_ELF help Binaries and libraries in the target filesystem will be stripped using the normal 'strip' command. This allows to save @@ -461,7 +489,7 @@ config BR2_STRIP_EXCLUDE_DIRS choice prompt "gcc optimization level" - default BR2_OPTIMIZE_S + default BR2_OPTIMIZE_2 help Set the optimization level for gcc @@ -507,6 +535,7 @@ config BR2_OPTIMIZE_2 -falign-loops -falign-labels -ftree-vrp -ftree-pre. Please note the warning under -fgcse about invoking -O2 on programs that use computed gotos. + This is the default. config BR2_OPTIMIZE_3 bool "optimization level 3" @@ -535,7 +564,6 @@ config BR2_OPTIMIZE_S -falign-loops -falign-labels -freorder-blocks -freorder-blocks-and-partition -fprefetch-loop-arrays -ftree-vect-loop-version - This is the default. config BR2_OPTIMIZE_FAST bool "optimize for fast (may break packages!)" @@ -551,13 +579,32 @@ config BR2_OPTIMIZE_FAST endchoice +config BR2_ENABLE_LTO + bool "build packages with link-time optimisation" + help + Enable the link-time optimisation (LTO) option when building + packages. Link-time optimisation re-runs optimisations at + link time, which allows the compiler to do interprocedural + analysis across compilation units and thus come with better + results: smaller size and better performance. + + Note that this analysis is limited to statically linked + object files and libraries. + + This option may significantly increase build times, + sometimes 5 times longer, with only limited gains. + + At this time, this option only enables LTO in packages that + have an explicit configuration option for it. Other packages + always enable LTO, but most packages never enable LTO. + config BR2_GOOGLE_BREAKPAD_ENABLE bool "Enable google-breakpad support" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS - depends on (BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC) + depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS select BR2_PACKAGE_GOOGLE_BREAKPAD @@ -601,6 +648,7 @@ choice config BR2_STATIC_LIBS bool "static only" + depends on !BR2_TOOLCHAIN_USES_GLIBC help Build and use only static libraries. No shared libraries will be installed on the target. This potentially increases your @@ -609,6 +657,9 @@ config BR2_STATIC_LIBS option is enabled, due to their need for dynamic library support. +comment "static only needs a toolchain w/ uclibc or musl" + depends on BR2_TOOLCHAIN_USES_GLIBC + config BR2_SHARED_LIBS bool "shared only" depends on BR2_BINFMT_SUPPORTS_SHARED @@ -638,12 +689,12 @@ config BR2_PACKAGE_OVERRIDE_FILE documentation for more details on this feature. config BR2_GLOBAL_PATCH_DIR - string "global patch directories" + string "global patch and hash directories" help You may specify a space separated list of one or more - directories containing global package patches. For a specific - version of a specific package , - patches are applied as follows: + directories containing global package patches and/or hashes. + For a specific version of a specific package + , patches are looked up as follows: First, the default Buildroot patch set for the package is applied from the package's directory in Buildroot. @@ -657,25 +708,9 @@ config BR2_GLOBAL_PATCH_DIR exists, then all *.patch files in the directory will be applied. -menu "Advanced" - -config BR2_COMPILER_PARANOID_UNSAFE_PATH - bool "paranoid check of library/header paths" - default y - help - By default, when this option is disabled, when the Buildroot - cross-compiler will encounter an unsafe library or header path - (such as /usr/include, or /usr/lib), the compiler will display - a warning. + The hash files are looked up similarly to the patches. - By enabling this option, this warning is turned into an error, - which will completely abort the build when such unsafe paths - are encountered. - - Note that this mechanism is available for both the internal - toolchain (through the toolchain wrapper and binutils patches) - and external toolchain backends (through the toolchain - wrapper). +menu "Advanced" config BR2_FORCE_HOST_BUILD bool "Force the building of host dependencies" @@ -689,6 +724,21 @@ config BR2_FORCE_HOST_BUILD This option will increase build time. +config BR2_DOWNLOAD_FORCE_CHECK_HASHES + bool "Force all downloads to have a valid hash" + help + Say 'y' here to enforce downloads to have at least one valid + hash (and of course, that all hashes be valid). + + By default, Buildroot checks hashes of all packages + downloaded, except those for which a custom version is + used. + + With this option turned on, Buildroot will check hashes of + all packages, including those that use a custom version. In + order to provide hashes for such packages, place additional + hash files in BR2_GLOBAL_PATCH_DIR directories. + config BR2_REPRODUCIBLE bool "Make the build reproducible (experimental)" # SOURCE_DATE_EPOCH support in toolchain-wrapper requires GCC 4.4 @@ -728,6 +778,20 @@ config BR2_PER_PACKAGE_DIRECTORIES endmenu +config BR2_TIME_BITS_64 + bool "Build Y2038-ready code" + depends on BR2_TOOLCHAIN_USES_GLIBC && !BR2_ARCH_IS_64 + help + This option will pass -D_TIME_BITS=64 in the compiler flags + to ensure the glibc C library uses a 64-bit representation + for time_t and other time types, which ensures that + programs/libraries will correctly handle time past year + 2038. + + This option only has an effect with glibc >= 2.34, as + earlier glibc versions did not have support for 64-bit + time_t. + comment "Security Hardening Options" config BR2_PIC_PIE_ARCH_SUPPORTS @@ -899,11 +963,20 @@ config BR2_FORTIFY_SOURCE_2 # gcc bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61164 depends on !BR2_TOOLCHAIN_BUILDROOT || BR2_TOOLCHAIN_GCC_AT_LEAST_6 help - This option sets _FORTIFY_SOURCES to 2 and some more + This option sets _FORTIFY_SOURCE to 2 and some more checking is added, but some conforming programs might fail. Also adds checks at run-time (detected buffer overflow terminates the program) +config BR2_FORTIFY_SOURCE_3 + bool "Extended" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_12 + help + This option sets _FORTIFY_SOURCE to 3 and even more + checking is added compared to level 2. Extends checks at + run-time that can introduce an additional performance + overhead. + endchoice comment "Fortify Source needs a glibc toolchain and optimization" @@ -911,8 +984,6 @@ comment "Fortify Source needs a glibc toolchain and optimization" depends on (!BR2_TOOLCHAIN_USES_GLIBC || BR2_OPTIMIZE_0) endmenu -source "toolchain/Config.in" - source "system/Config.in" source "linux/Config.in" diff --git a/buildroot/Config.in.legacy b/buildroot/Config.in.legacy index 97d6197aeb..63360b42b8 100644 --- a/buildroot/Config.in.legacy +++ b/buildroot/Config.in.legacy @@ -144,7 +144,972 @@ endif ############################################################################### -comment "Legacy options removed in 2022.02" +comment "Legacy options removed in 2024.11" + +config BR2_PACKAGE_BSDIFF + bool "bsdiff has been removed" + select BR2_LEGACY + help + The bsdiff package was removed as it is not maintained + anymore (no commit since 2014). + +config BR2_PACKAGE_PROCPS_NS_ORIGINAL_TOP + bool "BR2_PACKAGE_PROCPS_NS_ORIGINAL_TOP has been renamed" + select BR2_LEGACY + select BR2_PACKAGE_PROCPS_NG_ORIGINAL_TOP + help + The option has been renamed to + BR2_PACKAGE_PROCPS_NG_ORIGINAL_TOP. + +config BR2_PACKAGE_QEMU_TARGET_NIOS2 + bool "qemu nios2 support has been removed" + select BR2_LEGACY + help + NIOS2 support has been removed since Qemu 9.1.0. + +config BR2_PACKAGE_POPPERJS + bool "popperjs has been removed" + select BR2_LEGACY + help + The project has been renamed to floating-ui. + +config BR2_KERNEL_HEADERS_6_10 + bool "kernel headers version 6.10.x are no longer supported" + select BR2_LEGACY + help + Version 6.10.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + +config BR2_PACKAGE_IPMITOOL_PEN_REG_URI + string "IANA PEN registry moved to iana-assignment package" + help + Installation of the IANA PEN is now handled by the + iana-assignment package; to install a custom PEN, + use a rootfs-overlay for example. + +config BR2_PACKAGE_IPMITOOL_PEN_REG_URI_WRAP + bool + default y if BR2_PACKAGE_IPMITOOL_PEN_REG_URI != "" + select BR2_LEGACY + +config BR2_PACKAGE_ERLANG_P1_YAML + bool "erlang-p1-yaml has been renamed" + select BR2_LEGACY + select BR2_PACKAGE_ERLANG_FAST_YAML + help + The erlang-p1-yaml package has been renamed to + erlang-fast-yaml. + +config BR2_PACKAGE_ERLANG_P1_XMPP + bool "erlang-p1-xmpp has been renamed" + select BR2_LEGACY + select BR2_PACKAGE_ERLANG_XMPP + help + The erlang-p1-xmpp package has been renamed to erlang-xmpp. + +config BR2_PACKAGE_ERLANG_P1_XML + bool "erlang-p1-xml has been renamed" + select BR2_LEGACY + select BR2_PACKAGE_ERLANG_FAST_XML + help + The erlang-p1-xml package has been renamed to erlang-fast-xml. + +config BR2_PACKAGE_ERLANG_P1_STUN + bool "erlang-p1-stun has been renamed" + select BR2_LEGACY + select BR2_PACKAGE_ERLANG_STUN + help + The erlang-p1-stun package has been renamed to erlang-stun. + +config BR2_PACKAGE_FBV_GIF + bool "fbv GIF support has been removed" + select BR2_LEGACY + help + Fbv GIF support has been removed, use PNG, BMP or JPEG. + +config BR2_BINUTILS_VERSION_2_40_X + bool "binutils 2.40 has been removed" + select BR2_LEGACY + help + binutils 2.40 has been removed, use a newer version. + +comment "Legacy options removed in 2024.08" + +config BR2_PACKAGE_MIDORI + bool "midori has been removed" + select BR2_LEGACY + help + The original WebKitGTK-based Midori is no longer maintained + and doesn't build since WebKitGTK moved to libsoup3 as of + commit 38a098df133aaa2ebf09742054b02db5a44f58e5. + +config BR2_PACKAGE_FROTZ + bool "frotz has been removed" + select BR2_LEGACY + help + This package was causing build breakage, and was no longer + maintained in Buildroot. + +config BR2_PACKAGE_FAN_CTRL + bool "fan-ctrl has been removed" + select BR2_LEGACY + help + This package was no longer available from SourceForge, the + upstream is completely dead. + +config BR2_PACKAGE_FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE + bool "flutter-dynamic-layouts-example has been removed" + select BR2_LEGACY + help + flutter-dynamic-layouts was removed from flutter-packages + as of commit e35f29177495131f0f598fc7ae1ffd74d89edf15. + +config BR2_KERNEL_HEADERS_6_9 + bool "kernel headers version 6.9.x are no longer supported" + select BR2_LEGACY + help + Version 6.9.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + +config BR2_x86_knightslanding + bool "knightslanding x86 architecture support dropped" + select BR2_LEGACY + help + GCC 14.x has marked this architecture as obsolete, and emits + a warning causing build failures. + +config BR2_x86_knightsmill + bool "knightsmill x86 architecture support dropped" + select BR2_LEGACY + help + GCC 14.x has marked this architecture as obsolete, and emits + a warning causing build failures. + +config BR2_PACKAGE_DVB_APPS + bool "dvb-apps package removed" + select BR2_LEGACY + help + The dvb-apps package was removed as it is not maintained + anymore (no commit since 2014). + +config BR2_PACKAGE_GAMIN + bool "gamin package removed" + select BR2_LEGACY + help + The gamin package was removed as it is not maintained + anymore (no commit since 2016). + +config BR2_PACKAGE_CAIRO_SVG + bool "cairo svg support" + select BR2_LEGACY + select BR2_PACKAGE_CAIRO_PNG + help + Cairo SVG is compiled together with PNG. + +config BR2_PACKAGE_CAIRO_SCRIPT + bool "cairo script support" + select BR2_LEGACY + select BR2_PACKAGE_CAIRO_ZLIB + help + Cairo script got merged into cairo zlib. + +config BR2_PACKAGE_CAIRO_PS + bool "cairo postscript support" + select BR2_LEGACY + select BR2_PACKAGE_CAIRO_ZLIB + help + Cairo PS got merged into cairo zlib. + +config BR2_PACKAGE_CAIRO_PDF + bool "cairo pdf support" + select BR2_LEGACY + select BR2_PACKAGE_CAIRO_ZLIB + help + Cairo PDF got merged into cairo zlib. + +config BR2_PACKAGE_CAIRO_XML + bool "cairo xml support" + select BR2_LEGACY + select BR2_PACKAGE_CAIRO_ZLIB + help + Cairo XML got merged into cairo zlib. + +config BR2_GDB_VERSION_12 + bool "gdb 12.x has been removed" + select BR2_LEGACY + help + GDB 12.x has been removed. The new default version of GDB + 14.x has been automatically selected instead. + +config BR2_TARGET_BEAGLEV_DDRINIT + bool "beaglev-ddrinit has been removed" + select BR2_LEGACY + help + The beaglev-secondboot package has been removed after + the beaglev_defconfig removal. + +config BR2_TARGET_BEAGLEV_SECONDBOOT + bool "beaglev-secondboot has been removed" + select BR2_LEGACY + help + The beaglev-secondboot package has been removed after + the beaglev_defconfig removal. + +config BR2_PACKAGE_ONEVPL_INTEL_GPU + bool "onevpl-intel-gpu has been renamed" + select BR2_LEGACY + select BR2_PACKAGE_INTEL_VPL_GPU_RT + help + The onevpl-intel-gpu package has been renamed to + intel-vpl-gpu-rt. + +config BR2_PACKAGE_CGIC + bool "cgic has been removed" + select BR2_LEGACY + help + the cgic upstream no longer exists. + +config BR2_PACKAGE_BEECRYPT + bool "beecrypt package removed" + select BR2_LEGACY + help + The beecrypt package was removed as it is not maintained + anymore (no release since 2015). + +config BR2_PACKAGE_VERSAL_FIRMWARE + bool "versal-firmware has been replaced by xilinx-prebuilt" + select BR2_TARGET_XILINX_PREBUILT + select BR2_LEGACY + help + The versal-firmware package has been replaced by the more + generic xilinx-prebuilt package. + +config BR2_KERNEL_HEADERS_6_8 + bool "kernel headers version 6.8.x are no longer supported" + select BR2_LEGACY + help + Version 6.8.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + +config BR2_TARGET_AT91BOOTSTRAP + bool "at91bootstrap removed" + select BR2_LEGACY + help + Upstream for at91bootstrap 1.x is no longer available and + has been replaced by at91bootstrap3. + +config BR2_TARGET_AT91DATAFLASHBOOT + bool "at91dataflashboot removed" + select BR2_LEGACY + help + at91dataflashboot has been replaced by at91bootstrap3. + +config BR2_PACKAGE_ON2_8170_MODULES + bool "on2-8170-modules removed" + select BR2_LEGACY + help + The corresponding library and gstreamer 0.10 plugin are no + longer available. + +config BR2_PACKAGE_ON2_8170_LIBS + bool "on2-8170-libs removed" + select BR2_LEGACY + help + Upstream for this binary only library is no longer available. + +config BR2_GCC_VERSION_11_X + bool "gcc 11.x support removed" + select BR2_LEGACY + help + Support for gcc version 11.x has been removed. The current + default version (13.x or later) has been selected instead. + +config BR2_BINFMT_FLAT_SHARED + bool "FLAT shared binary format removed" + select BR2_LEGACY + help + Support for the FLAT shared binary format has been removed: + its support was removed from the Linux kernel, and also from + uClibc-ng, the only C library that supported it. + +config BR2_PACKAGE_OMXPLAYER + bool "omxplayer removed" + select BR2_LEGACY + help + Package was deprecated in 2020 and is broken with ffmpeg 6.x + +config BR2_KERNEL_HEADERS_6_7 + bool "kernel headers version 6.7.x are no longer supported" + select BR2_LEGACY + help + Version 6.7.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + +config BR2_TARGET_TI_K3_IMAGE_GEN + bool "ti-k3-image-gen removed" + select BR2_LEGACY + help + ti-k3-image-gen tool has been removed and replaced by + U-Boot binman tool (requires U-boot >= 2023.10). + +config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM + bool "u-boot TI K3 DM option has been removed." + select BR2_LEGACY + help + The TI K3 Device Manager is already included in + ti-k3-boot-firmware. + +config BR2_PACKAGE_FLUTTER_GALLERY + bool "flutter-gallery removed" + select BR2_LEGACY + help + flutter-gallery has been removed due to being abandoned + and no longer working with flutter 3.19+. It is replaced by + flutter-packages, where individual sub-packages (examples) + must be selected for the build. + +config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS + bool "Codescape IMG GNU Linux Toolchain 2018.09 has been removed" + select BR2_LEGACY + help + The Codescape IMG GNU Linux toolchain has been removed, use a + Bootlin toolchain instead. + +config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS + bool "Codescape MTI GNU Linux Toolchain 2018.09 has been removed" + select BR2_LEGACY + help + The Codescape MTI GNU Linux toolchain has been removed, use a + Bootlin toolchain instead. + +config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64 + bool "CodeSourcery AArch64 2014.11 has been removed" + select BR2_LEGACY + help + The Sourcery CodeBench AArch64 toolchain has been removed, + use an ARM/Bootlin/Linaro toolchain instead. + +config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM + bool "Sourcery CodeBench ARM 2014.05 has been removed" + select BR2_LEGACY + help + The Sourcery CodeBench ARM toolchain has been removed, use + an ARM/Bootlin/Linaro toolchain instead. + +config BR2_BINUTILS_VERSION_2_39_X + bool "binutils 2.39 has been removed" + select BR2_LEGACY + help + binutils 2.39 has been removed, use a newer version. + +comment "Legacy options removed in 2024.02" + +config BR2_PACKAGE_MYSQL + bool "mysql virtual package removed" + select BR2_LEGACY + help + The mysql virtual package has been removed as mariadb is the + only supported mysql variant. Use the mariadb package + instead. + +config BR2_PACKAGE_ORACLE_MYSQL + bool "oracle mysql removed" + select BR2_LEGACY + help + Oracle mysql has been removed as the package was + unmaintained. Consider using mariadb instead. + +config BR2_PACKAGE_STRONGSWAN_SCEP + bool "strongswan SCEP client tool removed" + select BR2_LEGACY + help + "ipsec scepclient" tool has been removed and replaced by the + pki subcommands "pki --scep" and "pki --scepca" which + implement the new SCEP RFC 8894 standard that was released in + September 2020 and which supports trusted "certificate + renewal" based on the existing client certificate. + +config BR2_PACKAGE_SHADOW_UTMPX + bool "shadow utmpx removed" + select BR2_LEGACY + help + UTMPX has been dropped by upstream. + +config BR2_PACKAGE_TINYMEMBENCH + bool "tinymembench removed" + select BR2_LEGACY + help + tinymembench has been removed due to being abandoned. + +config BR2_PACKAGE_DAVINCI_BOOTCOUNT + bool "davinci-bootcount has been renamed" + select BR2_LEGACY + select BR2_PACKAGE_UBOOT_BOOTCOUNT + help + The davinci-bootcount package has been renamed to + uboot-bootcount. + +config BR2_PACKAGE_PYTHON_CROSSBAR + bool "python-crossbar removed" + select BR2_LEGACY + help + python-crossbar has been removed. The current package has + not received an update since Sat Oct 9 13:55:06 2021 commit: + 33ece2446e25e20929d1c7eefa9f3244a3b79a92 and is not python + 3.12.0 compatible. + + Furthermore, the current version requires at least 42 new + packages worth of depedencies of which several require + patches to be python 3.12.0 compatible. As nobody has + stepped up to maintain the package and its ever-growing list + of dependencies, along with the other problems, it was time + to drop the package. + +config BR2_PACKAGE_PYTHON_PYGAME + bool "python-pygame removed" + select BR2_LEGACY + help + python-pygame has been removed due to being abandoned and + the old version no longer building with python 3.12.0. + +config BR2_KERNEL_HEADERS_4_14 + bool "kernel headers version 4.14.x are no longer supported" + select BR2_LEGACY + help + Version 4.14.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + +config BR2_PACKAGE_LIBCAMERA_PIPELINE_RASPBERRYPI + bool "libcamera pipeline 'raspberrypi' was renamed to 'rpi/vc4'" + depends on BR2_arm || BR2_aarch64 + depends on BR2_USE_WCHAR + select BR2_LEGACY + select BR2_PACKAGE_LIBCAMERA_PIPELINE_RPI_VC4 + help + Since version 0.1.0, the pipeline option 'raspberrypi' was + renamed to 'rpi/vc4'. + +config BR2_GDB_VERSION_11 + bool "gdb 11.x removed" + select BR2_LEGACY + help + GDB 11.x has been removed, use a newer version. + +config BR2_PACKAGE_LIBMPD + bool "libmpd package was removed" + select BR2_LEGACY + help + The libmpd package was only used by gmpc, both of which are + no longer maintained upstream. + +config BR2_PACKAGE_GMPC + bool "gmpc package was removed" + select BR2_LEGACY + help + The gmpc package was removed because it was unmaintained, + and still using the old libsoup2 library. + +config BR2_PACKAGE_FLICKCURL + bool "flickcurl package was removed" + select BR2_LEGACY + help + The flickcurl package was removed because it was + unmaintained upstream and causing build failures. + +config BR2_PACKAGE_ONEVPL + bool "onevpl package was renamed" + select BR2_LEGACY + select BR2_PACKAGE_LIBVPL + +config BR2_KERNEL_HEADERS_6_5 + bool "kernel headers version 6.5.x are no longer supported" + select BR2_LEGACY + help + Version 6.5.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + +config BR2_PACKAGE_WATCHDOGD_GENERIC_POLL + int "watchdogd generic poll has been replaced" + default 0 + help + The generic script poll interval has been replaced upstream + with a boolean on/off. Your configuration has been migrated. + + Set this legacy option to 0 here to remove the warning. + +# Note: BR2_PACKAGE_WATCHDOGD_*_POLL_WRAP referenced in package/watchdogd/Config.in +config BR2_PACKAGE_WATCHDOGD_GENERIC_POLL_WRAP + bool + default y if BR2_PACKAGE_WATCHDOGD_GENERIC_POLL != 0 + select BR2_LEGACY + +config BR2_PACKAGE_WATCHDOGD_LOADAVG_POLL + int "watchdogd loadavg poll has been replaced" + default 0 + help + The CPU load average poll interval has been replaced upstream + with a boolean on/off. Your configuration has been migrated. + + Set this legacy option to 0 here to remove the warning. + +# Note: BR2_PACKAGE_WATCHDOGD_*_POLL_WRAP referenced in package/watchdogd/Config.in +config BR2_PACKAGE_WATCHDOGD_LOADAVG_POLL_WRAP + bool + default y if BR2_PACKAGE_WATCHDOGD_LOADAVG_POLL != 0 + select BR2_LEGACY + +config BR2_PACKAGE_WATCHDOGD_FILENR_POLL + int "watchdogd filenr poll has been replaced" + default 0 + help + The file descriptor leak poll has been replaced upstream with + a boolean on/off. Your configuration has been migrated. + + Set this legacy option to 0 here to remove the warning. + +# Note: BR2_PACKAGE_WATCHDOGD_*_POLL_WRAP referenced in package/watchdogd/Config.in +config BR2_PACKAGE_WATCHDOGD_FILENR_POLL_WRAP + bool + default y if BR2_PACKAGE_WATCHDOGD_FILENR_POLL != 0 + select BR2_LEGACY + +config BR2_PACKAGE_WATCHDOGD_MEMINFO_POLL + int "watchdogd meminfo poll has been replaced" + default 0 + help + The memleak detector poll interval has been replaced upstream + with a boolean on/off. Your configuration has been migrated. + + Set this legacy option to 0 here to remove the warning. + +# Note: BR2_PACKAGE_WATCHDOGD_*_POLL_WRAP referenced in package/watchdogd/Config.in +config BR2_PACKAGE_WATCHDOGD_MEMINFO_POLL_WRAP + bool + default y if BR2_PACKAGE_WATCHDOGD_MEMINFO_POLL != 0 + select BR2_LEGACY + +comment "Legacy options removed in 2023.11" + +config BR2_PACKAGE_PYTHON_PYXB + bool "python-pyxb removed" + select BR2_LEGACY + help + python-pyxb has been removed due to being abandoned and + distutils no longer being supported in python 3.12.0. + +config BR2_PACKAGE_OPENJDK_VERSION_11 + bool "openjdk 11 has been removed" + select BR2_LEGACY + help + Version 11 of OpenJDK is no longer supported, version 17 + should now be used as the new LTS release. + +config BR2_KERNEL_HEADERS_6_4 + bool "kernel headers version 6.4.x are no longer supported" + select BR2_LEGACY + help + Version 6.4.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + +config BR2_PACKAGE_GOOGLE_MATERIAL_DESIGN_ICONS + bool "google-material-design-icons removed" + select BR2_LEGACY + help + The google-material-design-icons package has been removed. + +config BR2_GDB_VERSION_10 + bool "gdb 10.x removed" + select BR2_LEGACY + help + gdb 10.x has been removed, use a newer version. + +comment "Legacy options removed in 2023.08" + +config BR2_TARGET_LPC32XXCDL + bool "lpc32xxcdl has been removed" + select BR2_LEGACY + help + lpc32xxcdl has been removed, due to licensing concerns. + +config BR2_BINUTILS_VERSION_2_38_X + bool "binutils 2.38.x has been removed" + select BR2_LEGACY + help + binutils 2.38 has been removed, use a newer version. + +config BR2_GCC_VERSION_10_X + bool "gcc 10.x support removed" + select BR2_LEGACY + help + Support for gcc version 10.x has been removed. The current + default version (12.x or later) has been selected instead. + +config BR2_KERNEL_HEADERS_6_3 + bool "kernel headers version 6.3.x are no longer supported" + select BR2_LEGACY + help + Version 6.3.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + +config BR2_PACKAGE_TOVID + bool "tovid removed" + select BR2_LEGACY + help + tovid was removed + +config BR2_PACKAGE_LIBASPLIB + bool "libasplib removed" + select BR2_LEGACY + help + libasplib is no longer needed. + +config BR2_PACKAGE_OCF_LINUX + bool "ocf-linux has been removed" + select BR2_LEGACY + help + ocf-linux is incompatible with newer kernels. + +config BR2_BINUTILS_VERSION_2_37_X + bool "binutils 2.37.x has been removed" + select BR2_LEGACY + help + binutils 2.37 has been removed, use a newer version. + +comment "Legacy options removed in 2023.05" + +config BR2_KERNEL_HEADERS_6_2 + bool "kernel headers version 6.2.x are no longer supported" + select BR2_LEGACY + help + Version 6.2.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + +config BR2_PACKAGE_ATK + bool "atk removed" + select BR2_LEGACY + help + atk is now part of at-spi2-core. + +config BR2_PACKAGE_AT_SPI2_ATK + bool "at-spi2-atk removed" + select BR2_LEGACY + help + at-spi2-atk is now part of at-spi2-core. + +config BR2_PACKAGE_OPTEE_BENCHMARK + bool "optee-benchmark has been removed" + select BR2_LEGACY + help + optee-benchmark is no longer maintained upstream. + +config BR2_PACAKGE_OPENFPGALOADER_CMSIS + bool "openfpgaloader cmsis option name fixed" + select BR2_LEGACY + help + A typo on BR2_PACAKGE_OPENFPGALOADER_CMSIS was fixed by + renaming the option to BR2_PACKAGE_OPENFPGALOADER_CMSIS. + +comment "Legacy options removed in 2023.02" + +config BR2_PACKAGE_PUGIXML_HEADER_ONLY + bool "pugixml header-only removed" + select BR2_LEGACY + help + The header-only version raises a build failure with gerbera. + +config BR2_PACKAGE_UCCP420WLAN + bool "uccp420wlan removed" + select BR2_LEGACY + help + The uccp420wlan package is unmaintained and doesn't build + with any "recent" kernel (e.g. >= 4.7). + +config BR2_PACKAGE_IMX_GPU_G2D_EXAMPLES + bool "imx-gpu-g2d examples removed" + select BR2_LEGACY + help + The examples are not provided by NXP anymore. + +config BR2_KERNEL_HEADERS_6_0 + bool "kernel headers version 6.0.x are no longer supported" + select BR2_LEGACY + help + Version 6.0.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + +config BR2_KERNEL_HEADERS_4_9 + bool "kernel headers version 4.9.x are no longer supported" + select BR2_LEGACY + help + Version 4.9.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + +config BR2_PACKAGE_DOCKER_PROXY + bool "docker-proxy removed" + select BR2_LEGACY + select BR2_PACKAGE_DOCKER_ENGINE + help + docker-proxy has been dropped by upstream since version + 563fe8. it has been merged into docker-engine (moby). + +config BR2_PACKAGE_PYTHON_BUNCH + bool "python-bunch removed" + select BR2_LEGACY + help + The python-bunch package is unmaintained and is replaced + by the python-munch package. + +config BR2_TARGET_GUMMIBOOT + bool "gummiboot removed" + select BR2_LEGACY + help + gummiboot has been deprecated since 2015, with no further + updates. It became integrated into the systemd project as + systemd-boot. + +config BR2_PACKAGE_IPUTILS_NINFOD + bool "iputils 20221126 removed ninfod" + select BR2_LEGACY + help + iputils 20221126 removed ninfod. + +config BR2_PACKAGE_IPUTILS_RARPD + bool "iputils 20221126 removed rarpd" + select BR2_LEGACY + help + iputils 20221126 removed rarpd. + +config BR2_PACKAGE_IPUTILS_RDISC + bool "iputils 20221126 removed rdisc" + select BR2_LEGACY + help + iputils 20221126 removed rdisc. + +config BR2_PACKAGE_IPUTILS_RDISC_SERVER + bool "iputils 20221126 removed rdisc" + select BR2_LEGACY + help + iputils 20221126 removed rdisc. + +config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_XINGMUX + bool "xingmux moved" + select BR2_LEGACY + select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_XINGMUX + help + The xingmux option has been moved to gst1-plugins-good. + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE + bool "videoscale removed" + select BR2_LEGACY + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERTSCALE + help + The videoscale option has been combined with videoconvert. + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT + bool "videoconvert removed" + select BR2_LEGACY + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERTSCALE + help + The videoconvert option has been combined with videoscale. + +config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 + bool "imx-gpu-viv X11 output has been removed" + select BR2_LEGACY + help + The X11 output was dropped by NXP. + +config BR2_PACKAGE_XDRIVER_XF86_VIDEO_IMX_VIV + bool "xf86-video-imx-viv has been removed" + select BR2_LEGACY + help + The X11 output was dropped by NXP. + +config BR2_PACKAGE_QEMU_CUSTOM_TARGETS + string "the QEMU specific targets option has been removed" + help + This option has been replaced by a list of individual targets + for the many architectures supported by QEMU. + +config BR2_PACKAGE_QEMU_CUSTOM_TARGETS_WRAP + bool + default y if BR2_PACKAGE_QEMU_CUSTOM_TARGETS != "" + select BR2_LEGACY + +config BR2_PACKAGE_XDRIVER_XF86_INPUT_KEYBOARD + bool "xf86-input-keyboard removed" + select BR2_LEGACY + help + The X.org keyboard input driver no longer support Linux. + +config BR2_TARGET_SUN20I_D1_SPL + bool "sun20-d1-spl removed" + select BR2_LEGACY + help + U-Boot has gained SPL support for D1, so this temporary + bootloader is no longer supported. + +config BR2_PACKAGE_PYTHON_M2R + bool "python-m2r removed" + select BR2_LEGACY + help + The python-m2r package is unmaintained. + +config BR2_PACKAGE_MESA3D_XVMC + bool "mesa Gallium XvMC state tracker removed" + select BR2_LEGACY + help + The Gallium XvMC state tracker was removed upstream. + +config BR2_KERNEL_HEADERS_5_19 + bool "kernel headers version 5.19.x are no longer supported" + select BR2_LEGACY + help + Version 5.19.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + +config BR2_PACKAGE_XDRIVER_XF86_VIDEO_TGA + bool "xf86-video-tga removed" + select BR2_LEGACY + help + The X.org xf86-video-tga package was removed. + +config BR2_PACKAGE_XDRIVER_XF86_VIDEO_GLINT + bool "xf86-video-glint removed" + select BR2_LEGACY + help + The X.org xf86-video-glint package no longer builds with + Xserver 21 and is unmaintained. + +config BR2_PACKAGE_USBREDIR_SERVER + bool "usbredirserver removed" + select BR2_LEGACY + help + usbredirserver has been dropped by upstream since version + 0.13.0. usbredir tools (which include usbredirect binary) can + be used as a replacement. + +comment "Legacy options removed in 2022.11" + +config BR2_BINUTILS_VERSION_2_36_X + bool "binutils 2.36.x has been removed" + select BR2_LEGACY + help + binutils 2.36 has been removed, use a newer version. + +config BR2_PACKAGE_RABBITMQ_SERVER + bool "rabbitmq-server removed" + select BR2_LEGACY + help + Package was removed because it was unmaintained and had + known security issues. + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_RC5 + bool "libopenssl rc5 was never enabled" + select BR2_LEGACY + help + The libopenssl option for rc5 never actually enabled rc5, + which had always been disabled in Buildroot. + +config BR2_PACKAGE_LIBDCADEC + bool "package was deprecated upstream, use ffmpeg instead" + select BR2_LEGACY + help + This decoder has been fully integrated into FFmpeg master + branch and further development will continue there. Using + FFmpeg for DTS decoding is now recommended. + +config BR2_KERNEL_HEADERS_5_17 + bool "kernel headers version 5.17.x are no longer supported" + select BR2_LEGACY + help + Version 5.17.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + +config BR2_iwmmxt + bool "ARM iwmmxt variant removed" + select BR2_LEGACY + help + Support for the ARM iwmmxt architecture variant in GCC has + bitroten and is no longer maintained. GCC maintainers + recommend to no longer use it, and suggest to use "xscale" + as a replacement architecture variant. See + https://gcc.gnu.org/bugzilla/show_bug.cgi?id=106972 + +config BR2_PACKAGE_UHD_N230 + bool "uhd N230 support removed" + select BR2_LEGACY + help + uhd N230 support has been dropped by upstream since version + 4.0.0.0. + +config BR2_PACKAGE_UHD_RFNOC + bool "uhd RFNoC support removed" + select BR2_LEGACY + help + uhd RFNoC support has been dropped by upstream since version + 4.0.0.0. + +config BR2_PACKAGE_GPSD_OLDSTYLE + bool "gpsd oldstyle removed" + select BR2_LEGACY + help + gpsd oldstyle option has been removed by upstream in 2015. + +config BR2_GDB_VERSION_9_2 + bool "gdb 9.2 removed" + select BR2_LEGACY + help + Support for GDB 9.2 has been removed. A new version has + automatically been selected. + +comment "Legacy options removed in 2022.08" + +config BR2_ECLIPSE_REGISTER + bool "Eclipse integration removed" + select BR2_LEGACY + help + The Buildroot integration with the Eclipse IDE has been + removed, as the corresponding Eclipse plugin is no longer + maintained, and is no longer usable with current versions of + Eclipse. + +config BR2_csky + bool "csky architecture removed" + select BR2_LEGACY + help + The csky architecture was removed, by lack of toolchain + support. + +config BR2_PACKAGE_MESA3D_DRI_DRIVER_I915 + bool "mesa DRI i915 driver removed" + select BR2_LEGACY + help + The DRI i915 driver was removed upstream. + +config BR2_PACKAGE_MESA3D_DRI_DRIVER_I965 + bool "mesa DRI i965 driver removed" + select BR2_LEGACY + help + The DRI i965 driver was removed upstream. + +config BR2_PACKAGE_MESA3D_DRI_DRIVER_NOUVEAU + bool "mesa DRI nouveau driver removed" + select BR2_LEGACY + help + The DRI radeon nouveau was removed upstream. + +config BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON + bool "mesa DRI radeon r100 driver removed" + select BR2_LEGACY + help + The DRI radeon r100 driver was removed upstream. + +config BR2_GCC_VERSION_9_X + bool "gcc 9.x support removed" + select BR2_LEGACY + help + Support for gcc version 9.x has been removed. The current + default version (11.x or later) has been selected instead. config BR2_PACKAGE_PHP_EXT_WDDX bool "php wddx removed" @@ -152,6 +1117,51 @@ config BR2_PACKAGE_PHP_EXT_WDDX help The WDDX extension was removed from php. +config BR2_nds32 + bool "nds32 architecture removed" + select BR2_LEGACY + help + Support for the nds32 architecture has been removed, due to + its support being removed from the upstream Linux kernel, + and its lack of maintenance in Buildroot. + +config BR2_PACKAGE_RTL8723BS + bool "rtl8723bs removed" + select BR2_LEGACY + help + Package was removed because it is not compatible with latest + kernels and is not maintained anymore: code has been removed + in 2017 as driver is available in the linux-next tree. + +comment "Legacy options removed in 2022.05" + +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 @@ -159,8 +1169,30 @@ config BR2_sh2a 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 arguments has been changed as command" + 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 @@ -168,7 +1200,7 @@ config BR2_TARGET_ROOTFS_OCI_ENTRYPOINT_ARGS image. The new semantic for BR2_TARGET_ROOTFS_OCI_CMD is slightly - different in relation to how it is interpreted, so be sure to + 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 @@ -250,12 +1282,6 @@ config BR2_PACKAGE_PYTHON_DIALOG 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 @@ -463,20 +1489,22 @@ config BR2_PACKAGE_SUNXI_MALI_MAINLINE 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. +# Note: BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 is still referenced from +# package/sunxi-mali-utgard/Config.in 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. +# Note: BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 is still referenced from +# package/sunxi-mali-utgard/Config.in config BR2_PACKAGE_QT5WEBKIT_EXAMPLES bool "qt5webkit-examples removed" @@ -534,18 +1562,20 @@ 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. +# Note: BR2_OPENJDK_VERSION_LTS is still referenced from +# package/openjdk/Config.in 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. +# Note: BR2_OPENJDK_VERSION_LATEST is still referenced from +# package/openjdk/Config.in config BR2_PACKAGE_MPD_TIDAL bool "mpd tidal option removed" @@ -1461,6 +2491,35 @@ config BR2_PACKAGE_RPI_USERLAND_START_VCFILED help The vcfiled support was removed upstream. +config BR2_PACKAGE_TI_SGX_KM_AM335X + bool "ti-sgx-km AM335X option removed" + select BR2_LEGACY + select BR2_PACKAGE_TI_SGX_KM + help + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. + +config BR2_PACKAGE_TI_SGX_KM_AM437X + bool "ti-sgx-km AM437X option removed" + select BR2_LEGACY + help + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. + +config BR2_PACKAGE_TI_SGX_KM_AM4430 + bool "ti-sgx-km AM4430 option removed" + select BR2_LEGACY + help + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. + +config BR2_PACKAGE_TI_SGX_KM_AM5430 + bool "ti-sgx-km AM5430 option removed" + select BR2_LEGACY + help + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. + comment "Legacy options removed in 2019.11" config BR2_PACKAGE_OPENVMTOOLS_PROCPS @@ -1926,9 +2985,9 @@ config BR2_PACKAGE_FFTW_PRECISION_QUAD config BR2_PACKAGE_LUA_5_2 bool "Lua 5.2.x version removed" select BR2_LEGACY - select BR2_PACKAGE_LUA_5_3 help The Lua 5.2.x version was removed. +# Note: BR2_PACKAGE_LUA_5_2 is still referenced from package/lua/Config.in config BR2_TARGET_GENERIC_PASSWD_MD5 bool "target passwd md5 format support has been removed" @@ -2426,7 +3485,7 @@ config BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF has been renamed to BR2_PACKAGE_LIBMEDIAART_BACKEND_GDK_PIXBUF -config BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF +config BR2_PACKAGE_MEDIAART_BACKEND_QT bool "libmediaart qt backend option renamed" select BR2_LEGACY help @@ -2434,45 +3493,34 @@ config BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF BR2_PACKAGE_MEDIAART_BACKEND_QT has been renamed to BR2_PACKAGE_LIBMEDIAART_BACKEND_QT -# Note: BR2_PACKAGE_TI_SGX_AM335X is still referenced from -# package/ti-sgx-km/Config.in config BR2_PACKAGE_TI_SGX_AM335X - bool "ti-sgx-km AM335X option renamed" + bool "ti-sgx-km AM335X option removed" select BR2_LEGACY + select BR2_PACKAGE_TI_SGX_KM help - For consistency reasons, the option - BR2_PACKAGE_TI_SGX_AM335X has been renamed to - BR2_PACKAGE_TI_SGX_KM_AM335X. + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. -# Note: BR2_PACKAGE_TI_SGX_AM437X is still referenced from -# package/ti-sgx-km/Config.in config BR2_PACKAGE_TI_SGX_AM437X - bool "ti-sgx-km AM437X option renamed" + bool "ti-sgx-km AM437X option removed" select BR2_LEGACY help - For consistency reasons, the option - BR2_PACKAGE_TI_SGX_AM437X has been renamed to - BR2_PACKAGE_TI_SGX_KM_AM437X. + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. -# Note: BR2_PACKAGE_TI_SGX_AM4430 is still referenced from -# package/ti-sgx-km/Config.in config BR2_PACKAGE_TI_SGX_AM4430 - bool "ti-sgx-km AM4430 option renamed" + bool "ti-sgx-km AM4430 option removed" select BR2_LEGACY help - For consistency reasons, the option - BR2_PACKAGE_TI_SGX_AM4430 has been renamed to - BR2_PACKAGE_TI_SGX_KM_AM4430. + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. -# Note: BR2_PACKAGE_TI_SGX_AM5430 is still referenced from -# package/ti-sgx-km/Config.in config BR2_PACKAGE_TI_SGX_AM5430 - bool "ti-sgx-km AM5430 option renamed" + bool "ti-sgx-km AM5430 option removed" select BR2_LEGACY help - For consistency reasons, the option - BR2_PACKAGE_TI_SGX_AM5430 has been renamed to - BR2_PACKAGE_TI_SGX_KM_AM5430. + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. config BR2_PACKAGE_JANUS_AUDIO_BRIDGE bool "janus-gateway audio-bridge option renamed" @@ -3072,7 +4120,7 @@ config BR2_PACKAGE_POLICYCOREUTILS_RESTORECOND select BR2_PACKAGE_RESTORECOND help The policycoreutils package no longer offers restorecond - as a option. This package has been moved into a seperate + as a option. This package has been moved into a separate package maintained by the SELinux maintainers. config BR2_PACKAGE_SEPOLGEN @@ -3666,7 +4714,7 @@ config BR2_GDB_VERSION_7_9 comment "Legacy options removed in 2016.11" config BR2_PACKAGE_PHP_SAPI_CLI_CGI - bool "PHP CGI and CLI options are now seperate" + bool "PHP CGI and CLI options are now separate" select BR2_PACKAGE_PHP_SAPI_CLI select BR2_PACKAGE_PHP_SAPI_CGI select BR2_LEGACY @@ -3802,10 +4850,11 @@ config BR2_LINUX_KERNEL_TOOL_SELFTESTS config BR2_GCC_VERSION_4_8_ARC bool "gcc arc option renamed" select BR2_LEGACY - select BR2_GCC_VERSION_ARC help The option that selects the gcc version for the ARC architecture has been renamed to BR2_GCC_VERSION_ARC. +# Note: BR2_GCC_VERSION_4_8_ARC is still referenced from +# package/gcc/Config.in.host config BR2_KERNEL_HEADERS_4_0 bool "kernel headers version 4.0.x are no longer supported" @@ -3839,6 +4888,7 @@ 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 @@ -4144,19 +5194,21 @@ config BR2_PACKAGE_OPENPOWERLINK_DEBUG_LEVEL config BR2_PACKAGE_OPENPOWERLINK_KERNEL_MODULE bool "openpowerlink package has been updated" select BR2_LEGACY - select BR2_PACKAGE_OPENPOWERLINK_STACK_KERNEL_STACK_LIB help openpowerlink kernel modules are built if the kernel stack library is selected. +# Note: BR2_PACKAGE_OPENPOWERLINK_KERNEL_MODULE is still referenced from +# package/openpowerlink/Config.in config BR2_PACKAGE_OPENPOWERLINK_LIBPCAP bool "openpowerlink package has been updated" select BR2_LEGACY - select BR2_PACKAGE_OPENPOWERLINK_STACK_USERSPACE_DAEMON_LIB help The user space support has been split in two part: - - a monolitic user space library - - a user spae deamon driver + - a monolithic user space library + - a user space daemon driver +# Note: BR2_PACKAGE_OPENPOWERLINK_LIBPCAP is still referenced from +# package/openpowerlink/Config.in config BR2_LINUX_KERNEL_SAME_AS_HEADERS bool "using the linux headers version for the kernel has been removed" @@ -4695,7 +5747,7 @@ config BR2_PACKAGE_KODI_PVR_ADDONS select BR2_PACKAGE_KODI_PVR_VUPLUS select BR2_PACKAGE_KODI_PVR_WMC help - Kodi PVR addon was split into seperate modules + Kodi PVR addon was split into separate modules config BR2_BINUTILS_VERSION_2_23_2 bool "binutils 2.23 option renamed" diff --git a/buildroot/DEVELOPERS b/buildroot/DEVELOPERS index 16fe7602d7..aedd736772 100644 --- a/buildroot/DEVELOPERS +++ b/buildroot/DEVELOPERS @@ -26,6 +26,26 @@ # infrastructure, and will be CC'ed on all patches that add or # modify packages that use this infrastructure. +N: Adam Duskett +F: package/depot-tools/ +F: package/dmenu-wayland/ +F: package/fcft/ +F: package/foot/ +F: package/flutter-engine/ +F: package/flutter-packages/ +F: package/flutter-packages/flutter-adaptive-scaffold-example/ +F: package/flutter-packages/flutter-animations-example/ +F: package/flutter-packages/flutter-go-router-example/ +F: package/flutter-packages/flutter-image-example/ +F: package/flutter-packages/flutter-markdown-example/ +F: package/flutter-packages/flutter-rfw-local-example/ +F: package/flutter-pi/ +F: package/flutter-sdk-bin/ +F: package/ivi-homescreen/ +F: package/libutempter/ +F: package/tllist/ +F: support/testing/tests/package/test_flutter.py + N: Adam Heinrich F: package/jack1/ @@ -34,9 +54,13 @@ F: package/brotli/ F: package/bubblewrap/ F: package/cage/ F: package/cog/ +F: package/libavif/ +F: package/libdex/ F: package/libepoxy/ +F: package/libmanette/ F: package/libpsl/ F: package/libwpe/ +F: package/sysprof/ F: package/webkitgtk/ F: package/wlroots/ F: package/woff2/ @@ -57,7 +81,15 @@ F: package/libmbim/ F: package/libqmi/ F: package/modem-manager/ +N: Aleksandr Makarov +F: package/cpp-httplib/ + +N: Alessandro Partesotti +F: package/oatpp/ + N: Alex Michel +F: package/libzenoh-c/ +F: package/libzenoh-pico/ F: package/network-manager-openvpn/ N: Alex Suykov @@ -95,6 +127,7 @@ F: package/libest/ N: Alexander Mukhin F: package/tinyproxy/ +F: package/zfs/ N: Alexander Sverdlin F: package/mini-snmpd/ @@ -120,6 +153,7 @@ N: Alistair Francis F: board/sifive/ F: boot/opensbi/ F: configs/hifive_unleashed_defconfig +F: package/libspdm/ F: package/xen/ N: Alvaro G. M @@ -127,18 +161,29 @@ F: package/dcron/ F: package/libxmlrpc/ F: package/python-docopt/ -N: Anders Darander -F: package/ktap/ +N: Anand Gadiyar +F: board/ti/am62x-sk/ +F: board/ti/am64x-sk/ +F: boot/ti-k3-boot-firmware/ +F: boot/ti-k3-r5-loader/ +F: configs/ti_am62x_sk_defconfig +F: configs/ti_am64x_sk_defconfig N: André Zwing F: package/libkrb5/ -F: package/openal/ F: package/p7zip/ F: package/wine/ N: Andreas Klinger F: package/ply/ +N: Andreas Naumann +F: package/evemu/ +F: package/libevdev/ +F: package/pkg-qmake.mk +F: package/qt5/qt5opcua/ +F: package/qt6/qt6opcua/ + N: Andreas Ziegler F: package/mpd/ @@ -156,17 +201,23 @@ N: Andrey Yurovsky F: package/rauc/ N: Angelo Compagnucci +F: board/sipeed/lichee_rv/ +F: board/sipeed/lichee_rv_dock/ +F: configs/sipeed_lichee_rv* F: package/apparmor/ F: package/corkscrew/ F: package/cups/ F: package/cups-filters/ +F: package/cutekeyboard/ F: package/fail2ban/ F: package/grep/ +F: package/gtkiostream/ F: package/htpdate/ F: package/i2c-tools/ F: package/jq/ F: package/libapparmor/ F: package/libb64/ +F: package/libdill/ F: package/mender/ F: package/mender-artifact/ F: package/mono/ @@ -174,6 +225,7 @@ F: package/mono-gtksharp3/ F: package/monolite/ F: package/openjpeg/ F: package/python-can/ +F: package/python-minimalmodbus/ F: package/python-pillow/ F: package/python-pydal/ F: package/python-spidev/ @@ -181,6 +233,8 @@ F: package/python-web2py/ F: package/qt5/qt5coap/ F: package/qt5/qt5knx/ F: package/qt5/qt5mqtt/ +F: package/rtl8723ds/ +F: package/rtl8723ds-bt/ F: package/sam-ba/ F: package/sshguard/ F: package/sunwait/ @@ -188,11 +242,7 @@ F: package/sysdig/ N: Andy Shevchenko F: package/fb-test-app/ - -N: Anisse Astier -F: package/go/ -F: package/nghttp2/ -F: package/pkg-golang.mk +F: package/iotools/ N: Anthony Viallard F: package/gnuplot/ @@ -216,16 +266,13 @@ F: configs/snps_archs38_axs103_defconfig F: configs/snps_archs38_haps_defconfig F: configs/snps_archs38_hsdk_defconfig -N: Ariel D'Alessandro -F: package/axfsutils/ -F: package/mali-t76x/ - N: Arnaud Aujon F: package/espeak/ N: Arnout Vandecappelle F: package/arp-scan/ F: package/dehydrated/ +F: package/dracut/ F: package/freescale-imx/firmware-imx/ F: package/freescale-imx/imx-lib/ F: package/libpagekite/ @@ -235,18 +282,6 @@ F: package/python-bottle/ F: package/sqlcipher/ F: package/stress/ -N: Asaf Kahlon -F: package/collectd/ -F: package/libfuse3/ -F: package/libuv/ -F: package/python* -F: package/snmpclitools/ -F: package/spdlog/ -F: package/uftp/ -F: package/uftrace/ -F: package/uvw/ -F: package/zeromq/ - N: Ash Charles F: package/pru-software-support/ F: package/ti-cgt-pru/ @@ -263,6 +298,9 @@ F: package/orbit/ N: Attila Wagner F: package/python-canopen/ +N: Bagas Sanjaya +F: package/git/ + N: Bartosz Bilas F: board/stmicroelectronics/stm32mp157a-dk1/ F: configs/stm32mp157a_dk1_defconfig @@ -274,17 +312,6 @@ F: package/ttyd/ F: package/qt5/qt5scxml/ F: package/qt5/qt5webview/ -N: Bartosz Golaszewski -F: package/autoconf-archive/ -F: package/doxygen/ -F: package/libgpiod/ -F: package/libserialport/ -F: package/libsigrok/ -F: package/libsigrokdecode/ -F: package/libzip/ -F: package/pulseview/ -F: package/sigrok-cli/ - N: Baruch Siach F: board/solidrun/clearfog_gt_8k/ F: configs/solidrun_clearfog_gt_8k_defconfig @@ -296,6 +323,7 @@ F: package/ebtables/ F: package/i2c-tools/ F: package/libcurl/ F: package/libpcap/ +F: package/sexpect/ F: package/socat/ F: package/strace/ F: package/tcpdump/ @@ -308,7 +336,7 @@ F: package/taskd/ N: Benjamin Kamath F: package/lapack/ -N: Bernd Kuhls +N: Bernd Kuhls F: package/alsa-lib/ F: package/alsa-utils/ F: package/apache/ @@ -318,18 +346,20 @@ F: package/apr-util/ F: package/bcg729/ F: package/bento4/ F: package/bitcoin/ -F: package/bluez-tools/ -F: package/boinc/ F: package/clamav/ F: package/dav1d/ +F: package/dht/ +F: package/dnsmasq/ F: package/dovecot/ F: package/dovecot-pigeonhole/ F: package/dtv-scan-tables/ +F: package/ethtool/ F: package/eudev/ F: package/exim/ F: package/fetchmail/ F: package/ffmpeg/ F: package/flac/ +F: package/flatbuffers/ F: package/freeswitch/ F: package/freeswitch-mod-bcg729/ F: package/freetype/ @@ -337,30 +367,35 @@ F: package/fstrcmp/ F: package/ghostscript/ F: package/giflib/ F: package/gkrellm/ -F: package/gli/ -F: package/glmark2/ F: package/gpsd/ F: package/gptfdisk/ +F: package/hddtemp/ F: package/hdparm/ -F: package/inih/ +F: package/igt-gpu-tools/ F: package/intel-gmmlib/ F: package/intel-mediadriver/ F: package/intel-mediasdk/ +F: package/intel-microcode/ +F: package/intel-vpl-gpu-rt/ F: package/jsoncpp/ F: package/kodi* F: package/lame/ +F: package/lcms2/ F: package/leafnode2/ F: package/libaacs/ -F: package/libasplib/ F: package/libass/ F: package/libbdplus/ F: package/libbluray/ F: package/libbroadvoice/ +F: package/libcap/ F: package/libcdio/ F: package/libcec/ F: package/libcodec2/ F: package/libcrossguid/ -F: package/libdcadec/ +F: package/libde265/ +F: package/libdecor/ +F: package/libdeflate/ +F: package/libdisplay-info/ F: package/libdrm/ F: package/libdvbcsa/ F: package/libdvdcss/ @@ -368,13 +403,13 @@ F: package/libdvdnav/ F: package/libdvdread/ F: package/libebur128/ F: package/libfreeglut/ +F: package/libfribidi/ F: package/libg7221/ F: package/libglew/ -F: package/libglfw/ F: package/libglu/ F: package/libhdhomerun/ +F: package/libheif/ F: package/libilbc/ -F: package/libks/ F: package/libldns/ F: package/libmicrohttpd/ F: package/libminiupnpc/ @@ -390,19 +425,30 @@ F: package/libsidplay2/ F: package/libsilk/ F: package/libsndfile/ F: package/libsoundtouch/ -F: package/libsquish/ F: package/libudfread/ +F: package/libunibreak/ F: package/liburiparser/ +F: package/libutp/ +F: package/libuv/ F: package/libva/ F: package/libva-intel-driver/ F: package/libva-utils/ F: package/libvorbis/ +F: package/libvpl/ F: package/libvpx/ F: package/libyuv/ +F: package/linux-firmware/ +F: package/mc/ F: package/mesa3d/ F: package/minidlna/ F: package/mjpg-streamer/ +F: package/mpg123/ +F: package/ntp/ F: package/nut/ +F: package/openconnect/ +F: package/openvpn/ +F: package/opus/ +F: package/pciutils/ F: package/perl-crypt-openssl-guess/ F: package/perl-crypt-openssl-random/ F: package/perl-crypt-openssl-rsa/ @@ -421,31 +467,34 @@ F: package/perl-io-html/ F: package/perl-lwp-mediatypes/ F: package/perl-mail-dkim/ F: package/perl-mailtools/ +F: package/perl-netaddr-ip/ F: package/perl-net-dns/ F: package/perl-net-http/ -F: package/perl-netaddr-ip/ F: package/perl-timedate/ F: package/perl-uri/ F: package/perl-www-robotrules/ F: package/php/ -F: package/pixman/ F: package/pngquant/ -F: package/pound/ +F: package/pppd/ +F: package/privoxy/ F: package/pure-ftpd/ F: package/python-couchdb/ F: package/python-cssutils/ +F: package/python-glslang/ +F: package/python-mako/ F: package/python-mwclient/ F: package/python-mwscrape/ F: package/python-mwscrape2slob/ -F: package/python-mako/ F: package/python-oauthlib/ F: package/python-pyicu/ F: package/python-pylru/ F: package/python-requests-oauthlib/ F: package/python-slob/ +F: package/rrdtool/ +F: package/rsync/ F: package/rtmpdump/ F: package/samba4/ -F: package/softether/ +F: package/sofia-sip/ F: package/spandsp/ F: package/sqlite/ F: package/stellarium/ @@ -455,13 +504,10 @@ F: package/tor/ F: package/transmission/ F: package/tvheadend/ F: package/unixodbc/ -F: package/utf8proc/ -F: package/vdr/ -F: package/vdr-plugin-vnsiserver/ F: package/vlc/ -F: package/vnstat/ -F: package/waylandpp/ -F: package/x11r7/ +F: package/wget/ +F: package/wireless-regdb/ +F: package/wireless_tools/ F: package/x264/ F: package/x265/ F: package/xmrig/ @@ -477,16 +523,46 @@ N: Bilal Wasim F: board/chromebook/elm/ F: configs/chromebook_elm_defconfig +N: Boerge Struempfel +F: package/libgpiod2/ + N: Bogdan Radulescu F: package/iftop/ F: package/ncdu/ N: Brandon Maier +F: board/freescale/ls1046a-frwy/ +F: configs/ls1046a-frwy_defconfig +F: package/atftp/ +F: package/bats-assert/ +F: package/bats-file/ +F: package/bats-support/ +F: package/mtd/ +F: package/python-pysensors/ +F: package/qoriq-fm-ucode/ +F: package/unifdef/ F: package/vmtouch/ +F: support/testing/tests/package/test_atftp.py +F: support/testing/tests/package/test_zip.py + +N: Brandon Maier +F: package/dtc/ +F: support/testing/tests/package/test_dtc* N: Brock Williams F: package/pdmenu/ +N: Bryan Brattlof +F: board/ti/ +F: board/beagleboard/beagleplay/ +F: boot/ti-k3-boot-firmware/ +F: boot/ti-k3-r5-loader/ +F: configs/beagleplay_defconfig +F: configs/ti_am62ax_sk_defconfig +F: configs/ti_am62px_sk_defconfig +F: configs/ti_am62x_sk_defconfig +F: configs/ti_am64x_sk_defconfig + N: Carlo Caione F: package/jailhouse/ F: package/sunxi-boards/ @@ -501,8 +577,10 @@ N: Cédric Chépied F: package/znc/ N: Cédric Le Goater +F: board/aspeed/ F: board/qemu/ppc-bamboo/ F: board/qemu/ppc64le-powernv8/readme.txt +F: configs/aspeed* F: configs/qemu_ppc_bamboo_defconfig F: configs/qemu_ppc64le_powernv8_defconfig @@ -512,24 +590,34 @@ F: package/alsa-plugins/ N: Changming Huang F: package/qoriq-cadence-dp-firmware/ +N: Chris Dimich +F: package/freescale-imx/imx-vpu-hantro-daemon/ + N: Chris Packham F: package/coremark/ F: package/coremark-pro/ F: package/gstreamer1/gst1-shark/ F: package/micropython/ -F: package/micropython-lib/ F: package/syslog-ng/ +N: Christian Hitz +F: package/qt6/qt6scxml/ + N: Christian Kellermann F: package/python-pylibftdi/ -N: Christian Stewart +N: Christian Stewart +F: package/balena-engine/ F: package/batman-adv/ +F: package/catatonit/ +F: package/cni-plugins/ +F: package/conmon/ F: package/containerd/ +F: package/crun/ F: package/delve/ F: package/docker-cli/ +F: package/docker-compose/ F: package/docker-engine/ -F: package/docker-proxy/ F: package/embiggen-disk/ F: package/fuse-overlayfs/ F: package/go/ @@ -537,10 +625,13 @@ F: package/gocryptfs/ F: package/mbpfan/ F: package/moby-buildkit/ F: package/mosh/ +F: package/nerdctl/ F: package/pkg-golang.mk F: package/rtl8821au/ +F: package/rtl8821cu/ F: package/runc/ F: package/tini/ +F: support/testing/tests/package/test_docker_compose.py N: Christophe Priouzeau F: board/stmicroelectronics/stm32f429-disco/ @@ -605,6 +696,12 @@ N: Clément Péron F: board/beelink/gs1/ F: configs/beelink_gs1_defconfig +N: Colin Foster +F: package/python-tftpy/ +F: package/rauc-hawkbit-updater/ +F: support/testing/tests/package/sample_python_tftpy.py +F: support/testing/tests/package/test_python_tftpy.py + N: Corentin Guillevic F: package/libloki/ @@ -621,14 +718,41 @@ F: package/odroidc2-firmware/ N: Daniel J. Leach F: package/dacapo/ -N: Daniel Lang +N: Daniel Lang +F: package/atkmm/ +F: package/atkmm2_28/ +F: package/cairomm/ +F: package/cairomm1_14/ F: package/dbus-cxx/ +F: package/glibmm/ +F: package/glibmm2_66/ +F: package/gtkmm3/ +F: package/libsigc/ +F: package/libsigc2/ +F: package/llvm-project/ F: package/paho-mqtt-cpp/ +F: package/pangomm/ +F: package/pangomm2_46/ +F: package/sam-ba/ N: Damien Lanson F: package/libvdpau/ F: package/log4cpp/ +N: Damien Le Moal +F: package/python-kflash/ +F: board/canaan/ +F: configs/canaan_kd233_defconfig +F: board/sipeed/ +F: configs/sipeed_maix_bit_defconfig +F: configs/sipeed_maix_bit_sdcard_defconfig +F: configs/sipeed_maixduino_defconfig +F: configs/sipeed_maixduino_sdcard_defconfig +F: configs/sipeed_maix_dock_defconfig +F: configs/sipeed_maix_dock_sdcard_defconfig +F: configs/sipeed_maix_go_defconfig +F: configs/sipeed_maix_go_sdcard_defconfig + N: Daniel Nicoletti F: package/cutelyst/ @@ -642,6 +766,7 @@ F: package/libftdi1/ N: Danilo Bargen F: board/pcengines/apu2/ F: configs/pcengines_apu2_defconfig +F: package/tealdeer/ N: Danomi Manchego F: package/cjson/ @@ -652,22 +777,29 @@ F: package/lua-cjson/ F: package/luaexpat/ F: package/xinetd/ +N: Dario Binacchi +F: board/bsh/ +F: board/stmicroelectronics/stm32f746-disco/ +F: board/stmicroelectronics/stm32f769-disco/ +F: configs/imx6ulz_bsh_smm_m2_defconfig +F: configs/imx8mn_bsh_smm_s2_defconfig +F: configs/imx8mn_bsh_smm_s2_pro_defconfig +F: configs/stm32f746_disco_sd_defconfig +F: configs/stm32f769_disco_sd_defconfig +F: package/aespipe/ +F: package/armadillo/ +F: package/babeld/ +F: package/iana-assignments/ +F: package/sscep/ +F: package/tinyinit/ +F: package/uuu/ + N: Dario Binacchi -F: package/davinci-bootcount/ +F: package/uboot-bootcount/ F: package/libmnl/ -N: David Bachelart -F: package/ccrypt/ -F: package/dos2unix/ -F: package/ipmiutil/ -F: package/jsmn/ -F: package/python-daemon/ -F: package/sslh/ -F: package/udpxy/ - N: David Bender F: package/benejson/ -F: package/cgic/ F: package/freeradius-client/ F: package/openldap/ @@ -675,6 +807,7 @@ N: David du Colombier <0intro@gmail.com> F: package/x264/ N: David GOUARIN +F: package/freeradius-server/ F: package/librelp/ F: package/libtalloc/ @@ -689,8 +822,6 @@ N: David Pierret F: package/bat/ N: Davide Viti -F: board/friendlyarm/nanopi-r1/ -F: configs/friendlyarm_nanopi_r1_defconfig F: package/flann/ F: package/python-paho-mqtt/ F: package/qhull/ @@ -699,9 +830,6 @@ F: package/tcllib/ N: Denis Bodor F: package/libstrophe/ -N: Derrick Lyndon Pallas -F: package/ipcalc/ - N: Dick Olsson F: board/aarch64-efi/ F: board/pc/ @@ -724,12 +852,27 @@ F: package/s6/ F: package/skalibs/ F: support/testing/tests/boot/test_edk2.py +N: Dimitar Tomov +F: package/wolftpm/ + N: Dimitrios Siganos F: package/wireless-regdb/ +N: Dmitry Chestnykh +F: board/qemu/sparc-ss10/ +F: configs/qemu_sparc_ss10_defconfig +F: package/uclibc-ng-test/ + N: Dominik Faessler F: package/logsurfer/ +N: Dominik Michael Rauh +F: package/gdal/ + +N: Dong Wang +F: board/friendlyarm/nanopi-neo/ +F: configs/friendlyarm_nanopi_neo_defconfig + N: Doug Kehn F: package/nss-pam-ldapd/ F: package/sp-oops-extract/ @@ -743,12 +886,15 @@ F: board/acmesystems/acqua-a5/ F: configs/acmesystems_acqua_a5_256mb_defconfig F: configs/acmesystems_acqua_a5_512mb_defconfig +N: Eero Aaltonen +F: package/docopt-cpp/ + N: Eloi Bail F: package/bayer2rgb-neon/ F: package/gstreamer1/gst1-plugins-bayer2rgb-neon/ N: Eric Le Bihan -F: docs/manual/adding-packages-meson.txt +F: docs/manual/adding-packages-meson.adoc F: package/adwaita-icon-theme/ F: package/darkhttpd/ F: package/eudev/ @@ -776,18 +922,6 @@ N: Eric Limpens F: package/pifmrds/ F: package/ympd/ -N: Erico Nunes -F: board/aarch64-efi/ -F: configs/aarch64_efi_defconfig -F: package/acpica/ -F: package/acpitool/ -F: package/efibootmgr/ -F: package/efivar/ -F: package/fwts/ -F: package/spi-tools/ -F: package/xdotool/ -F: configs/pc_x86_64_* - N: Erik Larsson F: package/imx-mkimage/ @@ -798,12 +932,10 @@ N: Ernesto L. Williams Jr F: package/szip/ N: Esben Haabendal -F: boot/gummiboot/ F: package/python-kiwisolver/ -N: Etienne Carriere +N: Etienne Carriere F: boot/optee-os/ -F: package/optee-benchmark/ F: package/optee-client/ F: package/optee-examples/ F: package/optee-test/ @@ -826,11 +958,9 @@ F: package/jimtcl/ F: package/mimic/ F: package/nodm/ F: package/openbox/ -F: package/rtl8723bs/ F: package/supertuxkart/ N: Fabio Estevam -F: board/freescale/warpboard/ F: board/warp7/ F: configs/freescale_imx* F: configs/imx23evk_defconfig @@ -843,7 +973,6 @@ F: configs/imx6ulpico_defconfig F: configs/imx7d-sdb_defconfig F: configs/imx7dpico_defconfig F: configs/imx8mqevk_defconfig -F: configs/mx25pdk_defconfig F: configs/mx51evk_defconfig F: configs/mx53loco_defconfig F: configs/mx6cubox_defconfig @@ -851,8 +980,8 @@ F: configs/mx6sx_udoo_neo_defconfig F: configs/mx6udoo_defconfig F: configs/wandboard_defconfig F: configs/warp7_defconfig -F: configs/warpboard_defconfig F: package/atest/ +F: package/crucible/ F: package/kmscube/ N: Fabio Porcedda @@ -930,6 +1059,7 @@ F: package/libxslt/ F: package/mbedtls/ F: package/minissdpd/ F: package/minizip/ +F: package/minizip-zlib/ F: package/mongodb/ F: package/motion/ F: package/mutt/ @@ -951,8 +1081,9 @@ F: package/snort3/ F: package/suricata/ F: package/tinycbor/ F: package/tinydtls/ -F: package/tinymembench/ F: package/whois/ +F: package/x11r7/xlib_libXpresent/ +F: package/zeek/ N: Fabrice Goucem F: board/freescale/imx6ullevk/ @@ -961,24 +1092,49 @@ F: configs/freescale_imx6ullevk_defconfig N: Falco Hyfing F: package/python-pymodbus/ -N: Filip Skoneczny -F: board/sinovoip/m1-plus -F: configs/bananapi_m1_plus_defconfig +N: Fiona Klute +F: package/*/S* +F: package/python-aiomqtt/ +F: package/python-dunamai/ +F: package/python-poetry-dynamic-versioning/ +F: package/python-pyasynchat/ +F: package/python-pyasyncore/ + +N: Flávio Tapajós +F: configs/asus_tinker-s_rk3288_defconfig +F: board/asus/tinker-s/ +F: package/python-paho-mqtt/ +F: package/python-sqlalchemy/ +F: package/rsyslog/ + +N: Florian Fainelli +F: package/cpulimit/ N: Floris Bos F: package/ipmitool/ F: package/odhcploc/ N: Francis Laniel +F: package/falcosecurity-libs F: package/pahole/ +F: package/sysdig/ +F: package/tbb/ N: Francisco Gonzalez F: package/ser2net/ +N: Francois Dugast +F: board/sipeed/licheepi_nano/ +F: board/visionfive2/ +F: configs/sipeed_licheepi_nano_defconfig +F: configs/visionfive2_defconfig + N: Francois Perrad +F: board/freescale/ls1028ardb/ F: board/olimex/a20_olinuxino F: board/olimex/imx233_olinuxino/ F: board/olimex/stmp1_olinuxino/ +F: configs/ls1028ardb_defconfig F: configs/olimex_a20_olinuxino_* F: configs/olimex_imx233_olinuxino_defconfig F: configs/olimex_stmp157_olinuxino_lime_defconfig @@ -991,13 +1147,16 @@ F: package/copas/ F: package/coxpcall/ F: package/dado/ F: package/ficl/ +F: package/graphene/ F: package/janet/ +F: package/libgtk4/ F: package/libtomcrypt/ F: package/libtommath/ F: package/libwpe/ F: package/linenoise/ F: package/ljlinenoise/ F: package/lua-inotify/ +F: package/lmdb/ F: package/lpeg/ F: package/lpty/ F: package/lrandom/ @@ -1029,14 +1188,11 @@ F: package/libdmtx/ F: package/libsodium/ F: package/php-amqp/ F: package/python-cherrypy/ -F: package/rabbitmq-server/ F: package/sane-backends/ -F: package/ucl/ F: package/upx/ F: package/zxing-cpp/ -N: Frank Vanbever -F: package/elixir/ +N: Frank Vanbever F: package/libmodsecurity/ F: package/nginx-modsecurity/ @@ -1051,7 +1207,6 @@ F: package/gstreamer1/gst1-imx/ F: package/libimxvpuapi/ F: package/mfgtools/ F: package/sshpass/ -F: package/x11r7/xdriver_xf86-video-imx-viv/ N: Geoff Levand F: package/flannel/ @@ -1059,14 +1214,20 @@ F: package/flannel/ N: Geoffrey Ragot F: package/python-pyyaml/ +N: Gero Schwaericke +F: board/cubietech/cubieboard1/ +F: configs/cubieboard1_defconfig + N: Gilles Talis F: board/freescale/imx8mmevk/ F: board/friendlyarm/nanopi-r2s/ F: configs/freescale_imx8mmevk_defconfig F: configs/friendlyarm_nanopi_r2s_defconfig F: package/cctz/ +F: package/clpeak/ F: package/faad2/ F: package/fdk-aac/ +F: package/hawktracer/ F: package/httping/ F: package/iozone/ F: package/leptonica/ @@ -1074,6 +1235,7 @@ F: package/libeXosip2/ F: package/libolm/ F: package/libosip2/ F: package/ocrad/ +F: package/opencl-clhpp/ F: package/opusfile/ F: package/restclient-cpp/ F: package/tesseract-ocr/ @@ -1081,31 +1243,67 @@ F: package/webp/ F: package/xapian/ N: Giulio Benetti +F: board/bananapi/bananapi-m2-ultra/ +F: board/freescale/imx6ullevk/ +F: board/freescale/imxrt1050evk/ +F: board/mangopi/mq1rdw2/ F: board/olimex/a* +F: board/pine64/rockpro64 F: configs/amarula_vyasa_rk3288_defconfig F: configs/asus_tinker_rk3288_defconfig +F: configs/bananapi_m2_berry_defconfig +F: configs/bananapi_m2_ultra_defconfig +F: configs/freescale_imx6ullevk_defconfig +F: configs/imx6ullevk_defconfig +F: configs/imxrt1050-evk_defconfig +F: configs/mangopi_mq1rdw2_defconfig F: configs/olimex_a* +F: configs/rockpro64_defconfig F: package/at/ F: package/binutils/ F: package/cryptsetup/ F: package/erlang-jiffy/ +F: package/esp-hosted/ F: package/gcc/ F: package/harfbuzz/ +F: package/libblockdev/ F: package/libfuse3/ F: package/libnspr/ F: package/libnss/ +F: package/libnvme/ +F: package/libtraceevent/ +F: package/libtracefs +F: package/linux-tools/linux-tool-rtla.mk.in F: package/mali-driver/ F: package/minicom/ +F: package/mongoose/ +F: package/mmc-utils/ F: package/nfs-utils/ +F: package/python-libconf/ F: package/python-uvloop/ +F: package/qt5/ F: package/rockchip-mali/ +F: package/rtl8188eu/ +F: package/rtl8189es/ +F: package/rtl8192eu/ +F: package/rtl8723bu/ +F: package/rtl8723ds/ +F: package/rtl8812au-aircrack-ng/ +F: package/rtl8821au/ +F: package/rtl8821cu/ F: package/sunxi-mali-utgard/ F: package/sunxi-mali-utgard-driver/ F: package/sunxi-tools/ +F: package/swugenerator/ +F: package/swupdate/ F: package/trace-cmd/ F: package/udisks/ +F: package/wilc-driver/ F: toolchain/ +N: Graeme Smecher +F: package/python-orjson/ + N: Gregory Dymarek F: package/ding-libs/ F: package/gengetopt/ @@ -1139,25 +1337,23 @@ N: Guillaume William Brs F: package/libnids/ F: package/libxcrypt/ F: package/liquid-dsp/ +F: package/mbw/ F: package/pixiewps/ +F: package/python-beniget/ +F: package/python-gast/ F: package/python-pybind/ +F: package/python-pythran/ +F: package/python-scipy/ F: package/reaver/ F: support/testing/tests/package/br2-external/python-pybind F: support/testing/tests/package/sample_python_pybind.py +F: support/testing/tests/package/sample_python_scipy.py F: support/testing/tests/package/test_python_pybind.py - -N: Guo Ren -F: arch/Config.in.csky -F: board/csky/ -F: configs/csky_* +F: support/testing/tests/package/test_python_scipy.py N: Gustavo Heinz F: package/python-m2crypto/ -N: Gustavo Pimentel -F: configs/arm_juno_defconfig -F: board/arm/juno/ - N: Gwenhael Goavec-Merou F: board/terasic/de10nano_cyclone5/ F: configs/terasic_de10nano_cyclone5_defconfig @@ -1172,19 +1368,27 @@ F: package/python-markdown/ F: package/python-remi/ F: package/python-sip/ F: package/uhd/ +F: package/volk/ N: Heiko Thiery F: board/kontron/bl-imx8mm/ +F: board/kontron/smarc-sal28/ F: board/kontron/pitx-imx8m/ F: configs/kontron_bl_imx8mm_defconfig +F: configs/kontron_smarc_sal28_defconfig F: configs/kontron_pitx_imx8m_defconfig F: package/altera-stapl/ +F: package/blake3/ F: package/ipmitool/ F: package/libnetconf2/ F: package/libyang/ F: package/linuxptp/ F: package/netopeer2/ +F: package/python-yamllint/ +F: package/rauc/ F: package/sysrepo/ +F: support/testing/tests/package/sample_python_yamllint.py +F: support/testing/tests/package/test_python_yamllint.py N: Hervé Codina F: package/alchemy/ @@ -1221,6 +1425,12 @@ F: package/mrp/ N: Ian Haylock F: package/python-rpi-gpio/ +N: Ibai Erkiaga +F: package/binutils-bare-metal/ +F: package/gcc-bare-metal/ +F: package/newlib-bare-metal/ +F: toolchain/toolchain-bare-metal-buildroot/ + N: Ignacy Gawędzki F: package/angularjs/ @@ -1234,120 +1444,101 @@ N: Ismael Luceno F: package/axel/ F: package/mawk/ +N: J. Neuschäfer +F: package/execline/ +F: package/mdevd/ +F: package/python-rgbmatrix/ +F: package/rpi-rgb-led-matrix/ +F: package/s6/ +F: package/s6-linux-init/ +F: package/s6-linux-utils/ +F: package/s6-networking/ +F: package/s6-portable-utils/ +F: package/s6-rc/ +F: package/skalibs/ +F: package/tipidee/ + N: Jagan Teki F: board/amarula/ F: board/asus/ F: board/bananapi/ F: board/engicam/ -F: board/friendlyarm/nanopi-a64/ -F: board/friendlyarm/nanopi-neo2/ F: board/olimex/a33_olinuxino/ F: board/olimex/a64-olinuxino/ F: board/orangepi/orangepi-lite2/ F: board/orangepi/orangepi-one-plus -F: board/orangepi/orangepi-pc2/ -F: board/orangepi/orangepi-prime/ -F: board/orangepi/orangepi-win/ F: board/orangepi/orangepi-zero-plus2/ F: board/pine64/ -F: configs/amarula_a64_relic_defconfig F: configs/amarula_vyasa_rk3288_defconfig F: configs/asus_tinker_rk3288_defconfig -F: configs/bananapi_m1_defconfig -F: configs/bananapi_m64_defconfig F: configs/engicam_imx6qdl_icore_defconfig F: configs/engicam_imx6qdl_icore_qt5_defconfig F: configs/engicam_imx6qdl_icore_rqs_defconfig F: configs/engicam_imx6ul_geam_defconfig F: configs/engicam_imx6ul_isiot_defconfig -F: configs/friendlyarm_nanopi_a64_defconfig -F: configs/friendlyarm_nanopi_neo2_defconfig F: configs/olimex_a33_olinuxino_defconfig F: configs/olimex_a64_olinuxino_defconfig F: configs/orangepi_lite2_defconfig F: configs/orangepi_one_plus_defconfig -F: configs/orangepi_pc2_defconfig -F: configs/orangepi_prime_defconfig -F: configs/orangepi_win_defconfig F: configs/orangepi_zero_plus2_defconfig F: configs/pine64_defconfig F: configs/pine64_sopine_defconfig +F: package/python-scipy/ +F: support/testing/tests/package/sample_python_scipy.py +F: support/testing/tests/package/test_python_scipy.py N: James Hilliard F: package/apcupsd/ F: package/bpftool/ +F: package/cloudflared/ F: package/exfatprogs/ +F: package/fwupd/ +F: package/fwupd-efi/ +F: package/fxdiv/ F: package/gensio/ F: package/lua-std-debug/ F: package/lua-std-normalize/ +F: package/libjcat/ +F: package/libucontext/ F: package/lilv/ F: package/lv2/ +F: package/neon-2-sse/ F: package/pipewire/ -F: package/python-aioconsole/ -F: package/python-aiodns/ -F: package/python-aiohttp/ -F: package/python-aiohttp-cors/ -F: package/python-aiohttp-debugtoolbar/ -F: package/python-aiohttp-jinja2/ -F: package/python-aiohttp-mako/ -F: package/python-aiohttp-remotes/ -F: package/python-aiohttp-security/ -F: package/python-aiohttp-session/ -F: package/python-aiohttp-sse/ -F: package/python-aiologstash/ -F: package/python-aiomonitor/ -F: package/python-aiojobs/ -F: package/python-aioprocessing/ -F: package/python-aiorwlock/ -F: package/python-aiosignal/ -F: package/python-aiozipkin/ -F: package/python-argon2-cffi/ -F: package/python-argon2-cffi-bindings/ -F: package/python-async-lru/ -F: package/python-async-timeout/ -F: package/python-bidict/ -F: package/python-brotli/ -F: package/python-cbor2/ -F: package/python-cchardet/ -F: package/python-charset-normalizer/ -F: package/python-cssselect2/ -F: package/python-flatbuffers/ -F: package/python-fonttools/ -F: package/python-frozenlist/ -F: package/python-greenlet/ -F: package/python-installer/ -F: package/python-janus/ -F: package/python-logstash/ -F: package/python-multidict/ -F: package/python-pep517/ -F: package/python-pycares/ -F: package/python-pydyf/ -F: package/python-pypa-build/ -F: package/python-pyphen/ -F: package/python-snappy/ -F: package/python-sockjs/ -F: package/python-terminaltables/ -F: package/python-tinycss2/ -F: package/python-tomli/ -F: package/python-weasyprint/ -F: package/python-yarl/ -F: package/python-zopfli/ +F: package/python* +F: package/rtl8192eu/ F: package/serd/ F: package/sord/ F: package/sratom/ +F: package/stb/ +F: package/superiotool/ +F: package/tailscale/ +F: package/uefisettings/ F: package/zchunk/ +F: support/testing/tests/package/sample_python_rtoml.py +F: support/testing/tests/package/test_python_rtoml.py N: James Knight F: package/atkmm/ F: package/cairomm/ -F: package/google-material-design-icons/ F: package/glibmm/ F: package/gtkmm3/ F: package/libpqxx/ F: package/pangomm/ F: package/rpm/ +F: package/swaybg/ F: package/yad/ +N: Jamie Gibbons +F: board/beagleboard/beaglev_fire/ +F: board/microchip/mpfs_icicle/ +F: configs/beaglev_fire_defconfig +F: configs/microchip_mpfs_icicle_defconfig +F: package/microchip-hss-payload-generator/ + +N: Jan Havran +F: board/pine64/pinecube/ +F: configs/pine64_pinecube_defconfig + N: Jan Heylen F: package/opentracing-cpp/ @@ -1368,12 +1559,18 @@ F: package/zip/ N: Jared Bents F: package/libvirt/ -N: Jarkko Sakkinen +N: Jarkko Sakkinen +F: package/libtpms/ F: package/quota/ +F: package/swtpm/ N: Jason Pruitt F: package/librtlsdr/ +N: Javad Rahimi +F: board/orangepi/orangepi-pc2 +F: configs/orangepi_pc2_defconfig + N: Jean Burgat F: package/openfpgaloader/ @@ -1401,7 +1598,13 @@ F: package/lxc/ F: package/strongswan/ F: package/wmctrl/ F: package/x11r7/xdriver_xf86-video-imx/ -F: package/x11r7/xdriver_xf86-video-imx-viv/ + +N: Jesse Taube +F: board/freescale/imxrt1050evk/ +F: configs/imxrt1050-evk_defconfig + +N: Jesse Van Gavere +F: package/qt6/ N: Jianhui Zhao F: package/libuhttpd/ @@ -1412,15 +1615,22 @@ N: Joachim Wiberg F: configs/globalscale_espressobin_defconfig F: board/globalscale/espressobin/ F: package/inadyn/ +F: package/libconfuse/ F: package/libite/ +F: package/libnet/ F: package/libteam/ F: package/libuev/ F: package/mg/ +F: package/mdnsd/ +F: package/mini-snmpd/ F: package/mrouted/ F: package/netcalc/ +F: package/pimd/ +F: package/redir/ F: package/smcroute/ F: package/ssdp-responder/ F: package/sysklogd/ +F: package/uredir/ F: package/watchdogd/ N: Jochen Baltes @@ -1439,6 +1649,8 @@ F: board/qemu/ppc64le-pseries/ F: configs/qemu_ppc64le_pseries_defconfig F: board/qemu/ppc-mac99/ F: configs/qemu_ppc_mac99_defconfig +F: board/aspeed/ +F: configs/aspeed* N: Johan Derycke F: package/python-libconfig/ @@ -1447,6 +1659,8 @@ N: Johan Oudinet F: package/ejabberd/ F: package/erlang-base64url/ F: package/erlang-eimp/ +F: package/erlang-fast-xml/ +F: package/erlang-fast-yaml/ F: package/erlang-goldrush/ F: package/erlang-idna/ F: package/erlang-jiffy/ @@ -1459,15 +1673,15 @@ F: package/erlang-p1-oauth2/ F: package/erlang-p1-pkix/ F: package/erlang-p1-sip/ F: package/erlang-p1-stringprep/ -F: package/erlang-p1-stun/ F: package/erlang-p1-tls/ F: package/erlang-p1-utils/ -F: package/erlang-p1-xml/ -F: package/erlang-p1-xmpp/ -F: package/erlang-p1-yaml/ F: package/erlang-p1-yconf/ F: package/erlang-p1-zlib/ +F: package/erlang-stun/ +F: package/erlang-xmpp/ +F: package/forge/ F: package/nginx-dav-ext/ +F: package/vis-network/ F: package/vuejs/ N: John Stile @@ -1477,6 +1691,12 @@ N: John Faith F: package/python-inflection/ F: package/sdbusplus/ +N: Jon Ringle +F: package/mbpoll/ + +N: Jon Henrik Bjørnstad +F: package/qbee-agent/ + N: Jonathan Ben Avraham F: arch/Config.in.xtensa F: package/autofs/ @@ -1490,23 +1710,6 @@ N: Joris Offouga F: package/python-colorlog/ F: package/python-simplelogging/ -N: Jörg Krause -F: board/lemaker/bananapro/ -F: configs/bananapro_defconfig -F: package/augeas/ -F: package/bluez-alsa/ -F: package/caps/ -F: package/freescale-imx/imx-alsa-plugins/ -F: package/libopusenc/ -F: package/libupnpp/ -F: package/luv/ -F: package/luvi/ -F: package/mpd/ -F: package/shairport-sync/ -F: package/swupdate/ -F: package/upmpdcli/ -F: package/wavemon/ - N: Joris Lijssens F: package/emlog/ F: package/libcoap/ @@ -1519,23 +1722,14 @@ N: José Luis Salvador Rufo F: package/zfs/ F: support/testing/tests/package/test_zfs.py -N: José Pekkarinen -F: package/alfred/ -F: package/bmx7/ -F: package/python-aexpect/ -F: package/softhsm2/ -F: support/testing/tests/package/sample_python_aexpect.py -F: support/testing/tests/package/test_python_aexpect.py - N: Joseph Kogut -F: package/at-spi2-atk/ F: package/at-spi2-core/ -F: package/clang/ F: package/earlyoom/ F: package/gconf/ F: package/libnss/ -F: package/lld/ -F: package/llvm/ +F: package/llvm-project/clang/ +F: package/llvm-project/lld/ +F: package/llvm-project/llvm/ F: package/python-cython/ F: package/python-pycups/ F: package/python-raven/ @@ -1551,6 +1745,7 @@ N: Joshua Henderson F: package/qt5/qt5wayland/ N: Jugurtha BELKALEM +F: package/bcc/ F: package/python-aiofiles/ F: package/python-crayons/ F: package/python-cycler/ @@ -1578,7 +1773,6 @@ F: package/libcddb/ F: package/libmodbus/ F: package/ltris/ F: package/opentyrian/ -F: package/python-pygame/ N: Julien Corjon F: package/qt5/ @@ -1591,27 +1785,232 @@ F: configs/ts7680_defconfig F: package/paho-mqtt-c N: Julien Olivain -F: board/qmtech/zynq/ +F: board/qemu/riscv64-virt-efi/ F: board/spike/ F: board/technexion/imx8mmpico/ -F: board/technexion/imx8mpico/ F: configs/imx8mmpico_defconfig -F: configs/imx8mpico_defconfig +F: configs/qemu_riscv64_virt_efi_defconfig +F: configs/spike_riscv32_defconfig F: configs/spike_riscv64_defconfig -F: configs/zynq_qmtech_defconfig F: package/fluid-soundfont/ F: package/fluidsynth/ F: package/glslsandbox-player/ +F: package/gnupg2/ +F: package/highway/ +F: package/kexec/ +F: package/libjxl/ +F: package/libopenmpt/ +F: package/mokutil/ +F: package/oath-toolkit/ +F: package/octave/ +F: package/ola/ +F: package/openblas/ +F: package/opencsd/ +F: package/openmpi/ +F: package/perftest/ F: package/ptm2human/ F: package/python-distro/ F: package/python-gnupg/ +F: package/python-hkdf/ +F: package/python-hwdata/ +F: package/python-magic-wormhole/ +F: package/python-magic-wormhole-mailbox-server/ +F: package/python-magic-wormhole-transit-relay/ +F: package/python-midiutil/ +F: package/python-ml-dtypes/ F: package/python-pyalsa/ +F: package/python-spake2/ +F: package/rdma-core/ F: package/riscv-isa-sim/ +F: package/swipl/ +F: package/tig/ +F: package/tinycompress/ +F: package/z3/ F: package/zynaddsubfx/ +F: support/testing/tests/boot/test_optee_os.py +F: support/testing/tests/boot/test_optee_os/ +F: support/testing/tests/fs/test_btrfs.py +F: support/testing/tests/fs/test_btrfs/ +F: support/testing/tests/fs/test_erofs.py +F: support/testing/tests/fs/test_erofs/ F: support/testing/tests/package/sample_python_distro.py F: support/testing/tests/package/sample_python_gnupg.py +F: support/testing/tests/package/sample_python_hwdata.py +F: support/testing/tests/package/sample_python_midiutil.py +F: support/testing/tests/package/sample_python_ml_dtypes.py +F: support/testing/tests/package/sample_python_mpmath.py +F: support/testing/tests/package/sample_python_pyalsa.py +F: support/testing/tests/package/sample_python_spake2.py +F: support/testing/tests/package/sample_python_sympy.py +F: support/testing/tests/package/test_4th.py +F: support/testing/tests/package/test_acl.py +F: support/testing/tests/package/test_acpica.py +F: support/testing/tests/package/test_acpica/ +F: support/testing/tests/package/test_apache.py +F: support/testing/tests/package/test_attr.py +F: support/testing/tests/package/test_audio_codec_base.py +F: support/testing/tests/package/test_audit.py +F: support/testing/tests/package/test_bc.py +F: support/testing/tests/package/test_bcc.py +F: support/testing/tests/package/test_bcc/ +F: support/testing/tests/package/test_bitcoin.py +F: support/testing/tests/package/test_brotli.py +F: support/testing/tests/package/test_btrfs_progs.py +F: support/testing/tests/package/test_btrfs_progs/ +F: support/testing/tests/package/test_bzip2.py +F: support/testing/tests/package/test_compressor_base.py +F: support/testing/tests/package/test_coremark.py +F: support/testing/tests/package/test_cryptsetup.py +F: support/testing/tests/package/test_cryptsetup/ +F: support/testing/tests/package/test_ddrescue.py +F: support/testing/tests/package/test_ddrescue/ +F: support/testing/tests/package/test_dmidecode.py +F: support/testing/tests/package/test_dos2unix.py +F: support/testing/tests/package/test_dosfstools.py +F: support/testing/tests/package/test_dosfstools/ +F: support/testing/tests/package/test_ed.py +F: support/testing/tests/package/test_ethtool.py +F: support/testing/tests/package/test_ethtool/ +F: support/testing/tests/package/test_exfatprogs.py +F: support/testing/tests/package/test_exfatprogs/ +F: support/testing/tests/package/test_file.py +F: support/testing/tests/package/test_file/ +F: support/testing/tests/package/test_fluidsynth.py +F: support/testing/tests/package/test_fluidsynth/ +F: support/testing/tests/package/test_fping.py +F: support/testing/tests/package/test_fwts.py +F: support/testing/tests/package/test_gawk.py +F: support/testing/tests/package/test_ghostscript.py +F: support/testing/tests/package/test_ghostscript/ +F: support/testing/tests/package/test_glslsandbox_player.py +F: support/testing/tests/package/test_glslsandbox_player/ +F: support/testing/tests/package/test_gnupg2.py +F: support/testing/tests/package/test_gnuplot.py +F: support/testing/tests/package/test_gnuplot/ +F: support/testing/tests/package/test_gnuradio.py +F: support/testing/tests/package/test_gnuradio/ +F: support/testing/tests/package/test_gpsd.py +F: support/testing/tests/package/test_gpsd/ +F: support/testing/tests/package/test_gzip.py +F: support/testing/tests/package/test_highway.py +F: support/testing/tests/package/test_hwloc.py +F: support/testing/tests/package/test_iozone.py +F: support/testing/tests/package/test_iperf.py +F: support/testing/tests/package/test_iperf3.py +F: support/testing/tests/package/test_iproute2.py +F: support/testing/tests/package/test_iptables.py +F: support/testing/tests/package/test_iputils.py +F: support/testing/tests/package/test_jailhouse.py +F: support/testing/tests/package/test_jq.py +F: support/testing/tests/package/test_jq/ +F: support/testing/tests/package/test_kexec.py +F: support/testing/tests/package/test_kexec/ +F: support/testing/tests/package/test_kmod.py +F: support/testing/tests/package/test_kmod/ +F: support/testing/tests/package/test_kmscube.py +F: support/testing/tests/package/test_kmscube/ +F: support/testing/tests/package/test_lame.py +F: support/testing/tests/package/test_less.py +F: support/testing/tests/package/test_libcamera.py +F: support/testing/tests/package/test_libcamera/ +F: support/testing/tests/package/test_libgpgme.py +F: support/testing/tests/package/test_libjxl.py +F: support/testing/tests/package/test_links.py +F: support/testing/tests/package/test_links/ +F: support/testing/tests/package/test_lrzip.py +F: support/testing/tests/package/test_lrzsz.py +F: support/testing/tests/package/test_ltrace.py +F: support/testing/tests/package/test_lvm2.py +F: support/testing/tests/package/test_lzip.py +F: support/testing/tests/package/test_lsof.py +F: support/testing/tests/package/test_lz4.py +F: support/testing/tests/package/test_lzop.py +F: support/testing/tests/package/test_make.py +F: support/testing/tests/package/test_make/ +F: support/testing/tests/package/test_mariadb.py +F: support/testing/tests/package/test_mawk.py +F: support/testing/tests/package/test_mdadm.py +F: support/testing/tests/package/test_mdadm/ +F: support/testing/tests/package/test_micropython.py +F: support/testing/tests/package/test_micropython/ +F: support/testing/tests/package/test_mosquitto.py +F: support/testing/tests/package/test_mtools.py +F: support/testing/tests/package/test_mtr.py +F: support/testing/tests/package/test_ncdu.py +F: support/testing/tests/package/test_netcat.py +F: support/testing/tests/package/test_netsnmp.py +F: support/testing/tests/package/test_netsnmp/ +F: support/testing/tests/package/test_nftables.py +F: support/testing/tests/package/test_nftables/ +F: support/testing/tests/package/test_ngrep.py +F: support/testing/tests/package/test_nmap.py +F: support/testing/tests/package/test_ntp.py +F: support/testing/tests/package/test_ntp/ +F: support/testing/tests/package/test_numactl.py +F: support/testing/tests/package/test_numactl/ +F: support/testing/tests/package/test_oath_toolkit.py +F: support/testing/tests/package/test_octave.py +F: support/testing/tests/package/test_ola.py +F: support/testing/tests/package/test_ola/ +F: support/testing/tests/package/test_openblas.py +F: support/testing/tests/package/test_parted.py +F: support/testing/tests/package/test_pciutils.py +F: support/testing/tests/package/test_perftest.py +F: support/testing/tests/package/test_pigz.py +F: support/testing/tests/package/test_postgresql.py +F: support/testing/tests/package/test_pppd.py +F: support/testing/tests/package/test_pppd/ +F: support/testing/tests/package/test_pv.py F: support/testing/tests/package/test_python_distro.py F: support/testing/tests/package/test_python_gnupg.py +F: support/testing/tests/package/test_python_hkdf.py +F: support/testing/tests/package/test_python_hwdata.py +F: support/testing/tests/package/test_python_magic_wormhole.py +F: support/testing/tests/package/test_python_midiutil.py +F: support/testing/tests/package/test_python_ml_dtypes.py +F: support/testing/tests/package/test_python_mpmath.py +F: support/testing/tests/package/test_python_pyalsa.py +F: support/testing/tests/package/test_python_pyqt5.py +F: support/testing/tests/package/test_python_pyqt5/ +F: support/testing/tests/package/test_python_spake2.py +F: support/testing/tests/package/test_python_sympy.py +F: support/testing/tests/package/test_rdma_core.py +F: support/testing/tests/package/test_rdma_core/ +F: support/testing/tests/package/test_rrdtool.py +F: support/testing/tests/package/test_rt_tests.py +F: support/testing/tests/package/test_screen.py +F: support/testing/tests/package/test_sed.py +F: support/testing/tests/package/test_socat.py +F: support/testing/tests/package/test_sox.py +F: support/testing/tests/package/test_sqlite.py +F: support/testing/tests/package/test_strace.py +F: support/testing/tests/package/test_stress_ng.py +F: support/testing/tests/package/test_swipl.py +F: support/testing/tests/package/test_swipl/ +F: support/testing/tests/package/test_tcl.py +F: support/testing/tests/package/test_tcl/ +F: support/testing/tests/package/test_tcpdump.py +F: support/testing/tests/package/test_tesseract_ocr.py +F: support/testing/tests/package/test_thttpd.py +F: support/testing/tests/package/test_trace_cmd.py +F: support/testing/tests/package/test_trace_cmd/ +F: support/testing/tests/package/test_unbound.py +F: support/testing/tests/package/test_unbound/ +F: support/testing/tests/package/test_usbutils.py +F: support/testing/tests/package/test_usbutils/ +F: support/testing/tests/package/test_vorbis_tools.py +F: support/testing/tests/package/test_weston.py +F: support/testing/tests/package/test_weston/ +F: support/testing/tests/package/test_which.py +F: support/testing/tests/package/test_wine.py +F: support/testing/tests/package/test_xfsprogs.py +F: support/testing/tests/package/test_xfsprogs/ +F: support/testing/tests/package/test_xz.py +F: support/testing/tests/package/test_z3.py +F: support/testing/tests/package/test_z3/ +F: support/testing/tests/package/test_zbar.py +F: support/testing/tests/package/test_zchunk.py +F: support/testing/tests/package/test_zstd.py N: Julien Viard de Galbert F: package/dieharder/ @@ -1620,6 +2019,9 @@ F: package/easy-rsa/ N: Justin Maggard F: package/dtach/ +N: Kadambini Nema +F: package/ustreamer/ + N: Kamel Bouhara F: package/libodb-boost/ F: package/libodb-mysql/ @@ -1638,6 +2040,13 @@ F: package/ramsmp/ N: Kieran Bingham F: package/libcamera/ +N: Kilian Zinnecker +F: board/avnet/rzboard_v2l/ +F: board/radxa/rock5b/ +F: configs/avnet_rzboard_v2l_defconfig +F: configs/rock5b_defconfig +F: package/rockchip-rkbin/ + N: Klaus Heinrich Kiwi F: package/wqy-zenhei/ @@ -1645,6 +2054,16 @@ N: Koen Martens F: package/capnproto/ F: package/linuxconsoletools/ +N: Kory Maincent +F: board/octavo/osd32mp1-brk/ +F: board/octavo/osd32mp1-red/ +F: configs/octavo_osd32mp1_brk_defconfig +F: configs/octavo_osd32mp1_red_defconfig + +N: Kris Bahnsen +F: package/wilc-firmware/ +F: package/wilc-driver/ + N: Kurt Van Dijck F: package/bcusdk/ F: package/libpthsem/ @@ -1656,6 +2075,9 @@ F: package/aircrack-ng/ N: Laurent Charpentier F: package/open-lldp/ +N: Laurent Vivier +F: package/petitboot/ + N: Lee Jones F: boot/afboot-stm32/ @@ -1680,7 +2102,7 @@ F: package/mongrel2/ N: Lothar Felten F: board/bananapi/bananapi-m2-ultra/ -F: board/beaglebone/ +F: board/beagleboard/beaglebone/ F: configs/bananapi_m2_ultra_defconfig F: configs/beaglebone_defconfig F: configs/beaglebone_qt5_defconfig @@ -1689,8 +2111,6 @@ F: package/ti-sgx-km/ F: package/ti-sgx-um/ N: Louis Aussedat -F: board/friendlyarm/nanopi-neo-plus2/ -F: configs/friendlyarm_nanopi_neo_plus2_defconfig F: package/mfoc F: package/libpam-nfc F: package/python-dnspython/ @@ -1699,11 +2119,6 @@ F: package/python-huepy/ F: package/python-tqdm/ F: package/rtl8189es/ -N: Louis-Paul Cordier -F: package/intel-gmmlib/ -F: package/intel-mediadriver/ -F: package/intel-mediasdk/ - N: Luca Ceresoli F: board/olimex/a20_olinuxino/ F: board/zynq/ @@ -1716,6 +2131,7 @@ F: configs/zynqmp_zcu106_defconfig F: package/agentpp/ F: package/exim/ F: package/libpjsip/ +F: package/linux-tools/linux-tool-usbtools.mk.in F: package/qpid-proton/ F: package/rtl8188eu/ F: package/snmppp/ @@ -1742,12 +2158,11 @@ F: package/python-json-schema-validator/ F: package/python-keyring/ F: package/python-simplejson/ F: package/python-versiontools/ -F: package/wilc1000-firmware/ +F: package/wilc-firmware/ -N: Maeva Manuel -F: board/freescale/imx8qmmek/ -F: configs/freescale_imx8qmmek_defconfig -F: package/freescale-imx/imx-seco/ +N: Ludwig Kormann +F: board/in-circuit/ +F: configs/icnova* N: Mahyar Koshkouei F: package/ffmpeg/ @@ -1755,10 +2170,6 @@ F: package/mpv/ F: package/rpi-firmware/ F: package/rpi-userland/ -N: Manuel Vögele -F: package/python-pyqt5/ -F: package/python-requests-toolbelt/ - N: Marcin Bis F: package/bluez5_utils/ F: package/cc-tool/ @@ -1767,11 +2178,14 @@ F: package/ecryptfs-utils/ N: Marcin Niestroj F: board/grinn/ F: board/orangepi/orangepi-zero-plus/ +F: board/orangepi/orangepi-zero3/ F: configs/grinn_* F: configs/orangepi_zero_plus_defconfig +F: configs/orangepi_zero3_defconfig F: package/argparse/ F: package/dt-utils/ F: package/easydbus/ +F: package/gitlab-runner/ F: package/lua-flu/ F: package/lua-stdlib/ F: package/luaossl/ @@ -1779,6 +2193,7 @@ F: package/murata-cyw-fw/ F: package/netdata/ F: package/python-ansicolors/ F: package/python-bleak/ +F: package/python-dbus-fast/ F: package/python-dbus-next/ F: package/python-iniconfig/ F: package/python-intelhex/ @@ -1790,6 +2205,7 @@ F: package/python-typing-extensions/ F: package/python-xmodem/ F: package/rs485conf/ F: package/turbolua/ +F: support/testing/tests/package/sample_python_dbus_fast.py F: support/testing/tests/package/sample_python_dbus_next.py F: support/testing/tests/package/sample_python_pytest.py F: support/testing/tests/package/sample_python_pytest_asyncio.py @@ -1799,17 +2215,32 @@ F: support/testing/tests/package/test_python_pytest.py F: support/testing/tests/package/test_python_pytest_asyncio.py N: Marcus Folkesson +F: package/criu/ +F: package/libcamera/ +F: package/libcamera-apps/ F: package/libostree/ F: package/libselinux/ F: package/libsemanage/ F: package/libsepol/ F: package/selinux-python/ +F: support/testing/tests/package/sample_python_asn1crypto.py +F: support/testing/tests/package/test_python_asn1crypto.py F: utils/config F: utils/diffconfig +N: Marcus Hoffmann +F: package/nethogs/ +F: package/pico-sdk/ +F: package/picotool/ +F: package/python-immutabledict/ +F: package/python-jc/ +F: package/python-ruamel-yaml-clib/ +F: support/testing/tests/package/test_python_fastapi.py +F: support/testing/tests/package/test_python_ruamel_yaml.py +F: support/testing/tests/package/sample_python_fastapi.py +F: support/testing/tests/package/sample_python_ruamel_yaml.py + N: Marek Belisko -F: board/friendlyarm/nanopi-neo4/ -F: configs/friendlyarm_nanopi_neo4_defconfig F: package/libatasmart/ F: package/polkit/ F: package/sg3_utils/ @@ -1830,6 +2261,12 @@ F: board/qemu/riscv64-virt/ F: configs/qemu_riscv32_virt_defconfig F: configs/qemu_riscv64_virt_defconfig +N: Marleen Vos +F: board/stmicroelectronics/common/stm32mp1xx/ +F: configs/avenger96_defconfig +F: configs/stm32mp157a_dk1_defconfig +F: configs/stm32mp157c_dk2_defconfig + N: Martin Bark F: board/raspberrypi/ F: configs/raspberrypi3_defconfig @@ -1841,121 +2278,32 @@ F: package/rpi-firmware/ F: package/tzdata/ F: package/zic/ +N: Martin Hundebøll +F: package/python-apispec/ +F: package/python-flask-smorest/ +F: package/python-marshmallow/ +F: package/python-marshmallow-sqlalchemy/ +F: package/python-webargs/ + N: Martin Kepplinger F: package/tslib/ F: package/x11r7/xdriver_xf86-input-tslib/ F: package/x11vnc/ +N: Martin Povišer +F: package/python-construct/ +F: support/testing/tests/package/sample_python_construct.py +F: support/testing/tests/package/test_python_construct.py + N: Masahiro Yamada F: board/arm/foundation-v8/ F: configs/arm_foundationv8_defconfig -N: Mathieu Audat -F: board/technologic/ts4900/ -F: configs/ts4900_defconfig -F: package/ts4900-fpga/ - -N: Matt Weber -F: board/freescale/p* -F: board/freescale/t* -F: board/qemu/ppc64-e5500/ -F: configs/freescale_p* -F: configs/freescale_t* -F: configs/qemu_ppc64_e5500_defconfig -F: package/ace/ -F: package/argp-standalone/ -F: package/aufs/ -F: package/aufs-util/ -F: package/bc/ -F: package/bridge-utils/ -F: package/checkpolicy/ -F: package/checksec/ -F: package/cgroupfs-mount/ -F: package/crda/ -F: package/cunit/ -F: package/dacapo/ -F: package/davici/ -F: package/dnsmasq/ -F: package/dosfstools/ -F: package/eigen/ -F: package/ethtool/ -F: package/flashbench/ -F: package/fmc/ -F: package/fmlib/ -F: package/git/ -F: package/gnutls/ -F: package/hostapd/ -F: package/i2c-tools/ -F: package/ifplugd/ -F: package/igmpproxy/ -F: package/iperf/ -F: package/iperf3/ -F: package/iputils/ -F: package/iw/ -F: package/jitterentropy-library/ -F: package/kvm-unit-tests/ -F: package/kvmtool/ -F: package/libcsv/ -F: package/libcurl/ -F: package/libeastl/ -F: package/libfcgi/ -F: package/libopenssl/ -F: package/libselinux/ -F: package/libsemanage/ -F: package/libsepol/ -F: package/libssh2/ -F: package/libtalloc/ -F: package/libqmi/ -F: package/lighttpd/ -F: package/logrotate/ -F: package/makedevs/ -F: package/memtester/ -F: package/mii-diag/ -F: package/mrouted/ -F: package/mtd/ -F: package/mtools/ -F: package/nginx-upload/ -F: package/omniorb/ -F: package/openresolv/ -F: package/paxtest/ -F: package/picocom/ -F: package/policycoreutils/ -F: package/proftpd/ -F: package/protobuf-c/ -F: package/protobuf/ -F: package/python-bunch/ -F: package/python-colorama/ -F: package/python-filelock/ -F: package/python-flask-cors/ -F: package/python-iptables/ -F: package/python-ipy/ -F: package/python-iwlib/ -F: package/python-posix-ipc/ -F: package/python-pycairo/ -F: package/python-pysftp/ -F: package/python-tinyrpc/ -F: package/python-txdbus/ -F: package/qoriq-rcw/ -F: package/raptor/ -F: package/rng-tools/ -F: package/rsyslog/ -F: package/setools/ -F: package/sloci-image/ -F: package/smcroute/ -F: package/tclap/ -F: package/tini/ -F: package/uboot-tools/ -F: package/unionfs/ -F: package/valijson/ -F: package/wpa_supplicant/ -F: package/wireless_tools/ -F: package/xen/ -F: package/xml-security-c/ -F: support/testing/tests/fs/test_oci.py -F: support/testing/tests/package/br2-external/openjdk/ -F: support/testing/tests/package/test_openjdk.py -F: support/testing/tests/package/test_opkg/ -F: support/testing/tests/package/test_opkg.py +N: Matt Flax +F: package/gtkiostream/ + +N: Matt Silva +F: package/rlwrap/ N: Mauro Condarelli F: package/mc/ @@ -1963,7 +2311,6 @@ F: package/python-autobahn/ F: package/python-cbor/ F: package/python-characteristic/ F: package/python-click/ -F: package/python-crossbar/ F: package/python-lmdb/ F: package/python-mistune/ F: package/python-netaddr/ @@ -1978,6 +2325,9 @@ F: package/python-txaio/ F: package/python-ujson/ F: package/python-wsaccel/ +N: Maksim Kiselev +F: package/ledmon/ + N: Max Filippov F: arch/Config.in.xtensa @@ -1986,9 +2336,15 @@ F: package/libgeos/ F: package/libosmium/ F: package/osm2pgsql/ F: package/postgis/ +F: package/postgresql/ F: package/protozero/ F: package/timescaledb/ +N: Maxime Chevallier +F: package/libtraceevent/ +F: package/libtracefs +F: package/linux-tools/linux-tool-rtla.mk.in + N: Michael Durrant F: board/arcturus/ F: configs/arcturus_ucp1020_defconfig @@ -1999,19 +2355,24 @@ F: package/gnuplot/ F: package/sdl2/ N: Michael Nosthoff +F: package/boost/ +F: package/catch2/ +F: package/fmt/ F: package/grpc/ F: package/gtest/ +F: package/json-for-modern-cpp/ F: package/libabseil-cpp/ F: package/networkd-dispatcher/ F: package/protobuf/ F: package/re2/ - -N: Michael Rommel -F: package/knock/ -F: package/python-crc16/ -F: package/python-pyzmq/ +F: package/spdlog/ +F: package/sqlitecpp/ N: Michael Trimarchi +F: board/bsh/ +F: configs/imx6ulz_bsh_smm_m2_defconfig +F: configs/imx8mn_bsh_smm_s2_defconfig +F: configs/imx8mn_bsh_smm_s2_pro_defconfig F: package/python-spidev/ N: Michael Vetter @@ -2034,23 +2395,18 @@ F: package/openrc/ F: package/skeleton-init-openrc/ N: Michel Stempin -F: board/licheepi/ -F: configs/licheepi_zero_defconfig +F: board/sipeed/licheepi_zero/ +F: configs/sipeed_licheepi_zero_defconfig + +N: Mika Westerberg +F: package/tbtools/ N: Mike Frampton F: package/qcom-db410c-firmware/ -N: Mike Harmony -F: board/sinovoip/m2-plus/ -F: configs/bananapi_m2_plus_defconfig - N: Mikhail Boiko F: package/libfribidi/ -N: Miquèl Raynal -F: package/mali-driver/ -F: package/rockchip-mali/ - N: Mircea Gliga F: package/mbuffer/ @@ -2058,19 +2414,35 @@ N: Murat Demirten F: package/jpeg-turbo/ F: package/libgeotiff/ +N: Nasser Afshin +F: package/python-pycrate/ + N: Nathaniel Roach F: package/bandwidthd/ F: package/libgudev/ -N: Naumann Andreas -F: package/evemu/ -F: package/libevdev/ -F: package/pkg-qmake.mk -F: package/qt5/qt5opcua/ - N: Neal Frager +F: board/versal/ +F: board/xilinx/ +F: board/zynq/ F: board/zynqmp/ +F: boot/xilinx-prebuilt/ +F: configs/versal_vck190_defconfig +F: configs/versal_vek280_defconfig +F: configs/versal_vpk180_defconfig +F: configs/zynq_zc702_defconfig +F: configs/zynq_zc706_defconfig +F: configs/zynqmp_kria_kd240_defconfig +F: configs/zynqmp_kria_kr260_defconfig +F: configs/zynqmp_kria_kv260_defconfig F: configs/zynqmp_zcu102_defconfig +F: configs/zynqmp_zcu104_defconfig +F: configs/zynqmp_zcu106_defconfig +F: package/binutils-bare-metal/ +F: package/bootgen/ +F: package/gcc-bare-metal/ +F: package/newlib-bare-metal/ +F: toolchain/toolchain-bare-metal-buildroot/ N: Nicola Di Lieto F: package/uacme/ @@ -2081,6 +2453,7 @@ F: configs/galileo_defconfig N: Nicolas Carrier F: package/bmap-tools/ +F: package/composer/ F: package/libdbi/ F: package/libdbi-drivers/ F: package/lua-augeas/ @@ -2111,12 +2484,16 @@ F: support/testing/tests/package/test_python_git.py F: support/testing/tests/package/test_python_unittest_xml_reporting.py N: Nicolas Cavallari +F: package/bluez-alsa/ F: package/libgit2/ N: Nicolas Serafini F: package/exiv2/ F: package/ofono/ +N: Niklas Cassel +F: configs/qemu_riscv64_nommu_virt_defconfig + N: Nikolay Dimitrov F: board/embest/riotboard/ F: configs/riotboard_defconfig @@ -2129,14 +2506,15 @@ F: package/tpm-tools/ F: package/trousers/ N: Norbert Lange +F: package/dbus-broker/ F: package/systemd/ F: package/tcf-agent/ -N: Nylon Chen -F: arch/Config.in.nds32 +N: Leo Yu-Chi Liang F: board/andes -F: configs/andes_ae3xx_defconfig -F: toolchain/toolchain-external/toolchain-external-andes-nds32/ +F: configs/andes_ae350_45_defconfig +F: package/andes-spi-burn/ +F: package/kmon/ N: Olaf Rempel F: package/ctorrent/ @@ -2183,6 +2561,9 @@ N: Patrick Havelange F: support/testing/tests/package/test_lxc.py F: support/testing/tests/package/test_lxc/ +N: Patrick Oppenlander +F: package/minisign/ + N: Paul Cercueil F: package/libiio/ F: package/lightning/ @@ -2195,35 +2576,33 @@ F: package/libunistring/ N: Peter Korsgaard F: board/arrow/avenger96/ -F: board/beagleboneai/ +F: board/beagleboard/beagleboneai/ F: board/minnowboard/ F: board/nezha/ F: board/librecomputer/lafrite/ F: board/nexbox/a95x/ F: board/openblocks/a6/ F: board/orangepi/ -F: board/pandaboard/ F: board/roseapplepi/ +F: board/visionfive/ F: boot/shim/ -F: boot/sun20i-d1-spl/ F: configs/avenger96_defconfig F: configs/beagleboneai_defconfig F: configs/lafrite_defconfig -F: configs/minnowboard_max-graphical_defconfig F: configs/minnowboard_max_defconfig F: configs/nexbox_a95x_defconfig F: configs/nezha_defconfig F: configs/openblocks_a6_defconfig F: configs/orangepi_pc_defconfig F: configs/orangepi_r1_defconfig -F: configs/pandaboard_defconfig F: configs/roseapplepi_defconfig F: configs/sheevaplug_defconfig +F: configs/visionfive_defconfig F: package/bats-core/ +F: package/dfu-programmer/ F: package/docker-compose/ F: package/dump1090/ F: package/fatcat/ -F: package/flickcurl/ F: package/fscryptctl/ F: package/ifmetric/ F: package/jo/ @@ -2238,6 +2617,7 @@ F: package/python-cached-property/ F: package/python-docker/ F: package/python-dockerpty/ F: package/python-docker-pycreds/ +F: package/python-hid/ F: package/python-psutil/ F: package/python-request-id/ F: package/python-semver/ @@ -2251,38 +2631,14 @@ F: package/triggerhappy/ F: package/wireguard-linux-compat/ F: package/wireguard-tools/ F: support/testing/tests/package/test_docker_compose.py +F: support/testing/tests/package/test_python_hid.py N: Peter Seiderer -F: board/raspberrypi/ -F: configs/raspberrypi*_defconfig -F: package/assimp/ -F: package/bcm2835/ -F: package/ddrescue/ -F: package/dejavu/ -F: package/dillo/ -F: package/edid-decode/ -F: package/ell/ -F: package/ghostscript-fonts/ -F: package/gstreamer1/gst1-devtools/ -F: package/gstreamer1/gst1-interpipe/ -F: package/gstreamer1/gstreamer1-editing-services/ -F: package/iwd/ -F: package/libcamera-apps/ -F: package/libevdev/ -F: package/libuev/ -F: package/log4cplus/ -F: package/postgresql/ -F: package/python-colorzero/ -F: package/python-flask-wtf/ -F: package/python-gpiozero/ -F: package/qt5/ -F: package/quotatool/ -F: package/racehound/ -F: package/redir/ -F: package/rtl8812au-aircrack-ng/ -F: package/uredir/ -F: package/uqmi/ -F: package/wayland-utils/ +F: package/dotconf/ +F: package/fft-eval/ +F: package/python-blinker/ +F: package/qt5/qt5speech/ +F: package/speechd/ N: Peter Thompson F: package/sdl2_gfx/ @@ -2357,16 +2713,24 @@ F: package/tree/ N: Pieter De Gendt F: package/libvips/ -N: Pieterjan Camerlynck +N: Pieterjan Camerlynck F: package/libdvbpsi/ F: package/mraa/ F: package/synergy/ +N: Prabhu Sannachi +F: package/redis-plus-plus/ + +N: Qais Yousef +F: package/bpftrace/ + N: Rafal Susz F: board/avnet/s6lx9_microboard/ F: configs/s6lx9_microboard_defconfig N: Rafał Miłecki +F: board/broadcom/northstar/ +F: configs/broadcom_northstar_defconfig F: package/firmware-utils/ N: Rahul Bedarkar @@ -2379,6 +2743,9 @@ F: package/gupnp-av/ F: package/let-me-create/ F: package/nanomsg/ +N: Ralf Dragon +F: package/python-pyqt5-sip/ + N: Ramon Fried F: package/bitwise/ @@ -2392,8 +2759,27 @@ F: package/python-jmespath/ F: package/python-pymupdf/ F: package/python-rsa/ F: package/python-s3transfer/ +F: package/python-sdbus/ +F: package/python-sdbus-networkmanager/ +F: support/testing/tests/package/sample_python_jmespath.py +F: support/testing/tests/package/sample_python_pymupdf.py F: support/testing/tests/package/sample_python_rsa.py +F: support/testing/tests/package/sample_python_s3transfer.py +F: support/testing/tests/package/sample_python_sdbus.py +F: support/testing/tests/package/sample_python_sdbus_networkmanager.py +F: support/testing/tests/package/test_python_jmespath.py +F: support/testing/tests/package/test_python_pymupdf.py F: support/testing/tests/package/test_python_rsa.py +F: support/testing/tests/package/test_python_s3transfer.py +F: support/testing/tests/package/test_python_sdbus.py +F: support/testing/tests/package/test_python_sdbus_networkmanager.py + +N: Raphael Pavlidis +F: package/nvidia-persistenced/ +F: package/shadow/ +F: package/slirp4netns/ +F: package/sway/ +F: package/x11r7/xwayland/ N: Refik Tuzakli F: package/freescale-imx/ @@ -2415,7 +2801,9 @@ F: support/testing/run-tests F: support/testing/tests/package/test_atop.py F: support/testing/tests/utils/test_check_package.py F: utils/check-package +F: utils/check-symbols F: utils/checkpackagelib/ +F: utils/checksymbolslib/ F: utils/docker-run N: Richard Braun @@ -2425,22 +2813,35 @@ F: package/tzdata/ N: RJ Ascani F: package/azmq/ +N: Robert Marko +F: package/mdio-tools/ +F: package/mhz/ + N: Robert Rose F: package/grpc/ +N: Roberto Medina +F: board/firefly/roc-rk3399-pc/ +F: configs/roc_pc_rk3399_defconfig + N: Rodrigo Rebello F: package/chocolate-doom/ F: package/irssi/ F: package/vnstat/ N: Romain Naour +F: board/beagleboard/beagleboneai64/ F: board/qemu/ +F: board/ti/am574x-idk/ F: configs/qemu_* +F: configs/am574x_idk_defconfig +F: configs/beagleboneai64_defconfig F: package/alure/ F: package/aubio/ +F: package/bcc/ F: package/binutils/ +F: package/bpftrace/ F: package/bullet/ -F: package/clang/ F: package/clinfo/ F: package/efl/ F: package/enet/ @@ -2448,17 +2849,19 @@ F: package/enlightenment/ F: package/flare-engine/ F: package/flare-game/ F: package/gcc/ +F: package/gitlab-runner/ F: package/glibc/ F: package/irrlicht/ F: package/liblinear/ F: package/lensfun/ F: package/libbpf/ -F: package/libclc/ F: package/libgta/ F: package/libiec61850/ F: package/libspatialindex/ F: package/linux-syscall-support/ -F: package/llvm/ +F: package/llvm-project/clang/ +F: package/llvm-project/libclc/ +F: package/llvm-project/llvm/ F: package/lugaru/ F: package/mcelog/ F: package/mesa3d/ @@ -2468,6 +2871,9 @@ F: package/ogre/ F: package/openpowerlink/ F: package/physfs/ F: package/piglit/ +F: package/python-libevdev/ +F: package/python-pkgconfig/ +F: package/python-tpm2-pytss/ F: package/qemu/ F: package/solarus/ F: package/stress-ng/ @@ -2475,38 +2881,45 @@ F: package/supertux/ F: package/supertuxkart/ F: package/terminology/ F: package/tk/ +F: package/tpm2-openssl/ F: package/upower/ F: package/waffle/ F: package/xenomai/ F: package/zziplib/ +F: support/testing/tests/package/sample_python_mako.py +F: support/testing/tests/package/sample_python_mako_ext.py F: support/testing/tests/package/test_glxinfo.py F: support/testing/tests/package/test_openssh.py +F: support/testing/tests/package/test_python_mako.py F: toolchain/ +N: Roy Kollen Svendsen +F: package/dlib/ +F: package/qt6/ + +N: Rufus Segar +F: package/agent-proxy/ + N: Ryan Wilkins F: package/biosdevname/ +N: Saeed Kazemi +F: package/eza/ +F: package/fd/ +F: package/parsec-tool/ +F: package/procs/ +F: package/mxt-app/ +F: package/zoxide/ + N: Sam Lancia F: package/lrzip/ -N: Samuel Martin -F: package/armadillo/ -F: package/cwiid/ -F: package/flite/ -F: package/nginx/ -F: package/opencv3/ -F: package/openobex/ -F: package/pkg-cmake.mk -F: package/python-numpy/ -F: package/scrub/ -F: package/urg/ -F: package/ussp-push/ -F: support/misc/toolchainfile.cmake.in - N: Sam Voss F: package/ripgrep/ N: Sébastien Szymanski +F: board/armadeus/ +F: configs/armadeus* F: package/mmc-utils/ F: package/python-flask-jsonrpc/ F: package/python-flask-login/ @@ -2518,11 +2931,12 @@ F: package/libbson/ F: package/lua-resty-http/ F: package/mpir/ -N: Sen Hastings +N: Sen Hastings F: package/systemd F: support/scripts/pkg-stats N: Sergey Bobrenok +F: package/basu/ F: package/sdbus-cpp/ N: Sergey Matyukevich @@ -2531,10 +2945,14 @@ F: board/linksprite/pcduino F: board/orangepi/orangepi-zero F: board/orangepi/orangepi-one F: board/orangepi/orangepi-pc-plus/ +F: board/orangepi/orangepi-zero-plus2/ +F: board/orangepi/orangepi-zero2w/ F: configs/linksprite_pcduino_defconfig F: configs/orangepi_one_defconfig F: configs/orangepi_pc_plus_defconfig F: configs/orangepi_zero_defconfig +F: configs/orangepi_zero_plus2_defconfig +F: configs/orangepi_zero2w_defconfig F: package/armbian-firmware/ F: package/hostapd/ F: package/rtl8189fs/ @@ -2560,9 +2978,6 @@ F: package/tunctl/ F: package/ubus/ F: package/wolfssl/ -N: Shyam Saini -F: package/cukinia/ - N: Simon Dawson F: boot/at91bootstrap3/ F: package/cppzmq/ @@ -2577,7 +2992,6 @@ F: package/lcdapi/ F: package/libfreefare/ F: package/libjson/ F: package/libnfc/ -F: package/libnfc/ F: package/libserial/ F: package/libsigsegv/ F: package/macchanger/ @@ -2609,6 +3023,10 @@ F: package/libvpx/ F: package/mesa3d-demos/ F: package/ti-gfx/ +N: Stefan Nickl +F: board/freescale/imx8dxlevk/ +F: configs/freescale_imx8dxlevk_defconfig + N: Stefan Ott F: package/unbound/ @@ -2642,7 +3060,6 @@ F: package/dvdauthor/ F: package/dvdrw-tools/ F: package/memtest86/ F: package/mjpegtools/ -F: package/tovid/ F: package/udftools/ F: package/xorriso/ @@ -2651,107 +3068,70 @@ F: package/hwloc/ F: package/powertop/ N: Suniel Mahesh -F: board/firefly/ -F: board/friendlyarm/nanopc-t4 -F: board/friendlyarm/nanopi-m4 -F: board/orangepi/orangepi-rk3399 F: board/pine64/rockpro64 -F: board/radxa/rockpi-4 F: board/radxa/rockpi-n8 -F: board/radxa/rockpi-n10 -F: configs/friendlyarm_nanopc_t4_defconfig -F: configs/friendlyarm_nanopi_m4_defconfig -F: configs/orangepi_rk3399_defconfig -F: configs/roc_pc_rk3399_defconfig -F: configs/rock_pi_4_defconfig F: configs/rock_pi_n8_defconfig -F: configs/rock_pi_n10_defconfig F: configs/rockpro64_defconfig -F: package/arm-gnu-a-toolchain/ - -N: Sven Haardiek -F: package/lcdproc/ -F: package/python-influxdb/ +F: package/arm-gnu-toolchain/ N: Sven Oliver Moll F: package/most/ +N: TIAN Yuanhao +F: package/cli11/ +F: package/libsolv/ +F: package/open-iscsi/ +F: package/open-isns/ +F: package/reproc/ +F: package/termcolor/ +F: package/tl-expected/ + +N: Takumi Takahashi +F: package/gsettings-desktop-schemas/ +F: package/libcanberra/ + +N: Tan En De +F: package/libkcapi/ + N: Theo Debrouwere -F: board/beagleboardx15/ -F: configs/beagleboardx15_defconfig F: package/pugixml/ N: Thierry Bultel +F: package/dracut/ F: package/mpd-mpc/ N: Thijs Vermeir F: package/ranger/ F: package/x265/ +N: Thomas Bonnefille +F: board/pine64/star64 +F: configs/pine64_star64_defconfig +F: package/starfive-spltool/ + N: Thomas Claveirole F: package/fcgiwrap/ F: package/openlayers/ +F: package/vuejs/ F: package/vuejs-router/ -N: Thomas De Schampheleire -F: docs/manual/ -F: package/cereal/ -F: package/chartjs/ -F: package/datatables/ -F: package/datatables-buttons/ -F: package/datatables-fixedcolumns/ -F: package/datatables-responsive/ -F: package/jszip/ -F: package/libtelnet/ -F: package/opkg-utils/ -F: package/perl-convert-asn1/ -F: package/perl-crypt-blowfish/ -F: package/perl-crypt-cbc/ -F: package/perl-crypt-openssl-aes/ -F: package/perl-devel-cycle/ -F: package/perl-devel-size/ -F: package/perl-i18n/ -F: package/perl-locale-maketext-lexicon/ -F: package/perl-lwp-protocol-https/ -F: package/perl-math-int64/ -F: package/perl-math-prime-util/ -F: package/perl-mime-base64-urlsafe/ -F: package/perl-mojolicious-plugin-authentication/ -F: package/perl-mojolicious-plugin-authorization/ -F: package/perl-mojolicious-plugin-cspheader/ -F: package/perl-mojolicious-plugin-i18n/ -F: package/perl-mojolicious-plugin-securityheader/ -F: package/perl-mozilla-ca/ -F: package/perl-net-snmp/ -F: package/perl-net-ssh2/ -F: package/perl-net-telnet/ -F: package/perl-path-class/ -F: package/pigz/ -F: package/popperjs/ -F: package/xenomai/ -F: support/scripts/size-stats -F: support/testing/tests/package/test_perl_lwp_protocol_https.py -F: utils/size-stats-compare -F: toolchain/ +N: Thomas Devoogdt +F: package/fluent-bit/ +F: package/libsoup3/ N: Thomas Huth -F: board/qemu/m68k-mcf5208/ -F: configs/qemu_m68k_mcf5208_defconfig F: package/ascii-invaders/ -F: package/frotz/ F: package/kvm-unit-tests/ F: package/xorcurses/ +N: Thomas Perale +F: package/go/ + N: Thomas Petazzoni F: arch/Config.in.arm -F: board/beaglev/ F: board/stmicroelectronics/stm32mp157c-dk2/ -F: boot/beaglev-ddrinit/ -F: boot/beaglev-secondboot/ F: boot/boot-wrapper-aarch64/ F: boot/grub2/ -F: boot/gummiboot/ -F: configs/beaglev_defconfig F: configs/stm32mp157c_dk2_defconfig F: package/android-tools/ F: package/b43-firmware/ @@ -2764,6 +3144,7 @@ F: package/cloop/ F: package/cmake/ F: package/cramfs/ F: package/dmidecode/ +F: package/double-conversion/ F: package/flashrom/ F: package/gcc/ F: package/genext2fs/ @@ -2775,6 +3156,7 @@ F: package/hiawatha/ F: package/igh-ethercat/ F: package/intltool/ F: package/jh71xx-tools/ +F: package/libb2/ F: package/libcap/ F: package/libffi/ F: package/libsha1/ @@ -2789,6 +3171,7 @@ F: package/msmtp/ F: package/musl/ F: package/musl-fts/ F: package/ne10/ +F: package/nodejs/ F: package/pkg-python.mk F: package/pkg-autotools.mk F: package/pkg-generic.mk @@ -2796,9 +3179,11 @@ F: package/python3/ F: package/python-augeas/ F: package/python-flask-expects-json/ F: package/python-git/ +F: package/python-qrcode/ F: package/python-serial/ F: package/python-unittest-xml-reporting/ F: package/qextserialport/ +F: package/qt6/ F: package/riscv64-elf-toolchain/ F: package/rpcbind/ F: package/rt-tests/ @@ -2809,17 +3194,24 @@ F: package/squashfs/ F: package/tinifier/ F: package/wayland/ F: package/weston/ +F: support/testing/tests/boot/test_grub.py +F: support/testing/tests/boot/test_grub/ F: support/testing/tests/boot/test_syslinux.py +F: support/testing/tests/package/sample_nodejs_basic.js +F: support/testing/tests/package/sample_nodejs_module.js F: support/testing/tests/package/sample_python_augeas.py F: support/testing/tests/package/sample_python_flask.py F: support/testing/tests/package/sample_python_flask_expects_json.py F: support/testing/tests/package/sample_python_git.py F: support/testing/tests/package/sample_python_unittest_xml_reporting.py +F: support/testing/tests/package/test_nodejs.py F: support/testing/tests/package/test_python_augeas.py F: support/testing/tests/package/test_python_flask.py F: support/testing/tests/package/test_python_flask_expects_json.py F: support/testing/tests/package/test_python_git.py F: support/testing/tests/package/test_python_unittest_xml_reporting.py +F: support/testing/tests/toolchain/test_external_arm.py +F: support/testing/tests/toolchain/test_external_synopsys.py F: toolchain/ N: Timo Ketola @@ -2834,6 +3226,12 @@ F: package/waf/ F: support/testing/tests/package/test_crudini.py F: support/testing/tests/package/test_redis.py +N: Tobias Waldekranz +F: package/kmemd/ + +N: Torben Voltmer +F: package/espflash/ + N: Tudor Holton F: package/openjdk/ @@ -2851,21 +3249,39 @@ F: package/gettext-tiny/ F: package/tinyssh/ N: Valentin Korenblit -F: package/clang/ F: package/clinfo/ -F: package/libclc/ -F: package/llvm/ +F: package/llvm-project/clang/ +F: package/llvm-project/libclc/ +F: package/llvm-project/llvm/ N: Vanya Sergeev F: package/lua-periphery/ +N: Viacheslav Bocharov +F: package/rtl8822cs/ + N: Victor Huesca F: support/testing/tests/core/test_root_password.py +N: Vincent Jardin +F: board/nvidia/bf3/ +F: configs/nvidia_bf3_defconfig +F: package/bfscripts/ +F: package/dpdk/ + N: Vincent Prince F: package/nss-myhostname/ F: package/utp_com/ +N: Vincent Stehlé +F: board/arm/fvp-ebbr/ +F: board/qemu/aarch64-ebbr/ +F: board/qemu/arm-ebbr/ +F: configs/arm_fvp_ebbr_defconfig +F: configs/qemu_aarch64_ebbr_defconfig +F: configs/qemu_arm_ebbr_defconfig +F: package/edk2-non-osi/ + N: Vincent Stehlé F: board/bananapi/bananapi-m2-zero/ F: configs/bananapi_m2_zero_defconfig @@ -2873,6 +3289,10 @@ F: configs/uevm5432_defconfig F: package/i7z/ F: package/msr-tools/ F: package/pixz/ +F: package/zerofree/ +F: support/testing/tests/package/test_msr_tools* +F: support/testing/tests/package/test_pixz.py +F: support/testing/tests/package/test_zerofree.py N: Vinicius Tinti F: package/python-thrift/ @@ -2889,21 +3309,35 @@ N: Wade Berrier F: package/ngrep/ N: Waldemar Brodkorb +F: board/qemu/riscv32-virt/ +F: board/stmicroelectronics/stm32f746-disco/ +F: configs/qemu_riscv32_nommu_virt_defconfig +F: configs/stm32f746_disco_sd_defconfig +F: package/asterisk/ +F: package/evilwm/ +F: package/fbv/ +F: package/libjwt/ F: package/mksh/ F: package/ruby/ F: package/uclibc/ F: package/uclibc-ng-test/ +F: package/zabbix/ +F: support/testing/tests/package/test_ruby.py N: Will Newton F: package/enchant/ F: package/erlang/ F: package/libmicrohttpd/ -F: package/sysprof/ F: package/time/ N: Will Wagner F: package/yaffs2utils/ +N: Witold Lipieta +F: package/python-segno/ +F: support/testing/tests/package/sample_python_segno.py +F: support/testing/tests/package/test_python_segno.py + N: Wojciech M. Zabolotny F: package/avrdude/ F: package/jack2/ @@ -2913,59 +3347,28 @@ F: package/python-pyusb/ N: Wojciech Niziński F: package/fwup/ +N: Woodrow Douglass +F: package/chicken +F: package/opencv4 +F: package/opencv4-contrib + +N: Xuanhao Shi +F: board/ti/am62x-sk/ +F: board/ti/am64x-sk/ +F: boot/ti-k3-boot-firmware/ +F: boot/ti-k3-r5-loader/ +F: configs/ti_am62x_sk_defconfig +F: configs/ti_am64x_sk_defconfig + N: Yair Ben Avraham F: package/casync/ F: package/gloox/ F: package/tpm2-pkcs11/ -N: Yann E. MORIN -F: board/friendlyarm/nanopi-neo/ -F: configs/friendlyarm_nanopi_neo_defconfig -F: fs/squashfs/ -F: package/asterisk/ -F: package/cegui/ -F: package/dahdi-linux/ -F: package/dahdi-tools/ -F: package/dtc/ -F: package/dtv-scan-tables/ -F: package/dvb-apps/ -F: package/freerdp/ -F: package/keyutils/ -F: package/libbsd/ -F: package/libedit/ -F: package/libgsm/ -F: package/libiberty/ -F: package/libinput/ -F: package/libiscsi/ -F: package/libpri/ -F: package/libseccomp/ -F: package/libss7/ -F: package/linux-firmware/ -F: package/linux-tools/ -F: package/matchbox* -F: package/mesa3d-headers/ -F: package/nbd/ -F: package/nut/ -F: package/nvidia-driver/ -F: package/omxplayer/ -F: package/python-pyparsing/ -F: package/pkg-download.mk -F: package/pkg-waf.mk -F: package/slirp/ -F: package/snappy/ -F: package/spice/ -F: package/spice-protocol/ -F: package/systemd/ -F: package/systemd-bootchart/ -F: package/tmux/ -F: package/tvheadend/ -F: package/usbredir/ -F: package/vde2/ -F: package/w_scan/ -F: package/wayland/ -F: package/weston/ -F: package/zisofs-tools/ -F: support/download/ +N: Yann E. MORIN +F: .editorconfig +F: package/gpsd/ +F: package/skopeo/ N: Yegor Yefremov F: configs/beaglebone_defconfig @@ -2997,9 +3400,11 @@ F: package/libsoc/ F: package/libsocketcan/ F: package/libubox/ F: package/libuci/ +F: package/libxmlb/ F: package/linux-firmware/ F: package/linux-serial-test/ F: package/modem-manager/ +F: package/ncftp/ F: package/nftables/ F: package/nuttcp/ F: package/parted/ @@ -3016,8 +3421,16 @@ F: package/wpa_supplicant/ F: package/x11r7/xapp_xconsole/ F: package/x11r7/xapp_xinput-calibrator/ F: package/zlog/ +F: support/testing/tests/package/sample_python_dicttoxml2.py +F: support/testing/tests/package/sample_python_dtschema.py +F: support/testing/tests/package/sample_python_munch.py +F: support/testing/tests/package/sample_python_pysmb.py F: support/testing/tests/package/test_libftdi1.py F: support/testing/tests/package/test_python_can.py +F: support/testing/tests/package/test_python_dicttoxml2.py +F: support/testing/tests/package/test_python_dtschema.py +F: support/testing/tests/package/test_python_munch.py +F: support/testing/tests/package/test_python_pysmb.py F: utils/scanpypi N: Yunhao Tian @@ -3031,6 +3444,7 @@ F: package/libusb-compat/ F: package/proj/ F: package/python-iniparse/ F: package/qjson/ +F: package/qt6/qt6core5compat/ F: package/quazip/ F: package/shapelib/ F: package/simple-mail/ diff --git a/buildroot/Makefile b/buildroot/Makefile index 17f2f912a4..764148f715 100644 --- a/buildroot/Makefile +++ b/buildroot/Makefile @@ -1,8 +1,6 @@ # Makefile for buildroot # -# Copyright (C) 1999-2005 by Erik Andersen -# Copyright (C) 2006-2014 by the Buildroot developers -# Copyright (C) 2014-2020 by the Buildroot developers +# Copyright (C) the Buildroot developers # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -68,13 +66,14 @@ endif CANONICAL_CURDIR = $(realpath $(CURDIR)) REQ_UMASK = 0022 +CUR_UMASK := $(shell umask) # Make sure O= is passed (with its absolute canonical path) everywhere the # toplevel makefile is called back. EXTRAMAKEARGS := O=$(CANONICAL_O) # Check Buildroot execution pre-requisites here. -ifneq ($(shell umask):$(CURDIR):$(O),$(REQ_UMASK):$(CANONICAL_CURDIR):$(CANONICAL_O)) +ifneq ($(CUR_UMASK):$(CURDIR):$(O),$(REQ_UMASK):$(CANONICAL_CURDIR):$(CANONICAL_O)) .PHONY: _all $(MAKECMDGOALS) $(MAKECMDGOALS): _all @@ -83,6 +82,7 @@ $(MAKECMDGOALS): _all _all: @umask $(REQ_UMASK) && \ $(MAKE) -C $(CANONICAL_CURDIR) --no-print-directory \ + BR_ORIG_UMASK=$(CUR_UMASK) \ $(MAKECMDGOALS) $(EXTRAMAKEARGS) else # umask / $(CURDIR) / $(O) @@ -92,9 +92,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2022.02.5 +export BR2_VERSION := 2024.11 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1661977000 +BR2_VERSION_EPOCH = 1733653000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) @@ -125,7 +125,7 @@ endif noconfig_targets := menuconfig nconfig gconfig xconfig config oldconfig randconfig \ defconfig %_defconfig allyesconfig allnoconfig alldefconfig syncconfig release \ randpackageconfig allyespackageconfig allnopackageconfig \ - print-version olddefconfig distclean manual manual-% check-package check-flake8 + print-version olddefconfig distclean manual manual-% check-package # Some global targets do not trigger a build, but are used to collect # metadata, or do various checks. When such targets are triggered, @@ -229,8 +229,6 @@ LEGAL_MANIFEST_CSV_HOST = $(LEGAL_INFO_DIR)/host-manifest.csv LEGAL_WARNINGS = $(LEGAL_INFO_DIR)/.warnings LEGAL_REPORT = $(LEGAL_INFO_DIR)/README -CPE_UPDATES_DIR = $(BASE_DIR)/cpe-updates - BR2_CONFIG = $(CONFIG_DIR)/.config # Pull in the user's configuration file @@ -355,7 +353,7 @@ export HOSTARCH := $(shell LC_ALL=C $(HOSTCC_NOCCACHE) -v 2>&1 | \ # When adding a new host gcc version in Config.in, # update the HOSTCC_MAX_VERSION variable: -HOSTCC_MAX_VERSION := 9 +HOSTCC_MAX_VERSION := 11 HOSTCC_VERSION := $(shell V=$$($(HOSTCC_NOCCACHE) --version | \ sed -n -r 's/^.* ([0-9]*)\.([0-9]*)\.([0-9]*)[ ]*.*/\1 \2/p'); \ @@ -396,6 +394,9 @@ unexport DESTDIR # Causes breakage with packages that needs host-ruby unexport RUBYOPT +# Compilation of perl-related packages will fail otherwise +unexport PERL_MM_OPT + include package/pkg-utils.mk include package/doc-asciidoc.mk @@ -445,6 +446,7 @@ ZCAT := $(call qstrip,$(BR2_ZCAT)) BZCAT := $(call qstrip,$(BR2_BZCAT)) XZCAT := $(call qstrip,$(BR2_XZCAT)) LZCAT := $(call qstrip,$(BR2_LZCAT)) +ZSTDCAT := $(call qstrip,$(BR2_ZSTDCAT)) TAR_OPTIONS = $(call qstrip,$(BR2_TAR_OPTIONS)) -xf ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) @@ -478,8 +480,7 @@ BR_CACHE_DIR ?= $(call qstrip,$(BR2_CCACHE_DIR)) export BR_CACHE_DIR HOSTCC = $(CCACHE) $(HOSTCC_NOCCACHE) HOSTCXX = $(CCACHE) $(HOSTCXX_NOCCACHE) -else -export BR_NO_CCACHE +export BR2_USE_CCACHE ?= 1 endif # Scripts in support/ or post-build scripts may need to reference @@ -565,14 +566,12 @@ 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)),\ @@ -588,16 +587,17 @@ $(BUILD_DIR)/buildroot-config/auto.conf: $(BR2_CONFIG) 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)) + $(EXTRA_ENV) $(s) \ + $(TARGET_DIR) \ + $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS)) \ + $(call qstrip,$(BR2_ROOTFS_PRE_BUILD_SCRIPT_ARGS))$(sep)) .PHONY: world world: target-post-image .PHONY: prepare-sdk prepare-sdk: world - @$(call MESSAGE,"Rendering the SDK relocatable") - PER_PACKAGE_DIR=$(PER_PACKAGE_DIR) $(TOPDIR)/support/scripts/fix-rpath host - PER_PACKAGE_DIR=$(PER_PACKAGE_DIR) $(TOPDIR)/support/scripts/fix-rpath staging + @$(call MESSAGE,"Preparing the SDK") $(INSTALL) -m 755 $(TOPDIR)/support/misc/relocate-sdk.sh $(HOST_DIR)/relocate-sdk.sh mkdir -p $(HOST_DIR)/share/buildroot echo $(HOST_DIR) > $(HOST_DIR)/share/buildroot/sdk-location @@ -649,14 +649,6 @@ STRIP_FIND_SPECIAL_LIBS_CMD = \ \( -name 'ld-*.so*' -o -name 'libpthread*.so*' \) \ -print0 -ifeq ($(BR2_ECLIPSE_REGISTER),y) -define TOOLCHAIN_ECLIPSE_REGISTER - ./support/scripts/eclipse-register-toolchain `readlink -f $(O)` \ - $(notdir $(TARGET_CROSS)) $(BR2_ARCH) -endef -TARGET_FINALIZE_HOOKS += TOOLCHAIN_ECLIPSE_REGISTER -endif - # Generate locale data. ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y) GLIBC_GENERATE_LOCALES = $(call qstrip,$(BR2_GENERATE_LOCALE)) @@ -664,7 +656,7 @@ ifneq ($(GLIBC_GENERATE_LOCALES),) PACKAGES += host-localedef define GENERATE_GLIBC_LOCALES - $(MAKE) -f support/misc/gen-glibc-locales.mk \ + +$(MAKE) -f support/misc/gen-glibc-locales.mk \ ENDIAN=$(call LOWERCASE,$(BR2_ENDIAN)) \ LOCALES="$(GLIBC_GENERATE_LOCALES)" \ Q=$(Q) @@ -722,7 +714,14 @@ STAGING_DIR_FILES_LISTS = $(sort $(wildcard $(BUILD_DIR)/*/.files-list-staging.t .PHONY: host-finalize host-finalize: $(PACKAGES) $(HOST_DIR) $(HOST_DIR_SYMLINK) @$(call MESSAGE,"Finalizing host directory") - $(call per-package-rsync,$(sort $(PACKAGES)),host,$(HOST_DIR)) + $(call per-package-rsync,$(sort $(PACKAGES)),host,$(HOST_DIR),copy) + $(Q)PARALLEL_JOBS=$(PARALLEL_JOBS) \ + PER_PACKAGE_DIR=$(PER_PACKAGE_DIR) \ + $(TOPDIR)/support/scripts/fix-rpath host + $(Q)PARALLEL_JOBS=$(PARALLEL_JOBS) \ + PER_PACKAGE_DIR=$(PER_PACKAGE_DIR) \ + $(TOPDIR)/support/scripts/fix-rpath staging + $(call ppd-fixup-paths,$(BASE_DIR)) .PHONY: staging-finalize staging-finalize: $(STAGING_DIR_SYMLINK) @@ -730,12 +729,12 @@ staging-finalize: $(STAGING_DIR_SYMLINK) .PHONY: target-finalize target-finalize: $(PACKAGES) $(TARGET_DIR) host-finalize @$(call MESSAGE,"Finalizing target directory") - $(call per-package-rsync,$(sort $(PACKAGES)),target,$(TARGET_DIR)) + $(call per-package-rsync,$(sort $(PACKAGES)),target,$(TARGET_DIR),copy) $(foreach hook,$(TARGET_FINALIZE_HOOKS),$($(hook))$(sep)) rm -rf $(TARGET_DIR)/usr/include $(TARGET_DIR)/usr/share/aclocal \ $(TARGET_DIR)/usr/lib/pkgconfig $(TARGET_DIR)/usr/share/pkgconfig \ $(TARGET_DIR)/usr/lib/cmake $(TARGET_DIR)/usr/share/cmake \ - $(TARGET_DIR)/usr/doc + $(TARGET_DIR)/usr/lib/rpm $(TARGET_DIR)/usr/doc find $(TARGET_DIR)/usr/{lib,share}/ -name '*.cmake' -print0 | xargs -0 rm -f find $(TARGET_DIR)/lib/ $(TARGET_DIR)/usr/lib/ $(TARGET_DIR)/usr/libexec/ \ \( -name '*.a' -o -name '*.la' -o -name '*.prl' \) -print0 | xargs -0 rm -f @@ -775,7 +774,9 @@ endif ln -sf ../usr/lib/os-release $(TARGET_DIR)/etc @$(call MESSAGE,"Sanitizing RPATH in target tree") - PER_PACKAGE_DIR=$(PER_PACKAGE_DIR) $(TOPDIR)/support/scripts/fix-rpath target + PARALLEL_JOBS=$(PARALLEL_JOBS) \ + PER_PACKAGE_DIR=$(PER_PACKAGE_DIR) \ + $(TOPDIR)/support/scripts/fix-rpath target # For a merged /usr, ensure that /lib, /bin and /sbin and their /usr # counterparts are appropriately setup as symlinks ones to the others. @@ -806,17 +807,31 @@ endif # merged /usr $(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_BUILD_SCRIPT)), \ @$(call MESSAGE,"Executing post-build script $(s)")$(sep) \ - $(Q)$(EXTRA_ENV) $(s) $(TARGET_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep)) + $(Q)$(EXTRA_ENV) $(s) \ + $(TARGET_DIR) \ + $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS)) \ + $(call qstrip,$(BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS))$(sep)) touch $(TARGET_DIR)/usr +# Note: this will run in the filesystem context, so will use a copy +# of target/, not the real one, so the files are still available on +# re-builds (foo-rebuild, etc...) +define ROOTFS_RM_HWDB_DATA + rm -rf $(TARGET_DIR)/usr/lib/udev/hwdb.d/ $(TARGET_DIR)/etc/udev/hwdb.d/ +endef +ROOTFS_PRE_CMD_HOOKS += ROOTFS_RM_HWDB_DATA + .PHONY: target-post-image target-post-image: $(TARGETS_ROOTFS) target-finalize staging-finalize @rm -f $(ROOTFS_COMMON_TAR) $(Q)mkdir -p $(BINARIES_DIR) @$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_IMAGE_SCRIPT)), \ $(call MESSAGE,"Executing post-image script $(s)"); \ - $(EXTRA_ENV) $(s) $(BINARIES_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep)) + $(EXTRA_ENV) $(s) \ + $(BINARIES_DIR) \ + $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS)) \ + $(call qstrip,$(BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS))$(sep)) .PHONY: source source: $(foreach p,$(PACKAGES),$(p)-all-source) @@ -833,7 +848,7 @@ legal-info-clean: .PHONY: legal-info-prepare legal-info-prepare: $(LEGAL_INFO_DIR) @$(call MESSAGE,"Buildroot $(BR2_VERSION_FULL) Collecting legal info") - @$(call legal-license-file,buildroot,buildroot,support/legal-info/buildroot.hash,COPYING,COPYING,HOST) + @$(call legal-license-file,HOST,buildroot,buildroot,COPYING,COPYING,support/legal-info/buildroot.hash) @$(call legal-manifest,TARGET,PACKAGE,VERSION,LICENSE,LICENSE FILES,SOURCE ARCHIVE,SOURCE SITE,DEPENDENCIES WITH LICENSES) @$(call legal-manifest,HOST,PACKAGE,VERSION,LICENSE,LICENSE FILES,SOURCE ARCHIVE,SOURCE SITE,DEPENDENCIES WITH LICENSES) @$(call legal-manifest,HOST,buildroot,$(BR2_VERSION_FULL),GPL-2.0+,COPYING,not saved,not saved) @@ -929,14 +944,6 @@ pkg-stats: --html $(O)/pkg-stats.html \ --nvd-path $(DL_DIR)/buildroot-nvd -.PHONY: missing-cpe -missing-cpe: - $(Q)mkdir -p $(CPE_UPDATES_DIR) - $(Q)cd "$(CONFIG_DIR)" ; \ - $(TOPDIR)/support/scripts/gen-missing-cpe \ - --nvd-path $(DL_DIR)/buildroot-nvd \ - --output $(CPE_UPDATES_DIR) - else # ifeq ($(BR2_HAVE_DOT_CONFIG),y) # Some subdirectories are also package names. To avoid that "make linux" @@ -1013,13 +1020,18 @@ oldconfig syncconfig olddefconfig: $(BUILD_DIR)/buildroot-config/conf outputmake defconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile @$(COMMON_CONFIG_ENV) $< --defconfig$(if $(DEFCONFIG),=$(DEFCONFIG)) $(CONFIG_CONFIG_IN) -define percent_defconfig -# Override the BR2_DEFCONFIG from COMMON_CONFIG_ENV with the new defconfig -%_defconfig: $(BUILD_DIR)/buildroot-config/conf $(1)/configs/%_defconfig outputmakefile - @$$(COMMON_CONFIG_ENV) BR2_DEFCONFIG=$(1)/configs/$$@ \ - $$< --defconfig=$(1)/configs/$$@ $$(CONFIG_CONFIG_IN) -endef -$(eval $(foreach d,$(call reverse,$(TOPDIR) $(BR2_EXTERNAL_DIRS)),$(call percent_defconfig,$(d))$(sep))) +%_defconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile + @defconfig=$(or \ + $(firstword \ + $(foreach d, \ + $(call reverse,$(TOPDIR) $(BR2_EXTERNAL_DIRS)), \ + $(wildcard $(d)/configs/$@) \ + ) \ + ), \ + $(error "Can't find $@") \ + ); \ + $(COMMON_CONFIG_ENV) BR2_DEFCONFIG=$${defconfig} \ + $< --defconfig=$${defconfig} $(CONFIG_CONFIG_IN) update-defconfig: savedefconfig @@ -1039,7 +1051,7 @@ savedefconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile # staging and target directories do NOT list these as # dependencies anywhere else -$(BUILD_DIR) $(BASE_TARGET_DIR) $(HOST_DIR) $(BINARIES_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST) $(PER_PACKAGE_DIR): +$(BASE_DIR) $(BUILD_DIR) $(BASE_TARGET_DIR) $(HOST_DIR) $(BINARIES_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST) $(PER_PACKAGE_DIR): @mkdir -p $@ # outputmakefile generates a Makefile in the output directory, if using a @@ -1051,23 +1063,22 @@ ifeq ($(NEED_WRAPPER),y) $(Q)$(TOPDIR)/support/scripts/mkmakefile $(TOPDIR) $(O) endif -.PHONY: check-make-version -check-make-version: -ifneq ($(filter $(RUNNING_MAKE_VERSION),4.3),) - @echo "Make 4.3 doesn't support 'printvars' and 'show-vars' recipes" - @exit 1 -endif - # printvars prints all the variables currently defined in our # Makefiles. Alternatively, if a non-empty VARS variable is passed, # only the variables matching the make pattern passed in VARS are # displayed. # show-vars does the same, but as a JSON dictionnary. +# +# 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: check-make-version +printvars: +ifndef VARS + $(error Please pass a non-empty VARS to 'make printvars') +endif @: $(foreach V, \ - $(sort $(filter $(VARS),$(.VARIABLES))), \ + $(sort $(foreach X, $(.VARIABLES), $(filter $(VARS),$(X)))), \ $(if $(filter-out environment% default automatic, \ $(origin $V)), \ $(if $(QUOTED_VARS),\ @@ -1075,28 +1086,35 @@ printvars: check-make-version $(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: check-make-version +show-vars: @: - $(info $(call clean-json, { \ + $(foreach i, \ + $(call clean-json, { \ $(foreach V, \ - $(sort $(filter $(VARS),$(.VARIABLES))), \ - $(if $(filter-out environment% default automatic, $(origin $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)) \ + ) .PHONY: clean clean: rm -rf $(BASE_TARGET_DIR) $(BINARIES_DIR) $(HOST_DIR) $(HOST_DIR_SYMLINK) \ $(BUILD_DIR) $(BASE_DIR)/staging \ - $(LEGAL_INFO_DIR) $(GRAPHS_DIR) $(PER_PACKAGE_DIR) $(CPE_UPDATES_DIR) \ - $(O)/pkg-stats.* + $(LEGAL_INFO_DIR) $(GRAPHS_DIR) $(PER_PACKAGE_DIR) $(O)/pkg-stats.* .PHONY: distclean distclean: clean @@ -1154,6 +1172,9 @@ help: @echo ' - Recursively list packages which have as a dependency' @echo ' -graph-depends - Generate a graph of '\''s dependencies' @echo ' -graph-rdepends - Generate a graph of '\''s reverse dependencies' + @echo ' -graph-both-depends' + @echo ' - Generate a graph of both '\''s forward and' + @echo ' reverse dependencies.' @echo ' -dirclean - Remove build directory' @echo ' -reconfigure - Restart the build from the configure step' @echo ' -rebuild - Restart the build from the build step' @@ -1181,7 +1202,6 @@ help: @echo ' legal-info - generate info about license compliance' @echo ' show-info - generate info about packages, as a JSON blurb' @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' @@ -1239,20 +1259,21 @@ release: print-version: @echo $(BR2_VERSION_FULL) -check-flake8: - $(Q)git ls-tree -r --name-only HEAD \ - | xargs file \ - | grep 'Python script' \ - | cut -d':' -f1 \ - | xargs -- python3 -m flake8 --statistics - check-package: - find $(TOPDIR) -type f \( -name '*.mk' -o -name '*.hash' -o -name 'Config.*' -o -name '*.patch' \) \ - -exec ./utils/check-package --exclude=Sob --exclude=HashSpaces {} + + $(Q)./utils/check-package `git ls-tree -r --name-only HEAD` \ + --ignore-list=$(TOPDIR)/.checkpackageignore + +.PHONY: .checkpackageignore +.checkpackageignore: + $(Q)./utils/check-package --failed-only `git ls-tree -r --name-only HEAD` \ + > .checkpackageignore include docs/manual/manual.mk -include $(foreach dir,$(BR2_EXTERNAL_DIRS),$(sort $(wildcard $(dir)/docs/*/*.mk))) .PHONY: $(noconfig_targets) +# .WAIT was introduced in make 4.4. For older make, define it as phony. +.PHONY: .WAIT + endif #umask / $(CURDIR) / $(O) diff --git a/buildroot/arch/Config.in b/buildroot/arch/Config.in index 1665009a62..e57f4b2baa 100644 --- a/buildroot/arch/Config.in +++ b/buildroot/arch/Config.in @@ -9,10 +9,10 @@ config BR2_KERNEL_64_USERLAND_32 config BR2_SOFT_FLOAT bool -config BR2_ARCH_HAS_MMU_MANDATORY +config BR2_USE_MMU bool -config BR2_ARCH_HAS_MMU_OPTIONAL +config BR2_ARCH_HAS_FDPIC_SUPPORT bool choice @@ -23,7 +23,7 @@ choice config BR2_arcle bool "ARC (little endian)" - select BR2_ARCH_HAS_MMU_MANDATORY + select BR2_USE_MMU help Synopsys' DesignWare ARC Processor Cores are a family of 32-bit CPUs that can be used from deeply embedded to high @@ -31,7 +31,7 @@ config BR2_arcle config BR2_arceb bool "ARC (big endian)" - select BR2_ARCH_HAS_MMU_MANDATORY + select BR2_USE_MMU help Synopsys' DesignWare ARC Processor Cores are a family of 32-bit CPUs that can be used from deeply embedded to high @@ -49,7 +49,7 @@ config BR2_arm config BR2_armeb bool "ARM (big endian)" - select BR2_ARCH_HAS_MMU_MANDATORY + select BR2_USE_MMU help ARM is a 32-bit reduced instruction set computer (RISC) instruction set architecture (ISA) developed by ARM Holdings. @@ -60,7 +60,6 @@ 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 @@ -69,25 +68,14 @@ 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 http://en.wikipedia.org/wiki/ARM -config BR2_csky - bool "csky" - select BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT - select BR2_ARCH_HAS_MMU_MANDATORY - select BR2_ARCH_NEEDS_GCC_AT_LEAST_9 - help - csky is processor IP from china. - http://www.c-sky.com/ - http://www.github.com/c-sky - config BR2_i386 bool "i386" - select BR2_ARCH_HAS_MMU_MANDATORY + select BR2_USE_MMU help Intel i386 architecture compatible microprocessor http://en.wikipedia.org/wiki/I386 @@ -101,7 +89,7 @@ config BR2_m68k config BR2_microblazeel bool "Microblaze AXI (little endian)" - select BR2_ARCH_HAS_MMU_MANDATORY + select BR2_USE_MMU help Soft processor core designed for Xilinx FPGAs from Xilinx. AXI bus based architecture (little endian) @@ -110,7 +98,7 @@ config BR2_microblazeel config BR2_microblazebe bool "Microblaze non-AXI (big endian)" - select BR2_ARCH_HAS_MMU_MANDATORY + select BR2_USE_MMU help Soft processor core designed for Xilinx FPGAs from Xilinx. PLB bus based architecture (non-AXI, big endian) @@ -119,7 +107,7 @@ config BR2_microblazebe config BR2_mips bool "MIPS (big endian)" - select BR2_ARCH_HAS_MMU_MANDATORY + select BR2_USE_MMU help MIPS is a RISC microprocessor from MIPS Technologies. Big endian. @@ -128,7 +116,7 @@ config BR2_mips config BR2_mipsel bool "MIPS (little endian)" - select BR2_ARCH_HAS_MMU_MANDATORY + select BR2_USE_MMU help MIPS is a RISC microprocessor from MIPS Technologies. Little endian. @@ -138,7 +126,7 @@ config BR2_mipsel config BR2_mips64 bool "MIPS64 (big endian)" select BR2_ARCH_IS_64 - select BR2_ARCH_HAS_MMU_MANDATORY + select BR2_USE_MMU help MIPS is a RISC microprocessor from MIPS Technologies. Big endian. @@ -148,24 +136,16 @@ config BR2_mips64 config BR2_mips64el bool "MIPS64 (little endian)" select BR2_ARCH_IS_64 - select BR2_ARCH_HAS_MMU_MANDATORY + select BR2_USE_MMU help MIPS is a RISC microprocessor from MIPS Technologies. Little endian. http://www.mips.com/ http://en.wikipedia.org/wiki/MIPS_Technologies -config BR2_nds32 - bool "nds32" - select BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT - select BR2_ARCH_HAS_MMU_MANDATORY - help - nds32 is a 32-bit architecture developed by Andes Technology. - https://en.wikipedia.org/wiki/Andes_Technology - config BR2_nios2 bool "Nios II" - select BR2_ARCH_HAS_MMU_MANDATORY + select BR2_USE_MMU help Nios II is a soft core processor from Altera Corporation. http://www.altera.com/ @@ -173,14 +153,14 @@ config BR2_nios2 config BR2_or1k bool "OpenRISC" - select BR2_ARCH_HAS_MMU_MANDATORY + select BR2_USE_MMU help OpenRISC is a free and open processor for embedded system. http://openrisc.io config BR2_powerpc bool "PowerPC" - select BR2_ARCH_HAS_MMU_MANDATORY + select BR2_USE_MMU help PowerPC is a RISC architecture created by Apple-IBM-Motorola alliance. Big endian. @@ -190,7 +170,7 @@ config BR2_powerpc config BR2_powerpc64 bool "PowerPC64 (big endian)" select BR2_ARCH_IS_64 - select BR2_ARCH_HAS_MMU_MANDATORY + select BR2_USE_MMU help PowerPC is a RISC architecture created by Apple-IBM-Motorola alliance. Big endian. @@ -200,7 +180,7 @@ config BR2_powerpc64 config BR2_powerpc64le bool "PowerPC64 (little endian)" select BR2_ARCH_IS_64 - select BR2_ARCH_HAS_MMU_MANDATORY + select BR2_USE_MMU help PowerPC is a RISC architecture created by Apple-IBM-Motorola alliance. Little endian. @@ -220,7 +200,7 @@ config BR2_riscv config BR2_s390x bool "s390x" select BR2_ARCH_IS_64 - select BR2_ARCH_HAS_MMU_MANDATORY + select BR2_USE_MMU help s390x is a big-endian architecture made by IBM. http://www.ibm.com/ @@ -228,7 +208,7 @@ config BR2_s390x config BR2_sh bool "SuperH" - select BR2_ARCH_HAS_MMU_MANDATORY + select BR2_USE_MMU help SuperH (or SH) is a 32-bit reduced instruction set computer (RISC) instruction set architecture (ISA) developed by @@ -238,7 +218,7 @@ config BR2_sh config BR2_sparc bool "SPARC" - select BR2_ARCH_HAS_MMU_MANDATORY + select BR2_USE_MMU help SPARC (from Scalable Processor Architecture) is a RISC instruction set architecture (ISA) developed by Sun @@ -249,7 +229,7 @@ config BR2_sparc config BR2_sparc64 bool "SPARC64" select BR2_ARCH_IS_64 - select BR2_ARCH_HAS_MMU_MANDATORY + select BR2_USE_MMU help SPARC (from Scalable Processor Architecture) is a RISC instruction set architecture (ISA) developed by Sun @@ -260,7 +240,7 @@ config BR2_sparc64 config BR2_x86_64 bool "x86_64" select BR2_ARCH_IS_64 - select BR2_ARCH_HAS_MMU_MANDATORY + select BR2_USE_MMU help x86-64 is an extension of the x86 instruction set (Intel i386 architecture compatible microprocessor). @@ -323,6 +303,22 @@ config BR2_ARCH_NEEDS_GCC_AT_LEAST_11 bool select BR2_ARCH_NEEDS_GCC_AT_LEAST_10 +config BR2_ARCH_NEEDS_GCC_AT_LEAST_12 + bool + select BR2_ARCH_NEEDS_GCC_AT_LEAST_11 + +config BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + bool + select BR2_ARCH_NEEDS_GCC_AT_LEAST_12 + +config BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + bool + select BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + +config BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + bool + select BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + # The following string values are defined by the individual # Config.in.$ARCH files config BR2_ARCH @@ -377,56 +373,6 @@ config BR2_BINFMT_SUPPORTS_SHARED config BR2_READELF_ARCH_NAME string -# Set up target binary format -choice - prompt "Target Binary Format" - default BR2_BINFMT_ELF if BR2_USE_MMU - default BR2_BINFMT_FLAT - -config BR2_BINFMT_ELF - bool "ELF" - depends on BR2_USE_MMU - select BR2_BINFMT_SUPPORTS_SHARED - help - ELF (Executable and Linkable Format) is a format for libraries - and executables used across different architectures and - operating systems. - -config BR2_BINFMT_FLAT - bool "FLAT" - depends on !BR2_USE_MMU - help - FLAT binary is a relatively simple and lightweight executable - format based on the original a.out format. It is widely used - in environment where no MMU is available. - -endchoice - -# Set up flat binary type -choice - prompt "FLAT Binary type" - default BR2_BINFMT_FLAT_ONE - depends on BR2_BINFMT_FLAT - -config BR2_BINFMT_FLAT_ONE - bool "One memory region" - help - All segments are linked into one memory region. - -config BR2_BINFMT_FLAT_SHARED - bool "Shared binary" - depends on BR2_m68k - # Even though this really generates shared binaries, there is no libdl - # and dlopen() cannot be used. So packages that require shared - # libraries cannot be built. Therefore, we don't select - # BR2_BINFMT_SUPPORTS_SHARED and therefore force BR2_STATIC_LIBS. - # Although this adds -static to the compilation, that's not a problem - # because the -mid-shared-library option overrides it. - help - Allow to load and link indiviual FLAT binaries at run time. - -endchoice - if BR2_arcle || BR2_arceb source "arch/Config.in.arc" endif @@ -435,10 +381,6 @@ if BR2_arm || BR2_armeb || BR2_aarch64 || BR2_aarch64_be source "arch/Config.in.arm" endif -if BR2_csky -source "arch/Config.in.csky" -endif - if BR2_m68k source "arch/Config.in.m68k" endif @@ -451,10 +393,6 @@ if BR2_mips || BR2_mips64 || BR2_mipsel || BR2_mips64el source "arch/Config.in.mips" endif -if BR2_nds32 -source "arch/Config.in.nds32" -endif - if BR2_nios2 source "arch/Config.in.nios2" endif @@ -491,4 +429,39 @@ if BR2_xtensa source "arch/Config.in.xtensa" endif +# Set up target binary format +choice + prompt "Target Binary Format" + default BR2_BINFMT_ELF if BR2_USE_MMU + default BR2_BINFMT_FLAT + +config BR2_BINFMT_ELF + bool "ELF" + depends on BR2_USE_MMU + select BR2_BINFMT_SUPPORTS_SHARED + help + ELF (Executable and Linkable Format) is a format for libraries + and executables used across different architectures and + operating systems. + +config BR2_BINFMT_FDPIC + bool "FDPIC" + depends on BR2_ARCH_HAS_FDPIC_SUPPORT + select BR2_BINFMT_SUPPORTS_SHARED + help + ELF FDPIC binaries are based on ELF, but allow the individual + load segments of a binary to be located in memory + independently of each other. This makes this format ideal for + use in environments where no MMU is available. + +config BR2_BINFMT_FLAT + bool "FLAT" + depends on !BR2_USE_MMU + help + FLAT binary is a relatively simple and lightweight executable + format based on the original a.out format. It is widely used + in environment where no MMU is available. + +endchoice + endmenu # Target options diff --git a/buildroot/arch/Config.in.arc b/buildroot/arch/Config.in.arc index 388d3496bc..f367c49131 100644 --- a/buildroot/arch/Config.in.arc +++ b/buildroot/arch/Config.in.arc @@ -3,7 +3,7 @@ choice default BR2_arc770d depends on BR2_arc help - Specific CPU to use + Specific CPU to use config BR2_arc750d bool "ARC 750D" @@ -40,12 +40,12 @@ config BR2_archs38_full config BR2_archs4x_rel31 bool "ARC HS48 rel 31" help - Build for HS48 release 3.1 + Build for HS48 release 3.1 config BR2_archs4x bool "ARC HS48" help - Latest release of HS48 processor + Latest release of HS48 processor - Dual and Quad multiply and MAC operations - Double-precision FPU diff --git a/buildroot/arch/Config.in.arm b/buildroot/arch/Config.in.arm index 657923f14b..219215d122 100644 --- a/buildroot/arch/Config.in.arm +++ b/buildroot/arch/Config.in.arm @@ -73,21 +73,27 @@ config BR2_ARM_CPU_HAS_THUMB2 config BR2_ARM_CPU_ARMV4 bool + select BR2_USE_MMU config BR2_ARM_CPU_ARMV5 bool + select BR2_USE_MMU config BR2_ARM_CPU_ARMV6 bool + select BR2_USE_MMU config BR2_ARM_CPU_ARMV7A bool + select BR2_USE_MMU config BR2_ARM_CPU_ARMV7M bool + select BR2_ARCH_HAS_FDPIC_SUPPORT config BR2_ARM_CPU_ARMV8A bool + select BR2_USE_MMU choice prompt "Target Architecture Variant" @@ -103,23 +109,19 @@ 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 @@ -128,18 +130,11 @@ 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 @@ -147,34 +142,29 @@ 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 @@ -184,7 +174,6 @@ 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 @@ -192,7 +181,6 @@ 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 @@ -200,7 +188,6 @@ 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 @@ -208,7 +195,6 @@ 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 @@ -216,7 +202,6 @@ 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 @@ -224,7 +209,6 @@ 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 @@ -232,7 +216,6 @@ 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" @@ -241,7 +224,6 @@ 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" @@ -250,14 +232,12 @@ 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 @@ -289,7 +269,6 @@ 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" @@ -298,7 +277,6 @@ 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" @@ -307,7 +285,6 @@ 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 @@ -315,7 +292,6 @@ 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 @@ -323,7 +299,6 @@ 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" @@ -332,7 +307,6 @@ 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" @@ -341,7 +315,6 @@ 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" @@ -350,7 +323,6 @@ 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" @@ -359,7 +331,6 @@ 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" @@ -368,14 +339,12 @@ 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" @@ -384,63 +353,54 @@ 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" @@ -449,7 +409,6 @@ 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" @@ -458,21 +417,18 @@ 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" @@ -481,21 +437,18 @@ 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" @@ -504,7 +457,6 @@ 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" @@ -513,7 +465,6 @@ 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)" @@ -522,14 +473,12 @@ 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" @@ -538,7 +487,6 @@ 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 @@ -819,6 +767,35 @@ config BR2_ARM_INSTRUCTIONS_THUMB2 endchoice +choice + prompt "MMU Page Size" + default BR2_ARM64_PAGE_SIZE_4K + depends on BR2_aarch64 || BR2_aarch64_be + help + The default is 4KB, and you should probably keep this unless + you know what you are doing. In particular, the kernel + configuration must match this choice. If your kernel is + built by Buildroot, the kernel configuration is + automatically adjusted, but not if you built your kernel + outside of Buildroot. + +config BR2_ARM64_PAGE_SIZE_4K + bool "4KB" + +config BR2_ARM64_PAGE_SIZE_16K + bool "16KB" + +config BR2_ARM64_PAGE_SIZE_64K + bool "64KB" + +endchoice + +config BR2_ARM64_PAGE_SIZE + string + default "4K" if BR2_ARM64_PAGE_SIZE_4K + default "16K" if BR2_ARM64_PAGE_SIZE_16K + default "64K" if BR2_ARM64_PAGE_SIZE_64K + config BR2_ARCH default "arm" if BR2_arm default "armeb" if BR2_armeb @@ -841,7 +818,6 @@ config BR2_GCC_TARGET_CPU default "strongarm" if BR2_strongarm # armv5 default "arm926ej-s" if BR2_arm926t - default "iwmmxt" if BR2_iwmmxt default "xscale" if BR2_xscale # armv6 default "arm1136j-s" if BR2_arm1136j_s diff --git a/buildroot/arch/Config.in.csky b/buildroot/arch/Config.in.csky deleted file mode 100644 index b20b39e225..0000000000 --- a/buildroot/arch/Config.in.csky +++ /dev/null @@ -1,52 +0,0 @@ -choice - prompt "Target Architecture Variant" - default BR2_ck610 - help - Specific CPU variant to use - -config BR2_ck610 - # Not supported by upstream gcc <= 9, and handled as a special - # exception in package/gcc/Config.in.host - bool "ck610" - -config BR2_ck807 - bool "ck807" - -config BR2_ck810 - bool "ck810" - -config BR2_ck860 - bool "ck860" - -endchoice - -config BR2_CSKY_FPU - bool "Enable FPU coprocessor" - depends on BR2_ck810 || BR2_ck807 || BR2_ck860 - help - You can say N here if your C-SKY CPU doesn't have a - Floating-Point Coprocessor or if you don't need FPU support - for your user-space programs. - -config BR2_CSKY_VDSP - bool "Enable VDSP enhanced instructions Co-processor" - depends on BR2_CSKY_FPU - -config BR2_GCC_TARGET_FLOAT_ABI - default "soft" if !BR2_CSKY_FPU - default "hard" if BR2_CSKY_FPU - -config BR2_ARCH - default "csky" - -config BR2_NORMALIZED_ARCH - default "csky" - -config BR2_ENDIAN - default "LITTLE" - -config BR2_READELF_ARCH_NAME - default "CSKY" - -# vim: ft=kconfig -# -*- mode:kconfig; -*- diff --git a/buildroot/arch/Config.in.m68k b/buildroot/arch/Config.in.m68k index 1f7d944621..235cafacf5 100644 --- a/buildroot/arch/Config.in.m68k +++ b/buildroot/arch/Config.in.m68k @@ -23,10 +23,15 @@ choice help Specific CPU variant to use +config BR2_m68k_68030 + bool "68030" + select BR2_m68k_m68k + select BR2_USE_MMU + config BR2_m68k_68040 bool "68040" select BR2_m68k_m68k - select BR2_ARCH_HAS_MMU_MANDATORY + select BR2_USE_MMU config BR2_m68k_cf5208 bool "5208" @@ -36,6 +41,7 @@ config BR2_m68k_cf5208 endchoice config BR2_GCC_TARGET_CPU + default "68030" if BR2_m68k_68030 default "68040" if BR2_m68k_68040 default "5208" if BR2_m68k_cf5208 diff --git a/buildroot/arch/Config.in.mips b/buildroot/arch/Config.in.mips index 7f44f06c9d..29b4180d21 100644 --- a/buildroot/arch/Config.in.mips +++ b/buildroot/arch/Config.in.mips @@ -40,8 +40,8 @@ choice help Specific CPU variant to use - 64bit capable: 64, 64r2, 64r3, 64r5, 64r6 - non-64bit capable: 32, 32r2, 32r3, 32r5, 32r6 + 64bit capable: mips4, 64, 64r2, 64r3, 64r5, 64r6 + non-64bit capable: mips4, 32, 32r2, 32r3, 32r5, 32r6 config BR2_mips_32 bool "Generic MIPS32" @@ -97,6 +97,8 @@ config BR2_mips_xburst to be used in order to prevent emitting these instructions. See http://www.ingenic.com/en/?xburst.html +config BR2_mips4 + bool "MIPS IV" config BR2_mips_64 bool "Generic MIPS64" depends on BR2_ARCH_IS_64 @@ -262,6 +264,7 @@ config BR2_GCC_TARGET_ARCH default "octeon2" if BR2_mips_octeon2 default "octeon3" if BR2_mips_octeon3 default "p6600" if BR2_mips_p6600 + default "mips4" if BR2_mips4 config BR2_MIPS_OABI32 bool diff --git a/buildroot/arch/Config.in.nds32 b/buildroot/arch/Config.in.nds32 deleted file mode 100644 index 0babb2cf7f..0000000000 --- a/buildroot/arch/Config.in.nds32 +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_ARCH - default "nds32le" - -config BR2_NORMALIZED_ARCH - default "nds32" - -config BR2_GCC_TARGET_ARCH - default "v3" - -config BR2_ENDIAN - default "LITTLE" - -config BR2_READELF_ARCH_NAME - default "Andes Technology compact code size embedded RISC processor family" - -# vim: ft=kconfig -# -*- mode:kconfig; -*- diff --git a/buildroot/arch/Config.in.powerpc b/buildroot/arch/Config.in.powerpc index db74270405..3f4d348d5f 100644 --- a/buildroot/arch/Config.in.powerpc +++ b/buildroot/arch/Config.in.powerpc @@ -1,6 +1,10 @@ config BR2_POWERPC_CPU_HAS_ALTIVEC bool +config BR2_POWERPC_CPU_HAS_VSX + bool + select BR2_POWERPC_CPU_HAS_ALTIVEC + config BR2_POWERPC_CPU_HAS_SPE bool @@ -12,145 +16,134 @@ choice config BR2_generic_powerpc bool "generic" # No C library supports this variant on ppc64le - depends on !BR2_powerpc64le + depends on BR2_powerpc || BR2_powerpc64 config BR2_powerpc_401 bool "401" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc config BR2_powerpc_403 bool "403" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc config BR2_powerpc_405 bool "405" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc config BR2_powerpc_405fp bool "405 with FPU" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc config BR2_powerpc_440 bool "440" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc config BR2_powerpc_440fp bool "440 with FPU" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc config BR2_powerpc_464 bool "464" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc config BR2_powerpc_464fp bool "464 with FPU" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc config BR2_powerpc_476 bool "476" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc config BR2_powerpc_476fp bool "476 with FPU" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc config BR2_powerpc_505 bool "505" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc config BR2_powerpc_602 bool "602" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc config BR2_powerpc_603 bool "603" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc config BR2_powerpc_603e bool "603e" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc config BR2_powerpc_604 bool "604" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc config BR2_powerpc_604e bool "604e" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc config BR2_powerpc_620 bool "620" - # No C library supports this variant on ppc64le - depends on !BR2_powerpc64le + depends on BR2_powerpc || BR2_powerpc64 config BR2_powerpc_630 bool "630" - # No C library supports this variant on ppc64le - depends on !BR2_powerpc64le + depends on BR2_powerpc || BR2_powerpc64 config BR2_powerpc_740 bool "740" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc config BR2_powerpc_7400 bool "7400" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc select BR2_POWERPC_CPU_HAS_ALTIVEC config BR2_powerpc_7450 bool "7450" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc select BR2_POWERPC_CPU_HAS_ALTIVEC config BR2_powerpc_750 bool "750" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc config BR2_powerpc_821 bool "821" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc config BR2_powerpc_823 bool "823" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc config BR2_powerpc_860 bool "860" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc config BR2_powerpc_970 bool "970" + depends on BR2_powerpc || BR2_powerpc64 select BR2_POWERPC_CPU_HAS_ALTIVEC config BR2_powerpc_8540 bool "8540 / e500v1" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc select BR2_POWERPC_CPU_HAS_SPE config BR2_powerpc_8548 bool "8548 / e500v2" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc select BR2_POWERPC_CPU_HAS_SPE config BR2_powerpc_e300c2 bool "e300c2" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc config BR2_powerpc_e300c3 bool "e300c3" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc config BR2_powerpc_e500mc bool "e500mc" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc config BR2_powerpc_e5500 bool "e5500" - depends on !BR2_powerpc64le + depends on BR2_powerpc || BR2_powerpc64 config BR2_powerpc_e6500 bool "e6500" - depends on !BR2_powerpc64le + depends on BR2_powerpc || BR2_powerpc64 select BR2_POWERPC_CPU_HAS_ALTIVEC config BR2_powerpc_power4 bool "power4" - # No C library supports this variant on ppc64le - depends on !BR2_powerpc64le + depends on BR2_powerpc || BR2_powerpc64 config BR2_powerpc_power5 bool "power5" - # No C library supports this variant on ppc64le - depends on !BR2_powerpc64le + depends on BR2_powerpc || BR2_powerpc64 config BR2_powerpc_power6 bool "power6" + depends on BR2_powerpc || BR2_powerpc64 select BR2_POWERPC_CPU_HAS_ALTIVEC config BR2_powerpc_power7 bool "power7" - select BR2_POWERPC_CPU_HAS_ALTIVEC + depends on BR2_powerpc || BR2_powerpc64 + select BR2_POWERPC_CPU_HAS_VSX config BR2_powerpc_power8 bool "power8" + select BR2_POWERPC_CPU_HAS_VSX +config BR2_powerpc_power9 + bool "power9" select BR2_POWERPC_CPU_HAS_ALTIVEC -endchoice - -choice - prompt "Target ABI" - default BR2_powerpc_SPE if BR2_POWERPC_CPU_HAS_SPE - default BR2_powerpc_CLASSIC - help - Application Binary Interface to use - -config BR2_powerpc_CLASSIC - bool "Classic" - depends on !BR2_POWERPC_CPU_HAS_SPE -config BR2_powerpc_SPE - bool "SPE" - depends on BR2_POWERPC_CPU_HAS_SPE + select BR2_POWERPC_CPU_HAS_VSX + select BR2_ARCH_NEEDS_GCC_AT_LEAST_6 endchoice config BR2_POWERPC_SOFT_FLOAT @@ -213,6 +206,7 @@ config BR2_GCC_TARGET_CPU default "power6" if BR2_powerpc_power6 default "power7" if BR2_powerpc_power7 default "power8" if BR2_powerpc_power8 + default "power9" if BR2_powerpc_power9 config BR2_READELF_ARCH_NAME default "PowerPC" if BR2_powerpc diff --git a/buildroot/arch/Config.in.riscv b/buildroot/arch/Config.in.riscv index 30bdcaa80b..23d095d1a6 100644 --- a/buildroot/arch/Config.in.riscv +++ b/buildroot/arch/Config.in.riscv @@ -1,23 +1,5 @@ # RISC-V CPU ISA extensions. -config BR2_RISCV_ISA_RVI - bool - -config BR2_RISCV_ISA_RVM - bool - -config BR2_RISCV_ISA_RVA - bool - -config BR2_RISCV_ISA_RVF - bool - -config BR2_RISCV_ISA_RVD - bool - -config BR2_RISCV_ISA_RVC - bool - choice prompt "Target Architecture Variant" default BR2_riscv_g @@ -35,35 +17,33 @@ config BR2_riscv_g config BR2_riscv_custom bool "Custom architecture" select BR2_RISCV_ISA_RVI - select BR2_RISCV_ISA_CUSTOM_RVA endchoice -if BR2_riscv_custom - comment "Instruction Set Extensions" -config BR2_RISCV_ISA_CUSTOM_RVM +config BR2_RISCV_ISA_RVI + bool "Base Integer (I)" + +config BR2_RISCV_ISA_RVM bool "Integer Multiplication and Division (M)" - select BR2_RISCV_ISA_RVM -config BR2_RISCV_ISA_CUSTOM_RVA +config BR2_RISCV_ISA_RVA bool "Atomic Instructions (A)" - select BR2_RISCV_ISA_RVA -config BR2_RISCV_ISA_CUSTOM_RVF +config BR2_RISCV_ISA_RVF bool "Single-precision Floating-point (F)" - select BR2_RISCV_ISA_RVF -config BR2_RISCV_ISA_CUSTOM_RVD +config BR2_RISCV_ISA_RVD bool "Double-precision Floating-point (D)" depends on BR2_RISCV_ISA_RVF - select BR2_RISCV_ISA_RVD -config BR2_RISCV_ISA_CUSTOM_RVC +config BR2_RISCV_ISA_RVC bool "Compressed Instructions (C)" - select BR2_RISCV_ISA_RVC -endif + +config BR2_RISCV_ISA_RVV + bool "Vector Instructions (V)" + select BR2_ARCH_NEEDS_GCC_AT_LEAST_12 choice prompt "Target Architecture Size" @@ -71,15 +51,21 @@ 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 +config BR2_RISCV_USE_MMU + bool "MMU support" + default y + select BR2_USE_MMU + help + Enable this option if your RISC-V core has a MMU (Memory + Management Unit). + choice prompt "Target ABI" default BR2_RISCV_ABI_ILP32D if !BR2_ARCH_IS_64 && BR2_RISCV_ISA_RVD diff --git a/buildroot/arch/Config.in.x86 b/buildroot/arch/Config.in.x86 index c770ae3ffe..f9b32130b2 100644 --- a/buildroot/arch/Config.in.x86 +++ b/buildroot/arch/Config.in.x86 @@ -19,12 +19,20 @@ config BR2_X86_CPU_HAS_AVX bool config BR2_X86_CPU_HAS_AVX2 bool + +# BR2_X86_CPU_HAS_AVX512 implies the following AVX512 extensions: +# AVX512F, AVX512BW, AVX512CD, AVX512DQ, AVX512VL +# This subset is common to Intel Xeon (excl Xeon Phi), AMD Zen 4, and +# the x86-64-v4 psABI. +# +# Only select BR2_X86_CPU_HAS_AVX512 if the CPU supports this entire +# subset of extensions. 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 +# https://gcc.gnu.org/onlinedocs/gcc-13.2.0/gcc/x86-Options.html choice prompt "Target Architecture Variant" default BR2_x86_i586 if BR2_i386 @@ -64,6 +72,7 @@ config BR2_x86_pentium_m depends on !BR2_x86_64 select BR2_X86_CPU_HAS_MMX select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 config BR2_x86_pentium2 bool "pentium2" depends on !BR2_x86_64 @@ -227,6 +236,17 @@ config BR2_x86_sandybridge select BR2_X86_CPU_HAS_SSE42 select BR2_X86_CPU_HAS_AVX select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 +config BR2_x86_ivybridge + bool "ivybridge" + 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 @@ -335,6 +355,30 @@ config BR2_x86_tremont select BR2_X86_CPU_HAS_SSE4 select BR2_X86_CPU_HAS_SSE42 select BR2_ARCH_NEEDS_GCC_AT_LEAST_9 +config BR2_x86_sierraforest + bool "sierraforest" + 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_13 +config BR2_x86_grandridge + bool "grandridge" + 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_13 config BR2_x86_skylake_avx512 bool "skylake-avx512" select BR2_X86_CPU_HAS_MMX @@ -439,6 +483,8 @@ config BR2_x86_sapphirerapids select BR2_X86_CPU_HAS_AVX2 select BR2_X86_CPU_HAS_AVX512 select BR2_ARCH_NEEDS_GCC_AT_LEAST_11 + help + Use for Sapphire Rapids, Emerald Rapids config BR2_x86_alderlake bool "alderlake" select BR2_X86_CPU_HAS_MMX @@ -450,8 +496,9 @@ config BR2_x86_alderlake 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 + Use for Alder Lake, Raptor Lake, Meteor Lake config BR2_x86_rocketlake bool "rocketlake" select BR2_X86_CPU_HAS_MMX @@ -465,6 +512,32 @@ config BR2_x86_rocketlake select BR2_X86_CPU_HAS_AVX2 select BR2_X86_CPU_HAS_AVX512 select BR2_ARCH_NEEDS_GCC_AT_LEAST_11 +config BR2_x86_graniterapids + bool "graniterapids" + 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_13 +config BR2_x86_graniterapids_d + bool "graniterapids-d" + 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_13 config BR2_x86_k6 bool "k6" depends on !BR2_x86_64 @@ -502,6 +575,13 @@ config BR2_x86_barcelona select BR2_X86_CPU_HAS_SSE select BR2_X86_CPU_HAS_SSE2 select BR2_X86_CPU_HAS_SSE3 +config BR2_x86_bobcat + bool "bobcat" + 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 config BR2_x86_jaguar bool "jaguar" select BR2_X86_CPU_HAS_MMX @@ -511,6 +591,25 @@ config BR2_x86_jaguar 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_8 +config BR2_x86_bulldozer + bool "bulldozer" + 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 +config BR2_x86_piledriver + bool "piledriver" + 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 config BR2_x86_steamroller bool "steamroller" select BR2_X86_CPU_HAS_MMX @@ -520,12 +619,73 @@ config BR2_x86_steamroller 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_8 +config BR2_x86_excavator + bool "excavator" + 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_zen + bool "zen" + 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_zen2 + bool "zen 2" + 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_9 +config BR2_x86_zen3 + bool "zen 3" + 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 +config BR2_x86_zen4 + bool "zen 4" + 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_13 config BR2_x86_geode - bool "geode" - # Don't include MMX support because there several variant of geode - # processor, some with MMX support, some without. - # See: http://en.wikipedia.org/wiki/Geode_%28processor%29 + bool "AMD Geode" depends on !BR2_x86_64 + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_3DNOW config BR2_x86_c3 bool "Via/Cyrix C3 (Samuel/Ezra cores)" depends on !BR2_x86_64 @@ -593,6 +753,7 @@ config BR2_GCC_TARGET_ARCH default "nehalem" if BR2_x86_nehalem default "corei7-avx" if BR2_x86_corei7_avx default "sandybridge" if BR2_x86_sandybridge + default "ivybridge" if BR2_x86_ivybridge default "core-avx2" if BR2_x86_core_avx2 default "haswell" if BR2_x86_haswell default "broadwell" if BR2_x86_broadwell @@ -604,6 +765,8 @@ config BR2_GCC_TARGET_ARCH default "goldmont" if BR2_x86_goldmont default "goldmont-plus" if BR2_x86_goldmont_plus default "tremont" if BR2_x86_tremont + default "sierraforest" if BR2_x86_sierraforest + default "grandridge" if BR2_x86_grandridge default "skylake-avx512" if BR2_x86_skylake_avx512 default "cannonlake" if BR2_x86_cannonlake default "icelake-client" if BR2_x86_icelake_client @@ -614,11 +777,21 @@ config BR2_GCC_TARGET_ARCH default "sapphirerapids" if BR2_x86_sapphirerapids default "alderlake" if BR2_x86_alderlake default "rocketlake" if BR2_x86_rocketlake + default "graniterapids" if BR2_x86_graniterapids + default "graniterapids-d" if BR2_x86_graniterapids_d default "k8" if BR2_x86_opteron default "k8-sse3" if BR2_x86_opteron_sse3 default "barcelona" if BR2_x86_barcelona + default "btver1" if BR2_x86_bobcat default "btver2" if BR2_x86_jaguar + default "bdver1" if BR2_x86_bulldozer + default "bdver2" if BR2_x86_piledriver default "bdver3" if BR2_x86_steamroller + default "bdver4" if BR2_x86_excavator + default "znver1" if BR2_x86_zen + default "znver2" if BR2_x86_zen2 + default "znver3" if BR2_x86_zen3 + default "znver4" if BR2_x86_zen4 default "k6" if BR2_x86_k6 default "k6-2" if BR2_x86_k6_2 default "athlon" if BR2_x86_athlon diff --git a/buildroot/arch/Config.in.xtensa b/buildroot/arch/Config.in.xtensa index 45ad2dc487..f9d5adb4c9 100644 --- a/buildroot/arch/Config.in.xtensa +++ b/buildroot/arch/Config.in.xtensa @@ -5,11 +5,10 @@ choice config BR2_XTENSA_CUSTOM bool "Custom Xtensa processor configuration" - select BR2_ARCH_HAS_MMU_OPTIONAL config BR2_xtensa_fsf bool "fsf - Default configuration" - select BR2_ARCH_HAS_MMU_MANDATORY + select BR2_USE_MMU endchoice @@ -41,6 +40,15 @@ config BR2_XTENSA_BIG_ENDIAN endchoice +config BR2_XTENSA_USE_MMU + bool "MMU support" + default y + depends on BR2_XTENSA_CUSTOM + select BR2_USE_MMU + help + Enable this option if your Xtensa core has a MMU (Memory + Management Unit). + config BR2_ENDIAN default "LITTLE" if BR2_XTENSA_LITTLE_ENDIAN default "BIG" if BR2_xtensa_fsf || BR2_XTENSA_BIG_ENDIAN diff --git a/buildroot/arch/arch.mk b/buildroot/arch/arch.mk index 289c5a1125..4174d33df5 100644 --- a/buildroot/arch/arch.mk +++ b/buildroot/arch/arch.mk @@ -18,5 +18,16 @@ GCC_TARGET_FPU := $(call qstrip,$(BR2_GCC_TARGET_FPU)) GCC_TARGET_FLOAT_ABI := $(call qstrip,$(BR2_GCC_TARGET_FLOAT_ABI)) GCC_TARGET_MODE := $(call qstrip,$(BR2_GCC_TARGET_MODE)) +# Explicitly set LD's "max-page-size" instead of relying on some defaults +ifeq ($(BR2_ARC_PAGE_SIZE_4K)$(BR2_ARM64_PAGE_SIZE_4K),y) +ARCH_TOOLCHAIN_WRAPPER_OPTS += -Wl,-z,max-page-size=4096 -Wl,-z,common-page-size=4096 +else ifeq ($(BR2_ARC_PAGE_SIZE_8K),y) +ARCH_TOOLCHAIN_WRAPPER_OPTS += -Wl,-z,max-page-size=8192 -Wl,-z,common-page-size=8192 +else ifeq ($(BR2_ARC_PAGE_SIZE_16K)$(BR2_ARM64_PAGE_SIZE_16K),y) +ARCH_TOOLCHAIN_WRAPPER_OPTS += -Wl,-z,max-page-size=16384 -Wl,-z,common-page-size=16384 +else ifeq ($(BR2_ARM64_PAGE_SIZE_64K),y) +ARCH_TOOLCHAIN_WRAPPER_OPTS += -Wl,-z,max-page-size=65536 -Wl,-z,common-page-size=65536 +endif + # Include any architecture specific makefiles. -include $(sort $(wildcard arch/arch.mk.*)) diff --git a/buildroot/arch/arch.mk.arc b/buildroot/arch/arch.mk.arc index 32b818b0e0..42037626a6 100644 --- a/buildroot/arch/arch.mk.arc +++ b/buildroot/arch/arch.mk.arc @@ -2,16 +2,7 @@ ifeq ($(BR2_arc),y) # -matomic is always required when the ARC core has the atomic extensions ifeq ($(BR2_ARC_ATOMIC_EXT),y) -ARCH_TOOLCHAIN_WRAPPER_OPTS = -matomic -endif - -# Explicitly set LD's "max-page-size" instead of relying on some defaults -ifeq ($(BR2_ARC_PAGE_SIZE_4K),y) -ARCH_TOOLCHAIN_WRAPPER_OPTS += -Wl,-z,max-page-size=4096 -else ifeq ($(BR2_ARC_PAGE_SIZE_8K),y) -ARCH_TOOLCHAIN_WRAPPER_OPTS += -Wl,-z,max-page-size=8192 -else ifeq ($(BR2_ARC_PAGE_SIZE_16K),y) -ARCH_TOOLCHAIN_WRAPPER_OPTS += -Wl,-z,max-page-size=16384 +ARCH_TOOLCHAIN_WRAPPER_OPTS += -matomic endif endif diff --git a/buildroot/arch/arch.mk.csky b/buildroot/arch/arch.mk.csky deleted file mode 100644 index fb59ae22fd..0000000000 --- a/buildroot/arch/arch.mk.csky +++ /dev/null @@ -1,26 +0,0 @@ -# -# Configure the GCC_TARGET_ARCH variable and append the -# appropriate C-SKY ISA extensions. -# - -ifeq ($(BR2_csky),y) - -ifeq ($(BR2_ck610),y) -GCC_TARGET_CPU := ck610 -else ifeq ($(BR2_ck807),y) -GCC_TARGET_CPU := ck807 -else ifeq ($(BR2_ck810),y) -GCC_TARGET_CPU := ck810 -else ifeq ($(BR2_ck860),y) -GCC_TARGET_CPU := ck860 -endif - -ifeq ($(BR2_CSKY_FPU),y) -GCC_TARGET_CPU := $(GCC_TARGET_CPU)f -endif - -ifeq ($(BR2_CSKY_VDSP),y) -GCC_TARGET_CPU := $(GCC_TARGET_CPU)v -endif - -endif diff --git a/buildroot/arch/arch.mk.riscv b/buildroot/arch/arch.mk.riscv index f3bf2b3467..ee5c434b97 100644 --- a/buildroot/arch/arch.mk.riscv +++ b/buildroot/arch/arch.mk.riscv @@ -26,5 +26,17 @@ endif ifeq ($(BR2_RISCV_ISA_RVC),y) GCC_TARGET_ARCH := $(GCC_TARGET_ARCH)c endif +ifeq ($(BR2_RISCV_ISA_RVV),y) +GCC_TARGET_ARCH := $(GCC_TARGET_ARCH)v +endif + +# Starting from gcc 12.x, csr and fence instructions have been +# separated from the base I instruction set, and special -march +# suffixes are needed to enable their support. In Buildroot, we assume +# all RISC-V cores that support Linux implement those instructions, so +# we unconditionally enable those extensions. +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_12),y) +GCC_TARGET_ARCH := $(GCC_TARGET_ARCH)_zicsr_zifencei +endif endif diff --git a/buildroot/arch/arch.mk.xtensa b/buildroot/arch/arch.mk.xtensa index fd410f6bfa..75145e725f 100644 --- a/buildroot/arch/arch.mk.xtensa +++ b/buildroot/arch/arch.mk.xtensa @@ -1,3 +1,9 @@ +BR_ARCH_XTENSA_OVERLAY_FILE = $(call qstrip,$(BR2_XTENSA_OVERLAY_FILE)) + +ifeq ($(BR_BUILDING)$(BR2_XTENSA_CUSTOM)$(BR2_TOOLCHAIN_BUILDROOT):$(BR_ARCH_XTENSA_OVERLAY_FILE),yyy:) +$(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. # @@ -9,7 +15,6 @@ # 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)) diff --git a/buildroot/board/aarch64-efi/genimage-efi.cfg b/buildroot/board/aarch64-efi/genimage-efi.cfg index 87e85816bc..158deab87d 100644 --- a/buildroot/board/aarch64-efi/genimage-efi.cfg +++ b/buildroot/board/aarch64-efi/genimage-efi.cfg @@ -18,7 +18,7 @@ image disk.img { partition boot { image = "efi-part.vfat" - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + partition-type-uuid = U offset = 32K bootable = true } diff --git a/buildroot/board/aarch64-efi/patches/linux-headers/linux-headers.hash b/buildroot/board/aarch64-efi/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/aarch64-efi/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/aarch64-efi/patches/linux/linux.hash b/buildroot/board/aarch64-efi/patches/linux/linux.hash new file mode 100644 index 0000000000..20941a269b --- /dev/null +++ b/buildroot/board/aarch64-efi/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 524858852f5869a9ef17de8b1e6e7faf05bcb2c462bc96b3c24dbf82ede373cf linux-6.10.12.tar.xz diff --git a/buildroot/board/aarch64-efi/post-image.sh b/buildroot/board/aarch64-efi/post-image.sh index f0214dc866..1aef15ef6f 100755 --- a/buildroot/board/aarch64-efi/post-image.sh +++ b/buildroot/board/aarch64-efi/post-image.sh @@ -1,5 +1,5 @@ #!/bin/sh -BOARD_DIR="$(dirname $0)" +BOARD_DIR=$(dirname "$0") -cp -f ${BOARD_DIR}/grub.cfg ${BINARIES_DIR}/efi-part/EFI/BOOT/grub.cfg +cp -f "${BOARD_DIR}/grub.cfg" "${BINARIES_DIR}/efi-part/EFI/BOOT/grub.cfg" diff --git a/buildroot/board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts b/buildroot/board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts index 264af29809..411d1942f5 100644 --- a/buildroot/board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts +++ b/buildroot/board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts @@ -4,12 +4,12 @@ * Copyright (C) 2014 Atmel, * 2014 Nicolas Ferre * - * 2020 Sergio Tanzilli + * 2022 Sergio Tanzilli * * Licensed under GPLv2 or later. */ /dts-v1/; -#include "sama5d31.dtsi" +#include "microchip/sama5d31.dtsi" / { model = "Acme Systems Acqua SOM"; @@ -17,7 +17,7 @@ chosen { stdout-path = "serial0:115200n8"; - bootargs = "mem=256M console=ttyS0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rw rootwait consoleblank=0"; + bootargs = "mem=256M console=ttyS0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rw rootwait net.ifnames=0"; }; memory { @@ -128,15 +128,19 @@ i2c3@ { compatible = "i2c-gpio"; - gpios = <&pioE 1 0 /* SDA */ - &pioE 2 0 /* SCK */ - >; - i2c-gpio,delay-us = <4>; /* ~178 kHz */ + + sda-gpios = <&pioE 1 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; + scl-gpios = <&pioE 2 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c3_gpio>; + + i2c-gpio,delay-us = <4>; /* ~178 kHz */ #address-cells = <1>; #size-cells = <0>; - + /* EEPROM contains the eth0 MAC address */ - + eeprom@58 { compatible = "atmel,24mac402"; pagesize = <256>; @@ -145,10 +149,17 @@ #address-cells = <1>; #size-cells = <1>; - eth0_addr: eth-mac-addr@9A { - reg = <0x0 0x06>; + nvmem-layout { + compatible = "fixed-layout"; + #address-cells = <1>; + #size-cells = <1>; + + eth0_addr: eth-mac-addr@9A { + reg = <0x0 0x06>; + }; }; }; + }; pwm0: pwm@f002c000 { @@ -204,6 +215,17 @@ }; pinctrl@fffff200 { + + atmel,mux-mask = < + /* A B C */ + 0xffffffff 0xc0fc0000 0xc0ff0000 /* pioA */ + 0xffffffff 0x0ff8ffff 0x00000000 /* pioB */ + 0xffffffff 0xbc00f1ff 0x7c00fc00 /* pioC */ + 0xffffffff 0xc001c0e0 0x0001c1e0 /* pioD */ + 0xfffffff9 0xbf9f8000 0x18000000 /* pioE */ + /* 0xffffffff 0xb8000000 0x18000000 */ /* pioE */ + >; + board { pinctrl_i2c0_pu: i2c0_pu { atmel,pins = @@ -217,6 +239,13 @@ ; }; + pinctrl_i2c3_gpio: i2c3-gpio { + atmel,pins = + ; + }; + + pinctrl_key_gpio: key_gpio_0 { atmel,pins = ; @@ -236,12 +265,20 @@ atmel,pins = ; /* PE9, conflicts with A9 */ }; + + pinctrl_gpio_leds: gpio_leds_default { + atmel,pins = + ; + }; }; }; }; usb0: gadget@500000 { - status = "okay"; + status = "disabled"; }; usb1: ohci@600000 { @@ -272,6 +309,8 @@ leds { compatible = "gpio-leds"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpio_leds>; led0 { label = "led0"; diff --git a/buildroot/board/acmesystems/acqua-a5/patches/at91bootstrap3/at91bootstrap3.hash b/buildroot/board/acmesystems/acqua-a5/patches/at91bootstrap3/at91bootstrap3.hash new file mode 100644 index 0000000000..6edf3d3345 --- /dev/null +++ b/buildroot/board/acmesystems/acqua-a5/patches/at91bootstrap3/at91bootstrap3.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 5ea2a8fed1ba0024229c6f6d77176679e1b24791bdbce8e285634013d4a93551 at91bootstrap3-v3.10.3-git4.tar.gz diff --git a/buildroot/board/acmesystems/acqua-a5/patches/linux-headers/linux-headers.hash b/buildroot/board/acmesystems/acqua-a5/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/acmesystems/acqua-a5/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/acmesystems/acqua-a5/patches/linux/linux.hash b/buildroot/board/acmesystems/acqua-a5/patches/linux/linux.hash new file mode 100644 index 0000000000..4b20a009a7 --- /dev/null +++ b/buildroot/board/acmesystems/acqua-a5/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 b66a5b863b0f8669448b74ca83bd641a856f164b29956e539bbcb5fdeeab9cc6 linux-6.6.30.tar.xz diff --git a/buildroot/board/acmesystems/aria-g25/patches/at91bootstrap3/at91bootstrap3.hash b/buildroot/board/acmesystems/aria-g25/patches/at91bootstrap3/at91bootstrap3.hash new file mode 100644 index 0000000000..6edf3d3345 --- /dev/null +++ b/buildroot/board/acmesystems/aria-g25/patches/at91bootstrap3/at91bootstrap3.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 5ea2a8fed1ba0024229c6f6d77176679e1b24791bdbce8e285634013d4a93551 at91bootstrap3-v3.10.3-git4.tar.gz diff --git a/buildroot/board/acmesystems/aria-g25/patches/linux-headers/linux-headers.hash b/buildroot/board/acmesystems/aria-g25/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/acmesystems/aria-g25/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/acmesystems/aria-g25/patches/linux/linux.hash b/buildroot/board/acmesystems/aria-g25/patches/linux/linux.hash new file mode 100644 index 0000000000..81824a41ee --- /dev/null +++ b/buildroot/board/acmesystems/aria-g25/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 6c5e4d3c87feadbfdb9f7d2e46f3f120b00286ba380491c5956708e0b94232c8 linux-4.19.315.tar.xz diff --git a/buildroot/board/acmesystems/arietta-g25/patches/at91bootstrap3/at91bootstrap3.hash b/buildroot/board/acmesystems/arietta-g25/patches/at91bootstrap3/at91bootstrap3.hash new file mode 100644 index 0000000000..6edf3d3345 --- /dev/null +++ b/buildroot/board/acmesystems/arietta-g25/patches/at91bootstrap3/at91bootstrap3.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 5ea2a8fed1ba0024229c6f6d77176679e1b24791bdbce8e285634013d4a93551 at91bootstrap3-v3.10.3-git4.tar.gz diff --git a/buildroot/board/acmesystems/arietta-g25/patches/linux-headers/linux-headers.hash b/buildroot/board/acmesystems/arietta-g25/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/acmesystems/arietta-g25/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/acmesystems/arietta-g25/patches/linux/linux.hash b/buildroot/board/acmesystems/arietta-g25/patches/linux/linux.hash new file mode 100644 index 0000000000..81824a41ee --- /dev/null +++ b/buildroot/board/acmesystems/arietta-g25/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 6c5e4d3c87feadbfdb9f7d2e46f3f120b00286ba380491c5956708e0b94232c8 linux-4.19.315.tar.xz diff --git a/buildroot/board/amarula/a64-relic/extlinux.conf b/buildroot/board/amarula/a64-relic/extlinux.conf deleted file mode 100644 index 9f469846bc..0000000000 --- a/buildroot/board/amarula/a64-relic/extlinux.conf +++ /dev/null @@ -1,4 +0,0 @@ -label linux-4.17.0-rc3 - kernel /Image - devicetree /sun50i-a64-amarula-relic.dtb - append console=ttyS0,115200 earlyprintk root=/dev/mmcblk1p4 rootwait diff --git a/buildroot/board/amarula/a64-relic/genimage.cfg b/buildroot/board/amarula/a64-relic/genimage.cfg deleted file mode 100644 index 58b607f5fb..0000000000 --- a/buildroot/board/amarula/a64-relic/genimage.cfg +++ /dev/null @@ -1,11 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "sun50i-a64-amarula-relic.dtb", - "extlinux" - } - } - - size = 64M -} diff --git a/buildroot/board/amarula/a64-relic/post-build.sh b/buildroot/board/amarula/a64-relic/post-build.sh deleted file mode 100755 index ec20fca7d9..0000000000 --- a/buildroot/board/amarula/a64-relic/post-build.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -BOARD_DIR="$(dirname $0)" - -install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf diff --git a/buildroot/board/amarula/a64-relic/readme.txt b/buildroot/board/amarula/a64-relic/readme.txt deleted file mode 100644 index 77f79e3094..0000000000 --- a/buildroot/board/amarula/a64-relic/readme.txt +++ /dev/null @@ -1,90 +0,0 @@ -Amarula A64 Relic -================ - -Amarula A64-Relic is an Allwinner A64 based IoT device, which supports: -- Allwinner A64 Cortex-A53 -- Mali-400MP2 GPU -- AXP803 PMIC -- 1GB DDR3 RAM -- 8GB eMMC -- AP6330 Wifi/BLE -- MIPI-DSI -- CSI: OV5640 sensor -- USB OTG -- 12V DC power supply - -Wiki link: -https://openedev.amarulasolutions.com/display/ODWIKI/Amarual+A64-Relic - -Build -===== - - $ make amarula_a64_relic_defconfig - - $ make - -build files at output/images/: - - sunxi-spl.bin - - u-boot.itb - - Image - - sun50i-a64-amarula-relic.dtb - - boot.vfat - - rootfs.ext4 - -Write eMMC -========= - -The board comes with an operating system preloaded on the eMMC. -To replace it with the Buildroot-built system, take the following -steps - -1. Connect the board UART with host and open minicom(ttyUSBx/115200N8) - -2. Supply 12V DC for power-on the board. - -3. Interrupt U-Boot by pressing enter - -4. Create GPT partitions - => mmc dev 1 - => gpt write mmc 1 $partitions - -5. Connect the board USB-OTG with USB slot on the host. - -6. Initiate fastboot - => fastboot 0 - -7. Write images from host onto eMMC using fastboot - $ cd output/images - $ sudo fastboot -i 0x1f3a flash loader1 sunxi-spl.bin - $ sudo fastboot -i 0x1f3a flash loader2 u-boot.itb - $ sudo fastboot -i 0x1f3a flash esp boot.vfat - $ sudo fastboot -i 0x1f3a flash system rootfs.ext4 - -Update eMMC during Development -============================== - -During development, reflashing the entire filesystem image at every -change is time consuming. A useful alternative is to directly access -over USB the filesystem stored on the eMMC, using the USB Mass Storage -capability of U-Boot. To achieve this: - -1. Build U-Boot by enabling UMS - $ make uboot-menuconfig - (select CONFIG_CMD_USB_MASS_STORAGE=y) - -2. Follow all 6 steps from 'Write eMMC' and mount eMMC on host - => mmc dev 1 - => ums 0 mmc 1 - -WiFi -==== - - # wpa_passphrase ACCESSPOINTNAME >> /etc/wpa_supplicant.conf - (type password and enter) - # wpa_supplicant -i wlan0 -c /etc/wpa_supplicant.conf -B - # udhcpc -i wlan0 - # ping google.com - --- -Jagan Teki -29-Jun-2018 diff --git a/buildroot/board/amarula/a64-relic/rootfs_overlay/lib/firmware/brcm/brcmfmac4330-sdio.txt b/buildroot/board/amarula/a64-relic/rootfs_overlay/lib/firmware/brcm/brcmfmac4330-sdio.txt deleted file mode 100644 index d095f24c26..0000000000 --- a/buildroot/board/amarula/a64-relic/rootfs_overlay/lib/firmware/brcm/brcmfmac4330-sdio.txt +++ /dev/null @@ -1,83 +0,0 @@ -#AP6330_NVRAM_V1.0_20121130 -#Sample variables file for BCM94330 SD FC AGB board -manfid=0x2d0 -prodid=0x0547 -vendid=0x14e4 -devid=0x4360 -boardtype=0x05e1 -boardrev=0x1202 -boardflags=0x0080200 -nocrc=1 -xtalfreq=26000 -boardnum=22 -macaddr=00:90:4c:c5:12:38 -ag0=254 -aa2g=1 -ccode=ALL -pa0itssit=0x20 -pa0b0=5587 -pa0b1=-633 -pa0b2=-158 -rssismf2g=0xa -rssismc2g=0x3 -rssisav2g=0x7 -#rssi params for 5GHz -rssismf5g=0x4 -rssismc5g=0x3 -rssisav5g=0x7 -#PA parameters for lower a-band -pa1lob0=4748 -pa1lob1=-566 -pa1lob2=-180 -#PA parameters for midband -pa1b0=4762 -pa1b1=-593 -pa1b2=-172 -#PA parameters for high band -#pa1hib0=4596 -pa1hib0=4666 -pa1hib1=-619 -pa1hib2=-163 -rxpo5g=0 -maxp2ga0=74 -maxp5ga0=66 -maxp5gla0=66 -maxp5gha0=66 -# 2.4G Tx Power offsets -cck2gpo=0x2222 -ofdm2gpo=0x44444444 -mcs2gpo0=0x6666 -mcs2gpo1=0x6666 -# 5G Tx Power offsets -ofdm5gpo=0x44444444 -ofdm5glpo=0x44444444 -ofdm5ghpo=0x44444444 -mcs5gpo0=0x6666 -mcs5gpo1=0x6666 -mcs5glpo0=0x6666 -mcs5glpo1=0x6666 -mcs5ghpo0=0x6666 -mcs5ghpo1=0x6666 -sromrev=3 -il0macaddr=00:90:4c:c5:12:38 -wl0id=0x431b -cckPwrOffset=4 -swctrlmap_2g=0x44844484,0x42824282,0x40804484,0x18282,0x1ff -triso5g=0 -swctrlmap_5g=0x00100010,0x20202020,0x20202020,0x14202,0x0f0 -rfreg033=0x19 -rfreg033_cck=0x1f -dacrate2g=160 -dacrate5g=160 -txalpfbyp2g=1 -bphyscale=17 -cckPwrIdxCorr=-15 -pacalidx2g=50 -#pacalidx5g=20 -noise_cal_ref_2g=53 -noise_cal_po_2g=0 -noise_cal_ref_5g=52 -noise_cal_po_5g=5,0,0 -# 4330 OOB parameter: High level trigger -muxenab=0x10 - diff --git a/buildroot/board/amarula/vyasa/patches/linux-headers/linux-headers.hash b/buildroot/board/amarula/vyasa/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/amarula/vyasa/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/amarula/vyasa/patches/linux/linux.hash b/buildroot/board/amarula/vyasa/patches/linux/linux.hash new file mode 100644 index 0000000000..b763fc947a --- /dev/null +++ b/buildroot/board/amarula/vyasa/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 880ace63ca2291b8b639e9bd862cc828649d3e1e00ccfee5861473debd2e4dec linux-6.1.91.tar.xz diff --git a/buildroot/board/amarula/vyasa/patches/uboot/uboot.hash b/buildroot/board/amarula/vyasa/patches/uboot/uboot.hash new file mode 100644 index 0000000000..5e017f5499 --- /dev/null +++ b/buildroot/board/amarula/vyasa/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 50b4482a505bc281ba8470c399a3c26e145e29b23500bc35c50debd7fa46bdf8 u-boot-2022.10.tar.bz2 diff --git a/buildroot/board/andes/ae350/genimage_sdcard.cfg b/buildroot/board/andes/ae350/genimage_sdcard.cfg new file mode 100644 index 0000000000..58c6f8f156 --- /dev/null +++ b/buildroot/board/andes/ae350/genimage_sdcard.cfg @@ -0,0 +1,26 @@ +image boot.vfat { + vfat { + files = { + "u-boot-spl.bin", + "u-boot.itb", + "ae350_ax45mp.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" + } +} diff --git a/buildroot/board/andes/ae350/patches/uboot/0001-mmc-ftsdc010_mci-Support-DTS-of-ftsdc010-driver-for-.patch b/buildroot/board/andes/ae350/patches/uboot/0001-mmc-ftsdc010_mci-Support-DTS-of-ftsdc010-driver-for-.patch new file mode 100644 index 0000000000..be89a1563f --- /dev/null +++ b/buildroot/board/andes/ae350/patches/uboot/0001-mmc-ftsdc010_mci-Support-DTS-of-ftsdc010-driver-for-.patch @@ -0,0 +1,38 @@ +From 16aad5594e08550295ea3c12c1c9ed6f64774748 Mon Sep 17 00:00:00 2001 +From: Rick Chen +Date: Tue, 29 Mar 2022 13:41:10 +0800 +Subject: [PATCH] mmc: ftsdc010_mci: Support DTS of ftsdc010 driver for + generic dma + +The ftsdc010 driver has been implemented for generic dma in Linux +kernel. And its compatible is andestech,atfsdc010g to distinguish +the legacy andestech,atfsdc010 which is not for generic dma. + +Althought the ftsdc010_mci driver in U-Boot does not use dma, but +it still can work well with the mmc node for generic dma. So add +the compatible string to support it. + +Signed-off-by: Rick Chen + +Upstream-Status: Pending + +Signed-off-by: Yu Chien Peter Lin +--- + drivers/mmc/ftsdc010_mci.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/mmc/ftsdc010_mci.c b/drivers/mmc/ftsdc010_mci.c +index 570d54cf9d..65b1d447a8 100644 +--- a/drivers/mmc/ftsdc010_mci.c ++++ b/drivers/mmc/ftsdc010_mci.c +@@ -460,6 +460,7 @@ int ftsdc010_mmc_bind(struct udevice *dev) + + static const struct udevice_id ftsdc010_mmc_ids[] = { + { .compatible = "andestech,atfsdc010" }, ++ { .compatible = "andestech,atfsdc010g" }, + { } + }; + +-- +2.34.1 + diff --git a/buildroot/board/andes/ae350/patches/uboot/0002-spl-Align-device-tree-blob-address-at-8-byte-boundar.patch b/buildroot/board/andes/ae350/patches/uboot/0002-spl-Align-device-tree-blob-address-at-8-byte-boundar.patch new file mode 100644 index 0000000000..5080554ca1 --- /dev/null +++ b/buildroot/board/andes/ae350/patches/uboot/0002-spl-Align-device-tree-blob-address-at-8-byte-boundar.patch @@ -0,0 +1,42 @@ +From 933ad8a59f7fd9b2088badc3e97167d750a40b5a Mon Sep 17 00:00:00 2001 +From: Bin Meng +Date: Mon, 12 Jul 2021 11:52:31 +0800 +Subject: [PATCH] spl: Align device tree blob address at 8-byte boundary + +Since libfdt v1.6.1, a new requirement on the device tree address via: + + commit 5e735860c478 ("libfdt: Check for 8-byte address alignment in fdt_ro_probe_()") + +must be met that the device tree must be loaded in to memory at an +8-byte aligned address. + +Signed-off-by: Bin Meng + +This patch was imported from U-boot patchwork: +https://patchwork.ozlabs.org/project/uboot/patch/20210712035231.26475-1-bmeng.cn@gmail.com/ + +Signed-off-by: Yu Chien Peter Lin +--- + common/spl/spl_fit.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c +index a35be529..a76ad14a 100644 +--- a/common/spl/spl_fit.c ++++ b/common/spl/spl_fit.c +@@ -382,6 +382,12 @@ static int spl_fit_append_fdt(struct spl_image_info *spl_image, + */ + image_info.load_addr = spl_image->load_addr + spl_image->size; + ++ /* ++ * Since libfdt v1.6.1, the device tree must be loaded in to memory ++ * at an 8-byte aligned address. ++ */ ++ image_info.load_addr = roundup(image_info.load_addr, 8); ++ + /* Figure out which device tree the board wants to use */ + node = spl_fit_get_image_node(ctx, FIT_FDT_PROP, index++); + if (node < 0) { +-- +2.34.1 + diff --git a/buildroot/board/andes/ae350/post-build.sh b/buildroot/board/andes/ae350/post-build.sh new file mode 100755 index 0000000000..84187a064b --- /dev/null +++ b/buildroot/board/andes/ae350/post-build.sh @@ -0,0 +1,3 @@ +#!/bin/sh +cp $BINARIES_DIR/Image $TARGET_DIR/boot +cp $BINARIES_DIR/ae350_ax45mp.dtb $TARGET_DIR/boot diff --git a/buildroot/board/andes/ae350/readme.txt b/buildroot/board/andes/ae350/readme.txt new file mode 100644 index 0000000000..36561fc777 --- /dev/null +++ b/buildroot/board/andes/ae350/readme.txt @@ -0,0 +1,106 @@ +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_ax45mp.dtb + |-- boot.vfat + |-- fw_dynamic.bin + |-- fw_dynamic.elf + |-- Image + |-- rootfs.ext2 + |-- rootfs.ext4 -> rootfs.ext2 + |-- sdcard.img + |-- u-boot-spl.bin + `-- u-boot.itb + +How to update the bootloader and device-tree +============================================ + +To update the bootloader and device tree, make sure you have +an ICEman (Andes OpenOCD [1]) and AICE [2] connection set up +as below: + + Local Host Local/Remote Host + .-----------------. .--------------. + | buildroot images| | | + | | ICEman host + | .----------. | | .--------. | + | | SPI_burn |<---+--socket--+->| ICEman | | + | '----------' | | '--.-----' | + '-----------------' '-----|--------' + | + USB + .--------------. | + | target | .-----v-----. + | board <----JTAG---| AICE | + | | '-----------' + '--------------' + +[1] https://github.com/andestech/ICEman +[2] https://www.andestech.com/en/products-solutions/andeshape-platforms/aice-micro/ + +The Andes SPI_burn tool will be located in output/host/bin. Use +the following commands to update the bootloader and device tree: + + $ SPI_burn --host $ICE_IP --port $ICE_BURNER_PORT --addr 0x0 -i u-boot-spl.bin + $ SPI_burn --host $ICE_IP --port $ICE_BURNER_PORT --addr 0x10000 -i u-boot.itb + $ SPI_burn --host $ICE_IP --port $ICE_BURNER_PORT --addr 0xf0000 -i ae350_ax45mp.dtb + +Note that the --addr option specifies the offset starting from +the flash base address 0x80000000 and set by U-Boot configurations. +e.g. +u-boot-spl.bin : CONFIG_SPL_TEXT_BASE=0x80000000 +u-boot.itb : CONFIG_SPL_LOAD_FIT_ADDRESS=0x80010000 +ae350_ax45mp.dtb: CONFIG_SYS_FDT_BASE=0x800f0000 + +How to write the SD card +======================== + +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. diff --git a/buildroot/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf b/buildroot/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf new file mode 100644 index 0000000000..be19e196a8 --- /dev/null +++ b/buildroot/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label linux + kernel /boot/Image + fdt /boot/ae350_ax45mp.dtb + append earlycon=sbi root=/dev/mmcblk0p2 rootwait diff --git a/buildroot/board/andes/ae350/uboot.config.fragment b/buildroot/board/andes/ae350/uboot.config.fragment new file mode 100644 index 0000000000..4497ed4c74 --- /dev/null +++ b/buildroot/board/andes/ae350/uboot.config.fragment @@ -0,0 +1,6 @@ +CONFIG_SPL_FS_FAT=y +CONFIG_SPL_MMC=y +CONFIG_SPL_OPENSBI_LOAD_ADDR=0x0 +CONFIG_SPL_OPENSBI_SCRATCH_OPTIONS=0x0 +CONFIG_DISPLAY_CPUINFO=y +CONFIG_DISPLAY_BOARDINFO=y diff --git a/buildroot/board/andes/ae3xx/ae3xx.fragment b/buildroot/board/andes/ae3xx/ae3xx.fragment deleted file mode 100644 index 3b13d10740..0000000000 --- a/buildroot/board/andes/ae3xx/ae3xx.fragment +++ /dev/null @@ -1 +0,0 @@ -CONFIG_NDS32_BUILTIN_DTB="ae3xx" diff --git a/buildroot/board/andes/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch b/buildroot/board/andes/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch deleted file mode 100644 index adb60937bd..0000000000 --- a/buildroot/board/andes/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 90d52d180dcc5d1300dc352ca709eb6453894143 Mon Sep 17 00:00:00 2001 -From: Nylon Chen -Date: Wed, 28 Nov 2018 16:26:46 +0800 -Subject: [PATCH] nds32: Fix boot messages garbled - -In order to display uart correctly we have to pass the correct setting of uart to kernel by bootarg. -This patch will provide such settings to set the correct uart baud rate. - -Signed-off-by: Nylon Chen ---- - arch/nds32/boot/dts/ae3xx.dts | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/arch/nds32/boot/dts/ae3xx.dts b/arch/nds32/boot/dts/ae3xx.dts -index bb39749a6673..aefe2090926a 100644 ---- a/arch/nds32/boot/dts/ae3xx.dts -+++ b/arch/nds32/boot/dts/ae3xx.dts -@@ -6,6 +6,7 @@ - interrupt-parent = <&intc>; - - chosen { -+ bootargs = "memblock=debug earlycon console=ttyS0,38400n8 debug loglevel=7"; - stdout-path = &serial0; - }; - --- -2.18.0 - diff --git a/buildroot/board/andes/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch b/buildroot/board/andes/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch deleted file mode 100644 index 71ae991816..0000000000 --- a/buildroot/board/andes/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch +++ /dev/null @@ -1,52 +0,0 @@ -From f9df4186c17d686f1ca38f973d7a3a49e8e37c01 Mon Sep 17 00:00:00 2001 -From: Dirk Mueller -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 -Signed-off-by: David Gibson -[robh: cherry-pick from upstream] -Cc: stable@vger.kernel.org -Signed-off-by: Rob Herring -Signed-off-by: Giulio Benetti ---- - 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 - diff --git a/buildroot/board/andes/readme.txt b/buildroot/board/andes/readme.txt deleted file mode 100644 index 0f95c65549..0000000000 --- a/buildroot/board/andes/readme.txt +++ /dev/null @@ -1,49 +0,0 @@ -Intro -===== - -Andestech(nds32) AE3XX Platform - -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 -=============== - -Configure Buildroot -------------------- - -The andes_ae3xx_defconfig configuration is a sample configuration with -all that is required to bring the FPGA Development Board: - - $ make andes_ae3xx_defconfig - -Build everything ----------------- -Note: you will need to have access to the network, since Buildroot will -download the packages' sources. - - $ make - -Result of the build -------------------- - -After building, you should obtain this tree: - -output/images/ - +-- vmlinux - +-- rootfs.cpio - +-- rootfs.tar - -How to run it -============= - -Run ---- - - Setup the Console with the rate 38400/8-N-1. - - $ cd output/images - $ ../host/bin/nds32le-linux-gdb vmlinux - $ target remote [your host] - $ lo - $ c diff --git a/buildroot/board/arcturus/aarch64-ucls1012a/post-build.sh b/buildroot/board/arcturus/aarch64-ucls1012a/post-build.sh index f8ba78095f..372df59c61 100755 --- a/buildroot/board/arcturus/aarch64-ucls1012a/post-build.sh +++ b/buildroot/board/arcturus/aarch64-ucls1012a/post-build.sh @@ -1,5 +1,4 @@ #!/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}/ diff --git a/buildroot/board/arcturus/aarch64-ucls1012a/readme.txt b/buildroot/board/arcturus/aarch64-ucls1012a/readme.txt index 483d5e9aef..b486ecebc7 100644 --- a/buildroot/board/arcturus/aarch64-ucls1012a/readme.txt +++ b/buildroot/board/arcturus/aarch64-ucls1012a/readme.txt @@ -24,13 +24,13 @@ After building, you should obtain this tree: output/images/ +-- arc-ucls1012a.dtb - +-- Image + +-- Image.gz +-- part0-000000.itb +-- rootfs.cpio +-- rootfs.cpio.gz +-- rootfs.tar +-- u-boot.bin - +-- ucls1012a.its + +-- br2-ucls1012a.its Flashing -------- diff --git a/buildroot/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload b/buildroot/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload deleted file mode 100755 index c87ffda14f..0000000000 --- a/buildroot/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# -case "$1" in - start) - modprobe pfe - ;; - stop) - ;; - restart|reload) - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac diff --git a/buildroot/board/arm/foundation-v8/patches/linux-headers/linux-headers.hash b/buildroot/board/arm/foundation-v8/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/arm/foundation-v8/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/arm/foundation-v8/patches/linux/linux.hash b/buildroot/board/arm/foundation-v8/patches/linux/linux.hash new file mode 100644 index 0000000000..559b53be2d --- /dev/null +++ b/buildroot/board/arm/foundation-v8/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 b0bb92d982f88380e5b2059349c3a862e0afa712e0646eb0e082b9c2c5cb5176 linux-6.8.10.tar.xz diff --git a/buildroot/board/arm/foundation-v8/readme.txt b/buildroot/board/arm/foundation-v8/readme.txt index b5106f015e..701cf3ceb0 100644 --- a/buildroot/board/arm/foundation-v8/readme.txt +++ b/buildroot/board/arm/foundation-v8/readme.txt @@ -3,14 +3,14 @@ ARM software simulator of the AArch64 architecture. First, one has to download the AArch64 software simulator from: - https://silver.arm.com/download/download.tm?pv=4807186 + https://developer.arm.com/-/media/Files/downloads/ecosystem-models/FM_11_25/Foundation_Platform_11.25_15_Linux64.tgz Then, use the arm_foundationv8_defconfig configuration to build your Buildroot system. Finally, boot your system with: - ${LOCATION_OF_FOUNDATIONV8_SIMULATOR}/models/Linux64_GCC-6.4/Foundation_Platform \ + ${LOCATION_OF_FOUNDATIONV8_SIMULATOR}/models/Linux64_GCC-9.3/Foundation_Platform \ --image output/images/linux-system.axf \ --block-device output/images/rootfs.ext2 \ --network=nat \ diff --git a/buildroot/board/arm/fvp-ebbr/fvp-config.txt b/buildroot/board/arm/fvp-ebbr/fvp-config.txt new file mode 100644 index 0000000000..61e040015b --- /dev/null +++ b/buildroot/board/arm/fvp-ebbr/fvp-config.txt @@ -0,0 +1,15 @@ +# Arm A-Profile Base RevC AEM FVP config +bp.secure_memory=1 +bp.ve_sysregs.exit_on_shutdown=1 +cache_state_modelled=0 +cluster0.NUM_CORES=4 +cluster0.cpu0.enable_crc32=1 +cluster0.cpu1.enable_crc32=1 +cluster0.cpu2.enable_crc32=1 +cluster0.cpu3.enable_crc32=1 +cluster1.NUM_CORES=4 +cluster1.cpu0.enable_crc32=1 +cluster1.cpu1.enable_crc32=1 +cluster1.cpu2.enable_crc32=1 +cluster1.cpu3.enable_crc32=1 +pctl.startup=0.0.0.0 diff --git a/buildroot/board/arm/fvp-ebbr/fvp-ebbr.dts b/buildroot/board/arm/fvp-ebbr/fvp-ebbr.dts new file mode 100644 index 0000000000..45e4b47200 --- /dev/null +++ b/buildroot/board/arm/fvp-ebbr/fvp-ebbr.dts @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2024, ARM Limited and Contributors. All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "fvp-base-gicv3-psci-1t.dts" + +/* The TF-A Devicetree does not have the OP-TEE node; let's add it. */ + +/ { + firmware { + optee { + compatible = "linaro,optee-tz"; + method = "smc"; + }; + }; +}; diff --git a/buildroot/board/arm/fvp-ebbr/genimage.cfg b/buildroot/board/arm/fvp-ebbr/genimage.cfg new file mode 100644 index 0000000000..1ca8332b9c --- /dev/null +++ b/buildroot/board/arm/fvp-ebbr/genimage.cfg @@ -0,0 +1,31 @@ +image efi-part.vfat { + vfat { + file EFI { + image = "efi-part/EFI" + } + + file Image { + image = "Image" + } + } + + size = 128M +} + +image disk.img { + hdimage { + partition-table-type = "gpt" + } + + partition boot { + image = "efi-part.vfat" + partition-type-uuid = U + offset = 32K + bootable = true + } + + partition root { + partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae + image = "rootfs.ext2" + } +} diff --git a/buildroot/board/arm/fvp-ebbr/grub.cfg b/buildroot/board/arm/fvp-ebbr/grub.cfg new file mode 100644 index 0000000000..d99e19c4cd --- /dev/null +++ b/buildroot/board/arm/fvp-ebbr/grub.cfg @@ -0,0 +1,6 @@ +set default="0" +set timeout="5" + +menuentry "Buildroot" { + linux /Image root=PARTLABEL=root rootwait +} diff --git a/buildroot/board/arm/fvp-ebbr/patches/linux-headers/linux-headers.hash b/buildroot/board/arm/fvp-ebbr/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/arm/fvp-ebbr/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/arm/fvp-ebbr/patches/linux/linux.hash b/buildroot/board/arm/fvp-ebbr/patches/linux/linux.hash new file mode 100644 index 0000000000..20941a269b --- /dev/null +++ b/buildroot/board/arm/fvp-ebbr/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 524858852f5869a9ef17de8b1e6e7faf05bcb2c462bc96b3c24dbf82ede373cf linux-6.10.12.tar.xz diff --git a/buildroot/board/arm/fvp-ebbr/patches/uboot/uboot.hash b/buildroot/board/arm/fvp-ebbr/patches/uboot/uboot.hash new file mode 100644 index 0000000000..fe9b4f53dc --- /dev/null +++ b/buildroot/board/arm/fvp-ebbr/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f u-boot-2024.07.tar.bz2 diff --git a/buildroot/board/arm/fvp-ebbr/post-image.sh b/buildroot/board/arm/fvp-ebbr/post-image.sh new file mode 100755 index 0000000000..72b156eb33 --- /dev/null +++ b/buildroot/board/arm/fvp-ebbr/post-image.sh @@ -0,0 +1,7 @@ +#!/bin/sh +set -eu + +BOARD_DIR=$(dirname "$0") + +# Override the default GRUB configuration file with our own. +cp -f "${BOARD_DIR}/grub.cfg" "${BINARIES_DIR}/efi-part/EFI/BOOT/grub.cfg" diff --git a/buildroot/board/arm/fvp-ebbr/readme.txt b/buildroot/board/arm/fvp-ebbr/readme.txt new file mode 100644 index 0000000000..fe7d4de5c5 --- /dev/null +++ b/buildroot/board/arm/fvp-ebbr/readme.txt @@ -0,0 +1,73 @@ +Introduction +============ + +The arm_fvp_ebbr_defconfig is meant to illustrate some aspects of the Arm EBBR +specification[1] and the Arm SystemReady IR[2] compliance program. +It allows building an AArch64 U-Boot based firmware implementing the subset of +UEFI defined by EBBR, as well as a Linux OS disk image booting with UEFI, to run +on the Arm A-Profile Base RevC AEM FVP. + +Building +======== + + $ make arm_fvp_ebbr_defconfig + $ make + +Generated files under output/images: + +* bl1.bin: A ROM image built from TF-A. +* fip.bin: A firmware image comprising TF-A, OP-TEE and the U-Boot bootloader. +* disk.img: An OS disk image comprising the GRUB bootloader, the Linux kernel + and the root filesystem. + +Running on the FVP +================== + +Download the FVP from one of the following sources, corresponding to your host +computer: + +- https://developer.arm.com/-/cdn-downloads/permalink/Fixed-Virtual-Platforms/FM-11.27/FVP_Base_RevC-2xAEMvA_11.27_19_Linux64.tgz +- https://developer.arm.com/-/cdn-downloads/permalink/Fixed-Virtual-Platforms/FM-11.27/FVP_Base_RevC-2xAEMvA_11.27_19_Linux64_armv8l.tgz + +The FVP will be located under one of the corresponding folders: + +- Base_RevC_AEMvA_pkg/models/Linux64_GCC-9.3 +- Base_RevC_AEMvA_pkg/models/Linux64_armv8l_GCC-9.3 + +Run the simulation with: + + FVP_Base_RevC-2xAEMvA \ + --config-file board/arm/fvp-ebbr/fvp-config.txt \ + -C bp.secureflashloader.fname="output/images/bl1.bin" \ + -C bp.flashloader0.fname="output/images/fip.bin" \ + -C bp.virtioblockdevice.image_path="output/images/disk.img" + +The login prompt will appear in a new X terminal. + +Using the EBBR firmware to run another OS on the FVP +---------------------------------------------------- + +It is possible to use the generated firmware binaries to run another OS +supporting the EBBR specification. + +To run another OS on simulation using a live or pre-installed image, use the +same FVP command line as for the generated OS but adapt the OS image path in the +virtioblockdevice stanza. +The image generated by the aarch64_efi_defconfig or the Arm ACS-IR images[3] are +examples of pre-installed OS images. +Linux distributions such as Debian, Fedora, openSUSE or Ubuntu provide a +pre-installed OS image. + +Miscellaneous +============= + +This configuration is inspired by the arm_foundationv8_defconfig, the +qemu_aarch64_virt_defconfig and the Arm SystemReady IR IoT Integration, Test, +and Certification Guide[4]. + +Firmware update, MMC and network are currently not supported. + +[1]: https://github.com/ARM-software/ebbr +[2]: https://developer.arm.com/Architectures/Arm%20SystemReady%20IR +[3]: https://github.com/ARM-software/arm-systemready/tree/main/IR/prebuilt_images +[4]: https://developer.arm.com/documentation/DUI1101/latest/ diff --git a/buildroot/board/arm/fvp-ebbr/u-boot.fragment b/buildroot/board/arm/fvp-ebbr/u-boot.fragment new file mode 100644 index 0000000000..abbf8395be --- /dev/null +++ b/buildroot/board/arm/fvp-ebbr/u-boot.fragment @@ -0,0 +1,49 @@ +# CONFIG_USE_BOOTCOMMAND is not set +CONFIG_BOOTCOMMAND="bootflow scan -lb" +CONFIG_BOOTMETH_DISTRO=y +CONFIG_BOOTM_EFI=y +CONFIG_BOOTSTD_BOOTCOMMAND=y +CONFIG_BOOTSTD_DEFAULTS=y +CONFIG_BOOTSTD_FULL=y +CONFIG_CMD_BOOTDEV=y +CONFIG_CMD_BOOTEFI=y +CONFIG_CMD_BOOTEFI_HELLO=y +CONFIG_CMD_BOOTEFI_HELLO_COMPILE=y +CONFIG_CMD_BOOTEFI_SELFTEST=y +CONFIG_CMD_BOOTMETH=y +CONFIG_CMD_DM=y +CONFIG_CMD_EFIDEBUG=y +CONFIG_CMD_EFI_VARIABLE_FILE_STORE=y +CONFIG_CMD_GETTIME=y +CONFIG_CMD_GPT=y +CONFIG_CMD_NVEDIT_EFI=y +CONFIG_CMD_RNG=y +CONFIG_CMD_RTC=y +CONFIG_CMD_TIME=y +CONFIG_DM_RNG=y +CONFIG_DM_RTC=y +CONFIG_EFI_DEVICE_PATH_TO_TEXT=y +CONFIG_EFI_GET_TIME=y +CONFIG_EFI_HAVE_RUNTIME_RESET=y +CONFIG_EFI_LOADER=y +CONFIG_EFI_LOADER_HII=y +CONFIG_EFI_MM_COMM_TEE=y +CONFIG_EFI_PARTITION=y +CONFIG_EFI_SECURE_BOOT=y +CONFIG_EFI_SET_TIME=y +CONFIG_EFI_UNICODE_CAPITALIZATION=y +CONFIG_EFI_UNICODE_COLLATION_PROTOCOL2=y +CONFIG_EFI_VARIABLE_FILE_STORE=y +CONFIG_FAT_WRITE=y +CONFIG_FIT=y +CONFIG_FS_FAT=y +CONFIG_ISO_PARTITION=y +CONFIG_MISC=y +CONFIG_OF_CONTROL=y +CONFIG_OF_LIBFDT=y +CONFIG_OPTEE=y +CONFIG_PARTITION_TYPE_GUID=y +CONFIG_RNG_OPTEE=y +CONFIG_TEE=y +CONFIG_USE_BOOTCOMMAND=y +CONFIG_VEXPRESS_CONFIG=y diff --git a/buildroot/board/arm/juno/linux-juno-defconfig b/buildroot/board/arm/juno/linux-juno-defconfig deleted file mode 100644 index 64598d21a1..0000000000 --- a/buildroot/board/arm/juno/linux-juno-defconfig +++ /dev/null @@ -1,169 +0,0 @@ -CONFIG_SMP=y -CONFIG_SYSVIPC=y -CONFIG_POSIX_MQUEUE=y -CONFIG_FHANDLE=y -CONFIG_AUDIT=y -CONFIG_NO_HZ_IDLE=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_BSD_PROCESS_ACCT_V3=y -CONFIG_TASKSTATS=y -CONFIG_TASK_DELAY_ACCT=y -CONFIG_TASK_XACCT=y -CONFIG_TASK_IO_ACCOUNTING=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_MEMCG=y -CONFIG_MEMCG_SWAP=y -CONFIG_MEMCG_KMEM=y -CONFIG_CGROUP_HUGETLB=y -CONFIG_SCHED_AUTOGROUP=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_KALLSYMS_ALL=y -CONFIG_PROFILING=y -CONFIG_JUMP_LABEL=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_ARCH_VEXPRESS=y -CONFIG_PCI=y -CONFIG_PCI_MSI=y -CONFIG_PCI_HOST_GENERIC=y -CONFIG_PCIEPORTBUS=y -CONFIG_HOTPLUG_PCI_PCIE=y -CONFIG_HOTPLUG_PCI=y -CONFIG_NR_CPUS=6 -CONFIG_PREEMPT=y -CONFIG_KSM=y -CONFIG_TRANSPARENT_HUGEPAGE=y -CONFIG_CMA=y -CONFIG_CMDLINE="console=ttyAMA0" -CONFIG_COMPAT=y -CONFIG_CPU_IDLE=y -CONFIG_ARM_CPUIDLE=y -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_GOV_USERSPACE=y -CONFIG_CPU_FREQ_GOV_ONDEMAND=y -CONFIG_CPU_FREQ_GOV_INTERACTIVE=y -CONFIG_ARM_BIG_LITTLE_CPUFREQ=y -CONFIG_ARM_DT_BL_CPUFREQ=y -CONFIG_ARM_SCPI_CPUFREQ=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -CONFIG_BPF_JIT=y -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_DEVTMPFS=y -CONFIG_DEVTMPFS_MOUNT=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_SD=y -CONFIG_ATA=y -CONFIG_SATA_AHCI=y -CONFIG_SATA_AHCI_PLATFORM=y -CONFIG_AHCI_XGENE=y -CONFIG_PATA_PLATFORM=y -CONFIG_PATA_OF_PLATFORM=y -CONFIG_NETDEVICES=y -CONFIG_TUN=y -CONFIG_SKY2=y -CONFIG_SMC91X=y -CONFIG_SMSC911X=y -CONFIG_INPUT_EVDEV=y -CONFIG_SERIO_AMBAKMI=y -CONFIG_LEGACY_PTY_COUNT=16 -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_AMBA_PL011=y -CONFIG_SERIAL_AMBA_PL011_CONSOLE=y -CONFIG_SERIAL_OF_PLATFORM=y -CONFIG_SERIAL_XILINX_PS_UART=y -CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_DESIGNWARE_PLATFORM=y -CONFIG_I2C_SLAVE=y -CONFIG_SPI=y -CONFIG_SPI_PL022=y -CONFIG_PTP_1588_CLOCK=m -CONFIG_GPIO_PL061=y -CONFIG_GPIO_XGENE=y -CONFIG_POWER_RESET_XGENE=y -CONFIG_POWER_RESET_SYSCON=y -CONFIG_REGULATOR=y -CONFIG_REGULATOR_FIXED_VOLTAGE=y -CONFIG_REGULATOR_VEXPRESS=m -CONFIG_DRM=y -CONFIG_DRM_I2C_NXP_TDA998X=y -CONFIG_DRM_ARM=y -CONFIG_DRM_HDLCD=y -CONFIG_DRM_VIRTUAL_HDLCD=y -CONFIG_FB_ARMCLCD=y -CONFIG_LOGO=y -CONFIG_USB=y -CONFIG_USB_ANNOUNCE_NEW_DEVICES=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_HCD_PLATFORM=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_OHCI_HCD_PLATFORM=y -CONFIG_USB_STORAGE=y -CONFIG_USB_ISP1760=y -CONFIG_NOP_USB_XCEIV=y -CONFIG_USB_ULPI=y -CONFIG_MMC=y -CONFIG_MMC_ARMMMCI=y -CONFIG_MMC_SDHCI=y -CONFIG_MMC_SDHCI_PLTFM=y -CONFIG_MMC_SPI=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_EFI=y -CONFIG_RTC_DRV_PL030=y -CONFIG_RTC_DRV_PL031=y -CONFIG_DMADEVICES=y -CONFIG_PL330_DMA=y -CONFIG_COMMON_CLK_SCPI=y -CONFIG_ARM_TIMER_SP804=y -CONFIG_MAILBOX=y -CONFIG_ARM_MHU=y -CONFIG_PHY_XGENE=y -CONFIG_ARM_SCPI_PROTOCOL=y -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -CONFIG_FANOTIFY=y -CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y -CONFIG_QUOTA=y -CONFIG_AUTOFS4_FS=y -CONFIG_FUSE_FS=y -CONFIG_CUSE=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_HUGETLBFS=y -CONFIG_EFIVAR_FS=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ISO8859_1=y -CONFIG_VIRTUALIZATION=y -CONFIG_KVM=y -CONFIG_DYNAMIC_DEBUG=y -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_FS=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -CONFIG_LOCKUP_DETECTOR=y -CONFIG_SECURITY=y -CONFIG_CRYPTO_ANSI_CPRNG=y -CONFIG_ARM64_CRYPTO=y -CONFIG_CRYPTO_SHA1_ARM64_CE=y -CONFIG_CRYPTO_SHA2_ARM64_CE=y -CONFIG_CRYPTO_GHASH_ARM64_CE=y -CONFIG_CRYPTO_AES_ARM64_CE_CCM=y -CONFIG_CRYPTO_AES_ARM64_CE_BLK=y -CONFIG_SOUND=y -CONFIG_SND=y -CONFIG_SND_SOC=y -CONFIG_SND_SIMPLE_CARD=y -CONFIG_SND_DESIGNWARE_I2S=y -CONFIG_CMA=y -CONFIG_CMA_SIZE_MBYTES=64 diff --git a/buildroot/board/arm/juno/readme.txt b/buildroot/board/arm/juno/readme.txt deleted file mode 100644 index b292d9636d..0000000000 --- a/buildroot/board/arm/juno/readme.txt +++ /dev/null @@ -1,134 +0,0 @@ -ARM Juno r1/r0 - -Intro -===== - -These instructions apply to all models of the ARM Juno: - - Juno r0 (does not support PCIe) - - Juno r1 (supports PCIe) - - Juno r2 (Big Cluster with A72) - -Buildroot will generate the kernel image, device tree blob, bootloader binaries -and a minimal root filesystem. - -How to build it -=============== - -Configure Buildroot -------------------- - -Configuring Buildroot is pretty simple, just execute: - - $ make arm_juno_defconfig - -Build the rootfs, kernel and DTB --------------------------------- - -Note: you will need to have access to the network, since Buildroot will -download the packages' sources. - -You may now build your rootfs with: - - $ make - -(This may take a while) - -Result of the build -------------------- - -After building, you should obtain this tree: - - output/images/ - +-- rootfs.tar - +-- juno.dtb (if Juno r0 is used) - +-- juno-r1.dtb (if Juno r1 is used) - +-- juno-r2.dtb (if Juno r2 is used) - +-- Image - +-- bl1.bin - +-- bl2.bin - +-- bl2u.bin - +-- bl31.bin - +-- fip.bin - +-- scp-fw.bin - +-- u-boot.bin - -Preparing your rootfs -====================== - -Format your pen drive as a ext3 filesystem by executing: - - $ mkfs.ext3 /dev/ - -Preparing your rootfs -====================== - -Format your pen drive as a ext3 filesystem by executing: - - $ mkfs.ext3 /dev/ - -Installing your rootfs -====================== - -After mounting the pen drive please execute the following: - - $ sudo tar -xvf output/images/rootfs.tar -C - -When completed make sure to unmount the device: - - $ umount - -Insert the pen drive in one of the ARM Juno' USB type A connectors. - -Configure *.dtb in the boot configuration for Juno r0 -===================================================== - -SITE1/HBI0262B/images.txt -..... -NOR3UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR3ADDRESS: 0x00C00000 ;Image Flash Address -NOR3FILE: \SOFTWARE\juno.dtb ;Image File Name -NOR3NAME: board.dtb ;Specify Image name to preserve file extension -NOR3LOAD: 00000000 ;Image Load Address -NOR3ENTRY: 00000000 ;Image Entry Point -...... - -Configure *.dtb in the boot configuration for Juno r1 -===================================================== - -SITE1/HBI0262C/images.txt -...... -NOR3UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR3ADDRESS: 0x00C00000 ;Image Flash Address -NOR3FILE: \SOFTWARE\juno-r1.dtb ;Image File Name -NOR3NAME: board.dtb ;Specify target filename to preserve file extension -NOR3LOAD: 00000000 ;Image Load Address -NOR3ENTRY: 00000000 ;Image Entry Point -...... - -Configure *.dtb in the boot configuration for Juno r2 -===================================================== - -SITE1/HBI0262D/images.txt -...... -NOR3UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR3ADDRESS: 0x02000000 ;Image Flash Address -NOR3FILE: \SOFTWARE\juno-r2.dtb ;Image File Name -NOR3NAME: board.dtb ;Specify target filename to preserve file extension -NOR3LOAD: 00000000 ;Image Load Address -NOR3ENTRY: 00000000 ;Image Entry Point -...... - -Installing kernel image and DTB -=============================== - -1. Connect to the ARM Juno UART0 and execute USB_ON in the terminal -2. Connect a USB cable between your PC and ARM Juno USB type B connector - A mass storage device should appear in your desktop. -3. Open the software/ folder -4. Copy the 'Image' file to software/ -5. Copy the 'juno-r1.dtb' (r1), 'juno.dtb' (r0) or juno-r2.dtb (r2) file to software/ -6. Copy the bootloader binaries (bl1.bin and fip.bin) to software/ -7. Press the red button in the front pannel of ARM Juno - -At this time, the board will erase the Flash entry for each new item and -replace it with the lastest ones. diff --git a/buildroot/board/armadeus/apf27/linux-4.12.config b/buildroot/board/armadeus/apf27/linux-4.12.config deleted file mode 100644 index d0fb5d35dd..0000000000 --- a/buildroot/board/armadeus/apf27/linux-4.12.config +++ /dev/null @@ -1,216 +0,0 @@ -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_POSIX_MQUEUE=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_CGROUPS=y -CONFIG_EMBEDDED=y -# CONFIG_COMPAT_BRK is not set -CONFIG_SLAB=y -CONFIG_PROFILING=y -CONFIG_OPROFILE=m -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -# CONFIG_ARCH_MULTI_V7 is not set -CONFIG_ARCH_MXC=y -CONFIG_MACH_IMX27_DT=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_PM_DEBUG=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_DIAG is not set -CONFIG_CAN=m -CONFIG_CAN_VCAN=m -CONFIG_CAN_MCP251X=m -CONFIG_BT=m -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=m -CONFIG_BT_HIDP=m -CONFIG_BT_HCIBTUSB=m -CONFIG_BT_HCIUART=m -CONFIG_BT_HCIUART_H4=y -CONFIG_BT_HCIUART_BCSP=y -CONFIG_CFG80211=m -CONFIG_MAC80211=m -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_DEVTMPFS=y -CONFIG_DEVTMPFS_MOUNT=y -CONFIG_MTD=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_GEOMETRY=y -# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set -# CONFIG_MTD_CFI_I2 is not set -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_MXC=y -CONFIG_MTD_UBI=y -CONFIG_EEPROM_AT24=y -CONFIG_EEPROM_AT25=y -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -CONFIG_NETDEVICES=y -# CONFIG_NET_VENDOR_BROADCOM is not set -# CONFIG_NET_VENDOR_CIRRUS is not set -# CONFIG_NET_VENDOR_FARADAY is not set -# CONFIG_NET_VENDOR_INTEL is not set -# CONFIG_NET_VENDOR_MARVELL is not set -# CONFIG_NET_VENDOR_MICREL is not set -# CONFIG_NET_VENDOR_MICROCHIP is not set -# CONFIG_NET_VENDOR_NATSEMI is not set -# CONFIG_NET_VENDOR_SEEQ is not set -# CONFIG_NET_VENDOR_SMSC is not set -# CONFIG_NET_VENDOR_STMICRO is not set -# CONFIG_NET_VENDOR_WIZNET is not set -CONFIG_SMSC_PHY=y -CONFIG_LIBERTAS=m -CONFIG_LIBERTAS_SDIO=m -CONFIG_RT2X00=m -CONFIG_RT2500USB=m -CONFIG_RT73USB=m -CONFIG_RT2800USB=m -CONFIG_RTL8187=m -CONFIG_RTL8192CU=m -CONFIG_ZD1211RW=m -CONFIG_INPUT_JOYDEV=y -CONFIG_INPUT_EVDEV=y -CONFIG_KEYBOARD_GPIO=y -CONFIG_KEYBOARD_IMX=m -# CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_JOYSTICK=y -CONFIG_INPUT_TOUCHSCREEN=y -# CONFIG_LEGACY_PTYS is not set -CONFIG_SERIAL_IMX=y -CONFIG_SERIAL_IMX_CONSOLE=y -# CONFIG_HW_RANDOM is not set -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_IMX=y -CONFIG_SPI=y -CONFIG_SPI_IMX=y -CONFIG_SPI_SPIDEV=m -CONFIG_GPIO_SYSFS=y -CONFIG_W1=y -CONFIG_W1_MASTER_MXC=y -CONFIG_W1_SLAVE_THERM=y -CONFIG_WATCHDOG=y -CONFIG_IMX2_WDT=y -CONFIG_REGULATOR=y -CONFIG_REGULATOR_FIXED_VOLTAGE=y -CONFIG_MEDIA_SUPPORT=m -CONFIG_MEDIA_CAMERA_SUPPORT=y -CONFIG_MEDIA_USB_SUPPORT=y -CONFIG_USB_VIDEO_CLASS=m -CONFIG_USB_PWC=m -CONFIG_V4L_PLATFORM_DRIVERS=y -CONFIG_SOC_CAMERA=m -# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set -CONFIG_FB=y -# CONFIG_FB_MX3 is not set -CONFIG_BACKLIGHT_LCD_SUPPORT=y -# CONFIG_LCD_CLASS_DEVICE is not set -CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_VGA16 is not set -CONFIG_SOUND=m -CONFIG_SND=m -CONFIG_SND_MIXER_OSS=m -CONFIG_SND_PCM_OSS=m -# CONFIG_SND_DRIVERS is not set -# CONFIG_SND_ARM is not set -# CONFIG_SND_SPI is not set -# CONFIG_SND_USB is not set -CONFIG_SND_SOC=m -CONFIG_SND_IMX_SOC=m -CONFIG_USB=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_MXC=y -CONFIG_USB_ACM=y -CONFIG_USB_PRINTER=y -CONFIG_USB_STORAGE=y -CONFIG_USB_CHIPIDEA=y -CONFIG_USB_CHIPIDEA_HOST=y -CONFIG_USB_SERIAL=y -CONFIG_USB_SERIAL_FTDI_SIO=y -CONFIG_USB_SERIAL_PL2303=y -CONFIG_USB_ULPI=y -CONFIG_USB_GADGET=y -CONFIG_USB_ETH=m -CONFIG_USB_GADGETFS=m -CONFIG_USB_MASS_STORAGE=m -CONFIG_USB_G_HID=m -CONFIG_MMC=y -CONFIG_MMC_MXC=y -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_GPIO=y -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_TIMER=y -CONFIG_LEDS_TRIGGER_ONESHOT=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_LEDS_TRIGGER_BACKLIGHT=y -CONFIG_LEDS_TRIGGER_CPU=y -CONFIG_LEDS_TRIGGER_GPIO=y -CONFIG_LEDS_TRIGGER_DEFAULT_ON=y -CONFIG_LEDS_TRIGGER_TRANSIENT=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_DS1374=y -CONFIG_RTC_DRV_MXC=m -CONFIG_DMADEVICES=y -CONFIG_IMX_DMA=y -CONFIG_IMX_SDMA=y -# CONFIG_IOMMU_SUPPORT is not set -CONFIG_IIO=y -CONFIG_MAX1027=y -CONFIG_MAX5821=y -CONFIG_PWM=y -CONFIG_PWM_IMX=y -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -CONFIG_EXT3_FS_POSIX_ACL=y -CONFIG_EXT3_FS_SECURITY=y -# CONFIG_DNOTIFY is not set -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y -# CONFIG_PROC_PAGE_MONITOR is not set -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_UBIFS_FS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V4=y -CONFIG_ROOT_NFS=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_850=y -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_ISO8859_15=m -CONFIG_PRINTK_TIME=y -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_FS=y -# CONFIG_SCHED_DEBUG is not set -# CONFIG_DEBUG_PREEMPT is not set -# CONFIG_FTRACE is not set -CONFIG_DEBUG_LL=y -CONFIG_EARLY_PRINTK=y -CONFIG_FONTS=y -CONFIG_FONT_8x8=y diff --git a/buildroot/board/armadeus/apf27/linux-5.10.config b/buildroot/board/armadeus/apf27/linux-5.10.config new file mode 100644 index 0000000000..5f5776f8a6 --- /dev/null +++ b/buildroot/board/armadeus/apf27/linux-5.10.config @@ -0,0 +1,227 @@ +# CONFIG_SWAP is not set +CONFIG_SYSVIPC=y +CONFIG_POSIX_MQUEUE=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_PREEMPT=y +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_CGROUPS=y +CONFIG_EMBEDDED=y +# CONFIG_COMPAT_BRK is not set +CONFIG_SLAB=y +CONFIG_PROFILING=y +# CONFIG_ARCH_MULTI_V7 is not set +CONFIG_ARCH_MXC=y +CONFIG_AEABI=y +CONFIG_PM_DEBUG=y +CONFIG_OPROFILE=m +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +# CONFIG_BLK_DEV_BSG is not set +# CONFIG_IOSCHED_DEADLINE is not set +# CONFIG_IOSCHED_CFQ is not set +CONFIG_MACH_IMX27_DT=y +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +# CONFIG_INET_DIAG is not set +CONFIG_IPV6=y +CONFIG_CAN=m +CONFIG_CAN_VCAN=m +CONFIG_CAN_MCP251X=m +CONFIG_BT=m +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +CONFIG_BT_HIDP=m +CONFIG_BT_HCIBTUSB=m +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +CONFIG_CFG80211=m +CONFIG_MAC80211=m +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_MTD=y +CONFIG_MTD_CMDLINE_PARTS=y +CONFIG_MTD_BLOCK=y +CONFIG_MTD_CFI=y +CONFIG_MTD_CFI_ADV_OPTIONS=y +CONFIG_MTD_CFI_GEOMETRY=y +# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set +# CONFIG_MTD_CFI_I2 is not set +CONFIG_MTD_CFI_INTELEXT=y +CONFIG_MTD_PHYSMAP=y +CONFIG_MTD_NAND=y +CONFIG_MTD_NAND_MXC=y +CONFIG_MTD_UBI=y +CONFIG_EEPROM_AT24=y +CONFIG_EEPROM_AT25=y +CONFIG_SCSI=y +CONFIG_BLK_DEV_SD=y +CONFIG_BLK_DEV_SR=y +CONFIG_CHR_DEV_SG=y +CONFIG_CHR_DEV_SCH=y +CONFIG_SCSI_LOGGING=y +CONFIG_SCSI_SCAN_ASYNC=y +CONFIG_NETDEVICES=y +# CONFIG_NET_VENDOR_BROADCOM is not set +# CONFIG_NET_VENDOR_CIRRUS is not set +# CONFIG_NET_VENDOR_FARADAY is not set +# CONFIG_NET_VENDOR_INTEL is not set +# CONFIG_NET_VENDOR_MARVELL is not set +# CONFIG_NET_VENDOR_MICREL is not set +# CONFIG_NET_VENDOR_MICROCHIP is not set +# CONFIG_NET_VENDOR_NATSEMI is not set +# CONFIG_NET_VENDOR_SEEQ is not set +# CONFIG_NET_VENDOR_SMSC is not set +# CONFIG_NET_VENDOR_STMICRO is not set +# CONFIG_NET_VENDOR_WIZNET is not set +CONFIG_SMSC_PHY=y +CONFIG_LIBERTAS=m +CONFIG_LIBERTAS_SDIO=m +CONFIG_RT2X00=m +CONFIG_RT2500USB=m +CONFIG_RT73USB=m +CONFIG_RT2800USB=m +CONFIG_RTL8187=m +CONFIG_RTL8192CU=m +CONFIG_ZD1211RW=m +CONFIG_INPUT_JOYDEV=y +CONFIG_INPUT_EVDEV=y +CONFIG_KEYBOARD_GPIO=y +CONFIG_KEYBOARD_IMX=m +# CONFIG_INPUT_MOUSE is not set +CONFIG_INPUT_JOYSTICK=y +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_TSC2102=y +# CONFIG_LEGACY_PTYS is not set +CONFIG_SERIAL_IMX=y +CONFIG_SERIAL_IMX_CONSOLE=y +# CONFIG_HW_RANDOM is not set +CONFIG_I2C=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_IMX=y +CONFIG_SPI=y +CONFIG_SPI_IMX=y +CONFIG_SPI_SPIDEV=m +CONFIG_GPIO_SYSFS=y +CONFIG_W1=y +CONFIG_W1_MASTER_MXC=y +CONFIG_W1_SLAVE_THERM=y +CONFIG_WATCHDOG=y +CONFIG_IMX2_WDT=y +CONFIG_REGULATOR=y +CONFIG_REGULATOR_FIXED_VOLTAGE=y +CONFIG_MEDIA_SUPPORT=m +CONFIG_MEDIA_CAMERA_SUPPORT=y +CONFIG_MEDIA_USB_SUPPORT=y +CONFIG_USB_VIDEO_CLASS=m +CONFIG_USB_PWC=m +CONFIG_V4L_PLATFORM_DRIVERS=y +CONFIG_SOC_CAMERA=m +CONFIG_VIDEO_MX2=m +CONFIG_V4L_MEM2MEM_DRIVERS=y +CONFIG_VIDEO_CODA=m +CONFIG_VIDEO_MX2_EMMAPRP=m +# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set +CONFIG_SOC_CAMERA_MT9M111=m +# CONFIG_DVB_AU8522_V4L is not set +# CONFIG_DVB_TUNER_DIB0070 is not set +# CONFIG_DVB_TUNER_DIB0090 is not set +CONFIG_FB=y +CONFIG_FB_IMX=y +CONFIG_LCD_L4F00242T03=y +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_LOGO=y +CONFIG_SOUND=m +CONFIG_SND=m +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m +# CONFIG_SND_DRIVERS is not set +# CONFIG_SND_ARM is not set +# CONFIG_SND_SPI is not set +# CONFIG_SND_USB is not set +CONFIG_SND_SOC=m +CONFIG_SND_IMX_SOC=m +CONFIG_USB=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_MXC=y +CONFIG_USB_ACM=y +CONFIG_USB_PRINTER=y +CONFIG_USB_STORAGE=y +CONFIG_USB_CHIPIDEA=y +CONFIG_USB_CHIPIDEA_UDC=y +CONFIG_USB_CHIPIDEA_HOST=y +CONFIG_USB_CHIPIDEA_DEBUG=y +CONFIG_USB_SERIAL=y +CONFIG_USB_SERIAL_FTDI_SIO=y +CONFIG_USB_SERIAL_PL2303=y +CONFIG_NOP_USB_XCEIV=y +CONFIG_USB_ULPI=y +CONFIG_USB_GADGET=y +CONFIG_USB_FSL_USB2=y +CONFIG_USB_ETH=m +CONFIG_USB_GADGETFS=m +CONFIG_USB_MASS_STORAGE=m +CONFIG_USB_G_HID=m +CONFIG_MMC=y +CONFIG_MMC_MXC=y +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +CONFIG_LEDS_GPIO=y +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_ONESHOT=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=y +CONFIG_LEDS_TRIGGER_BACKLIGHT=y +CONFIG_LEDS_TRIGGER_CPU=y +CONFIG_LEDS_TRIGGER_GPIO=y +CONFIG_LEDS_TRIGGER_DEFAULT_ON=y +CONFIG_LEDS_TRIGGER_TRANSIENT=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_DS1374=y +CONFIG_RTC_DRV_MXC=m +CONFIG_DMADEVICES=y +CONFIG_IMX_DMA=y +CONFIG_IMX_SDMA=y +# CONFIG_IOMMU_SUPPORT is not set +CONFIG_IIO=y +CONFIG_MAX1027=y +CONFIG_PWM=y +CONFIG_PWM_IMX=y +CONFIG_EXT2_FS=y +CONFIG_EXT3_FS=y +CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_SECURITY=y +# CONFIG_DNOTIFY is not set +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +# CONFIG_PROC_PAGE_MONITOR is not set +CONFIG_TMPFS=y +CONFIG_JFFS2_FS=y +CONFIG_UBIFS_FS=y +CONFIG_NFS_FS=y +CONFIG_NFS_V4=y +CONFIG_ROOT_NFS=y +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_850=y +CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_15=m +CONFIG_FONTS=y +CONFIG_FONT_8x8=y +CONFIG_PRINTK_TIME=y +CONFIG_DEBUG_INFO=y +CONFIG_DEBUG_FS=y +# CONFIG_SCHED_DEBUG is not set +# CONFIG_DEBUG_PREEMPT is not set +# CONFIG_FTRACE is not set +CONFIG_DEBUG_LL=y +CONFIG_EARLY_PRINTK=y diff --git a/buildroot/board/armadeus/apf51/linux-4.4.config b/buildroot/board/armadeus/apf51/linux-5.10.config similarity index 100% rename from buildroot/board/armadeus/apf51/linux-4.4.config rename to buildroot/board/armadeus/apf51/linux-5.10.config diff --git a/buildroot/board/armadeus/patches/linux-headers/linux-headers.hash b/buildroot/board/armadeus/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/armadeus/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/armadeus/patches/linux/linux.hash b/buildroot/board/armadeus/patches/linux/linux.hash new file mode 100644 index 0000000000..804920c10d --- /dev/null +++ b/buildroot/board/armadeus/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 879ca159c34ea9d3a6775f292cc59c2d3931d57dca00f0bebe2675ea0c82c6a9 linux-5.10.215.tar.xz diff --git a/buildroot/board/armadeus/patches/uboot/uboot.hash b/buildroot/board/armadeus/patches/uboot/uboot.hash new file mode 100644 index 0000000000..777e0adab2 --- /dev/null +++ b/buildroot/board/armadeus/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 839bf23cfe8ce613a77e583a60375179d0ad324e92c82fbdd07bebf0fd142268 u-boot-2018.09.tar.bz2 diff --git a/buildroot/board/arrow/avenger96/overlay/boot/extlinux/extlinux.conf b/buildroot/board/arrow/avenger96/overlay/boot/extlinux/extlinux.conf index 5d506b3dae..7d6d7f8a44 100644 --- a/buildroot/board/arrow/avenger96/overlay/boot/extlinux/extlinux.conf +++ b/buildroot/board/arrow/avenger96/overlay/boot/extlinux/extlinux.conf @@ -1,4 +1,4 @@ label stm32mp157c-dk2-buildroot kernel /boot/zImage devicetree /boot/stm32mp157a-dhcor-avenger96.dtb - append root=/dev/mmcblk1p4 rootwait + append root=/dev/mmcblk0p4 rootwait diff --git a/buildroot/board/aspeed/ast2500-evb/genimage.cfg b/buildroot/board/aspeed/ast2500-evb/genimage.cfg new file mode 100644 index 0000000000..498a71e4d7 --- /dev/null +++ b/buildroot/board/aspeed/ast2500-evb/genimage.cfg @@ -0,0 +1,40 @@ +# +# This config reproduces the OpenBMC flash layout defined in Linux : +# +# arch/arm/boot/dts/openbmc-flash-layout.dtsi +# +# and included by aspeed-ast2500-evb.dts +# +flash nor-32M-256 { + pebsize = 4K + numpebs = 8K + minimum-io-unit-size = 256 +} + +image flash.img { + flash { + } + flashtype = "nor-32M-256" + + partition uboot { + image = "u-boot.bin" + size = 384K + } + + partition ubootenv { + /* TODO */ + offset = 384K + size = 128K + } + + partition fitimage { + image = "image.itb" + offset = 512K + size = 4352K + } + + partition spare { + offset = 4864K + size = 27904K + } +} diff --git a/buildroot/board/aspeed/ast2500-evb/linux.fragment b/buildroot/board/aspeed/ast2500-evb/linux.fragment new file mode 100644 index 0000000000..1cee95f842 --- /dev/null +++ b/buildroot/board/aspeed/ast2500-evb/linux.fragment @@ -0,0 +1,7 @@ +CONFIG_KERNEL_XZ=y +CONFIG_ARCH_MULTI_V7=n +CONFIG_MACH_ASPEED_G6=n +CONFIG_SMP=n +CONFIG_EXT4_FS=n +CONFIG_DEBUG_FS=n +CONFIG_SUSPEND=n diff --git a/buildroot/board/aspeed/ast2500-evb/readme.txt b/buildroot/board/aspeed/ast2500-evb/readme.txt new file mode 100644 index 0000000000..f509be553b --- /dev/null +++ b/buildroot/board/aspeed/ast2500-evb/readme.txt @@ -0,0 +1,80 @@ +Aspeed AST2500 EVB + +Introduction +============ + +The AST2500 EVB is an evaluation board for the AST2500 SoC, most +commonly used as a Server Management Processor. It includes an 800MHz +ARM11 processor with DDR3 or DDR4 SDRAM (up to 1GB), SPI flash memory +devices for BMC and host firmwares and numerous controllers to drive +the server board. + + https://www.aspeedtech.com/server_ast2500/ + +How to build it +=============== + +Configure buildroot: + + $ make aspeed_ast2500evb_defconfig + +Compile everything and build the rootfs image: + + $ make + +Result of the build +=================== + +After building, the output/images directory contains: + + output/images/ + ├── aspeed-ast2500-evb.dtb + ├── flash.img + ├── image.itb + ├── rootfs.cpio + ├── rootfs.cpio.xz + ├── rootfs.tar + ├── u-boot.bin + └── zImage + +Flashing the image +================== + +To update the contents of the first flash device, copy flash.img : + + $ flashcp flash.img /dev/mtd0 + +or simply the boot loader: + + $ flashcp u-boot.bin /dev/mtd1 + +Preparing the board +=================== + + * Connect a serial line to the board + * Power-up the board + +Booting the board +================= + +The AST2500 EVB boots from the SPI flash device directly and loads a +first bootloader (usually U-Boot). U-Boot will attempt to load a Linux +kernel from the same flash device by default but other storage could +be used. + + * from U-Boot + + The FIT image image.itb can be used to boot the board from U-Boot + using tftp + + * with QEMU + + $ qemu-system-arm -M ast2500-evb \ + -drive file=output/images/flash.img,format=raw,if=mtd \ + -nographic + + $ qemu-system-arm -M ast2500-evb \ + -kernel output/images/zImage \ + -initrd output/images/rootfs.cpio \ + -dtb output/images/aspeed-ast2500-evb.dtb \ + -nographic diff --git a/buildroot/board/aspeed/ast2500-evb/uboot.fragment b/buildroot/board/aspeed/ast2500-evb/uboot.fragment new file mode 100644 index 0000000000..8463252e59 --- /dev/null +++ b/buildroot/board/aspeed/ast2500-evb/uboot.fragment @@ -0,0 +1,3 @@ +CONFIG_BOOTCOMMAND="bootm 20080000" +CONFIG_FIT=y +CONFIG_SHA256=y diff --git a/buildroot/board/aspeed/ast2600-evb/genimage.cfg b/buildroot/board/aspeed/ast2600-evb/genimage.cfg new file mode 100644 index 0000000000..56932d4787 --- /dev/null +++ b/buildroot/board/aspeed/ast2600-evb/genimage.cfg @@ -0,0 +1,40 @@ +# +# This config reproduces the OpenBMC flash layout defined in Linux : +# +# arch/arm/boot/dts/openbmc-flash-layout-64.dtsi +# +# and included by aspeed-ast2600-evb.dts +# +flash nor-64M-256 { + pebsize = 4K + numpebs = 16K + minimum-io-unit-size = 256 +} + +image flash.img { + flash { + } + flashtype = "nor-64M-256" + + partition uboot { + image = "u-boot.bin" + size = 896K + } + + partition ubootenv { + /* TODO */ + offset = 896K + size = 128K + } + + partition fitimage { + image = "image.itb" + offset = 1M + size = 9M + } + + partition spare { + offset = 10M + size = 54M + } +} diff --git a/buildroot/board/aspeed/ast2600-evb/readme.txt b/buildroot/board/aspeed/ast2600-evb/readme.txt new file mode 100644 index 0000000000..1f7ba13d5d --- /dev/null +++ b/buildroot/board/aspeed/ast2600-evb/readme.txt @@ -0,0 +1,80 @@ +Aspeed AST2600 EVB + +Introduction +============ + +The AST2600 EVB is an evaluation board for the AST2600 SoC, most +commonly used as a Server Management Processor. It includes a +Dual-core ARM Cortex A7 processor with DDR4 SDRAM (up to 2GB), SPI +flash memory devices for BMC and host firmwares and numerous +controllers to drive the server board. + + https://www.aspeedtech.com/server_ast2600/ + +How to build it +=============== + +Configure buildroot: + + $ make aspeed_ast2600evb_defconfig + +Compile everything and build the rootfs image: + + $ make + +Result of the build +=================== + +After building, the output/images directory contains: + + output/images/ + ├── aspeed-ast2600-evb.dtb + ├── flash.img + ├── image.itb + ├── rootfs.cpio + ├── rootfs.cpio.xz + ├── rootfs.tar + ├── u-boot.bin + └── zImage + +Flashing the image +================== + +To update the contents of the first flash device, copy flash.img : + + $ flashcp flash.img /dev/mtd0 + +or simply the boot loader: + + $ flashcp u-boot.bin /dev/mtd1 + +Preparing the board +=================== + + * Connect a serial line to the board + * Power-up the board + +Booting the board +================= + +The AST2600 EVB boots from the SPI flash device directly and loads a +first bootloader (usually U-Boot). U-Boot will attempt to load a Linux +kernel from the same flash device by default but other storage could +be used. + + * from U-Boot + + The FIT image image.itb can be used to boot the board from U-Boot + using tftp + + * with QEMU + + $ qemu-system-arm -M ast2600-evb \ + -drive file=output/images/flash.img,format=raw,if=mtd \ + -nographic + + $ qemu-system-arm -M ast2600-evb \ + -kernel output/images/zImage \ + -initrd output/images/rootfs.cpio \ + -dtb output/images/aspeed-ast2600-evb.dtb \ + -nographic diff --git a/buildroot/board/aspeed/common/image.its.template b/buildroot/board/aspeed/common/image.its.template new file mode 100644 index 0000000000..e3200e2407 --- /dev/null +++ b/buildroot/board/aspeed/common/image.its.template @@ -0,0 +1,56 @@ +/dts-v1/; + +/ { + description = "Kernel and buildroot image"; + #address-cells = <1>; + + images { + kernel-1 { + description = "Linux kernel"; + data = /incbin/("zImage"); + type = "kernel"; + arch = "arm"; + os = "linux"; + compression = "none"; + load = <0x80001000>; + entry = <0x80001000>; + hash-1 { + algo = "sha256"; + }; + }; + fdt-1 { + description = "Flattened Device Tree blob"; + data = /incbin/("%BOARD_DTB%"); + type = "flat_dt"; + arch = "arm"; + compression = "none"; + hash-1 { + algo = "sha256"; + }; + }; + ramdisk-1 { + description = "ramdisk"; + data = /incbin/("rootfs.cpio.xz"); + type = "ramdisk"; + arch = "arm"; + os = "linux"; + compression = "none"; + hash-1 { + algo = "sha256"; + }; + }; + }; + + configurations { + default = "conf-1"; + conf-1 { + description = "Boot Linux kernel with FDT blob, ramdisk"; + kernel = "kernel-1"; + fdt = "fdt-1"; + ramdisk = "ramdisk-1"; + hash-1 { + algo = "sha256"; + }; + }; + }; +}; diff --git a/buildroot/board/aspeed/common/post-image.sh b/buildroot/board/aspeed/common/post-image.sh new file mode 100755 index 0000000000..ea65a49aff --- /dev/null +++ b/buildroot/board/aspeed/common/post-image.sh @@ -0,0 +1,27 @@ +#!/bin/bash + +BOARD_DIR="$(dirname $0)" +mkimage=$HOST_DIR/bin/mkimage + +BOARD_DT=$(sed -n \ + 's/^BR2_LINUX_KERNEL_INTREE_DTS_NAME="\([a-z0-9\-]*\).*"$/\1/p' \ + ${BR2_CONFIG}) + +sed -e "s/%BOARD_DTB%/${BOARD_DT}.dtb/" \ + $BOARD_DIR/image.its.template > $BINARIES_DIR/image.its + +(cd $BINARIES_DIR && $mkimage -f image.its image.itb) + +GENIMAGE_CFG="board/aspeed/${BOARD_DT#aspeed-*}/genimage.cfg" +GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" + +rm -rf "${GENIMAGE_TMP}" + +genimage \ + --rootpath "${TARGET_DIR}" \ + --tmppath "${GENIMAGE_TMP}" \ + --inputpath "${BINARIES_DIR}" \ + --outputpath "${BINARIES_DIR}" \ + --config "${GENIMAGE_CFG}" + +rm -f $BINARIES_DIR/image.its diff --git a/buildroot/board/asus/tinker-s/extlinux.conf b/buildroot/board/asus/tinker-s/extlinux.conf new file mode 100644 index 0000000000..61ebe50c71 --- /dev/null +++ b/buildroot/board/asus/tinker-s/extlinux.conf @@ -0,0 +1,4 @@ +label Tinker linux + kernel /boot/zImage + devicetree /boot/rk3288-tinker-s.dtb + append console=ttyS2,115200n8 root=179:1 rootwait diff --git a/buildroot/board/asus/tinker-s/post-build.sh b/buildroot/board/asus/tinker-s/post-build.sh new file mode 100755 index 0000000000..f938876625 --- /dev/null +++ b/buildroot/board/asus/tinker-s/post-build.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +MKIMAGE=$HOST_DIR/bin/mkimage +BOARD_DIR="$(dirname "$0")" + +$MKIMAGE -n rk3288 -T rksd -d "$BINARIES_DIR"/u-boot-tpl.bin "$BINARIES_DIR"/u-boot-tpl.img +cat "$BINARIES_DIR"/u-boot-tpl.img "$BINARIES_DIR"/u-boot-spl-dtb.bin > "$BINARIES_DIR"/u-boot-tpl-spl-dtb.img + +install -m 0644 -D "$BOARD_DIR"/extlinux.conf "$TARGET_DIR"/boot/extlinux/extlinux.conf diff --git a/buildroot/board/asus/tinker-s/readme.txt b/buildroot/board/asus/tinker-s/readme.txt new file mode 100644 index 0000000000..3dffa12b45 --- /dev/null +++ b/buildroot/board/asus/tinker-s/readme.txt @@ -0,0 +1,43 @@ +Tinker S RK3288 +============= + +Tinker Board is a Single Board Computer (SBC) in an ultra-small form +factor that offers class-leading performance while leveraging outstanding +mechanical compatibility. The "S" variant of the Tinker Board has eMMC + +Tinker link: +https://www.asus.com/br/motherboards-components/single-board-computer/all-series/tinker-board-s/ + +Wiki link: +https://openedev.amarulasolutions.com/display/ODWIKI/Tinker+RK3288 + +How to build it +=============== + + $ make asus_tinker-s_rk3288_defconfig + +Then you can edit the build options using + + $ make menuconfig + +Compile all and build rootfs image: + + $ make + +Prepare your SDCard +=================== + +Buildroot generates a ready-to-use SD card image that you can flash directly to +the card. The image will be in output/images/sdcard.img. +You can write this image directly to an SD card device (i.e. /dev/xxx): + + $ sudo dd if=output/images/sdcard.img of=/dev/xxx + $ sudo sync + +Finally, you can insert the SD card to the Tinker RK3288 board and boot it. + +NOTE: +USB power supply requires more than the standard 500mA USB current, so +this board must be supplied from a capable port or from an external +AC/DC adapter. Otherwise it will hang forever while loading the kernel +image. diff --git a/buildroot/board/asus/tinker/extlinux.conf b/buildroot/board/asus/tinker/extlinux.conf index 136af0debd..be21e246ec 100644 --- a/buildroot/board/asus/tinker/extlinux.conf +++ b/buildroot/board/asus/tinker/extlinux.conf @@ -1,4 +1,4 @@ -label Tinker linux-next - kernel /boot/uImage +label Tinker linux + kernel /boot/zImage devicetree /boot/rk3288-tinker.dtb append console=ttyS2,115200n8 root=/dev/mmcblk0p1 rootwait diff --git a/buildroot/board/asus/tinker/genimage.cfg b/buildroot/board/asus/tinker/genimage.cfg index a4b1e8d608..fa7fd734f2 100644 --- a/buildroot/board/asus/tinker/genimage.cfg +++ b/buildroot/board/asus/tinker/genimage.cfg @@ -2,12 +2,19 @@ image sdcard.img { hdimage { } - partition u-boot-spl-dtb { + partition u-boot-tpl-spl-dtb { in-partition-table = "no" - image = "u-boot-spl-dtb.img" + image = "u-boot-tpl-spl-dtb.img" offset = 32K } + partition u-boot-dtb { + in-partition-table = "no" + image = "u-boot-dtb.img" + offset = 8M + size = 30M + } + partition rootfs { partition-type = 0x83 image = "rootfs.ext4" diff --git a/buildroot/board/asus/tinker/post-build.sh b/buildroot/board/asus/tinker/post-build.sh index 8108ed83ff..ffbbcdeb58 100755 --- a/buildroot/board/asus/tinker/post-build.sh +++ b/buildroot/board/asus/tinker/post-build.sh @@ -3,7 +3,7 @@ MKIMAGE=$HOST_DIR/bin/mkimage BOARD_DIR="$(dirname $0)" -$MKIMAGE -n rk3288 -T rksd -d $BINARIES_DIR/u-boot-spl-dtb.bin $BINARIES_DIR/u-boot-spl-dtb.img -cat $BINARIES_DIR/u-boot-dtb.bin >> $BINARIES_DIR/u-boot-spl-dtb.img +$MKIMAGE -n rk3288 -T rksd -d $BINARIES_DIR/u-boot-tpl.bin $BINARIES_DIR/u-boot-tpl.img +cat $BINARIES_DIR/u-boot-tpl.img $BINARIES_DIR/u-boot-spl-dtb.bin > $BINARIES_DIR/u-boot-tpl-spl-dtb.img install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf diff --git a/buildroot/board/asus/tinker/readme.txt b/buildroot/board/asus/tinker/readme.txt index 7372d29520..110e2168c9 100644 --- a/buildroot/board/asus/tinker/readme.txt +++ b/buildroot/board/asus/tinker/readme.txt @@ -35,3 +35,9 @@ You can write this image directly to an SD card device (i.e. /dev/xxx): $ sudo sync Finally, you can insert the SD card to the Tinker RK3288 board and boot it. + +NOTE: +USB power supply requires more than the standard 500mA USB current, so +this board must be supplied from a capable port or from an external +AC/DC adapter. Otherwise it will hang forever while loading the kernel +image. diff --git a/buildroot/board/atmel/at91sam9x5ek/patches/at91bootstrap3/at91bootstrap3.hash b/buildroot/board/atmel/at91sam9x5ek/patches/at91bootstrap3/at91bootstrap3.hash new file mode 100644 index 0000000000..6edf3d3345 --- /dev/null +++ b/buildroot/board/atmel/at91sam9x5ek/patches/at91bootstrap3/at91bootstrap3.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 5ea2a8fed1ba0024229c6f6d77176679e1b24791bdbce8e285634013d4a93551 at91bootstrap3-v3.10.3-git4.tar.gz diff --git a/buildroot/board/atmel/at91sam9x5ek/patches/linux-headers/linux-headers.hash b/buildroot/board/atmel/at91sam9x5ek/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/atmel/at91sam9x5ek/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/atmel/at91sam9x5ek/patches/linux/0001-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch b/buildroot/board/atmel/at91sam9x5ek/patches/linux/0001-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch new file mode 100644 index 0000000000..81c4ce2fbc --- /dev/null +++ b/buildroot/board/atmel/at91sam9x5ek/patches/linux/0001-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch @@ -0,0 +1,435 @@ +From 762d2dcd9e233e3025f8627ea65f23e568045edb Mon Sep 17 00:00:00 2001 +From: Nick Desaulniers +Date: Mon, 4 Nov 2019 19:31:45 +0100 +Subject: [PATCH] ARM: 8933/1: replace Sun/Solaris style flag on section + directive + +[ Upstream commit 790756c7e0229dedc83bf058ac69633045b1000e ] + +It looks like a section directive was using "Solaris style" to declare +the section flags. Replace this with the GNU style so that Clang's +integrated assembler can assemble this directive. + +The modified instances were identified via: +$ ag \.section | grep # + +Link: https://ftp.gnu.org/old-gnu/Manuals/gas-2.9.1/html_chapter/as_7.html#SEC119 +Link: https://github.com/ClangBuiltLinux/linux/issues/744 +Link: https://bugs.llvm.org/show_bug.cgi?id=43759 +Link: https://reviews.llvm.org/D69296 + +Acked-by: Nicolas Pitre +Reviewed-by: Ard Biesheuvel +Reviewed-by: Stefan Agner +Signed-off-by: Nick Desaulniers +Suggested-by: Fangrui Song +Suggested-by: Jian Cai +Suggested-by: Peter Smith +Signed-off-by: Russell King +Signed-off-by: Sasha Levin +Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=762d2dcd9e233e3025f8627ea65f23e568045edb +--- + arch/arm/boot/bootp/init.S | 2 +- + arch/arm/boot/compressed/big-endian.S | 2 +- + arch/arm/boot/compressed/head.S | 2 +- + arch/arm/boot/compressed/piggy.S | 2 +- + arch/arm/mm/proc-arm1020.S | 2 +- + arch/arm/mm/proc-arm1020e.S | 2 +- + arch/arm/mm/proc-arm1022.S | 2 +- + arch/arm/mm/proc-arm1026.S | 2 +- + arch/arm/mm/proc-arm720.S | 2 +- + arch/arm/mm/proc-arm740.S | 2 +- + arch/arm/mm/proc-arm7tdmi.S | 2 +- + arch/arm/mm/proc-arm920.S | 2 +- + arch/arm/mm/proc-arm922.S | 2 +- + arch/arm/mm/proc-arm925.S | 2 +- + arch/arm/mm/proc-arm926.S | 2 +- + arch/arm/mm/proc-arm940.S | 2 +- + arch/arm/mm/proc-arm946.S | 2 +- + arch/arm/mm/proc-arm9tdmi.S | 2 +- + arch/arm/mm/proc-fa526.S | 2 +- + arch/arm/mm/proc-feroceon.S | 2 +- + arch/arm/mm/proc-mohawk.S | 2 +- + arch/arm/mm/proc-sa110.S | 2 +- + arch/arm/mm/proc-sa1100.S | 2 +- + arch/arm/mm/proc-v6.S | 2 +- + arch/arm/mm/proc-v7.S | 2 +- + arch/arm/mm/proc-v7m.S | 4 ++-- + arch/arm/mm/proc-xsc3.S | 2 +- + arch/arm/mm/proc-xscale.S | 2 +- + 28 files changed, 29 insertions(+), 29 deletions(-) + +diff --git a/arch/arm/boot/bootp/init.S b/arch/arm/boot/bootp/init.S +index 78b508075161..868eeeaaa46e 100644 +--- a/arch/arm/boot/bootp/init.S ++++ b/arch/arm/boot/bootp/init.S +@@ -16,7 +16,7 @@ + * size immediately following the kernel, we could build this into + * a binary blob, and concatenate the zImage using the cat command. + */ +- .section .start,#alloc,#execinstr ++ .section .start, "ax" + .type _start, #function + .globl _start + +diff --git a/arch/arm/boot/compressed/big-endian.S b/arch/arm/boot/compressed/big-endian.S +index 88e2a88d324b..0e092c36da2f 100644 +--- a/arch/arm/boot/compressed/big-endian.S ++++ b/arch/arm/boot/compressed/big-endian.S +@@ -6,7 +6,7 @@ + * Author: Nicolas Pitre + */ + +- .section ".start", #alloc, #execinstr ++ .section ".start", "ax" + + mrc p15, 0, r0, c1, c0, 0 @ read control reg + orr r0, r0, #(1 << 7) @ enable big endian mode +diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S +index 69e661f574a0..e4d1b3d0b7d9 100644 +--- a/arch/arm/boot/compressed/head.S ++++ b/arch/arm/boot/compressed/head.S +@@ -114,7 +114,7 @@ + #endif + .endm + +- .section ".start", #alloc, #execinstr ++ .section ".start", "ax" + /* + * sort out different calling conventions + */ +diff --git a/arch/arm/boot/compressed/piggy.S b/arch/arm/boot/compressed/piggy.S +index 0284f84dcf38..27577644ee72 100644 +--- a/arch/arm/boot/compressed/piggy.S ++++ b/arch/arm/boot/compressed/piggy.S +@@ -1,5 +1,5 @@ + /* SPDX-License-Identifier: GPL-2.0 */ +- .section .piggydata,#alloc ++ .section .piggydata, "a" + .globl input_data + input_data: + .incbin "arch/arm/boot/compressed/piggy_data" +diff --git a/arch/arm/mm/proc-arm1020.S b/arch/arm/mm/proc-arm1020.S +index 774ef1323554..4773490177c9 100644 +--- a/arch/arm/mm/proc-arm1020.S ++++ b/arch/arm/mm/proc-arm1020.S +@@ -505,7 +505,7 @@ cpu_arm1020_name: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .type __arm1020_proc_info,#object + __arm1020_proc_info: +diff --git a/arch/arm/mm/proc-arm1020e.S b/arch/arm/mm/proc-arm1020e.S +index ae3c27b71594..928e8ca58f40 100644 +--- a/arch/arm/mm/proc-arm1020e.S ++++ b/arch/arm/mm/proc-arm1020e.S +@@ -463,7 +463,7 @@ arm1020e_crval: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .type __arm1020e_proc_info,#object + __arm1020e_proc_info: +diff --git a/arch/arm/mm/proc-arm1022.S b/arch/arm/mm/proc-arm1022.S +index dbb2413fe04d..385584c3d222 100644 +--- a/arch/arm/mm/proc-arm1022.S ++++ b/arch/arm/mm/proc-arm1022.S +@@ -448,7 +448,7 @@ arm1022_crval: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .type __arm1022_proc_info,#object + __arm1022_proc_info: +diff --git a/arch/arm/mm/proc-arm1026.S b/arch/arm/mm/proc-arm1026.S +index 0b37b2cef9d3..29cc81857373 100644 +--- a/arch/arm/mm/proc-arm1026.S ++++ b/arch/arm/mm/proc-arm1026.S +@@ -442,7 +442,7 @@ arm1026_crval: + string cpu_arm1026_name, "ARM1026EJ-S" + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .type __arm1026_proc_info,#object + __arm1026_proc_info: +diff --git a/arch/arm/mm/proc-arm720.S b/arch/arm/mm/proc-arm720.S +index 3651cd70e418..c08cd1b0a1d0 100644 +--- a/arch/arm/mm/proc-arm720.S ++++ b/arch/arm/mm/proc-arm720.S +@@ -186,7 +186,7 @@ arm720_crval: + * See for a definition of this structure. + */ + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .macro arm720_proc_info name:req, cpu_val:req, cpu_mask:req, cpu_name:req, cpu_flush:req + .type __\name\()_proc_info,#object +diff --git a/arch/arm/mm/proc-arm740.S b/arch/arm/mm/proc-arm740.S +index 024fb7732407..6eed87103b95 100644 +--- a/arch/arm/mm/proc-arm740.S ++++ b/arch/arm/mm/proc-arm740.S +@@ -132,7 +132,7 @@ __arm740_setup: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + .type __arm740_proc_info,#object + __arm740_proc_info: + .long 0x41807400 +diff --git a/arch/arm/mm/proc-arm7tdmi.S b/arch/arm/mm/proc-arm7tdmi.S +index 25472d94426d..beb64a7ccb38 100644 +--- a/arch/arm/mm/proc-arm7tdmi.S ++++ b/arch/arm/mm/proc-arm7tdmi.S +@@ -76,7 +76,7 @@ __arm7tdmi_setup: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .macro arm7tdmi_proc_info name:req, cpu_val:req, cpu_mask:req, cpu_name:req, \ + extra_hwcaps=0 +diff --git a/arch/arm/mm/proc-arm920.S b/arch/arm/mm/proc-arm920.S +index 7a14bd4414c9..5d4319708362 100644 +--- a/arch/arm/mm/proc-arm920.S ++++ b/arch/arm/mm/proc-arm920.S +@@ -448,7 +448,7 @@ arm920_crval: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .type __arm920_proc_info,#object + __arm920_proc_info: +diff --git a/arch/arm/mm/proc-arm922.S b/arch/arm/mm/proc-arm922.S +index edccfcdcd551..7e22ca780b36 100644 +--- a/arch/arm/mm/proc-arm922.S ++++ b/arch/arm/mm/proc-arm922.S +@@ -426,7 +426,7 @@ arm922_crval: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .type __arm922_proc_info,#object + __arm922_proc_info: +diff --git a/arch/arm/mm/proc-arm925.S b/arch/arm/mm/proc-arm925.S +index 32a47cc19076..d343e77b8456 100644 +--- a/arch/arm/mm/proc-arm925.S ++++ b/arch/arm/mm/proc-arm925.S +@@ -491,7 +491,7 @@ arm925_crval: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .macro arm925_proc_info name:req, cpu_val:req, cpu_mask:req, cpu_name:req, cache + .type __\name\()_proc_info,#object +diff --git a/arch/arm/mm/proc-arm926.S b/arch/arm/mm/proc-arm926.S +index fb827c633693..8cf78c608c42 100644 +--- a/arch/arm/mm/proc-arm926.S ++++ b/arch/arm/mm/proc-arm926.S +@@ -474,7 +474,7 @@ arm926_crval: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .type __arm926_proc_info,#object + __arm926_proc_info: +diff --git a/arch/arm/mm/proc-arm940.S b/arch/arm/mm/proc-arm940.S +index ee5b66f847c4..631ae64eeccd 100644 +--- a/arch/arm/mm/proc-arm940.S ++++ b/arch/arm/mm/proc-arm940.S +@@ -344,7 +344,7 @@ __arm940_setup: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .type __arm940_proc_info,#object + __arm940_proc_info: +diff --git a/arch/arm/mm/proc-arm946.S b/arch/arm/mm/proc-arm946.S +index 7361837edc31..033ad7402d67 100644 +--- a/arch/arm/mm/proc-arm946.S ++++ b/arch/arm/mm/proc-arm946.S +@@ -399,7 +399,7 @@ __arm946_setup: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + .type __arm946_proc_info,#object + __arm946_proc_info: + .long 0x41009460 +diff --git a/arch/arm/mm/proc-arm9tdmi.S b/arch/arm/mm/proc-arm9tdmi.S +index 7fac8c612134..2195468ccd76 100644 +--- a/arch/arm/mm/proc-arm9tdmi.S ++++ b/arch/arm/mm/proc-arm9tdmi.S +@@ -70,7 +70,7 @@ __arm9tdmi_setup: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .macro arm9tdmi_proc_info name:req, cpu_val:req, cpu_mask:req, cpu_name:req + .type __\name\()_proc_info, #object +diff --git a/arch/arm/mm/proc-fa526.S b/arch/arm/mm/proc-fa526.S +index 4001b73af4ee..fd3e5dd94e59 100644 +--- a/arch/arm/mm/proc-fa526.S ++++ b/arch/arm/mm/proc-fa526.S +@@ -190,7 +190,7 @@ fa526_cr1_set: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .type __fa526_proc_info,#object + __fa526_proc_info: +diff --git a/arch/arm/mm/proc-feroceon.S b/arch/arm/mm/proc-feroceon.S +index 92e08bf37aad..685d324a74d3 100644 +--- a/arch/arm/mm/proc-feroceon.S ++++ b/arch/arm/mm/proc-feroceon.S +@@ -584,7 +584,7 @@ feroceon_crval: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .macro feroceon_proc_info name:req, cpu_val:req, cpu_mask:req, cpu_name:req, cache:req + .type __\name\()_proc_info,#object +diff --git a/arch/arm/mm/proc-mohawk.S b/arch/arm/mm/proc-mohawk.S +index 6f07d2ef4ff2..9182321a586a 100644 +--- a/arch/arm/mm/proc-mohawk.S ++++ b/arch/arm/mm/proc-mohawk.S +@@ -429,7 +429,7 @@ mohawk_crval: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .type __88sv331x_proc_info,#object + __88sv331x_proc_info: +diff --git a/arch/arm/mm/proc-sa110.S b/arch/arm/mm/proc-sa110.S +index ee2ce496239f..093ad2ceff28 100644 +--- a/arch/arm/mm/proc-sa110.S ++++ b/arch/arm/mm/proc-sa110.S +@@ -199,7 +199,7 @@ sa110_crval: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .type __sa110_proc_info,#object + __sa110_proc_info: +diff --git a/arch/arm/mm/proc-sa1100.S b/arch/arm/mm/proc-sa1100.S +index 222d5836f666..12b8fcab4b59 100644 +--- a/arch/arm/mm/proc-sa1100.S ++++ b/arch/arm/mm/proc-sa1100.S +@@ -242,7 +242,7 @@ sa1100_crval: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .macro sa1100_proc_info name:req, cpu_val:req, cpu_mask:req, cpu_name:req + .type __\name\()_proc_info,#object +diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S +index 06d890a2342b..32f4df0915ef 100644 +--- a/arch/arm/mm/proc-v6.S ++++ b/arch/arm/mm/proc-v6.S +@@ -264,7 +264,7 @@ v6_crval: + string cpu_elf_name, "v6" + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + /* + * Match any ARMv6 processor core. +diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S +index 339eb17c9808..e351d682c2e3 100644 +--- a/arch/arm/mm/proc-v7.S ++++ b/arch/arm/mm/proc-v7.S +@@ -637,7 +637,7 @@ __v7_setup_stack: + string cpu_elf_name, "v7" + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + /* + * Standard v7 proc info content +diff --git a/arch/arm/mm/proc-v7m.S b/arch/arm/mm/proc-v7m.S +index 9c2978c128d9..0be14b64879c 100644 +--- a/arch/arm/mm/proc-v7m.S ++++ b/arch/arm/mm/proc-v7m.S +@@ -96,7 +96,7 @@ ENTRY(cpu_cm7_proc_fin) + ret lr + ENDPROC(cpu_cm7_proc_fin) + +- .section ".init.text", #alloc, #execinstr ++ .section ".init.text", "ax" + + __v7m_cm7_setup: + mov r8, #(V7M_SCB_CCR_DC | V7M_SCB_CCR_IC| V7M_SCB_CCR_BP) +@@ -180,7 +180,7 @@ ENDPROC(__v7m_setup) + string cpu_elf_name "v7m" + string cpu_v7m_name "ARMv7-M" + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .macro __v7m_proc name, initfunc, cache_fns = nop_cache_fns, hwcaps = 0, proc_fns = v7m_processor_functions + .long 0 /* proc_info_list.__cpu_mm_mmu_flags */ +diff --git a/arch/arm/mm/proc-xsc3.S b/arch/arm/mm/proc-xsc3.S +index 293dcc2c441f..da96e4de1353 100644 +--- a/arch/arm/mm/proc-xsc3.S ++++ b/arch/arm/mm/proc-xsc3.S +@@ -499,7 +499,7 @@ xsc3_crval: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .macro xsc3_proc_info name:req, cpu_val:req, cpu_mask:req + .type __\name\()_proc_info,#object +diff --git a/arch/arm/mm/proc-xscale.S b/arch/arm/mm/proc-xscale.S +index 3d75b7972fd1..c7800c69921b 100644 +--- a/arch/arm/mm/proc-xscale.S ++++ b/arch/arm/mm/proc-xscale.S +@@ -613,7 +613,7 @@ xscale_crval: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .macro xscale_proc_info name:req, cpu_val:req, cpu_mask:req, cpu_name:req, cache + .type __\name\()_proc_info,#object +-- +2.43.0 + diff --git a/buildroot/board/atmel/at91sam9x5ek/patches/linux/linux.hash b/buildroot/board/atmel/at91sam9x5ek/patches/linux/linux.hash new file mode 100644 index 0000000000..ef899fbbc9 --- /dev/null +++ b/buildroot/board/atmel/at91sam9x5ek/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 6cc67b3d2d550c3f0b201d7850bdb25503bc6a51e41b98d2c0fbd531b56f3a20 linux-linux4sam_6.1.tar.gz diff --git a/buildroot/board/atmel/at91sam9x5ek/patches/uboot/uboot.hash b/buildroot/board/atmel/at91sam9x5ek/patches/uboot/uboot.hash new file mode 100644 index 0000000000..723ce137f2 --- /dev/null +++ b/buildroot/board/atmel/at91sam9x5ek/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 c7c08f44487c97ade41966ed6cd639258d124e781580ea0a82d96b6b5ca230a5 uboot-linux4sam_6.1-git4.tar.gz diff --git a/buildroot/board/avnet/rzboard_v2l/genimage.cfg b/buildroot/board/avnet/rzboard_v2l/genimage.cfg new file mode 100644 index 0000000000..94f35cb360 --- /dev/null +++ b/buildroot/board/avnet/rzboard_v2l/genimage.cfg @@ -0,0 +1,29 @@ +# SD card image for RZBoard V2L + +image boot.vfat { + vfat { + files = { + "Image", + "rzboard.dtb", + "uEnv.txt" + } + } + size = 24M +} + +image sdcard.img { + hdimage { + partition-table-type = "hybrid" + } + + partition boot { + partition-type = "0xC" + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext2" + } +} diff --git a/buildroot/board/avnet/rzboard_v2l/post-image.sh b/buildroot/board/avnet/rzboard_v2l/post-image.sh new file mode 100755 index 0000000000..25bef8f793 --- /dev/null +++ b/buildroot/board/avnet/rzboard_v2l/post-image.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +set -e + +cp board/avnet/rzboard_v2l/uEnv.txt "${BINARIES_DIR}" +support/scripts/genimage.sh -c board/avnet/rzboard_v2l/genimage.cfg diff --git a/buildroot/board/avnet/rzboard_v2l/readme.txt b/buildroot/board/avnet/rzboard_v2l/readme.txt new file mode 100644 index 0000000000..24b5680874 --- /dev/null +++ b/buildroot/board/avnet/rzboard_v2l/readme.txt @@ -0,0 +1,71 @@ +RZBoard V2L +=========== + +https://www.avnet.com/wps/portal/us/products/avnet-boards/avnet-board-families/rzboard-v2l/ + +This board support creates a bootable sd card image for the AVNET RZBoard V2L. +This board is shipped with a u-boot inside its eMMC. This board support uses +that u-boot and only puts uEnv.txt, kernel image and rootfs onto the sd card. + +Build: +====== + + $ make rzboard_v2l_defconfig + $ make + +Files created in output directory +================================= + +output/images +. +├── Image +├── boot.vfat +├── rootfs.ext2 +├── rootfs.ext4 +├── rootfs.tar +├── rzboard.dtb +├── sdcard.img +└── uEnv.txt + +Creating bootable SD card: +========================== + +Simply invoke (as root) + +sudo dd if=output/images/sdcard.img of=/dev/sdX && sync + +Where X is your SD card device. + +Booting: +======== + +Configure board for sd card boot: +--------------------------------- +Set the 'BOOT1' switch (next to the audio jack) to '1' (away from 'ON') in +order to let the board boot kernel and rootfs from SD card. + +Serial console: +--------------- +The RZBoard V2L has a 4-pin header "J19" right next to the micro USB. Its +layout can be seen in the Quick-Start Guide, or the Hardware User Guide, +obtainable from: +https://www.avnet.com/wps/portal/us/products/avnet-boards/avnet-board-families/rzboard-v2l/ + +The uart pins are as follows (from left to right - orientation according to the +board's labeling): + +pin 1: n/a (most away from the board's corner) +pin 2: tx +pin 3: rx +pin 4: gnd (nearest to the board's corner) + +Baudrate for this board is 115200. + +Power-Up: +--------- +Plug in a suitable USB-C power supply and press the button 'S1' (next to the +USB-C port) for 2 seconds until the LED goes on. + +Login: +------ +Enter 'root' as login user, and the prompt is ready. diff --git a/buildroot/board/avnet/rzboard_v2l/uEnv.txt b/buildroot/board/avnet/rzboard_v2l/uEnv.txt new file mode 100644 index 0000000000..28b8acb8c6 --- /dev/null +++ b/buildroot/board/avnet/rzboard_v2l/uEnv.txt @@ -0,0 +1,3 @@ +bootcmd=booti ${kernel_addr_r} - ${fdt_addr_r} +uenvcmd=fatload mmc 0:1 ${kernel_addr_r} Image; fatload mmc 0:1 ${fdt_addr_r} rzboard.dtb +bootargs=root=/dev/mmcblk0p2 rw rootfstype=ext4 earlyprintk console=ttyS0,115200 rootwait earlycon clk_ignore_unused debug diff --git a/buildroot/board/bananapi/bananapi-m1/boot.cmd b/buildroot/board/bananapi/bananapi-m1/boot.cmd deleted file mode 100644 index 0cf6f4d63e..0000000000 --- a/buildroot/board/bananapi/bananapi-m1/boot.cmd +++ /dev/null @@ -1,7 +0,0 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -mmc dev 0 -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun7i-a20-bananapi.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/buildroot/board/bananapi/bananapi-m1/genimage.cfg b/buildroot/board/bananapi/bananapi-m1/genimage.cfg deleted file mode 100644 index ce62fbf712..0000000000 --- a/buildroot/board/bananapi/bananapi-m1/genimage.cfg +++ /dev/null @@ -1,34 +0,0 @@ -image boot.vfat { - vfat { - files = { - "zImage", - "sun7i-a20-bananapi.dtb", - "boot.scr" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - size = 1016K # 1MB - 8KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/buildroot/board/bananapi/bananapi-m1/readme.txt b/buildroot/board/bananapi/bananapi-m1/readme.txt deleted file mode 100644 index 382ba63c49..0000000000 --- a/buildroot/board/bananapi/bananapi-m1/readme.txt +++ /dev/null @@ -1,37 +0,0 @@ -Intro -===== - -This default configuration will allow you to start experimenting with the -buildroot environment for the Bananapi M1. With the current configuration -it will bring-up the board, and allow access through the serial console. - -Bananapi M1 link: -http://www.banana-pi.org/m1.html - -Wiki link: -https://openedev.amarulasolutions.com/display/ODWIKI/Bananapi+M1 - -This configuration uses U-Boot mainline and kernel mainline. - -How to build -============ - - $ make bananapi_m1_defconfig - $ make - -Note: you will need access to the internet to download the required -sources. - -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 Bananapi M1 and power it up. The console -is on the serial line, 115200 8N1. diff --git a/buildroot/board/bananapi/bananapi-m2-berry/extlinux.conf b/buildroot/board/bananapi/bananapi-m2-berry/extlinux.conf new file mode 100644 index 0000000000..1f1b4f5cf3 --- /dev/null +++ b/buildroot/board/bananapi/bananapi-m2-berry/extlinux.conf @@ -0,0 +1,4 @@ +label Bananapi M2 Berry linux + kernel /boot/zImage + devicetree /boot/sun8i-v40-bananapi-m2-berry.dtb + append console=ttyS0,115200n8 root=/dev/mmcblk0p1 rootwait diff --git a/buildroot/board/bananapi/bananapi-m2-berry/genimage.cfg b/buildroot/board/bananapi/bananapi-m2-berry/genimage.cfg new file mode 100644 index 0000000000..92c8677545 --- /dev/null +++ b/buildroot/board/bananapi/bananapi-m2-berry/genimage.cfg @@ -0,0 +1,16 @@ +image sdcard.img { + hdimage { + } + + partition u-boot { + in-partition-table = "no" + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + size = 1016K # 1MB - 8KB + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/buildroot/board/bananapi/bananapi-m2-berry/post-build.sh b/buildroot/board/bananapi/bananapi-m2-berry/post-build.sh new file mode 100755 index 0000000000..21a2b0d8e7 --- /dev/null +++ b/buildroot/board/bananapi/bananapi-m2-berry/post-build.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +BOARD_DIR="$(dirname "$0")" + +install -m 644 -D "${BOARD_DIR}"/extlinux.conf \ + "${TARGET_DIR}"/boot/extlinux/extlinux.conf diff --git a/buildroot/board/bananapi/bananapi-m2-berry/readme.txt b/buildroot/board/bananapi/bananapi-m2-berry/readme.txt new file mode 100644 index 0000000000..838675ed94 --- /dev/null +++ b/buildroot/board/bananapi/bananapi-m2-berry/readme.txt @@ -0,0 +1,35 @@ +Intro +===== + +This default configuration will allow you to start experimenting with the +buildroot environment for the Bananapi M2 Berry. With the current +configuration it will bring-up the board, and allow access through the +serial console. + +Bananapi M2 Berry link: +https://wiki.banana-pi.org/Banana_Pi_BPI-M2_Berry + +This configuration uses U-Boot mainline and kernel mainline. + +How to build +============ + + $ make bananapi_m2_berry_defconfig + $ make + +Note: you will need access to the internet to download the required +sources. + +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 Bananapi M2 Berry and power it up. The console +is on the serial line, 115200 8N1. diff --git a/buildroot/board/bananapi/bananapi-m2-ultra/boot.cmd b/buildroot/board/bananapi/bananapi-m2-ultra/boot.cmd deleted file mode 100644 index 9c24eabff6..0000000000 --- a/buildroot/board/bananapi/bananapi-m2-ultra/boot.cmd +++ /dev/null @@ -1,7 +0,0 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -mmc dev 0 -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-r40-bananapi-m2-ultra.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/buildroot/board/bananapi/bananapi-m2-ultra/extlinux.conf b/buildroot/board/bananapi/bananapi-m2-ultra/extlinux.conf new file mode 100644 index 0000000000..f5f35c1d8f --- /dev/null +++ b/buildroot/board/bananapi/bananapi-m2-ultra/extlinux.conf @@ -0,0 +1,4 @@ +label Bananapi M2 Ultra linux + kernel /boot/zImage + devicetree /boot/sun8i-r40-bananapi-m2-ultra.dtb + append console=ttyS0,115200n8 root=/dev/mmcblk0p1 rootwait diff --git a/buildroot/board/bananapi/bananapi-m2-ultra/genimage.cfg b/buildroot/board/bananapi/bananapi-m2-ultra/genimage.cfg index 88324f1f24..92c8677545 100644 --- a/buildroot/board/bananapi/bananapi-m2-ultra/genimage.cfg +++ b/buildroot/board/bananapi/bananapi-m2-ultra/genimage.cfg @@ -1,15 +1,3 @@ -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-r40-bananapi-m2-ultra.dtb", - "boot.scr" - } - } - - size = 64M -} - image sdcard.img { hdimage { } @@ -21,12 +9,6 @@ image sdcard.img { size = 1016K # 1MB - 8KB } - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - partition rootfs { partition-type = 0x83 image = "rootfs.ext4" diff --git a/buildroot/board/bananapi/bananapi-m2-ultra/post-build.sh b/buildroot/board/bananapi/bananapi-m2-ultra/post-build.sh new file mode 100755 index 0000000000..21a2b0d8e7 --- /dev/null +++ b/buildroot/board/bananapi/bananapi-m2-ultra/post-build.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +BOARD_DIR="$(dirname "$0")" + +install -m 644 -D "${BOARD_DIR}"/extlinux.conf \ + "${TARGET_DIR}"/boot/extlinux/extlinux.conf diff --git a/buildroot/board/bananapi/bananapi-m2-zero/boot.cmd b/buildroot/board/bananapi/bananapi-m2-zero/boot.cmd index 081450935b..70ccdf7045 100644 --- a/buildroot/board/bananapi/bananapi-m2-zero/boot.cmd +++ b/buildroot/board/bananapi/bananapi-m2-zero/boot.cmd @@ -1,4 +1,4 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait +setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk1p2 rootwait mmc dev 0 fatload mmc 0 $kernel_addr_r zImage diff --git a/buildroot/board/bananapi/bananapi-m64/boot.cmd b/buildroot/board/bananapi/bananapi-m64/boot.cmd deleted file mode 100644 index d35c9b0b2c..0000000000 --- a/buildroot/board/bananapi/bananapi-m64/boot.cmd +++ /dev/null @@ -1,6 +0,0 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r Image -fatload mmc 0 $fdt_addr_r sun50i-a64-bananapi-m64.dtb - -booti $kernel_addr_r - $fdt_addr_r diff --git a/buildroot/board/bananapi/bananapi-m64/genimage.cfg b/buildroot/board/bananapi/bananapi-m64/genimage.cfg deleted file mode 100644 index e922c0dba2..0000000000 --- a/buildroot/board/bananapi/bananapi-m64/genimage.cfg +++ /dev/null @@ -1,40 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "sun50i-a64-bananapi-m64.dtb", - "boot.scr" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - } - - partition spl { - in-partition-table = "no" - image = "sunxi-spl.bin" - offset = 8K - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot.itb" - offset = 40K - size = 1M # 1MB - 40KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/buildroot/board/bananapi/bananapi-m64/readme.txt b/buildroot/board/bananapi/bananapi-m64/readme.txt deleted file mode 100644 index 0dec3e52ee..0000000000 --- a/buildroot/board/bananapi/bananapi-m64/readme.txt +++ /dev/null @@ -1,37 +0,0 @@ -Intro -===== - -This default configuration will allow you to start experimenting with the -buildroot environment for the Bananapi M64. With the current configuration -it will bring-up the board, and allow access through the serial console. - -Bananapi M64 link: -http://www.banana-pi.org/m64.html - -Wiki link: -https://openedev.amarulasolutions.com/display/ODWIKI/Bananapi+M64 - -This configuration uses U-Boot mainline and kernel mainline. - -How to build -============ - - $ make bananapi_m64_defconfig - $ make - -Note: you will need access to the internet to download the required -sources. - -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 Bananapi M64 and power it up. The console -is on the serial line, 115200 8N1. diff --git a/buildroot/board/beagleboard/beaglebone-qt5/patches/linux-headers/linux-headers.hash b/buildroot/board/beagleboard/beaglebone-qt5/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/beagleboard/beaglebone-qt5/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/beaglebone/patches/linux/0001-keep-jtag-clock-alive-for-debugger.patch b/buildroot/board/beagleboard/beaglebone-qt5/patches/linux/0001-keep-jtag-clock-alive-for-debugger.patch similarity index 100% rename from buildroot/board/beaglebone/patches/linux/0001-keep-jtag-clock-alive-for-debugger.patch rename to buildroot/board/beagleboard/beaglebone-qt5/patches/linux/0001-keep-jtag-clock-alive-for-debugger.patch diff --git a/buildroot/board/beagleboard/beaglebone-qt5/patches/linux/0002-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch b/buildroot/board/beagleboard/beaglebone-qt5/patches/linux/0002-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch new file mode 100644 index 0000000000..e99363aeb6 --- /dev/null +++ b/buildroot/board/beagleboard/beaglebone-qt5/patches/linux/0002-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch @@ -0,0 +1,432 @@ +From 790756c7e0229dedc83bf058ac69633045b1000e Mon Sep 17 00:00:00 2001 +From: Nick Desaulniers +Date: Mon, 4 Nov 2019 19:31:45 +0100 +Subject: [PATCH] ARM: 8933/1: replace Sun/Solaris style flag on section + directive + +It looks like a section directive was using "Solaris style" to declare +the section flags. Replace this with the GNU style so that Clang's +integrated assembler can assemble this directive. + +The modified instances were identified via: +$ ag \.section | grep # + +Link: https://ftp.gnu.org/old-gnu/Manuals/gas-2.9.1/html_chapter/as_7.html#SEC119 +Link: https://github.com/ClangBuiltLinux/linux/issues/744 +Link: https://bugs.llvm.org/show_bug.cgi?id=43759 +Link: https://reviews.llvm.org/D69296 + +Acked-by: Nicolas Pitre +Reviewed-by: Ard Biesheuvel +Reviewed-by: Stefan Agner +Signed-off-by: Nick Desaulniers +Suggested-by: Fangrui Song +Suggested-by: Jian Cai +Suggested-by: Peter Smith +Signed-off-by: Russell King +Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=762d2dcd9e233e3025f8627ea65f23e568045edb +--- + arch/arm/boot/bootp/init.S | 2 +- + arch/arm/boot/compressed/big-endian.S | 2 +- + arch/arm/boot/compressed/head.S | 2 +- + arch/arm/boot/compressed/piggy.S | 2 +- + arch/arm/mm/proc-arm1020.S | 2 +- + arch/arm/mm/proc-arm1020e.S | 2 +- + arch/arm/mm/proc-arm1022.S | 2 +- + arch/arm/mm/proc-arm1026.S | 2 +- + arch/arm/mm/proc-arm720.S | 2 +- + arch/arm/mm/proc-arm740.S | 2 +- + arch/arm/mm/proc-arm7tdmi.S | 2 +- + arch/arm/mm/proc-arm920.S | 2 +- + arch/arm/mm/proc-arm922.S | 2 +- + arch/arm/mm/proc-arm925.S | 2 +- + arch/arm/mm/proc-arm926.S | 2 +- + arch/arm/mm/proc-arm940.S | 2 +- + arch/arm/mm/proc-arm946.S | 2 +- + arch/arm/mm/proc-arm9tdmi.S | 2 +- + arch/arm/mm/proc-fa526.S | 2 +- + arch/arm/mm/proc-feroceon.S | 2 +- + arch/arm/mm/proc-mohawk.S | 2 +- + arch/arm/mm/proc-sa110.S | 2 +- + arch/arm/mm/proc-sa1100.S | 2 +- + arch/arm/mm/proc-v6.S | 2 +- + arch/arm/mm/proc-v7.S | 2 +- + arch/arm/mm/proc-v7m.S | 4 ++-- + arch/arm/mm/proc-xsc3.S | 2 +- + arch/arm/mm/proc-xscale.S | 2 +- + 28 files changed, 29 insertions(+), 29 deletions(-) + +diff --git a/arch/arm/boot/bootp/init.S b/arch/arm/boot/bootp/init.S +index 5c476bd2b4ce..b562da2f7040 100644 +--- a/arch/arm/boot/bootp/init.S ++++ b/arch/arm/boot/bootp/init.S +@@ -13,7 +13,7 @@ + * size immediately following the kernel, we could build this into + * a binary blob, and concatenate the zImage using the cat command. + */ +- .section .start,#alloc,#execinstr ++ .section .start, "ax" + .type _start, #function + .globl _start + +diff --git a/arch/arm/boot/compressed/big-endian.S b/arch/arm/boot/compressed/big-endian.S +index 88e2a88d324b..0e092c36da2f 100644 +--- a/arch/arm/boot/compressed/big-endian.S ++++ b/arch/arm/boot/compressed/big-endian.S +@@ -6,7 +6,7 @@ + * Author: Nicolas Pitre + */ + +- .section ".start", #alloc, #execinstr ++ .section ".start", "ax" + + mrc p15, 0, r0, c1, c0, 0 @ read control reg + orr r0, r0, #(1 << 7) @ enable big endian mode +diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S +index ae70754d003d..ead21e5f2b80 100644 +--- a/arch/arm/boot/compressed/head.S ++++ b/arch/arm/boot/compressed/head.S +@@ -140,7 +140,7 @@ + #endif + .endm + +- .section ".start", #alloc, #execinstr ++ .section ".start", "ax" + /* + * sort out different calling conventions + */ +diff --git a/arch/arm/boot/compressed/piggy.S b/arch/arm/boot/compressed/piggy.S +index 0284f84dcf38..27577644ee72 100644 +--- a/arch/arm/boot/compressed/piggy.S ++++ b/arch/arm/boot/compressed/piggy.S +@@ -1,5 +1,5 @@ + /* SPDX-License-Identifier: GPL-2.0 */ +- .section .piggydata,#alloc ++ .section .piggydata, "a" + .globl input_data + input_data: + .incbin "arch/arm/boot/compressed/piggy_data" +diff --git a/arch/arm/mm/proc-arm1020.S b/arch/arm/mm/proc-arm1020.S +index 4fa5371bc662..2785da387c91 100644 +--- a/arch/arm/mm/proc-arm1020.S ++++ b/arch/arm/mm/proc-arm1020.S +@@ -491,7 +491,7 @@ cpu_arm1020_name: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .type __arm1020_proc_info,#object + __arm1020_proc_info: +diff --git a/arch/arm/mm/proc-arm1020e.S b/arch/arm/mm/proc-arm1020e.S +index 5d8a8339e09a..e9ea237ed785 100644 +--- a/arch/arm/mm/proc-arm1020e.S ++++ b/arch/arm/mm/proc-arm1020e.S +@@ -449,7 +449,7 @@ arm1020e_crval: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .type __arm1020e_proc_info,#object + __arm1020e_proc_info: +diff --git a/arch/arm/mm/proc-arm1022.S b/arch/arm/mm/proc-arm1022.S +index b3dd95c345e4..920c279e7879 100644 +--- a/arch/arm/mm/proc-arm1022.S ++++ b/arch/arm/mm/proc-arm1022.S +@@ -443,7 +443,7 @@ arm1022_crval: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .type __arm1022_proc_info,#object + __arm1022_proc_info: +diff --git a/arch/arm/mm/proc-arm1026.S b/arch/arm/mm/proc-arm1026.S +index e927187157d7..0bdf25a95b10 100644 +--- a/arch/arm/mm/proc-arm1026.S ++++ b/arch/arm/mm/proc-arm1026.S +@@ -437,7 +437,7 @@ arm1026_crval: + string cpu_arm1026_name, "ARM1026EJ-S" + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .type __arm1026_proc_info,#object + __arm1026_proc_info: +diff --git a/arch/arm/mm/proc-arm720.S b/arch/arm/mm/proc-arm720.S +index c99d24363f32..39361e196d61 100644 +--- a/arch/arm/mm/proc-arm720.S ++++ b/arch/arm/mm/proc-arm720.S +@@ -172,7 +172,7 @@ arm720_crval: + * See for a definition of this structure. + */ + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .macro arm720_proc_info name:req, cpu_val:req, cpu_mask:req, cpu_name:req, cpu_flush:req + .type __\name\()_proc_info,#object +diff --git a/arch/arm/mm/proc-arm740.S b/arch/arm/mm/proc-arm740.S +index 1b4a3838393f..1a94bbf6e53f 100644 +--- a/arch/arm/mm/proc-arm740.S ++++ b/arch/arm/mm/proc-arm740.S +@@ -128,7 +128,7 @@ __arm740_setup: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + .type __arm740_proc_info,#object + __arm740_proc_info: + .long 0x41807400 +diff --git a/arch/arm/mm/proc-arm7tdmi.S b/arch/arm/mm/proc-arm7tdmi.S +index 17a4687065c7..52b66cf0259e 100644 +--- a/arch/arm/mm/proc-arm7tdmi.S ++++ b/arch/arm/mm/proc-arm7tdmi.S +@@ -72,7 +72,7 @@ __arm7tdmi_setup: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .macro arm7tdmi_proc_info name:req, cpu_val:req, cpu_mask:req, cpu_name:req, \ + extra_hwcaps=0 +diff --git a/arch/arm/mm/proc-arm920.S b/arch/arm/mm/proc-arm920.S +index 298c76b47749..31ac8acc34dc 100644 +--- a/arch/arm/mm/proc-arm920.S ++++ b/arch/arm/mm/proc-arm920.S +@@ -434,7 +434,7 @@ arm920_crval: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .type __arm920_proc_info,#object + __arm920_proc_info: +diff --git a/arch/arm/mm/proc-arm922.S b/arch/arm/mm/proc-arm922.S +index 824be3a0bc23..ca2c7ca8af21 100644 +--- a/arch/arm/mm/proc-arm922.S ++++ b/arch/arm/mm/proc-arm922.S +@@ -412,7 +412,7 @@ arm922_crval: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .type __arm922_proc_info,#object + __arm922_proc_info: +diff --git a/arch/arm/mm/proc-arm925.S b/arch/arm/mm/proc-arm925.S +index d40cff8f102c..a381a0c9f109 100644 +--- a/arch/arm/mm/proc-arm925.S ++++ b/arch/arm/mm/proc-arm925.S +@@ -477,7 +477,7 @@ arm925_crval: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .macro arm925_proc_info name:req, cpu_val:req, cpu_mask:req, cpu_name:req, cache + .type __\name\()_proc_info,#object +diff --git a/arch/arm/mm/proc-arm926.S b/arch/arm/mm/proc-arm926.S +index 4ef89e1d1127..1ba253c2bce1 100644 +--- a/arch/arm/mm/proc-arm926.S ++++ b/arch/arm/mm/proc-arm926.S +@@ -460,7 +460,7 @@ arm926_crval: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .type __arm926_proc_info,#object + __arm926_proc_info: +diff --git a/arch/arm/mm/proc-arm940.S b/arch/arm/mm/proc-arm940.S +index 1c26d991386d..4b8a00220cc9 100644 +--- a/arch/arm/mm/proc-arm940.S ++++ b/arch/arm/mm/proc-arm940.S +@@ -340,7 +340,7 @@ __arm940_setup: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .type __arm940_proc_info,#object + __arm940_proc_info: +diff --git a/arch/arm/mm/proc-arm946.S b/arch/arm/mm/proc-arm946.S +index 2dc1c75a4fd4..555becf9c758 100644 +--- a/arch/arm/mm/proc-arm946.S ++++ b/arch/arm/mm/proc-arm946.S +@@ -395,7 +395,7 @@ __arm946_setup: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + .type __arm946_proc_info,#object + __arm946_proc_info: + .long 0x41009460 +diff --git a/arch/arm/mm/proc-arm9tdmi.S b/arch/arm/mm/proc-arm9tdmi.S +index 913c06e590af..ef517530130b 100644 +--- a/arch/arm/mm/proc-arm9tdmi.S ++++ b/arch/arm/mm/proc-arm9tdmi.S +@@ -66,7 +66,7 @@ __arm9tdmi_setup: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .macro arm9tdmi_proc_info name:req, cpu_val:req, cpu_mask:req, cpu_name:req + .type __\name\()_proc_info, #object +diff --git a/arch/arm/mm/proc-fa526.S b/arch/arm/mm/proc-fa526.S +index 8120b6f4dbb8..dddf833fe000 100644 +--- a/arch/arm/mm/proc-fa526.S ++++ b/arch/arm/mm/proc-fa526.S +@@ -185,7 +185,7 @@ fa526_cr1_set: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .type __fa526_proc_info,#object + __fa526_proc_info: +diff --git a/arch/arm/mm/proc-feroceon.S b/arch/arm/mm/proc-feroceon.S +index bb6dc34d42a3..b12b76bc8d30 100644 +--- a/arch/arm/mm/proc-feroceon.S ++++ b/arch/arm/mm/proc-feroceon.S +@@ -571,7 +571,7 @@ feroceon_crval: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .macro feroceon_proc_info name:req, cpu_val:req, cpu_mask:req, cpu_name:req, cache:req + .type __\name\()_proc_info,#object +diff --git a/arch/arm/mm/proc-mohawk.S b/arch/arm/mm/proc-mohawk.S +index f08308578885..d47d6c5cee63 100644 +--- a/arch/arm/mm/proc-mohawk.S ++++ b/arch/arm/mm/proc-mohawk.S +@@ -416,7 +416,7 @@ mohawk_crval: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .type __88sv331x_proc_info,#object + __88sv331x_proc_info: +diff --git a/arch/arm/mm/proc-sa110.S b/arch/arm/mm/proc-sa110.S +index d5bc5d702563..baba503ba816 100644 +--- a/arch/arm/mm/proc-sa110.S ++++ b/arch/arm/mm/proc-sa110.S +@@ -196,7 +196,7 @@ sa110_crval: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .type __sa110_proc_info,#object + __sa110_proc_info: +diff --git a/arch/arm/mm/proc-sa1100.S b/arch/arm/mm/proc-sa1100.S +index be7b611c76c7..75ebacc8e4e5 100644 +--- a/arch/arm/mm/proc-sa1100.S ++++ b/arch/arm/mm/proc-sa1100.S +@@ -239,7 +239,7 @@ sa1100_crval: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .macro sa1100_proc_info name:req, cpu_val:req, cpu_mask:req, cpu_name:req + .type __\name\()_proc_info,#object +diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S +index c1c85eb3484f..1dd0d5ca27da 100644 +--- a/arch/arm/mm/proc-v6.S ++++ b/arch/arm/mm/proc-v6.S +@@ -261,7 +261,7 @@ v6_crval: + string cpu_elf_name, "v6" + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + /* + * Match any ARMv6 processor core. +diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S +index c4e8006a1a8c..48e0ef6f0dcc 100644 +--- a/arch/arm/mm/proc-v7.S ++++ b/arch/arm/mm/proc-v7.S +@@ -644,7 +644,7 @@ __v7_setup_stack: + string cpu_elf_name, "v7" + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + /* + * Standard v7 proc info content +diff --git a/arch/arm/mm/proc-v7m.S b/arch/arm/mm/proc-v7m.S +index 1a49d503eafc..84459c1d31b8 100644 +--- a/arch/arm/mm/proc-v7m.S ++++ b/arch/arm/mm/proc-v7m.S +@@ -93,7 +93,7 @@ ENTRY(cpu_cm7_proc_fin) + ret lr + ENDPROC(cpu_cm7_proc_fin) + +- .section ".init.text", #alloc, #execinstr ++ .section ".init.text", "ax" + + __v7m_cm7_setup: + mov r8, #(V7M_SCB_CCR_DC | V7M_SCB_CCR_IC| V7M_SCB_CCR_BP) +@@ -177,7 +177,7 @@ ENDPROC(__v7m_setup) + string cpu_elf_name "v7m" + string cpu_v7m_name "ARMv7-M" + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .macro __v7m_proc name, initfunc, cache_fns = nop_cache_fns, hwcaps = 0, proc_fns = v7m_processor_functions + .long 0 /* proc_info_list.__cpu_mm_mmu_flags */ +diff --git a/arch/arm/mm/proc-xsc3.S b/arch/arm/mm/proc-xsc3.S +index 1ac0fbbe9f12..42eaecc43cfe 100644 +--- a/arch/arm/mm/proc-xsc3.S ++++ b/arch/arm/mm/proc-xsc3.S +@@ -496,7 +496,7 @@ xsc3_crval: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .macro xsc3_proc_info name:req, cpu_val:req, cpu_mask:req + .type __\name\()_proc_info,#object +diff --git a/arch/arm/mm/proc-xscale.S b/arch/arm/mm/proc-xscale.S +index bdb2b7749b03..18ac5a1f8922 100644 +--- a/arch/arm/mm/proc-xscale.S ++++ b/arch/arm/mm/proc-xscale.S +@@ -610,7 +610,7 @@ xscale_crval: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .macro xscale_proc_info name:req, cpu_val:req, cpu_mask:req, cpu_name:req, cache + .type __\name\()_proc_info,#object +-- +2.43.0 + diff --git a/buildroot/board/beagleboard/beaglebone-qt5/patches/linux/0003-ata-ahci-Match-EM_MAX_SLOTS-with-SATA_PMP_MAX_PORTS.patch b/buildroot/board/beagleboard/beaglebone-qt5/patches/linux/0003-ata-ahci-Match-EM_MAX_SLOTS-with-SATA_PMP_MAX_PORTS.patch new file mode 100644 index 0000000000..50f5cf71a7 --- /dev/null +++ b/buildroot/board/beagleboard/beaglebone-qt5/patches/linux/0003-ata-ahci-Match-EM_MAX_SLOTS-with-SATA_PMP_MAX_PORTS.patch @@ -0,0 +1,80 @@ +From 67a00c299c5c143817c948fbc7de1a2fa1af38fb Mon Sep 17 00:00:00 2001 +From: Kai-Heng Feng +Date: Tue, 11 Oct 2022 10:46:17 +0800 +Subject: [PATCH] ata: ahci: Match EM_MAX_SLOTS with SATA_PMP_MAX_PORTS + +commit 1e41e693f458eef2d5728207dbd327cd3b16580a upstream. + +UBSAN complains about array-index-out-of-bounds: +[ 1.980703] kernel: UBSAN: array-index-out-of-bounds in /build/linux-9H675w/linux-5.15.0/drivers/ata/libahci.c:968:41 +[ 1.980709] kernel: index 15 is out of range for type 'ahci_em_priv [8]' +[ 1.980713] kernel: CPU: 0 PID: 209 Comm: scsi_eh_8 Not tainted 5.15.0-25-generic #25-Ubuntu +[ 1.980716] kernel: Hardware name: System manufacturer System Product Name/P5Q3, BIOS 1102 06/11/2010 +[ 1.980718] kernel: Call Trace: +[ 1.980721] kernel: +[ 1.980723] kernel: show_stack+0x52/0x58 +[ 1.980729] kernel: dump_stack_lvl+0x4a/0x5f +[ 1.980734] kernel: dump_stack+0x10/0x12 +[ 1.980736] kernel: ubsan_epilogue+0x9/0x45 +[ 1.980739] kernel: __ubsan_handle_out_of_bounds.cold+0x44/0x49 +[ 1.980742] kernel: ahci_qc_issue+0x166/0x170 [libahci] +[ 1.980748] kernel: ata_qc_issue+0x135/0x240 +[ 1.980752] kernel: ata_exec_internal_sg+0x2c4/0x580 +[ 1.980754] kernel: ? vprintk_default+0x1d/0x20 +[ 1.980759] kernel: ata_exec_internal+0x67/0xa0 +[ 1.980762] kernel: sata_pmp_read+0x8d/0xc0 +[ 1.980765] kernel: sata_pmp_read_gscr+0x3c/0x90 +[ 1.980768] kernel: sata_pmp_attach+0x8b/0x310 +[ 1.980771] kernel: ata_eh_revalidate_and_attach+0x28c/0x4b0 +[ 1.980775] kernel: ata_eh_recover+0x6b6/0xb30 +[ 1.980778] kernel: ? ahci_do_hardreset+0x180/0x180 [libahci] +[ 1.980783] kernel: ? ahci_stop_engine+0xb0/0xb0 [libahci] +[ 1.980787] kernel: ? ahci_do_softreset+0x290/0x290 [libahci] +[ 1.980792] kernel: ? trace_event_raw_event_ata_eh_link_autopsy_qc+0xe0/0xe0 +[ 1.980795] kernel: sata_pmp_eh_recover.isra.0+0x214/0x560 +[ 1.980799] kernel: sata_pmp_error_handler+0x23/0x40 +[ 1.980802] kernel: ahci_error_handler+0x43/0x80 [libahci] +[ 1.980806] kernel: ata_scsi_port_error_handler+0x2b1/0x600 +[ 1.980810] kernel: ata_scsi_error+0x9c/0xd0 +[ 1.980813] kernel: scsi_error_handler+0xa1/0x180 +[ 1.980817] kernel: ? scsi_unjam_host+0x1c0/0x1c0 +[ 1.980820] kernel: kthread+0x12a/0x150 +[ 1.980823] kernel: ? set_kthread_struct+0x50/0x50 +[ 1.980826] kernel: ret_from_fork+0x22/0x30 +[ 1.980831] kernel: + +This happens because sata_pmp_init_links() initialize link->pmp up to +SATA_PMP_MAX_PORTS while em_priv is declared as 8 elements array. + +I can't find the maximum Enclosure Management ports specified in AHCI +spec v1.3.1, but "12.2.1 LED message type" states that "Port Multiplier +Information" can utilize 4 bits, which implies it can support up to 16 +ports. Hence, use SATA_PMP_MAX_PORTS as EM_MAX_SLOTS to resolve the +issue. + +BugLink: https://bugs.launchpad.net/bugs/1970074 +Cc: stable@vger.kernel.org +Signed-off-by: Kai-Heng Feng +Signed-off-by: Damien Le Moal +Signed-off-by: Greg Kroah-Hartman +Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=67a00c299c5c143817c948fbc7de1a2fa1af38fb +--- + drivers/ata/ahci.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h +index 9290e787abdc..d5b9f9689877 100644 +--- a/drivers/ata/ahci.h ++++ b/drivers/ata/ahci.h +@@ -265,7 +265,7 @@ enum { + PCS_7 = 0x94, /* 7+ port PCS (Denverton) */ + + /* em constants */ +- EM_MAX_SLOTS = 8, ++ EM_MAX_SLOTS = SATA_PMP_MAX_PORTS, + EM_MAX_RETRY = 5, + + /* em_ctl bits */ +-- +2.43.0 + diff --git a/buildroot/board/beagleboard/beaglebone-qt5/patches/linux/0004-ata-ahci-fix-enum-constants-for-gcc-13.patch b/buildroot/board/beagleboard/beaglebone-qt5/patches/linux/0004-ata-ahci-fix-enum-constants-for-gcc-13.patch new file mode 100644 index 0000000000..6a5b3f594b --- /dev/null +++ b/buildroot/board/beagleboard/beaglebone-qt5/patches/linux/0004-ata-ahci-fix-enum-constants-for-gcc-13.patch @@ -0,0 +1,357 @@ +From ba6e23d2c9e3bcabda328467ba4eeca12f37e2ae Mon Sep 17 00:00:00 2001 +From: Arnd Bergmann +Date: Sat, 3 Dec 2022 11:54:25 +0100 +Subject: [PATCH] ata: ahci: fix enum constants for gcc-13 + +commit f07788079f515ca4a681c5f595bdad19cfbd7b1d upstream. + +gcc-13 slightly changes the type of constant expressions that are defined +in an enum, which triggers a compile time sanity check in libata: + +linux/drivers/ata/libahci.c: In function 'ahci_led_store': +linux/include/linux/compiler_types.h:357:45: error: call to '__compiletime_assert_302' declared with attribute error: BUILD_BUG_ON failed: sizeof(_s) > sizeof(long) +357 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) + +The new behavior is that sizeof() returns the same value for the +constant as it does for the enum type, which is generally more sensible +and consistent. + +The problem in libata is that it contains a single enum definition for +lots of unrelated constants, some of which are large positive (unsigned) +integers like 0xffffffff, while others like (1<<31) are interpreted as +negative integers, and this forces the enum type to become 64 bit wide +even though most constants would still fit into a signed 32-bit 'int'. + +Fix this by changing the entire enum definition to use BIT(x) in place +of (1< +Cc: linux-ide@vger.kernel.org +Cc: Damien Le Moal +Cc: stable@vger.kernel.org +Cc: Randy Dunlap +Signed-off-by: Arnd Bergmann +Tested-by: Luis Machado +Signed-off-by: Damien Le Moal +[Backport to linux-4.19.y] +Signed-off-by: Paul Barker +Signed-off-by: Greg Kroah-Hartman +Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=4c3ddc06cedb62f2904e58fd95170bf206bee149 +--- + drivers/ata/ahci.h | 232 +++++++++++++++++++++++---------------------- + 1 file changed, 117 insertions(+), 115 deletions(-) + +diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h +index d5b9f9689877..8cc6cb14767b 100644 +--- a/drivers/ata/ahci.h ++++ b/drivers/ata/ahci.h +@@ -40,6 +40,7 @@ + #include + #include + #include ++#include + + /* Enclosure Management Control */ + #define EM_CTRL_MSG_TYPE 0x000f0000 +@@ -70,12 +71,12 @@ enum { + AHCI_PORT_PRIV_FBS_DMA_SZ = AHCI_CMD_SLOT_SZ + + AHCI_CMD_TBL_AR_SZ + + (AHCI_RX_FIS_SZ * 16), +- AHCI_IRQ_ON_SG = (1 << 31), +- AHCI_CMD_ATAPI = (1 << 5), +- AHCI_CMD_WRITE = (1 << 6), +- AHCI_CMD_PREFETCH = (1 << 7), +- AHCI_CMD_RESET = (1 << 8), +- AHCI_CMD_CLR_BUSY = (1 << 10), ++ AHCI_IRQ_ON_SG = BIT(31), ++ AHCI_CMD_ATAPI = BIT(5), ++ AHCI_CMD_WRITE = BIT(6), ++ AHCI_CMD_PREFETCH = BIT(7), ++ AHCI_CMD_RESET = BIT(8), ++ AHCI_CMD_CLR_BUSY = BIT(10), + + RX_FIS_PIO_SETUP = 0x20, /* offset of PIO Setup FIS data */ + RX_FIS_D2H_REG = 0x40, /* offset of D2H Register FIS data */ +@@ -93,37 +94,37 @@ enum { + HOST_CAP2 = 0x24, /* host capabilities, extended */ + + /* HOST_CTL bits */ +- HOST_RESET = (1 << 0), /* reset controller; self-clear */ +- HOST_IRQ_EN = (1 << 1), /* global IRQ enable */ +- HOST_MRSM = (1 << 2), /* MSI Revert to Single Message */ +- HOST_AHCI_EN = (1 << 31), /* AHCI enabled */ ++ HOST_RESET = BIT(0), /* reset controller; self-clear */ ++ HOST_IRQ_EN = BIT(1), /* global IRQ enable */ ++ HOST_MRSM = BIT(2), /* MSI Revert to Single Message */ ++ HOST_AHCI_EN = BIT(31), /* AHCI enabled */ + + /* HOST_CAP bits */ +- HOST_CAP_SXS = (1 << 5), /* Supports External SATA */ +- HOST_CAP_EMS = (1 << 6), /* Enclosure Management support */ +- HOST_CAP_CCC = (1 << 7), /* Command Completion Coalescing */ +- HOST_CAP_PART = (1 << 13), /* Partial state capable */ +- HOST_CAP_SSC = (1 << 14), /* Slumber state capable */ +- HOST_CAP_PIO_MULTI = (1 << 15), /* PIO multiple DRQ support */ +- HOST_CAP_FBS = (1 << 16), /* FIS-based switching support */ +- HOST_CAP_PMP = (1 << 17), /* Port Multiplier support */ +- HOST_CAP_ONLY = (1 << 18), /* Supports AHCI mode only */ +- HOST_CAP_CLO = (1 << 24), /* Command List Override support */ +- HOST_CAP_LED = (1 << 25), /* Supports activity LED */ +- HOST_CAP_ALPM = (1 << 26), /* Aggressive Link PM support */ +- HOST_CAP_SSS = (1 << 27), /* Staggered Spin-up */ +- HOST_CAP_MPS = (1 << 28), /* Mechanical presence switch */ +- HOST_CAP_SNTF = (1 << 29), /* SNotification register */ +- HOST_CAP_NCQ = (1 << 30), /* Native Command Queueing */ +- HOST_CAP_64 = (1 << 31), /* PCI DAC (64-bit DMA) support */ ++ HOST_CAP_SXS = BIT(5), /* Supports External SATA */ ++ HOST_CAP_EMS = BIT(6), /* Enclosure Management support */ ++ HOST_CAP_CCC = BIT(7), /* Command Completion Coalescing */ ++ HOST_CAP_PART = BIT(13), /* Partial state capable */ ++ HOST_CAP_SSC = BIT(14), /* Slumber state capable */ ++ HOST_CAP_PIO_MULTI = BIT(15), /* PIO multiple DRQ support */ ++ HOST_CAP_FBS = BIT(16), /* FIS-based switching support */ ++ HOST_CAP_PMP = BIT(17), /* Port Multiplier support */ ++ HOST_CAP_ONLY = BIT(18), /* Supports AHCI mode only */ ++ HOST_CAP_CLO = BIT(24), /* Command List Override support */ ++ HOST_CAP_LED = BIT(25), /* Supports activity LED */ ++ HOST_CAP_ALPM = BIT(26), /* Aggressive Link PM support */ ++ HOST_CAP_SSS = BIT(27), /* Staggered Spin-up */ ++ HOST_CAP_MPS = BIT(28), /* Mechanical presence switch */ ++ HOST_CAP_SNTF = BIT(29), /* SNotification register */ ++ HOST_CAP_NCQ = BIT(30), /* Native Command Queueing */ ++ HOST_CAP_64 = BIT(31), /* PCI DAC (64-bit DMA) support */ + + /* HOST_CAP2 bits */ +- HOST_CAP2_BOH = (1 << 0), /* BIOS/OS handoff supported */ +- HOST_CAP2_NVMHCI = (1 << 1), /* NVMHCI supported */ +- HOST_CAP2_APST = (1 << 2), /* Automatic partial to slumber */ +- HOST_CAP2_SDS = (1 << 3), /* Support device sleep */ +- HOST_CAP2_SADM = (1 << 4), /* Support aggressive DevSlp */ +- HOST_CAP2_DESO = (1 << 5), /* DevSlp from slumber only */ ++ HOST_CAP2_BOH = BIT(0), /* BIOS/OS handoff supported */ ++ HOST_CAP2_NVMHCI = BIT(1), /* NVMHCI supported */ ++ HOST_CAP2_APST = BIT(2), /* Automatic partial to slumber */ ++ HOST_CAP2_SDS = BIT(3), /* Support device sleep */ ++ HOST_CAP2_SADM = BIT(4), /* Support aggressive DevSlp */ ++ HOST_CAP2_DESO = BIT(5), /* DevSlp from slumber only */ + + /* registers for each SATA port */ + PORT_LST_ADDR = 0x00, /* command list DMA addr */ +@@ -145,24 +146,25 @@ enum { + PORT_DEVSLP = 0x44, /* device sleep */ + + /* PORT_IRQ_{STAT,MASK} bits */ +- PORT_IRQ_COLD_PRES = (1 << 31), /* cold presence detect */ +- PORT_IRQ_TF_ERR = (1 << 30), /* task file error */ +- PORT_IRQ_HBUS_ERR = (1 << 29), /* host bus fatal error */ +- PORT_IRQ_HBUS_DATA_ERR = (1 << 28), /* host bus data error */ +- PORT_IRQ_IF_ERR = (1 << 27), /* interface fatal error */ +- PORT_IRQ_IF_NONFATAL = (1 << 26), /* interface non-fatal error */ +- PORT_IRQ_OVERFLOW = (1 << 24), /* xfer exhausted available S/G */ +- PORT_IRQ_BAD_PMP = (1 << 23), /* incorrect port multiplier */ +- +- PORT_IRQ_PHYRDY = (1 << 22), /* PhyRdy changed */ +- PORT_IRQ_DEV_ILCK = (1 << 7), /* device interlock */ +- PORT_IRQ_CONNECT = (1 << 6), /* port connect change status */ +- PORT_IRQ_SG_DONE = (1 << 5), /* descriptor processed */ +- PORT_IRQ_UNK_FIS = (1 << 4), /* unknown FIS rx'd */ +- PORT_IRQ_SDB_FIS = (1 << 3), /* Set Device Bits FIS rx'd */ +- PORT_IRQ_DMAS_FIS = (1 << 2), /* DMA Setup FIS rx'd */ +- PORT_IRQ_PIOS_FIS = (1 << 1), /* PIO Setup FIS rx'd */ +- PORT_IRQ_D2H_REG_FIS = (1 << 0), /* D2H Register FIS rx'd */ ++ PORT_IRQ_COLD_PRES = BIT(31), /* cold presence detect */ ++ PORT_IRQ_TF_ERR = BIT(30), /* task file error */ ++ PORT_IRQ_HBUS_ERR = BIT(29), /* host bus fatal error */ ++ PORT_IRQ_HBUS_DATA_ERR = BIT(28), /* host bus data error */ ++ PORT_IRQ_IF_ERR = BIT(27), /* interface fatal error */ ++ PORT_IRQ_IF_NONFATAL = BIT(26), /* interface non-fatal error */ ++ PORT_IRQ_OVERFLOW = BIT(24), /* xfer exhausted available S/G */ ++ PORT_IRQ_BAD_PMP = BIT(23), /* incorrect port multiplier */ ++ ++ PORT_IRQ_PHYRDY = BIT(22), /* PhyRdy changed */ ++ PORT_IRQ_DEV_ILCK = BIT(7), /* device interlock */ ++ PORT_IRQ_DMPS = BIT(7), /* mechanical presence status */ ++ PORT_IRQ_CONNECT = BIT(6), /* port connect change status */ ++ PORT_IRQ_SG_DONE = BIT(5), /* descriptor processed */ ++ PORT_IRQ_UNK_FIS = BIT(4), /* unknown FIS rx'd */ ++ PORT_IRQ_SDB_FIS = BIT(3), /* Set Device Bits FIS rx'd */ ++ PORT_IRQ_DMAS_FIS = BIT(2), /* DMA Setup FIS rx'd */ ++ PORT_IRQ_PIOS_FIS = BIT(1), /* PIO Setup FIS rx'd */ ++ PORT_IRQ_D2H_REG_FIS = BIT(0), /* D2H Register FIS rx'd */ + + PORT_IRQ_FREEZE = PORT_IRQ_HBUS_ERR | + PORT_IRQ_IF_ERR | +@@ -178,34 +180,34 @@ enum { + PORT_IRQ_PIOS_FIS | PORT_IRQ_D2H_REG_FIS, + + /* PORT_CMD bits */ +- PORT_CMD_ASP = (1 << 27), /* Aggressive Slumber/Partial */ +- PORT_CMD_ALPE = (1 << 26), /* Aggressive Link PM enable */ +- PORT_CMD_ATAPI = (1 << 24), /* Device is ATAPI */ +- PORT_CMD_FBSCP = (1 << 22), /* FBS Capable Port */ +- PORT_CMD_ESP = (1 << 21), /* External Sata Port */ +- PORT_CMD_HPCP = (1 << 18), /* HotPlug Capable Port */ +- PORT_CMD_PMP = (1 << 17), /* PMP attached */ +- PORT_CMD_LIST_ON = (1 << 15), /* cmd list DMA engine running */ +- PORT_CMD_FIS_ON = (1 << 14), /* FIS DMA engine running */ +- PORT_CMD_FIS_RX = (1 << 4), /* Enable FIS receive DMA engine */ +- PORT_CMD_CLO = (1 << 3), /* Command list override */ +- PORT_CMD_POWER_ON = (1 << 2), /* Power up device */ +- PORT_CMD_SPIN_UP = (1 << 1), /* Spin up device */ +- PORT_CMD_START = (1 << 0), /* Enable port DMA engine */ +- +- PORT_CMD_ICC_MASK = (0xf << 28), /* i/f ICC state mask */ +- PORT_CMD_ICC_ACTIVE = (0x1 << 28), /* Put i/f in active state */ +- PORT_CMD_ICC_PARTIAL = (0x2 << 28), /* Put i/f in partial state */ +- PORT_CMD_ICC_SLUMBER = (0x6 << 28), /* Put i/f in slumber state */ ++ PORT_CMD_ASP = BIT(27), /* Aggressive Slumber/Partial */ ++ PORT_CMD_ALPE = BIT(26), /* Aggressive Link PM enable */ ++ PORT_CMD_ATAPI = BIT(24), /* Device is ATAPI */ ++ PORT_CMD_FBSCP = BIT(22), /* FBS Capable Port */ ++ PORT_CMD_ESP = BIT(21), /* External Sata Port */ ++ PORT_CMD_HPCP = BIT(18), /* HotPlug Capable Port */ ++ PORT_CMD_PMP = BIT(17), /* PMP attached */ ++ PORT_CMD_LIST_ON = BIT(15), /* cmd list DMA engine running */ ++ PORT_CMD_FIS_ON = BIT(14), /* FIS DMA engine running */ ++ PORT_CMD_FIS_RX = BIT(4), /* Enable FIS receive DMA engine */ ++ PORT_CMD_CLO = BIT(3), /* Command list override */ ++ PORT_CMD_POWER_ON = BIT(2), /* Power up device */ ++ PORT_CMD_SPIN_UP = BIT(1), /* Spin up device */ ++ PORT_CMD_START = BIT(0), /* Enable port DMA engine */ ++ ++ PORT_CMD_ICC_MASK = (0xfu << 28), /* i/f ICC state mask */ ++ PORT_CMD_ICC_ACTIVE = (0x1u << 28), /* Put i/f in active state */ ++ PORT_CMD_ICC_PARTIAL = (0x2u << 28), /* Put i/f in partial state */ ++ PORT_CMD_ICC_SLUMBER = (0x6u << 28), /* Put i/f in slumber state */ + + /* PORT_FBS bits */ + PORT_FBS_DWE_OFFSET = 16, /* FBS device with error offset */ + PORT_FBS_ADO_OFFSET = 12, /* FBS active dev optimization offset */ + PORT_FBS_DEV_OFFSET = 8, /* FBS device to issue offset */ + PORT_FBS_DEV_MASK = (0xf << PORT_FBS_DEV_OFFSET), /* FBS.DEV */ +- PORT_FBS_SDE = (1 << 2), /* FBS single device error */ +- PORT_FBS_DEC = (1 << 1), /* FBS device error clear */ +- PORT_FBS_EN = (1 << 0), /* Enable FBS */ ++ PORT_FBS_SDE = BIT(2), /* FBS single device error */ ++ PORT_FBS_DEC = BIT(1), /* FBS device error clear */ ++ PORT_FBS_EN = BIT(0), /* Enable FBS */ + + /* PORT_DEVSLP bits */ + PORT_DEVSLP_DM_OFFSET = 25, /* DITO multiplier offset */ +@@ -213,45 +215,45 @@ enum { + PORT_DEVSLP_DITO_OFFSET = 15, /* DITO offset */ + PORT_DEVSLP_MDAT_OFFSET = 10, /* Minimum assertion time */ + PORT_DEVSLP_DETO_OFFSET = 2, /* DevSlp exit timeout */ +- PORT_DEVSLP_DSP = (1 << 1), /* DevSlp present */ +- PORT_DEVSLP_ADSE = (1 << 0), /* Aggressive DevSlp enable */ ++ PORT_DEVSLP_DSP = BIT(1), /* DevSlp present */ ++ PORT_DEVSLP_ADSE = BIT(0), /* Aggressive DevSlp enable */ + + /* hpriv->flags bits */ + + #define AHCI_HFLAGS(flags) .private_data = (void *)(flags) + +- AHCI_HFLAG_NO_NCQ = (1 << 0), +- AHCI_HFLAG_IGN_IRQ_IF_ERR = (1 << 1), /* ignore IRQ_IF_ERR */ +- AHCI_HFLAG_IGN_SERR_INTERNAL = (1 << 2), /* ignore SERR_INTERNAL */ +- AHCI_HFLAG_32BIT_ONLY = (1 << 3), /* force 32bit */ +- AHCI_HFLAG_MV_PATA = (1 << 4), /* PATA port */ +- AHCI_HFLAG_NO_MSI = (1 << 5), /* no PCI MSI */ +- AHCI_HFLAG_NO_PMP = (1 << 6), /* no PMP */ +- AHCI_HFLAG_SECT255 = (1 << 8), /* max 255 sectors */ +- AHCI_HFLAG_YES_NCQ = (1 << 9), /* force NCQ cap on */ +- AHCI_HFLAG_NO_SUSPEND = (1 << 10), /* don't suspend */ +- AHCI_HFLAG_SRST_TOUT_IS_OFFLINE = (1 << 11), /* treat SRST timeout as +- link offline */ +- AHCI_HFLAG_NO_SNTF = (1 << 12), /* no sntf */ +- AHCI_HFLAG_NO_FPDMA_AA = (1 << 13), /* no FPDMA AA */ +- AHCI_HFLAG_YES_FBS = (1 << 14), /* force FBS cap on */ +- AHCI_HFLAG_DELAY_ENGINE = (1 << 15), /* do not start engine on +- port start (wait until +- error-handling stage) */ +- AHCI_HFLAG_NO_DEVSLP = (1 << 17), /* no device sleep */ +- AHCI_HFLAG_NO_FBS = (1 << 18), /* no FBS */ ++ AHCI_HFLAG_NO_NCQ = BIT(0), ++ AHCI_HFLAG_IGN_IRQ_IF_ERR = BIT(1), /* ignore IRQ_IF_ERR */ ++ AHCI_HFLAG_IGN_SERR_INTERNAL = BIT(2), /* ignore SERR_INTERNAL */ ++ AHCI_HFLAG_32BIT_ONLY = BIT(3), /* force 32bit */ ++ AHCI_HFLAG_MV_PATA = BIT(4), /* PATA port */ ++ AHCI_HFLAG_NO_MSI = BIT(5), /* no PCI MSI */ ++ AHCI_HFLAG_NO_PMP = BIT(6), /* no PMP */ ++ AHCI_HFLAG_SECT255 = BIT(8), /* max 255 sectors */ ++ AHCI_HFLAG_YES_NCQ = BIT(9), /* force NCQ cap on */ ++ AHCI_HFLAG_NO_SUSPEND = BIT(10), /* don't suspend */ ++ AHCI_HFLAG_SRST_TOUT_IS_OFFLINE = BIT(11), /* treat SRST timeout as ++ link offline */ ++ AHCI_HFLAG_NO_SNTF = BIT(12), /* no sntf */ ++ AHCI_HFLAG_NO_FPDMA_AA = BIT(13), /* no FPDMA AA */ ++ AHCI_HFLAG_YES_FBS = BIT(14), /* force FBS cap on */ ++ AHCI_HFLAG_DELAY_ENGINE = BIT(15), /* do not start engine on ++ port start (wait until ++ error-handling stage) */ ++ AHCI_HFLAG_NO_DEVSLP = BIT(17), /* no device sleep */ ++ AHCI_HFLAG_NO_FBS = BIT(18), /* no FBS */ + + #ifdef CONFIG_PCI_MSI +- AHCI_HFLAG_MULTI_MSI = (1 << 20), /* per-port MSI(-X) */ ++ AHCI_HFLAG_MULTI_MSI = BIT(20), /* per-port MSI(-X) */ + #else + /* compile out MSI infrastructure */ + AHCI_HFLAG_MULTI_MSI = 0, + #endif +- AHCI_HFLAG_WAKE_BEFORE_STOP = (1 << 22), /* wake before DMA stop */ +- AHCI_HFLAG_YES_ALPM = (1 << 23), /* force ALPM cap on */ +- AHCI_HFLAG_NO_WRITE_TO_RO = (1 << 24), /* don't write to read +- only registers */ +- AHCI_HFLAG_IS_MOBILE = (1 << 25), /* mobile chipset, use ++ AHCI_HFLAG_WAKE_BEFORE_STOP = BIT(22), /* wake before DMA stop */ ++ AHCI_HFLAG_YES_ALPM = BIT(23), /* force ALPM cap on */ ++ AHCI_HFLAG_NO_WRITE_TO_RO = BIT(24), /* don't write to read ++ only registers */ ++ AHCI_HFLAG_IS_MOBILE = BIT(25), /* mobile chipset, use + SATA_MOBILE_LPM_POLICY + as default lpm_policy */ + +@@ -269,22 +271,22 @@ enum { + EM_MAX_RETRY = 5, + + /* em_ctl bits */ +- EM_CTL_RST = (1 << 9), /* Reset */ +- EM_CTL_TM = (1 << 8), /* Transmit Message */ +- EM_CTL_MR = (1 << 0), /* Message Received */ +- EM_CTL_ALHD = (1 << 26), /* Activity LED */ +- EM_CTL_XMT = (1 << 25), /* Transmit Only */ +- EM_CTL_SMB = (1 << 24), /* Single Message Buffer */ +- EM_CTL_SGPIO = (1 << 19), /* SGPIO messages supported */ +- EM_CTL_SES = (1 << 18), /* SES-2 messages supported */ +- EM_CTL_SAFTE = (1 << 17), /* SAF-TE messages supported */ +- EM_CTL_LED = (1 << 16), /* LED messages supported */ ++ EM_CTL_RST = BIT(9), /* Reset */ ++ EM_CTL_TM = BIT(8), /* Transmit Message */ ++ EM_CTL_MR = BIT(0), /* Message Received */ ++ EM_CTL_ALHD = BIT(26), /* Activity LED */ ++ EM_CTL_XMT = BIT(25), /* Transmit Only */ ++ EM_CTL_SMB = BIT(24), /* Single Message Buffer */ ++ EM_CTL_SGPIO = BIT(19), /* SGPIO messages supported */ ++ EM_CTL_SES = BIT(18), /* SES-2 messages supported */ ++ EM_CTL_SAFTE = BIT(17), /* SAF-TE messages supported */ ++ EM_CTL_LED = BIT(16), /* LED messages supported */ + + /* em message type */ +- EM_MSG_TYPE_LED = (1 << 0), /* LED */ +- EM_MSG_TYPE_SAFTE = (1 << 1), /* SAF-TE */ +- EM_MSG_TYPE_SES2 = (1 << 2), /* SES-2 */ +- EM_MSG_TYPE_SGPIO = (1 << 3), /* SGPIO */ ++ EM_MSG_TYPE_LED = BIT(0), /* LED */ ++ EM_MSG_TYPE_SAFTE = BIT(1), /* SAF-TE */ ++ EM_MSG_TYPE_SES2 = BIT(2), /* SES-2 */ ++ EM_MSG_TYPE_SGPIO = BIT(3), /* SGPIO */ + }; + + struct ahci_cmd_hdr { +-- +2.43.0 + diff --git a/buildroot/board/beagleboard/beaglebone-qt5/patches/linux/linux.hash b/buildroot/board/beagleboard/beaglebone-qt5/patches/linux/linux.hash new file mode 100644 index 0000000000..72d5bfff98 --- /dev/null +++ b/buildroot/board/beagleboard/beaglebone-qt5/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 394523e61eabf24bf920981ba967799ff90b6099a72dc1d1b92c918433439f61 linux-4.19.94-ti-r72.tar.gz diff --git a/buildroot/board/beagleboard/beaglebone-qt5/patches/uboot/uboot.hash b/buildroot/board/beagleboard/beaglebone-qt5/patches/uboot/uboot.hash new file mode 100644 index 0000000000..fe9b4f53dc --- /dev/null +++ b/buildroot/board/beagleboard/beaglebone-qt5/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f u-boot-2024.07.tar.bz2 diff --git a/buildroot/board/beagleboard/beaglebone/extlinux.conf b/buildroot/board/beagleboard/beaglebone/extlinux.conf new file mode 100644 index 0000000000..13affcabd4 --- /dev/null +++ b/buildroot/board/beagleboard/beaglebone/extlinux.conf @@ -0,0 +1,4 @@ +label beaglebone-buildroot + kernel /zImage + fdtdir / + append console=ttyS0,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait diff --git a/buildroot/board/beagleboard/beaglebone/genimage.cfg b/buildroot/board/beagleboard/beaglebone/genimage.cfg new file mode 100644 index 0000000000..4b026fda84 --- /dev/null +++ b/buildroot/board/beagleboard/beaglebone/genimage.cfg @@ -0,0 +1,37 @@ +image boot.vfat { + vfat { + files = { + "MLO", + "u-boot.img", + "zImage", + "uEnv.txt", + "am335x-evm.dtb", + "am335x-evmsk.dtb", + "am335x-bone.dtb", + "am335x-boneblack.dtb", + "am335x-bonegreen.dtb", + "am335x-boneblack-wireless.dtb", + "am335x-bonegreen-wireless.dtb", + "extlinux" + } + } + + size = 16M +} + +image sdcard.img { + hdimage { + } + + partition u-boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + size = 512M + } +} diff --git a/buildroot/board/beaglebone/linux-sgx.fragment b/buildroot/board/beagleboard/beaglebone/linux-sgx.fragment similarity index 100% rename from buildroot/board/beaglebone/linux-sgx.fragment rename to buildroot/board/beagleboard/beaglebone/linux-sgx.fragment diff --git a/buildroot/board/beagleboard/beaglebone/patches/linux-headers/linux-headers.hash b/buildroot/board/beagleboard/beaglebone/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/beagleboard/beaglebone/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/beagleboard/beaglebone/patches/linux/linux.hash b/buildroot/board/beagleboard/beaglebone/patches/linux/linux.hash new file mode 100644 index 0000000000..4a7384d036 --- /dev/null +++ b/buildroot/board/beagleboard/beaglebone/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 f1ae7325c6c146e0f852866a3bfd3f90ae1b5f46e414bc99a38384ed677e3721 linux-6.6.32-ti-arm32-r7.tar.gz diff --git a/buildroot/board/beagleboard/beaglebone/patches/uboot/uboot.hash b/buildroot/board/beagleboard/beaglebone/patches/uboot/uboot.hash new file mode 100644 index 0000000000..904fa56c02 --- /dev/null +++ b/buildroot/board/beagleboard/beaglebone/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0 u-boot-2024.10.tar.bz2 diff --git a/buildroot/board/beagleboard/beaglebone/post-build.sh b/buildroot/board/beagleboard/beaglebone/post-build.sh new file mode 100755 index 0000000000..b7afd92ffe --- /dev/null +++ b/buildroot/board/beagleboard/beaglebone/post-build.sh @@ -0,0 +1,6 @@ +#!/bin/sh +BOARD_DIR="$(dirname $0)" + +cp $BOARD_DIR/uEnv.txt $BINARIES_DIR/uEnv.txt + +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf diff --git a/buildroot/board/beagleboard/beaglebone/readme.txt b/buildroot/board/beagleboard/beaglebone/readme.txt new file mode 100644 index 0000000000..a11377eaee --- /dev/null +++ b/buildroot/board/beagleboard/beaglebone/readme.txt @@ -0,0 +1,66 @@ +CircuitCo BeagleBone +Texas Instuments AM335x Evaluation Module (TMDXEVM3358) + +Description +=========== + +This configuration will build a complete image for the beaglebone and +the TI AM335x-EVM, the board type is identified by the on-board +EEPROM. The configuration is based on the +ti-processor-sdk-06.01.00.08. Device tree blobs for beaglebone +variants and the evm-sk are built too. + +For Qt5 support support use the beaglebone_qt5_defconfig. + +How to build it +=============== + +Select the default configuration for the target: +$ make beaglebone_defconfig + +Optional: modify the configuration: +$ make menuconfig + +Build: +$ make + +Result of the build +=================== +output/images/ ++-- am335x-boneblack.dtb ++-- am335x-boneblack-wireless.dtb ++-- am335x-boneblue.dtb ++-- am335x-bonegreen.dtb ++-- am335x-bonegreen-wireless.dtb ++-- am335x-bone.dtb ++-- am335x-evm.dtb ++-- am335x-evmsk.dtb ++-- boot.vfat ++-- MLO ++-- rootfs.ext2 ++-- rootfs.tar ++-- sdcard.img ++-- u-boot.img ++-- uEnv.txt ++-- zImage + +To copy the image file to the sdcard use dd: +$ dd if=output/images/sdcard.img of=/dev/XXX + + +Running Qt5 hellowindow opengl demo: +=================== +# export QT_QPA_EGLFS_KMS_CONFIG=/etc/qt5/eglfs_kms_cfg.json +# export QT_QPA_PLATFORM=eglfs +# export QT_QPA_EGLFS_INTEGRATION=none +# /usr/lib/qt/examples/opengl/hellowindow/hellowindow + + +Tested hardware +=============== +am335x-evm (rev. 1.1A) +beagleboneblack (rev. A5A) +beaglebone (rev. A6) + +2020, Adam Duskett +2016, Lothar Felten diff --git a/buildroot/board/beaglebone/rootfs_overlay/etc/qt5/eglfs_kms_cfg.json b/buildroot/board/beagleboard/beaglebone/rootfs_overlay/etc/qt5/eglfs_kms_cfg.json similarity index 100% rename from buildroot/board/beaglebone/rootfs_overlay/etc/qt5/eglfs_kms_cfg.json rename to buildroot/board/beagleboard/beaglebone/rootfs_overlay/etc/qt5/eglfs_kms_cfg.json diff --git a/buildroot/board/beaglebone/uEnv.txt b/buildroot/board/beagleboard/beaglebone/uEnv.txt similarity index 100% rename from buildroot/board/beaglebone/uEnv.txt rename to buildroot/board/beagleboard/beaglebone/uEnv.txt diff --git a/buildroot/board/beagleboneai/genimage.cfg b/buildroot/board/beagleboard/beagleboneai/genimage.cfg similarity index 100% rename from buildroot/board/beagleboneai/genimage.cfg rename to buildroot/board/beagleboard/beagleboneai/genimage.cfg diff --git a/buildroot/board/beagleboard/beagleboneai/patches/linux-headers/linux-headers.hash b/buildroot/board/beagleboard/beagleboneai/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/beagleboard/beagleboneai/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/beagleboard/beagleboneai/patches/linux/linux.hash b/buildroot/board/beagleboard/beagleboneai/patches/linux/linux.hash new file mode 100644 index 0000000000..ec1a3601b7 --- /dev/null +++ b/buildroot/board/beagleboard/beagleboneai/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 c52bc1ffc396c11bce335c9ee5cd55fe4213cbc1fb4026ff62bb90c864c61f62 linux-5.10.217.tar.xz diff --git a/buildroot/board/beagleboneai/patches/uboot/0001-am57xx_evm-fixes.patch b/buildroot/board/beagleboard/beagleboneai/patches/uboot/0001-am57xx_evm-fixes.patch similarity index 100% rename from buildroot/board/beagleboneai/patches/uboot/0001-am57xx_evm-fixes.patch rename to buildroot/board/beagleboard/beagleboneai/patches/uboot/0001-am57xx_evm-fixes.patch diff --git a/buildroot/board/beagleboard/beagleboneai/patches/uboot/uboot.hash b/buildroot/board/beagleboard/beagleboneai/patches/uboot/uboot.hash new file mode 100644 index 0000000000..4b82872f31 --- /dev/null +++ b/buildroot/board/beagleboard/beagleboneai/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 0d438b1bb5cceb57a18ea2de4a0d51f7be5b05b98717df05938636e0aadfe11a u-boot-2021.04.tar.bz2 diff --git a/buildroot/board/beagleboard/beagleboneai/post-build.sh b/buildroot/board/beagleboard/beagleboneai/post-build.sh new file mode 100755 index 0000000000..384b4d8745 --- /dev/null +++ b/buildroot/board/beagleboard/beagleboneai/post-build.sh @@ -0,0 +1,4 @@ +#!/bin/sh +BOARD_DIR="$(dirname $0)" + +cp board/beagleboard/beagleboneai/uEnv.txt $BINARIES_DIR/uEnv.txt diff --git a/buildroot/board/beagleboneai/readme.txt b/buildroot/board/beagleboard/beagleboneai/readme.txt similarity index 100% rename from buildroot/board/beagleboneai/readme.txt rename to buildroot/board/beagleboard/beagleboneai/readme.txt diff --git a/buildroot/board/beagleboneai/uEnv.txt b/buildroot/board/beagleboard/beagleboneai/uEnv.txt similarity index 100% rename from buildroot/board/beagleboneai/uEnv.txt rename to buildroot/board/beagleboard/beagleboneai/uEnv.txt diff --git a/buildroot/board/beagleboard/beagleboneai64/extlinux.conf b/buildroot/board/beagleboard/beagleboneai64/extlinux.conf new file mode 100644 index 0000000000..582d510b5d --- /dev/null +++ b/buildroot/board/beagleboard/beagleboneai64/extlinux.conf @@ -0,0 +1,5 @@ +default buildroot +label buildroot + kernel /Image + devicetreedir / +append root=/dev/mmcblk1p2 rootwait rw console=ttyS2,115200n8 diff --git a/buildroot/board/beagleboard/beagleboneai64/genimage.cfg b/buildroot/board/beagleboard/beagleboneai64/genimage.cfg new file mode 100644 index 0000000000..b5ba2d21db --- /dev/null +++ b/buildroot/board/beagleboard/beagleboneai64/genimage.cfg @@ -0,0 +1,33 @@ +image boot.vfat { + vfat { + files = { + "sysfw.itb", + "tiboot3.bin", + "tispl.bin", + "u-boot.img", + "Image", + "ti", + "extlinux", + } + + label = "boot" + } + + size = 64M +} + +image sdcard.img { + hdimage { + } + + partition u-boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/buildroot/board/beagleboard/beagleboneai64/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/buildroot/board/beagleboard/beagleboneai64/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 0000000000..6f02bfbb22 --- /dev/null +++ b/buildroot/board/beagleboard/beagleboneai64/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 7efa89e1b4e4106ee05d68e876c8efbb146364d89cfd5d26bf4647b09c08f32b arm-trusted-firmware-v2.10-git4.tar.gz diff --git a/buildroot/board/beagleboard/beagleboneai64/patches/linux-headers/linux-headers.hash b/buildroot/board/beagleboard/beagleboneai64/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/beagleboard/beagleboneai64/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/beagleboard/beagleboneai64/patches/linux/linux.hash b/buildroot/board/beagleboard/beagleboneai64/patches/linux/linux.hash new file mode 100644 index 0000000000..4b20a009a7 --- /dev/null +++ b/buildroot/board/beagleboard/beagleboneai64/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 b66a5b863b0f8669448b74ca83bd641a856f164b29956e539bbcb5fdeeab9cc6 linux-6.6.30.tar.xz diff --git a/buildroot/board/beagleboard/beagleboneai64/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash b/buildroot/board/beagleboard/beagleboneai64/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash new file mode 100644 index 0000000000..97a2b4eaf9 --- /dev/null +++ b/buildroot/board/beagleboard/beagleboneai64/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a u-boot-2024.04.tar.bz2 diff --git a/buildroot/board/beagleboard/beagleboneai64/patches/uboot/uboot.hash b/buildroot/board/beagleboard/beagleboneai64/patches/uboot/uboot.hash new file mode 100644 index 0000000000..97a2b4eaf9 --- /dev/null +++ b/buildroot/board/beagleboard/beagleboneai64/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a u-boot-2024.04.tar.bz2 diff --git a/buildroot/board/beagleboard/beagleboneai64/post-build.sh b/buildroot/board/beagleboard/beagleboneai64/post-build.sh new file mode 100755 index 0000000000..2315ff393a --- /dev/null +++ b/buildroot/board/beagleboard/beagleboneai64/post-build.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +BOARD_DIR="$(dirname "$0")" + +ln -sf tispl.bin_unsigned "$BINARIES_DIR"/tispl.bin + +install -m 0644 -D "$BOARD_DIR"/extlinux.conf "$BINARIES_DIR"/extlinux/extlinux.conf diff --git a/buildroot/board/beagleboard/beagleboneai64/readme.txt b/buildroot/board/beagleboard/beagleboneai64/readme.txt new file mode 100644 index 0000000000..fa4e189c44 --- /dev/null +++ b/buildroot/board/beagleboard/beagleboneai64/readme.txt @@ -0,0 +1,39 @@ +BeagleBoard.org BeagleBone AI-64 Development Board + +Description +=========== + +This configuration will build a basic image for the BeagleBoard.org +BeagleBone AI-64. For more details about the board, visit: + +https://www.beagleboard.org/boards/beaglebone-ai-64 + +How to Build +============ + +Select the default configuration for the target: + +$ make beagleboneai64_defconfig + +Optional: modify the configuration: + +$ make menuconfig + +Build: + +$ make + +To copy the resultimg output image file to an SD card use dd: + +$ dd if=output/images/sdcard.img of=/dev/sdX bs=1M + +How to Run +========== + +Insert the SD card into the BeagleBone AI-64 board, and power it up +through the USB Type-C connector. The system should come up (make sure +to boot from the SD card not from the eMMC). You can use a USB to +serial adapter to connect to the connector labeled UART0 (J3) to +communicate with the board. + +https://docs.beagleboard.org/latest/boards/beaglebone/ai-64/02-quick-start.html diff --git a/buildroot/board/beagleboard/beagleplay/extlinux.conf b/buildroot/board/beagleboard/beagleplay/extlinux.conf new file mode 100644 index 0000000000..2b3aa7349e --- /dev/null +++ b/buildroot/board/beagleboard/beagleplay/extlinux.conf @@ -0,0 +1,5 @@ +label beagleplay-buildroot + kernel /Image + fdtdir / + devicetree /k3-am625-beagleplay.dtb + append console=ttyS2,115200n8 root=/dev/mmcblk1p2 rw rootfstype=ext4 rootwait earlycon=ns16550a,mmio32,0x02800000 diff --git a/buildroot/board/beagleboard/beagleplay/genimage.cfg b/buildroot/board/beagleboard/beagleplay/genimage.cfg new file mode 100644 index 0000000000..4b516dc714 --- /dev/null +++ b/buildroot/board/beagleboard/beagleplay/genimage.cfg @@ -0,0 +1,39 @@ +image boot.vfat { + vfat { + files = { + "Image", + "k3-am625-beagleplay.dtb", + "tiboot3.bin", + } + + file tispl.bin { + image = tispl.bin_unsigned + } + + file u-boot.img { + image = u-boot.img_unsigned + } + + file extlinux/extlinux.conf { + image = extlinux.conf + } + } + + size = 64M +} + +image sdcard.img { + hdimage { + } + + partition u-boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/buildroot/board/beagleboard/beagleplay/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/buildroot/board/beagleboard/beagleplay/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 0000000000..8b77e1f165 --- /dev/null +++ b/buildroot/board/beagleboard/beagleplay/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 c0f23ccc71c49989e9ad238acf334473c17b7c88f79a20c829c3d443e3794a22 arm-trusted-firmware-v2.11-git4.tar.gz diff --git a/buildroot/board/beagleboard/beagleplay/patches/linux-headers/linux-headers.hash b/buildroot/board/beagleboard/beagleplay/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/beagleboard/beagleplay/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/beagleboard/beagleplay/patches/linux/linux.hash b/buildroot/board/beagleboard/beagleplay/patches/linux/linux.hash new file mode 100644 index 0000000000..53eb143894 --- /dev/null +++ b/buildroot/board/beagleboard/beagleplay/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 774698422ee54c5f1e704456f37c65c06b51b4e9a8b0866f34580d86fef8e226 linux-6.10.tar.xz diff --git a/buildroot/board/beagleboard/beagleplay/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash b/buildroot/board/beagleboard/beagleplay/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash new file mode 120000 index 0000000000..b89e91d3e8 --- /dev/null +++ b/buildroot/board/beagleboard/beagleplay/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash @@ -0,0 +1 @@ +../uboot/uboot.hash \ No newline at end of file diff --git a/buildroot/board/beagleboard/beagleplay/patches/uboot/uboot.hash b/buildroot/board/beagleboard/beagleplay/patches/uboot/uboot.hash new file mode 100644 index 0000000000..fe9b4f53dc --- /dev/null +++ b/buildroot/board/beagleboard/beagleplay/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f u-boot-2024.07.tar.bz2 diff --git a/buildroot/board/beagleboard/beagleplay/post-build.sh b/buildroot/board/beagleboard/beagleplay/post-build.sh new file mode 100755 index 0000000000..f11dc6c313 --- /dev/null +++ b/buildroot/board/beagleboard/beagleplay/post-build.sh @@ -0,0 +1,5 @@ +#!/bin/sh -x + +BOARD_DIR="$(dirname "$0")" + +install -m 0644 -D "$BOARD_DIR"/extlinux.conf "$BINARIES_DIR"/extlinux.conf diff --git a/buildroot/board/beagleboard/beagleplay/readme.txt b/buildroot/board/beagleboard/beagleplay/readme.txt new file mode 100644 index 0000000000..eed87e6d3c --- /dev/null +++ b/buildroot/board/beagleboard/beagleplay/readme.txt @@ -0,0 +1,39 @@ +BeagleBoard's BeaglePlay + +Description +=========== + +This configuration will build a complete image for the BeaglePlay +board: https://www.beagleboard.org/boards/beagleplay + +How to Build +============ + +Select the default configuration for the target: + + $ make beagleplay_defconfig + +Optional: modify the configuration: + + $ make menuconfig + +NOTE: The AM625x processor has multiple security variants. You must +ensure the matching tiboot3.bin is uses or the board will not boot. +The BeaglePlay uses the General Purpose (GP) variant, ensure you use +the tiboot3-am62x-gp-evm.bin + +Build: + + $ make + +To copy the resultimg output image file to an SD card use dd: + + $ dd if=output/images/sdcard.img of=/dev/sdX bs=1M + +How to Run +========== + +This configuration has both the boot/ and root/ partitions which is +capable of booting from the bootloaders embedded in the eMMC as well +as when using holding the USR button to boot from the SD card. + diff --git a/buildroot/board/beagleboard/beaglev_fire/README.txt b/buildroot/board/beagleboard/beaglev_fire/README.txt new file mode 100644 index 0000000000..c9a824b67f --- /dev/null +++ b/buildroot/board/beagleboard/beaglev_fire/README.txt @@ -0,0 +1,134 @@ +Beagle-V Fire +============== + +BeagleV Fire is a low-cost RISC-V 64-bit based platform, powered by +Microchip's PolarFire SoC. This file describes how to use the +pre-defined Buildroot configuration for the Beagle-V Fire board. + +Further information about the Beagle-V Fire can be found at +https://docs.beagleboard.org/latest/boards/beaglev/fire/index.html. + + +Building +======== + +Configure Buildroot using the default board configuration: + + '$ make beaglev_fire_defconfig' + +Customise the build as necessary: + + '$ make menuconfig' + +Start the build: + + '$ make' + + +Result of the build +=================== + +Once the build has finished you will have the following files: + + output/images/ + +-- boot.scr + +-- boot.vfat + +-- Image + +-- Image.gz + +-- beaglev_fire.itb + +-- beaglev_fire.its + +-- mpfs-beaglev-fire.dtb + +-- payload.bin + +-- rootfs.ext2 + +-- rootfs.ext4 + +-- rootfs.tar + +-- sdcard.img + +-- u-boot.bin + + +Flashing the image to your eMMC +=============================== + +By default Buildroot builds an image suitable for the eMMC. The first partition +of this image contains a U-Boot binary, embedded in a Hart Software Services +(HSS) payload. The second partition contains a FAT filesystem with a U-Boot env +and an ITB file containing the kernel and the device tree. The third partition +contains the file system. This image can be written directly to the eMMC. + +To do so, follow the below steps: + +1. Connect to BeagleV-Fire UART debug port using a 3.3v USB to UART bridge. + +2. Now you can run `tio ` in a terminal window to access the UART debug +port connection. + e.g `tio /dev/ttyUSB4` + +3. Once you are connected properly, you can press the Reset button which will +show you a progress bar. + +4. Press any key in the terminal application to stop the HSS from booting. This +will give you access to the HSS command line interface and a ">>" for input +will be displayed in the terminal. + +5. Type `usbdmsc` in the HSS command line interface. The HSS `usbdmsc` command +exposes the eMMC as a USB mass storage device using the USB type C connector. +If successful, a message saying "USB Host connected" will be displayed. + +6. The eMMC should now appear as mass storage device/drive on your host PC, as +it is mounted through your USB type C connector. + +7. Now, all you need to do is dd the image to the eMMC, which can be done with +the following command on your development host: + + '$ sudo dd if=output/images/sdcard.img of=/dev/sdX bs=1M' + +You will have to replace /dev/sdX by the actual device name of your eMMC. +Please, be especially cautious not to overwrite the wrong drive as this cannot +be undone. + +8. Once the image transfer has completed you can type `CTRL+C` to disconnect +your device. + +9. Finally, type `boot` or reset your board to boot your new Linux image. + +Customize BeagleV-Fire Cape Gateware Using Verilog (Optional) +============================================================= + +To customize your Beagle-V Fire gateware please follow the guide below to +create your custom bitstream (steps 1 - 6): +https://docs.beagleboard.org/latest/boards/beaglev/fire/demos-and-tutorials/gateware/customize-cape-gateware-verilog.html + + + Program BeagleV-Fire With Your Custom Bitstream with Buildroot + ============================================================== + + After following the steps 1-6 from the above tutorial, you should now have a + artifacts.zip file on your local host. + + Unzip the downloaded artifacts.zip file. + + Go to the custom FPGA design directory: + 'cd artifacts/bitstreams/my_custom_fpga_design' + + On your Linux host development computer, copy the bitstream to BeagleV-Fire + board, replacing with the path to your BeagleV-Fire root file + system. + 'cp -r ./LinuxProgramming /path/to/your/buildroot/board/beagleboard/beaglev_fire/rootfs-overlay/etc/' + + To apply these changes to your image, make sure to re-build it with: + `make` + + Then, re-flash your image - to ensure you have the necessary firmware files - by + following the above section "Flashing the image to your eMMC". + + On BeagleV-Fire, + 1. Make your update gateware script executable + 'chmod +x /usr/share/microchip/update-gateware.sh' + 2. Create a firmware directory + 'mkdir /lib/firmware' + 3. Change to the directory of your gateware script + `cd /usr/share/microchip/` + 3. initiate the reprogramming of the FPGA with your gateware bitstream: + './update-gateware.sh /etc/LinuxProgramming/' + + Wait for a couple of minutes for the BeagleV-Fire to reprogram itself. diff --git a/buildroot/board/beagleboard/beaglev_fire/beaglev_fire.its b/buildroot/board/beagleboard/beaglev_fire/beaglev_fire.its new file mode 100644 index 0000000000..97c878c118 --- /dev/null +++ b/buildroot/board/beagleboard/beaglev_fire/beaglev_fire.its @@ -0,0 +1,55 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Flattened Image Tree file for BVF + * + * Copyright (C) 2024 Microchip Technology Inc. and its subsidiaries. + * + */ + +/dts-v1/; + +/ { + description = "U-Boot fitImage for the BeagleV-Fire"; + #address-cells = <2>; + + images { + kernel { + description = "Linux kernel"; + data = /incbin/("./Image.gz"); + type = "kernel"; + arch = "riscv"; + os = "linux"; + compression = "gzip"; + load = <0x80200000>; + entry = <0x80200000>; + hash-1 { + algo = "sha256"; + }; + }; + base_fdt { + description = "Flattened Device Tree blob"; + data = /incbin/("./mpfs-beaglev-fire.dtb"); + type = "flat_dt"; + arch = "riscv"; + compression = "none"; + load = <0x8a000000>; + hash-1 { + algo = "sha256"; + }; + }; + }; + + configurations { + default = "kernel_dtb"; + kernel_dtb { + description = "1 Linux kernel, FDT blob"; + kernel = "kernel"; + fdt = "base_fdt"; + }; + + base_dtb { + description = "Base FDT blob for BeagleV-Fire board"; + fdt = "base_fdt"; + }; + }; +}; diff --git a/buildroot/board/beagleboard/beaglev_fire/boot.cmd b/buildroot/board/beagleboard/beaglev_fire/boot.cmd new file mode 100644 index 0000000000..05f4858bac --- /dev/null +++ b/buildroot/board/beagleboard/beaglev_fire/boot.cmd @@ -0,0 +1,15 @@ +# this assumes ${scriptaddr} is already set!! + +# Try to boot a fitImage from eMMC/SD + +setenv fdt_high 0xffffffffffffffff +setenv initrd_high 0xffffffffffffffff + +load mmc 0:${distro_bootpart} ${scriptaddr} beaglev_fire.itb; +bootm start ${scriptaddr}#kernel_dtb; +bootm loados ${scriptaddr}; +# Try to load a ramdisk if available inside fitImage +bootm ramdisk; +bootm prep; +fdt set /soc/ethernet@20110000 mac-address ${beaglevfire_mac_addr0}; +bootm go; diff --git a/buildroot/board/beagleboard/beaglev_fire/config.yaml b/buildroot/board/beagleboard/beaglev_fire/config.yaml new file mode 100644 index 0000000000..5fccdfd34f --- /dev/null +++ b/buildroot/board/beagleboard/beaglev_fire/config.yaml @@ -0,0 +1,28 @@ +# +# HSS Payload Generator - buildroot configuration file +# + +# First, we can optionally set a name for our image, otherwise one will be created dynamically +set-name: 'PolarFire-SoC-HSS::U-Boot' + +# +# Next, we'll define the entry point addresses for each hart, as follows: +# +hart-entry-points: {u54_1: '0x80200000', u54_2: '0x80200000', u54_3: '0x80200000', u54_4: '0x80200000'} +# +# Finally, we'll define a payloads (source binary file) that will be placed at certain regions in memory +# The payload section is defined with the keyword payloads, and then a number of individual +# payload descriptors. +# +# Each payload has a name (path to its ELF/bin file), an owner-hart, and optionally 1-3 secondary-harts. +# +# Additionally, it has a privilege mode in which it will start execution. +# * Valid privilege modes are PRV_M, PRV_S and PRV_U. +# +# +# In this case, the only payload is the u-boot s-mode binary. +# +# Case only matters for the ELF path names, not the keywords. +# +payloads: + u-boot.bin: {exec-addr: '0x80200000', owner-hart: u54_1, secondary-hart: u54_2, secondary-hart: u54_3, secondary-hart: u54_4, priv-mode: prv_s} diff --git a/buildroot/board/beagleboard/beaglev_fire/genimage.cfg b/buildroot/board/beagleboard/beaglev_fire/genimage.cfg new file mode 100644 index 0000000000..ef650704c6 --- /dev/null +++ b/buildroot/board/beagleboard/beaglev_fire/genimage.cfg @@ -0,0 +1,35 @@ +# Image for eMMC boot on the Microchip PolarFire SOC BeagleV-Fire Board +# +image boot.vfat { + vfat { + files = { + "beaglev_fire.itb", + } + + file boot.scr { + image = "boot.scr" + } + } + size = 60M +} + +image sdcard.img { + hdimage { + partition-table-type = "gpt" + } + + partition uboot { + partition-type-uuid = 21686148-6449-6E6F-744E-656564454649 + image = "payload.bin" + } + + partition kernel { + partition-type-uuid = 0FC63DAF-8483-4772-8E79-3D69D8477DE4 + bootable = "true" + image = "boot.vfat" + } + + partition root { + image = "rootfs.ext4" + } +} diff --git a/buildroot/board/beagleboard/beaglev_fire/patches/linux-headers/linux-headers.hash b/buildroot/board/beagleboard/beaglev_fire/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/beagleboard/beaglev_fire/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/beagleboard/beaglev_fire/patches/linux/linux.hash b/buildroot/board/beagleboard/beaglev_fire/patches/linux/linux.hash new file mode 100644 index 0000000000..9ee63df23d --- /dev/null +++ b/buildroot/board/beagleboard/beaglev_fire/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 7bd234a93bc6351d6a830f9ef18e9e780d70c478d280a6513a30bc2f945fb050 linux-linux4microchip+fpga-2024.09.1.tar.gz diff --git a/buildroot/board/beagleboard/beaglev_fire/patches/uboot/uboot.hash b/buildroot/board/beagleboard/beaglev_fire/patches/uboot/uboot.hash new file mode 100644 index 0000000000..cb0ec5ec52 --- /dev/null +++ b/buildroot/board/beagleboard/beaglev_fire/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 a2fad7fe7f933fa4679b070e952e1e7a21dbd8b586d7a9a11bfcb99e75ae7ad6 uboot-linux4microchip+fpga-2024.09.tar.gz diff --git a/buildroot/board/beagleboard/beaglev_fire/post-image.sh b/buildroot/board/beagleboard/beaglev_fire/post-image.sh new file mode 100755 index 0000000000..43be1356cf --- /dev/null +++ b/buildroot/board/beagleboard/beaglev_fire/post-image.sh @@ -0,0 +1,14 @@ +#!/bin/bash +set -e + +HSS_PAYLOAD_GENERATOR="${HOST_DIR}"/bin/hss-payload-generator +MKIMAGE="${HOST_DIR}"/bin/mkimage +BOARD_DIR="$(pwd)"/"${0%/*}" + +pushd "${BINARIES_DIR}" +"${HSS_PAYLOAD_GENERATOR}" -c "${BOARD_DIR}"/config.yaml payload.bin +cp "${BOARD_DIR}"/beaglev_fire.its "${BINARIES_DIR}"/beaglev_fire.its +gzip -9 Image -c > Image.gz +"${MKIMAGE}" -f beaglev_fire.its beaglev_fire.itb +popd +support/scripts/genimage.sh -c "${BOARD_DIR}"/genimage.cfg diff --git a/buildroot/board/beagleboard/beaglev_fire/rootfs-overlay/usr/share/microchip/update-gateware.sh b/buildroot/board/beagleboard/beaglev_fire/rootfs-overlay/usr/share/microchip/update-gateware.sh new file mode 100644 index 0000000000..f455037b60 --- /dev/null +++ b/buildroot/board/beagleboard/beaglev_fire/rootfs-overlay/usr/share/microchip/update-gateware.sh @@ -0,0 +1,32 @@ +#!/bin/sh + +if [ ! -e "$1"/mpfs_bitstream.spi ]; then + echo "No gateware file found." + exit 1 +fi + +if [ ! -d /lib/firmware ] +then + mkdir /lib/firmware +fi + +cp "$1"/mpfs_dtbo.spi /lib/firmware/mpfs_dtbo.spi +cp "$1"/mpfs_bitstream.spi /lib/firmware/mpfs_bitstream.spi + +mount -t debugfs none /sys/kernel/debug + +# Trash existing device tree overlay in case the rest of the process fails: +flash_erase /dev/mtd0 0 1024 + +# # Write device tree overlay +dd if=/lib/firmware/mpfs_dtbo.spi of=/dev/mtd0 seek=1024 + +# Fake the presence of a golden image for now. +dd if=/dev/zero of=/dev/mtd0 count=4 bs=1 + +# Initiate FPGA update. +echo 1 > /sys/kernel/debug/fpga/microchip_exec_update + +# Reboot Linux for the gateware update to take effect. +# FPGA reprogramming takes places between Linux shut-down and HSS restarting the board. +reboot diff --git a/buildroot/board/beagleboard/beaglev_fire/uboot-fragment.config b/buildroot/board/beagleboard/beaglev_fire/uboot-fragment.config new file mode 100644 index 0000000000..e2a5eb9438 --- /dev/null +++ b/buildroot/board/beagleboard/beaglev_fire/uboot-fragment.config @@ -0,0 +1,3 @@ +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/mmcblk0p3 rootwait uio_pdrv_genirq.of_id=generic-uio" +CONFIG_MPFS_PRIORITISE_QSPI_BOOT=n diff --git a/buildroot/board/beagleboardx15/genimage.cfg b/buildroot/board/beagleboardx15/genimage.cfg deleted file mode 100644 index b1604105cd..0000000000 --- a/buildroot/board/beagleboardx15/genimage.cfg +++ /dev/null @@ -1,27 +0,0 @@ -image boot.vfat { - vfat { - files = { - "MLO", - "u-boot.img" - } - } - - size = 4M -} - -image sdcard.img { - hdimage { - } - - partition u-boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - size = 512M - } -} diff --git a/buildroot/board/beagleboardx15/readme.txt b/buildroot/board/beagleboardx15/readme.txt deleted file mode 100644 index 5af2c914ba..0000000000 --- a/buildroot/board/beagleboardx15/readme.txt +++ /dev/null @@ -1,49 +0,0 @@ -BeagleBoard X15 - -Intro -===== -This config currently supports the beagleboard x15, -and generates a barebone image. - -The image must be flashed to a SD card to be used. - -How to build it -=============== - - $ make beagleboardx15_defconfig - -Then you can edit the build options using - - $ make menuconfig - -Compile all and build a sdcard image: - - $ make - -Result of the build -------------------- - -After building, you should get a tree like this: - - output/images/ - +-- am57xx-beagle-x15.dtb - +-- am57xx-beagle-x15-revb1.dtb - +-- boot.vfat - +-- MLO - +--rootfs.ext2 - +-- rootfs.ext4 - +-- rootfs.tar - +-- sdcard.img - +-- u-boot.img - +-- u-boot-spl.bin - +-- zImage - -How to write the microSD 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 diff --git a/buildroot/board/beaglebone/genimage.cfg b/buildroot/board/beaglebone/genimage.cfg deleted file mode 100644 index 42ca2cf107..0000000000 --- a/buildroot/board/beaglebone/genimage.cfg +++ /dev/null @@ -1,35 +0,0 @@ -image boot.vfat { - vfat { - files = { - "MLO", - "u-boot.img", - "zImage", - "uEnv.txt", - "am335x-evm.dtb", - "am335x-evmsk.dtb", - "am335x-bone.dtb", - "am335x-boneblack.dtb", - "am335x-bonegreen.dtb", - "am335x-boneblack-wireless.dtb", - } - } - - size = 16M -} - -image sdcard.img { - hdimage { - } - - partition u-boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - size = 512M - } -} diff --git a/buildroot/board/beaglebone/post-build.sh b/buildroot/board/beaglebone/post-build.sh deleted file mode 100755 index ffdd19138c..0000000000 --- a/buildroot/board/beaglebone/post-build.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -BOARD_DIR="$(dirname $0)" - -cp $BOARD_DIR/uEnv.txt $BINARIES_DIR/uEnv.txt diff --git a/buildroot/board/beaglebone/readme.txt b/buildroot/board/beaglebone/readme.txt deleted file mode 100644 index 231e977a89..0000000000 --- a/buildroot/board/beaglebone/readme.txt +++ /dev/null @@ -1,62 +0,0 @@ -CircuitCo BeagleBone -Texas Instuments AM335x Evaluation Module (TMDXEVM3358) - -Description -=========== - -This configuration will build a complete image for the beaglebone and -the TI AM335x-EVM, the board type is identified by the on-board -EEPROM. The configuration is based on the -ti-processor-sdk-06.01.00.08. Device tree blobs for beaglebone -variants and the evm-sk are built too. - -For Qt5 support support use the beaglebone_qt5_defconfig. - -How to build it -=============== - -Select the default configuration for the target: -$ make beaglebone_defconfig - -Optional: modify the configuration: -$ make menuconfig - -Build: -$ make - -Result of the build -=================== -output/images/ -+-- am335x-boneblack.dtb -+-- am335x-bone.dtb -+-- am335x-evm.dtb -+-- am335x-evmsk.dtb -+-- boot.vfat -+-- MLO -+-- rootfs.ext2 -+-- rootfs.tar -+-- sdcard.img -+-- u-boot.img -+-- uEnv.txt -+-- zImage - -To copy the image file to the sdcard use dd: -$ dd if=output/images/sdcard.img of=/dev/XXX - - -Running Qt5 hellowindow opengl demo: -=================== -# export QT_QPA_EGLFS_KMS_CONFIG=/etc/qt5/eglfs_kms_cfg.json -# export QT_QPA_PLATFORM=eglfs -# export QT_QPA_EGLFS_INTEGRATION=none -# /usr/lib/qt/examples/opengl/hellowindow/hellowindow - - -Tested hardware -=============== -am335x-evm (rev. 1.1A) -beagleboneblack (rev. A5A) -beaglebone (rev. A6) - -2020, Adam Duskett -2016, Lothar Felten diff --git a/buildroot/board/beagleboneai/post-build.sh b/buildroot/board/beagleboneai/post-build.sh deleted file mode 100755 index 34a86cc746..0000000000 --- a/buildroot/board/beagleboneai/post-build.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -BOARD_DIR="$(dirname $0)" - -cp board/beagleboneai/uEnv.txt $BINARIES_DIR/uEnv.txt diff --git a/buildroot/board/beaglev/extlinux.conf b/buildroot/board/beaglev/extlinux.conf deleted file mode 100644 index 9daf6a7581..0000000000 --- a/buildroot/board/beaglev/extlinux.conf +++ /dev/null @@ -1,4 +0,0 @@ -label linux - kernel /boot/Image - devicetree /boot/jh7100-beaglev-starlight.dtb - append console=ttyS0,115200 earlyprintk root=PARTUUID=0fef845a-c6e1-45bc-82f7-002fa720f958 rootwait diff --git a/buildroot/board/beaglev/genimage.cfg b/buildroot/board/beaglev/genimage.cfg deleted file mode 100644 index deefdbc110..0000000000 --- a/buildroot/board/beaglev/genimage.cfg +++ /dev/null @@ -1,12 +0,0 @@ -image sdcard.img { - hdimage { - partition-table-type = "gpt" - } - - partition rootfs { - partition-type-uuid = 72ec70a6-cf74-40e6-bd49-4bda08e8f224 - partition-uuid = 0fef845a-c6e1-45bc-82f7-002fa720f958 - bootable = "true" - image = "rootfs.ext4" - } -} diff --git a/buildroot/board/beaglev/post-build.sh b/buildroot/board/beaglev/post-build.sh deleted file mode 100755 index fe61fd33cc..0000000000 --- a/buildroot/board/beaglev/post-build.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -BOARD_DIR=$(dirname $0) - -# Bring the extlinux.conf file in. -install -D -m 0644 ${BOARD_DIR}/extlinux.conf \ - ${TARGET_DIR}/boot/extlinux/extlinux.conf - -# To be reflashed through Xmodem, the bootloader needs to be prepended -# with a 4-byte header that contains the total size of the file. -perl -e 'print pack("l", (stat @ARGV[0])[7])' ${BINARIES_DIR}/fw_payload.bin > ${BINARIES_DIR}/fw_payload.bin.out -cat ${BINARIES_DIR}/fw_payload.bin >> ${BINARIES_DIR}/fw_payload.bin.out diff --git a/buildroot/board/beaglev/readme.txt b/buildroot/board/beaglev/readme.txt deleted file mode 100644 index 60678059e1..0000000000 --- a/buildroot/board/beaglev/readme.txt +++ /dev/null @@ -1,124 +0,0 @@ -BeagleV -======= - -BeagleV is a low-cost RISC-V 64-bit based platform, powered by a -Starfive JH7100 processor. The current defconfig in Buildroot has been -tested with the JH7100 chip used on the beta version of the BeagleV -board. - -How to build -============ - -$ make beaglev_defconfig -$ make - -Build results -============= - -After building, output/images contains: - -+ bootloader-BEAGLEV-buildroot.bin.out -+ ddrinit-2133-buildroot.bin.out -+ Image -+ fw_payload.bin -+ fw_payload.bin.out -+ fw_payload.elf -+ rootfs.ext2 -+ rootfs.ext4 -+ sdcard.img -+ u-boot.bin - -The four important files are: - - - bootloader-BEAGLEV-buildroot.bin.out, the first stage bootloader - - - ddrinit-2133-buildroot.bin.out, the DDR initialization firmware - - - fw_payload.bin.out, which is the bootloader image, containing - both OpenSBI and U-Boot. - - - sdcard.img, the SD card image, which contains the root filesystem, - kernel image and Device Tree. - -Flashing the SD card image -========================== - -$ sudo dd if=output/images/sdcard.img of=/dev/sdX - -Preparing the board -=================== - -Connect the Beagle-V fan to the 5V supply (pin 2 or 4 of the GPIO -connector) and GND (pin 6 of the GPIO connector). - -Connect a TTL UART cable to pin 8 (TX), 10 (RX) and 14 (GND). - -Insert your SD card. - -Power-up the board using an USB-C cable. - -Flashing OpenSBI/U-Boot -======================= - -The bootloader pre-flashed on the Beagle-V has a non-working -fdt_addr_r environment variable value, so it won't work -as-is. Reflashing the bootloader with the bootloader image produced by -Buildroot is necessary. - -When the board starts up, a pre-loader shows a count down of 2 -seconds, interrupt by pressing any key. You should reach a menu like -this: - ---------8<---------- - -bootloader version:210209-4547a8d -ddr 0x00000000, 1M test -ddr 0x00100000, 2M test -DDR clk 2133M,Version: 210302-5aea32f -0 -*************************************************** -*************** FLASH PROGRAMMING ***************** -*************************************************** - -0:update uboot -1:quit -select the function: - ---------8<---------- - -Press 0 and Enter. You will now see "C" characters being -displayed. Ask your serial port communication program to send -fw_payload.bin.out using the Xmodem protocol. - -After reflashing is complete, restart the board, it will automatically -start the system from the SD card, and reach the login prompt. - -Flashing low-level bootloaders -============================== - -The BeagleV comes pre-flashed with functional low-level bootloaders -(called "secondboot" and "ddrinit"). Re-flashing them is not necessary -to use this Buildroot defconfig. However, for the sake of -completeness, Buildroot builds and provides those low-level bootloader -images. - -You can flash them as follows: - - - In the same "pre-loader" menu as the one used above, instead of - entering 0 or 1, enter the magic "root@s5t" string. This enters the - "expert" features. - - - Then, press 0 and send over X-modem the - bootloader-BEAGLEV-buildroot.bin.out file. - - - Then, press 1 and send over X-modem the - ddrinit-2133-buildroot.bin.out. - -Note that the reflashing mechanism itself relies on those low-level -bootloaders, so if you flash non-working versions, you'll have to go -through a recovery process. This requires wiring up to a separate -debug UART, which pins are located near the HDMI connector. See -https://wiki.seeedstudio.com/BeagleV-Update-bootloader-ddr-init-boot-uboot-Recover-bootloader/ -section "Recover the bootloader" for more details. The instructions -make use of a jh7100-recover tool, which Buildroot has built as part -of this defconfig: it is available as output/host/bin/jh7100-recover. diff --git a/buildroot/board/broadcom/northstar/linux.config b/buildroot/board/broadcom/northstar/linux.config new file mode 100644 index 0000000000..47e6990032 --- /dev/null +++ b/buildroot/board/broadcom/northstar/linux.config @@ -0,0 +1,70 @@ +CONFIG_EMBEDDED=y +CONFIG_ARCH_BCM=y +CONFIG_ARCH_BCM_5301X=y +CONFIG_ARCH_BCM_53573=y +CONFIG_SMP=y +CONFIG_NR_CPUS=2 +CONFIG_HIGHMEM=y +CONFIG_ARM_APPENDED_DTB=y +CONFIG_CMDLINE="ubi.mtd=ubi root=ubi0:rootfs rootfstype=ubifs" +CONFIG_CMDLINE_FORCE=y +# CONFIG_SUSPEND is not set +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_BRIDGE=y +CONFIG_BRIDGE_VLAN_FILTERING=y +CONFIG_NET_DSA=y +CONFIG_VLAN_8021Q=y +CONFIG_PCI=y +CONFIG_BCM47XX_NVRAM=y +CONFIG_BCM47XX_SPROM=y +CONFIG_MTD=y +CONFIG_MTD_BCM47XX_PARTS=y +CONFIG_MTD_PARSER_TRX=y +CONFIG_MTD_BCM47XXSFLASH=y +CONFIG_MTD_RAW_NAND=y +CONFIG_MTD_NAND_BRCMNAND=y +CONFIG_MTD_SPI_NOR=y +CONFIG_MTD_UBI=y +CONFIG_NETDEVICES=y +CONFIG_VXLAN=y +CONFIG_VETH=y +CONFIG_B53=y +CONFIG_BGMAC_BCMA=y +CONFIG_BROADCOM_PHY=y +CONFIG_MDIO_BUS_MUX_MMIOREG=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_NR_UARTS=2 +CONFIG_SERIAL_8250_RUNTIME_UARTS=2 +CONFIG_SERIAL_OF_PLATFORM=y +CONFIG_SPI=y +CONFIG_THERMAL=y +CONFIG_WATCHDOG=y +CONFIG_BCM47XX_WDT=y +CONFIG_BCMA_HOST_SOC=y +CONFIG_BCMA_DRIVER_GMAC_CMN=y +CONFIG_BCMA_DRIVER_GPIO=y +CONFIG_USB=y +CONFIG_USB_LEDS_TRIGGER_USBPORT=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_PLATFORM=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_OHCI_HCD=y +# CONFIG_USB_OHCI_HCD_PCI is not set +CONFIG_USB_HCD_BCMA=y +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +CONFIG_LEDS_GPIO=y +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=y +CONFIG_LEDS_TRIGGER_DEFAULT_ON=y +CONFIG_PHY_BCM_NS_USB2=y +CONFIG_PHY_BCM_NS_USB3=y +CONFIG_UBIFS_FS=y +CONFIG_DEBUG_LL=y +CONFIG_DEBUG_UNCOMPRESS=y +CONFIG_EARLY_PRINTK=y diff --git a/buildroot/board/broadcom/northstar/post-image.sh b/buildroot/board/broadcom/northstar/post-image.sh new file mode 100755 index 0000000000..559ed8bf4b --- /dev/null +++ b/buildroot/board/broadcom/northstar/post-image.sh @@ -0,0 +1,41 @@ +#!/bin/sh + +# $1: images directory path +# $2: device dts filename +# $3: board id +build_lxl() { + local images="$1" + local device="$2" + local board="$3" + + $HOST_DIR/bin/lzma_alone e $images/zImage.$device $images/zImage.$device.lzma -d16 + rm -f $images/zImage.$device + $HOST_DIR/bin/otrx create $images/$device.trx -f $images/zImage.$device.lzma -a 0x20000 -f $images/rootfs.ubi + rm -f $images/zImage.$device.lzma + $HOST_DIR/bin/lxlfw create $images/$device.lxl -i $images/$device.trx -b "$board" +} + +# $1: images directory path +# $2: device dts filename +build_trx() { + local images="$1" + local device="$2" + + $HOST_DIR/bin/lzma_alone e $images/zImage.$device $images/zImage.$device.lzma -d16 + rm -f $images/zImage.$device + $HOST_DIR/bin/otrx create $images/$device.trx -f $images/zImage.$device.lzma -a 0x20000 -f $images/rootfs.ubi + rm -f $images/zImage.$device.lzma +} + +devices="$(sed -n 's/^BR2_LINUX_KERNEL_INTREE_DTS_NAME="\([^"]*\)"$/\1/p' ${BR2_CONFIG})" +for device in $devices; do + device="${device#broadcom/}" + case "$device" in + "bcm4708-smartrg-sr400ac") + build_trx "$1" "$device" + ;; + "bcm47094-luxul-xwr-3150-v1") + build_lxl "$1" "$device" "XWR-3150" + ;; + esac +done diff --git a/buildroot/board/broadcom/northstar/readme.txt b/buildroot/board/broadcom/northstar/readme.txt new file mode 100644 index 0000000000..523bb439e3 --- /dev/null +++ b/buildroot/board/broadcom/northstar/readme.txt @@ -0,0 +1,38 @@ +Broadcom Northstar + +Intro +===== + +This readme covers Northstar family of Broadcom SoCs. It includes: + - BCM4708 (2 x 800 MHz) + - BCM47081 (1 x 800 MHz) + - BCM4709 (2 x 1 GHz) + - BCM47094 (2 x 1 GHz) (AKA BCM4709C0) + +Northstar platform is used in some home routers by multiple vendors. There are +over 100 market devices based on it and they can all be supported with 1 kernel. + +There is no point in having separated board for each model. This board code is +meant for all supported Northstar devices. + +All Northstar devices come with CFE bootloader by default. It's basically closed +source as sources are available for some old releases only. There is no U-Boot (or +any other) drop-in replacement or second stage loader with Northstar support. + +CFE supports flashing firmware images over TFTP and HTTP (depending on vendor / +device setup). + +How to build it +=============== + + $ make broadcom_northstar_defconfig + + $ make + +How to flash over HTTP +====================== + +Power on device and press (and hold) CTRL+C in serial console terminal. When CFE +gets into prompt mode it'll automatically start built-in HTTP server. Navigate +to http://192.168.1.1/ (unless IP was changed - verify with "ifconfig") and +upload new firmware using a web browser. diff --git a/buildroot/board/bsh/common/imx8mn-bsh-smm-s2/linux.fragment b/buildroot/board/bsh/common/imx8mn-bsh-smm-s2/linux.fragment new file mode 100644 index 0000000000..80803ab088 --- /dev/null +++ b/buildroot/board/bsh/common/imx8mn-bsh-smm-s2/linux.fragment @@ -0,0 +1,895 @@ +# CONFIG_BPF_SYSCALL is not set +CONFIG_TASK_DELAY_ACCT=y +CONFIG_CGROUP_FREEZER=y +# CONFIG_CGROUP_BPF is not set +CONFIG_RELAY=y +# CONFIG_ARCH_ACTIONS is not set +# CONFIG_ARCH_SUNXI is not set +# CONFIG_ARCH_ALPINE is not set +# CONFIG_ARCH_APPLE is not set +# CONFIG_ARCH_BCM2835 is not set +# CONFIG_ARCH_BCM4908 is not set +# CONFIG_ARCH_BCM_IPROC is not set +# CONFIG_ARCH_BERLIN is not set +# CONFIG_ARCH_BRCMSTB is not set +# CONFIG_ARCH_EXYNOS is not set +# CONFIG_ARCH_K3 is not set +# CONFIG_ARCH_LAYERSCAPE is not set +# CONFIG_ARCH_LG1K is not set +# CONFIG_ARCH_HISI is not set +# CONFIG_ARCH_KEEMBAY is not set +# CONFIG_ARCH_MEDIATEK is not set +# CONFIG_ARCH_MESON is not set +# CONFIG_ARCH_MVEBU is not set +# CONFIG_ARCH_QCOM is not set +# CONFIG_ARCH_RENESAS is not set +# CONFIG_ARCH_ROCKCHIP is not set +# CONFIG_ARCH_S32 is not set +# CONFIG_ARCH_SEATTLE is not set +# CONFIG_ARCH_INTEL_SOCFPGA is not set +# CONFIG_ARCH_SYNQUACER is not set +# CONFIG_ARCH_TEGRA is not set +# CONFIG_ARCH_TESLA_FSD is not set +# CONFIG_ARCH_SPRD is not set +# CONFIG_ARCH_THUNDER is not set +# CONFIG_ARCH_THUNDER2 is not set +# CONFIG_ARCH_UNIPHIER is not set +# CONFIG_ARCH_VEXPRESS is not set +# CONFIG_ARCH_VISCONTI is not set +# CONFIG_ARCH_XGENE is not set +# CONFIG_ARCH_ZYNQMP is not set +# CONFIG_KEXEC is not set +# CONFIG_KEXEC_FILE is not set +# CONFIG_XEN is not set +# CONFIG_ARM64_PTR_AUTH is not set +# CONFIG_ARM64_TLB_RANGE is not set +# CONFIG_ARM64_MTE is not set +CONFIG_PM_DEBUG=y +CONFIG_PM_TEST_SUSPEND=y +# CONFIG_HIBERNATION is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=y +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y +CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y +# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set +# CONFIG_ARM_ALLWINNER_SUN50I_CPUFREQ_NVMEM is not set +# CONFIG_ARM_ARMADA_37XX_CPUFREQ is not set +CONFIG_ARM_IMX_CPUFREQ_DT=y +# CONFIG_ARM_QCOM_CPUFREQ_NVMEM is not set +# CONFIG_ARM_QCOM_CPUFREQ_HW is not set +# CONFIG_ARM_RASPBERRYPI_CPUFREQ is not set +# CONFIG_ARM_SCMI_CPUFREQ is not set +# CONFIG_ARM_TEGRA186_CPUFREQ is not set +# CONFIG_ARM_MEDIATEK_CPUFREQ is not set +# CONFIG_QORIQ_CPUFREQ is not set +# CONFIG_ACPI_APEI_PCIEAER is not set +# CONFIG_VIRTUALIZATION is not set +# CONFIG_KVM is not set +# CONFIG_GCC_PLUGINS is not set +CONFIG_IPV6=y +CONFIG_MODVERSIONS=y +CONFIG_IPV6_SIT=m +CONFIG_NET_DSA_TAG_OCELOT=m +CONFIG_VLAN_8021Q=y +CONFIG_LLC2=y +CONFIG_NET_SCH_MULTIQ=m +CONFIG_NET_CLS_TCINDEX=m +CONFIG_NET_PKTGEN=m +CONFIG_BT=y +CONFIG_BT_RFCOMM=y +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=y +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_HIDP=y +# CONFIG_CAN_RCAR is not set +# CONFIG_CAN_RCAR_CANFD is not set +# CONFIG_CAN_MCP251XFD is not set +CONFIG_BT_HCIUART=y +CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIUART_ATH3K=y +CONFIG_BT_HCIUART_3WIRE=y +CONFIG_BT_HCIVHCI=y +CONFIG_CFG80211=y +CONFIG_NL80211_TESTMODE=y +CONFIG_CFG80211_WEXT=y +CONFIG_MAC80211=y +# CONFIG_BT_HCIUART_MRVL is not set +# CONFIG_BT_MRVL is not set +# CONFIG_BT_MRVL_SDIO is not set +# CONFIG_BT_QCOMSMD is not set +# CONFIG_RFKILL is not set +# CONFIG_PCI is not set +# CONFIG_PCIEPORTBUS is not set +# CONFIG_PCIEAER is not set +# CONFIG_PCI_IOV is not set +# CONFIG_PCI_PASID is not set +# CONFIG_HOTPLUG_PCI is not set +# CONFIG_HOTPLUG_PCI_ACPI is not set +# CONFIG_PCI_AARDVARK is not set +# CONFIG_PCI_TEGRA is not set +# CONFIG_PCIE_RCAR_HOST is not set +# CONFIG_PCIE_RCAR_EP is not set +# CONFIG_PCI_HOST_GENERIC is not set +# CONFIG_PCI_XGENE is not set +# CONFIG_PCIE_ALTERA is not set +# CONFIG_PCIE_ALTERA_MSI is not set +# CONFIG_PCI_HOST_THUNDER_PEM is not set +# CONFIG_PCI_HOST_THUNDER_ECAM is not set +# CONFIG_PCIE_ROCKCHIP_HOST is not set +# CONFIG_PCIE_BRCMSTB is not set +# CONFIG_PCI_IMX6 is not set +# CONFIG_PCI_LAYERSCAPE is not set +# CONFIG_PCI_HISI is not set +# CONFIG_PCIE_QCOM is not set +# CONFIG_PCIE_ARMADA_8K is not set +# CONFIG_PCIE_KIRIN is not set +# CONFIG_PCIE_HISI_STB is not set +# CONFIG_PCIE_TEGRA194_HOST is not set +# CONFIG_PCIE_VISCONTI_HOST is not set +# CONFIG_PCIE_LAYERSCAPE_GEN4 is not set +# CONFIG_PCI_ENDPOINT is not set +# CONFIG_PCI_ENDPOINT_CONFIGFS is not set +# CONFIG_PCI_EPF_TEST is not set +CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y +CONFIG_BRCMSTB_GISB_ARB=y +CONFIG_VEXPRESS_CONFIG=y +# CONFIG_HISILICON_LPC is not set +# CONFIG_TEGRA_ACONNECT is not set +# CONFIG_RASPBERRYPI_FIRMWARE is not set +# CONFIG_INTEL_STRATIX10_SERVICE is not set +# CONFIG_INTEL_STRATIX10_RSU is not set +CONFIG_IMX_DSP=y +# CONFIG_GNSS is not set +# CONFIG_GNSS_MTK_SERIAL is not set +CONFIG_MTD_CMDLINE_PARTS=y +# CONFIG_MTD_NAND_BRCMNAND is not set +CONFIG_MTD_NAND_GPMI_NAND=y +# CONFIG_MTD_NAND_MARVELL is not set +# CONFIG_MTD_NAND_FSL_IFC is not set +# CONFIG_MTD_NAND_QCOM is not set +# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set +CONFIG_MTD_UBI=y +# CONFIG_BLK_DEV_NVME is not set +# CONFIG_PCI_ENDPOINT_TEST is not set +CONFIG_RAID_ATTRS=m +# CONFIG_SCSI_HISI_SAS_PCI is not set +# CONFIG_MEGARAID_SAS is not set +# CONFIG_SCSI_MPT3SAS is not set +# CONFIG_SCSI_UFS_QCOM is not set +# CONFIG_SCSI_UFS_HISI is not set +# CONFIG_SCSI_UFS_EXYNOS is not set +# CONFIG_SATA_AHCI is not set +CONFIG_AHCI_IMX=y +# CONFIG_AHCI_BRCM is not set +# CONFIG_AHCI_MVEBU is not set +# CONFIG_SATA_SIL24 is not set +# CONFIG_SATA_RCAR is not set +CONFIG_DM_CRYPT=m +# CONFIG_NET_DSA_BCM_SF2 is not set +# CONFIG_NET_DSA_MSCC_FELIX is not set +# CONFIG_NET_XGENE is not set +# CONFIG_ATL1C is not set +# CONFIG_SYSTEMPORT is not set +# CONFIG_BNX2X is not set +# CONFIG_THUNDER_NIC_PF is not set +CONFIG_FSL_XGMAC_MDIO=y +CONFIG_FSL_ENETC_IERB=y +# CONFIG_FSL_FMAN is not set +# CONFIG_FSL_DPAA_ETH is not set +# CONFIG_FSL_DPAA2_ETH is not set +# CONFIG_FSL_ENETC is not set +# CONFIG_FSL_ENETC_VF is not set +# CONFIG_FSL_ENETC_QOS is not set +CONFIG_MVMDIO=y +CONFIG_MSCC_OCELOT_SWITCH=m +# CONFIG_HNS3 is not set +# CONFIG_HNS3_HCLGE is not set +# CONFIG_HNS3_ENET is not set +# CONFIG_E1000 is not set +# CONFIG_E1000E is not set +# CONFIG_IGB is not set +# CONFIG_IGBVF is not set +# CONFIG_MVNETA is not set +# CONFIG_MVPP2 is not set +# CONFIG_SKY2 is not set +# CONFIG_MLX4_EN is not set +# CONFIG_MLX5_CORE is not set +# CONFIG_MLX5_CORE_EN is not set +# CONFIG_R8169 is not set +# CONFIG_SH_ETH is not set +# CONFIG_RAVB is not set +CONFIG_STMMAC_ETH=y +CONFIG_DWMAC_GENERIC=m +CONFIG_MICROCHIP_PHY=y +CONFIG_NXP_TJA11XX_PHY=y +CONFIG_MDIO_BITBANG=y +# CONFIG_SNI_AVE is not set +# CONFIG_SNI_NETSEC is not set +# CONFIG_TI_K3_AM65_CPSW_NUSS is not set +# CONFIG_QCOM_IPA is not set +# CONFIG_MESON_GXL_PHY is not set +# CONFIG_AQUANTIA_PHY is not set +# CONFIG_BCM54140_PHY is not set +# CONFIG_MARVELL_PHY is not set +# CONFIG_MARVELL_10G_PHY is not set +# CONFIG_MICREL_PHY is not set +# CONFIG_MICROSEMI_PHY is not set +# CONFIG_AT803X_PHY is not set +# CONFIG_REALTEK_PHY is not set +# CONFIG_ROCKCHIP_PHY is not set +# CONFIG_DP83867_PHY is not set +# CONFIG_VITESSE_PHY is not set +# CONFIG_USB_BRCMSTB is not set +CONFIG_USB_RTL8152=y +CONFIG_USB_USBNET=y +CONFIG_BRCMFMAC=y +CONFIG_HOSTAP=y +# CONFIG_ATH10K is not set +# CONFIG_ATH10K_PCI is not set +# CONFIG_ATH10K_SNOC is not set +# CONFIG_WCN36XX is not set +# CONFIG_MWIFIEX is not set +# CONFIG_MWIFIEX_SDIO is not set +# CONFIG_MWIFIEX_PCIE is not set +CONFIG_KEYBOARD_SNVS_PWRKEY=y +# CONFIG_KEYBOARD_IMX_SC_KEY is not set +# CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set +# CONFIG_INPUT_PM8941_PWRKEY is not set +# CONFIG_INPUT_PM8XXX_VIBRATOR is not set +# CONFIG_INPUT_PWM_BEEPER is not set +# CONFIG_INPUT_PWM_VIBRA is not set +# CONFIG_INPUT_HISI_POWERKEY is not set +# CONFIG_SERIAL_8250_BCM2835AUX is not set +# CONFIG_SERIAL_8250_OMAP is not set +# CONFIG_SERIAL_8250_MT6577 is not set +# CONFIG_SERIAL_8250_UNIPHIER is not set +# CONFIG_SERIAL_MESON is not set +# CONFIG_SERIAL_MESON_CONSOLE is not set +# CONFIG_SERIAL_SAMSUNG is not set +# CONFIG_SERIAL_SAMSUNG_CONSOLE is not set +# CONFIG_SERIAL_TEGRA is not set +# CONFIG_SERIAL_TEGRA_TCU is not set +# CONFIG_SERIAL_SH_SCI is not set +# CONFIG_SERIAL_MSM is not set +# CONFIG_SERIAL_MSM_CONSOLE is not set +# CONFIG_SERIAL_QCOM_GENI is not set +# CONFIG_SERIAL_QCOM_GENI_CONSOLE is not set +# CONFIG_SERIAL_MVEBU_UART is not set +# CONFIG_SERIAL_OWL is not set +# CONFIG_I2C_MUX is not set +# CONFIG_I2C_BCM2835 is not set +# CONFIG_I2C_MESON is not set +# CONFIG_I2C_MT65XX is not set +# CONFIG_I2C_MV64XXX is not set +# CONFIG_I2C_OMAP is not set +# CONFIG_I2C_OWL is not set +# CONFIG_I2C_PXA is not set +# CONFIG_I2C_QCOM_CCI is not set +# CONFIG_I2C_QCOM_GENI is not set +# CONFIG_I2C_QUP is not set +# CONFIG_I2C_RIIC is not set +# CONFIG_I2C_S3C2410 is not set +# CONFIG_I2C_SH_MOBILE is not set +# CONFIG_I2C_TEGRA is not set +# CONFIG_I2C_UNIPHIER_F is not set +# CONFIG_I2C_RCAR is not set +# CONFIG_SPI_ARMADA_3700 is not set +# CONFIG_SPI_BCM2835 is not set +# CONFIG_SPI_BCM2835AUX is not set +# CONFIG_SPI_DESIGNWARE is not set +# CONFIG_SPI_DW_DMA is not set +# CONFIG_SPI_DW_MMIO is not set +CONFIG_SPI_IMX=y +# CONFIG_SPI_FSL_DSPI is not set +# CONFIG_SPI_MESON_SPICC is not set +# CONFIG_SPI_MESON_SPIFC is not set +# CONFIG_SPI_ORION is not set +CONFIG_SPI_SPIDEV=y +CONFIG_SPI_SLAVE=y +CONFIG_SPI_SLAVE_TIME=y +CONFIG_SPI_SLAVE_SYSTEM_CONTROL=y +CONFIG_PINCTRL=y +# CONFIG_SPI_RPCIF is not set +# CONFIG_SPI_RSPI is not set +# CONFIG_SPI_QCOM_QSPI is not set +# CONFIG_SPI_QUP is not set +# CONFIG_SPI_QCOM_GENI is not set +# CONFIG_SPI_S3C64XX is not set +# CONFIG_SPI_SH_MSIOF is not set +# CONFIG_SPI_SUN6I is not set +# CONFIG_SPMI is not set +# CONFIG_PINCTRL_OWL is not set +# CONFIG_PINCTRL_S700 is not set +# CONFIG_PINCTRL_S900 is not set +CONFIG_GPIOLIB=y +# CONFIG_PINCTRL_MSM is not set +# CONFIG_PINCTRL_IPQ8074 is not set +# CONFIG_PINCTRL_IPQ6018 is not set +# CONFIG_PINCTRL_MSM8916 is not set +# CONFIG_PINCTRL_MSM8994 is not set +# CONFIG_PINCTRL_MSM8996 is not set +# CONFIG_PINCTRL_MSM8998 is not set +# CONFIG_PINCTRL_QCS404 is not set +# CONFIG_PINCTRL_QDF2XXX is not set +# CONFIG_PINCTRL_QCOM_SPMI_PMIC is not set +# CONFIG_PINCTRL_SC7180 is not set +# CONFIG_PINCTRL_SC7280 is not set +# CONFIG_PINCTRL_SDM845 is not set +# CONFIG_PINCTRL_SM8150 is not set +# CONFIG_PINCTRL_SM8250 is not set +# CONFIG_PINCTRL_SM8350 is not set +# CONFIG_PINCTRL_SM8450 is not set +# CONFIG_PINCTRL_LPASS_LPI is not set +# CONFIG_GPIO_DAVINCI is not set +# CONFIG_GPIO_MPC8XXX is not set +# CONFIG_GPIO_RCAR is not set +# CONFIG_GPIO_UNIPHIER is not set +# CONFIG_GPIO_VISCONTI is not set +# CONFIG_GPIO_XGENE_SB is not set +CONFIG_POWER_RESET_BRCMSTB=y +# CONFIG_GPIO_MAX77620 is not set +# CONFIG_GPIO_SL28CPLD is not set +# CONFIG_POWER_RESET_MSM is not set +# CONFIG_POWER_RESET_QCOM_PON is not set +# CONFIG_BATTERY_MAX17042 is not set +# CONFIG_CHARGER_BQ25890 is not set +# CONFIG_CHARGER_BQ25980 is not set +# CONFIG_SENSORS_JC42 is not set +# CONFIG_SENSORS_LM75 is not set +# CONFIG_SENSORS_RASPBERRYPI_HWMON is not set +# CONFIG_SENSORS_SL28CPLD is not set +CONFIG_THERMAL_WRITABLE_TRIPS=y +CONFIG_IMX_SC_THERMAL=y +CONFIG_IMX8MM_THERMAL=y +CONFIG_QORIQ_THERMAL=y +# CONFIG_SUN8I_THERMAL is not set +# CONFIG_ROCKCHIP_THERMAL is not set +# CONFIG_RCAR_THERMAL is not set +# CONFIG_RCAR_GEN3_THERMAL is not set +# CONFIG_RZG2L_THERMAL is not set +# CONFIG_ARMADA_THERMAL is not set +# CONFIG_BCM2711_THERMAL is not set +# CONFIG_BCM2835_THERMAL is not set +# CONFIG_BRCMSTB_THERMAL is not set +# CONFIG_EXYNOS_THERMAL is not set +# CONFIG_TEGRA_SOCTHERM is not set +# CONFIG_TEGRA_BPMP_THERMAL is not set +# CONFIG_QCOM_TSENS is not set +# CONFIG_QCOM_SPMI_TEMP_ALARM is not set +# CONFIG_QCOM_LMH is not set +# CONFIG_UNIPHIER_THERMAL is not set +# CONFIG_SL28CPLD_WATCHDOG is not set +# CONFIG_S3C2410_WATCHDOG is not set +# CONFIG_BCM7038_WDT is not set +# CONFIG_SUNXI_WATCHDOG is not set +CONFIG_IMX_SC_WDT=y +CONFIG_IMX7ULP_WDT=y +# CONFIG_QCOM_WDT is not set +# CONFIG_MESON_GXBB_WATCHDOG is not set +# CONFIG_MESON_WATCHDOG is not set +# CONFIG_RENESAS_WDT is not set +# CONFIG_RENESAS_RZG2LWDT is not set +# CONFIG_UNIPHIER_WATCHDOG is not set +# CONFIG_BCM2835_WDT is not set +# CONFIG_MFD_ALTERA_SYSMGR is not set +# CONFIG_MFD_AXP20X_RSB is not set +# CONFIG_MFD_EXYNOS_LPASS is not set +# CONFIG_MFD_HI655X_PMIC is not set +# CONFIG_MFD_MT6397 is not set +# CONFIG_MFD_SPMI_PMIC is not set +# CONFIG_MFD_SL28CPLD is not set +CONFIG_REGULATOR=y +# CONFIG_REGULATOR_HI655X is not set +# CONFIG_REGULATOR_MP8859 is not set +# CONFIG_REGULATOR_MT6358 is not set +# CONFIG_REGULATOR_MT6397 is not set +# CONFIG_REGULATOR_PF8X00 is not set +# CONFIG_REGULATOR_QCOM_RPMH is not set +# CONFIG_REGULATOR_QCOM_SMD_RPM is not set +# CONFIG_REGULATOR_QCOM_SPMI is not set +# CONFIG_REGULATOR_TPS65132 is not set +CONFIG_MEDIA_SUPPORT=y +# CONFIG_RC_CORE is not set +# CONFIG_RC_DECODERS is not set +# CONFIG_RC_DEVICES is not set +# CONFIG_IR_MESON is not set +# CONFIG_IR_SUNXI is not set +CONFIG_SDR_PLATFORM_DRIVERS=y +# CONFIG_VIDEO_QCOM_CAMSS is not set +# CONFIG_VIDEO_RCAR_CSI2 is not set +# CONFIG_VIDEO_RCAR_VIN is not set +# CONFIG_VIDEO_SUN6I_CSI is not set +# CONFIG_VIDEO_RCAR_ISP is not set +# CONFIG_VIDEO_SAMSUNG_S5P_JPEG is not set +# CONFIG_VIDEO_SAMSUNG_S5P_MFC is not set +# CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC is not set +# CONFIG_VIDEO_RENESAS_FDP1 is not set +# CONFIG_VIDEO_RENESAS_FCP is not set +# CONFIG_VIDEO_RENESAS_VSP1 is not set +# CONFIG_VIDEO_QCOM_VENUS is not set +# CONFIG_VIDEO_RCAR_DRIF is not set +CONFIG_VIDEO_OV5640=y +CONFIG_DRM=y +CONFIG_DRM_I2C_CH7006=m +CONFIG_DRM_I2C_SIL164=m +# CONFIG_DRM_NOUVEAU is not set +# CONFIG_DRM_EXYNOS is not set +# CONFIG_DRM_EXYNOS5433_DECON is not set +# CONFIG_DRM_EXYNOS7_DECON is not set +# CONFIG_DRM_EXYNOS_DSI is not set +# CONFIG_DRM_EXYNOS_DP is not set +# CONFIG_DRM_EXYNOS_HDMI is not set +# CONFIG_DRM_EXYNOS_MIC is not set +# CONFIG_DRM_ROCKCHIP is not set +# CONFIG_ROCKCHIP_ANALOGIX_DP is not set +# CONFIG_ROCKCHIP_CDN_DP is not set +# CONFIG_ROCKCHIP_DW_HDMI is not set +# CONFIG_ROCKCHIP_DW_MIPI_DSI is not set +# CONFIG_ROCKCHIP_INNO_HDMI is not set +# CONFIG_ROCKCHIP_LVDS is not set +# CONFIG_DRM_RCAR_DU is not set +# CONFIG_DRM_RCAR_MIPI_DSI is not set +# CONFIG_DRM_SUN4I is not set +# CONFIG_DRM_SUN6I_DSI is not set +# CONFIG_DRM_SUN8I_DW_HDMI is not set +# CONFIG_DRM_SUN8I_MIXER is not set +# CONFIG_DRM_MSM is not set +# CONFIG_DRM_TEGRA is not set +# CONFIG_DRM_PANEL_BOE_TV101WUM_NL6 is not set +# CONFIG_DRM_PANEL_LVDS is not set +# CONFIG_DRM_PANEL_SIMPLE is not set +# CONFIG_DRM_PANEL_EDP is not set +# CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set +# CONFIG_DRM_PANEL_RAYDIUM_RM67191 is not set +# CONFIG_DRM_PANEL_SITRONIX_ST7703 is not set +CONFIG_DRM_DISPLAY_CONNECTOR=m +# CONFIG_DRM_LONTIUM_LT8912B is not set +CONFIG_DRM_NWL_MIPI_DSI=y +# CONFIG_DRM_LONTIUM_LT9611UXC is not set +# CONFIG_DRM_PARADE_PS8640 is not set +CONFIG_DRM_I2C_ADV7511=y +CONFIG_DRM_DW_HDMI_I2S_AUDIO=m +CONFIG_DRM_IMX_DCSS=y +# CONFIG_DRM_VC4 is not set +# CONFIG_DRM_HISI_HIBMC is not set +CONFIG_DRM_MXSFB=y +# CONFIG_DRM_MEDIATEK is not set +# CONFIG_DRM_MEDIATEK_HDMI is not set +# CONFIG_DRM_MESON is not set +CONFIG_DRM_LEGACY=y +# CONFIG_FB is not set +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_EFI is not set +# CONFIG_BACKLIGHT_PWM is not set +# CONFIG_BACKLIGHT_LP855X is not set +# CONFIG_LOGO is not set +CONFIG_SND_DYNAMIC_MINORS=y +CONFIG_SND_ALOOP=m +# CONFIG_SND_SPI is not set +# CONFIG_SND_USB is not set +# CONFIG_SND_HDA_TEGRA is not set +# CONFIG_SND_HDA_CODEC_HDMI is not set +CONFIG_SND_SOC_FSL_ASRC=y +CONFIG_SND_SOC_FSL_EASRC=y +CONFIG_SND_IMX_SOC=y +CONFIG_SND_SOC_FSL_ASOC_CARD=y +CONFIG_SND_SOC_SOF_TOPLEVEL=y +CONFIG_SND_SOC_SOF_OF=m +CONFIG_SND_SOC_SOF_IMX_TOPLEVEL=y +CONFIG_SND_SOC_AK4458=y +CONFIG_SND_SOC_AK5558=y +CONFIG_SND_SOC_PCM512x_I2C=y +CONFIG_SND_SIMPLE_CARD=y +CONFIG_SND_AUDIO_GRAPH_CARD=y +CONFIG_USB_CONN_GPIO=y +# CONFIG_SND_BCM2835_SOC_I2S is not set +# CONFIG_SND_SOC_FSL_MICFIL is not set +# CONFIG_SND_SOC_IMX_SGTL5000 is not set +# CONFIG_SND_SOC_IMX_SPDIF is not set +# CONFIG_SND_SOC_IMX_AUDMIX is not set +# CONFIG_SND_MESON_AXG_SOUND_CARD is not set +# CONFIG_SND_MESON_GX_SOUND_CARD is not set +# CONFIG_SND_SOC_QCOM is not set +# CONFIG_SND_SOC_APQ8016_SBC is not set +# CONFIG_SND_SOC_MSM8996 is not set +# CONFIG_SND_SOC_SDM845 is not set +# CONFIG_SND_SOC_SM8250 is not set +# CONFIG_SND_SOC_ROCKCHIP is not set +# CONFIG_SND_SOC_ROCKCHIP_SPDIF is not set +# CONFIG_SND_SOC_ROCKCHIP_RT5645 is not set +# CONFIG_SND_SOC_RK3399_GRU_SOUND is not set +# CONFIG_SND_SOC_SAMSUNG is not set +# CONFIG_SND_SOC_RCAR is not set +# CONFIG_SND_SOC_RZ is not set +# CONFIG_SND_SUN4I_I2S is not set +# CONFIG_SND_SUN4I_SPDIF is not set +# CONFIG_SND_SOC_TEGRA is not set +# CONFIG_SND_SOC_TEGRA210_AHUB is not set +# CONFIG_SND_SOC_TEGRA210_DMIC is not set +# CONFIG_SND_SOC_TEGRA210_I2S is not set +# CONFIG_SND_SOC_TEGRA186_DSPK is not set +# CONFIG_SND_SOC_TEGRA210_ADMAIF is not set +# CONFIG_SND_SOC_TEGRA210_MVC is not set +# CONFIG_SND_SOC_TEGRA210_SFC is not set +# CONFIG_SND_SOC_TEGRA210_AMX is not set +# CONFIG_SND_SOC_TEGRA210_ADX is not set +# CONFIG_SND_SOC_TEGRA210_MIXER is not set +# CONFIG_SND_SOC_TEGRA_AUDIO_GRAPH_CARD is not set +# CONFIG_SND_SOC_AK4613 is not set +# CONFIG_SND_SOC_ES7134 is not set +# CONFIG_SND_SOC_ES7241 is not set +# CONFIG_SND_SOC_GTM601 is not set +# CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set +# CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set +# CONFIG_SND_SOC_PCM3168A_I2C is not set +# CONFIG_SND_SOC_RT5659 is not set +# CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set +# CONFIG_SND_SOC_SIMPLE_MUX is not set +# CONFIG_SND_SOC_TAS571X is not set +# CONFIG_SND_SOC_TLV320AIC32X4_I2C is not set +# CONFIG_SND_SOC_WCD934X is not set +# CONFIG_SND_SOC_WM8904 is not set +# CONFIG_SND_SOC_WM8960 is not set +# CONFIG_SND_SOC_WM8962 is not set +# CONFIG_SND_SOC_WM8978 is not set +# CONFIG_SND_SOC_WSA881X is not set +# CONFIG_SND_SOC_NAU8822 is not set +# CONFIG_SND_SOC_LPASS_WSA_MACRO is not set +# CONFIG_SND_SOC_LPASS_VA_MACRO is not set +# CONFIG_SND_AUDIO_GRAPH_CARD2 is not set +# CONFIG_HID_MULTITOUCH is not set +# CONFIG_I2C_HID_ACPI is not set +# CONFIG_I2C_HID_OF is not set +# CONFIG_USB_XHCI_PCI_RENESAS is not set +# CONFIG_USB_XHCI_TEGRA is not set +# CONFIG_USB_EHCI_EXYNOS is not set +# CONFIG_USB_OHCI_EXYNOS is not set +CONFIG_USB_HCD_TEST_MODE=y +# CONFIG_USB_RENESAS_USBHS_HCD is not set +# CONFIG_USB_RENESAS_USBHS is not set +CONFIG_USB_UAS=y +# CONFIG_USB_CDNS_SUPPORT is not set +# CONFIG_USB_CDNS3 is not set +# CONFIG_USB_CDNS3_GADGET is not set +# CONFIG_USB_CDNS3_HOST is not set +# CONFIG_USB_MTU3 is not set +# CONFIG_USB_MUSB_SUNXI is not set +CONFIG_USB_SERIAL=y +CONFIG_USB_SERIAL_CONSOLE=y +CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_SIMPLE=y +CONFIG_USB_SERIAL_FTDI_SIO=y +CONFIG_USB_TEST=m +CONFIG_USB_EHSET_TEST_FIXTURE=y +# CONFIG_USB_SERIAL_CP210X is not set +# CONFIG_USB_SERIAL_OPTION is not set +CONFIG_USB_MXS_PHY=y +CONFIG_USB_ULPI=y +CONFIG_USB_SNP_UDC_PLAT=y +CONFIG_USB_BDC_UDC=y +CONFIG_USB_CONFIGFS=y +# CONFIG_USB_RENESAS_USBHS_UDC is not set +# CONFIG_USB_RENESAS_USB3 is not set +# CONFIG_USB_TEGRA_XUDC is not set +CONFIG_USB_CONFIGFS_F_LB_SS=y +CONFIG_USB_CONFIGFS_F_UAC1=y +CONFIG_USB_CONFIGFS_F_UAC1_LEGACY=y +CONFIG_USB_CONFIGFS_F_UAC2=y +CONFIG_USB_CONFIGFS_F_MIDI=y +CONFIG_USB_CONFIGFS_F_HID=y +CONFIG_USB_CONFIGFS_F_UVC=y +CONFIG_USB_ZERO=m +CONFIG_USB_AUDIO=m +CONFIG_USB_ETH=m +CONFIG_USB_MASS_STORAGE=m +CONFIG_USB_G_SERIAL=m +CONFIG_TYPEC=y +CONFIG_TYPEC_TCPM=y +CONFIG_TYPEC_TCPCI=y +# CONFIG_TYPEC_TPS6598X is not set +# CONFIG_MMC_SDHCI_ACPI is not set +# CONFIG_MMC_SDHCI_TEGRA is not set +# CONFIG_MMC_MESON_GX is not set +# CONFIG_MMC_SDHCI_MSM is not set +# CONFIG_MMC_SDHI is not set +# CONFIG_MMC_UNIPHIER is not set +# CONFIG_MMC_DW_ROCKCHIP is not set +# CONFIG_MMC_SUNXI is not set +# CONFIG_MMC_BCM2835 is not set +# CONFIG_MMC_MTK is not set +# CONFIG_MMC_OWL is not set +# CONFIG_LEDS_LM3692X is not set +# CONFIG_LEDS_PCA9532 is not set +# CONFIG_EDAC_LAYERSCAPE is not set +# CONFIG_RTC_DRV_HYM8563 is not set +# CONFIG_RTC_DRV_PCF85063 is not set +# CONFIG_RTC_DRV_M41T80 is not set +# CONFIG_RTC_DRV_RV3028 is not set +# CONFIG_RTC_DRV_FSL_FTM_ALARM is not set +# CONFIG_RTC_DRV_S3C is not set +CONFIG_RTC_DRV_SNVS=y +CONFIG_RTC_DRV_IMX_SC=y +# CONFIG_RTC_DRV_SUN6I is not set +# CONFIG_RTC_DRV_ARMADA38X is not set +# CONFIG_RTC_DRV_PM8XXX is not set +# CONFIG_RTC_DRV_TEGRA is not set +# CONFIG_RTC_DRV_XGENE is not set +# CONFIG_RTC_DRV_MT6397 is not set +CONFIG_BCM_SBA_RAID=m +# CONFIG_DMA_BCM2835 is not set +# CONFIG_DMA_SUN6I is not set +CONFIG_FSL_QDMA=m +CONFIG_IMX_SDMA=y +# CONFIG_K3_DMA is not set +# CONFIG_MV_XOR is not set +CONFIG_MXS_DMA=y +# CONFIG_OWL_DMA is not set +# CONFIG_TEGRA186_GPC_DMA is not set +# CONFIG_TEGRA20_APB_DMA is not set +# CONFIG_TEGRA210_ADMA is not set +# CONFIG_QCOM_BAM_DMA is not set +CONFIG_DMATEST=y +CONFIG_DMABUF_HEAPS=y +CONFIG_DMABUF_HEAPS_SYSTEM=y +CONFIG_DMABUF_HEAPS_CMA=y +# CONFIG_RCAR_DMAC is not set +# CONFIG_RENESAS_USB_DMAC is not set +# CONFIG_RZ_DMAC is not set +# CONFIG_TI_K3_UDMA is not set +# CONFIG_TI_K3_UDMA_GLUE_LAYER is not set +# CONFIG_VFIO_PCI is not set +# CONFIG_VIRTIO_PCI is not set +# CONFIG_XEN_GNTDEV is not set +# CONFIG_XEN_GRANT_DEV_ALLOC is not set +# CONFIG_VIDEO_HANTRO is not set +# CONFIG_VIDEO_IMX_MEDIA is not set +# CONFIG_COMMON_CLK_SCMI is not set +# CONFIG_COMMON_CLK_FSL_SAI is not set +CONFIG_COMMON_CLK_XGENE=y +# CONFIG_COMMON_CLK_BD718XX is not set +# CONFIG_CLK_RASPBERRYPI is not set +# CONFIG_CLK_IMX8MM is not set +# CONFIG_CLK_IMX8MP is not set +# CONFIG_CLK_IMX8MQ is not set +# CONFIG_CLK_IMX8QXP is not set +# CONFIG_CLK_IMX8ULP is not set +# CONFIG_TI_SCI_CLK is not set +# CONFIG_COMMON_CLK_QCOM is not set +# CONFIG_QCOM_A53PLL is not set +# CONFIG_QCOM_CLK_APCS_MSM8916 is not set +# CONFIG_QCOM_CLK_APCC_MSM8996 is not set +# CONFIG_QCOM_CLK_SMD_RPM is not set +# CONFIG_QCOM_CLK_RPMH is not set +# CONFIG_IPQ_GCC_6018 is not set +# CONFIG_IPQ_GCC_8074 is not set +# CONFIG_MSM_GCC_8916 is not set +# CONFIG_MSM_GCC_8994 is not set +# CONFIG_MSM_MMCC_8996 is not set +# CONFIG_MSM_GCC_8998 is not set +# CONFIG_QCS_GCC_404 is not set +# CONFIG_SC_GCC_7180 is not set +# CONFIG_SC_GCC_7280 is not set +# CONFIG_SDM_CAMCC_845 is not set +# CONFIG_SDM_GPUCC_845 is not set +# CONFIG_SDM_VIDEOCC_845 is not set +# CONFIG_SDM_DISPCC_845 is not set +# CONFIG_SM_GCC_8350 is not set +# CONFIG_SM_GCC_8450 is not set +# CONFIG_SM_GPUCC_8150 is not set +# CONFIG_SM_GPUCC_8250 is not set +# CONFIG_QCOM_HFPLL is not set +# CONFIG_CLK_GFM_LPASS_SM8250 is not set +# CONFIG_CLK_RCAR_USB2_CLOCK_SEL is not set +# CONFIG_HWSPINLOCK_QCOM is not set +# CONFIG_RENESAS_OSTM is not set +# CONFIG_BCM2835_MBOX is not set +# CONFIG_QCOM_APCS_IPC is not set +# CONFIG_QCOM_IPCC is not set +# CONFIG_ROCKCHIP_IOMMU is not set +# CONFIG_TEGRA_IOMMU_SMMU is not set +# CONFIG_MTK_IOMMU is not set +# CONFIG_QCOM_IOMMU is not set +CONFIG_IMX_REMOTEPROC=y +CONFIG_IMX_DSP_REMOTEPROC=y +CONFIG_RPMSG_CHAR=y +# CONFIG_QCOM_Q6V5_MSS is not set +# CONFIG_QCOM_Q6V5_PAS is not set +# CONFIG_QCOM_SYSMON is not set +# CONFIG_QCOM_WCNSS_PIL is not set +# CONFIG_RPMSG_QCOM_GLINK_SMEM is not set +# CONFIG_RPMSG_QCOM_SMD is not set +CONFIG_SOC_BRCMSTB=y +# CONFIG_OWL_PM_DOMAINS is not set +# CONFIG_RASPBERRYPI_POWER is not set +# CONFIG_FSL_DPAA is not set +# CONFIG_FSL_MC_DPIO is not set +CONFIG_SOC_TI=y +# CONFIG_MTK_DEVAPC is not set +# CONFIG_MTK_PMIC_WRAP is not set +# CONFIG_QCOM_AOSS_QMP is not set +# CONFIG_QCOM_COMMAND_DB is not set +# CONFIG_QCOM_CPR is not set +# CONFIG_QCOM_GENI_SE is not set +# CONFIG_QCOM_RMTFS_MEM is not set +# CONFIG_QCOM_RPMH is not set +# CONFIG_QCOM_RPMHPD is not set +# CONFIG_QCOM_RPMPD is not set +# CONFIG_QCOM_SMEM is not set +# CONFIG_QCOM_SMD_RPM is not set +# CONFIG_QCOM_SMP2P is not set +# CONFIG_QCOM_SMSM is not set +# CONFIG_QCOM_SOCINFO is not set +# CONFIG_QCOM_STATS is not set +# CONFIG_QCOM_WCNSS_CTRL is not set +# CONFIG_QCOM_APR is not set +# CONFIG_ARCH_R8A77995 is not set +# CONFIG_ARCH_R8A77990 is not set +# CONFIG_ARCH_R8A77950 is not set +# CONFIG_ARCH_R8A77951 is not set +# CONFIG_ARCH_R8A77965 is not set +# CONFIG_ARCH_R8A77960 is not set +# CONFIG_ARCH_R8A77961 is not set +# CONFIG_ARCH_R8A779F0 is not set +# CONFIG_ARCH_R8A77980 is not set +# CONFIG_ARCH_R8A77970 is not set +# CONFIG_ARCH_R8A779A0 is not set +# CONFIG_ARCH_R8A774C0 is not set +# CONFIG_ARCH_R8A774E1 is not set +# CONFIG_ARCH_R8A774A1 is not set +# CONFIG_ARCH_R8A774B1 is not set +# CONFIG_ARCH_R9A07G044 is not set +# CONFIG_ROCKCHIP_IODOMAIN is not set +# CONFIG_ROCKCHIP_PM_DOMAINS is not set +# CONFIG_ARCH_TEGRA_132_SOC is not set +# CONFIG_ARCH_TEGRA_210_SOC is not set +# CONFIG_ARCH_TEGRA_186_SOC is not set +# CONFIG_ARCH_TEGRA_194_SOC is not set +# CONFIG_ARCH_TEGRA_234_SOC is not set +# CONFIG_TI_SCI_PM_DOMAINS is not set +# CONFIG_ARM_IMX_BUS_DEVFREQ is not set +# CONFIG_ARM_IMX8M_DDRC_DEVFREQ is not set +CONFIG_MEMORY=y +# CONFIG_RENESAS_RPCIF is not set +CONFIG_IMX8QXP_ADC=y +# CONFIG_EXYNOS_ADC is not set +# CONFIG_QCOM_SPMI_VADC is not set +# CONFIG_QCOM_SPMI_ADC5 is not set +# CONFIG_ROCKCHIP_SARADC is not set +# CONFIG_RZG2L_ADC is not set +# CONFIG_TI_ADS1015 is not set +CONFIG_IIO_ST_LSM6DSX=y +# CONFIG_SENSORS_ISL29018 is not set +# CONFIG_VCNL4000 is not set +# CONFIG_IIO_ST_MAGN_3AXIS is not set +# CONFIG_MPL3115 is not set +# CONFIG_PWM_BCM2835 is not set +# CONFIG_PWM_BRCMSTB is not set +CONFIG_PWM_FSL_FTM=m +CONFIG_PWM_IMX27=y +# CONFIG_PWM_MESON is not set +# CONFIG_PWM_MTK_DISP is not set +# CONFIG_PWM_MEDIATEK is not set +# CONFIG_PWM_RCAR is not set +# CONFIG_PWM_RENESAS_TPU is not set +# CONFIG_PWM_ROCKCHIP is not set +# CONFIG_PWM_SAMSUNG is not set +# CONFIG_PWM_SL28CPLD is not set +# CONFIG_PWM_SUN4I is not set +# CONFIG_PWM_TEGRA is not set +# CONFIG_PWM_VISCONTI is not set +# CONFIG_SL28CPLD_INTC is not set +# CONFIG_QCOM_PDC is not set +# CONFIG_RESET_QCOM_AOSS is not set +# CONFIG_RESET_QCOM_PDC is not set +# CONFIG_RESET_RZG2L_USBPHY_CTRL is not set +# CONFIG_RESET_TI_SCI is not set +CONFIG_PHY_CADENCE_SALVO=y +CONFIG_PHY_MIXEL_MIPI_DPHY=y +# CONFIG_PHY_SUN4I_USB is not set +# CONFIG_PHY_CADENCE_SIERRA is not set +# CONFIG_PHY_FSL_IMX8M_PCIE is not set +# CONFIG_PHY_HI6220_USB is not set +# CONFIG_PHY_HISTB_COMBPHY is not set +# CONFIG_PHY_HISI_INNO_USB2 is not set +# CONFIG_PHY_MVEBU_CP110_COMPHY is not set +# CONFIG_PHY_MTK_TPHY is not set +# CONFIG_PHY_QCOM_QMP is not set +# CONFIG_PHY_QCOM_QUSB2 is not set +CONFIG_PHY_SAMSUNG_USB2=y +# CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set +# CONFIG_PHY_RCAR_GEN3_PCIE is not set +# CONFIG_PHY_RCAR_GEN3_USB2 is not set +# CONFIG_PHY_RCAR_GEN3_USB3 is not set +# CONFIG_PHY_ROCKCHIP_EMMC is not set +# CONFIG_PHY_ROCKCHIP_INNO_HDMI is not set +# CONFIG_PHY_ROCKCHIP_INNO_USB2 is not set +# CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY is not set +# CONFIG_PHY_ROCKCHIP_PCIE is not set +# CONFIG_PHY_ROCKCHIP_TYPEC is not set +# CONFIG_PHY_SAMSUNG_UFS is not set +# CONFIG_PHY_UNIPHIER_USB2 is not set +# CONFIG_PHY_UNIPHIER_USB3 is not set +# CONFIG_PHY_TEGRA_XUSB is not set +# CONFIG_PHY_AM654_SERDES is not set +# CONFIG_PHY_J721E_WIZ is not set +CONFIG_FSL_IMX8_DDR_PMU=y +# CONFIG_QCOM_L2_PMU is not set +# CONFIG_QCOM_L3_PMU is not set +# CONFIG_MTK_EFUSE is not set +# CONFIG_QCOM_QFPROM is not set +# CONFIG_ROCKCHIP_EFUSE is not set +# CONFIG_NVMEM_SUNXI_SID is not set +# CONFIG_UNIPHIER_EFUSE is not set +# CONFIG_MESON_EFUSE is not set +# CONFIG_NVMEM_RMEM is not set +# CONFIG_NVMEM_LAYERSCAPE_SFP is not set +# CONFIG_FPGA_MGR_ALTERA_CVP is not set +# CONFIG_FPGA_MGR_STRATIX10_SOC is not set +# CONFIG_SLIMBUS is not set +# CONFIG_SLIM_QCOM_NGD_CTRL is not set +# CONFIG_INTERCONNECT_IMX is not set +# CONFIG_INTERCONNECT_IMX8MM is not set +# CONFIG_INTERCONNECT_IMX8MN is not set +# CONFIG_INTERCONNECT_IMX8MQ is not set +# CONFIG_INTERCONNECT_QCOM is not set +# CONFIG_INTERCONNECT_QCOM_MSM8916 is not set +# CONFIG_INTERCONNECT_QCOM_OSM_L3 is not set +# CONFIG_INTERCONNECT_QCOM_SC7280 is not set +# CONFIG_INTERCONNECT_QCOM_SDM845 is not set +# CONFIG_INTERCONNECT_QCOM_SM8150 is not set +# CONFIG_INTERCONNECT_QCOM_SM8250 is not set +# CONFIG_INTERCONNECT_QCOM_SM8350 is not set +# CONFIG_INTERCONNECT_QCOM_SM8450 is not set +# CONFIG_TMPFS_POSIX_ACL is not set +# CONFIG_CONFIGFS_FS is not set +CONFIG_JFFS2_FS=y +CONFIG_UBIFS_FS=y +CONFIG_SQUASHFS_XZ=y +CONFIG_CRYPTO_USER=y +CONFIG_CRYPTO_TEST=m +CONFIG_CRYPTO_DH=m +CONFIG_CRYPTO_CHACHA20POLY1305=m +CONFIG_CRYPTO_CFB=m +CONFIG_CRYPTO_CTS=m +CONFIG_CRYPTO_LRW=m +CONFIG_CRYPTO_OFB=m +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_XCBC=m +CONFIG_CRYPTO_VMAC=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_RMD160=m +CONFIG_CRYPTO_STREEBOG=m +CONFIG_CRYPTO_WP512=m +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_CAMELLIA=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_DES=m +CONFIG_CRYPTO_FCRYPT=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_SEED=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_USER_API_HASH=m +CONFIG_CRYPTO_USER_API_SKCIPHER=m +CONFIG_CRYPTO_USER_API_AEAD=m +# CONFIG_CRYPTO_DEV_SUN8I_CE is not set +# CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM is not set +# CONFIG_CRYPTO_DEV_QCOM_RNG is not set +CONFIG_CRYPTO_DEV_AMLOGIC_GXL=m +CONFIG_INDIRECT_PIO=y +CONFIG_CRC_CCITT=m +# CONFIG_CRYPTO_DEV_HISI_SEC2 is not set +# CONFIG_CRYPTO_DEV_HISI_ZIP is not set +# CONFIG_CRYPTO_DEV_HISI_HPRE is not set +# CONFIG_CRYPTO_DEV_HISI_TRNG is not set +CONFIG_IRQ_POLL=y +# CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_INFO_REDUCED is not set +CONFIG_CORESIGHT=y +CONFIG_CORESIGHT_LINK_AND_SINK_TMC=y +CONFIG_CORESIGHT_SOURCE_ETM4X=y diff --git a/buildroot/board/bsh/common/imx8mn-bsh-smm-s2/patches/arm-trusted-firmware/0001-fix-imx8m-drop-UARTs-domain-permissions-setting.patch b/buildroot/board/bsh/common/imx8mn-bsh-smm-s2/patches/arm-trusted-firmware/0001-fix-imx8m-drop-UARTs-domain-permissions-setting.patch new file mode 100644 index 0000000000..74b12df38d --- /dev/null +++ b/buildroot/board/bsh/common/imx8mn-bsh-smm-s2/patches/arm-trusted-firmware/0001-fix-imx8m-drop-UARTs-domain-permissions-setting.patch @@ -0,0 +1,65 @@ +From 0d12fc41d6c68b257de1610a1511144d731f9af4 Mon Sep 17 00:00:00 2001 +From: Dario Binacchi +Date: Wed, 24 Jul 2024 10:46:49 +0200 +Subject: [PATCH] fix(imx8m): drop UARTs domain permissions setting + +The commit d76f012ea8fc0 ("refactor(imx8m): replace magic number with +enum type") also hardcodes the domain permissions configuration for the +UARTs, causing a regression for any board using a boot console different +from UART2. Indeed, previously, the RDC_PDAP_UARTn registers were set to +the reset value (0xff), meaning all domains were enabled for read and +write access. + +This patch partially reverts that commit to fix the regression. + +Fixes: d76f012ea8fc0 ("refactor(imx8m): replace magic number with enum type") +Change-Id: I2670bf485372f32ef45cebb72a7694a9a800f417 +Signed-off-by: Dario Binacchi +Upstream: https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/30131 +--- + plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c | 2 -- + plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c | 2 -- + plat/imx/imx8m/imx8mp/imx8mp_bl31_setup.c | 1 - + 3 files changed, 5 deletions(-) + +diff --git a/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c b/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c +index f6e46eb67bc9..539df931a6a4 100644 +--- a/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c ++++ b/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c +@@ -67,8 +67,6 @@ static const struct imx_rdc_cfg rdc[] = { + RDC_MDAn(RDC_MDA_M4, DID1), + + /* peripherals domain permission */ +- RDC_PDAPn(RDC_PDAP_UART4, D1R | D1W), +- RDC_PDAPn(RDC_PDAP_UART2, D0R | D0W), + + /* memory region */ + +diff --git a/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c b/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c +index befa7698f912..604ef3cae6dc 100644 +--- a/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c ++++ b/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c +@@ -53,8 +53,6 @@ static const struct imx_rdc_cfg rdc[] = { + RDC_MDAn(RDC_MDA_M7, DID1), + + /* peripherals domain permission */ +- RDC_PDAPn(RDC_PDAP_UART4, D1R | D1W), +- RDC_PDAPn(RDC_PDAP_UART2, D0R | D0W), + + /* memory region */ + RDC_MEM_REGIONn(16, 0x0, 0x0, 0xff), +diff --git a/plat/imx/imx8m/imx8mp/imx8mp_bl31_setup.c b/plat/imx/imx8m/imx8mp/imx8mp_bl31_setup.c +index ffad3d159e59..5251c28e6ba8 100644 +--- a/plat/imx/imx8m/imx8mp/imx8mp_bl31_setup.c ++++ b/plat/imx/imx8m/imx8mp/imx8mp_bl31_setup.c +@@ -54,7 +54,6 @@ static const struct imx_rdc_cfg rdc[] = { + RDC_MDAn(RDC_MDA_M7, DID1), + + /* peripherals domain permission */ +- RDC_PDAPn(RDC_PDAP_UART2, D0R | D0W), + + /* memory region */ + +-- +2.43.0 + diff --git a/buildroot/board/bsh/common/imx8mn-bsh-smm-s2/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/buildroot/board/bsh/common/imx8mn-bsh-smm-s2/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 0000000000..6f02bfbb22 --- /dev/null +++ b/buildroot/board/bsh/common/imx8mn-bsh-smm-s2/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 7efa89e1b4e4106ee05d68e876c8efbb146364d89cfd5d26bf4647b09c08f32b arm-trusted-firmware-v2.10-git4.tar.gz diff --git a/buildroot/board/bsh/common/imx8mn-bsh-smm-s2/patches/linux-headers/linux-headers.hash b/buildroot/board/bsh/common/imx8mn-bsh-smm-s2/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/bsh/common/imx8mn-bsh-smm-s2/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/bsh/common/imx8mn-bsh-smm-s2/patches/linux/linux.hash b/buildroot/board/bsh/common/imx8mn-bsh-smm-s2/patches/linux/linux.hash new file mode 100644 index 0000000000..53eb143894 --- /dev/null +++ b/buildroot/board/bsh/common/imx8mn-bsh-smm-s2/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 774698422ee54c5f1e704456f37c65c06b51b4e9a8b0866f34580d86fef8e226 linux-6.10.tar.xz diff --git a/buildroot/board/bsh/common/imx8mn-bsh-smm-s2/patches/uboot/uboot.hash b/buildroot/board/bsh/common/imx8mn-bsh-smm-s2/patches/uboot/uboot.hash new file mode 100644 index 0000000000..fe9b4f53dc --- /dev/null +++ b/buildroot/board/bsh/common/imx8mn-bsh-smm-s2/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f u-boot-2024.07.tar.bz2 diff --git a/buildroot/board/bsh/imx6ulz-bsh-smm-m2/flash.sh b/buildroot/board/bsh/imx6ulz-bsh-smm-m2/flash.sh new file mode 100755 index 0000000000..b2a610644e --- /dev/null +++ b/buildroot/board/bsh/imx6ulz-bsh-smm-m2/flash.sh @@ -0,0 +1,25 @@ +#!/bin/bash + +if [ $# -eq 0 ]; then + OUTPUT_DIR=output +else + OUTPUT_DIR=$1 +fi + +if ! test -d "${OUTPUT_DIR}" ; then + echo "ERROR: no output directory specified." + echo "Usage: $0 OUTPUT_DIR" + echo "" + echo "Arguments:" + echo " OUTPUT_DIR The Buildroot output directory." + exit 1 +fi + +IMAGES_DIR="${OUTPUT_DIR}/images" + +"${OUTPUT_DIR}"/host/bin/uuu -v -b "${IMAGES_DIR}/nand-full.lst" \ + "${IMAGES_DIR}/u-boot-with-spl.imx" \ + "${IMAGES_DIR}/u-boot-with-spl.imx" \ + "${IMAGES_DIR}/rootfs.ubifs" \ + "${IMAGES_DIR}/zImage" \ + "${IMAGES_DIR}/imx6ulz-bsh-smm-m2.dtb" diff --git a/buildroot/board/bsh/imx6ulz-bsh-smm-m2/linux.config b/buildroot/board/bsh/imx6ulz-bsh-smm-m2/linux.config new file mode 100644 index 0000000000..7da8d4abe9 --- /dev/null +++ b/buildroot/board/bsh/imx6ulz-bsh-smm-m2/linux.config @@ -0,0 +1,303 @@ +CONFIG_SYSVIPC=y +CONFIG_NO_HZ_IDLE=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_PREEMPT_VOLUNTARY=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=18 +CONFIG_CGROUPS=y +CONFIG_CGROUP_FREEZER=y +CONFIG_RELAY=y +CONFIG_BLK_DEV_INITRD=y +CONFIG_EXPERT=y +CONFIG_ARCH_MULTI_V6=y +CONFIG_ARCH_MXC=y +CONFIG_SOC_IMX6Q=y +CONFIG_SOC_IMX6SL=y +CONFIG_SOC_IMX6SLL=y +CONFIG_SOC_IMX6SX=y +CONFIG_SOC_IMX6UL=y +CONFIG_SMP=y +CONFIG_HAVE_ARM_ARCH_TIMER=y +CONFIG_ARM_PSCI=y +CONFIG_HIGHMEM=y +CONFIG_ARCH_FORCE_MAX_ORDER=14 +CONFIG_CMDLINE="noinitrd console=ttymxc0,115200" +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_STAT=y +CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=y +CONFIG_CPU_FREQ_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y +CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y +CONFIG_CPUFREQ_DT=y +CONFIG_ARM_IMX6Q_CPUFREQ=y +CONFIG_ARM_IMX_CPUFREQ_DT=y +CONFIG_CPU_IDLE=y +CONFIG_ARM_CPUIDLE=y +CONFIG_ARM_PSCI_CPUIDLE=y +CONFIG_VFP=y +CONFIG_NEON=y +CONFIG_PM_DEBUG=y +CONFIG_PM_TEST_SUSPEND=y +CONFIG_KPROBES=y +# CONFIG_GCC_PLUGINS is not set +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODVERSIONS=y +CONFIG_MODULE_SRCVERSION_ALL=y +CONFIG_BINFMT_MISC=m +# CONFIG_COMPAT_BRK is not set +CONFIG_CMA=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IPV6_SIT=m +CONFIG_NETFILTER=y +CONFIG_IP_NF_IPTABLES=y +CONFIG_IP_NF_FILTER=y +CONFIG_VLAN_8021Q=y +CONFIG_LLC2=y +CONFIG_DNS_RESOLVER=y +CONFIG_NET_PKTGEN=m +CONFIG_BT=y +CONFIG_BT_RFCOMM=y +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=y +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_HIDP=y +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIUART_ATH3K=y +CONFIG_BT_HCIUART_LL=y +CONFIG_BT_HCIUART_3WIRE=y +CONFIG_BT_HCIUART_BCM=y +CONFIG_BT_HCIVHCI=y +CONFIG_CFG80211=y +CONFIG_NL80211_TESTMODE=y +CONFIG_MAC80211=y +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +# CONFIG_STANDALONE is not set +CONFIG_FW_LOADER_USER_HELPER=y +CONFIG_BRCMSTB_GISB_ARB=y +CONFIG_IMX_WEIM=y +CONFIG_VEXPRESS_CONFIG=y +CONFIG_CONNECTOR=y +CONFIG_MTD=y +CONFIG_MTD_CMDLINE_PARTS=y +CONFIG_MTD_BLOCK=y +CONFIG_MTD_CFI=y +CONFIG_MTD_JEDECPROBE=y +CONFIG_MTD_CFI_INTELEXT=y +CONFIG_MTD_CFI_AMDSTD=y +CONFIG_MTD_CFI_STAA=y +CONFIG_MTD_PHYSMAP=y +CONFIG_MTD_PHYSMAP_OF=y +CONFIG_MTD_DATAFLASH=y +CONFIG_MTD_SST25L=y +CONFIG_MTD_RAW_NAND=y +CONFIG_MTD_NAND_GPMI_NAND=y +CONFIG_MTD_NAND_MXC=y +CONFIG_MTD_SPI_NOR=y +# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set +CONFIG_MTD_UBI=y +CONFIG_MTD_UBI_FASTMAP=y +CONFIG_MTD_UBI_BLOCK=y +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_SIZE=65536 +CONFIG_EEPROM_AT25=y +CONFIG_NETDEVICES=y +# CONFIG_ETHERNET is not set +# CONFIG_USB_NET_DRIVERS is not set +CONFIG_BRCMFMAC=m +CONFIG_HOSTAP=y +CONFIG_INPUT_MISC=y +CONFIG_SERIO_SERPORT=m +CONFIG_VT_HW_CONSOLE_BINDING=y +# CONFIG_LEGACY_PTYS is not set +CONFIG_SERIAL_IMX=y +CONFIG_SERIAL_IMX_CONSOLE=y +CONFIG_SERIAL_FSL_LPUART=y +CONFIG_SERIAL_FSL_LPUART_CONSOLE=y +CONFIG_SERIAL_DEV_BUS=y +CONFIG_SPI=y +CONFIG_SPI_FSL_QUADSPI=y +CONFIG_SPI_GPIO=y +CONFIG_SPI_IMX=y +CONFIG_SPI_SPIDEV=y +CONFIG_PTP_1588_CLOCK=y +CONFIG_GPIO_SYSFS=y +CONFIG_GPIO_MXC=y +CONFIG_POWER_RESET=y +CONFIG_POWER_RESET_SYSCON=y +CONFIG_POWER_RESET_SYSCON_POWEROFF=y +CONFIG_SENSORS_GPIO_FAN=y +CONFIG_THERMAL=y +CONFIG_THERMAL_STATISTICS=y +CONFIG_THERMAL_WRITABLE_TRIPS=y +CONFIG_CPU_THERMAL=y +CONFIG_IMX_THERMAL=y +CONFIG_IMX8MM_THERMAL=y +CONFIG_WATCHDOG=y +CONFIG_IMX2_WDT=y +CONFIG_REGULATOR=y +CONFIG_REGULATOR_FIXED_VOLTAGE=y +CONFIG_REGULATOR_ANATOP=y +CONFIG_REGULATOR_GPIO=y +CONFIG_MEDIA_CEC_SUPPORT=y +CONFIG_IMX_IPUV3_CORE=y +CONFIG_USB=y +CONFIG_USB_ANNOUNCE_NEW_DEVICES=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_HCD_TEST_MODE=y +CONFIG_USB_ACM=m +CONFIG_USB_CHIPIDEA=y +CONFIG_USB_CHIPIDEA_UDC=y +CONFIG_USB_CHIPIDEA_HOST=y +CONFIG_USB_EHSET_TEST_FIXTURE=y +CONFIG_NOP_USB_XCEIV=y +CONFIG_USB_MXS_PHY=y +CONFIG_USB_ULPI=y +CONFIG_USB_GADGET=y +CONFIG_USB_SNP_UDC_PLAT=y +CONFIG_USB_BDC_UDC=y +CONFIG_USB_CONFIGFS=y +CONFIG_USB_CONFIGFS_SERIAL=y +CONFIG_USB_CONFIGFS_ACM=y +CONFIG_USB_CONFIGFS_OBEX=y +CONFIG_USB_CONFIGFS_NCM=y +CONFIG_USB_CONFIGFS_ECM=y +CONFIG_USB_CONFIGFS_ECM_SUBSET=y +CONFIG_USB_CONFIGFS_RNDIS=y +CONFIG_USB_CONFIGFS_EEM=y +CONFIG_USB_CONFIGFS_MASS_STORAGE=y +CONFIG_USB_CONFIGFS_F_LB_SS=y +CONFIG_USB_CONFIGFS_F_FS=y +CONFIG_USB_CONFIGFS_F_HID=y +CONFIG_USB_CONFIGFS_F_PRINTER=y +CONFIG_USB_ZERO=m +CONFIG_USB_ETH=m +CONFIG_USB_G_NCM=m +CONFIG_USB_GADGETFS=m +CONFIG_USB_FUNCTIONFS=m +CONFIG_USB_MASS_STORAGE=m +CONFIG_USB_G_SERIAL=m +CONFIG_TYPEC=y +CONFIG_TYPEC_TCPM=y +CONFIG_MMC=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_PLTFM=y +CONFIG_MMC_SDHCI_ESDHC_IMX=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_INTF_DEV_UIE_EMUL=y +CONFIG_RTC_DRV_MXC=y +CONFIG_RTC_DRV_MXC_V2=y +CONFIG_RTC_DRV_SNVS=y +CONFIG_DMADEVICES=y +CONFIG_FSL_EDMA=y +CONFIG_FSL_QDMA=m +CONFIG_IMX_SDMA=m +CONFIG_MXS_DMA=y +CONFIG_DMATEST=y +CONFIG_DMABUF_HEAPS=y +CONFIG_DMABUF_HEAPS_SYSTEM=y +CONFIG_DMABUF_HEAPS_CMA=y +# CONFIG_VIRTIO_MENU is not set +# CONFIG_VHOST_MENU is not set +CONFIG_COMMON_CLK_PWM=y +CONFIG_CLK_IMX8MN=y +CONFIG_SOC_BRCMSTB=y +CONFIG_IMX_GPCV2_PM_DOMAINS=y +CONFIG_SOC_IMX8M=y +CONFIG_SOC_TI=y +CONFIG_MEMORY=y +CONFIG_PWM=y +CONFIG_PWM_FSL_FTM=m +CONFIG_PWM_IMX27=y +CONFIG_PWM_IMX_TPM=y +CONFIG_PHY_CADENCE_SALVO=y +CONFIG_FSL_IMX8_DDR_PMU=y +CONFIG_NVMEM_IMX_OCOTP=y +CONFIG_NVMEM_SNVS_LPGPR=y +CONFIG_EXT2_FS=y +CONFIG_EXT2_FS_XATTR=y +CONFIG_EXT2_FS_POSIX_ACL=y +CONFIG_EXT2_FS_SECURITY=y +CONFIG_EXT3_FS=y +CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_SECURITY=y +CONFIG_AUTOFS_FS=y +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_UDF_FS=m +CONFIG_MSDOS_FS=m +CONFIG_VFAT_FS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_XATTR=y +CONFIG_UBIFS_FS=y +# CONFIG_NETWORK_FILESYSTEMS is not set +CONFIG_NLS_DEFAULT="cp437" +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_ASCII=y +CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_UTF8=y +CONFIG_SECURITYFS=y +CONFIG_CRYPTO_USER=y +CONFIG_CRYPTO_TEST=m +CONFIG_CRYPTO_DH=m +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_CAMELLIA=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_DES=m +CONFIG_CRYPTO_FCRYPT=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_SEED=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_CFB=m +CONFIG_CRYPTO_CTS=m +CONFIG_CRYPTO_LRW=m +CONFIG_CRYPTO_OFB=m +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_CHACHA20POLY1305=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_RMD160=m +CONFIG_CRYPTO_SHA1=y +CONFIG_CRYPTO_STREEBOG=m +CONFIG_CRYPTO_VMAC=m +CONFIG_CRYPTO_WP512=m +CONFIG_CRYPTO_XCBC=m +CONFIG_CRYPTO_USER_API_HASH=m +CONFIG_CRYPTO_USER_API_SKCIPHER=m +CONFIG_CRYPTO_USER_API_AEAD=m +CONFIG_CRYPTO_DEV_FSL_CAAM=y +CONFIG_CRYPTO_DEV_SAHARA=y +CONFIG_CRYPTO_DEV_MXS_DCP=y +CONFIG_CRYPTO_DEV_AMLOGIC_GXL=m +CONFIG_CRC_T10DIF=y +CONFIG_CRC7=m +CONFIG_LIBCRC32C=m +CONFIG_DMA_CMA=y +CONFIG_CMA_SIZE_MBYTES=64 +CONFIG_IRQ_POLL=y +CONFIG_PRINTK_TIME=y +# CONFIG_DEBUG_BUGVERBOSE is not set +CONFIG_MAGIC_SYSRQ=y +CONFIG_DEBUG_FS=y +# CONFIG_SLUB_DEBUG is not set +# CONFIG_SCHED_DEBUG is not set +CONFIG_PROVE_LOCKING=y +# CONFIG_FTRACE is not set +CONFIG_CORESIGHT=y diff --git a/buildroot/board/bsh/imx6ulz-bsh-smm-m2/nand-full.lst b/buildroot/board/bsh/imx6ulz-bsh-smm-m2/nand-full.lst new file mode 100644 index 0000000000..7c5a884d65 --- /dev/null +++ b/buildroot/board/bsh/imx6ulz-bsh-smm-m2/nand-full.lst @@ -0,0 +1,40 @@ +# @_flash.bin | bootloader +# @_image [_flash.bin] | image burn to nand, default is the same as bootloader +# @_filesystem | filesystem to burn +# @_kernel | kernel image +# @_dtb | dtb image + +# This command will be run when i.MX6/7 i.MX8MM, i.MX8MQ +SDP: boot -f _flash.bin + +# These commands will be run when use SPL and will be skipped if no spl +# SDPU will be deprecated. please use SDPV instead of SDPU +# { +SDPU: delay 1000 +SDPU: write -f _flash.bin -offset 0x57c00 +SDPU: jump +# } + +# These commands will be run when use SPL and will be skipped if no spl +# if (SPL support SDPV) +# { +SDPV: delay 1000 +SDPV: write -f _flash.bin -offset 0x11000 +SDPV: jump +# } + +FB: ucmd setenv fastboot_buffer ${loadaddr} +FB[-t 60000]: ucmd nand erase.chip +FB[-t 60000]: ucmd ubi part rootfs +FB[-t 60000]: ucmd ubi create root - +FB: download -f _filesystem +FB[-t 60000]: ucmd ubi write ${loadaddr} root ${filesize} + +FB: download -f _kernel +FB[-t 60000]: ucmd nand write ${loadaddr} kernel ${filesize} + +FB: download -f _dtb +FB[-t 8000]: ucmd nand write ${loadaddr} nanddtb ${filesize} +FB: ucmd setenv loadaddr 0x82000000 + +FB: done diff --git a/buildroot/board/bsh/imx6ulz-bsh-smm-m2/patches/linux-headers/linux-headers.hash b/buildroot/board/bsh/imx6ulz-bsh-smm-m2/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/bsh/imx6ulz-bsh-smm-m2/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/bsh/imx6ulz-bsh-smm-m2/patches/linux/linux.hash b/buildroot/board/bsh/imx6ulz-bsh-smm-m2/patches/linux/linux.hash new file mode 100644 index 0000000000..25e4464adb --- /dev/null +++ b/buildroot/board/bsh/imx6ulz-bsh-smm-m2/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 365ff26a30e206de9b18489f45d38582a0a61b7c5919f8ab89295a47316784e1 linux-6.1.68.tar.xz diff --git a/buildroot/board/bsh/imx6ulz-bsh-smm-m2/patches/uboot/uboot.hash b/buildroot/board/bsh/imx6ulz-bsh-smm-m2/patches/uboot/uboot.hash new file mode 100644 index 0000000000..c0b3bcdd04 --- /dev/null +++ b/buildroot/board/bsh/imx6ulz-bsh-smm-m2/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 e00e6c6f014e046101739d08d06f328811cebcf5ae101348f409cbbd55ce6900 u-boot-2023.10.tar.bz2 diff --git a/buildroot/board/bsh/imx6ulz-bsh-smm-m2/post-build.sh b/buildroot/board/bsh/imx6ulz-bsh-smm-m2/post-build.sh new file mode 100755 index 0000000000..eac82cc22a --- /dev/null +++ b/buildroot/board/bsh/imx6ulz-bsh-smm-m2/post-build.sh @@ -0,0 +1,4 @@ +#!/bin/sh +BOARD_DIR="$(dirname "$0")" + +cp "${BOARD_DIR}/nand-full.lst" "${BINARIES_DIR}" diff --git a/buildroot/board/bsh/imx6ulz-bsh-smm-m2/readme.txt b/buildroot/board/bsh/imx6ulz-bsh-smm-m2/readme.txt new file mode 100644 index 0000000000..e6641e6df1 --- /dev/null +++ b/buildroot/board/bsh/imx6ulz-bsh-smm-m2/readme.txt @@ -0,0 +1,67 @@ +i.MX6ULZ BSH SMM M2 +================== + +This tutorial describes how to use the predefined Buildroot +configuration for the i.MX6ULZ BSH SMM M2 board. + +Building +-------- + +Configure buildroot: + + $ make imx6ulz_bsh_smm_m2_defconfig + +Change settings to fit your needs (optional): + + $ make menuconfig + +Compile everything and build the rootfs image: + + $ make + + +Result of the build +------------------- + +After building, the output/images directory contains: + + output/images/ + ├── imx6ulz-bsh-smm-m2.dtb + ├── zImage + ├── nand-full.lst + ├── rootfs.ubifs + └── u-boot-with-spl.imx + +Preparing the board +------------------- + +Plug the USB type A to micro B cable into the USB Debug +Connector (DBG UART). Use serial port settings 115200 8N1 +to access the debug console. + +Plug another USB type A to micro B cable into the USB-OTG +Connector (USB1). This connection is used to flash the board +firmware using the Freescale/NXP UUU tool. + +Connect the power supply/adaptor to the DC Power Jack (labelled ++5V). + + +Flashing +-------- + +Power up the board by switching on the Power ON Switch, which is +placed right next to the DC Jack. + +Enter the following U-Boot commands on the debug serial console: + + $ nand erase.chip + $ reset + +Flash the built images directly to board’s memory. On your computer, +run: + + $ board/bsh/imx6ulz-bsh-smm-m2/flash.sh output/ + +It will flash the bootloader, the Device Tree Blob, the kernel image +and the UBI root file system. diff --git a/buildroot/board/bsh/imx8mn-bsh-smm-s2-pro/extlinux.conf b/buildroot/board/bsh/imx8mn-bsh-smm-s2-pro/extlinux.conf new file mode 100644 index 0000000000..9111354742 --- /dev/null +++ b/buildroot/board/bsh/imx8mn-bsh-smm-s2-pro/extlinux.conf @@ -0,0 +1,4 @@ +label buildroot + kernel /boot/Image + devicetree /boot/freescale/imx8mn-bsh-smm-s2pro.dtb + append root=PARTUUID=%PARTUUID% rootwait rw diff --git a/buildroot/board/bsh/imx8mn-bsh-smm-s2-pro/flash.sh b/buildroot/board/bsh/imx8mn-bsh-smm-s2-pro/flash.sh new file mode 100755 index 0000000000..17b20f0097 --- /dev/null +++ b/buildroot/board/bsh/imx8mn-bsh-smm-s2-pro/flash.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +if [ $# -eq 0 ]; then + OUTPUT_DIR=output +else + OUTPUT_DIR=$1 +fi + +if ! test -d "${OUTPUT_DIR}" ; then + echo "ERROR: no output directory specified." + echo "Usage: $0 OUTPUT_DIR" + echo "" + echo "Arguments:" + echo " OUTPUT_DIR The Buildroot output directory." + exit 1 +fi + +IMAGES_DIR=${OUTPUT_DIR}/images + +${OUTPUT_DIR}/host/bin/uuu -v -b emmc_all \ + ${IMAGES_DIR}/flash.bin \ + ${IMAGES_DIR}/sdcard.img + diff --git a/buildroot/board/bsh/imx8mn-bsh-smm-s2-pro/genimage.cfg b/buildroot/board/bsh/imx8mn-bsh-smm-s2-pro/genimage.cfg new file mode 100644 index 0000000000..10c52548cd --- /dev/null +++ b/buildroot/board/bsh/imx8mn-bsh-smm-s2-pro/genimage.cfg @@ -0,0 +1,17 @@ +image sdcard.img { + hdimage { + partition-table-type = "gpt" + } + + partition imx-boot { + in-partition-table = "no" + image = "flash.bin" + offset = 32K + } + + partition rootfs { + offset = 8M + image = "rootfs.ext4" + partition-uuid = %PARTUUID% + } +} diff --git a/buildroot/board/bsh/imx8mn-bsh-smm-s2-pro/post-build.sh b/buildroot/board/bsh/imx8mn-bsh-smm-s2-pro/post-build.sh new file mode 100755 index 0000000000..bf8861f6a9 --- /dev/null +++ b/buildroot/board/bsh/imx8mn-bsh-smm-s2-pro/post-build.sh @@ -0,0 +1,7 @@ +#!/bin/sh +BOARD_DIR="$(dirname $0)" +PARTUUID="$($HOST_DIR/bin/uuidgen)" + +install -d "$TARGET_DIR/boot/extlinux/" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" diff --git a/buildroot/board/kontron/pitx-imx8m/post-image.sh b/buildroot/board/bsh/imx8mn-bsh-smm-s2-pro/post-image.sh similarity index 100% rename from buildroot/board/kontron/pitx-imx8m/post-image.sh rename to buildroot/board/bsh/imx8mn-bsh-smm-s2-pro/post-image.sh diff --git a/buildroot/board/bsh/imx8mn-bsh-smm-s2-pro/readme.txt b/buildroot/board/bsh/imx8mn-bsh-smm-s2-pro/readme.txt new file mode 100644 index 0000000000..5763f164fe --- /dev/null +++ b/buildroot/board/bsh/imx8mn-bsh-smm-s2-pro/readme.txt @@ -0,0 +1,73 @@ +i.MX8MN BSH SMM S2 PRO +====================== + +How to build it +--------------- + +Configure buildroot: + + $ make imx8mn_bsh_smm_s2_pro_defconfig + +Change settings to fit your needs (optional): + + $ make menuconfig + +Compile everything and build the rootfs image: + + $ make + + +Result of the build +------------------- + +After building, the output/images directory contains: + + output/images/ + ├── bl31.bin + ├── Image + ├── flash.bin + ├── ddr3* + ├── rootfs.ext2 + ├── rootfs.ext4 -> rootfs.ext2 + ├── rootfs.tar + ├── sdcard.img + ├── u-boot.bin + ├── u-boot-nodtb.bin + └── u-boot-spl.bin + + +Preparing the board +------------------- + +Plug the USB type A to micro B cable into the USB Debug +Connector (DBG UART). Use serial port settings 115200 8N1 +to access the debug console. + +Plug another USB type A to micro B cable into the USB-OTG +Connector (USB1). This connection is used to flash the board +firmware using the Freescale/NXP UUU tool. + +Connect the power supply/adaptor to the DC Power Jack (labelled ++5V). + + +Flashing the emmc card image +---------------------------- + +Power up the board by switching on the Power ON Switch, which is +placed right next to the DC Jack. + +Enter the following U-Boot commands on the debug serial console: + + $ fastboot usb 0 + +Flash the images on eMMC. On your computer, run: + + $ board/bsh/imx8mn-bsh-smm-s2-pro/flash.sh output/ + + +Booting the board +----------------- + +By default the bootloader will search for the first valid image, +starting with the internal eMMC. diff --git a/buildroot/board/bsh/imx8mn-bsh-smm-s2/flash.sh b/buildroot/board/bsh/imx8mn-bsh-smm-s2/flash.sh new file mode 100755 index 0000000000..1f343d516d --- /dev/null +++ b/buildroot/board/bsh/imx8mn-bsh-smm-s2/flash.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +if [ $# -eq 0 ]; then + OUTPUT_DIR=output +else + OUTPUT_DIR=$1 +fi + +if ! test -d "${OUTPUT_DIR}" ; then + echo "ERROR: no output directory specified." + echo "Usage: $0 OUTPUT_DIR" + echo "" + echo "Arguments:" + echo " OUTPUT_DIR The Buildroot output directory." + exit 1 +fi + +IMAGES_DIR=${OUTPUT_DIR}/images + +${OUTPUT_DIR}/host/bin/uuu -v -b ${IMAGES_DIR}/nand-full.lst \ + ${IMAGES_DIR}/flash.bin \ + ${IMAGES_DIR}/flash.bin \ + ${IMAGES_DIR}/rootfs.ubifs \ + ${IMAGES_DIR}/Image \ + ${IMAGES_DIR}/freescale/imx8mn-bsh-smm-s2.dtb + diff --git a/buildroot/board/bsh/imx8mn-bsh-smm-s2/nand-full.lst b/buildroot/board/bsh/imx8mn-bsh-smm-s2/nand-full.lst new file mode 100644 index 0000000000..c01d2d6c1d --- /dev/null +++ b/buildroot/board/bsh/imx8mn-bsh-smm-s2/nand-full.lst @@ -0,0 +1,29 @@ +# @_flash.bin | bootloader +# @_image [_flash.bin] | image burn to nand, default is the same as bootloader +# @_filesystem | filesystem to burn +# @_kernel | kernel image +# @_dtb | dtb image + +# This command will be run when ROM support stream mode +# i.MX8QXP, i.MX8QM +SDPS: boot -f _flash.bin + +FB: ucmd setenv fastboot_buffer ${loadaddr} +FB: download -f _image +# Burn image to nandfit partition if needed +FB: ucmd if env exists nandfit_part; then nand erase.part nandfit; nand write ${fastboot_buffer} nandfit ${filesize}; else true; fi; +FB: ucmd nandbcb init ${fastboot_buffer} nandboot ${filesize} + +FB[-t 10000]: ucmd ubi part nandrootfs +FB[-t 10000]: ucmd ubi create root - +FB: download -f _filesystem +FB[-t 60000]: ucmd ubi write ${loadaddr} root ${filesize} + +FB: download -f _kernel +FB[-t 10000]: ucmd nand write ${loadaddr} nandkernel ${filesize} + +FB: download -f _dtb +FB[-t 8000]: ucmd nand write ${loadaddr} nanddtb ${filesize} + +FB: reboot +FB: done diff --git a/buildroot/board/bsh/imx8mn-bsh-smm-s2/post-build.sh b/buildroot/board/bsh/imx8mn-bsh-smm-s2/post-build.sh new file mode 100755 index 0000000000..49df4cd6fb --- /dev/null +++ b/buildroot/board/bsh/imx8mn-bsh-smm-s2/post-build.sh @@ -0,0 +1,4 @@ +#!/bin/sh +BOARD_DIR="$(dirname $0)" + +cp ${BOARD_DIR}/nand-full.lst ${BINARIES_DIR} diff --git a/buildroot/board/bsh/imx8mn-bsh-smm-s2/readme.txt b/buildroot/board/bsh/imx8mn-bsh-smm-s2/readme.txt new file mode 100644 index 0000000000..6b8cd03199 --- /dev/null +++ b/buildroot/board/bsh/imx8mn-bsh-smm-s2/readme.txt @@ -0,0 +1,75 @@ +i.MX8MN BSH SMM S2 +================== + +This tutorial describes how to use the predefined Buildroot +configuration for the i.MX8MN BSH SMM S2 board. + +Building +-------- + +Configure buildroot: + + $ make imx8mn_bsh_smm_s2_defconfig + +Change settings to fit your needs (optional): + + $ make menuconfig + +Compile everything and build the rootfs image: + + $ make + + +Result of the build +------------------- + +After building, the output/images directory contains: + + output/images/ + ├── bl31.bin + ├── ddr3* + ├── flash.bin + ├── freescale/imx8mn-bsh-smm-s2.dtb + ├── Image + ├── nand-full.lst + ├── rootfs.ext2 + ├── rootfs.ext4 -> rootfs.ext2 + ├── rootfs.tar + ├── rootfs.ubifs + ├── u-boot.bin + └── u-boot-spl.bin + + +Preparing the board +------------------- + +Plug the USB type A to micro B cable into the USB Debug +Connector (DBG UART). Use serial port settings 115200 8N1 +to access the debug console. + +Plug another USB type A to micro B cable into the USB-OTG +Connector (USB1). This connection is used to flash the board +firmware using the Freescale/NXP UUU tool. + +Connect the power supply/adaptor to the DC Power Jack (labelled ++5V). + + +Flashing +-------- + +Power up the board by switching on the Power ON Switch, which is +placed right next to the DC Jack. + +Enter the following U-Boot commands on the debug serial console: + + $ nand erase.chip + $ reset + +Flash the built images directly to board’s memory. On your computer, +run: + + $ board/bsh/imx8mn-bsh-smm-s2/flash.sh output/ + +It will flash the bootloader, the Device Tree Blob, the kernel image +and the UBI root file system. diff --git a/buildroot/board/canaan/k210-soc/busybox-tiny.config b/buildroot/board/canaan/k210-soc/busybox-tiny.config new file mode 100644 index 0000000000..9db12b560a --- /dev/null +++ b/buildroot/board/canaan/k210-soc/busybox-tiny.config @@ -0,0 +1,231 @@ +# +# Additional config changes for busybox-minimal.config +# to reduce the size of the busybox executable. +# + +# +# Settings +# +# CONFIG_INCLUDE_SUSv2 is not set +# CONFIG_LONG_OPTS is not set +# CONFIG_LFS is not set +# CONFIG_FEATURE_DEVPTS is not set +# CONFIG_FEATURE_SYSLOG_INFO is not set +# CONFIG_FEATURE_SYSLOG is not set + +# +# Library Tuning +# +# CONFIG_FEATURE_RTMINMAX is not set +# CONFIG_FEATURE_RTMINMAX_USE_LIBC_DEFINITIONS is not set +# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set +CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y +# CONFIG_FEATURE_EDITING_VI is not set +# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set +# CONFIG_FEATURE_REVERSE_SEARCH is not set +# CONFIG_FEATURE_EDITING_WINCH is not set +# CONFIG_FEATURE_HWIB is not set + +# +# Archival Utilities +# +# CONFIG_ZCAT is not set +# CONFIG_BZCAT is not set +# CONFIG_LZCAT is not set +# CONFIG_XZCAT is not set +# CONFIG_UNLZOP is not set +# CONFIG_LZOPCAT is not set + +# +# Coreutils +# +# CONFIG_CKSUM is not set +# CONFIG_DOS2UNIX is not set +# CONFIG_UNIX2DOS is not set +# CONFIG_DU is not set +# CONFIG_FACTOR is not set +# CONFIG_FOLD is not set +# CONFIG_HEAD is not set +# CONFIG_INSTALL is not set +# CONFIG_LINK is not set +# CONFIG_LOGNAME is not set +# CONFIG_MD5SUM is not set +# CONFIG_SHA1SUM is not set +# CONFIG_SHA256SUM is not set +# CONFIG_SHA512SUM is not set +# CONFIG_SHA3SUM is not set +# CONFIG_MKFIFO is not set +# CONFIG_NICE is not set +# CONFIG_NL is not set +# CONFIG_NOHUP is not set +# CONFIG_OD is not set +# CONFIG_PASTE is not set +# CONFIG_SHRED is not set +# CONFIG_SORT is not set +# CONFIG_TAIL is not set +# CONFIG_TEE is not set +# CONFIG_TIMEOUT is not set +# CONFIG_TR is not set +# CONFIG_UNIQ is not set +# CONFIG_UUDECODE is not set +# CONFIG_BASE32 is not set +# CONFIG_UUENCODE is not set +# CONFIG_WC is not set +# CONFIG_WHOAMI is not set +# CONFIG_WHO is not set +# CONFIG_W is not set +# CONFIG_USERS is not set +# CONFIG_YES is not set + +# +# Common options +# +# CONFIG_FEATURE_VERBOSE is not set + +# +# Debian Utilities +# +# CONFIG_RUN_PARTS is not set +# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set +# CONFIG_FEATURE_RUN_PARTS_FANCY is not set +# CONFIG_START_STOP_DAEMON is not set +# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set +# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set +# CONFIG_WHICH is not set + +# +# klibc-utils +# +# CONFIG_NUKE is not set +# CONFIG_RESUME is not set +# CONFIG_RUN_INIT is not set + +# +# Editors +# +# CONFIG_SED is not set +CONFIG_VI=y +CONFIG_FEATURE_VI_MAX_LEN=4096 +CONFIG_FEATURE_VI_COLON=y +CONFIG_FEATURE_VI_YANKMARK=y +CONFIG_FEATURE_VI_USE_SIGNALS=y +CONFIG_FEATURE_VI_DOT_CMD=y +CONFIG_FEATURE_VI_READONLY=y +CONFIG_FEATURE_VI_SETOPTS=y +CONFIG_FEATURE_VI_SET=y +CONFIG_FEATURE_VI_WIN_RESIZE=y +CONFIG_FEATURE_VI_ASK_TERMINAL=y +CONFIG_FEATURE_VI_UNDO=y + +# +# Finding Utilities +# +CONFIG_GREP=y +# CONFIG_EGREP is not set +# CONFIG_FGREP is not set +# CONFIG_XARGS is not set + +# +# Init Utilities +# +# CONFIG_HALT is not set +# CONFIG_POWEROFF is not set +# CONFIG_FEATURE_WAIT_FOR_INIT is not set +# CONFIG_FEATURE_CALL_TELINIT is not set +# CONFIG_INIT is not set +# CONFIG_LINUXRC is not set + +# +# Login/Password Management Utilities +# +# CONFIG_FEATURE_SHADOWPASSWDS is not set +# CONFIG_USE_BB_CRYPT is not set +# CONFIG_USE_BB_CRYPT_SHA is not set +# CONFIG_ADDUSER is not set +# CONFIG_GETTY is not set +# CONFIG_LOGIN is not set +# CONFIG_PASSWD is not set + +# +# Linux System Utilities +# +# CONFIG_FALLOCATE is not set +# CONFIG_FREERAMDISK is not set +# CONFIG_FSFREEZE is not set +# CONFIG_GETOPT is not set +# CONFIG_XXD is not set +# CONFIG_MESG is not set +# CONFIG_MKE2FS is not set +# CONFIG_MKDOSFS is not set +# CONFIG_FEATURE_MOUNT_CIFS is not set +# CONFIG_FEATURE_MOUNT_FSTAB is not set +# CONFIG_FEATURE_MOUNT_OTHERTAB is not set +# CONFIG_NOLOGIN is not set +# CONFIG_LINUX32 is not set +# CONFIG_LINUX64 is not set +# CONFIG_SETPRIV is not set + +# +# Common options for mount/umount +# +# CONFIG_FEATURE_MOUNT_LOOP is not set +# CONFIG_FEATURE_MOUNT_LOOP_CREATE is not set + +# +# Miscellaneous Utilities +# +# CONFIG_BC is not set +# CONFIG_HEXEDIT is not set +# CONFIG_I2CTRANSFER is not set +# CONFIG_LSSCSI is not set +# CONFIG_MIM is not set +# CONFIG_PARTPROBE is not set +# CONFIG_SETFATTR is not set +# CONFIG_SETSERIAL is not set +# CONFIG_TS is not set + +# +# Networking Utilities +# +# CONFIG_HOSTNAME is not set +# CONFIG_DNSDOMAINNAME is not set +# CONFIG_IFCONFIG is not set +# CONFIG_IFUP is not set +# CONFIG_IFDOWN is not set +# CONFIG_IP is not set +# CONFIG_IPADDR is not set +# CONFIG_IPLINK is not set +# CONFIG_IPROUTE is not set +# CONFIG_NC is not set +# CONFIG_NETSTAT is not set +# CONFIG_PING is not set +# CONFIG_ROUTE is not set +# CONFIG_TC is not set +# CONFIG_TELNET is not set +# CONFIG_WGET is not set +# CONFIG_UDHCPC is not set + +# +# Process Utilities +# +# CONFIG_KILLALL is not set +# CONFIG_KILLALL5 is not set + +# +# Runit Utilities +# +# CONFIG_SVC is not set +# CONFIG_SVOK is not set + +# +# Shells +# +CONFIG_BASH_IS_HUSH=y +# CONFIG_BASH_IS_NONE is not set +# CONFIG_HUSH_SAVEHISTORY is not set + +# +# Options common to all shells +# +# CONFIG_FEATURE_SH_READ_FRAC is not set +# CONFIG_FEATURE_SH_EMBEDDED_SCRIPTS is not set diff --git a/buildroot/board/canaan/k210-soc/genimage.cfg b/buildroot/board/canaan/k210-soc/genimage.cfg new file mode 100644 index 0000000000..da7d5dbafb --- /dev/null +++ b/buildroot/board/canaan/k210-soc/genimage.cfg @@ -0,0 +1,30 @@ +image boot.vfat { + vfat { + file uImage { + image = "uImage" + } + + file k210.dtb { + image = "k210.dtb" + } + } + size = 4M +} + +image sdcard.img { + hdimage { + } + + partition boot { + partition-type = 0xC + image = "boot.vfat" + bootable = "true" + offset = 4M + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext2" + size = 64M + } +} diff --git a/buildroot/board/canaan/k210-soc/linux-sdcard.config b/buildroot/board/canaan/k210-soc/linux-sdcard.config new file mode 100644 index 0000000000..4b0ead78a7 --- /dev/null +++ b/buildroot/board/canaan/k210-soc/linux-sdcard.config @@ -0,0 +1,4 @@ +CONFIG_BUILTIN_DTB=n +CONFIG_SOC_CANAAN_K210_DTB_BUILTIN=n +CONFIG_SOC_CANAAN_K210_DTB_SOURCE="" +CONFIG_CMDLINE="earlycon console=ttySIF0 root=/dev/mmcblk0p2 rootwait ro" diff --git a/buildroot/board/canaan/k210-soc/patches/uboot/0001-riscv-Fix-build-against-binutils-2.38.patch b/buildroot/board/canaan/k210-soc/patches/uboot/0001-riscv-Fix-build-against-binutils-2.38.patch new file mode 100644 index 0000000000..52b496f054 --- /dev/null +++ b/buildroot/board/canaan/k210-soc/patches/uboot/0001-riscv-Fix-build-against-binutils-2.38.patch @@ -0,0 +1,58 @@ +From 0cf11f3c0478f4286adcfb09bf9137f8b00212e3 Mon Sep 17 00:00:00 2001 +From: Alexandre Ghiti +Date: Mon, 3 Oct 2022 18:07:54 +0200 +Subject: [PATCH] riscv: Fix build against binutils 2.38 + +The following description is copied from the equivalent patch for the +Linux Kernel proposed by Aurelien Jarno: + +>From version 2.38, binutils default to ISA spec version 20191213. This +means that the csr read/write (csrr*/csrw*) instructions and fence.i +instruction has separated from the `I` extension, become two standalone +extensions: Zicsr and Zifencei. As the kernel uses those instruction, +this causes the following build failure: + +arch/riscv/cpu/mtrap.S: Assembler messages: +arch/riscv/cpu/mtrap.S:65: Error: unrecognized opcode `csrr a0,scause' +arch/riscv/cpu/mtrap.S:66: Error: unrecognized opcode `csrr a1,sepc' +arch/riscv/cpu/mtrap.S:67: Error: unrecognized opcode `csrr a2,stval' +arch/riscv/cpu/mtrap.S:70: Error: unrecognized opcode `csrw sepc,a0' + +Signed-off-by: Alexandre Ghiti +Reviewed-by: Bin Meng +Tested-by: Heinrich Schuchardt +Tested-by: Heiko Stuebner +Tested-by: Christian Stewart +Reviewed-by: Rick Chen +(cherry picked from commit 1dde977518f13824b847e23275001191139bc384) +Upstream: https://gitlab.com/u-boot/u-boot/-/commit/1dde977518f13824b847e23275001191139bc384 +Signed-off-by: Romain Naour +--- + arch/riscv/Makefile | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile +index 0b80eb8d864..53d1194ffb6 100644 +--- a/arch/riscv/Makefile ++++ b/arch/riscv/Makefile +@@ -24,7 +24,16 @@ ifeq ($(CONFIG_CMODEL_MEDANY),y) + CMODEL = medany + endif + +-ARCH_FLAGS = -march=$(ARCH_BASE)$(ARCH_A)$(ARCH_C) -mabi=$(ABI) \ ++RISCV_MARCH = $(ARCH_BASE)$(ARCH_A)$(ARCH_C) ++ ++# Newer binutils versions default to ISA spec version 20191213 which moves some ++# instructions from the I extension to the Zicsr and Zifencei extensions. ++toolchain-need-zicsr-zifencei := $(call cc-option-yn, -mabi=$(ABI) -march=$(RISCV_MARCH)_zicsr_zifencei) ++ifeq ($(toolchain-need-zicsr-zifencei),y) ++ RISCV_MARCH := $(RISCV_MARCH)_zicsr_zifencei ++endif ++ ++ARCH_FLAGS = -march=$(RISCV_MARCH) -mabi=$(ABI) \ + -mcmodel=$(CMODEL) + + PLATFORM_CPPFLAGS += $(ARCH_FLAGS) +-- +2.41.0 + diff --git a/buildroot/board/canaan/k210-soc/post-build.sh b/buildroot/board/canaan/k210-soc/post-build.sh new file mode 100755 index 0000000000..5b6f56a2c5 --- /dev/null +++ b/buildroot/board/canaan/k210-soc/post-build.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +MKIMAGE=${HOST_DIR}/bin/mkimage + +# Generate u-Boot kernel image +${MKIMAGE} -A riscv -O linux -T kernel -C none \ + -a 0x80000000 -e 0x80000000 \ + -n Linux -d ${BINARIES_DIR}/loader.bin ${BINARIES_DIR}/uImage + +# Link the kernel-built board dtb file to using the k210.dtb generic +# name for use by genimage.cfg +BOARDDTBKPATH="$(grep BR2_LINUX_KERNEL_INTREE_DTS_NAME ${BR2_CONFIG} | cut -d'=' -f2 | tr -d \")" + +BOARDDTB="$(basename ${BOARDDTBKPATH})" +if [ -z "${BOARDDTB}" ]; then + echo "Board DTB file not specified" + exit 1 +fi + +BOARDDTB="${BINARIES_DIR}/${BOARDDTB}.dtb" +if [ ! -f "${BOARDDTB}" ]; then + echo "Board DTB file not found in ${BINARIES_DIR}" + exit 1 +fi + +TARGETDTB=${BINARIES_DIR}/k210.dtb +rm -f ${TARGETDTB} +ln -s ${BOARDDTB} ${TARGETDTB} diff --git a/buildroot/board/canaan/k210-soc/uboot.config b/buildroot/board/canaan/k210-soc/uboot.config new file mode 100644 index 0000000000..159085f802 --- /dev/null +++ b/buildroot/board/canaan/k210-soc/uboot.config @@ -0,0 +1 @@ +# CONFIG_WATCHDOG_AUTOSTART is not set diff --git a/buildroot/board/canaan/kd233/linux-cpio.config b/buildroot/board/canaan/kd233/linux-cpio.config new file mode 100644 index 0000000000..d5b107124a --- /dev/null +++ b/buildroot/board/canaan/kd233/linux-cpio.config @@ -0,0 +1,2 @@ +CONFIG_SOC_CANAAN_K210_DTB_BUILTIN=y +CONFIG_SOC_CANAAN_K210_DTB_SOURCE="canaan_kd233" diff --git a/buildroot/board/canaan/kd233/readme.txt b/buildroot/board/canaan/kd233/readme.txt new file mode 100644 index 0000000000..47b78fa2d7 --- /dev/null +++ b/buildroot/board/canaan/kd233/readme.txt @@ -0,0 +1,149 @@ +Canaan KD233 Board +================== + +The Canaan KD233 is a dual-core RISC-V 64-bits board based on the Canaan +Kendryte K210 SoC. + +Prerequisite +------------ + +In order to use the kflash utility to program this board, the user must have +access to the board USB serial device file. The simplest way to do this is to +add your user to the same group as this device file. Assume the device file is +/dev/ttyUSB0, first identify the device group name. In most cases, it is +either "dialout" or "uucp". Also verify that read-write access is enabled for +the group: + +``` +$ ls -l /dev/ttyUSB0 +crw-rw---- 1 root dialout 188, 0 May 26 13:48 /dev/ttyUSB0 +``` + +Then add yourself to that group (dialout in this example): + +``` +$ sudo usermod -a -G dialout $(whoami) +``` + +To enable the above, it is sometimes necessary to logout and login again. + +Buildroot Configuration +----------------------- + +Unlike other K210 based boards (Sipeed boards), U-Boot does not work on the +KD233 board due to the different wiring for the SD-Card mmc controller. As such, +the KD233 board can only be used by directly booting into Linux Kernel. + +buildroot can be configured to do so using the canaan_kd233_defconfig +configuration file. This configuration allows building a bootable kernel image +with a built-in initramfs root file system (the board SD card is not used). The +built kernel image can be flashed directly to the board ROM for direct booting. +No boot loader is required. + +Once booted, the on-board SD card can be used by Linux. + +The configuration file will also compile and install the kflash and +pyserial-miniterm host utilities to program bootable image files to the board +and open a serial terminal console. + +Direct Linux Kernel Boot +------------------------- + +Using the canaan_kd233_defconfig configuration, the bootable kernel binary image +is built as follows. + +``` +$ make canaan_kd233_defconfig +$ make +``` + +The bootable binary image is the output/images/loader.bin file. This image file +can be written to the board boot flash using the kflash utility. + +``` +$ output/host/bin/kflash -b 1500000 -p /dev/ttyUSB0 -t output/images/loader.bin +``` + +Once the kernel image file is fully programmed, a terminal console is open and +the board can be rebooted by pressing the reset button on the board (if it does +not reboot automatically). + +The output will be similar to the following. + +``` +[ 0.000000] Linux version 5.17.0 (foo@bar.com) (riscv64-buildroot-linux-uclibc-gcc.br_real (Buildroot 2022.02-560-g6a2b542a09-dirty) 10.3.0, GNU ld (GNU Binutils) 2.32) #2 SMP Thu Apr 21 16:40:44 JST 2022 +[ 0.000000] Machine model: Kendryte KD233 +[ 0.000000] earlycon: sifive0 at MMIO 0x0000000038000000 (options '115200n8') +[ 0.000000] printk: bootconsole [sifive0] enabled +[ 0.000000] Zone ranges: +[ 0.000000] DMA32 [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] Normal empty +[ 0.000000] Movable zone start for each node +[ 0.000000] Early memory node ranges +[ 0.000000] node 0: [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] Initmem setup node 0 [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] riscv: ISA extensions acdfim +[ 0.000000] riscv: ELF capabilities acdfim +[ 0.000000] percpu: max_distance=0x16000 too large for vmalloc space 0x0 +[ 0.000000] percpu: Embedded 11 pages/cpu s15264 r0 d29792 u45056 +[ 0.000000] percpu: wasting 10 pages per chunk +[ 0.000000] Built 1 zonelists, mobility grouping off. Total pages: 2020 +[ 0.000000] Kernel command line: earlycon console=ttySIF0 +[ 0.000000] Dentry cache hash table entries: 1024 (order: 1, 8192 bytes, linear) +[ 0.000000] Inode-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.000000] mem auto-init: stack:off, heap alloc:off, heap free:off +[ 0.000000] Memory: 5984K/8192K available (964K kernel code, 137K rwdata, 205K rodata, 546K init, 66K bss, 2208K reserved, 0K cma-reserved) +[ 0.000000] rcu: Hierarchical RCU implementation. +[ 0.000000] rcu: RCU calculated value of scheduler-enlistment delay is 25 jiffies. +[ 0.000000] NR_IRQS: 64, nr_irqs: 64, preallocated irqs: 0 +[ 0.000000] riscv-intc: 64 local interrupts mapped +[ 0.000000] plic: interrupt-controller@c000000: mapped 65 interrupts with 2 handlers for 4 contexts. +[ 0.000000] k210-clk: clock-controller: CPU running at 390 MHz +[ 0.000000] clint: timer@2000000: timer running at 7800000 Hz +[ 0.000000] clocksource: clint_clocksource: mask: 0xffffffffffffffff max_cycles: 0x3990be68b, max_idle_ns: 881590404272 ns +[ 0.000001] sched_clock: 64 bits at 7MHz, resolution 128ns, wraps every 4398046511054ns +[ 0.008178] Calibrating delay loop (skipped), value calculated using timer frequency.. 15.60 BogoMIPS (lpj=31200) +[ 0.018251] pid_max: default: 4096 minimum: 301 +[ 0.022861] Mount-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.029971] Mountpoint-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.040234] rcu: Hierarchical SRCU implementation. +[ 0.045110] smp: Bringing up secondary CPUs ... +[ 0.050211] smp: Brought up 1 node, 2 CPUs +[ 0.054340] devtmpfs: initialized +[ 0.070401] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 7645041785100000 ns +[ 0.079473] pinctrl core: initialized pinctrl subsystem +[ 0.117795] clocksource: Switched to clocksource clint_clocksource +[ 0.130245] workingset: timestamp_bits=62 max_order=11 bucket_order=0 +[ 0.176925] k210-sysctl 50440000.syscon: K210 system controller +[ 0.192947] k210-rst 50440000.syscon:reset-controller: K210 reset controller +[ 0.200870] cacheinfo: Unable to detect cache hierarchy for CPU 0 +[ 0.210947] i2c_dev: i2c /dev entries driver +[ 0.220535] k210-fpioa 502b0000.pinmux: K210 FPIOA pin controller +[ 0.232253] 38000000.serial: ttySIF0 at MMIO 0x38000000 (irq = 1, base_baud = 115200) is a SiFive UART v0 +[ 0.241202] printk: console [ttySIF0] enabled +[ 0.241202] printk: console [ttySIF0] enabled +[ 0.249818] printk: bootconsole [sifive0] disabled +[ 0.249818] printk: bootconsole [sifive0] disabled +[ 0.261664] panel@0 enforce active low on chipselect handle +[ 0.275950] Freeing unused kernel image (initmem) memory: 540K +[ 0.281098] This architecture does not have kernel memory protection. +[ 0.287520] Run /init as init process + __ _ + / / (_) ____ _ _ __ __ + / / | || _ \ | | | |\ \/ / + / /___| || | | || |_| | > < + /_____/|_||_| |_| \____|/_/\_\ + 64-bits RISC-V Kendryte K210 NOMMU + +/ # +``` + +To open a terminal console without re-flashing the board, the pyserial-miniterm +host tool can be used. + +``` +$ output/host/bin/pyserial-miniterm --raw --eol=LF /dev/ttyUSB0 115200 +``` + +The options "--raw" and "--eol=LF" are added here to avoid a double carriage +return each time a command is entered. diff --git a/buildroot/board/chromebook/elm/patches/linux-headers/linux-headers.hash b/buildroot/board/chromebook/elm/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/chromebook/elm/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/chromebook/elm/patches/linux/linux.hash b/buildroot/board/chromebook/elm/patches/linux/linux.hash new file mode 100644 index 0000000000..88aa603ac5 --- /dev/null +++ b/buildroot/board/chromebook/elm/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 dcdf99e43e98330d925016985bfbc7b83c66d367b714b2de0cbbfcbf83d8ca43 linux-5.10.tar.xz diff --git a/buildroot/board/chromebook/snow/linux-4.15-dts-tpm.patch b/buildroot/board/chromebook/snow/linux-4.15-dts-tpm.patch deleted file mode 100644 index c71ff1b584..0000000000 --- a/buildroot/board/chromebook/snow/linux-4.15-dts-tpm.patch +++ /dev/null @@ -1,27 +0,0 @@ -Some versions of u-boot for this Chromebook check for tpm node -in the device tree and fail badly (reboot) if it is not found. - -While not exactly correct, it is much easier to patch the mainline -device tree to match u-boot expectations than to fix u-boot on -this device. - -See https://code.google.com/p/chromium/issues/detail?id=220169 -and https://lkml.org/lkml/2013/3/4/242 - -Signed-off-by: Alex Suykov - ---- a/arch/arm/boot/dts/exynos5250-snow-common.dtsi -+++ b/arch/arm/boot/dts/exynos5250-snow-common.dtsi -@@ -466,6 +466,11 @@ - status = "okay"; - samsung,i2c-sda-delay = <100>; - samsung,i2c-max-bus-freq = <66000>; -+ -+ tpm { -+ compatible = "infineon,slb9635tt"; -+ reg = <0x20>; -+ }; - }; - - &i2c_5 { - diff --git a/buildroot/board/chromebook/snow/patches/linux-headers/linux-headers.hash b/buildroot/board/chromebook/snow/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/chromebook/snow/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/chromebook/snow/patches/linux/0001-linux-4.15-dts-tpm.patch b/buildroot/board/chromebook/snow/patches/linux/0001-linux-4.15-dts-tpm.patch new file mode 100644 index 0000000000..01f452b563 --- /dev/null +++ b/buildroot/board/chromebook/snow/patches/linux/0001-linux-4.15-dts-tpm.patch @@ -0,0 +1,30 @@ +Some versions of u-boot for this Chromebook check for tpm node +in the device tree and fail badly (reboot) if it is not found. + +While not exactly correct, it is much easier to patch the mainline +device tree to match u-boot expectations than to fix u-boot on +this device. + +See https://code.google.com/p/chromium/issues/detail?id=220169 +and https://lkml.org/lkml/2013/3/4/242 + +Signed-off-by: Alex Suykov +Upstream: Not Applicable +[yann.morin.1998@free.fr: add Upstream tag] +Signed-off-by: Yann E. MORIN + +--- a/arch/arm/boot/dts/exynos5250-snow-common.dtsi ++++ b/arch/arm/boot/dts/exynos5250-snow-common.dtsi +@@ -466,6 +466,11 @@ + status = "okay"; + samsung,i2c-sda-delay = <100>; + samsung,i2c-max-bus-freq = <66000>; ++ ++ tpm { ++ compatible = "infineon,slb9635tt"; ++ reg = <0x20>; ++ }; + }; + + &i2c_5 { + diff --git a/buildroot/board/chromebook/snow/patches/linux/linux.hash b/buildroot/board/chromebook/snow/patches/linux/linux.hash new file mode 100644 index 0000000000..1064af46aa --- /dev/null +++ b/buildroot/board/chromebook/snow/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Localy computed +sha256 5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769 linux-4.15.tar.xz diff --git a/buildroot/board/ci20/uboot-env.txt b/buildroot/board/ci20/uboot-env.txt index 3093496cc9..2d693af7b7 100644 --- a/buildroot/board/ci20/uboot-env.txt +++ b/buildroot/board/ci20/uboot-env.txt @@ -1,6 +1,6 @@ baudrate=115200 board_mfr=NP -bootargs=console=ttyS4,115200 console=tty0 mem=256M@0x0 mem=768M@0x30000000 rootwait root=/dev/mmcblk0p1 devtmpfs.mount=1 ip=dhcp +bootargs=console=ttyS4,115200 console=tty0 mem=256M@0x0 mem=768M@0x30000000 rootwait root=/dev/mmcblk0p1 devtmpfs.mount=1 bootcmd=run ethargs; ext4load mmc 0:1 0x88000000 /boot/uImage; bootm 0x88000000 bootdelay=1 ethargs=env set bootargs ${bootargs} diff --git a/buildroot/board/csky/gx6605s/gdbinit b/buildroot/board/csky/gx6605s/gdbinit deleted file mode 100644 index d602aad46d..0000000000 --- a/buildroot/board/csky/gx6605s/gdbinit +++ /dev/null @@ -1,25 +0,0 @@ -tar jtag jtag://127.0.0.1:1025 -reset - -# setup CCR (Cache Config Reg) -# 0-1:MP,2:IE,3:DE,4:WB,5:RS,6:Z,7:BE -set $cr18 = 0x7d - -# vendor custom setup, double cache line & preload -set $cr30 = 0xc - -# pin mux for serial8250 -set *(unsigned int *) 0xa030a14c |= (1 << 22) | (1 << 23) - -# pass devicetree blob -# r2 is magic -# r3 is address -set $r2 = 0x20150401 -set $r3 = 0x92000000 -restore gx6605s.dtb binary 0x92000000 - -# flush cache -set $cr17 = 0x33 - -load - diff --git a/buildroot/board/csky/gx6605s/gx6605s.dts b/buildroot/board/csky/gx6605s/gx6605s.dts deleted file mode 100644 index e4d46f59a0..0000000000 --- a/buildroot/board/csky/gx6605s/gx6605s.dts +++ /dev/null @@ -1,155 +0,0 @@ -/dts-v1/; -#include -#include - -/ { - model = "C-SKY gx6605s"; - compatible = "csky,gx6605s"; - #address-cells = <1>; - #size-cells = <1>; - - memory { - device_type = "memory"; - reg = <0x10000000 0x04000000>; - }; - - soc { - #address-cells = <1>; - #size-cells = <1>; - compatible = "simple-bus"; - ranges; - - dummy_apb: apb-clock { - compatible = "fixed-clock"; - clock-frequency = <27000000>; - clock-output-names = "dummy_apb"; - #clock-cells = <0>; - }; - - intc: interrupt-controller@500000 { - compatible = "csky,gx6605s-intc"; - reg = <0x00500000 0x400>; - interrupt-controller; - #interrupt-cells = <1>; - }; - - timer@20a000 { - compatible = "csky,gx6605s-timer"; - reg = <0x0020a000 0x400>; - clocks = <&dummy_apb>; - interrupts = <10>; - interrupt-parent = <&intc>; - }; - - ehci-hcd@900000 { - compatible = "generic-ehci"; - reg = <0x00900000 0x400>; - interrupt-parent = <&intc>; - interrupts = <59>; - }; - - ohci-hcd0@a00000 { - compatible = "generic-ohci"; - reg = <0x00a00000 0x400>; - interrupt-parent = <&intc>; - interrupts = <58>; - }; - - ohci-hcd1@b00000 { - compatible = "generic-ohci"; - reg = <0x00b00000 0x400>; - interrupt-parent = <&intc>; - interrupts = <57>; - }; - - serial@403000 { - compatible = "ns16550a"; - reg = <0x00403000 0x400>; - interrupt-parent = <&intc>; - interrupts = <15>; - clock-frequency = <29491200>; - baud = <115200>; - reg-shift = <2>; - reg-io-width = <1>; - }; - - gpio0: gpio@305000 { - compatible = "wd,mbl-gpio"; - reg-names = "dirout", "dat", "set", "clr"; - reg = <0x305000 4>, <0x305004 4>, <0x305008 4>, <0x30500c 4>; - bgpio-base = <0>; - #gpio-cells = <2>; - gpio-controller; - }; - - gpio_buttons { - compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; - poll-interval = <100>; - autorepeat; - - button0 { - label = "button8"; - linux,code = ; - gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; - }; - - button1 { - label = "button6"; - linux,code = ; - gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; - }; - - button2 { - label = "button5"; - linux,code = ; - gpios = <&gpio0 5 GPIO_ACTIVE_LOW>; - }; - - button3 { - label = "button9"; - linux,code = ; - gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; - }; - - button4 { - label = "button7"; - linux,code = ; - gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; - }; - }; - - gpio_leds { - compatible = "gpio-leds"; - - led0 { - label = "led10"; - gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; - linux,default-trigger = "heartbeat"; - }; - - led1 { - label = "led11"; - gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; - linux,default-trigger = "timer"; - }; - - led2 { - label = "led12"; - gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; - linux,default-trigger = "default-on"; - }; - - led3 { - label = "led13"; - gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; - linux,default-trigger = "default-on"; - }; - }; - }; - - chosen { - bootargs = "console=ttyS0,115200 init=/sbin/init root=/dev/sda2 rw rootwait"; - }; -}; diff --git a/buildroot/board/csky/readme.txt b/buildroot/board/csky/readme.txt deleted file mode 100644 index dc82dcc1d7..0000000000 --- a/buildroot/board/csky/readme.txt +++ /dev/null @@ -1,88 +0,0 @@ -C-SKY Development Kit - -Intro -===== - -C-SKY is a CPU Architecture from www.c-sky.com and has it own instruction set. -Just like arm and mips in linux/arch, it named as 'csky'. - -gx6605s develop board is made by Hangzhou Nationalchip and C-SKY. - -Hardware Spec: - * CPU: ck610 up to 594Mhz - * Integrate with 64MB ddr2 in SOC. - * Integrate with hardware Jtag. - * Integrate with usb-to-serial chip. - * USB ehci controller in SOC. - * Power Supply: DC 5V from two micro-usb. - -How to build it -=============== - -Configure Buildroot -------------------- - -The csky_gx6605s_defconfig configuration is a sample configuration with -all that is required to bring the gx6605s Development Board: - - $ make csky_gx6605s_defconfig - -Build everything ----------------- - -Note: you will need to have access to the network, since Buildroot will -download the packages' sources. - - $ make - -Result of the build -------------------- - -After building, you should obtain this tree: - - output/images/ - +-- vmlinux - +-- rootfs.ext2 - +-- .dtb - -How to run it -============= - -Prepare Jtag-Server -------------------- - - Download the Jtag-Server here: - - https://github.com/c-sky/tools/raw/master/DebugServerConsole-linux-x86_64-V4.2.00-20161213.tar.gz - - Go to the unpacked directory: - - $./DebugServerConsole -ddc -rstwait 1000 -prereset -port 1025 - - Perhaps you need to use "sudo", which need libusb to detect c510:b210 - - $ sudo ./DebugServerConsole -ddc -rstwait 1000 -prereset -port 1025 - -Prepare USB drive ------------------ - - You sould determine which device associated to the usb drive - carefully. eg: - - $ cat /proc/partitions - 8 48 1971712 sdd - 8 49 976720 sdd1 - - $ sudo dd if=rootfs.ext2 of=/dev/sdd1 - $ sudo sync - -Run ---- - - Plug the usb drive on gx6605s dev board. - - Setup the Console with the rate 115200/8-N-1. - - $ cd output/images - $ ../host/bin/csky-linux-gdb -x ../../board/csky/gx6605s/gdbinit vmlinux - diff --git a/buildroot/board/cubietech/cubieboard1/genimage.cfg b/buildroot/board/cubietech/cubieboard1/genimage.cfg new file mode 100644 index 0000000000..92c8677545 --- /dev/null +++ b/buildroot/board/cubietech/cubieboard1/genimage.cfg @@ -0,0 +1,16 @@ +image sdcard.img { + hdimage { + } + + partition u-boot { + in-partition-table = "no" + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + size = 1016K # 1MB - 8KB + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/buildroot/board/cubietech/cubieboard1/patches/linux-headers/linux-headers.hash b/buildroot/board/cubietech/cubieboard1/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/cubietech/cubieboard1/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/cubietech/cubieboard1/patches/linux/linux.hash b/buildroot/board/cubietech/cubieboard1/patches/linux/linux.hash new file mode 100644 index 0000000000..42d02c9f78 --- /dev/null +++ b/buildroot/board/cubietech/cubieboard1/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 c954f60197008f1e1f32a1e77293903cf3801d2543ec4bf521f5651eb7f133ce linux-6.11.6.tar.xz diff --git a/buildroot/board/cubietech/cubieboard1/patches/uboot/uboot.hash b/buildroot/board/cubietech/cubieboard1/patches/uboot/uboot.hash new file mode 100644 index 0000000000..904fa56c02 --- /dev/null +++ b/buildroot/board/cubietech/cubieboard1/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0 u-boot-2024.10.tar.bz2 diff --git a/buildroot/board/cubietech/cubieboard1/readme.txt b/buildroot/board/cubietech/cubieboard1/readme.txt new file mode 100644 index 0000000000..d5033f473f --- /dev/null +++ b/buildroot/board/cubietech/cubieboard1/readme.txt @@ -0,0 +1,32 @@ +Cubietech Cubieboard1 +===================== + +Cubieboard1 is the first generation Cubieboard from Cubietech. + +Cubietech: +http://www.cubietech.com/product-detail/cubieboard1 + +Linux Sunxi Wiki: +https://linux-sunxi.org/Cubietech_Cubieboard + +Building +-------- + +Configure and build with + + make cubieboard1_defconfig + make + +Flashing +-------- + +Flash the sdcard image onto a micro sdcard with + + dd if=output/images/sdcard.img of=/dev/sdX bs=1M conv=fsync + +Running +------- + +Connect a 3V3 serial interface to the serial header on the top side of the board +(between the USB jacks and the A10 chip). Then provide power to the board. The +interface uses 115200 baud. diff --git a/buildroot/board/cubietech/cubieboard1/rootfs_overlay/boot/extlinux/extlinux.conf b/buildroot/board/cubietech/cubieboard1/rootfs_overlay/boot/extlinux/extlinux.conf new file mode 100644 index 0000000000..2fde683f38 --- /dev/null +++ b/buildroot/board/cubietech/cubieboard1/rootfs_overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,5 @@ +DEFAULT linux +LABEL linux + KERNEL /boot/zImage + DEVICETREE /boot/sun4i-a10-cubieboard.dtb + APPEND console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p1 rootwait diff --git a/buildroot/board/firefly/roc-rk3399-pc/post-build.sh b/buildroot/board/firefly/roc-rk3399-pc/post-build.sh index 1f5ff6a611..d84a5da0b0 100755 --- a/buildroot/board/firefly/roc-rk3399-pc/post-build.sh +++ b/buildroot/board/firefly/roc-rk3399-pc/post-build.sh @@ -1,5 +1,5 @@ #!/bin/sh -BOARD_DIR="$(dirname $0)" +BOARD_DIR="$(dirname "$0")" -install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf +install -m 0644 -D "$BOARD_DIR"/extlinux.conf "$TARGET_DIR"/boot/extlinux/extlinux.conf diff --git a/buildroot/board/freescale/common/imx/genimage.cfg.template_imx9 b/buildroot/board/freescale/common/imx/genimage.cfg.template_imx9 new file mode 100644 index 0000000000..df7ddc25b7 --- /dev/null +++ b/buildroot/board/freescale/common/imx/genimage.cfg.template_imx9 @@ -0,0 +1,42 @@ +# Minimal SD card image for the NXP i.MX9 boards +# +# We mimic the .sdcard NXP's image format: +# * the SD card must have 32 kB free space at the beginning, +# * U-Boot is integrated into imx9-boot-sd.bin and is dumped as is, +# * a FAT partition at offset 8MB is containing Image and DTB files +# * a single root filesystem partition is required (ext2, ext3 or ext4) +# + +image boot.vfat { + vfat { + label = "boot" + files = { + %FILES% + } + } + + size = 64M +} + +image sdcard.img { + hdimage { + } + + partition imx-boot { + in-partition-table = "no" + image = "imx9-boot-sd.bin" + offset = %IMXOFFSET% + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + offset = 8M + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext2" + } +} diff --git a/buildroot/board/freescale/common/imx/imx8-bootloader-prepare.sh b/buildroot/board/freescale/common/imx/imx8-bootloader-prepare.sh index 56f65e3126..0f5dff674f 100755 --- a/buildroot/board/freescale/common/imx/imx8-bootloader-prepare.sh +++ b/buildroot/board/freescale/common/imx/imx8-bootloader-prepare.sh @@ -8,34 +8,75 @@ main () exit 1 fi + FIT_EXTERNAL_POSITION=0x5000 + if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y$" ${BR2_CONFIG}; then - 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 + 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 + ${HOST_DIR}/bin/mkimage -E -p ${FIT_EXTERNAL_POSITION} -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 - 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 + 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 + ${HOST_DIR}/bin/mkimage -E -p ${FIT_EXTERNAL_POSITION} -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 - 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 + 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 + ${HOST_DIR}/bin/mkimage -E -p ${FIT_EXTERNAL_POSITION} -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 - 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 + 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 + ${HOST_DIR}/bin/mkimage -E -p ${FIT_EXTERNAL_POSITION} -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 0x920000 -second_loader ${BINARIES_DIR}/u-boot.itb 0x40200000 0x60000 -out ${BINARIES_DIR}/imx8-boot-sd.bin + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8ULP=y$" "${BR2_CONFIG}"; then + SPL_LOAD_ADDR=0x22020000 + ATF_LOAD_ADDR=0x20040000 + "${HOST_DIR}/bin/mkimage_imx8" -commit > "${BINARIES_DIR}/mkimg.commit" + cat "${BINARIES_DIR}/u-boot.bin" "${BINARIES_DIR}/mkimg.commit" > "${BINARIES_DIR}/u-boot-hash.bin" + rm -f "${BINARIES_DIR}/mkimg.commit" + if grep -Eq "^BR2_TARGET_OPTEE_OS=y$" "${BR2_CONFIG}"; then + "${HOST_DIR}/bin/mkimage_imx8" -soc ULP -c -ap "${BINARIES_DIR}/bl31.bin" a35 ${ATF_LOAD_ADDR} -ap "${BINARIES_DIR}/u-boot-hash.bin" a35 0x80200000 -ap "${BINARIES_DIR}/tee.bin" a35 0xa6000000 -out "${BINARIES_DIR}/u-boot-atf-container.img" + else + "${HOST_DIR}/bin/mkimage_imx8" -soc ULP -c -ap "${BINARIES_DIR}/bl31.bin" a35 ${ATF_LOAD_ADDR} -ap "${BINARIES_DIR}/u-boot-hash.bin" a35 0x80200000 -out "${BINARIES_DIR}/u-boot-atf-container.img" + fi + if [ -e "${BINARIES_DIR}/m33_image.bin" ]; then + "${HOST_DIR}/bin/mkimage_imx8" -soc ULP -append "${BINARIES_DIR}/ahab-container.img" -c -upower "${BINARIES_DIR}/upower.bin" -m4 "${BINARIES_DIR}/m33_image.bin" 0 0x1ffc2000 -ap "${BINARIES_DIR}/u-boot-spl.bin" a35 ${SPL_LOAD_ADDR} -out "${BINARIES_DIR}/imx8-boot-sd.bin" + else + "${HOST_DIR}/bin/mkimage_imx8" -soc ULP -append "${BINARIES_DIR}/ahab-container.img" -c -upower "${BINARIES_DIR}/upower.bin" 0 0x1ffc2000 -ap "${BINARIES_DIR}/u-boot-spl.bin" a35 ${SPL_LOAD_ADDR} -out "${BINARIES_DIR}/imx8-boot-sd.bin" + fi + flashbin_size="$(wc -c "${BINARIES_DIR}/imx8-boot-sd.bin" | awk '{print $1}')" + pad_cnt=$(($((flashbin_size + 0x400 - 1)) / 0x400)) + dd if="${BINARIES_DIR}/u-boot-atf-container.img" of="${BINARIES_DIR}/imx8-boot-sd.bin" bs=1K seek=${pad_cnt} else ${HOST_DIR}/bin/mkimage_imx8 -commit > ${BINARIES_DIR}/mkimg.commit cat ${BINARIES_DIR}/u-boot.bin ${BINARIES_DIR}/mkimg.commit > ${BINARIES_DIR}/u-boot-hash.bin @@ -43,6 +84,8 @@ main () dd if=${BINARIES_DIR}/u-boot-hash.bin of=${BINARIES_DIR}/u-boot-atf.bin bs=1K seek=128 if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8=y$" ${BR2_CONFIG}; then ${HOST_DIR}/bin/mkimage_imx8 -soc QM -rev B0 -append ${BINARIES_DIR}/ahab-container.img -c -scfw ${BINARIES_DIR}/mx8qm-mek-scfw-tcm.bin -ap ${BINARIES_DIR}/u-boot-atf.bin a53 0x80000000 -out ${BINARIES_DIR}/imx8-boot-sd.bin + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8DXL=y$" ${BR2_CONFIG}; then + ${HOST_DIR}/bin/mkimage_imx8 -soc DXL -rev B0 -append ${BINARIES_DIR}/ahab-container.img -c -scfw ${BINARIES_DIR}/mx8dxl-evk-scfw-tcm.bin -ap ${BINARIES_DIR}/u-boot-atf.bin a35 0x80000000 -out ${BINARIES_DIR}/imx8-boot-sd.bin else ${HOST_DIR}/bin/mkimage_imx8 -soc QX -rev B0 -append ${BINARIES_DIR}/ahab-container.img -c -scfw ${BINARIES_DIR}/mx8qx-mek-scfw-tcm.bin -ap ${BINARIES_DIR}/u-boot-atf.bin a35 0x80000000 -out ${BINARIES_DIR}/imx8-boot-sd.bin fi @@ -51,4 +94,5 @@ main () exit $? } +set -e main $@ diff --git a/buildroot/board/freescale/common/imx/imx9-bootloader-prepare.sh b/buildroot/board/freescale/common/imx/imx9-bootloader-prepare.sh new file mode 100755 index 0000000000..8ab5a241b0 --- /dev/null +++ b/buildroot/board/freescale/common/imx/imx9-bootloader-prepare.sh @@ -0,0 +1,43 @@ +#!/usr/bin/env bash + +main () +{ + SPL_LOAD_ADDR=0x2049A000 + ATF_LOAD_ADDR=0x204E0000 + if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91=y$" "${BR2_CONFIG}"; then + SPL_LOAD_ADDR=0x204A0000 + ATF_LOAD_ADDR=0x204C0000 + fi + + 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" + + "${HOST_DIR}/bin/mkimage_imx8" -commit > "${BINARIES_DIR}/mkimg.commit" + cat "${BINARIES_DIR}/u-boot.bin" "${BINARIES_DIR}/mkimg.commit" > "${BINARIES_DIR}/u-boot-hash.bin" + rm -f "${BINARIES_DIR}/mkimg.commit" + + if grep -Eq "^BR2_TARGET_OPTEE_OS=y$" "${BR2_CONFIG}"; then + "${HOST_DIR}/bin/mkimage_imx8" -soc IMX9 -c \ + -ap "${BINARIES_DIR}/bl31.bin" a35 ${ATF_LOAD_ADDR} \ + -ap "${BINARIES_DIR}/u-boot-hash.bin" a35 0x80200000 \ + -ap "${BINARIES_DIR}/tee.bin" a35 0x96000000 \ + -out "${BINARIES_DIR}/u-boot-atf-container.img" + else + "${HOST_DIR}/bin/mkimage_imx8" -soc IMX9 -c \ + -ap "${BINARIES_DIR}/bl31.bin" a35 ${ATF_LOAD_ADDR} \ + -ap "${BINARIES_DIR}/u-boot-hash.bin" a35 0x80200000 \ + -out "${BINARIES_DIR}/u-boot-atf-container.img" + fi + + "${HOST_DIR}/bin/mkimage_imx8" -soc IMX9 -append "${BINARIES_DIR}/ahab-container.img" -c \ + -ap "${BINARIES_DIR}/u-boot-spl-ddr.bin" a35 ${SPL_LOAD_ADDR} \ + -out "${BINARIES_DIR}/imx9-boot-sd.bin" + + flashbin_size="$(wc -c "${BINARIES_DIR}/imx9-boot-sd.bin" | awk '{print $1}')" + pad_cnt=$(($((flashbin_size + 0x400 - 1)) / 0x400)) + dd if="${BINARIES_DIR}/u-boot-atf-container.img" of="${BINARIES_DIR}/imx9-boot-sd.bin" bs=1K seek=${pad_cnt} + + exit $? +} + +main "$@" diff --git a/buildroot/board/freescale/common/imx/post-image.sh b/buildroot/board/freescale/common/imx/post-image.sh index d36f82917e..a440bfb75c 100755 --- a/buildroot/board/freescale/common/imx/post-image.sh +++ b/buildroot/board/freescale/common/imx/post-image.sh @@ -7,10 +7,12 @@ # dtb_list() { - local DTB_LIST="$(sed -n 's/^BR2_LINUX_KERNEL_INTREE_DTS_NAME="\([\/a-z0-9 \-]*\)"$/\1/p' ${BR2_CONFIG})" + local DTB_LIST + + DTB_LIST="$(sed -n 's/^BR2_LINUX_KERNEL_INTREE_DTS_NAME="\([\/a-z0-9 \-]*\)"$/\1/p' "${BR2_CONFIG}")" for dt in $DTB_LIST; do - echo -n "\"`basename $dt`.dtb\", " + echo -n "\"$(basename "${dt}").dtb\", " done } @@ -21,11 +23,11 @@ dtb_list() # linux_image() { - if grep -Eq "^BR2_LINUX_KERNEL_UIMAGE=y$" ${BR2_CONFIG}; then + if grep -Eq "^BR2_LINUX_KERNEL_UIMAGE=y$" "${BR2_CONFIG}"; then echo "\"uImage\"" - elif grep -Eq "^BR2_LINUX_KERNEL_IMAGE=y$" ${BR2_CONFIG}; then + elif grep -Eq "^BR2_LINUX_KERNEL_IMAGE=y$" "${BR2_CONFIG}"; then echo "\"Image\"" - elif grep -Eq "^BR2_LINUX_KERNEL_IMAGEGZ=y$" ${BR2_CONFIG}; then + elif grep -Eq "^BR2_LINUX_KERNEL_IMAGEGZ=y$" "${BR2_CONFIG}"; then echo "\"Image.gz\"" else echo "\"zImage\"" @@ -34,25 +36,31 @@ linux_image() genimage_type() { - if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8=y$" ${BR2_CONFIG}; then + if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8=y$" "${BR2_CONFIG}"; then + echo "genimage.cfg.template_imx8" + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y$" "${BR2_CONFIG}"; then echo "genimage.cfg.template_imx8" - elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y$" ${BR2_CONFIG}; then + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y$" "${BR2_CONFIG}"; then echo "genimage.cfg.template_imx8" - elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y$" ${BR2_CONFIG}; then + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y$" "${BR2_CONFIG}"; then echo "genimage.cfg.template_imx8" - elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y$" ${BR2_CONFIG}; then + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP=y$" "${BR2_CONFIG}"; then echo "genimage.cfg.template_imx8" - elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP=y$" ${BR2_CONFIG}; then + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X=y$" "${BR2_CONFIG}"; then echo "genimage.cfg.template_imx8" - elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X=y$" ${BR2_CONFIG}; then + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8DXL=y$" "${BR2_CONFIG}"; then echo "genimage.cfg.template_imx8" - elif grep -Eq "^BR2_LINUX_KERNEL_INSTALL_TARGET=y$" ${BR2_CONFIG}; then - if grep -Eq "^BR2_TARGET_UBOOT_SPL=y$" ${BR2_CONFIG}; then + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91=y$" "${BR2_CONFIG}"; then + echo "genimage.cfg.template_imx9" + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93=y$" "${BR2_CONFIG}"; then + echo "genimage.cfg.template_imx9" + elif grep -Eq "^BR2_LINUX_KERNEL_INSTALL_TARGET=y$" "${BR2_CONFIG}"; then + if grep -Eq "^BR2_TARGET_UBOOT_SPL=y$" "${BR2_CONFIG}"; then echo "genimage.cfg.template_no_boot_part_spl" else echo "genimage.cfg.template_no_boot_part" fi - elif grep -Eq "^BR2_TARGET_UBOOT_SPL=y$" ${BR2_CONFIG}; then + elif grep -Eq "^BR2_TARGET_UBOOT_SPL=y$" "${BR2_CONFIG}"; then echo "genimage.cfg.template_spl" else echo "genimage.cfg.template" @@ -61,9 +69,9 @@ genimage_type() imx_offset() { - if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y$" ${BR2_CONFIG}; then + if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y$" "${BR2_CONFIG}"; then echo "33K" - elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y$" ${BR2_CONFIG}; then + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y$" "${BR2_CONFIG}"; then echo "33K" else echo "32K" @@ -72,29 +80,30 @@ imx_offset() uboot_image() { - if grep -Eq "^BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y$" ${BR2_CONFIG}; then + if grep -Eq "^BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y$" "${BR2_CONFIG}"; then echo "u-boot-dtb.imx" - elif grep -Eq "^BR2_TARGET_UBOOT_FORMAT_IMX=y$" ${BR2_CONFIG}; then + elif grep -Eq "^BR2_TARGET_UBOOT_FORMAT_IMX=y$" "${BR2_CONFIG}"; then echo "u-boot.imx" - elif grep -Eq "^BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y$" ${BR2_CONFIG}; then + elif grep -Eq "^BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y$" "${BR2_CONFIG}"; then echo "u-boot-dtb.img" - elif grep -Eq "^BR2_TARGET_UBOOT_FORMAT_IMG=y$" ${BR2_CONFIG}; then + elif grep -Eq "^BR2_TARGET_UBOOT_FORMAT_IMG=y$" "${BR2_CONFIG}"; then echo "u-boot.img" fi } main() { - local FILES="$(dtb_list) $(linux_image)" - local IMXOFFSET="$(imx_offset)" - local UBOOTBIN="$(uboot_image)" - local GENIMAGE_CFG="$(mktemp --suffix genimage.cfg)" - local GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" + local FILES IMXOFFSET UBOOTBIN GENIMAGE_CFG GENIMAGE_TMP + FILES="$(dtb_list) $(linux_image)" + IMXOFFSET="$(imx_offset)" + UBOOTBIN="$(uboot_image)" + GENIMAGE_CFG="$(mktemp --suffix genimage.cfg)" + GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" sed -e "s/%FILES%/${FILES}/" \ -e "s/%IMXOFFSET%/${IMXOFFSET}/" \ -e "s/%UBOOTBIN%/${UBOOTBIN}/" \ - board/freescale/common/imx/$(genimage_type) > ${GENIMAGE_CFG} + "board/freescale/common/imx/$(genimage_type)" > "${GENIMAGE_CFG}" rm -rf "${GENIMAGE_TMP}" @@ -105,9 +114,9 @@ main() --outputpath "${BINARIES_DIR}" \ --config "${GENIMAGE_CFG}" - rm -f ${GENIMAGE_CFG} + rm -f "${GENIMAGE_CFG}" exit $? } -main $@ +main "$@" diff --git a/buildroot/board/freescale/common/patches/arm-trusted-firmware/0001-feat-build-add-support-for-new-binutils-versions.patch b/buildroot/board/freescale/common/patches/arm-trusted-firmware/0001-feat-build-add-support-for-new-binutils-versions.patch new file mode 100644 index 0000000000..335c18553a --- /dev/null +++ b/buildroot/board/freescale/common/patches/arm-trusted-firmware/0001-feat-build-add-support-for-new-binutils-versions.patch @@ -0,0 +1,61 @@ +From 0f75b03c008eacb9818af3a56dc088e72a623d17 Mon Sep 17 00:00:00 2001 +From: Marco Felsch +Date: Wed, 9 Nov 2022 12:59:09 +0100 +Subject: [PATCH] feat(build): add support for new binutils versions + +Users of GNU ld (BPF) from binutils 2.39+ will observe multiple instaces +of a new warning when linking the bl*.elf in the form: + + ld.bfd: warning: stm32mp1_helper.o: missing .note.GNU-stack section implies executable stack + ld.bfd: NOTE: This behaviour is deprecated and will be removed in a future version of the linker + ld.bfd: warning: bl2.elf has a LOAD segment with RWX permissions + ld.bfd: warning: bl32.elf has a LOAD segment with RWX permissions + +These new warnings are enbaled by default to secure elf binaries: + - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=ba951afb99912da01a6e8434126b8fac7aa75107 + - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=0d38576a34ec64a1b4500c9277a8e9d0f07e6774 + +Fix it in a similar way to what the Linux kernel does, see: +https://lore.kernel.org/all/20220810222442.2296651-1-ndesaulniers@google.com/ + +Following the reasoning there, we set "-z noexecstack" for all linkers +(although LLVM's LLD defaults to it) and optional add +--no-warn-rwx-segments since this a ld.bfd related. + +Signed-off-by: Marco Felsch +Signed-off-by: Robert Schwebel +Change-Id: I9430f5fa5036ca88da46cd3b945754d62616b617 +Signed-off-by: Heiko Thiery +Upstream: https://github.com/ARM-software/arm-trusted-firmware/commit/1f49db5f25cdd4e43825c9bcc0575070b80f628c +--- + Makefile | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 1ddb7b844..470956b19 100644 +--- a/Makefile ++++ b/Makefile +@@ -416,6 +416,8 @@ endif + + GCC_V_OUTPUT := $(shell $(CC) -v 2>&1) + ++TF_LDFLAGS += -z noexecstack ++ + # LD = armlink + ifneq ($(findstring armlink,$(notdir $(LD))),) + TF_LDFLAGS += --diag_error=warning --lto_level=O1 +@@ -442,7 +444,10 @@ TF_LDFLAGS += $(subst --,-Xlinker --,$(TF_LDFLAGS_$(ARCH))) + + # LD = gcc-ld (ld) or llvm-ld (ld.lld) or other + else +-TF_LDFLAGS += --fatal-warnings -O1 ++# With ld.bfd version 2.39 and newer new warnings are added. Skip those since we ++# are not loaded by a elf loader. ++TF_LDFLAGS += $(call ld_option, --no-warn-rwx-segments) ++TF_LDFLAGS += -O1 + TF_LDFLAGS += --gc-sections + # ld.lld doesn't recognize the errata flags, + # therefore don't add those in that case +-- +2.30.2 + diff --git a/buildroot/board/freescale/common/patches/arm-trusted-firmware/0002-LF-7968-01-fix-Makefile-Suppress-array-bounds-error.patch b/buildroot/board/freescale/common/patches/arm-trusted-firmware/0002-LF-7968-01-fix-Makefile-Suppress-array-bounds-error.patch new file mode 100644 index 0000000000..7a7a7bbc28 --- /dev/null +++ b/buildroot/board/freescale/common/patches/arm-trusted-firmware/0002-LF-7968-01-fix-Makefile-Suppress-array-bounds-error.patch @@ -0,0 +1,51 @@ +From b2a94de52ae4a940a87d569815b19d3fa92dd32a Mon Sep 17 00:00:00 2001 +From: Tom Hochstein +Date: Mon, 16 May 2022 13:45:16 -0500 +Subject: [PATCH] LF-7968-01 fix(Makefile): Suppress array-bounds error + +The array-bounds error is triggered now in cases where it was silent +before, causing errors like: + +``` +plat/imx/imx8m/hab.c: In function 'imx_hab_handler': +plat/imx/imx8m/hab.c:64:57: error: array subscript 0 is outside array bounds of 'uint32_t[0]' {aka 'unsigned int[]'} [-Werror=array-bounds] + 64 | #define HAB_RVT_CHECK_TARGET_ARM64 ((unsigned long)*(uint32_t *)(HAB_RVT_BASE + 0x18)) + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +``` + +The error is a false-positive and is entered as a bug [1]. The problem +is fixed partially in GCC 12 and fully in GCC 13 [2]. + +The partial fix does not work here because the constant addresses used +are less than the 4kB boundary chosen for the partial fix, so suppress +the error until GCC is upgraded to 13. + +[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99578 +[2] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99578#c39 + +Upstream-Status: Inappropriate [other] +Signed-off-by: Tom Hochstein +Signed-off-by: Jacky Bai +Reviewed-by: Ye Li +Signed-off-by: Brandon Maier +Upstream: https://github.com/nxp-imx/imx-atf/commit/058bf0f104115037d03e277f079825ef3659c5b9 +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index c87c3ae08..2d6b90f47 100644 +--- a/Makefile ++++ b/Makefile +@@ -346,7 +346,7 @@ WARNINGS += -Wshift-overflow -Wshift-sign-overflow \ + endif + + ifneq (${E},0) +-ERRORS := -Werror ++ERRORS := -Werror -Wno-error=array-bounds + endif + + CPPFLAGS = ${DEFINES} ${INCLUDES} ${MBEDTLS_INC} -nostdinc \ +-- +2.41.0 + diff --git a/buildroot/board/freescale/imx25pdk/readme.txt b/buildroot/board/freescale/imx25pdk/readme.txt deleted file mode 100644 index 1aece6c9b3..0000000000 --- a/buildroot/board/freescale/imx25pdk/readme.txt +++ /dev/null @@ -1,54 +0,0 @@ -************************** -Freescale i.MX25 PDK board -************************** - -This file documents the Buildroot support for the Freescale i.MX25 PDK board. - -Build -===== - -First, configure Buildroot for the i.MX25 PDK board: - - make mx25pdk_defconfig - -Build all components: - - make - -You will find in output/images/ the following files: - - imx25-pdk.dtb - - rootfs.ext4 - - rootfs.tar - - sdcard.img - - u-boot.imx - - zImage - -Create a bootable SD card -========================= - -To determine the device associated to the SD card have a look in the -/proc/partitions file: - - cat /proc/partitions - -Buildroot prepares a bootable "sdcard.img" image in the output/images/ -directory, ready to be dumped on a SD card. Launch the following -command as root: - - dd if=output/images/sdcard.img of=/dev/ - -*** WARNING! This will destroy all the card content. Use with care! *** - -For details about the medium image layout, see the definition in -board/freescale/common/imx/genimage.cfg.template. - -Boot the i.MX25 PDK board -========================= - -To boot your newly created system: -- insert the SD card in the SD slot of the board; -- put a USB cable into the Debug USB Port and connect using a terminal - emulator at 115200 bps, 8n1; -- power on the board. - -Enjoy! diff --git a/buildroot/board/freescale/imx28evk/readme.txt b/buildroot/board/freescale/imx28evk/readme.txt index 2920cb04cd..3b77634fe1 100644 --- a/buildroot/board/freescale/imx28evk/readme.txt +++ b/buildroot/board/freescale/imx28evk/readme.txt @@ -54,4 +54,4 @@ Enjoy! References ========== -[1] http://cache.freescale.com/files/32bit/doc/user_guide/EVK_imx28_QuickStart.pdf +[1] https://www.nxp.com/docs/en/user-guide/EVK_imx28_QuickStart.pdf diff --git a/buildroot/board/freescale/imx51evk/patches/linux-headers/linux-headers.hash b/buildroot/board/freescale/imx51evk/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/freescale/imx51evk/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/freescale/imx51evk/patches/linux/linux.hash b/buildroot/board/freescale/imx51evk/patches/linux/linux.hash new file mode 100644 index 0000000000..fdda2dfdaa --- /dev/null +++ b/buildroot/board/freescale/imx51evk/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From: https://mirrors.edge.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc +sha256 9c36b243e8c3ec1d5963366618f336710b84340bf95be2037b26c452392cb2d6 linux-5.10.218.tar.xz diff --git a/buildroot/board/freescale/imx51evk/patches/uboot/uboot.hash b/buildroot/board/freescale/imx51evk/patches/uboot/uboot.hash new file mode 100644 index 0000000000..716b56e14d --- /dev/null +++ b/buildroot/board/freescale/imx51evk/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally computed: +sha256 b407e1510a74e863b8b5cb42a24625344f0e0c2fc7582d8c866bd899367d0454 u-boot-2021.01.tar.bz2 diff --git a/buildroot/board/freescale/imx6sabre/patches/linux-headers/linux-headers.hash b/buildroot/board/freescale/imx6sabre/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/freescale/imx6sabre/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/freescale/imx6sabre/patches/linux/linux.hash b/buildroot/board/freescale/imx6sabre/patches/linux/linux.hash new file mode 100644 index 0000000000..3c4223976b --- /dev/null +++ b/buildroot/board/freescale/imx6sabre/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 c70adedadce88f8685cb26d9703b930292c1349138e2c55ed9b4cd6e277de3bd linux-imx-lf-6.6.23-2.0.0.tar.gz diff --git a/buildroot/board/freescale/imx6sabre/patches/uboot/0001-mx6qsabre_common-boot-Linux-to-init-in-mfgtools-mode.patch b/buildroot/board/freescale/imx6sabre/patches/uboot/0001-mx6qsabre_common-boot-Linux-to-init-in-mfgtools-mode.patch index a9f88c2645..cbcb7c73fb 100644 --- a/buildroot/board/freescale/imx6sabre/patches/uboot/0001-mx6qsabre_common-boot-Linux-to-init-in-mfgtools-mode.patch +++ b/buildroot/board/freescale/imx6sabre/patches/uboot/0001-mx6qsabre_common-boot-Linux-to-init-in-mfgtools-mode.patch @@ -1,4 +1,4 @@ -From e9a88fddc149fc52cdc5a8997f9fd3a29416c643 Mon Sep 17 00:00:00 2001 +From 221b57404b29190e0b37f03b81dd3ee6a0fc9ce0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= Date: Tue, 12 Aug 2014 10:17:31 +0200 Subject: [PATCH] mx6qsabre_common: boot Linux to /init in mfgtools mode @@ -15,17 +15,20 @@ buildroot system entirely through USB. Signed-off-by: Vincent Stehlé Signed-off-by: Julien Olivain +[Julien: rebased patch on lf-6.6.23-2.0.0] +Signed-off-by: Julien Olivain +Upstream: Not applicable, Buildroot specific. --- include/configs/imx_env.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/imx_env.h b/include/configs/imx_env.h -index c03748d93f..aa1a8bf488 100644 +index 1b34478fc3f..9106d59ff9f 100644 --- a/include/configs/imx_env.h +++ b/include/configs/imx_env.h -@@ -29,7 +29,7 @@ +@@ -54,7 +54,7 @@ - #define CONFIG_MFG_ENV_SETTINGS_DEFAULT \ + #define CFG_MFG_ENV_SETTINGS_DEFAULT \ "mfgtool_args=setenv bootargs console=${console},${baudrate} " \ - "rdinit=/linuxrc " \ + "rdinit=/init " \ @@ -33,5 +36,5 @@ index c03748d93f..aa1a8bf488 100644 "\0" \ "kboot="MFG_BOOT_CMD"\0"\ -- -2.26.2 +2.45.2 diff --git a/buildroot/board/freescale/imx6sabre/patches/uboot/uboot.hash b/buildroot/board/freescale/imx6sabre/patches/uboot/uboot.hash new file mode 100644 index 0000000000..4e0d729ca0 --- /dev/null +++ b/buildroot/board/freescale/imx6sabre/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 179b6531ef1d4ce681d139741ac7b4144220c90b7223297df28b61e98e8d37fc uboot-imx-lf-6.6.23-2.0.0.tar.gz diff --git a/buildroot/board/freescale/imx6sabre/readme.txt b/buildroot/board/freescale/imx6sabre/readme.txt index 4b8db5233a..320ee463e2 100644 --- a/buildroot/board/freescale/imx6sabre/readme.txt +++ b/buildroot/board/freescale/imx6sabre/readme.txt @@ -8,15 +8,15 @@ as well as the Freescale SABRE Board for Automotive Infotainment. Read the i.MX 6 SABRESD Quick Start Guide for an introduction to the board: -http://cache.freescale.com/files/32bit/doc/quick_start_guide/SABRESDB_IMX6_QSG.pdf +https://www.nxp.com/files-static/32bit/doc/quick_start_guide/SABRESDB_IMX6_QSG.pdf Read the i.MX 6 SoloX SABRESD Quick Start Guide for an introduction to the board: -http://cache.freescale.com/files/32bit/doc/user_guide/IMX6SOLOXQSG.pdf +https://www.nxp.com/files-static/32bit/doc/quick_start_guide/IMX6SOLOXQSG.pdf Read the SABRE for Automotive Infotainment Quick Start Guide for an introduction to the board: -http://cache.freescale.com/files/32bit/doc/user_guide/IMX6SABREINFOQSG.pdf +https://www.nxp.com/webapp/Download?colCode=IMX6SABREINFOQSG Building with NXP kernel and NXP U-Boot ======================================= @@ -166,6 +166,6 @@ Enjoy! References ========== -https://community.freescale.com/docs/DOC-95015 -https://community.freescale.com/docs/DOC-95017 -https://community.freescale.com/docs/DOC-99218 +https://community.nxp.com/docs/DOC-95015 +https://community.nxp.com/docs/DOC-95017 +https://community.nxp.com/docs/DOC-99218 diff --git a/buildroot/board/freescale/imx6ulevk/readme.txt b/buildroot/board/freescale/imx6ulevk/readme.txt index 90355f354f..5a5b4ae5a3 100644 --- a/buildroot/board/freescale/imx6ulevk/readme.txt +++ b/buildroot/board/freescale/imx6ulevk/readme.txt @@ -12,7 +12,7 @@ Build First, configure Buildroot for your i.MX6UL EVK board: -In order to to do so there are two supported options: +In order to do so there are two supported options: make freescale_imx6ulevk_defconfig @@ -71,4 +71,4 @@ Enjoy! References ========== -[1] http://cache.freescale.com/files/32bit/doc/quick_start_guide/IMX6ULTRALITEQSG.pdf +[1] https://www.nxp.com/webapp/Download?colCode=IMX6ULTRALITEQSG diff --git a/buildroot/board/freescale/imx6ullevk/linux_sdma.fragment b/buildroot/board/freescale/imx6ullevk/linux_sdma.fragment new file mode 100644 index 0000000000..6f1c8b4313 --- /dev/null +++ b/buildroot/board/freescale/imx6ullevk/linux_sdma.fragment @@ -0,0 +1 @@ +CONFIG_IMX_SDMA=m diff --git a/buildroot/board/freescale/imx6ullevk/patches/linux-headers/linux-headers.hash b/buildroot/board/freescale/imx6ullevk/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/freescale/imx6ullevk/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/freescale/imx6ullevk/patches/linux/linux.hash b/buildroot/board/freescale/imx6ullevk/patches/linux/linux.hash new file mode 100644 index 0000000000..3c4223976b --- /dev/null +++ b/buildroot/board/freescale/imx6ullevk/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 c70adedadce88f8685cb26d9703b930292c1349138e2c55ed9b4cd6e277de3bd linux-imx-lf-6.6.23-2.0.0.tar.gz diff --git a/buildroot/board/freescale/imx6ullevk/patches/uboot/uboot.hash b/buildroot/board/freescale/imx6ullevk/patches/uboot/uboot.hash new file mode 100644 index 0000000000..4e0d729ca0 --- /dev/null +++ b/buildroot/board/freescale/imx6ullevk/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 179b6531ef1d4ce681d139741ac7b4144220c90b7223297df28b61e98e8d37fc uboot-imx-lf-6.6.23-2.0.0.tar.gz diff --git a/buildroot/board/freescale/imx6ullevk/readme.txt b/buildroot/board/freescale/imx6ullevk/readme.txt index 77acec2615..dc7c5f3678 100644 --- a/buildroot/board/freescale/imx6ullevk/readme.txt +++ b/buildroot/board/freescale/imx6ullevk/readme.txt @@ -9,7 +9,7 @@ Build First, configure Buildroot for your i.MX6ULL EVK board: -In order to to do so there are two supported options: +In order to do so there are two supported options: make freescale_imx6ullevk_defconfig diff --git a/buildroot/board/freescale/imx7dsdb/patches/linux-headers/linux-headers.hash b/buildroot/board/freescale/imx7dsdb/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/freescale/imx7dsdb/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/freescale/imx7dsdb/patches/linux/linux.hash b/buildroot/board/freescale/imx7dsdb/patches/linux/linux.hash new file mode 100644 index 0000000000..3c4223976b --- /dev/null +++ b/buildroot/board/freescale/imx7dsdb/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 c70adedadce88f8685cb26d9703b930292c1349138e2c55ed9b4cd6e277de3bd linux-imx-lf-6.6.23-2.0.0.tar.gz diff --git a/buildroot/board/freescale/imx7dsdb/patches/uboot/uboot.hash b/buildroot/board/freescale/imx7dsdb/patches/uboot/uboot.hash new file mode 100644 index 0000000000..4e0d729ca0 --- /dev/null +++ b/buildroot/board/freescale/imx7dsdb/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 179b6531ef1d4ce681d139741ac7b4144220c90b7223297df28b61e98e8d37fc uboot-imx-lf-6.6.23-2.0.0.tar.gz diff --git a/buildroot/board/freescale/imx8dxlevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/buildroot/board/freescale/imx8dxlevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 0000000000..0266b45d6a --- /dev/null +++ b/buildroot/board/freescale/imx8dxlevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 37f0dee8b3b52d6c7f8a46c3bdd4138b528f9cc607015400e7cad0c206df41d7 imx-atf-lf-6.6.23-2.0.0.tar.gz diff --git a/buildroot/board/freescale/imx8dxlevk/patches/linux-headers/linux-headers.hash b/buildroot/board/freescale/imx8dxlevk/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/freescale/imx8dxlevk/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/freescale/imx8dxlevk/patches/linux/linux.hash b/buildroot/board/freescale/imx8dxlevk/patches/linux/linux.hash new file mode 100644 index 0000000000..3c4223976b --- /dev/null +++ b/buildroot/board/freescale/imx8dxlevk/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 c70adedadce88f8685cb26d9703b930292c1349138e2c55ed9b4cd6e277de3bd linux-imx-lf-6.6.23-2.0.0.tar.gz diff --git a/buildroot/board/freescale/imx8dxlevk/patches/uboot/uboot.hash b/buildroot/board/freescale/imx8dxlevk/patches/uboot/uboot.hash new file mode 100644 index 0000000000..4e0d729ca0 --- /dev/null +++ b/buildroot/board/freescale/imx8dxlevk/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 179b6531ef1d4ce681d139741ac7b4144220c90b7223297df28b61e98e8d37fc uboot-imx-lf-6.6.23-2.0.0.tar.gz diff --git a/buildroot/board/freescale/imx8dxlevk/readme.txt b/buildroot/board/freescale/imx8dxlevk/readme.txt new file mode 100644 index 0000000000..33ceb66931 --- /dev/null +++ b/buildroot/board/freescale/imx8dxlevk/readme.txt @@ -0,0 +1,69 @@ +****************************** +Freescale i.MX8DXL WEVK board +****************************** + +This file documents the Buildroot support for the Freescale i.MX8DXL WEVK +board. + +Build +===== + +First, configure Buildroot for the i.MX8DXL WEVK board: + + make freescale_imx8dxlevk_defconfig + +Build all components: + + make + +You will find in output/images/ the following files: + - ahab-container.img + - bl31.bin + - boot.vfat + - Image + - imx8-boot-sd.bin + - imx8dxl-evk.dtb + - mkimg.commit + - mx8dxl-ddr3-evk-scfw-tcm.bin + - mx8dxl-evk-scfw-tcm.bin + - mx8dxl-phantom-mek-scfw-tcm.bin + - mx8dxl-val-scfw-tcm.bin + - rootfs.ext2 + - rootfs.ext4 + - rootfs.tar + - sdcard.img + - u-boot-atf.bin + - u-boot.bin + - u-boot-hash.bin + +Create a bootable SD card +========================= + +To determine the device associated to the SD card have a look in the +/proc/partitions file: + + cat /proc/partitions + +Buildroot prepares a bootable "sdcard.img" image in the output/images/ +directory, ready to be dumped on a SD card. Launch the following +command as root: + + dd if=output/images/sdcard.img of=/dev/ + +*** WARNING! This will destroy all the card content. Use with care! *** + +For details about the medium image layout, see the definition in +board/freescale/common/imx/genimage.cfg.template_imx8. + +Boot the i.MX8DXL WEVK board +============================ + +To boot your newly created system: +- insert the SD card in the SD slot of the board; +- Configure the boot switch as follows: +SW1: ON ON OFF OFF +- put a micro USB cable into the Debug USB Port and connect using a terminal + emulator at 115200 bps, 8n1; +- power on the board. + +Enjoy! diff --git a/buildroot/board/freescale/imx8mmevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/buildroot/board/freescale/imx8mmevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 0000000000..0266b45d6a --- /dev/null +++ b/buildroot/board/freescale/imx8mmevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 37f0dee8b3b52d6c7f8a46c3bdd4138b528f9cc607015400e7cad0c206df41d7 imx-atf-lf-6.6.23-2.0.0.tar.gz diff --git a/buildroot/board/freescale/imx8mmevk/patches/linux-headers/linux-headers.hash b/buildroot/board/freescale/imx8mmevk/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/freescale/imx8mmevk/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/freescale/imx8mmevk/patches/linux/linux.hash b/buildroot/board/freescale/imx8mmevk/patches/linux/linux.hash new file mode 100644 index 0000000000..3c4223976b --- /dev/null +++ b/buildroot/board/freescale/imx8mmevk/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 c70adedadce88f8685cb26d9703b930292c1349138e2c55ed9b4cd6e277de3bd linux-imx-lf-6.6.23-2.0.0.tar.gz diff --git a/buildroot/board/freescale/imx8mmevk/patches/uboot/uboot.hash b/buildroot/board/freescale/imx8mmevk/patches/uboot/uboot.hash new file mode 100644 index 0000000000..4e0d729ca0 --- /dev/null +++ b/buildroot/board/freescale/imx8mmevk/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 179b6531ef1d4ce681d139741ac7b4144220c90b7223297df28b61e98e8d37fc uboot-imx-lf-6.6.23-2.0.0.tar.gz diff --git a/buildroot/board/freescale/imx8mnevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/buildroot/board/freescale/imx8mnevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 0000000000..0266b45d6a --- /dev/null +++ b/buildroot/board/freescale/imx8mnevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 37f0dee8b3b52d6c7f8a46c3bdd4138b528f9cc607015400e7cad0c206df41d7 imx-atf-lf-6.6.23-2.0.0.tar.gz diff --git a/buildroot/board/freescale/imx8mnevk/patches/linux-headers/linux-headers.hash b/buildroot/board/freescale/imx8mnevk/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/freescale/imx8mnevk/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/freescale/imx8mnevk/patches/linux/linux.hash b/buildroot/board/freescale/imx8mnevk/patches/linux/linux.hash new file mode 100644 index 0000000000..3c4223976b --- /dev/null +++ b/buildroot/board/freescale/imx8mnevk/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 c70adedadce88f8685cb26d9703b930292c1349138e2c55ed9b4cd6e277de3bd linux-imx-lf-6.6.23-2.0.0.tar.gz diff --git a/buildroot/board/freescale/imx8mnevk/patches/uboot/uboot.hash b/buildroot/board/freescale/imx8mnevk/patches/uboot/uboot.hash new file mode 100644 index 0000000000..4e0d729ca0 --- /dev/null +++ b/buildroot/board/freescale/imx8mnevk/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 179b6531ef1d4ce681d139741ac7b4144220c90b7223297df28b61e98e8d37fc uboot-imx-lf-6.6.23-2.0.0.tar.gz diff --git a/buildroot/board/freescale/imx8mpevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/buildroot/board/freescale/imx8mpevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 0000000000..0266b45d6a --- /dev/null +++ b/buildroot/board/freescale/imx8mpevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 37f0dee8b3b52d6c7f8a46c3bdd4138b528f9cc607015400e7cad0c206df41d7 imx-atf-lf-6.6.23-2.0.0.tar.gz diff --git a/buildroot/board/freescale/imx8mpevk/patches/linux-headers/linux-headers.hash b/buildroot/board/freescale/imx8mpevk/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/freescale/imx8mpevk/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/freescale/imx8mpevk/patches/linux/linux.hash b/buildroot/board/freescale/imx8mpevk/patches/linux/linux.hash new file mode 100644 index 0000000000..3c4223976b --- /dev/null +++ b/buildroot/board/freescale/imx8mpevk/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 c70adedadce88f8685cb26d9703b930292c1349138e2c55ed9b4cd6e277de3bd linux-imx-lf-6.6.23-2.0.0.tar.gz diff --git a/buildroot/board/freescale/imx8mpevk/patches/uboot/uboot.hash b/buildroot/board/freescale/imx8mpevk/patches/uboot/uboot.hash new file mode 100644 index 0000000000..4e0d729ca0 --- /dev/null +++ b/buildroot/board/freescale/imx8mpevk/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 179b6531ef1d4ce681d139741ac7b4144220c90b7223297df28b61e98e8d37fc uboot-imx-lf-6.6.23-2.0.0.tar.gz diff --git a/buildroot/board/freescale/imx8mpevk/uboot-fragment.config b/buildroot/board/freescale/imx8mpevk/uboot-fragment.config new file mode 100644 index 0000000000..b4683be9ef --- /dev/null +++ b/buildroot/board/freescale/imx8mpevk/uboot-fragment.config @@ -0,0 +1,3 @@ +# Use the upstream devicetree name for EVK board +# Revert https://github.com/nxp-imx/uboot-imx/commit/a60e787a6e35b9c14c391e03d41468e4ad63d598 +CONFIG_DEFAULT_FDT_FILE="imx8mp-evk.dtb" diff --git a/buildroot/board/freescale/imx8mqevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/buildroot/board/freescale/imx8mqevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 0000000000..0266b45d6a --- /dev/null +++ b/buildroot/board/freescale/imx8mqevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 37f0dee8b3b52d6c7f8a46c3bdd4138b528f9cc607015400e7cad0c206df41d7 imx-atf-lf-6.6.23-2.0.0.tar.gz diff --git a/buildroot/board/freescale/imx8mqevk/patches/linux-headers/linux-headers.hash b/buildroot/board/freescale/imx8mqevk/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/freescale/imx8mqevk/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/freescale/imx8mqevk/patches/linux/linux.hash b/buildroot/board/freescale/imx8mqevk/patches/linux/linux.hash new file mode 100644 index 0000000000..3c4223976b --- /dev/null +++ b/buildroot/board/freescale/imx8mqevk/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 c70adedadce88f8685cb26d9703b930292c1349138e2c55ed9b4cd6e277de3bd linux-imx-lf-6.6.23-2.0.0.tar.gz diff --git a/buildroot/board/freescale/imx8mqevk/patches/uboot/uboot.hash b/buildroot/board/freescale/imx8mqevk/patches/uboot/uboot.hash new file mode 100644 index 0000000000..4e0d729ca0 --- /dev/null +++ b/buildroot/board/freescale/imx8mqevk/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 179b6531ef1d4ce681d139741ac7b4144220c90b7223297df28b61e98e8d37fc uboot-imx-lf-6.6.23-2.0.0.tar.gz diff --git a/buildroot/board/freescale/imx8qmmek/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/buildroot/board/freescale/imx8qmmek/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 0000000000..0266b45d6a --- /dev/null +++ b/buildroot/board/freescale/imx8qmmek/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 37f0dee8b3b52d6c7f8a46c3bdd4138b528f9cc607015400e7cad0c206df41d7 imx-atf-lf-6.6.23-2.0.0.tar.gz diff --git a/buildroot/board/freescale/imx8qmmek/patches/linux-headers/linux-headers.hash b/buildroot/board/freescale/imx8qmmek/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/freescale/imx8qmmek/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/freescale/imx8qmmek/patches/linux/linux.hash b/buildroot/board/freescale/imx8qmmek/patches/linux/linux.hash new file mode 100644 index 0000000000..3c4223976b --- /dev/null +++ b/buildroot/board/freescale/imx8qmmek/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 c70adedadce88f8685cb26d9703b930292c1349138e2c55ed9b4cd6e277de3bd linux-imx-lf-6.6.23-2.0.0.tar.gz diff --git a/buildroot/board/freescale/imx8qmmek/patches/uboot/uboot.hash b/buildroot/board/freescale/imx8qmmek/patches/uboot/uboot.hash new file mode 100644 index 0000000000..4e0d729ca0 --- /dev/null +++ b/buildroot/board/freescale/imx8qmmek/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 179b6531ef1d4ce681d139741ac7b4144220c90b7223297df28b61e98e8d37fc uboot-imx-lf-6.6.23-2.0.0.tar.gz diff --git a/buildroot/board/freescale/imx8qxpmek/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/buildroot/board/freescale/imx8qxpmek/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 0000000000..0266b45d6a --- /dev/null +++ b/buildroot/board/freescale/imx8qxpmek/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 37f0dee8b3b52d6c7f8a46c3bdd4138b528f9cc607015400e7cad0c206df41d7 imx-atf-lf-6.6.23-2.0.0.tar.gz diff --git a/buildroot/board/freescale/imx8qxpmek/patches/linux-headers/linux-headers.hash b/buildroot/board/freescale/imx8qxpmek/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/freescale/imx8qxpmek/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/freescale/imx8qxpmek/patches/linux/linux.hash b/buildroot/board/freescale/imx8qxpmek/patches/linux/linux.hash new file mode 100644 index 0000000000..3c4223976b --- /dev/null +++ b/buildroot/board/freescale/imx8qxpmek/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 c70adedadce88f8685cb26d9703b930292c1349138e2c55ed9b4cd6e277de3bd linux-imx-lf-6.6.23-2.0.0.tar.gz diff --git a/buildroot/board/freescale/imx8qxpmek/patches/uboot/uboot.hash b/buildroot/board/freescale/imx8qxpmek/patches/uboot/uboot.hash new file mode 100644 index 0000000000..4e0d729ca0 --- /dev/null +++ b/buildroot/board/freescale/imx8qxpmek/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 179b6531ef1d4ce681d139741ac7b4144220c90b7223297df28b61e98e8d37fc uboot-imx-lf-6.6.23-2.0.0.tar.gz diff --git a/buildroot/board/freescale/imx93evk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/buildroot/board/freescale/imx93evk/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 0000000000..0266b45d6a --- /dev/null +++ b/buildroot/board/freescale/imx93evk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 37f0dee8b3b52d6c7f8a46c3bdd4138b528f9cc607015400e7cad0c206df41d7 imx-atf-lf-6.6.23-2.0.0.tar.gz diff --git a/buildroot/board/freescale/imx93evk/patches/linux-headers/linux-headers.hash b/buildroot/board/freescale/imx93evk/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/freescale/imx93evk/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/freescale/imx93evk/patches/linux/linux.hash b/buildroot/board/freescale/imx93evk/patches/linux/linux.hash new file mode 100644 index 0000000000..3c4223976b --- /dev/null +++ b/buildroot/board/freescale/imx93evk/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 c70adedadce88f8685cb26d9703b930292c1349138e2c55ed9b4cd6e277de3bd linux-imx-lf-6.6.23-2.0.0.tar.gz diff --git a/buildroot/board/freescale/imx93evk/patches/uboot/uboot.hash b/buildroot/board/freescale/imx93evk/patches/uboot/uboot.hash new file mode 100644 index 0000000000..4e0d729ca0 --- /dev/null +++ b/buildroot/board/freescale/imx93evk/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 179b6531ef1d4ce681d139741ac7b4144220c90b7223297df28b61e98e8d37fc uboot-imx-lf-6.6.23-2.0.0.tar.gz diff --git a/buildroot/board/freescale/imx93evk/readme.txt b/buildroot/board/freescale/imx93evk/readme.txt new file mode 100644 index 0000000000..1173de39db --- /dev/null +++ b/buildroot/board/freescale/imx93evk/readme.txt @@ -0,0 +1,77 @@ +********************* +NXP i.MX93 EVK board +********************* + +This file documents the Buildroot support for the i.MX 93 EVK board. + +Build +===== + +First, configure Buildroot for the i.MX 93 EVK board: + + make freescale_imx93evk_defconfig + +Build all components: + + make + +You will find in output/images/ the following files: + - ahab-container.img + - bl31.bin + - boot.vfat + - ddr_fw.bin + - Image + - imx93-11x11-evk.dtb + - imx9-boot-sd.bin + - lpddr4_pmu_train_fw.bin + - rootfs.ext2 + - rootfs.ext4 + - rootfs.tar + - sdcard.img + - u-boot-atf-container.img + - u-boot.bin + - u-boot-hash.bin + - u-boot-spl.bin + - u-boot-spl-ddr.bin + - u-boot-spl-padded.bin + +Create a bootable SD card +========================= + +To determine the device associated to the SD card have a look in the +/proc/partitions file: + + cat /proc/partitions + +Buildroot prepares a bootable "sdcard.img" image in the output/images/ +directory, ready to be dumped on a SD card. Launch the following +command as root: + + dd if=output/images/sdcard.img of=/dev/ + +*** WARNING! This will destroy all the card content. Use with care! *** + +For details about the medium image layout, see the definition in +board/freescale/common/imx/genimage.cfg.template_imx9. + +Boot the i.MX 93 EVK board +=============================== + +To boot your newly created system (refer to the i.MX 93 EVK Documentation +[1] for guidance): +- insert the SD card in the SD slot of the board; +- Configure the switches as follows: +SW1301: 0100 SW1301[1-4] +- put a micro USB cable into the Debug USB Port and connect using a terminal + emulator at 115200 bps, 8n1; +- power on the board. + +Note: the debug USB connector presents 4 UARTs (for example /dev/ttyUSB[0-3]), +the Cortex-A55 UART should be the 3rd one (in the previous example, /dev/ttyUSB2). +Refer to the documentation [1] for more details. + +Enjoy! + +References +========== +[1] https://www.nxp.com/document/guide/getting-started-with-the-i-mx93-evk:GS-IMX93EVK diff --git a/buildroot/board/freescale/imxrt1050evk/genimage.cfg b/buildroot/board/freescale/imxrt1050evk/genimage.cfg new file mode 100644 index 0000000000..64fc8452f8 --- /dev/null +++ b/buildroot/board/freescale/imxrt1050evk/genimage.cfg @@ -0,0 +1,40 @@ +image boot.vfat { + vfat { + files = { + "zImage", + "imxrt1050-evk.dtb", + } + } + + size = 8M +} + +image sdcard.img { + hdimage { + } + + partition SPL { + in-partition-table = "no" + image = "SPL" + offset = 1K + size = 127K + } + + partition u-boot { + in-partition-table = "no" + image = "u-boot.img" + offset = 128K + size = 512K + } + + partition boot { + partition-type = 0xc + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/buildroot/board/freescale/imxrt1050evk/readme.txt b/buildroot/board/freescale/imxrt1050evk/readme.txt new file mode 100644 index 0000000000..1fc4edd88b --- /dev/null +++ b/buildroot/board/freescale/imxrt1050evk/readme.txt @@ -0,0 +1,30 @@ +NXP i.MXRT1050 EVK board +------------------------ + +i.MX RT1050 are NXP's crossover MCUs. They combine the high performance and high +level of integration of an applications processors with the ease-of-use and +real-time functionality of a microcontroller. The i.MX RT1050 MCU runs on the Arm +Cortex-M7 core at 600 MHz. +https://www.nxp.com/design/development-boards/i-mx-evaluation-and-development-boards/i-mx-rt1050-evaluation-kit:MIMXRT1050-EVK + +To build a minimal support for this board: + +$ make imxrt1050-evk_defconfig +$ make + +Buildroot prepares a bootable "sdcard.img" image in the output/images/ +directory, ready to be flashed into the SD card: + +$ dd if=output/images/sdcard.img of=/dev/sdX +Where 'sdX' is the device node of the uSD. + +Jumper settings: + + SW7: 1 0 1 0 + +Where 0 means bottom position and 1 means top position (from the +switch label numbers reference). + +Connect the USB cable between the EVK and the PC for the console. + +Insert the micro SD card in the board, power it up and U-Boot messages should come up. diff --git a/buildroot/board/freescale/imxrt1050evk/uboot.fragment b/buildroot/board/freescale/imxrt1050evk/uboot.fragment new file mode 100644 index 0000000000..dd45ca4c29 --- /dev/null +++ b/buildroot/board/freescale/imxrt1050evk/uboot.fragment @@ -0,0 +1,2 @@ +CONFIG_USE_BOOTCOMMAND=y +CONFIG_BOOTCOMMAND="setenv bootargs console=ttyLP0 root=/dev/mmcblk0p2 rw earlycon rootwait;load mmc 0:1 0x80800000 imxrt1050-evk.dtb;load mmc 0:1 0x80000000 zImage;bootz 0x80000000 - 0x80800000" diff --git a/buildroot/board/freescale/ls1028ardb/genimage.cfg b/buildroot/board/freescale/ls1028ardb/genimage.cfg new file mode 100644 index 0000000000..3efef0bffc --- /dev/null +++ b/buildroot/board/freescale/ls1028ardb/genimage.cfg @@ -0,0 +1,23 @@ +image sdcard.img { + hdimage { + } + + partition fsbl { + offset = 4K + in-partition-table = "no" + image = "bl2_sd.pbl" + } + + partition ssbl { + offset = 1M + in-partition-table = "no" + image = "fip.bin" + } + + partition rootfs { + offset = 8M + partition-type = 0x83 + bootable = "true" + image = "rootfs.ext4" + } +} diff --git a/buildroot/board/freescale/ls1028ardb/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/buildroot/board/freescale/ls1028ardb/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 0000000000..f9af28ab3c --- /dev/null +++ b/buildroot/board/freescale/ls1028ardb/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 4f4dc78bfb5b7391a65ae0f83856661071f666ac2bf6a9380fddbe376a8bdaaa atf-lf-6.6.23-2.0.0.tar.gz diff --git a/buildroot/board/freescale/ls1028ardb/patches/linux-headers/linux-headers.hash b/buildroot/board/freescale/ls1028ardb/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/freescale/ls1028ardb/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/freescale/ls1028ardb/patches/linux/linux.hash b/buildroot/board/freescale/ls1028ardb/patches/linux/linux.hash new file mode 100644 index 0000000000..e038c22862 --- /dev/null +++ b/buildroot/board/freescale/ls1028ardb/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 6d592722e004516309f8ce33e654f1322e4d1f0f33567acb86ca19229176fd9e linux-lf-6.6.23-2.0.0.tar.gz diff --git a/buildroot/board/freescale/ls1028ardb/patches/uboot/uboot.hash b/buildroot/board/freescale/ls1028ardb/patches/uboot/uboot.hash new file mode 100644 index 0000000000..a5ccd82b2b --- /dev/null +++ b/buildroot/board/freescale/ls1028ardb/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 a2bcd7a34d4908ffbadfea731d0f0fd20f19a31cff6ff6310980e7f6743ceb24 u-boot-lf-6.6.23-2.0.0.tar.gz diff --git a/buildroot/board/freescale/ls1028ardb/readme.txt b/buildroot/board/freescale/ls1028ardb/readme.txt new file mode 100644 index 0000000000..6633d60b90 --- /dev/null +++ b/buildroot/board/freescale/ls1028ardb/readme.txt @@ -0,0 +1,87 @@ +************** +NXP LS1028ARDB +************** + +This file documents the Buildroot support for the LS1028A Reference Design Board. + +for more details about the board and the QorIQ Layerscape SoC, see the following pages: + - https://www.nxp.com/design/qoriq-developer-resources/layerscape-ls1028a-reference-design-board:LS1028ARDB + - https://www.nxp.com/LS1028A + +for the software NXP LSDK (Layerscape Software Development Kit), see + - https://www.nxp.com/docs/en/user-guide/LSDKUG_Rev21.08.pdf + +the components from NXP are: + - rcw, lf-6.6.23-2.0.0 + - atf (fork), lf-6.6.23-2.0.0 + - uboot (fork), lf-6.6.23-2.0.0 + - cadence-dp-firmware (blob), LSDK 20.12 + - linux (fork), lf-6.6.23-2.0.0 + +Build +===== + +First, configure Buildroot for the LS1028ARDB board: + + make ls1028ardb_defconfig + +Build all components: + + make + +You will find in output/images/ the following files: + - bl2_sd.pbl + - fip.bin + - fsl-ls1028a-rdb.dtb + - Image + - PBL.bin + - rootfs.ext2 + - rootfs.ext4 -> rootfs.ext2 + - sdcard.img + - u-boot.bin + +Create a bootable SD card +========================= + +To determine the device associated to the SD card have a look in the +/proc/partitions file: + + cat /proc/partitions + +Buildroot prepares a bootable "sdcard.img" image in the output/images/ +directory, ready to be dumped on a SD card. Launch the following +command as root: + + dd if=output/images/sdcard.img of=/dev/sdX + +*** WARNING! This will destroy all the card content. Use with care! *** + +For details about the medium image layout, see the definition in +board/freescale/ls1028ardb/genimage.cfg. + +Boot the LS1028ARDB board +========================= + +To boot your newly created system: +- insert the SD card in the SD slot of the board; +- Configure the switches SW2[1:4] = 1000 (select SD Card boot option) +- put a DB9F cable into the UART1 Port and connect using a terminal + emulator at 115200 bps, 8n1; +- power on the board. + +The Cadence DP (Display Port) firmware must loaded from uboot with the following commands: + + => ext2load mmc 0 0x80000000 /boot/ls1028a-dp-fw.bin + 102464 bytes read in 24 ms (4.1 MiB/s) + => hdp load 0x80000000 0x2000 + Loading hdp firmware from 0x0000000080000000 offset 0x0000000000002000 + Loading hdp firmware Complete + => boot + +The interfaces of Ethernet switch (Felix DSA) are bring up with the following commands: + + ip link set eno2 up + ip link set swp0 up + ip link set swp1 up + ip link set swp2 up + ip link set swp3 up diff --git a/buildroot/board/freescale/ls1028ardb/rootfs_overlay/boot/extlinux/extlinux.conf b/buildroot/board/freescale/ls1028ardb/rootfs_overlay/boot/extlinux/extlinux.conf new file mode 100644 index 0000000000..bd6c7c95c3 --- /dev/null +++ b/buildroot/board/freescale/ls1028ardb/rootfs_overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label ls1028ardb-buildroot + kernel /boot/Image + devicetree /boot/fsl-ls1028a-rdb.dtb + append root=/dev/mmcblk0p1 rootwait video=1920x1080-32@60 cma=256M diff --git a/buildroot/board/freescale/ls1028ardb/rootfs_overlay/etc/udev/rules.d/73-fsl-enetc-networking.rules b/buildroot/board/freescale/ls1028ardb/rootfs_overlay/etc/udev/rules.d/73-fsl-enetc-networking.rules new file mode 100644 index 0000000000..19f41634bd --- /dev/null +++ b/buildroot/board/freescale/ls1028ardb/rootfs_overlay/etc/udev/rules.d/73-fsl-enetc-networking.rules @@ -0,0 +1,16 @@ +# ENETC rules +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.0", DRIVERS=="fsl_enetc", NAME:="eno0" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.1", DRIVERS=="fsl_enetc", NAME:="eno1" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.2", DRIVERS=="fsl_enetc", NAME:="eno2" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.6", DRIVERS=="fsl_enetc", NAME:="eno3" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:01.0", DRIVERS=="fsl_enetc_vf", NAME:="eno0vf0" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:01.1", DRIVERS=="fsl_enetc_vf", NAME:="eno0vf1" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:01.2", DRIVERS=="fsl_enetc_vf", NAME:="eno1vf0" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:01.3", DRIVERS=="fsl_enetc_vf", NAME:="eno1vf1" +# LS1028 switch rules +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.5", DRIVERS=="mscc_felix", ATTR{phys_port_name}=="p0", NAME="swp0" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.5", DRIVERS=="mscc_felix", ATTR{phys_port_name}=="p1", NAME="swp1" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.5", DRIVERS=="mscc_felix", ATTR{phys_port_name}=="p2", NAME="swp2" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.5", DRIVERS=="mscc_felix", ATTR{phys_port_name}=="p3", NAME="swp3" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.5", DRIVERS=="mscc_felix", ATTR{phys_port_name}=="p4", NAME="swp4" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.5", DRIVERS=="mscc_felix", ATTR{phys_port_name}=="p5", NAME="swp5" diff --git a/buildroot/board/freescale/ls1046a-frwy/genimage.cfg b/buildroot/board/freescale/ls1046a-frwy/genimage.cfg new file mode 100644 index 0000000000..63cca042b2 --- /dev/null +++ b/buildroot/board/freescale/ls1046a-frwy/genimage.cfg @@ -0,0 +1,29 @@ +image sdcard.img { + hdimage { + } + + partition fsbl { + offset = 4K + in-partition-table = "no" + image = "bl2_sd.pbl" + } + + partition ssbl { + offset = 1M + in-partition-table = "no" + image = "fip.bin" + } + + partition fman { + offset = 9M + in-partition-table = "no" + image = "fsl_fman_ucode_ls1046_r1.0_106_4_18.bin" + } + + partition rootfs { + offset = 16M + partition-type = 0x83 + bootable = "true" + image = "rootfs.ext4" + } +} diff --git a/buildroot/board/freescale/ls1046a-frwy/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/buildroot/board/freescale/ls1046a-frwy/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 0000000000..f9af28ab3c --- /dev/null +++ b/buildroot/board/freescale/ls1046a-frwy/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 4f4dc78bfb5b7391a65ae0f83856661071f666ac2bf6a9380fddbe376a8bdaaa atf-lf-6.6.23-2.0.0.tar.gz diff --git a/buildroot/board/freescale/ls1046a-frwy/patches/linux-headers/linux-headers.hash b/buildroot/board/freescale/ls1046a-frwy/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/freescale/ls1046a-frwy/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/freescale/ls1046a-frwy/patches/linux/linux.hash b/buildroot/board/freescale/ls1046a-frwy/patches/linux/linux.hash new file mode 100644 index 0000000000..e038c22862 --- /dev/null +++ b/buildroot/board/freescale/ls1046a-frwy/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 6d592722e004516309f8ce33e654f1322e4d1f0f33567acb86ca19229176fd9e linux-lf-6.6.23-2.0.0.tar.gz diff --git a/buildroot/board/freescale/ls1046a-frwy/patches/uboot/uboot.hash b/buildroot/board/freescale/ls1046a-frwy/patches/uboot/uboot.hash new file mode 100644 index 0000000000..a5ccd82b2b --- /dev/null +++ b/buildroot/board/freescale/ls1046a-frwy/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 a2bcd7a34d4908ffbadfea731d0f0fd20f19a31cff6ff6310980e7f6743ceb24 u-boot-lf-6.6.23-2.0.0.tar.gz diff --git a/buildroot/board/freescale/ls1046a-frwy/readme.txt b/buildroot/board/freescale/ls1046a-frwy/readme.txt new file mode 100644 index 0000000000..4d1e0e1dcd --- /dev/null +++ b/buildroot/board/freescale/ls1046a-frwy/readme.txt @@ -0,0 +1,90 @@ +************** +NXP LS1046A-FRWY +************** + +This file documents the Buildroot support for the LS1046A Freeway Board. + +for more details about the board and the QorIQ Layerscape SoC, see the following pages: + - https://www.nxp.com/design/software/qoriq-developer-resources/ls1046a-freeway-board:FRWY-LS1046A + - https://www.nxp.com/FRWY-LS1046A + - https://www.nxp.com/docs/en/quick-reference-guide/FRWY-LS1046AGSG.pdf + +for the software NXP LSDK (Layerscape Software Development Kit), see + - https://www.nxp.com/docs/en/user-guide/LSDKUG_Rev21.08.pdf + +the components from NXP are: + - rcw, lf-6.6.23-2.0.0 + - atf (fork), lf-6.6.23-2.0.0 + - uboot (fork), lf-6.6.23-2.0.0 + - qoriq-fm-ucode (blob), lf-6.6.23-2.0.0 + - linux (fork), lf-6.6.23-2.0.0 + +Build +===== + +First, configure Buildroot for the LS1046A-FRWY board: + + make ls1046a-frwy_defconfig + +Build all components: + + make + +You will find in output/images/ the following files: + - bl2_sd.pbl + - fip.bin + - fsl_fman_ucode_ls1046_r1.0_106_4_18.bin + - fsl_fman_ucode_ls1046_r1.0_108_4_9.bin + - fsl-ls1046a-frwy.dtb + - fsl-ls1046a-frwy-sdk.dtb + - Image + - PBL.bin + - rootfs.ext2 + - rootfs.ext4 + - sdcard.img + - u-boot.bin + +Create a bootable SD card +========================= + +To determine the device associated to the SD card have a look in the +/proc/partitions file: + + cat /proc/partitions + +Buildroot prepares a bootable "sdcard.img" image in the output/images/ +directory, ready to be dumped on a SD card. Launch the following +command as root: + + dd if=output/images/sdcard.img of=/dev/sdX + +*** WARNING! This will destroy all the card content. Use with care! *** + +For details about the medium image layout, see the definition in +board/freescale/ls1046a-frwy/genimage.cfg. + +Boot the LS1046A-FRWY board +========================= + +To boot your newly created system: +- insert the SD card in the SD slot of the board; +- Configure the switches SW1[1:9] = 0_0100_0000 (select SD Card boot option) +- put a Micro-USB cable into UART1 Port and connect using a terminal emulator + at 115200 bps, 8n1. Or remove the jumper on J72, connect a USB to TTL cable + to J73, and connect using a terminal emualtor at 115200 bps, 8n1. +- power on the board. + +The front panel Ethernet connectors are off at boot, to bring them up run the +following commands. + +1G PORT1 + ip link set eth1 up + +1G PORT2 + ip link set eth2 up + +1G PORT3 + ip link set eth0 up + +1G PORT4 + ip link set eth3 up diff --git a/buildroot/board/freescale/ls1046a-frwy/rootfs_overlay/boot/extlinux/extlinux.conf b/buildroot/board/freescale/ls1046a-frwy/rootfs_overlay/boot/extlinux/extlinux.conf new file mode 100644 index 0000000000..536d62b6c5 --- /dev/null +++ b/buildroot/board/freescale/ls1046a-frwy/rootfs_overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label ls1046afrwy-buildroot + kernel /boot/Image + devicetree /boot/fsl-ls1046a-frwy-sdk.dtb + append console=ttyS0,115200 root=/dev/mmcblk0p1 earlycon=uart8250,mmio,0x21c0500 rootwait diff --git a/buildroot/board/freescale/warpboard/README b/buildroot/board/freescale/warpboard/README deleted file mode 100644 index 67d4e044e9..0000000000 --- a/buildroot/board/freescale/warpboard/README +++ /dev/null @@ -1,77 +0,0 @@ -Build -===== - -First, configure Buildroot for your WarpBoard. - make warpboard_defconfig - -Build all components: - make - -You will find in ./output/images/ the following files: - - imx6sl-warp.dtb - - rootfs.ext4 - - rootfs.tar - - sdcard.img - - u-boot.imx - - zImage - -Update uboot -============ - -- Put warpboard in USB download mode by closing the j2 jumper on the - daugther board - -- Load u-boot.imx in the WarpBoard by using the imx-usb-loader host utility: - - $ ./output/host/bin/imx_usb -c output/host/etc/imx-loader.d/ output/images/u-boot.imx - -- U-Boot will appear in minicom - -- Reset the U-Boot environment to its default: - => env default -f -a - => saveenv - -- Run the DFU command in U-Boot: - => dfu 0 mmc 0 - -- Transfer U-Boot into flash by running this command in host side: - - $ sudo ./output/host/bin/dfu-util -D output/images/u-boot.imx -a boot - -- remove power and put the WarpBoard back into normal boot mode by - opening the j2 jumper. - -Update linux & rootfs -===================== - -Run the 'ums' command from the U-Boot prompt to mount the eMMC as USB mass -storage: - -=> ums 0 mmc 0 - -And then flash the sdcard.img into the eMMC: - - dd if=output/images/sdcard.img of=/dev/ - -*** WARNING! This will destroy all the eMMC content. Use it with care! *** - -Using bluetooth -================ - -Enable the bluez_utils or bluez5_utils package, and then run: - -$ hciattach /dev/ttymxc4 any -$ hciconfig hci0 up - -Using Wifi -========== - -# modprobe brcmfmac -# iwconfig wlan0 essid ACCESSPOINTNAME -# wpa_passphrase ACCESSPOINTNAME > /etc/wpa.conf -(enter the wifi password and press enter) -# wpa_supplicant -Dwext -iwlan0 -c /etc/wpa.conf & -# udhcpc -i wlan0 -# ping buildroot.org - -Enjoy! diff --git a/buildroot/board/freescale/warpboard/linux.fragment b/buildroot/board/freescale/warpboard/linux.fragment deleted file mode 100644 index 892d0cb7b9..0000000000 --- a/buildroot/board/freescale/warpboard/linux.fragment +++ /dev/null @@ -1 +0,0 @@ -CONFIG_CFG80211_WEXT=y diff --git a/buildroot/board/freescale/warpboard/rootfs_overlay/lib/firmware/brcm/brcmfmac4330-sdio.txt b/buildroot/board/freescale/warpboard/rootfs_overlay/lib/firmware/brcm/brcmfmac4330-sdio.txt deleted file mode 100644 index 9546246b91..0000000000 --- a/buildroot/board/freescale/warpboard/rootfs_overlay/lib/firmware/brcm/brcmfmac4330-sdio.txt +++ /dev/null @@ -1,40 +0,0 @@ -# bcm94330wlsdgb.txt -manfid=0x2d0 -prodid=0x0552 -vendid=0x14e4 -devid=0x4360 -boardtype=0x0552 -boardrev=0x11 -# this design has 2.4GHz SP3T switch -boardflags=0x00080200 -nocrc=1 -xtalfreq=37400 -boardnum=22 -macaddr=00:90:4c:c5:12:38 -ag0=255 -aa2g=1 -ccode=CN -pa0b0=0x14d0 -pa0b1=0xfd98 -pa0b2=0xff78 -rssismf2g=0xa -rssismc2g=0x3 -rssisav2g=0x7 -maxp2ga0=0x50 -sromrev=3 -il0macaddr=00:90:4c:c5:12:38 -wl0id=0x431b -cckPwrOffset=5 -ofdm2gpo=0x66666666 -mcs2gpo0=0x6666 -mcs2gpo1=0x6666 -swctrlmap_2g=0x04040404,0x02020202,0x02020404,0x10202,0x1ff -swctrlmap_5g=0x00100010,0x00280020,0x00200010,0x14202,0x2f8 -rfreg033=0x19 -rfreg033_cck=0x1f -dacrate2g=160 -txalpfbyp2g=1 -bphyscale=17 -cckPwrIdxCorr=-15 -pacalidx2g=45 -txgaintbl=1 diff --git a/buildroot/board/friendlyarm/nanopc-t4/extlinux.conf b/buildroot/board/friendlyarm/nanopc-t4/extlinux.conf deleted file mode 100644 index 31c6b30d32..0000000000 --- a/buildroot/board/friendlyarm/nanopc-t4/extlinux.conf +++ /dev/null @@ -1,4 +0,0 @@ -label RK3399_NanoPC_T4 linux - kernel /Image - devicetree /rk3399-nanopc-t4.dtb - append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk1p4 rootwait diff --git a/buildroot/board/friendlyarm/nanopc-t4/genimage.cfg b/buildroot/board/friendlyarm/nanopc-t4/genimage.cfg deleted file mode 100644 index 98dc2f3892..0000000000 --- a/buildroot/board/friendlyarm/nanopc-t4/genimage.cfg +++ /dev/null @@ -1,39 +0,0 @@ -image boot.vfat { - 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 - } - - partition loader2 { - image = "u-boot.itb" - offset = 8M - } - - partition boot { - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b - bootable = "true" - image = "boot.vfat" - offset = 16M - } - - partition rootfs { - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae - image = "rootfs.ext4" - } -} diff --git a/buildroot/board/friendlyarm/nanopc-t4/post-build.sh b/buildroot/board/friendlyarm/nanopc-t4/post-build.sh deleted file mode 100755 index ba29375c05..0000000000 --- a/buildroot/board/friendlyarm/nanopc-t4/post-build.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" - -install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf diff --git a/buildroot/board/friendlyarm/nanopc-t4/readme.txt b/buildroot/board/friendlyarm/nanopc-t4/readme.txt deleted file mode 100644 index 0989c6cc1e..0000000000 --- a/buildroot/board/friendlyarm/nanopc-t4/readme.txt +++ /dev/null @@ -1,45 +0,0 @@ -FriendlyARM NANOPC-T4 -===================== - -Build: - - $ make friendlyarm_nanopc_t4_defconfig - $ make - -Files created in output directory -================================= - -output/images - -├── bl31.elf -├── boot.vfat -├── extlinux -├── idbloader.img -├── Image -├── rk3399-nanopc-t4.dtb -├── rootfs.ext2 -├── rootfs.ext4 -> rootfs.ext2 -├── rootfs.tar -├── sdcard.img -├── u-boot.bin -└── u-boot.itb - -Creating bootable SD card: -========================== - -Simply invoke (as root) - -sudo dd if=output/images/sdcard.img of=/dev/sdX && sync - -Where X is your SD card device - -Serial console --------------- - -Baudrate for this board is 1500000 - -Login: ------- -Apply power and press the PWR button for 3 sec. Enter 'root' as login user, and the prompt is ready. - -https://wiki.amarulasolutions.com/bsp/rockchip/rk3399/npc_t4.html diff --git a/buildroot/board/friendlyarm/nanopi-a64/boot.cmd b/buildroot/board/friendlyarm/nanopi-a64/boot.cmd deleted file mode 100644 index 446bd85672..0000000000 --- a/buildroot/board/friendlyarm/nanopi-a64/boot.cmd +++ /dev/null @@ -1,6 +0,0 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r Image -fatload mmc 0 $fdt_addr_r sun50i-a64-nanopi-a64.dtb - -booti $kernel_addr_r - $fdt_addr_r diff --git a/buildroot/board/friendlyarm/nanopi-a64/genimage.cfg b/buildroot/board/friendlyarm/nanopi-a64/genimage.cfg deleted file mode 100644 index 6907314149..0000000000 --- a/buildroot/board/friendlyarm/nanopi-a64/genimage.cfg +++ /dev/null @@ -1,40 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "sun50i-a64-nanopi-a64.dtb", - "boot.scr" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - } - - partition spl { - in-partition-table = "no" - image = "sunxi-spl.bin" - offset = 8K - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot.itb" - offset = 40K - size = 1M # 1MB - 40KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/buildroot/board/friendlyarm/nanopi-a64/readme.txt b/buildroot/board/friendlyarm/nanopi-a64/readme.txt deleted file mode 100644 index 88c4e661cb..0000000000 --- a/buildroot/board/friendlyarm/nanopi-a64/readme.txt +++ /dev/null @@ -1,37 +0,0 @@ -Intro -===== - -This default configuration will allow you to start experimenting with the -buildroot environment for the Nanopi A64. With the current configuration -it will bring-up the board, and allow access through the serial console. - -Nanopi A64 link: -http://nanopi.io/nanopi-a64.html - -Wiki link: -https://openedev.amarulasolutions.com/display/ODWIKI/FriendlyARM+Nanopi+A64 - -This configuration uses U-Boot mainline and kernel mainline. - -How to build -============ - - $ make friendlyarm_nanopi_a64_defconfig - $ make - -Note: you will need access to the internet to download the required -sources. - -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 A64 and power it up. The console -is on the serial line, 115200 8N1. diff --git a/buildroot/board/friendlyarm/nanopi-m1-plus/boot.cmd b/buildroot/board/friendlyarm/nanopi-m1-plus/boot.cmd deleted file mode 100644 index 35a1d65d3d..0000000000 --- a/buildroot/board/friendlyarm/nanopi-m1-plus/boot.cmd +++ /dev/null @@ -1,8 +0,0 @@ -setenv fdt_high ffffffff - -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-h3-nanopi-m1-plus.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/buildroot/board/friendlyarm/nanopi-m1-plus/genimage.cfg b/buildroot/board/friendlyarm/nanopi-m1-plus/genimage.cfg deleted file mode 100644 index 5257cf89c7..0000000000 --- a/buildroot/board/friendlyarm/nanopi-m1-plus/genimage.cfg +++ /dev/null @@ -1,36 +0,0 @@ -# Minimal SD card image for the NanoPi M1 Plus -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h3-nanopi-m1-plus.dtb", - "boot.scr" - } - } - - size = 10M -} - -image sdcard.img { - hdimage { - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - size = 1016K # 1MB - 8KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/buildroot/board/friendlyarm/nanopi-m1-plus/readme.txt b/buildroot/board/friendlyarm/nanopi-m1-plus/readme.txt deleted file mode 100644 index 0327dec80e..0000000000 --- a/buildroot/board/friendlyarm/nanopi-m1-plus/readme.txt +++ /dev/null @@ -1,29 +0,0 @@ -NanoPi M1 Plus - -Intro -===== - -This default configuration will allow you to start experimenting with the -buildroot environment for the NanoPi M1 Plus. With the current configuration -it will bring-up the board, and allow access through the serial console. - -How to build it -=============== - -Configure Buildroot: - - $ make friendlyarm_nanopi_m1_plus_defconfig - -Compile everything and build the SD card image: - - $ make - -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 diff --git a/buildroot/board/friendlyarm/nanopi-m1/boot.cmd b/buildroot/board/friendlyarm/nanopi-m1/boot.cmd deleted file mode 100644 index b4d612ede7..0000000000 --- a/buildroot/board/friendlyarm/nanopi-m1/boot.cmd +++ /dev/null @@ -1,8 +0,0 @@ -setenv fdt_high ffffffff - -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-h3-nanopi-m1.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/buildroot/board/friendlyarm/nanopi-m1/genimage.cfg b/buildroot/board/friendlyarm/nanopi-m1/genimage.cfg deleted file mode 100644 index 3b2b82ce96..0000000000 --- a/buildroot/board/friendlyarm/nanopi-m1/genimage.cfg +++ /dev/null @@ -1,37 +0,0 @@ -# Minimal SD card image for the NanoPi M1 -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h3-nanopi-m1.dtb", - "boot.scr" - } - } - - size = 10M -} - -image sdcard.img { - hdimage { - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - size = 1016K # 1MB - 8KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - size = 512M - } -} diff --git a/buildroot/board/friendlyarm/nanopi-m1/readme.txt b/buildroot/board/friendlyarm/nanopi-m1/readme.txt deleted file mode 100644 index 6a34c4239d..0000000000 --- a/buildroot/board/friendlyarm/nanopi-m1/readme.txt +++ /dev/null @@ -1,29 +0,0 @@ -NanoPi M1 - -Intro -===== - -This default configuration will allow you to start experimenting with the -buildroot environment for the NanoPi M1. With the current configuration -it will bring-up the board, and allow access through the serial console. - -How to build it -=============== - -Configure Buildroot: - - $ make friendlyarm_nanopi_m1_defconfig - -Compile everything and build the SD card image: - - $ make - -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 diff --git a/buildroot/board/friendlyarm/nanopi-m4/extlinux.conf b/buildroot/board/friendlyarm/nanopi-m4/extlinux.conf deleted file mode 100644 index fb24f09eb1..0000000000 --- a/buildroot/board/friendlyarm/nanopi-m4/extlinux.conf +++ /dev/null @@ -1,4 +0,0 @@ -label RK3399_NANOPI_M4 linux - kernel /Image - devicetree /rk3399-nanopi-m4.dtb - append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk1p4 rw rootwait diff --git a/buildroot/board/friendlyarm/nanopi-m4/genimage.cfg b/buildroot/board/friendlyarm/nanopi-m4/genimage.cfg deleted file mode 100644 index 8d0e6ad13b..0000000000 --- a/buildroot/board/friendlyarm/nanopi-m4/genimage.cfg +++ /dev/null @@ -1,39 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "rk3399-nanopi-m4.dtb", - "extlinux" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - partition-table-type = "gpt" - } - - partition loader1 { - image = "idbloader.img" - offset = 32K - } - - partition loader2 { - image = "u-boot.itb" - offset = 8M - } - - partition boot { - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b - bootable = "true" - image = "boot.vfat" - offset = 16M - } - - partition rootfs { - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae - image = "rootfs.ext4" - } -} diff --git a/buildroot/board/friendlyarm/nanopi-m4/post-build.sh b/buildroot/board/friendlyarm/nanopi-m4/post-build.sh deleted file mode 100755 index ba29375c05..0000000000 --- a/buildroot/board/friendlyarm/nanopi-m4/post-build.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" - -install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf diff --git a/buildroot/board/friendlyarm/nanopi-m4/readme.txt b/buildroot/board/friendlyarm/nanopi-m4/readme.txt deleted file mode 100644 index 0553bf8377..0000000000 --- a/buildroot/board/friendlyarm/nanopi-m4/readme.txt +++ /dev/null @@ -1,45 +0,0 @@ -FriendlyARM NANOPI-M4 -===================== - -Build: - - $ make friendlyarm_nanopi_m4_defconfig - $ make - -Files created in output directory -================================= - -output/images - -├── bl31.elf -├── boot.vfat -├── extlinux -├── idbloader.img -├── Image -├── rk3399-nanopi-m4.dtb -├── rootfs.ext2 -├── rootfs.ext4 -> rootfs.ext2 -├── rootfs.tar -├── sdcard.img -├── u-boot.bin -└── u-boot.itb - -Creating bootable SD card: -========================== - -Simply invoke (as root) - -sudo dd if=output/images/sdcard.img of=/dev/sdX && sync - -Where X is your SD card device - -Serial console --------------- - -Baudrate for this board is 1500000 - -Login: ------- -Enter 'root' as login user, and the prompt is ready. - -https://wiki.amarulasolutions.com/bsp/rockchip/rk3399/nanopi_m4.html diff --git a/buildroot/board/friendlyarm/nanopi-neo-plus2/extlinux.conf b/buildroot/board/friendlyarm/nanopi-neo-plus2/extlinux.conf deleted file mode 100644 index fcb6f632c1..0000000000 --- a/buildroot/board/friendlyarm/nanopi-neo-plus2/extlinux.conf +++ /dev/null @@ -1,4 +0,0 @@ -label linux - kernel /Image - devicetree /sun50i-h5-nanopi-neo-plus2.dtb - append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait diff --git a/buildroot/board/friendlyarm/nanopi-neo-plus2/genimage.cfg b/buildroot/board/friendlyarm/nanopi-neo-plus2/genimage.cfg deleted file mode 100644 index 9000201399..0000000000 --- a/buildroot/board/friendlyarm/nanopi-neo-plus2/genimage.cfg +++ /dev/null @@ -1,40 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "sun50i-h5-nanopi-neo-plus2.dtb", - "extlinux" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - } - - partition spl { - in-partition-table = "no" - image = "sunxi-spl.bin" - offset = 8K - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot.itb" - offset = 40K - size = 1M # 1MB - 40KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/buildroot/board/friendlyarm/nanopi-neo-plus2/linux-extras.config b/buildroot/board/friendlyarm/nanopi-neo-plus2/linux-extras.config deleted file mode 100644 index 52b4b4b29e..0000000000 --- a/buildroot/board/friendlyarm/nanopi-neo-plus2/linux-extras.config +++ /dev/null @@ -1,10 +0,0 @@ -# wireless core -CONFIG_WIRELESS=y -CONFIG_CFG80211=y -CONFIG_MAC80211=y -CONFIG_CFG80211_WEXT=y - -# wireless drivers -CONFIG_WLAN=y -CONFIG_WLAN_VENDOR_BROADCOM=y -CONFIG_BRCMFMAC=m diff --git a/buildroot/board/friendlyarm/nanopi-neo-plus2/post-build.sh b/buildroot/board/friendlyarm/nanopi-neo-plus2/post-build.sh deleted file mode 100755 index ec20fca7d9..0000000000 --- a/buildroot/board/friendlyarm/nanopi-neo-plus2/post-build.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -BOARD_DIR="$(dirname $0)" - -install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf diff --git a/buildroot/board/friendlyarm/nanopi-neo-plus2/readme.txt b/buildroot/board/friendlyarm/nanopi-neo-plus2/readme.txt deleted file mode 100644 index ae59952029..0000000000 --- a/buildroot/board/friendlyarm/nanopi-neo-plus2/readme.txt +++ /dev/null @@ -1,37 +0,0 @@ -Intro -===== - -This default configuration will allow you to start experimenting with the -buildroot environment for the Nanopi NEO Plus2. With the current configuration -it will bring-up the board, and allow access through the serial console. - -Nanopi NEO2 link: -http://nanopi.io/nanopi-neo-plus2.html - -Wiki link: -http://wiki.friendlyarm.com/wiki/index.php/NanoPi_NEO_Plus2 - -This configuration uses U-Boot mainline and kernel mainline. - -How to build -============ - - $ make friendlyarm_nanopi_neo_plus2_defconfig - $ make - -Note: you will need access to the internet to download the required -sources. - -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 NEO Plus2 and power it up. The console -is on the serial line, 115200 8N1. diff --git a/buildroot/board/friendlyarm/nanopi-neo-plus2/rootfs_overlay/lib/firmware/brcm/brcmfmac43430-sdio.friendlyarm,nanopi-neo-plus2.txt b/buildroot/board/friendlyarm/nanopi-neo-plus2/rootfs_overlay/lib/firmware/brcm/brcmfmac43430-sdio.friendlyarm,nanopi-neo-plus2.txt deleted file mode 100644 index 740d172eb5..0000000000 --- a/buildroot/board/friendlyarm/nanopi-neo-plus2/rootfs_overlay/lib/firmware/brcm/brcmfmac43430-sdio.friendlyarm,nanopi-neo-plus2.txt +++ /dev/null @@ -1,53 +0,0 @@ -#AP6212_NVRAM_V1.0.1_20160606 -# 2.4 GHz, 20 MHz BW mode -# The following parameter values are just placeholders, need to be updated. -manfid=0x2d0 -prodid=0x0726 -vendid=0x14e4 -devid=0x43e2 -boardtype=0x0726 -boardrev=0x1101 -boardnum=22 -macaddr=00:90:4c:c5:12:38 -sromrev=11 -boardflags=0x00404201 -xtalfreq=26000 -nocrc=1 -ag0=255 -aa2g=1 -ccode=ALL - -pa0itssit=0x20 -extpagain2g=0 - -#PA parameters for 2.4GHz, measured at CHIP OUTPUT -pa2ga0=-168,7161,-820 -AvVmid_c0=0x0,0xc8 -cckpwroffset0=5 - -# PPR params -maxp2ga0=90 -txpwrbckof=6 -cckbw202gpo=0x5555 -legofdmbw202gpo=0x77777777 -mcsbw202gpo=0xaaaaaaaa - -# OFDM IIR : -ofdmdigfilttype=7 -# PAPD mode: -papdmode=2 - -il0macaddr=00:90:4c:c5:12:38 -wl0id=0x431b - -#OOB parameters -hostwake=0x40 -hostrdy=0x41 -usbrdy=0x03 -usbrdydelay=100 -deadman_to=0xffffffff -# muxenab: 0x1 for UART enable, 0x10 for Host awake -muxenab=0x10 -# CLDO PWM voltage settings - 0x4 - 1.1 volt -#cldo_pwm=0x4 -glitch_based_crsmin=1 diff --git a/buildroot/board/friendlyarm/nanopi-neo/boot.cmd b/buildroot/board/friendlyarm/nanopi-neo/boot.cmd deleted file mode 100644 index 7874057859..0000000000 --- a/buildroot/board/friendlyarm/nanopi-neo/boot.cmd +++ /dev/null @@ -1,8 +0,0 @@ -setenv fdt_high ffffffff - -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-h3-nanopi-neo.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/buildroot/board/friendlyarm/nanopi-neo/extlinux.conf b/buildroot/board/friendlyarm/nanopi-neo/extlinux.conf new file mode 100644 index 0000000000..e65951f9d9 --- /dev/null +++ b/buildroot/board/friendlyarm/nanopi-neo/extlinux.conf @@ -0,0 +1,4 @@ +label NanoPi NEO linux + kernel /boot/zImage + devicetree /boot/sun8i-h3-nanopi-neo.dtb + append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p1 rootwait panic=10 diff --git a/buildroot/board/friendlyarm/nanopi-neo/genimage.cfg b/buildroot/board/friendlyarm/nanopi-neo/genimage.cfg index 92af667552..6d57dd9088 100644 --- a/buildroot/board/friendlyarm/nanopi-neo/genimage.cfg +++ b/buildroot/board/friendlyarm/nanopi-neo/genimage.cfg @@ -1,34 +1,17 @@ -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h3-nanopi-neo.dtb", - "boot.scr" - } - } - - size = 10M -} - +# Minimal SD card image for the NanoPi NEO. image sdcard.img { hdimage { } partition u-boot { - in-partition-table = "no" + in-partition-table = false image = "u-boot-sunxi-with-spl.bin" offset = 8K - size = 1016K # 1MB - 8KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" } partition rootfs { partition-type = 0x83 image = "rootfs.ext4" + offset = 1M } } diff --git a/buildroot/board/friendlyarm/nanopi-neo/patches/linux-headers/linux-headers.hash b/buildroot/board/friendlyarm/nanopi-neo/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/friendlyarm/nanopi-neo/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/friendlyarm/nanopi-neo/patches/linux/linux.hash b/buildroot/board/friendlyarm/nanopi-neo/patches/linux/linux.hash new file mode 100644 index 0000000000..ecff37638a --- /dev/null +++ b/buildroot/board/friendlyarm/nanopi-neo/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 93218296934915636fe6ba08e125948424cc270fd8948502c0ab91087a9fccd8 linux-6.6.44.tar.xz diff --git a/buildroot/board/friendlyarm/nanopi-neo/patches/uboot/uboot.hash b/buildroot/board/friendlyarm/nanopi-neo/patches/uboot/uboot.hash new file mode 100644 index 0000000000..fe9b4f53dc --- /dev/null +++ b/buildroot/board/friendlyarm/nanopi-neo/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f u-boot-2024.07.tar.bz2 diff --git a/buildroot/board/friendlyarm/nanopi-neo/post-build.sh b/buildroot/board/friendlyarm/nanopi-neo/post-build.sh new file mode 100755 index 0000000000..d84a5da0b0 --- /dev/null +++ b/buildroot/board/friendlyarm/nanopi-neo/post-build.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +BOARD_DIR="$(dirname "$0")" + +install -m 0644 -D "$BOARD_DIR"/extlinux.conf "$TARGET_DIR"/boot/extlinux/extlinux.conf diff --git a/buildroot/board/friendlyarm/nanopi-neo/readme.txt b/buildroot/board/friendlyarm/nanopi-neo/readme.txt index 84fb9cc484..cfe7714a41 100644 --- a/buildroot/board/friendlyarm/nanopi-neo/readme.txt +++ b/buildroot/board/friendlyarm/nanopi-neo/readme.txt @@ -1,25 +1,14 @@ +Nanopi NEO + Intro ===== -The instructions herein are valid for the FriendlyARM NanoPi NEO, -both the 256MiB and 512MiB versions. They should also work for the -NanoPi NEO Air, but this is untested so far. - -The FriendlyARM Nanopi NEO is a 4x4cm² board with an Allwiner H3 SoC: - - quad-core Cortex-A7 @1.2GHz - - 256 or 512MiB of DDR - - uSDCard as only storage option - - 3x USB 2.0 host (one socket, two on expansion pin-holes) - - 1x USB 2.0 OTG (also used as power source) - - 10/100 ethernet MAC - - GPIOs, SPI, I2c... - -Support for the Nanopi NEO in U-Boot and Linux is very recent, so only -core, basic features are available. - -Unfortunately, support for the ethernet MAC and the USB OTG are not -yet upstream, but are being actively worked on. +This default configuration will allow you to start experimenting with the +buildroot environment for the NanoPi NEO. With the current configuration +it will bring-up the board, and allow access through the serial console. +FriendlyARM Nanopi NEO link: +https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO How to build ============ @@ -30,13 +19,23 @@ How to build Note: you will need access to the internet to download the required sources. -You will then obtain an image ready to be written to your micro SDcard: +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 SD card in your Nanopi NEO and power it up. The console +is on the debug TTL UART, 115200 8N1. - $ dd if=output/images/sdcard.img of=/dev/sdX bs=1M +Ethernet +========== -Notes: - - replace 'sdX' with the actual device with your micro SDcard, - - you may need to be root to do that (use 'sudo'). + # udhcpc -i eth0 -Insert the micro SDcard in your NanoPi NEO and power it up. The console -is on the serial line, 115200 8N1. +Enjoy! diff --git a/buildroot/board/friendlyarm/nanopi-neo2/boot.cmd b/buildroot/board/friendlyarm/nanopi-neo2/boot.cmd deleted file mode 100644 index 9a39f4afc9..0000000000 --- a/buildroot/board/friendlyarm/nanopi-neo2/boot.cmd +++ /dev/null @@ -1,6 +0,0 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r Image -fatload mmc 0 $fdt_addr_r sun50i-h5-nanopi-neo2.dtb - -booti $kernel_addr_r - $fdt_addr_r diff --git a/buildroot/board/friendlyarm/nanopi-neo2/genimage.cfg b/buildroot/board/friendlyarm/nanopi-neo2/genimage.cfg deleted file mode 100644 index 3163a06592..0000000000 --- a/buildroot/board/friendlyarm/nanopi-neo2/genimage.cfg +++ /dev/null @@ -1,40 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "sun50i-h5-nanopi-neo2.dtb", - "boot.scr" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - } - - partition spl { - in-partition-table = "no" - image = "sunxi-spl.bin" - offset = 8K - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot.itb" - offset = 40K - size = 1M # 1MB - 40KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/buildroot/board/friendlyarm/nanopi-neo2/readme.txt b/buildroot/board/friendlyarm/nanopi-neo2/readme.txt deleted file mode 100644 index 0f445e2bea..0000000000 --- a/buildroot/board/friendlyarm/nanopi-neo2/readme.txt +++ /dev/null @@ -1,37 +0,0 @@ -Intro -===== - -This default configuration will allow you to start experimenting with the -buildroot environment for the Nanopi NEO2. With the current configuration -it will bring-up the board, and allow access through the serial console. - -Nanopi NEO2 link: -http://nanopi.io/nanopi-neo2.html - -Wiki link: -https://openedev.amarulasolutions.com/display/ODWIKI/FriendlyARM+NanoPi+NEO2 - -This configuration uses U-Boot mainline and kernel mainline. - -How to build -============ - - $ make friendlyarm_nanopi_neo2_defconfig - $ make - -Note: you will need access to the internet to download the required -sources. - -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 NEO2 and power it up. The console -is on the serial line, 115200 8N1. diff --git a/buildroot/board/friendlyarm/nanopi-neo4/extlinux.conf b/buildroot/board/friendlyarm/nanopi-neo4/extlinux.conf deleted file mode 100644 index 91eef67fb9..0000000000 --- a/buildroot/board/friendlyarm/nanopi-neo4/extlinux.conf +++ /dev/null @@ -1,4 +0,0 @@ -label NanoPi Neo4 linux - kernel /boot/Image - devicetree /boot/rk3399-nanopi-neo4.dtb - append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk1p1 rootwait diff --git a/buildroot/board/friendlyarm/nanopi-neo4/genimage.cfg b/buildroot/board/friendlyarm/nanopi-neo4/genimage.cfg deleted file mode 100644 index 966c869273..0000000000 --- a/buildroot/board/friendlyarm/nanopi-neo4/genimage.cfg +++ /dev/null @@ -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 - size = 30M - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/buildroot/board/friendlyarm/nanopi-neo4/post-build.sh b/buildroot/board/friendlyarm/nanopi-neo4/post-build.sh deleted file mode 100755 index 1f5ff6a611..0000000000 --- a/buildroot/board/friendlyarm/nanopi-neo4/post-build.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" - -install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf diff --git a/buildroot/board/friendlyarm/nanopi-neo4/readme.txt b/buildroot/board/friendlyarm/nanopi-neo4/readme.txt deleted file mode 100644 index 7c04a52806..0000000000 --- a/buildroot/board/friendlyarm/nanopi-neo4/readme.txt +++ /dev/null @@ -1,53 +0,0 @@ -Intro -===== - -NanoPi Neo4 is a RK3399 SoC based ARM64 board. - - -Official wiki: http://wiki.friendlyarm.com/wiki/index.php/NanoPi_NEO4 -Mainline wiki: https://wiki.amarulasolutions.com/bsp/rockchip/rk3399/neo4.html - -Build -===== - -Run NanoPi Neo4 configuration - - $ make friendlyarm_nanopi_neo4_defconfig - -To build, run make comamnd. - - $ make - -Files created in output directory -================================= - -output/images - -├── bl31.bin -├── bl31.elf -├── Image -├── rk3399-nanopi-neo4.dtb -├── rootfs.ext2 -├── rootfs.ext4 -> rootfs.ext2 -├── rootfs.tar -├── sdcard.img -├── u-boot.bin -├── u-boot.itb -├── u-boot-spl-dtb.bin -├── u-boot-tpl-dtb.bin -├── u-boot-tpl-dtb.img -└── u-boot-tpl-spl-dtb.img - -Creating bootable SD card: -========================= - -Simply invoke (as root) - - # dd if=output/images/sdcard.img of=/dev/sdX && sync - -Where X is your SD card device - -Serial console --------------- - -Baudrate for this board is 1500000 diff --git a/buildroot/board/friendlyarm/nanopi-r1/boot.cmd b/buildroot/board/friendlyarm/nanopi-r1/boot.cmd deleted file mode 100644 index 9f0cdbfe51..0000000000 --- a/buildroot/board/friendlyarm/nanopi-r1/boot.cmd +++ /dev/null @@ -1,8 +0,0 @@ -setenv fdt_high ffffffff - -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-h3-nanopi-r1.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/buildroot/board/friendlyarm/nanopi-r1/genimage.cfg b/buildroot/board/friendlyarm/nanopi-r1/genimage.cfg deleted file mode 100644 index a180311cae..0000000000 --- a/buildroot/board/friendlyarm/nanopi-r1/genimage.cfg +++ /dev/null @@ -1,37 +0,0 @@ -# Minimal SD card image for the NanoPi M1 -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h3-nanopi-r1.dtb", - "boot.scr" - } - } - - size = 10M -} - -image sdcard.img { - hdimage { - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - size = 1016K # 1MB - 8KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - size = 512M - } -} diff --git a/buildroot/board/friendlyarm/nanopi-r1/kernel/linux-extras.config b/buildroot/board/friendlyarm/nanopi-r1/kernel/linux-extras.config deleted file mode 100644 index 206b3810a7..0000000000 --- a/buildroot/board/friendlyarm/nanopi-r1/kernel/linux-extras.config +++ /dev/null @@ -1,2 +0,0 @@ -# USB ethernet -CONFIG_USB_RTL8152=y diff --git a/buildroot/board/friendlyarm/nanopi-r1/kernel/sun8i-h3-nanopi-r1.dts b/buildroot/board/friendlyarm/nanopi-r1/kernel/sun8i-h3-nanopi-r1.dts deleted file mode 100644 index ca15a57bee..0000000000 --- a/buildroot/board/friendlyarm/nanopi-r1/kernel/sun8i-h3-nanopi-r1.dts +++ /dev/null @@ -1,170 +0,0 @@ -/* - * Copyright (C) 2019 Igor Pecovnik - * - * This file is dual-licensed: you can use it either under the terms - * of the GPL or the X11 license, at your option. Note that this dual - * licensing only applies to this file, and not this project as a - * whole. - * - * a) This file is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * Or, alternatively, - * - * b) Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, - * copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following - * conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - */ - -#include "sun8i-h3-nanopi.dtsi" - -/ { - model = "FriendlyElec NanoPi-R1"; - compatible = "friendlyarm,nanopi-r1", "allwinner,sun8i-h3"; - - aliases { - serial1 = &uart3; - ethernet0 = &emac; - ethernet1 = &emac; - ethernet2 = &sdio_wifi; - }; - - wifi_pwrseq: wifi_pwrseq { - compatible = "mmc-pwrseq-simple"; - pinctrl-names = "default"; - reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */ - }; - - reg_gmac_3v3: gmac-3v3 { - compatible = "regulator-fixed"; - regulator-name = "gmac-3v3"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - startup-delay-us = <100000>; - enable-active-high; - gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>; - }; - - leds { - /delete-node/ status; - /delete-node/ pwr; - led1 { - label = "LED1"; - gpios = <&pio 0 10 GPIO_ACTIVE_HIGH>; - linux,default-trigger = "heartbeat"; - }; - - led2 { - label = "LED2"; - gpios = <&pio 6 11 GPIO_ACTIVE_HIGH>; - default-state = "off"; - linux,default-trigger = "netdev"; - }; - - led3 { - label = "LED3"; - gpios = <&pio 0 9 GPIO_ACTIVE_HIGH>; - default-state = "off"; - linux,default-trigger = "netdev"; - }; - }; - - r_gpio_keys { - compatible = "gpio-keys"; - input-name = "k1"; - pinctrl-names = "default"; - pinctrl-0 = <&sw_r_npi>; - - /delete-node/ k1; - reset { - label = "reset"; - linux,code = ; - gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>; - }; - }; -}; - -&emac { - pinctrl-names = "default"; - pinctrl-0 = <&emac_rgmii_pins>; - phy-supply = <®_gmac_3v3>; - phy-handle = <&ext_rgmii_phy>; - phy-mode = "rgmii"; - - status = "okay"; -}; - -&external_mdio { - ext_rgmii_phy: ethernet-phy@1 { - compatible = "ethernet-phy-ieee802.3-c22"; - reg = <7>; - }; -}; - -&mmc1 { - vmmc-supply = <®_vcc3v3>; - vqmmc-supply = <®_vcc3v3>; - mmc-pwrseq = <&wifi_pwrseq>; - bus-width = <4>; - non-removable; - status = "okay"; - - sdio_wifi: sdio_wifi@1 { - reg = <1>; - compatible = "brcm,bcm4329-fmac"; - interrupt-parent = <&pio>; - interrupts = <6 10 IRQ_TYPE_LEVEL_LOW>; /* PG10 / EINT10 */ - interrupt-names = "host-wake"; - }; -}; - -&mmc2 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc2_8bit_pins>; - vmmc-supply = <®_vcc3v3>; - vqmmc-supply = <®_vcc3v3>; - bus-width = <8>; - non-removable; - status = "okay"; -}; - -&ohci0 { - status = "okay"; -}; - -&ohci1 { - status = "okay"; -}; - -&usb_otg { - dr_mode = "peripheral"; - status = "okay"; -}; - -&usbphy { - status = "okay"; -}; diff --git a/buildroot/board/friendlyarm/nanopi-r1/readme.txt b/buildroot/board/friendlyarm/nanopi-r1/readme.txt deleted file mode 100644 index fa3114fc83..0000000000 --- a/buildroot/board/friendlyarm/nanopi-r1/readme.txt +++ /dev/null @@ -1,29 +0,0 @@ -NanoPi R1 - -Intro -===== - -This default configuration will allow you to start experimenting with the -buildroot environment for the NanoPi R1. With the current configuration -it will bring-up the board, and allow access through the serial console. - -How to build it -=============== - -Configure Buildroot: - - $ make friendlyarm_nanopi_r1_defconfig - -Compile everything and build the SD card image: - - $ make - -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 diff --git a/buildroot/board/friendlyarm/nanopi-r1/uboot/nanopi_r1_defconfig b/buildroot/board/friendlyarm/nanopi-r1/uboot/nanopi_r1_defconfig deleted file mode 100644 index e028b41a46..0000000000 --- a/buildroot/board/friendlyarm/nanopi-r1/uboot/nanopi_r1_defconfig +++ /dev/null @@ -1,22 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_SUNXI=y -CONFIG_SPL=y -CONFIG_MACH_SUN8I_H3=y -CONFIG_DRAM_CLK=408 -CONFIG_DRAM_ZQ=3881979 -CONFIG_DRAM_ODT_EN=y -CONFIG_MACPWR="PD6" -# CONFIG_VIDEO_DE2 is not set -CONFIG_NR_DRAM_BANKS=1 -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set -CONFIG_CONSOLE_MUX=y -CONFIG_SYS_CLK_FREQ=480000000 -# CONFIG_CMD_FLASH is not set -# CONFIG_SPL_DOS_PARTITION is not set -# CONFIG_SPL_EFI_PARTITION is not set -CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-nanopi-r1" -CONFIG_SUN8I_EMAC=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_OHCI_HCD=y -CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y -CONFIG_MMC_SUNXI_SLOT_EXTRA=2 diff --git a/buildroot/board/friendlyarm/nanopi-r1/uboot/sun8i-h3-nanopi-r1.dts b/buildroot/board/friendlyarm/nanopi-r1/uboot/sun8i-h3-nanopi-r1.dts deleted file mode 100644 index 9c3c574e0f..0000000000 --- a/buildroot/board/friendlyarm/nanopi-r1/uboot/sun8i-h3-nanopi-r1.dts +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Copyright (C) 2019 Igor Pecovnik - * - * This file is dual-licensed: you can use it either under the terms - * of the GPL or the X11 license, at your option. Note that this dual - * licensing only applies to this file, and not this project as a - * whole. - * - * a) This file is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * Or, alternatively, - * - * b) Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, - * copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following - * conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - */ - -#include "sun8i-h3-nanopi.dtsi" - -/ { - model = "FriendlyARM NanoPi R1"; - compatible = "friendlyarm,nanopi-neo", "allwinner,sun8i-h3"; - - reg_gmac_3v3: gmac-3v3 { - compatible = "regulator-fixed"; - pinctrl-names = "default"; - regulator-name = "gmac-3v3"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - startup-delay-us = <100000>; - enable-active-high; - gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>; - }; - -}; - -&ehci0 { - status = "okay"; -}; - -&pio { - gmac_power_pin_nanopi: gmac_power_pin@0 { - pins = "PD6"; - function = "gpio_out"; - }; -}; - -&ohci0 { - status = "okay"; -}; - -&mmc2 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc2_8bit_pins>; - vmmc-supply = <®_vcc3v3>; - bus-width = <8>; - non-removable; - cap-mmc-hw-reset; - status = "okay"; -}; - -&emac { - pinctrl-names = "default"; - pinctrl-0 = <&emac_rgmii_pins>; - phy-supply = <®_gmac_3v3>; - phy-handle = <&ext_rgmii_phy>; - phy-mode = "rgmii"; - - status = "okay"; -}; - -&external_mdio { - ext_rgmii_phy: ethernet-phy@1 { - compatible = "ethernet-phy-ieee802.3-c22"; - reg = <7>; - }; -}; diff --git a/buildroot/board/in-circuit/icnova-a20-adb4006/boot.cmd b/buildroot/board/in-circuit/icnova-a20-adb4006/boot.cmd new file mode 100644 index 0000000000..93d32a5e5f --- /dev/null +++ b/buildroot/board/in-circuit/icnova-a20-adb4006/boot.cmd @@ -0,0 +1,5 @@ +setenv fdt_high ffffffff +setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait +fatload mmc 0 $kernel_addr_r zImage +fatload mmc 0 $fdt_addr_r sun7i-a20-icnova-a20-adb4006.dtb +bootz $kernel_addr_r - $fdt_addr_r diff --git a/buildroot/board/in-circuit/icnova-a20-adb4006/genimage.cfg b/buildroot/board/in-circuit/icnova-a20-adb4006/genimage.cfg new file mode 100644 index 0000000000..4975d679be --- /dev/null +++ b/buildroot/board/in-circuit/icnova-a20-adb4006/genimage.cfg @@ -0,0 +1,38 @@ +# Minimal SD card image for the ICnova A20 SomPi on ADB4006 +# Based in the Cubieboard2 genimage.cfg + +image boot.vfat { + vfat { + files = { + "zImage", + "sun7i-a20-icnova-a20-adb4006.dtb", + "boot.scr" + } + } + + size = 10M +} + +image sdcard.img { + hdimage { + } + + partition u-boot { + in-partition-table = "no" + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + size = 1016K # 1MB - 8KB + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + size = 512M + } +} diff --git a/buildroot/board/in-circuit/icnova-a20-adb4006/linux.fragment b/buildroot/board/in-circuit/icnova-a20-adb4006/linux.fragment new file mode 100644 index 0000000000..1c99df12e6 --- /dev/null +++ b/buildroot/board/in-circuit/icnova-a20-adb4006/linux.fragment @@ -0,0 +1 @@ +CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE=y diff --git a/buildroot/board/in-circuit/icnova-a20-adb4006/patches/linux-headers/linux-headers.hash b/buildroot/board/in-circuit/icnova-a20-adb4006/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/in-circuit/icnova-a20-adb4006/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/in-circuit/icnova-a20-adb4006/patches/linux/linux.hash b/buildroot/board/in-circuit/icnova-a20-adb4006/patches/linux/linux.hash new file mode 100644 index 0000000000..98edd13a58 --- /dev/null +++ b/buildroot/board/in-circuit/icnova-a20-adb4006/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 f74812f78e88992c416434cb107639e13a551dbaff36bb90d6346ab16ab71a95 linux-6.6.56.tar.xz diff --git a/buildroot/board/in-circuit/icnova-a20-adb4006/patches/uboot/0001-sunxi-sun4i-Reduce-cpu-clock-at-SPL-initialization-t.patch b/buildroot/board/in-circuit/icnova-a20-adb4006/patches/uboot/0001-sunxi-sun4i-Reduce-cpu-clock-at-SPL-initialization-t.patch new file mode 100644 index 0000000000..edaa47ac4e --- /dev/null +++ b/buildroot/board/in-circuit/icnova-a20-adb4006/patches/uboot/0001-sunxi-sun4i-Reduce-cpu-clock-at-SPL-initialization-t.patch @@ -0,0 +1,48 @@ +From 3cdf8aa3ff45e35a237285c107785bc3d2c6976a Mon Sep 17 00:00:00 2001 +From: Ludwig Kormann +Date: Wed, 31 Jan 2024 11:28:19 +0100 +Subject: [PATCH] sunxi: sun4i: Reduce cpu clock at SPL initialization to 144 + MHz + +Up until now cpu clock gets initialized at 384 MHz, which is +the highest supported cpu clock. + +Recent A20 batches show an increased percentage of modules +reacting very sensitive to operating conditions outside the +specifications. + +The cpu dies very shortly after PLLs, core frequency or cpu +voltage are missconfigured. E.g.: +- uboot SPL selects 384 MHz as cpu clock which requires a cpu + voltage of at least 1.1 V. +- Linux CPU Frequency scaling with most sun7i dts will reduce + cpu voltage down to 1.0 V. +- When intiating a reboot or reset from linux the cpu voltage + may keep the 1.0 V configuration and the cpu dies during SPL + initialization. + +Therefore reduce cpu clock at uboot SPL initialization down +to 144 MHz from 384 MHz. + +Signed-off-by: Ludwig Kormann +Upstream: Not Applicable +--- + arch/arm/include/asm/arch-sunxi/clock_sun4i.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm/include/asm/arch-sunxi/clock_sun4i.h b/arch/arm/include/asm/arch-sunxi/clock_sun4i.h +index 2cec91cb20..252c4c693e 100644 +--- a/arch/arm/include/asm/arch-sunxi/clock_sun4i.h ++++ b/arch/arm/include/asm/arch-sunxi/clock_sun4i.h +@@ -141,7 +141,7 @@ struct sunxi_ccm_reg { + #define CCM_PLL1_CFG_SIG_DELT_PAT_EN_SHIFT 2 + #define CCM_PLL1_CFG_FACTOR_M_SHIFT 0 + +-#define PLL1_CFG_DEFAULT 0xa1005000 ++#define PLL1_CFG_DEFAULT 0xa1004c01 + + #if defined CONFIG_OLD_SUNXI_KERNEL_COMPAT && defined CONFIG_MACH_SUN5I + /* +-- +2.39.2 + diff --git a/buildroot/board/in-circuit/icnova-a20-adb4006/patches/uboot/uboot.hash b/buildroot/board/in-circuit/icnova-a20-adb4006/patches/uboot/uboot.hash new file mode 100644 index 0000000000..904fa56c02 --- /dev/null +++ b/buildroot/board/in-circuit/icnova-a20-adb4006/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0 u-boot-2024.10.tar.bz2 diff --git a/buildroot/board/intel/galileo/linux-3.14.config b/buildroot/board/intel/galileo/linux-3.14.config index e7aa9cf232..c658afb88e 100644 --- a/buildroot/board/intel/galileo/linux-3.14.config +++ b/buildroot/board/intel/galileo/linux-3.14.config @@ -154,9 +154,9 @@ CONFIG_TUN=y # CONFIG_NET_VENDOR_SILAN is not set # CONFIG_NET_VENDOR_SIS is not set # CONFIG_NET_VENDOR_SMSC is not set -CONFIG_STMMAC_ETH=m +CONFIG_STMMAC_ETH=y # CONFIG_STMMAC_PLATFORM is not set -CONFIG_STMMAC_PCI=m +CONFIG_STMMAC_PCI=y # CONFIG_NET_VENDOR_SUN is not set # CONFIG_NET_VENDOR_TEHUTI is not set # CONFIG_NET_VENDOR_TI is not set @@ -306,3 +306,6 @@ CONFIG_SECURITY=y CONFIG_SECURITY_NETWORK=y # CONFIG_VIRTUALIZATION is not set CONFIG_CRC_T10DIF=y +CONFIG_NFS_FS=y +CONFIG_ROOT_NFS=y +CONFIG_IP_PNP=y diff --git a/buildroot/board/khadas/vim3/extlinux.conf b/buildroot/board/khadas/vim3/extlinux.conf new file mode 100644 index 0000000000..2b1544a5cc --- /dev/null +++ b/buildroot/board/khadas/vim3/extlinux.conf @@ -0,0 +1,5 @@ +default buildroot +label buildroot + kernel /Image + devicetree /meson-g12b-a311d-khadas-vim3.dtb +append root=/dev/mmcblk0p2 rootwait console=ttyAML0,115200 diff --git a/buildroot/board/khadas/vim3/genimage.cfg b/buildroot/board/khadas/vim3/genimage.cfg new file mode 100644 index 0000000000..79d7f9ca07 --- /dev/null +++ b/buildroot/board/khadas/vim3/genimage.cfg @@ -0,0 +1,33 @@ +image boot.vfat { + vfat { + files = { + "Image", + "meson-g12b-a311d-khadas-vim3.dtb", + "extlinux" + } + + label = "boot" + } + + size = 64M +} + +image sdcard.img { + hdimage { + } + + partition boot { + partition-type = 0xC + bootable = "true" + image="boot.vfat" + size = 64M + offset = 2M + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext2" + size = 128M + offset = 0 + } +} diff --git a/buildroot/board/khadas/vim3/post-build.sh b/buildroot/board/khadas/vim3/post-build.sh new file mode 100755 index 0000000000..8dae08a47c --- /dev/null +++ b/buildroot/board/khadas/vim3/post-build.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +BOARD_DIR="$(dirname "$0")" + +install -m 0644 -D "$BOARD_DIR"/extlinux.conf "$BINARIES_DIR"/extlinux/extlinux.conf diff --git a/buildroot/board/khadas/vim3/post-image.sh b/buildroot/board/khadas/vim3/post-image.sh new file mode 100755 index 0000000000..db38421494 --- /dev/null +++ b/buildroot/board/khadas/vim3/post-image.sh @@ -0,0 +1,23 @@ +#!/bin/sh + +BOARD_DIR="$(dirname "$0")" + +support/scripts/genimage.sh -c "${BOARD_DIR}/genimage.cfg" + +AMLOGIC_DIR=${BINARIES_DIR}/amlogic-boot-fip +FIP_DIR=${BINARIES_DIR}/fip + +mkdir -p "${FIP_DIR}" + +(cd "${AMLOGIC_DIR}" && \ + ./build-fip.sh khadas-vim3 \ + "${BINARIES_DIR}"/u-boot.bin \ + "${FIP_DIR}") + +dd if="${FIP_DIR}"/u-boot.bin.sd.bin \ + of="${BINARIES_DIR}"/sdcard.img \ + conv=fsync,notrunc bs=1 count=444 + +dd if="${FIP_DIR}"/u-boot.bin.sd.bin \ + of="${BINARIES_DIR}"/sdcard.img \ + conv=fsync,notrunc bs=512 skip=1 seek=1 diff --git a/buildroot/board/khadas/vim3/readme.txt b/buildroot/board/khadas/vim3/readme.txt new file mode 100644 index 0000000000..cc9b513644 --- /dev/null +++ b/buildroot/board/khadas/vim3/readme.txt @@ -0,0 +1,71 @@ +Khadas VIM3 + +Description +=========== + +This configuration builds a complete image for the Khadas VIM3 to be flashed +on an SD-card. + +How to build it +=============== + +Select the default configuration for the target: +$ make khadas_vim3_defconfig + +Optional: modify the configuration: +$ make menuconfig + +Build: +$ make + +Result of the build +=================== +output/images/ ++-- amlogic-boot-fip ++ +-- build-fip.sh ++ +-- g12a.inc ++ `-- khadas-vim3 ++ +-- acs.bin ++ +-- acs_tool.py ++ +-- aml_ddr.fw ++ +-- aml_encrypt_g12b ++ +-- bl2.bin ++ +-- bl301.bin ++ +-- bl30.bin ++ +-- bl31.bin ++ +-- bl31.img ++ +-- blx_fix.sh ++ +-- ddr3_1d.fw ++ +-- ddr4_1d.fw ++ +-- ddr4_2d.fw ++ +-- diag_lpddr4.fw ++ +-- lpddr3_1d.fw ++ +-- lpddr4_1d.fw ++ +-- lpddr4_2d.fw ++ +-- Makefile ++ `-- piei.fw ++-- boot.vfat ++-- extlinux ++ `-- extlinux.conf ++-- fip ++ +-- u-boot.bin ++ +-- u-boot.bin.sd.bin ++ +-- u-boot.bin.usb.bl2 ++ `-- u-boot.bin.usb.tpl ++-- Image ++-- meson-g12b-a311d-khadas-vim3.dtb ++-- rootfs.ext2 ++-- rootfs.ext4 -> rootfs.ext2 ++-- rootfs.tar ++-- sdcard.img +`-- u-boot.bin + +The post-image script uses the files in the amlogic-boot-fip folder to sign +the bootloader image before integrating it into the sdcard image. + +To copy the image file to the sdcard use dd: +$ dd if=output/images/sdcard.img of=/dev/sdX + +Tested hardware +=============== +Khadas vim3 (rev. 14) diff --git a/buildroot/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch b/buildroot/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch deleted file mode 100644 index 6d76282def..0000000000 --- a/buildroot/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 95a311af81cd47c44d3d6e3f717f06a06d8f3dfd Mon Sep 17 00:00:00 2001 -From: Heiko Thiery -Date: Mon, 10 Jan 2022 14:13:02 +0100 -Subject: [PATCH 1/2] imx: imx8mm: imx8mm-kontron-n801x-s: convert options to Kconfig - -CONFIG_SPL_MMC and CONFIG_SPL_SERIAL - -Patch submitted upstream: -https://patchwork.ozlabs.org/project/uboot/patch/20220112085755.7396-1-heiko.thiery@gmail.com/ - -Signed-off-by: Heiko Thiery ---- - configs/kontron-sl-mx8mm_defconfig | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/configs/kontron-sl-mx8mm_defconfig b/configs/kontron-sl-mx8mm_defconfig -index 35d12fca32..940bf07a92 100644 ---- a/configs/kontron-sl-mx8mm_defconfig -+++ b/configs/kontron-sl-mx8mm_defconfig -@@ -15,6 +15,8 @@ CONFIG_SPL_DM_SPI=y - CONFIG_DEFAULT_DEVICE_TREE="imx8mm-kontron-n801x-s" - CONFIG_SPL_TEXT_BASE=0x7E1000 - CONFIG_TARGET_KONTRON_MX8MM=y -+CONFIG_SPL_MMC=y -+CONFIG_SPL_SERIAL=y - CONFIG_BOOTCOUNT_BOOTLIMIT=3 - CONFIG_SPL=y - CONFIG_DISTRO_DEFAULTS=y --- -2.30.2 - diff --git a/buildroot/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch b/buildroot/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch deleted file mode 100644 index a88d7aba87..0000000000 --- a/buildroot/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch +++ /dev/null @@ -1,305 +0,0 @@ -From ef694c19c074333fd16589ec6ffef3e7ca895186 Mon Sep 17 00:00:00 2001 -From: Heiko Thiery -Date: Wed, 12 Jan 2022 08:44:36 +0100 -Subject: [PATCH 2/2] imx: imx8mm: imx8mm-kontron-n801x-s: add common board - u-boot.dtsi - -When using a board variant that selects the lvds specific dtb the -*.u-boot.dtsi file will not be included. To have a lvds dtb specific -u-boot.dtsi file move this part to a common board u-boot.dtsi file and -include this in the board base u-boot.dtsi and create an additional one -for the lvds variant. - -Patch submitted upstream: -https://patchwork.ozlabs.org/project/uboot/patch/20220112085755.7396-2-heiko.thiery@gmail.com/ - -Signed-off-by: Heiko Thiery ---- - .../imx8mm-kontron-n801x-s-lvds-u-boot.dtsi | 6 + - .../dts/imx8mm-kontron-n801x-s-u-boot.dtsi | 124 +---------------- - arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi | 128 ++++++++++++++++++ - 3 files changed, 135 insertions(+), 123 deletions(-) - create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi - create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi - -diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi -new file mode 100644 -index 0000000000..4bf75722bf ---- /dev/null -+++ b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi -@@ -0,0 +1,6 @@ -+// SPDX-License-Identifier: GPL-2.0+ -+/* -+ * Copyright (C) 2019 Kontron Electronics GmbH -+ */ -+ -+#include "imx8mm-kontron-n801x-u-boot.dtsi" -diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi -index 22d18e6f1c..4bf75722bf 100644 ---- a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi -+++ b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi -@@ -3,126 +3,4 @@ - * Copyright (C) 2019 Kontron Electronics GmbH - */ - --#include "imx8mm-u-boot.dtsi" -- --/ { -- aliases { -- usb0 = &usbotg1; -- usb1 = &usbotg2; -- }; -- -- wdt-reboot { -- compatible = "wdt-reboot"; -- wdt = <&wdog1>; -- u-boot,dm-spl; -- }; -- -- firmware { -- optee { -- compatible = "linaro,optee-tz"; -- method = "smc"; -- }; -- }; --}; -- --&fec1 { -- phy-mode = "rgmii-rxid"; --}; -- --&i2c1 { -- u-boot,dm-spl; -- u-boot,dm-pre-reloc; --}; -- --&i2c2 { -- status = "okay"; -- u-boot,dm-spl; -- u-boot,dm-pre-reloc; --}; -- --&pinctrl_ecspi1 { -- u-boot,dm-spl; --}; -- --&pinctrl_i2c1 { -- u-boot,dm-spl; --}; -- --&pinctrl_pmic { -- u-boot,dm-spl; -- fsl,pins = < -- MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 -- /* Disable Pullup for SD_VSEL */ -- MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 -- >; --}; -- --&pinctrl_uart3 { -- u-boot,dm-spl; -- u-boot,dm-pre-reloc; --}; -- --&pinctrl_usdhc1 { -- u-boot,dm-spl; --}; -- --&pinctrl_usdhc1_100mhz { -- u-boot,dm-spl; --}; -- --&pinctrl_usdhc1_200mhz { -- u-boot,dm-spl; --}; -- --&pinctrl_usdhc2 { -- u-boot,dm-spl; --}; -- --&pca9450 { -- u-boot,dm-spl; --}; -- --&{/soc@0/bus@30800000/i2c@30a20000/pmic@25/regulators} { -- u-boot,dm-spl; --}; -- --&ecspi1 { -- u-boot,dm-spl; --}; -- --&gpio1 { -- u-boot,dm-spl; --}; -- --&gpio2 { -- u-boot,dm-spl; --}; -- --&gpio3 { -- u-boot,dm-spl; --}; -- --&gpio4 { -- u-boot,dm-spl; --}; -- --&gpio5 { -- u-boot,dm-spl; --}; -- --&uart3 { -- u-boot,dm-spl; -- u-boot,dm-pre-reloc; --}; -- --&usdhc1 { -- u-boot,dm-spl; --}; -- --&usdhc2 { -- u-boot,dm-spl; --}; -- --&wdog1 { -- u-boot,dm-spl; --}; -+#include "imx8mm-kontron-n801x-u-boot.dtsi" -diff --git a/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi -new file mode 100644 -index 0000000000..22d18e6f1c ---- /dev/null -+++ b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi -@@ -0,0 +1,128 @@ -+// SPDX-License-Identifier: GPL-2.0+ -+/* -+ * Copyright (C) 2019 Kontron Electronics GmbH -+ */ -+ -+#include "imx8mm-u-boot.dtsi" -+ -+/ { -+ aliases { -+ usb0 = &usbotg1; -+ usb1 = &usbotg2; -+ }; -+ -+ wdt-reboot { -+ compatible = "wdt-reboot"; -+ wdt = <&wdog1>; -+ u-boot,dm-spl; -+ }; -+ -+ firmware { -+ optee { -+ compatible = "linaro,optee-tz"; -+ method = "smc"; -+ }; -+ }; -+}; -+ -+&fec1 { -+ phy-mode = "rgmii-rxid"; -+}; -+ -+&i2c1 { -+ u-boot,dm-spl; -+ u-boot,dm-pre-reloc; -+}; -+ -+&i2c2 { -+ status = "okay"; -+ u-boot,dm-spl; -+ u-boot,dm-pre-reloc; -+}; -+ -+&pinctrl_ecspi1 { -+ u-boot,dm-spl; -+}; -+ -+&pinctrl_i2c1 { -+ u-boot,dm-spl; -+}; -+ -+&pinctrl_pmic { -+ u-boot,dm-spl; -+ fsl,pins = < -+ MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 -+ /* Disable Pullup for SD_VSEL */ -+ MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 -+ >; -+}; -+ -+&pinctrl_uart3 { -+ u-boot,dm-spl; -+ u-boot,dm-pre-reloc; -+}; -+ -+&pinctrl_usdhc1 { -+ u-boot,dm-spl; -+}; -+ -+&pinctrl_usdhc1_100mhz { -+ u-boot,dm-spl; -+}; -+ -+&pinctrl_usdhc1_200mhz { -+ u-boot,dm-spl; -+}; -+ -+&pinctrl_usdhc2 { -+ u-boot,dm-spl; -+}; -+ -+&pca9450 { -+ u-boot,dm-spl; -+}; -+ -+&{/soc@0/bus@30800000/i2c@30a20000/pmic@25/regulators} { -+ u-boot,dm-spl; -+}; -+ -+&ecspi1 { -+ u-boot,dm-spl; -+}; -+ -+&gpio1 { -+ u-boot,dm-spl; -+}; -+ -+&gpio2 { -+ u-boot,dm-spl; -+}; -+ -+&gpio3 { -+ u-boot,dm-spl; -+}; -+ -+&gpio4 { -+ u-boot,dm-spl; -+}; -+ -+&gpio5 { -+ u-boot,dm-spl; -+}; -+ -+&uart3 { -+ u-boot,dm-spl; -+ u-boot,dm-pre-reloc; -+}; -+ -+&usdhc1 { -+ u-boot,dm-spl; -+}; -+ -+&usdhc2 { -+ u-boot,dm-spl; -+}; -+ -+&wdog1 { -+ u-boot,dm-spl; -+}; --- -2.30.2 - diff --git a/buildroot/board/kontron/pitx-imx8m/genimage.cfg b/buildroot/board/kontron/pitx-imx8m/genimage.cfg index 4a0aa117fb..bc100b171d 100644 --- a/buildroot/board/kontron/pitx-imx8m/genimage.cfg +++ b/buildroot/board/kontron/pitx-imx8m/genimage.cfg @@ -5,7 +5,7 @@ image sdcard.img { partition imx-boot { in-partition-table = "no" - image = "imx8-boot-sd.bin" + image = "flash.bin" offset = 33K } diff --git a/buildroot/board/kontron/pitx-imx8m/patches/uboot/2022.04/0001-tools-mkeficapsule-use-pkg-config-to-get-luuid-and-l.patch b/buildroot/board/kontron/pitx-imx8m/patches/uboot/2022.04/0001-tools-mkeficapsule-use-pkg-config-to-get-luuid-and-l.patch new file mode 100644 index 0000000000..9530a45efe --- /dev/null +++ b/buildroot/board/kontron/pitx-imx8m/patches/uboot/2022.04/0001-tools-mkeficapsule-use-pkg-config-to-get-luuid-and-l.patch @@ -0,0 +1,33 @@ +From f3523977e8f5f6b2173708777001332431ebc609 Mon Sep 17 00:00:00 2001 +From: Heiko Thiery +Date: Tue, 19 Jul 2022 16:17:09 +0200 +Subject: [PATCH 1/2] tools: mkeficapsule: use pkg-config to get -luuid and -lgnutls + +Instead of hardcoding -luuid -lgnutls as the flags needed to build +mkeficapsule, use pkg-config when available. + +We gracefully fallback on the previous behavior of hardcoding -luuid +-lgnutls if pkg-config is not available or fails with an error. + +Signed-off-by: Heiko Thiery +--- + tools/Makefile | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tools/Makefile b/tools/Makefile +index 9f2339666a..9f6b282ad8 100644 +--- a/tools/Makefile ++++ b/tools/Makefile +@@ -242,7 +242,8 @@ hostprogs-$(CONFIG_MIPS) += mips-relocs + hostprogs-$(CONFIG_ASN1_COMPILER) += asn1_compiler + HOSTCFLAGS_asn1_compiler.o = -idirafter $(srctree)/include + +-HOSTLDLIBS_mkeficapsule += -lgnutls -luuid ++HOSTLDLIBS_mkeficapsule += \ ++ $(shell pkg-config --libs gnutls uuid 2> /dev/null || echo "-lgnutls -luuid") + hostprogs-$(CONFIG_TOOLS_MKEFICAPSULE) += mkeficapsule + + # We build some files with extra pedantic flags to try to minimize things +-- +2.30.2 + diff --git a/buildroot/board/kontron/smarc-sal28/genimage.cfg b/buildroot/board/kontron/smarc-sal28/genimage.cfg index c885cd51a6..82bab26fec 100644 --- a/buildroot/board/kontron/smarc-sal28/genimage.cfg +++ b/buildroot/board/kontron/smarc-sal28/genimage.cfg @@ -17,7 +17,7 @@ image sdcard-emmc.img { } partition rootfs { - offset = 2M + offset = 4M image = rootfs.ext4 partition-uuid = %PARTUUID% } diff --git a/buildroot/board/lego/ev3/patches/linux-headers/linux-headers.hash b/buildroot/board/lego/ev3/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/lego/ev3/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/lego/ev3/patches/linux/linux.hash b/buildroot/board/lego/ev3/patches/linux/linux.hash new file mode 100644 index 0000000000..81824a41ee --- /dev/null +++ b/buildroot/board/lego/ev3/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 6c5e4d3c87feadbfdb9f7d2e46f3f120b00286ba380491c5956708e0b94232c8 linux-4.19.315.tar.xz diff --git a/buildroot/board/lego/ev3/patches/uboot/uboot.hash b/buildroot/board/lego/ev3/patches/uboot/uboot.hash new file mode 100644 index 0000000000..c53d9ecc5c --- /dev/null +++ b/buildroot/board/lego/ev3/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 312b7eeae44581d1362c3a3f02c28d806647756c82ba8c72241c7cdbe68ba77e u-boot-2021.07.tar.bz2 diff --git a/buildroot/board/librecomputer/lafrite/patches/linux-headers/linux-headers.hash b/buildroot/board/librecomputer/lafrite/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/librecomputer/lafrite/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/librecomputer/lafrite/patches/linux/linux.hash b/buildroot/board/librecomputer/lafrite/patches/linux/linux.hash new file mode 100644 index 0000000000..899adefd07 --- /dev/null +++ b/buildroot/board/librecomputer/lafrite/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 23e3e7b56407250f5411bdab95763d0bc4e3a19dfa431d951df7eacabd61a2f4 linux-6.6.22.tar.xz diff --git a/buildroot/board/licheepi/readme.txt b/buildroot/board/licheepi/readme.txt deleted file mode 100644 index 6b8bf94b45..0000000000 --- a/buildroot/board/licheepi/readme.txt +++ /dev/null @@ -1,62 +0,0 @@ -Intro -===== - -This directory contains a buildroot configuration for building a -LicheePi Zero. - -How to build it -=============== - -Configure Buildroot -------------------- - - $ make licheepi_zero_defconfig - -Build the rootfs ----------------- - -Note: you will need to have access to the network, since Buildroot -will download the packages' sources. - -You may now build your rootfs with: - - $ make - -(This may take a while, consider getting yourself a coffee ;-) ) - -Result of the build -------------------- - -After building, you should obtain this tree: - - output/images/ - +-- boot.scr - +-- boot.vfat - +-- rootfs.ext2 - +-- rootfs.ext4 -> rootfs.ext2 - +-- rootfs.tar - +-- sdcard.img - +-- sun8i-v3s-licheepi-zero-dock.dtb - +-- sun8i-v3s-licheepi-zero.dtb - +-- u-boot.bin - +-- u-boot-sunxi-with-spl.bin - `-- zImage - -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 - -Alternatively, you can use the Etcher graphical tool to burn the image -to the SD card safely and on any platform: - -https://etcher.io/ - -Once the SD card is burned, insert it into your LicheePi Zero board, -and power it up. Your new system should come up now and start a -console on the UART0 serial port. diff --git a/buildroot/board/linksprite/pcduino/boot.cmd b/buildroot/board/linksprite/pcduino/boot.cmd deleted file mode 100644 index 0db8363599..0000000000 --- a/buildroot/board/linksprite/pcduino/boot.cmd +++ /dev/null @@ -1,8 +0,0 @@ -setenv fdt_high ffffffff - -setenv bootargs console=ttyS0,115200 console=tty1 earlyprintk root=/dev/mmcblk0p2 rootwait panic=10 ${extra} - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun4i-a10-pcduino.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/buildroot/board/linksprite/pcduino/genimage.cfg b/buildroot/board/linksprite/pcduino/genimage.cfg deleted file mode 100644 index db33322118..0000000000 --- a/buildroot/board/linksprite/pcduino/genimage.cfg +++ /dev/null @@ -1,43 +0,0 @@ -# -# Minimal SD card image for the pcDuino -# - -image boot.vfat { - vfat { - files = { - "zImage", - "sun4i-a10-pcduino.dtb", - "boot.scr" - } - } - - size = 16M -} - -# -# Note: u-boot environment is stored between u-boot and boot partitions -# - -image sdcard.img { - hdimage { - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - size = 1016K # 1MB - 8KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - offset = 1M - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/buildroot/board/linksprite/pcduino/post-build.sh b/buildroot/board/linksprite/pcduino/post-build.sh deleted file mode 100755 index e1e1877671..0000000000 --- a/buildroot/board/linksprite/pcduino/post-build.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -# post-build.sh for pcDuino taken from OrangePi post-build.sh -# 2013, Carlo Caione - -BOARD_DIR="$(dirname $0)" -MKIMAGE=$HOST_DIR/bin/mkimage -BOOT_CMD=$BOARD_DIR/boot.cmd -BOOT_CMD_H=$BINARIES_DIR/boot.scr - -# U-Boot script -$MKIMAGE -C none -A arm -T script -d $BOOT_CMD $BOOT_CMD_H diff --git a/buildroot/board/linksprite/pcduino/post-image.sh b/buildroot/board/linksprite/pcduino/post-image.sh deleted file mode 100755 index c82b189f9c..0000000000 --- a/buildroot/board/linksprite/pcduino/post-image.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" -GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" - -rm -rf "${GENIMAGE_TMP}" - -genimage \ - --rootpath "${TARGET_DIR}" \ - --tmppath "${GENIMAGE_TMP}" \ - --inputpath "${BINARIES_DIR}" \ - --outputpath "${BINARIES_DIR}" \ - --config "${GENIMAGE_CFG}" - -exit $? diff --git a/buildroot/board/mangopi/mq1rdw2/genimage.cfg b/buildroot/board/mangopi/mq1rdw2/genimage.cfg new file mode 100644 index 0000000000..92c8677545 --- /dev/null +++ b/buildroot/board/mangopi/mq1rdw2/genimage.cfg @@ -0,0 +1,16 @@ +image sdcard.img { + hdimage { + } + + partition u-boot { + in-partition-table = "no" + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + size = 1016K # 1MB - 8KB + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/buildroot/board/mangopi/mq1rdw2/readme.txt b/buildroot/board/mangopi/mq1rdw2/readme.txt new file mode 100644 index 0000000000..fd37f63154 --- /dev/null +++ b/buildroot/board/mangopi/mq1rdw2/readme.txt @@ -0,0 +1,46 @@ +MangoPi MQ1RDW2 +=============== + +MangoPi MQ1RDW2 is a tiny ARM Cortex-A7 based single board computer. +It's built around Allwinner T113-S3 dual core 1GHz CPU with integrated +128MB DDR3-1600 RAM. +Board features: +- USB-OTG Type-C socket +- USB-HOST Type-C socket +- 2x 18 pin GPIO headers +- TF card slot +- RTL8723DS WiFi module with ext. antenna connector +- 40 pin RGB FPC connector +- 6 pin CTP FPC connector +- 24 pin DVP FPC connector +- onboard mic +- onboard audio amplifier +- FEL,reset button + +How to build +============ + +$ make mangopi_mq1rdw2_defconfig +$ make + +Wifi +========== + +Edit board/mangopi/mq1rdw2/overlay/etc/wpa_supplicant.conf or +/etc/wpa_supplicant.conf once connected to the board: + +* Replace YOURSSID with your AP ssid +* Replace YOURPASSWD with your AP password + +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 + +Connect a TTL UART to the UART3 on P8 header (unpopulated), insert the microSD card and +plug in a USB-C cable to the OTG or HOST connector to boot the system. diff --git a/buildroot/board/mangopi/mq1rdw2/rootfs_overlay/boot/extlinux/extlinux.conf b/buildroot/board/mangopi/mq1rdw2/rootfs_overlay/boot/extlinux/extlinux.conf new file mode 100644 index 0000000000..c190ff7659 --- /dev/null +++ b/buildroot/board/mangopi/mq1rdw2/rootfs_overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label MANGOPI-MQ1RDW2 + kernel /boot/zImage + devicetree /boot/sun8i-t113s-mangopi-mq-r-t113.dtb + append console=ttyS3,115200 root=/dev/mmcblk0p1 rootwait panic=10 ${extra} diff --git a/buildroot/board/mangopi/mq1rdw2/rootfs_overlay/etc/network/interfaces b/buildroot/board/mangopi/mq1rdw2/rootfs_overlay/etc/network/interfaces new file mode 100644 index 0000000000..89e7d74aff --- /dev/null +++ b/buildroot/board/mangopi/mq1rdw2/rootfs_overlay/etc/network/interfaces @@ -0,0 +1,6 @@ +auto lo +iface lo inet loopback + +auto wlan0 +iface wlan0 inet dhcp +wpa-conf /etc/wpa_supplicant.conf diff --git a/buildroot/board/mangopi/mq1rdw2/rootfs_overlay/etc/wpa_supplicant.conf b/buildroot/board/mangopi/mq1rdw2/rootfs_overlay/etc/wpa_supplicant.conf new file mode 100644 index 0000000000..b43292b0a7 --- /dev/null +++ b/buildroot/board/mangopi/mq1rdw2/rootfs_overlay/etc/wpa_supplicant.conf @@ -0,0 +1,8 @@ +ap_scan=1 + +network={ + ssid="YOURSSID" + scan_ssid=1 + key_mgmt=WPA-PSK + psk="YOURPASSWD" +} diff --git a/buildroot/board/mender/x86_64/genimage-efi.cfg b/buildroot/board/mender/x86_64/genimage-efi.cfg new file mode 100644 index 0000000000..9c2723d8fb --- /dev/null +++ b/buildroot/board/mender/x86_64/genimage-efi.cfg @@ -0,0 +1,43 @@ +image efi-part.vfat { + vfat { + file EFI { + image = "efi-part/EFI" + } + file grub-mender-grubenv { + image = "efi-part/grub-mender-grubenv" + } + file bzImage { + image = "bzImage" + } + } + + size = 16M +} + +image disk.img { + hdimage { + partition-table-type = "gpt" + } + + partition boot { + partition-type-uuid = U + offset = 32K + image = "efi-part.vfat" + bootable = true + } + + partition roota { + partition-type-uuid = 4F68BCE3-E8CD-4DB1-96E7-FBCAF984B709 + image = "rootfs.ext2" + } + + partition rootb { + partition-type-uuid = 4F68BCE3-E8CD-4DB1-96E7-FBCAF984B709 + image = "rootfs.ext2" + } + + partition data { + partition-type-uuid = L + image = "data-part.ext4" + } +} diff --git a/buildroot/board/mender/x86_64/linux.config b/buildroot/board/mender/x86_64/linux.config new file mode 100644 index 0000000000..f17fc18edb --- /dev/null +++ b/buildroot/board/mender/x86_64/linux.config @@ -0,0 +1,64 @@ +CONFIG_SYSVIPC=y +CONFIG_SMP=y +CONFIG_HYPERVISOR_GUEST=y +CONFIG_PARAVIRT=y +CONFIG_EFI=y +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_NETFILTER=y +CONFIG_IP_NF_IPTABLES=y +CONFIG_IP_NF_FILTER=y +CONFIG_CFG80211=m +CONFIG_CFG80211_WEXT=y +CONFIG_MAC80211=m +CONFIG_PCI=y +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_VIRTIO_BLK=y +CONFIG_BLK_DEV_SD=y +CONFIG_SCSI_VIRTIO=y +CONFIG_ATA=y +CONFIG_NETDEVICES=y +CONFIG_VIRTIO_NET=y +CONFIG_ATH9K=m +CONFIG_ATH9K_HTC=m +CONFIG_CARL9170=m +CONFIG_ATH10K=m +CONFIG_RT2X00=m +CONFIG_RT73USB=m +CONFIG_RT2800USB=m +CONFIG_RT2800USB_RT3573=y +CONFIG_RT2800USB_RT53XX=y +CONFIG_RT2800USB_RT55XX=y +# CONFIG_RTL_CARDS is not set +CONFIG_RTL8XXXU=m +CONFIG_INPUT_EVDEV=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_VIRTIO_CONSOLE=y +CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_DRM=y +CONFIG_DRM_VIRTIO_GPU=y +CONFIG_FB_VESA=y +CONFIG_SOUND=y +CONFIG_SND=y +CONFIG_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_STORAGE=y +CONFIG_VIRTIO_PCI=y +CONFIG_VIRTIO_BALLOON=y +CONFIG_VIRTIO_INPUT=y +CONFIG_VIRTIO_MMIO=y +CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y +CONFIG_EXT4_FS=y +CONFIG_FUSE_FS=y +CONFIG_VFAT_FS=y +CONFIG_SQUASHFS=y +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_ISO8859_1=y +CONFIG_UNWINDER_FRAME_POINTER=y diff --git a/buildroot/board/mender/x86_64/mender_grubenv_defines b/buildroot/board/mender/x86_64/mender_grubenv_defines new file mode 100644 index 0000000000..77f68fe6b2 --- /dev/null +++ b/buildroot/board/mender/x86_64/mender_grubenv_defines @@ -0,0 +1,25 @@ +################################################################################ +# Mandatory +################################################################################ +# Warning: This file is an example and should be customized to fit your needs! + +# Partition index of root filesystem A +mender_rootfsa_part=2 + +# Partition index of root filesystem B +mender_rootfsb_part=3 + +# Device file corresponding to the root filesystem partitions, without index. +mender_kernel_root_base=/dev/vda + +# Name of the storage device containing root filesystem partitions in GRUB +# format. +mender_grub_storage_device=hd0 + +# Type of kernel (bzImage or zImage) +kernel_imagetype=bzImage + +# Type of initrd image. +# Note: An initrd image is not strictly necessary, and the system will boot and +# update without a initrd image. +# initrd_imagetype=initrd.img diff --git a/buildroot/board/mender/x86_64/overlay/etc/fstab b/buildroot/board/mender/x86_64/overlay/etc/fstab new file mode 100644 index 0000000000..45a7ba0260 --- /dev/null +++ b/buildroot/board/mender/x86_64/overlay/etc/fstab @@ -0,0 +1,7 @@ +# +/dev/root / ext4 rw,noauto 0 1 +/dev/vda1 /boot vfat defaults 0 0 +/dev/vda4 /var/lib/mender ext4 rw,relatime 0 0 +proc /proc proc defaults 0 0 +devpts /dev/pts devpts defaults,gid=5,mode=620,ptmxmode=0666 0 0 +sysfs /sys sysfs defaults 0 0 diff --git a/buildroot/board/mender/x86_64/overlay/etc/mender/mender.conf b/buildroot/board/mender/x86_64/overlay/etc/mender/mender.conf new file mode 100644 index 0000000000..5f423fb2cb --- /dev/null +++ b/buildroot/board/mender/x86_64/overlay/etc/mender/mender.conf @@ -0,0 +1,11 @@ +{ + "InventoryPollIntervalSeconds": 1800, + "UpdatePollIntervalSeconds": 1800, + "RetryPollIntervalSeconds": 300, + "RootfsPartA": "/dev/vda2", + "RootfsPartB": "/dev/vda3", + "ServerCertificate": "/etc/mender/server.crt", + "ServerURL": "https://docker.mender.io", + "TenantToken": "dummy", + "DeviceTypeFile": "/etc/mender/device_type" +} diff --git a/buildroot/board/mender/x86_64/post-build.sh b/buildroot/board/mender/x86_64/post-build.sh new file mode 100755 index 0000000000..bc4f4b8f11 --- /dev/null +++ b/buildroot/board/mender/x86_64/post-build.sh @@ -0,0 +1,54 @@ +#!/usr/bin/env bash +set -e +DEVICE_TYPE="buildroot-x86_64" +ARTIFACT_NAME="1.0" + +parse_args() { + local o O opts + o='a:o:d:' + O='artifact-name:,data-part-size:,device-type:' + opts="$(getopt -o "${o}" -l "${O}" -- "${@}")" + eval set -- "${opts}" + while [ ${#} -gt 0 ]; do + case "${1}" in + (-o|--data-part-size) + # Ignored to have same options as other scripts + shift 2 + ;; + (-d|--device-type) + DEVICE_TYPE="${2}"; shift 2 + ;; + (-a|--artifact-name) + ARTIFACT_NAME="${2}"; shift 2 + ;; + (--) + shift; break + ;; + esac + done +} + +# Create a persistent directory to mount the data partition at. +mender_fixup() { + pushd "${TARGET_DIR}" + if [[ -L var/lib/mender ]]; then + rm var/lib/mender + mkdir -p var/lib/mender + fi + + # The common paradigm is to have the persistent data volume at /data for mender. + if [[ ! -L data ]]; then + ln -s var/lib/mender data + fi + + popd +} + +main() { + parse_args "${@}" + mender_fixup + echo "device_type=${DEVICE_TYPE}" > "${TARGET_DIR}/etc/mender/device_type" + echo "artifact_name=${ARTIFACT_NAME}" > "${TARGET_DIR}/etc/mender/artifact_info" +} + +main "${@}" diff --git a/buildroot/board/mender/x86_64/post-image-efi.sh b/buildroot/board/mender/x86_64/post-image-efi.sh new file mode 100755 index 0000000000..ab12386076 --- /dev/null +++ b/buildroot/board/mender/x86_64/post-image-efi.sh @@ -0,0 +1,69 @@ +#!/usr/bin/env bash +set -e +BOARD_DIR="$(realpath "$(dirname "$0")")" +DATA_PART_SIZE="32M" +DEVICE_TYPE="buildroot-x86_64" +ARTIFACT_NAME="1.0" + +# Parse arguments. +parse_args() { + local o O opts + o='a:o:d:' + O='artifact-name:,data-part-size:,device-type:' + opts="$(getopt -o "${o}" -l "${O}" -- "${@}")" + eval set -- "${opts}" + while [ ${#} -gt 0 ]; do + case "${1}" in + (-o|--data-part-size) + DATA_PART_SIZE="${2}"; shift 2 + ;; + (-d|--device-type) + DEVICE_TYPE="${2}"; shift 2 + ;; + (-a|--artifact-name) + ARTIFACT_NAME="${2}"; shift 2 + ;; + (--) + shift; break + ;; + esac + done +} + +# Create the data partition +make_data_partition() { + "${HOST_DIR}/sbin/mkfs.ext4" \ + -F \ + -r 1 \ + -N 0 \ + -m 5 \ + -L "data" \ + "${BINARIES_DIR}/data-part.ext4" "${DATA_PART_SIZE}" +} + +# Create a mender image. +generate_mender_image() { + echo "Creating ${BINARIES_DIR}/${DEVICE_TYPE}-${ARTIFACT_NAME}.mender" + "${HOST_DIR}/bin/mender-artifact" \ + --compression lzma \ + write rootfs-image \ + -t "${DEVICE_TYPE}" \ + -n "${BR2_VERSION}" \ + -f "${BINARIES_DIR}/rootfs.ext2" \ + -o "${BINARIES_DIR}/${DEVICE_TYPE}-${ARTIFACT_NAME}.mender" +} + +generate_image() { + support/scripts/genimage.sh -c "${BOARD_DIR}/genimage-efi.cfg" +} + +# Main function. +main() { + parse_args "${@}" + make_data_partition + generate_image + generate_mender_image + exit $? +} + +main "${@}" diff --git a/buildroot/board/mender/x86_64/readme.txt b/buildroot/board/mender/x86_64/readme.txt new file mode 100644 index 0000000000..a9755ec58b --- /dev/null +++ b/buildroot/board/mender/x86_64/readme.txt @@ -0,0 +1,69 @@ +Mender UEFI PC sample config +===================== + +1. Build + + $ make mender_x86_64_efi_defconfig + + Add any additional packages required. Update the files in board/mender/x86_64 + and change /dev/vda to what is relevant for your platform: typically + /dev/mmcblk0p for eMMC and /dev/sda for USB or SATA. + + $ make + +2. Write the Pendrive + + The build process will create a Pendrive image called disk.img in + output/images. + + Write the image to a pendrive: + + $ dd if=output/images/disk.img of=/dev/${pendrive}; sync + + Once the process is complete, insert it into the target PC and boot. + + Remember that if said PC has another boot device you might need to + select this alternative for it to boot. + + You might need to disable Secure Boot from the setup as well. + +3. Enjoy + +Emulation in qemu +======================== + +Run the emulation with: + +qemu-system-x86_64 \ + -M pc \ + -drive file=output/images/disk.img,if=virtio,format=raw \ + -net nic,model=virtio \ + -net user \ + -serial stdio \ + -bios + +Note that needs to point to a valid x86_64 UEFI +firmware image for qemu. It may be provided by your distribution as an +edk2 or OVMF package, in a path such as /usr/share/edk2/ovmf/OVMF_CODE.fd. + +Optional arguments: + - -enable-kvm to speed up qemu. This requires a loaded kvm module on the host + system. + - Add -smp N to emulate an SMP system with N CPUs. + +The login prompt will appear in the serial window. + +Tested with QEMU 4.1.1 on Fedora 31 + +Creating a mender-artifact +======================== + +The mender artifact is created in output/images/buildroot-x86_64-1.0.mender + +You may wish to change --artifact-name=1.0 to a name that best suits your +particular needs, as this option changes the mender artifact name. + +Using mender +======================== +Please read the mender documentation at: +https://docs.mender.io/2.2/getting-started diff --git a/buildroot/board/microchip/mpfs_icicle/README.txt b/buildroot/board/microchip/mpfs_icicle/README.txt new file mode 100644 index 0000000000..de20ecc410 --- /dev/null +++ b/buildroot/board/microchip/mpfs_icicle/README.txt @@ -0,0 +1,62 @@ +Microchip PolarFire SoC Icicle Kit +================================== + +This file describes how to use the pre-defined Buildroot +configuration for Microchip's PolarFire SoC Icicle Kit. + +Further information about the PolarFire SoC Icicle Kit can be found +at https://github.com/polarfire-soc/polarfire-soc-documentation + +Building +======== + +Configure Buildroot using the default board configuration: + + '$ make microchip_mpfs_icicle_defconfig' + +Customise the build as necessary: + + '$ make menuconfig' + +Start the build: + + '$ make' + +Result of the build +=================== + +Once the build has finished you will have the following files: + + output/images/ + +-- boot.scr + +-- boot.vfat + +-- Image + +-- mpfs_icicle.itb + +-- mpfs_icicle.its + +-- mpfs-icicle-kit.dtb + +-- payload.bin + +-- rootfs.ext2 + +-- rootfs.ext4 + +-- rootfs.tar + +-- sdcard.img + +-- u-boot.bin + + +Creating a bootable SD card with genimage +========================================= + +By default Buildroot builds a SD card image for you. The first partition +of this image contains a U-Boot binary, embedded in a Hart Software +Services (HSS) payload. The second partition contains a FAT filesystem +with a U-Boot env and an ITB file containing the kernel and the device +tree. The third partition contains the file system. This image can be +written directly to the eMMC or an SD card. All you need to do is dd the +image to the eMMC or your SD card, which can be done with the following +command on your development host: + + '$ sudo dd if=output/images/sdcard.img of=/dev/sdb bs=1M' + +For instructions on how to transfer the image to the eMMC/SD, please refer to +the "Programming the Linux image" section of our guide on updating +PolarFire SoC dev kits: +https://github.com/polarfire-soc/polarfire-soc-documentation/blob/master/reference-designs-fpga-and-development-kits/updating-mpfs-kit.md. diff --git a/buildroot/board/microchip/mpfs_icicle/config.yaml b/buildroot/board/microchip/mpfs_icicle/config.yaml new file mode 100644 index 0000000000..5fccdfd34f --- /dev/null +++ b/buildroot/board/microchip/mpfs_icicle/config.yaml @@ -0,0 +1,28 @@ +# +# HSS Payload Generator - buildroot configuration file +# + +# First, we can optionally set a name for our image, otherwise one will be created dynamically +set-name: 'PolarFire-SoC-HSS::U-Boot' + +# +# Next, we'll define the entry point addresses for each hart, as follows: +# +hart-entry-points: {u54_1: '0x80200000', u54_2: '0x80200000', u54_3: '0x80200000', u54_4: '0x80200000'} +# +# Finally, we'll define a payloads (source binary file) that will be placed at certain regions in memory +# The payload section is defined with the keyword payloads, and then a number of individual +# payload descriptors. +# +# Each payload has a name (path to its ELF/bin file), an owner-hart, and optionally 1-3 secondary-harts. +# +# Additionally, it has a privilege mode in which it will start execution. +# * Valid privilege modes are PRV_M, PRV_S and PRV_U. +# +# +# In this case, the only payload is the u-boot s-mode binary. +# +# Case only matters for the ELF path names, not the keywords. +# +payloads: + u-boot.bin: {exec-addr: '0x80200000', owner-hart: u54_1, secondary-hart: u54_2, secondary-hart: u54_3, secondary-hart: u54_4, priv-mode: prv_s} diff --git a/buildroot/board/microchip/mpfs_icicle/genimage.cfg b/buildroot/board/microchip/mpfs_icicle/genimage.cfg new file mode 100644 index 0000000000..9282c9ce5f --- /dev/null +++ b/buildroot/board/microchip/mpfs_icicle/genimage.cfg @@ -0,0 +1,34 @@ +# Image for eMMC or SDCard boot on the Microchip PolarFire SOC Icicle Board +# +image boot.vfat { + vfat { + files = { + "mpfs_icicle.itb", + } + + file boot.scr { + image = "boot.scr" + } + } + size = 60M +} + +image sdcard.img { + hdimage { + partition-table-type = "gpt" + } + + partition uboot { + partition-type-uuid = 21686148-6449-6E6F-744E-656564454649 + image = "payload.bin" + } + + partition kernel { + bootable = "true" + image = "boot.vfat" + } + + partition root { + image = "rootfs.ext4" + } +} diff --git a/buildroot/board/microchip/mpfs_icicle/linux.fragment b/buildroot/board/microchip/mpfs_icicle/linux.fragment new file mode 100644 index 0000000000..0cecddb61b --- /dev/null +++ b/buildroot/board/microchip/mpfs_icicle/linux.fragment @@ -0,0 +1 @@ +CONFIG_POLARFIRE_SOC_DMA_NONCOHERENT=y diff --git a/buildroot/board/microchip/mpfs_icicle/mpfs_icicle.its b/buildroot/board/microchip/mpfs_icicle/mpfs_icicle.its new file mode 100644 index 0000000000..a62b079fa1 --- /dev/null +++ b/buildroot/board/microchip/mpfs_icicle/mpfs_icicle.its @@ -0,0 +1,53 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Flattened Image Tree file for Icicle Kit + * + */ + +/dts-v1/; + +/ { + description = "U-Boot fitImage for the MPFS"; + address-cells = <1>; + + images { + kernel { + description = "Linux kernel"; + data = /incbin/("./Image"); + type = "kernel"; + arch = "riscv"; + os = "linux"; + compression = "none"; + load = <0x80200000>; + entry = <0x80200000>; + hash-1 { + algo = "sha256"; + }; + }; + base_fdt { + description = "Flattened Device Tree blob"; + data = /incbin/("./mpfs-icicle-kit.dtb"); + type = "flat_dt"; + arch = "riscv"; + compression = "none"; + load = <0x8a000000>; + hash-1 { + algo = "sha256"; + }; + }; + }; + + configurations { + default = "kernel_dtb"; + kernel_dtb { + description = "1 Linux kernel, FDT blob"; + kernel = "kernel"; + fdt = "base_fdt"; + }; + + base_dtb { + description = "Base FDT blob for MPFS Icicle board"; + fdt = "base_fdt"; + }; + }; +}; diff --git a/buildroot/board/microchip/mpfs_icicle/patches/linux-headers/linux-headers.hash b/buildroot/board/microchip/mpfs_icicle/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/microchip/mpfs_icicle/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/microchip/mpfs_icicle/patches/linux/linux.hash b/buildroot/board/microchip/mpfs_icicle/patches/linux/linux.hash new file mode 100644 index 0000000000..416a8b1550 --- /dev/null +++ b/buildroot/board/microchip/mpfs_icicle/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 dcb7b41fd363729675c34545fcb514d5a94dbb3714ee10f527a26ca7716c2579 linux-linux4microchip+fpga-2024.06.tar.gz diff --git a/buildroot/board/microchip/mpfs_icicle/patches/uboot/uboot.hash b/buildroot/board/microchip/mpfs_icicle/patches/uboot/uboot.hash new file mode 100644 index 0000000000..2628d4b4fd --- /dev/null +++ b/buildroot/board/microchip/mpfs_icicle/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 d461c45a9c5acd019776cdcf8ab2b571315282a880dd6580431f7dd5bfac3889 uboot-linux4microchip+fpga-2024.06.tar.gz diff --git a/buildroot/board/microchip/mpfs_icicle/post-image.sh b/buildroot/board/microchip/mpfs_icicle/post-image.sh new file mode 100755 index 0000000000..596bb21d78 --- /dev/null +++ b/buildroot/board/microchip/mpfs_icicle/post-image.sh @@ -0,0 +1,13 @@ +#!/bin/bash +set -e + +HSS_PAYLOAD_GENERATOR="${HOST_DIR}"/bin/hss-payload-generator +MKIMAGE="${HOST_DIR}"/bin/mkimage +BOARD_DIR="$(pwd)"/"${0%/*}" + +pushd "${BINARIES_DIR}" +"${HSS_PAYLOAD_GENERATOR}" -c "${BOARD_DIR}"/config.yaml payload.bin +cp "${BOARD_DIR}"/mpfs_icicle.its "${BINARIES_DIR}"/mpfs_icicle.its +"${MKIMAGE}" -f mpfs_icicle.its mpfs_icicle.itb +popd +support/scripts/genimage.sh -c "${BOARD_DIR}"/genimage.cfg diff --git a/buildroot/board/microchip/mpfs_icicle/uboot-env.txt b/buildroot/board/microchip/mpfs_icicle/uboot-env.txt new file mode 100644 index 0000000000..8a655085ed --- /dev/null +++ b/buildroot/board/microchip/mpfs_icicle/uboot-env.txt @@ -0,0 +1,16 @@ +# this assumes ${scriptaddr} is already set!! + +# Try to boot a fitImage from eMMC/SD + +setenv fdt_high 0xffffffffffffffff +setenv initrd_high 0xffffffffffffffff + +load mmc 0:${distro_bootpart} ${scriptaddr} mpfs_icicle.itb; +bootm start ${scriptaddr}#kernel_dtb; +bootm loados ${scriptaddr}; +# Try to load a ramdisk if available inside fitImage +bootm ramdisk; +bootm prep; +fdt set /soc/ethernet@20112000 mac-address ${icicle_mac_addr0}; +fdt set /soc/ethernet@20110000 mac-address ${icicle_mac_addr1}; +bootm go; diff --git a/buildroot/board/microchip/mpfs_icicle/uboot-fragment-rootfs.config b/buildroot/board/microchip/mpfs_icicle/uboot-fragment-rootfs.config new file mode 100644 index 0000000000..e2a5eb9438 --- /dev/null +++ b/buildroot/board/microchip/mpfs_icicle/uboot-fragment-rootfs.config @@ -0,0 +1,3 @@ +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/mmcblk0p3 rootwait uio_pdrv_genirq.of_id=generic-uio" +CONFIG_MPFS_PRIORITISE_QSPI_BOOT=n diff --git a/buildroot/board/minnowboard/fs-overlay-graphical/etc/X11/Xsession b/buildroot/board/minnowboard/fs-overlay-graphical/etc/X11/Xsession deleted file mode 100755 index d8862f170c..0000000000 --- a/buildroot/board/minnowboard/fs-overlay-graphical/etc/X11/Xsession +++ /dev/null @@ -1,7 +0,0 @@ -# Start a terminal on the top left corner -xterm -geom 80x30+0+0 & - -# OpenGL demo -glmark2 & - -exec /usr/bin/openbox-session diff --git a/buildroot/board/minnowboard/fs-overlay-graphical/etc/X11/xorg.conf.d/01-modules.conf b/buildroot/board/minnowboard/fs-overlay-graphical/etc/X11/xorg.conf.d/01-modules.conf deleted file mode 100644 index 91659baa65..0000000000 --- a/buildroot/board/minnowboard/fs-overlay-graphical/etc/X11/xorg.conf.d/01-modules.conf +++ /dev/null @@ -1,11 +0,0 @@ - -# Xorg does not implement real dynamic linking and requires that its -# modules get loaded in the right order. -# https://forums.gentoo.org/viewtopic-p-8245578.html#8245578 -Section "Module" - Load "vgahw" - Load "fb" - Load "shadowfb" - Load "int10" - Load "vbe" -EndSection diff --git a/buildroot/board/minnowboard/fs-overlay-graphical/etc/asound.conf b/buildroot/board/minnowboard/fs-overlay-graphical/etc/asound.conf deleted file mode 100644 index b75b238364..0000000000 --- a/buildroot/board/minnowboard/fs-overlay-graphical/etc/asound.conf +++ /dev/null @@ -1,4 +0,0 @@ -# Customize ALSA: -# the HDMI PCM is at card=0, device=3 (i.e. hw:0,3) -defaults.pcm.card 0 -defaults.pcm.device 3 diff --git a/buildroot/board/nezha/genimage.cfg b/buildroot/board/nezha/genimage.cfg index 783391fb99..836666ff8e 100644 --- a/buildroot/board/nezha/genimage.cfg +++ b/buildroot/board/nezha/genimage.cfg @@ -4,34 +4,16 @@ image sdcard.img { hdimage { } - partition boot0-1 { - in-partition-table = "no" - image = "boot0_sdcard_sun20iw1p1.bin" + partition u-boot { + in-partition-table = false + image = "u-boot-sunxi-with-spl.bin" offset = 8K } - partition boot0-2 { - in-partition-table = "no" - image = "boot0_sdcard_sun20iw1p1.bin" - offset = 128K - } - - partition u-boot-1 { - in-partition-table = "no" - image = "u-boot.toc1" - offset = 12M - } - - partition u-boot-2 { - in-partition-table = "no" - image = "u-boot.toc1" - offset = 16400K - } - partition rootfs { partition-type = 0x83 image = "rootfs.ext4" bootable = "true" - offset = 18M + offset = 1M } } diff --git a/buildroot/board/nezha/linux.fragment b/buildroot/board/nezha/linux.fragment new file mode 100644 index 0000000000..4b101eaacb --- /dev/null +++ b/buildroot/board/nezha/linux.fragment @@ -0,0 +1,2 @@ +CONFIG_USB_GADGET=y +CONFIG_USB_MUSB_DUAL_ROLE=y diff --git a/buildroot/board/nezha/overlay/boot/extlinux/extlinux.conf b/buildroot/board/nezha/overlay/boot/extlinux/extlinux.conf index 02232f4d16..91b2298628 100644 --- a/buildroot/board/nezha/overlay/boot/extlinux/extlinux.conf +++ b/buildroot/board/nezha/overlay/boot/extlinux/extlinux.conf @@ -1,4 +1,4 @@ label linux kernel /boot/Image - devicetree /boot/sun20i-d1-nezha.dtb + # use devicetree from u-boot append console=ttyS0,115200 root=/dev/mmcblk0p1 ro rootwait diff --git a/buildroot/board/nezha/patches/linux-headers/linux-headers.hash b/buildroot/board/nezha/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/nezha/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/nezha/patches/linux/linux.hash b/buildroot/board/nezha/patches/linux/linux.hash new file mode 100644 index 0000000000..899adefd07 --- /dev/null +++ b/buildroot/board/nezha/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 23e3e7b56407250f5411bdab95763d0bc4e3a19dfa431d951df7eacabd61a2f4 linux-6.6.22.tar.xz diff --git a/buildroot/board/nezha/patches/opensbi/opensbi.hash b/buildroot/board/nezha/patches/opensbi/opensbi.hash new file mode 100644 index 0000000000..bc4058abe6 --- /dev/null +++ b/buildroot/board/nezha/patches/opensbi/opensbi.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 319b62a4186fbce9b81a0c5f0ec9f003a10c808397a72138bc9745d9b87b1eb1 opensbi-1.4.tar.gz diff --git a/buildroot/board/nezha/patches/uboot/0001-arch-riscv-dts-sun20i-d1.dtsi-adjust-plic-compatible.patch b/buildroot/board/nezha/patches/uboot/0001-arch-riscv-dts-sun20i-d1.dtsi-adjust-plic-compatible.patch deleted file mode 100644 index 3524f44a61..0000000000 --- a/buildroot/board/nezha/patches/uboot/0001-arch-riscv-dts-sun20i-d1.dtsi-adjust-plic-compatible.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 99cf8f37ceb1def9e7bbaccc395cf2275723e03d Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Thu, 4 Nov 2021 22:15:13 +0100 -Subject: [PATCH] arch/riscv/dts/sun20i-d1.dtsi: adjust plic compatible to - match opensbi - -The T-HEAD PLIC is by default not accessible from S-mode, and access must be -enabled by opensbi to make it accessible to Linux. - -The DTB is used both by U-Boot and opensbi (but the PLIC node is ignored by -U-Boot), so change the compatible to match what opensbi expects to fix a -crash during Linux boot: - -https://github.com/riscv-software-src/opensbi/commit/78c2b19218bd - -Signed-off-by: Peter Korsgaard ---- - arch/riscv/dts/sun20i-d1.dtsi | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/riscv/dts/sun20i-d1.dtsi b/arch/riscv/dts/sun20i-d1.dtsi -index 280e0336d4..56d02c33b0 100644 ---- a/arch/riscv/dts/sun20i-d1.dtsi -+++ b/arch/riscv/dts/sun20i-d1.dtsi -@@ -1136,7 +1136,7 @@ - - plic: interrupt-controller@10000000 { - compatible = "allwinner,sun20i-d1-plic", -- "sifive,plic-1.0.0"; -+ "thead,c900-plic"; - reg = <0x10000000 0x4000000>; - #address-cells = <0>; - interrupts-extended = <&cpu0_intc 11>, --- -2.20.1 - diff --git a/buildroot/board/nezha/patches/uboot/0002-Makefile-HACK-Support-building-u-boot.toc1-for-nezda.patch b/buildroot/board/nezha/patches/uboot/0002-Makefile-HACK-Support-building-u-boot.toc1-for-nezda.patch deleted file mode 100644 index 6e89a921df..0000000000 --- a/buildroot/board/nezha/patches/uboot/0002-Makefile-HACK-Support-building-u-boot.toc1-for-nezda.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 4a923e0e4ef6d2b41cb89d658e269adada847573 Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Thu, 4 Nov 2021 22:32:04 +0100 -Subject: [PATCH] Makefile: HACK: Support building u-boot.toc1 for nezda board - -For easier integration into Buildroot. The boot0 / toc1 logic is WIP until -U-Boot gains SPL support for the D1, so add a hack to make it easier to -integrate in Buildroot as-is. - -Signed-off-by: Peter Korsgaard ---- - Makefile | 9 +++++++++ - nezha.cfg | 9 +++++++++ - 2 files changed, 18 insertions(+) - create mode 100644 nezha.cfg - -diff --git a/Makefile b/Makefile -index f911f70344..259d93bf80 100644 ---- a/Makefile -+++ b/Makefile -@@ -1084,6 +1084,15 @@ endif - .binman_stamp: FORCE - @touch $@ - -+fw_dynamic.bin: $(OPENSBI) -+ $(call if_changed,copy) -+ -+MKIMAGEFLAGS_u-boot.toc1 = -T sunxi_toc1 -+u-boot.toc1: nezha.cfg fw_dynamic.bin inputs -+ $(call if_changed,mkimage) -+ -+all: u-boot.toc1 -+ - ifeq ($(CONFIG_DEPRECATED),y) - $(warning "You have deprecated configuration options enabled in your .config! Please check your configuration.") - endif -diff --git a/nezha.cfg b/nezha.cfg -new file mode 100644 -index 0000000000..2d23b9b388 ---- /dev/null -+++ b/nezha.cfg -@@ -0,0 +1,9 @@ -+[opensbi] -+file = fw_dynamic.bin -+addr = 0x40000000 -+[dtb] -+file = arch/riscv/dts/sun20i-d1-nezha.dtb -+addr = 0x44000000 -+[u-boot] -+file = u-boot-nodtb.bin -+addr = 0x4a000000 --- -2.20.1 - diff --git a/buildroot/board/nezha/patches/uboot/uboot.hash b/buildroot/board/nezha/patches/uboot/uboot.hash new file mode 100644 index 0000000000..7d05185938 --- /dev/null +++ b/buildroot/board/nezha/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 36db7c20b179f03aa29009565c6b34380d5629fd5c57ed110244594d9930dfed uboot-2e89b706f5c956a70c989cd31665f1429e9a0b48.tar.gz diff --git a/buildroot/board/nvidia/bf3/linux.config b/buildroot/board/nvidia/bf3/linux.config new file mode 100644 index 0000000000..5dce565481 --- /dev/null +++ b/buildroot/board/nvidia/bf3/linux.config @@ -0,0 +1,163 @@ +CONFIG_SYSVIPC=y +CONFIG_POSIX_MQUEUE=y +CONFIG_NO_HZ_IDLE=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_TASKSTATS=y +CONFIG_MEMCG=y +CONFIG_BLK_CGROUP=y +CONFIG_CPUSETS=y +CONFIG_CGROUP_DEVICE=y +CONFIG_CGROUP_CPUACCT=y +CONFIG_SCHED_AUTOGROUP=y +CONFIG_PROFILING=y +CONFIG_ARCH_VEXPRESS=y +CONFIG_COMPAT=y +CONFIG_ACPI=y +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_BLK_DEV_BSGLIB=y +CONFIG_BINFMT_MISC=y +CONFIG_TRANSPARENT_HUGEPAGE=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_PACKET_DIAG=y +CONFIG_UNIX=y +CONFIG_NET_KEY=y +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_BRIDGE=y +CONFIG_NET_SCHED=y +CONFIG_VSOCKETS=y +CONFIG_PCI=y +CONFIG_PCI_HOST_GENERIC=y +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_FW_CFG_SYSFS=y +CONFIG_FW_CFG_SYSFS_CMDLINE=y +CONFIG_VIRTIO_BLK=y +CONFIG_BLK_DEV_SD=y +CONFIG_CHR_DEV_SG=y +CONFIG_SCSI_CONSTANTS=y +CONFIG_SCSI_LOGGING=y +CONFIG_SCSI_SCAN_ASYNC=y +CONFIG_SCSI_VIRTIO=y +CONFIG_ATA=y +CONFIG_NETDEVICES=y +CONFIG_DUMMY=y +CONFIG_MACVLAN=y +CONFIG_VIRTIO_NET=y +CONFIG_NLMON=y +CONFIG_INPUT_EVDEV=y +CONFIG_SERIAL_AMBA_PL011=y +CONFIG_SERIAL_AMBA_PL011_CONSOLE=y +CONFIG_VIRTIO_CONSOLE=y +CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM_VIRTIO=y +CONFIG_TCG_TPM=y +CONFIG_TCG_TIS=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_PL031=y +CONFIG_VIRTIO_PCI=y +CONFIG_VIRTIO_INPUT=y +CONFIG_VIRTIO_MMIO=y +CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y +CONFIG_MAILBOX=y +CONFIG_PL320_MBOX=y +CONFIG_ARM_SMMU_V3=y +CONFIG_EXT4_FS=y +CONFIG_FUSE_FS=y +CONFIG_VIRTIO_FS=y +CONFIG_OVERLAY_FS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_RAS=y +CONFIG_EDAC=y +CONFIG_EDAC_LEGACY_SYSFS=y +CONFIG_EDAC_BLUEFIELD=y +CONFIG_I2C=y +CONFIG_MELLANOX_PLATFORM=y +CONFIG_REGMAP_I2C=y +CONFIG_I2C_CHARDEV=y +CONFIG_GPIO_MLXBF2=y +CONFIG_GPIO_MLXBF3=y +CONFIG_GPIO_MLXBF=y +CONFIG_I2C_MLXBF=y +CONFIG_I2C_MLXCPLD=y +CONFIG_I2C_MUX=y +CONFIG_I2C_MUX_MLXCPLD=y +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +CONFIG_LEDS_MLXCPLD=y +CONFIG_LEDS_MLXREG=y +CONFIG_NET_SWITCHDEV=y +CONFIG_MLX5_BRIDGE=y +CONFIG_NET_CLS_ACT=y +CONFIG_NET_TC_SKB_EXT=y +CONFIG_CONFIG_NET_CLS_ACT=y +CONFIG_MLX5_CLS_ACT=y +CONFIG_DCB=y +CONFIG_MLX5_CORE_EN_DCB=y +CONFIG_MLX5_CORE_EN=y +CONFIG_MLX5_CORE=y +CONFIG_MLX5_DPLL=y +CONFIG_MLX5_EN_ARFS=y +CONFIG_INET_ESP=y +CONFIG_INET6_ESP=y +CONFIG_XFRM_OFFLOAD=y +CONFIG_INET_ESP_OFFLOAD=y +CONFIG_INET6_ESP_OFFLOAD=y +CONFIG_MLX5_EN_IPSEC=y +CONFIG_MLX5_EN_RXNFC=y +CONFIG_TLS_DEVICE=y +CONFIG_TLS=y +CONFIG_MLX5_EN_TLS=y +CONFIG_MLX5_ESWITCH=y +CONFIG_MLX5_FPGA_IPSEC=y +CONFIG_MLX5_FPGA_TLS=y +CONFIG_MLX5_FPGA=y +CONFIG_MLX5_IPSEC=y +CONFIG_MACSEC=y +CONFIG_MLX5_MACSEC=y +CONFIG_MLX5_MPFS=y +CONFIG_MLX5_SF_MANAGER=y +CONFIG_MLX5_SF=y +CONFIG_MLX5_SW_STEERING=y +CONFIG_NETFILTER=y +CONFIG_NETFILTER_INGRESS=y +CONFIG_NF_CONNTRACK=y +CONFIG_NF_TABLES=y +CONFIG_NF_FLOW_TABLE=y +CONFIG_NET_ACT_CT=y +CONFIG_MLX5_TC_CT=y +CONFIG_MLX5_TC_SAMPLE=y +CONFIG_MLX5_TLS=y +CONFIG_VDPA=y +CONFIG_VHOST_IOTLB=y +CONFIG_MLX5_VDPA_NET=y +CONFIG_MLX5_VDPA_STEERING_DEBUG=y +CONFIG_MLX5_VDPA=y +CONFIG_IOMMUFD=y +CONFIG_IOMMU_SUPPORT=y +CONFIG_VFIO=y +CONFIG_MLX5_VFIO_PCI=y +CONFIG_MLXBF_BOOTCTL=y +CONFIG_MLXBF_GIGE=y +CONFIG_MLXBF_PMC=y +CONFIG_MLXBF_TMFIFO=y +CONFIG_MLXFW=y +CONFIG_MLXREG_HOTPLUG=y +CONFIG_MLXREG_IO=y +CONFIG_WATCHDOG=y +CONFIG_MLX_WDT=y +CONFIG_MMC=y +CONFIG_MMC_DW=y +CONFIG_MMC_DW_BLUEFIELD=y +CONFIG_NET_VENDOR_MELLANOX=y +CONFIG_PINCTRL=y +CONFIG_PINCTRL_MLXBF3=y +CONFIG_POWER_MLXBF=y +CONFIG_SENSORS_MLXREG_FAN=y +CONFIG_BLK_DEV_INITRD=y +CONFIG_RD_GZIP=y +CONFIG_INITRAMFS_COMPRESSION_GZIP=y diff --git a/buildroot/board/nvidia/bf3/patches/linux-headers/linux-headers.hash b/buildroot/board/nvidia/bf3/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/nvidia/bf3/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/nvidia/bf3/patches/linux/linux.hash b/buildroot/board/nvidia/bf3/patches/linux/linux.hash new file mode 100644 index 0000000000..d2272b2110 --- /dev/null +++ b/buildroot/board/nvidia/bf3/patches/linux/linux.hash @@ -0,0 +1,4 @@ +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +# After checking with pgp with using key +# B8868C80BA62A1FFFAF5FDA9632D3A06589DA6B1 +sha256 c954f60197008f1e1f32a1e77293903cf3801d2543ec4bf521f5651eb7f133ce linux-6.11.6.tar.xz diff --git a/buildroot/board/nvidia/bf3/readme.txt b/buildroot/board/nvidia/bf3/readme.txt new file mode 100644 index 0000000000..7e072d21e2 --- /dev/null +++ b/buildroot/board/nvidia/bf3/readme.txt @@ -0,0 +1,70 @@ +***************** +BlueField 3 Board +***************** + +The BlueField 3 board is provided "as-is" without official support +from NVIDIA. + +For a detailed description of this board, please refer to the official +website: +https://www.nvidia.com/en-us/networking/products/data-processing-unit/ + + +Missing Kernel Modules +====================== + +Please note that the following kernel modules are unavailable as they +are not included in the Linux upstream repository: + - CONFIG_MLXBF_PTM (module: mlxbf-ptm) + - CONFIG_MLXBF_PKA (module: mlxbf-pka) + +For further details on these kernel modules and their usage, please +refer to the NVIDIA documentation: +https://docs.nvidia.com/networking/display/bluefielddpuosv470/installing+popular+linux+distributions+on+bluefield + + +Boot loader +=========== + +NVIDIA does not provide information for rebuilding the ARM BL1, BL2, +BL3, UEFI, or other components in the boot stages. Therefore, we +assume the BF3 board is already running the pre-built Ubuntu image +provided in the BFB installation format. + +Since there are no available details on the BF3's BFB format or the +ARM Trusted Firmware (ATF) needed to rebuild BL1, BL2, BL3, UEFI, or +GRUB, these components are assumed to remain unmodified. + + +Grub Configuration and Image Loading +==================================== + +The board's image is loaded from the BF3's GRUB, with the following +GRUB settings, assuming the console is set to `hvc0` to provide access +thru `/dev/rshimN/console` from the root CPU since the root CPU's +rshim exposes a virtio console over the PCIe bus to the BR3 board. + +To update GRUB settings, boot using the built-in BF3 Ubuntu image. + +Extract of /etc/default/grub: + + GRUB_DEFAULT=0 + GRUB_TIMEOUT_STYLE=menu + GRUB_TIMEOUT=-1 + GRUB_RECORDFAIL_TIMEOUT=5 + GRUB_DISTRIBUTOR=`lsb_release -i -s 2> /dev/null || echo Debian` + GRUB_CMDLINE_LINUX_DEFAULT="" + GRUB_CMDLINE_LINUX="console=hvc0 earlyprintk=hvc0 earlycon=hvc0 loglevel=7 fixrtc net.ifnames=0 biosdevname=0 iommu.passthrough=1" + + +Uploading Buildroot Images +-------------------------- + +After configuring GRUB, you can upload your Buildroot images to the +BF3’s GRUB boot folder: + + scp build_folder/images/Image BF3:/boot/vmlinuz-buildroot-xyz + +Finally, run `update-grub` on the BF3 board to apply the updated GRUB settings. + +Enjoy! diff --git a/buildroot/board/octavo/osd32mp1-brk/genimage.cfg b/buildroot/board/octavo/osd32mp1-brk/genimage.cfg new file mode 100644 index 0000000000..40bde81e86 --- /dev/null +++ b/buildroot/board/octavo/osd32mp1-brk/genimage.cfg @@ -0,0 +1,23 @@ +image sdcard.img { + hdimage { + partition-table-type = "gpt" + } + + partition fsbl1 { + image = "tf-a-stm32mp157c-osd32mp1-brk.stm32" + } + + partition fsbl2 { + image = "tf-a-stm32mp157c-osd32mp1-brk.stm32" + } + + partition fip { + image = "fip.bin" + size = 2M + } + + partition rootfs { + image = "rootfs.ext4" + bootable = "yes" + } +} diff --git a/buildroot/board/octavo/osd32mp1-brk/linux-dts/stm32mp157c-osd32mp1-brk.dts b/buildroot/board/octavo/osd32mp1-brk/linux-dts/stm32mp157c-osd32mp1-brk.dts new file mode 100644 index 0000000000..d5f2793f54 --- /dev/null +++ b/buildroot/board/octavo/osd32mp1-brk/linux-dts/stm32mp157c-osd32mp1-brk.dts @@ -0,0 +1,1120 @@ +/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */ +/* + * Copyright (C) Octavo Systems LLC 2020 - All Rights Reserved + */ + +/* For more information on Device Tree configuration, please refer to + * https://wiki.st.com/stm32mpu/wiki/Category:Device_tree_configuration + */ + +/dts-v1/; +#include +#include "stm32mp157.dtsi" +#include "stm32mp15xc.dtsi" +#include "stm32mp15xxac-pinctrl.dtsi" +#include "stm32mp15-m4-srm.dtsi" +#include +#include +#include + +/ { + model = "Octavo OSD32MP1 BRK board"; + compatible = "st,stm32mp157c-osd32mp1-brk", "st,stm32mp157"; + + memory@c0000000 { + device_type = "memory"; + reg = <0xc0000000 0x20000000>; + }; + + reserved-memory { + #address-cells = <1>; + #size-cells = <1>; + ranges; + + mcuram2:mcuram2@10000000{ + compatible = "shared-dma-pool"; + reg = <0x10000000 0x40000>; + no-map; + }; + + vdev0vring0:vdev0vring0@10040000{ + compatible = "shared-dma-pool"; + reg = <0x10040000 0x1000>; + no-map; + }; + + vdev0vring1:vdev0vring1@10041000{ + compatible = "shared-dma-pool"; + reg = <0x10041000 0x1000>; + no-map; + }; + + vdev0buffer:vdev0buffer@10042000{ + compatible = "shared-dma-pool"; + reg = <0x10042000 0x4000>; + no-map; + }; + + mcuram:mcuram@30000000{ + compatible = "shared-dma-pool"; + reg = <0x30000000 0x40000>; + no-map; + }; + + retram:retram@38000000{ + compatible = "shared-dma-pool"; + reg = <0x38000000 0x10000>; + no-map; + }; + + gpu_reserved:gpu@d4000000{ + reg = <0xd4000000 0x4000000>; + no-map; + }; + }; + + led{ + compatible = "gpio-leds"; + + red1{ + label = "LED1_RED"; + gpios = <&gpioz 6 GPIO_ACTIVE_LOW>; + linux,default-trigger = "heartbeat"; + status = "okay"; + default-state = "off"; + }; + + green1{ + label = "LED1_GRN"; + gpios = <&gpioz 7 GPIO_ACTIVE_LOW>; + status = "okay"; + default-state = "on"; + }; + + red2{ + label = "LED2_RED"; + gpios = <&gpioi 8 GPIO_ACTIVE_LOW>; + status = "okay"; + default-state = "off"; + }; + + green2{ + label = "LED2_GRN"; + gpios = <&gpioi 9 GPIO_ACTIVE_LOW>; + default-state = "off"; + }; + }; + + usb_phy_tuning:usb-phy-tuning{ + st,hs-dc-level = <2>; + st,fs-rftime-tuning; + st,hs-rftime-reduction; + st,hs-current-trim = <15>; + st,hs-impedance-trim = <1>; + st,squelch-level = <3>; + st,hs-rx-offset = <2>; + st,no-lsfs-sc; + }; + + vin:vin{ + compatible = "regulator-fixed"; + regulator-name = "vin"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-always-on; + }; + + aliases{ + serial0 = &uart4; + serial2 = &usart2; + serial5 = &uart5; + serial7 = &uart7; + serial1 = &uart8; + }; + + chosen{ + stdout-path = "serial0:115200n8"; + }; + +}; /*root*/ + +&pinctrl { + u-boot,dm-pre-reloc; + i2c1_pins_mx: i2c1-0 { + pins { + pinmux = , /* I2C1_SCL */ + ; /* I2C1_SDA */ + bias-disable; + drive-open-drain; + slew-rate = <0>; + }; + }; + + i2c1_pins_sleep_mx: i2c1-1 { + pins { + pinmux = , /* I2C1_SCL */ + ; /* I2C1_SDA */ + }; + }; + + i2c2_pins_mx: i2c2-0 { + pins { + pinmux = , /* I2C2_SCL */ + ; /* I2C2_SDA */ + bias-disable; + drive-open-drain; + slew-rate = <0>; + }; + }; + + i2c2_pins_sleep_mx: i2c2-1 { + pins { + pinmux = , /* I2C2_SCL */ + ; /* I2C2_SDA */ + }; + }; + + i2c5_pins_mx: i2c5-0 { + pins { + pinmux = , /* I2C5_SCL */ + ; /* I2C5_SDA */ + bias-disable; + drive-open-drain; + slew-rate = <0>; + }; + }; + + i2c5_pins_sleep_mx: i2c5-1 { + pins { + pinmux = , /* I2C5_SCL */ + ; /* I2C5_SDA */ + }; + }; + + spi2_pins_mx: spi2-0 { + pins1 { + pinmux = , /* SPI2_SCK */ + ; /* SPI2_MOSI */ + bias-disable; + drive-push-pull; + slew-rate = <1>; + }; + + pins2 { + pinmux = ; /* SPI2_MISO */ + bias-disable; + }; + }; + + spi2_sleep_pins_mx: spi2-sleep-0 { + pins { + pinmux = , /* SPI2_SCK */ + , /* SPI2_MISO */ + ; /* SPI2_MOSI */ + }; + }; + + spi4_pins_mx: spi4-0 { + pins1 { + pinmux = , /* SPI4_SCK */ + ; /* SPI4_MOSI */ + bias-disable; + drive-push-pull; + slew-rate = <1>; + }; + + pins2 { + pinmux = ; /* SPI4_MISO */ + bias-disable; + }; + }; + + spi4_sleep_pins_mx: spi4-sleep-0 { + pins { + pinmux = , /* SPI2_SCK */ + , /* SPI2_MISO */ + ; /* SPI2_MOSI */ + }; + }; + + usart2_pins_mx: usart2-0 { + pins1 { + pinmux = ; /* USART2_TX */ + bias-disable; + drive-push-pull; + slew-rate = <0>; + }; + pins2 { + pinmux = ; /* USART2_RX */ + bias-disable; + }; + }; + + usart2_idle_pins_mx: usart2-idle-0 { + pins1 { + pinmux = ; /* USART2_TX */ + }; + pins2 { + pinmux = ; /* USART2_RX */ + bias-disable; + }; + }; + + usart2_sleep_pins_mx: usart2-sleep-0 { + pins { + pinmux = , /* USART2_TX */ + ; /* USART2_RX */ + }; + }; + + uart5_pins_mx: uart5-0 { + pins1 { + pinmux = ; /* USART5_TX */ + bias-disable; + drive-push-pull; + slew-rate = <0>; + }; + pins2 { + pinmux = ; /* USART5_RX */ + bias-disable; + }; + }; + + uart5_idle_pins_mx: uart5-idle-0 { + pins1 { + pinmux = ; /* USART5_TX */ + }; + pins2 { + pinmux = ; /* USART5_RX */ + bias-disable; + }; + }; + + uart5_sleep_pins_mx: uart5-sleep-0 { + pins { + pinmux = , /* USART5_TX */ + ; /* USART5_RX */ + }; + }; + + uart7_pins_mx: uart7-0 { + pins1 { + pinmux = ; /* USART7_TX */ + bias-disable; + drive-push-pull; + slew-rate = <0>; + }; + pins2 { + pinmux = ; /* USART7_RX */ + bias-disable; + }; + }; + + uart7_idle_pins_mx: uart7-idle-0 { + pins1 { + pinmux = ; /* USART7_TX */ + }; + pins2 { + pinmux = ; /* USART7_RX */ + bias-disable; + }; + }; + + uart7_sleep_pins_mx: uart7-sleep-0 { + pins { + pinmux = , /* USART7_TX */ + ; /* USART7_RX */ + }; + }; + + uart8_pins_mx: uart8-0 { + pins1 { + pinmux = ; /* USART8_TX */ + bias-disable; + drive-push-pull; + slew-rate = <0>; + }; + pins2 { + pinmux = ; /* USART8_RX */ + bias-disable; + }; + }; + + uart8_idle_pins_mx: uart8-idle-0 { + pins1 { + pinmux = ; /* USART8_TX */ + }; + pins2 { + pinmux = ; /* USART8_RX */ + bias-disable; + }; + }; + + uart8_sleep_pins_mx: uart8-sleep-0 { + pins { + pinmux = , /* USART8_TX */ + ; /* USART8_RX */ + }; + }; + + m_can1_pins_mx: m-can1-0 { + pins1 { + pinmux = ; /* CAN1_TX */ + slew-rate = <0>; + drive-push-pull; + bias-disable; + }; + pins2 { + pinmux = ; /* CAN1_RX */ + bias-disable; + }; + }; + + m_can1_sleep_pins_mx: m_can1-sleep@0 { + pins { + pinmux = , /* CAN1_TX */ + ; /* CAN1_RX */ + }; + }; + + pwm1_pins_mx: pwm1-0 { + pins { + pinmux = ; /* TIM1_CH2 */ + bias-pull-down; + drive-push-pull; + slew-rate = <0>; + }; + }; + + pwm1_sleep_pins_mx: pwm1-sleep-0 { + pins { + pinmux = ; /* TIM1_CH1 */ + }; + }; + + pwm3_pins_mx: pwm3-0 { + pins { + pinmux = ; /* TIM3_CH2 */ + bias-pull-down; + drive-push-pull; + slew-rate = <0>; + }; + }; + + pwm3_sleep_pins_mx: pwm3-sleep-0 { + pins { + pinmux = ; /* TIM3_CH2 */ + }; + }; + + pwm4_pins_mx: pwm4-0 { + pins { + pinmux = ; /* TIM4_CH2 */ + bias-pull-down; + drive-push-pull; + slew-rate = <0>; + }; + }; + + pwm4_sleep_pins_mx: pwm4-sleep-0 { + pins { + pinmux = ; /* TIM4_CH2 */ + }; + }; + + pwm8_pins_mx: pwm8-0 { + pins { + pinmux = ; /* TIM8_CH2 */ + bias-pull-down; + drive-push-pull; + slew-rate = <0>; + }; + }; + + pwm8_sleep_pins_mx: pwm8-sleep-0 { + pins { + pinmux = ; /* TIM8_CH2 */ + }; + }; + + + pwm12_pins_mx: pwm12-0 { + pins { + pinmux = ; /* TIM12_CH2 */ + bias-pull-down; + drive-push-pull; + slew-rate = <0>; + }; + }; + + pwm12_sleep_pins_mx: pwm12-sleep-0 { + pins { + pinmux = ; /* TIM12_CH2 */ + }; + }; + + sdmmc1_pins_mx: sdmmc1_mx-0 { + u-boot,dm-pre-reloc; + pins1 { + u-boot,dm-pre-reloc; + pinmux = , /* SDMMC1_D0 */ + , /* SDMMC1_D1 */ + , /* SDMMC1_D2 */ + , /* SDMMC1_D3 */ + ; /* SDMMC1_CMD */ + bias-disable; + drive-push-pull; + slew-rate = <1>; + }; + pins2 { + u-boot,dm-pre-reloc; + pinmux = ; /* SDMMC1_CK */ + bias-disable; + drive-push-pull; + slew-rate = <2>; + }; + }; + + sdmmc1_opendrain_pins_mx: sdmmc1_opendrain_mx-0 { + u-boot,dm-pre-reloc; + pins1 { + u-boot,dm-pre-reloc; + pinmux = , /* SDMMC1_D0 */ + , /* SDMMC1_D1 */ + , /* SDMMC1_D2 */ + ; /* SDMMC1_D3 */ + bias-disable; + drive-push-pull; + slew-rate = <1>; + }; + pins2 { + u-boot,dm-pre-reloc; + pinmux = ; /* SDMMC1_CK */ + bias-disable; + drive-push-pull; + slew-rate = <2>; + }; + pins3 { + u-boot,dm-pre-reloc; + pinmux = ; /* SDMMC1_CMD */ + bias-disable; + drive-open-drain; + slew-rate = <1>; + }; + }; + + sdmmc1_sleep_pins_mx: sdmmc1_sleep_mx-0 { + u-boot,dm-pre-reloc; + pins { + u-boot,dm-pre-reloc; + pinmux = , /* SDMMC1_D0 */ + , /* SDMMC1_D1 */ + , /* SDMMC1_D2 */ + , /* SDMMC1_D3 */ + , /* SDMMC1_CK */ + ; /* SDMMC1_CMD */ + }; + }; + + uart4_pins_mx: uart4_mx-0 { + u-boot,dm-pre-reloc; + pins1 { + u-boot,dm-pre-reloc; + pinmux = ; /* UART4_RX */ + /* pull-up on rx to avoid floating level */ + bias-pull-up; + }; + pins2 { + u-boot,dm-pre-reloc; + pinmux = ; /* UART4_TX */ + bias-disable; + drive-push-pull; + slew-rate = <0>; + }; + }; + + uart4_sleep_pins_mx: uart4_sleep_mx-0 { + u-boot,dm-pre-reloc; + pins { + u-boot,dm-pre-reloc; + pinmux = , /* UART4_RX */ + ; /* UART4_TX */ + }; + }; +}; + +&pinctrl_z { + u-boot,dm-pre-reloc; + + i2c4_pins_z_mx: i2c4_mx-0 { + u-boot,dm-pre-reloc; + pins { + u-boot,dm-pre-reloc; + pinmux = , /* I2C4_SCL */ + ; /* I2C4_SDA */ + bias-disable; + drive-open-drain; + slew-rate = <0>; + }; + }; + + i2c4_sleep_pins_z_mx: i2c4_sleep_mx-0 { + u-boot,dm-pre-reloc; + pins { + u-boot,dm-pre-reloc; + pinmux = , /* I2C4_SCL */ + ; /* I2C4_SDA */ + }; + }; + + spi6_pins_mx: spi6-0 { + pins1 { + pinmux = , /* SPI6_SCK */ + ; /* SPI6_MOSI */ + bias-disable; + drive-push-pull; + slew-rate = <1>; + }; + + pins2 { + pinmux = ; /* SPI6_MISO */ + bias-disable; + }; + }; + + spi6_sleep_pins_mx: spi6-sleep-0 { + pins { + pinmux = , /* SPI6_SCK */ + , /* SPI6_MISO */ + ; /* SPI6_MOSI */ + }; + }; +}; + +&m4_rproc{ + memory-region = <&retram>, <&mcuram>, <&mcuram2>, <&vdev0vring0>, + <&vdev0vring1>, <&vdev0buffer>; + mboxes = <&ipcc 0>, <&ipcc 1>, <&ipcc 2>; + mbox-names = "vq0", "vq1", "shutdown"; + interrupt-parent = <&exti>; + interrupts = <68 1>; + wakeup-source; + status = "okay"; +}; + +&pwr_regulators { + vdd-supply = <&vdd>; + vdd_3v3_usbfs-supply = <&vdd_usb>; +}; + + +&crc1{ + status = "okay"; +}; + +&cryp1{ + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&dma1{ + status = "okay"; + sram = <&dma_pool>; +}; + +&dma2{ + status = "okay"; + sram = <&dma_pool>; +}; + +&dts{ + status = "okay"; +}; + +&gpu{ + status = "okay"; + contiguous-area = <&gpu_reserved>; +}; + +&hash1{ + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&hsem{ + status = "okay"; +}; + +&i2c1 { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&i2c1_pins_mx>; + pinctrl-1 = <&i2c1_pins_sleep_mx>; + i2c-scl-rising-time-ns = <100>; + i2c-scl-falling-time-ns = <7>; + status = "okay"; + /delete-property/dmas; + /delete-property/dma-names; +}; + +&i2c2 { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&i2c2_pins_mx>; + pinctrl-1 = <&i2c2_pins_sleep_mx>; + i2c-scl-rising-time-ns = <100>; + i2c-scl-falling-time-ns = <7>; + status = "okay"; + /delete-property/dmas; + /delete-property/dma-names; +}; + +&i2c5 { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&i2c5_pins_mx>; + pinctrl-1 = <&i2c5_pins_sleep_mx>; + i2c-scl-rising-time-ns = <100>; + i2c-scl-falling-time-ns = <7>; + status = "okay"; + /delete-property/dmas; + /delete-property/dma-names; +}; + +&i2c4{ + u-boot,dm-pre-reloc; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&i2c4_pins_z_mx>; + pinctrl-1 = <&i2c4_sleep_pins_z_mx>; + status = "okay"; + + i2c-scl-rising-time-ns = <185>; + i2c-scl-falling-time-ns = <20>; + clock-frequency = <400000>; + /delete-property/ dmas; + /delete-property/ dma-names; + + pmic:stpmic@33{ + compatible = "st,stpmic1"; + reg = <0x33>; + interrupts-extended = <&exti_pwr 55 IRQ_TYPE_EDGE_FALLING>; + interrupt-controller; + #interrupt-cells = <2>; + status = "okay"; + + regulators{ + compatible = "st,stpmic1-regulators"; + buck1-supply = <&vin>; + buck2-supply = <&vin>; + buck3-supply = <&vin>; + buck4-supply = <&vin>; + ldo1-supply = <&v3v3>; + ldo2-supply = <&vin>; + ldo3-supply = <&vdd_ddr>; + ldo4-supply = <&vin>; + ldo5-supply = <&vin>; + ldo6-supply = <&v3v3>; + vref_ddr-supply = <&vin>; + boost-supply = <&vin>; + pwr_sw1-supply = <&bst_out>; + pwr_sw2-supply = <&bst_out>; + + vddcore:buck1{ + regulator-name = "vddcore"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1350000>; + regulator-always-on; + regulator-initial-mode = <0>; + regulator-over-current-protection; + }; + + vdd_ddr:buck2{ + regulator-name = "vdd_ddr"; + regulator-min-microvolt = <1350000>; + regulator-max-microvolt = <1350000>; + regulator-always-on; + regulator-initial-mode = <0>; + regulator-over-current-protection; + }; + + vdd:buck3{ + regulator-name = "vdd"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + st,mask-reset; + regulator-initial-mode = <0>; + regulator-over-current-protection; + }; + + v3v3:buck4{ + regulator-name = "v3v3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + regulator-over-current-protection; + regulator-initial-mode = <0>; + }; + + v1v8_audio:ldo1{ + regulator-name = "v1v8_audio"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-always-on; + interrupts = ; + }; + + v3v3_hdmi:ldo2{ + regulator-name = "v3v3_hdmi"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + interrupts = ; + }; + + vtt_ddr:ldo3{ + regulator-name = "vtt_ddr"; + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <750000>; + regulator-always-on; + regulator-over-current-protection; + }; + + vdd_usb:ldo4{ + regulator-name = "vdd_usb"; + interrupts = ; + }; + + vdda:ldo5{ + regulator-name = "vdda"; + regulator-min-microvolt = <2900000>; + regulator-max-microvolt = <2900000>; + interrupts = ; + regulator-boot-on; + }; + + v1v2_hdmi:ldo6{ + regulator-name = "v1v2_hdmi"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + regulator-always-on; + interrupts = ; + }; + + vref_ddr:vref_ddr{ + regulator-name = "vref_ddr"; + regulator-always-on; + regulator-over-current-protection; + }; + + bst_out:boost{ + regulator-name = "bst_out"; + interrupts = ; + }; + + vbus_otg:pwr_sw1{ + regulator-name = "vbus_otg"; + interrupts = ; + }; + + vbus_sw:pwr_sw2{ + regulator-name = "vbus_sw"; + interrupts = ; + regulator-active-discharge = <1>; + }; + }; + + onkey{ + compatible = "st,stpmic1-onkey"; + interrupts = , ; + interrupt-names = "onkey-falling", "onkey-rising"; + power-off-time-sec = <10>; + status = "okay"; + }; + + watchdog { + compatible = "st,stpmic1-wdt"; + status = "disabled"; + }; + }; + eeprom@50 { + compatible = "atmel,24c02"; + reg = <0x50>; + pagesize = <16>; + }; +}; + +&ipcc{ + status = "okay"; +}; + +&iwdg2{ + status = "okay"; + timeout-sec = <32>; +}; + +&mdma1{ + status = "okay"; +}; + +&rcc{ + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&rng1{ + status = "okay"; +}; + +&rtc{ + status = "okay"; +}; + +&sdmmc1{ + u-boot,dm-pre-reloc; + pinctrl-names = "default", "opendrain", "sleep"; + pinctrl-0 = <&sdmmc1_pins_mx>; + pinctrl-1 = <&sdmmc1_opendrain_pins_mx>; + pinctrl-2 = <&sdmmc1_sleep_pins_mx>; + status = "okay"; + + cd-gpios = <&gpiog 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; + disable-wp; + st,neg-edge; + bus-width = <4>; + vmmc-supply = <&v3v3>; +}; + +&tamp{ + status = "okay"; +}; + +&uart4{ + u-boot,dm-pre-reloc; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&uart4_pins_mx>; + pinctrl-1 = <&uart4_sleep_pins_mx>; + status = "okay"; + + /delete-property/ dmas; + /delete-property/ dma-names; +}; + +&usbh_ehci{ + status = "okay"; + phys = <&usbphyc_port0>; +}; + +&usbh_ohci{ + status = "okay"; +}; + +&usbotg_hs{ + u-boot,dm-pre-reloc; + status = "okay"; + phys = <&usbphyc_port1 0>; + phy-names = "usb2-phy"; +}; + +&usbphyc{ + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&usbphyc_port0{ + u-boot,dm-pre-reloc; + status = "okay"; + phy-supply = <&vdd_usb>; + st,phy-tuning = <&usb_phy_tuning>; +}; + +&usbphyc_port1{ + u-boot,dm-pre-reloc; + status = "okay"; + phy-supply = <&vdd_usb>; + st,phy-tuning = <&usb_phy_tuning>; +}; + +&adc { + vdd-supply = <&vdd>; + vdda-supply = <&vdda>; + vref-supply = <&vdda>; + status = "okay"; + adc1: adc@0 { + st,min-sample-time-nsecs = <5000>; + st,adc-channels = <0 1>; + status = "okay"; + }; + + adc2: adc@100 { + status = "okay"; + }; + + adc_temp: temp { + status = "okay"; + }; +}; + +&usbh_ohci{ + phys = <&usbphyc_port0>; +}; + +&cpu0{ + cpu-supply = <&vddcore>; +}; + +&cpu1{ + cpu-supply = <&vddcore>; +}; + +&sram{ + dma_pool:dma_pool@0{ + reg = <0x50000 0x10000>; + pool; + }; +}; + +&spi2 { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&spi2_pins_mx>; + pinctrl-1 = <&spi2_sleep_pins_mx>; + cs-gpios = <&gpioi 0 0>; + status = "okay"; + + spidev2: spidev2@0{ + compatible = "rohm,dh2228fv"; + spi-max-frequency = <30000000>; + reg = <0>; + }; +}; + +&spi4 { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&spi4_pins_mx>; + pinctrl-1 = <&spi4_sleep_pins_mx>; + cs-gpios = <&gpioe 11 0>; + status = "okay"; + + spidev4: spidev4@0{ + compatible = "rohm,dh2228fv"; + spi-max-frequency = <30000000>; + reg = <0>; + }; +}; + +&spi6 { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&spi6_pins_mx>; + pinctrl-1 = <&spi6_sleep_pins_mx>; + cs-gpios = <&gpioz 3 0>; + status = "okay"; + + spidev6: spidev6@0{ + compatible = "rohm,dh2228fv"; + spi-max-frequency = <30000000>; + reg = <0>; + }; +}; + +&usart2 { + pinctrl-names = "default", "sleep", "idle"; + pinctrl-0 = <&usart2_pins_mx>; + pinctrl-1 = <&usart2_sleep_pins_mx>; + pinctrl-2 = <&usart2_idle_pins_mx>; + status = "okay"; +}; + +&uart5 { + pinctrl-names = "default", "sleep", "idle"; + pinctrl-0 = <&uart5_pins_mx>; + pinctrl-1 = <&uart5_sleep_pins_mx>; + pinctrl-2 = <&uart5_idle_pins_mx>; + status = "okay"; +}; + +&uart7 { + pinctrl-names = "default", "sleep", "idle"; + pinctrl-0 = <&uart7_pins_mx>; + pinctrl-1 = <&uart7_sleep_pins_mx>; + pinctrl-2 = <&uart7_idle_pins_mx>; + status = "okay"; +}; + +&uart8 { + pinctrl-names = "default", "sleep", "idle"; + pinctrl-0 = <&uart8_pins_mx>; + pinctrl-1 = <&uart8_sleep_pins_mx>; + pinctrl-2 = <&uart8_idle_pins_mx>; + status = "okay"; +}; + +&m_can1 { + pinctrl-names = "default"; + pinctrl-0 = <&m_can1_pins_mx>; + status = "okay"; + can-transceiver { + max-bitrate = <5000000>; + }; +}; + +&timers1 { + status = "okay"; + /* spare dmas for other usage */ + /delete-property/dmas; + /delete-property/dma-names; + pwm1: pwm { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&pwm1_pins_mx>; + pinctrl-1 = <&pwm1_sleep_pins_mx>; + status = "okay"; + }; +}; + +&timers3 { + status = "okay"; + /* spare dmas for other usage */ + /delete-property/dmas; + /delete-property/dma-names; + pwm3: pwm { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&pwm3_pins_mx>; + pinctrl-1 = <&pwm3_sleep_pins_mx>; + status = "okay"; + }; +}; + +&timers4 { + status = "okay"; + /* spare dmas for other usage */ + /delete-property/dmas; + /delete-property/dma-names; + pwm4: pwm { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&pwm4_pins_mx>; + pinctrl-1 = <&pwm4_sleep_pins_mx>; + status = "okay"; + }; +}; + +&timers8 { + status = "okay"; + /* spare dmas for other usage */ + /delete-property/dmas; + /delete-property/dma-names; + pwm8: pwm { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&pwm8_pins_mx>; + pinctrl-1 = <&pwm8_sleep_pins_mx>; + status = "okay"; + }; +}; + +&timers12 { + status = "okay"; + /* spare dmas for other usage */ + /delete-property/dmas; + /delete-property/dma-names; + pwm12: pwm { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&pwm12_pins_mx>; + pinctrl-1 = <&pwm12_sleep_pins_mx>; + status = "okay"; + }; +}; diff --git a/buildroot/board/octavo/osd32mp1-brk/overlay/boot/extlinux/extlinux.conf b/buildroot/board/octavo/osd32mp1-brk/overlay/boot/extlinux/extlinux.conf new file mode 100644 index 0000000000..a1ca2e58d6 --- /dev/null +++ b/buildroot/board/octavo/osd32mp1-brk/overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label osd32mp1-brk-buildroot + kernel /boot/zImage + devicetree /boot/stm32mp157c-osd32mp1-brk.dtb + append root=/dev/mmcblk0p4 rootwait diff --git a/buildroot/board/octavo/osd32mp1-brk/patches/uboot/0001-Add-OSD32MP1-BRK-device-tree-support.patch b/buildroot/board/octavo/osd32mp1-brk/patches/uboot/0001-Add-OSD32MP1-BRK-device-tree-support.patch new file mode 100644 index 0000000000..3e4b6de235 --- /dev/null +++ b/buildroot/board/octavo/osd32mp1-brk/patches/uboot/0001-Add-OSD32MP1-BRK-device-tree-support.patch @@ -0,0 +1,1509 @@ +From 4731b1f73e0bfe3e3539f6b7c17e0f5366996a98 Mon Sep 17 00:00:00 2001 +From: "neeraj.dantu" +Date: Sun, 21 Nov 2021 23:26:05 -0600 +Subject: [PATCH 1/2] Add OSD32MP1-BRK device tree support + +Signed-off-by: Kory Maincent +--- + arch/arm/dts/Makefile | 3 +- + .../dts/stm32mp15-osd32mp1-ddr3-1x4Gb.dtsi | 119 ++ + .../dts/stm32mp157c-osd32mp1-brk-u-boot.dtsi | 219 ++++ + arch/arm/dts/stm32mp157c-osd32mp1-brk.dts | 1120 +++++++++++++++++ + 4 files changed, 1460 insertions(+), 1 deletion(-) + create mode 100644 arch/arm/dts/stm32mp15-osd32mp1-ddr3-1x4Gb.dtsi + create mode 100644 arch/arm/dts/stm32mp157c-osd32mp1-brk-u-boot.dtsi + create mode 100644 arch/arm/dts/stm32mp157c-osd32mp1-brk.dts + +diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile +index 83677c3d4f..6e67c6d18a 100644 +--- a/arch/arm/dts/Makefile ++++ b/arch/arm/dts/Makefile +@@ -959,7 +959,8 @@ dtb-$(CONFIG_STM32MP15x) += \ + stm32mp157f-ed1.dtb \ + stm32mp157f-ev1.dtb \ + stm32mp15xx-dhcom-pdk2.dtb \ +- stm32mp15xx-dhcor-avenger96.dtb ++ stm32mp15xx-dhcor-avenger96.dtb \ ++ stm32mp157c-osd32mp1-brk.dtb + + dtb-$(CONFIG_SOC_K3_AM6) += k3-am654-base-board.dtb k3-am654-r5-base-board.dtb + dtb-$(CONFIG_SOC_K3_J721E) += k3-j721e-common-proc-board.dtb \ +diff --git a/arch/arm/dts/stm32mp15-osd32mp1-ddr3-1x4Gb.dtsi b/arch/arm/dts/stm32mp15-osd32mp1-ddr3-1x4Gb.dtsi +new file mode 100644 +index 0000000000..362f3281b8 +--- /dev/null ++++ b/arch/arm/dts/stm32mp15-osd32mp1-ddr3-1x4Gb.dtsi +@@ -0,0 +1,119 @@ ++/* ++ * Copyright (C) 2015-2018, STMicroelectronics - All Rights Reserved ++ * ++ * SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause ++ * ++ */ ++ ++/* ++ * File generated by STMicroelectronics STM32CubeMX DDR Tool for MPUs ++ * DDR type: DDR3 / DDR3L ++ * DDR width: 16bits ++ * DDR density: 4Gb ++ * System frequency: 533000Khz ++ * Relaxed Timing Mode: false ++ * Address mapping type: RBC ++ * ++ * Save Date: 2020.08.20, save Time: 10:57:25 ++ */ ++ ++#define DDR_MEM_NAME "DDR3-DDR3L 16bits 533000Khz" ++#define DDR_MEM_SPEED 533000 ++#define DDR_MEM_SIZE 0x20000000 ++ ++#define DDR_MSTR 0x00041401 ++#define DDR_MRCTRL0 0x00000010 ++#define DDR_MRCTRL1 0x00000000 ++#define DDR_DERATEEN 0x00000000 ++#define DDR_DERATEINT 0x00800000 ++#define DDR_PWRCTL 0x00000000 ++#define DDR_PWRTMG 0x00400010 ++#define DDR_HWLPCTL 0x00000000 ++#define DDR_RFSHCTL0 0x00210000 ++#define DDR_RFSHCTL3 0x00000000 ++#define DDR_RFSHTMG 0x0081008B ++#define DDR_CRCPARCTL0 0x00000000 ++#define DDR_DRAMTMG0 0x121B2414 ++#define DDR_DRAMTMG1 0x000A041C ++#define DDR_DRAMTMG2 0x0608090F ++#define DDR_DRAMTMG3 0x0050400C ++#define DDR_DRAMTMG4 0x08040608 ++#define DDR_DRAMTMG5 0x06060403 ++#define DDR_DRAMTMG6 0x02020002 ++#define DDR_DRAMTMG7 0x00000202 ++#define DDR_DRAMTMG8 0x00001005 ++#define DDR_DRAMTMG14 0x000000A0 ++#define DDR_ZQCTL0 0xC2000040 ++#define DDR_DFITMG0 0x02060105 ++#define DDR_DFITMG1 0x00000202 ++#define DDR_DFILPCFG0 0x07000000 ++#define DDR_DFIUPD0 0xC0400003 ++#define DDR_DFIUPD1 0x00000000 ++#define DDR_DFIUPD2 0x00000000 ++#define DDR_DFIPHYMSTR 0x00000000 ++#define DDR_ODTCFG 0x06000600 ++#define DDR_ODTMAP 0x00000001 ++#define DDR_SCHED 0x00000C01 ++#define DDR_SCHED1 0x00000000 ++#define DDR_PERFHPR1 0x01000001 ++#define DDR_PERFLPR1 0x08000200 ++#define DDR_PERFWR1 0x08000400 ++#define DDR_DBG0 0x00000000 ++#define DDR_DBG1 0x00000000 ++#define DDR_DBGCMD 0x00000000 ++#define DDR_POISONCFG 0x00000000 ++#define DDR_PCCFG 0x00000010 ++#define DDR_PCFGR_0 0x00010000 ++#define DDR_PCFGW_0 0x00000000 ++#define DDR_PCFGQOS0_0 0x02100C03 ++#define DDR_PCFGQOS1_0 0x00800100 ++#define DDR_PCFGWQOS0_0 0x01100C03 ++#define DDR_PCFGWQOS1_0 0x01000200 ++#define DDR_PCFGR_1 0x00010000 ++#define DDR_PCFGW_1 0x00000000 ++#define DDR_PCFGQOS0_1 0x02100C03 ++#define DDR_PCFGQOS1_1 0x00800040 ++#define DDR_PCFGWQOS0_1 0x01100C03 ++#define DDR_PCFGWQOS1_1 0x01000200 ++#define DDR_ADDRMAP1 0x00070707 ++#define DDR_ADDRMAP2 0x00000000 ++#define DDR_ADDRMAP3 0x1F000000 ++#define DDR_ADDRMAP4 0x00001F1F ++#define DDR_ADDRMAP5 0x06060606 ++#define DDR_ADDRMAP6 0x0F060606 ++#define DDR_ADDRMAP9 0x00000000 ++#define DDR_ADDRMAP10 0x00000000 ++#define DDR_ADDRMAP11 0x00000000 ++#define DDR_PGCR 0x01442E02 ++#define DDR_PTR0 0x0022AA5B ++#define DDR_PTR1 0x04841104 ++#define DDR_PTR2 0x042DA068 ++#define DDR_ACIOCR 0x10400812 ++#define DDR_DXCCR 0x00000C40 ++#define DDR_DSGCR 0xF200011F ++#define DDR_DCR 0x0000000B ++#define DDR_DTPR0 0x38D488D0 ++#define DDR_DTPR1 0x098B00D8 ++#define DDR_DTPR2 0x10023600 ++#define DDR_MR0 0x00000840 ++#define DDR_MR1 0x00000000 ++#define DDR_MR2 0x00000208 ++#define DDR_MR3 0x00000000 ++#define DDR_ODTCR 0x00010000 ++#define DDR_ZQ0CR1 0x00000038 ++#define DDR_DX0GCR 0x0000CE81 ++#define DDR_DX0DLLCR 0x40000000 ++#define DDR_DX0DQTR 0xFFFFFFFF ++#define DDR_DX0DQSTR 0x3DB02000 ++#define DDR_DX1GCR 0x0000CE81 ++#define DDR_DX1DLLCR 0x40000000 ++#define DDR_DX1DQTR 0xFFFFFFFF ++#define DDR_DX1DQSTR 0x3DB02000 ++#define DDR_DX2GCR 0x0000CE80 ++#define DDR_DX2DLLCR 0x40000000 ++#define DDR_DX2DQTR 0xFFFFFFFF ++#define DDR_DX2DQSTR 0x3DB02000 ++#define DDR_DX3GCR 0x0000CE80 ++#define DDR_DX3DLLCR 0x40000000 ++#define DDR_DX3DQTR 0xFFFFFFFF ++#define DDR_DX3DQSTR 0x3DB02000 +diff --git a/arch/arm/dts/stm32mp157c-osd32mp1-brk-u-boot.dtsi b/arch/arm/dts/stm32mp157c-osd32mp1-brk-u-boot.dtsi +new file mode 100644 +index 0000000000..b7284f3028 +--- /dev/null ++++ b/arch/arm/dts/stm32mp157c-osd32mp1-brk-u-boot.dtsi +@@ -0,0 +1,219 @@ ++/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause*/ ++/* ++ * Copyright (C) 2020, Octavo Systems LLC - All Rights Reserved ++ */ ++ ++/* For more information on Device Tree configuration, please refer to ++ * https://wiki.st.com/stm32mpu/wiki/Category:Device_tree_configuration ++ */ ++ ++#include ++#include "stm32mp15-osd32mp1-ddr3-1x4Gb.dtsi" ++#include "stm32mp15-u-boot.dtsi" ++#include "stm32mp15-ddr.dtsi" ++ ++ ++/ { ++ ++ aliases{ ++ i2c0 = &i2c4; ++ mmc0 = &sdmmc1; ++ usb0 = &usbotg_hs; ++ }; ++ ++ config{ ++ u-boot,boot-led = "LED2_GRN"; ++ u-boot,error-led = "LED2_RED"; ++ u-boot,mmc-env-partition = "fip"; ++ st,stm32prog-gpios = <&gpiod 9 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; ++ }; ++ ++#ifdef CONFIG_STM32MP15x_STM32IMAGE ++ config { ++ u-boot,mmc-env-partition = "ssbl"; ++ }; ++ ++ /* only needed for boot with TF-A, witout FIP support */ ++ firmware { ++ optee { ++ compatible = "linaro,optee-tz"; ++ method = "smc"; ++ }; ++ }; ++ ++ reserved-memory { ++ optee@de000000 { ++ reg = <0xde000000 0x02000000>; ++ no-map; ++ }; ++ }; ++#endif ++ ++}; /*root*/ ++ ++#ifndef CONFIG_TFABOOT ++ ++&clk_hse { ++ st,digbypass; ++}; ++ ++&rcc { ++ u-boot,dm-pre-reloc; ++ st,clksrc = < ++ CLK_MPU_PLL1P ++ CLK_AXI_PLL2P ++ CLK_MCU_PLL3P ++ CLK_PLL12_HSE ++ CLK_PLL3_HSE ++ CLK_PLL4_HSE ++ CLK_RTC_LSE ++ CLK_MCO1_DISABLED ++ CLK_MCO2_DISABLED ++ >; ++ st,clkdiv = < ++ 1 /*MPU*/ ++ 0 /*AXI*/ ++ 0 /*MCU*/ ++ 1 /*APB1*/ ++ 1 /*APB2*/ ++ 1 /*APB3*/ ++ 1 /*APB4*/ ++ 2 /*APB5*/ ++ 23 /*RTC*/ ++ 0 /*MCO1*/ ++ 0 /*MCO2*/ ++ >; ++ st,pkcs = < ++ CLK_CKPER_HSE ++ CLK_FMC_ACLK ++ CLK_QSPI_ACLK ++ CLK_ETH_DISABLED ++ CLK_SDMMC12_PLL4P ++ CLK_DSI_DSIPLL ++ CLK_STGEN_HSE ++ CLK_USBPHY_HSE ++ CLK_SPI2S1_PLL3Q ++ CLK_SPI2S23_PLL3Q ++ CLK_SPI45_HSI ++ CLK_SPI6_HSI ++ CLK_I2C46_HSI ++ CLK_SDMMC3_PLL4P ++ CLK_USBO_USBPHY ++ CLK_ADC_CKPER ++ CLK_CEC_LSE ++ CLK_I2C12_HSI ++ CLK_I2C35_HSI ++ CLK_UART1_HSI ++ CLK_UART24_HSI ++ CLK_UART35_HSI ++ CLK_UART6_HSI ++ CLK_UART78_HSI ++ CLK_SPDIF_PLL4P ++ CLK_FDCAN_PLL4R ++ CLK_SAI1_PLL3Q ++ CLK_SAI2_PLL3Q ++ CLK_SAI3_PLL3Q ++ CLK_SAI4_PLL3Q ++ CLK_RNG1_LSI ++ CLK_RNG2_LSI ++ CLK_LPTIM1_PCLK1 ++ CLK_LPTIM23_PCLK3 ++ CLK_LPTIM45_LSE ++ >; ++ pll2:st,pll@1 { ++ compatible = "st,stm32mp1-pll"; ++ reg = <1>; ++ cfg = < 2 65 1 0 0 PQR(1,1,1) >; ++ frac = < 0x1400 >; ++ u-boot,dm-pre-reloc; ++ }; ++ pll3:st,pll@2 { ++ compatible = "st,stm32mp1-pll"; ++ reg = <2>; ++ cfg = < 1 33 1 16 36 PQR(1,1,1) >; ++ frac = < 0x1a04 >; ++ u-boot,dm-pre-reloc; ++ }; ++ pll4:st,pll@3 { ++ compatible = "st,stm32mp1-pll"; ++ reg = <3>; ++ cfg = < 3 98 5 7 7 PQR(1,1,1) >; ++ u-boot,dm-pre-reloc; ++ }; ++}; ++ ++&i2c4{ ++ u-boot,dm-pre-reloc; ++}; ++ ++&i2c4_pins_z_mx { ++ u-boot,dm-pre-reloc; ++ pins { ++ u-boot,dm-pre-reloc; ++ }; ++}; ++ ++&sdmmc1{ ++ u-boot,dm-pre-reloc; ++}; ++ ++&sdmmc1_pins_mx { ++ u-boot,dm-spl; ++ pins1 { ++ u-boot,dm-spl; ++ }; ++ pins2 { ++ u-boot,dm-spl; ++ }; ++}; ++ ++#endif /*CONFIG_TFABOOT*/ ++ ++&cryp1{ ++ u-boot,dm-pre-reloc; ++}; ++ ++&hash1{ ++ u-boot,dm-pre-reloc; ++}; ++ ++&uart4{ ++ u-boot,dm-pre-reloc; ++}; ++ ++&usbotg_hs{ ++ u-boot,dm-pre-reloc; ++ u-boot,force-b-session-valid; ++ hnp-srp-disable; ++ dr_mode = "peripheral"; ++}; ++ ++&usbphyc{ ++ u-boot,dm-pre-reloc; ++}; ++ ++&usbphyc_port0{ ++ u-boot,dm-pre-reloc; ++}; ++ ++&usbphyc_port1{ ++ u-boot,dm-pre-reloc; ++}; ++ ++&adc{ ++ status = "okay"; ++}; ++ ++#ifndef CONFIG_STM32MP1_TRUSTED ++&i2s2{ ++ clocks = <&rcc SPI2>, <&rcc SPI2_K>, <&rcc PLL3_Q>, <&rcc PLL3_R>; ++}; ++ ++&pmic{ ++ u-boot,dm-pre-reloc; ++}; ++ ++&sai2{ ++ clocks = <&rcc SAI2>, <&rcc PLL3_Q>, <&rcc PLL3_R>; ++}; ++#endif /*CONFIG_STM32MP1_TRUSTED*/ +diff --git a/arch/arm/dts/stm32mp157c-osd32mp1-brk.dts b/arch/arm/dts/stm32mp157c-osd32mp1-brk.dts +new file mode 100644 +index 0000000000..d5f2793f54 +--- /dev/null ++++ b/arch/arm/dts/stm32mp157c-osd32mp1-brk.dts +@@ -0,0 +1,1120 @@ ++/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */ ++/* ++ * Copyright (C) Octavo Systems LLC 2020 - All Rights Reserved ++ */ ++ ++/* For more information on Device Tree configuration, please refer to ++ * https://wiki.st.com/stm32mpu/wiki/Category:Device_tree_configuration ++ */ ++ ++/dts-v1/; ++#include ++#include "stm32mp157.dtsi" ++#include "stm32mp15xc.dtsi" ++#include "stm32mp15xxac-pinctrl.dtsi" ++#include "stm32mp15-m4-srm.dtsi" ++#include ++#include ++#include ++ ++/ { ++ model = "Octavo OSD32MP1 BRK board"; ++ compatible = "st,stm32mp157c-osd32mp1-brk", "st,stm32mp157"; ++ ++ memory@c0000000 { ++ device_type = "memory"; ++ reg = <0xc0000000 0x20000000>; ++ }; ++ ++ reserved-memory { ++ #address-cells = <1>; ++ #size-cells = <1>; ++ ranges; ++ ++ mcuram2:mcuram2@10000000{ ++ compatible = "shared-dma-pool"; ++ reg = <0x10000000 0x40000>; ++ no-map; ++ }; ++ ++ vdev0vring0:vdev0vring0@10040000{ ++ compatible = "shared-dma-pool"; ++ reg = <0x10040000 0x1000>; ++ no-map; ++ }; ++ ++ vdev0vring1:vdev0vring1@10041000{ ++ compatible = "shared-dma-pool"; ++ reg = <0x10041000 0x1000>; ++ no-map; ++ }; ++ ++ vdev0buffer:vdev0buffer@10042000{ ++ compatible = "shared-dma-pool"; ++ reg = <0x10042000 0x4000>; ++ no-map; ++ }; ++ ++ mcuram:mcuram@30000000{ ++ compatible = "shared-dma-pool"; ++ reg = <0x30000000 0x40000>; ++ no-map; ++ }; ++ ++ retram:retram@38000000{ ++ compatible = "shared-dma-pool"; ++ reg = <0x38000000 0x10000>; ++ no-map; ++ }; ++ ++ gpu_reserved:gpu@d4000000{ ++ reg = <0xd4000000 0x4000000>; ++ no-map; ++ }; ++ }; ++ ++ led{ ++ compatible = "gpio-leds"; ++ ++ red1{ ++ label = "LED1_RED"; ++ gpios = <&gpioz 6 GPIO_ACTIVE_LOW>; ++ linux,default-trigger = "heartbeat"; ++ status = "okay"; ++ default-state = "off"; ++ }; ++ ++ green1{ ++ label = "LED1_GRN"; ++ gpios = <&gpioz 7 GPIO_ACTIVE_LOW>; ++ status = "okay"; ++ default-state = "on"; ++ }; ++ ++ red2{ ++ label = "LED2_RED"; ++ gpios = <&gpioi 8 GPIO_ACTIVE_LOW>; ++ status = "okay"; ++ default-state = "off"; ++ }; ++ ++ green2{ ++ label = "LED2_GRN"; ++ gpios = <&gpioi 9 GPIO_ACTIVE_LOW>; ++ default-state = "off"; ++ }; ++ }; ++ ++ usb_phy_tuning:usb-phy-tuning{ ++ st,hs-dc-level = <2>; ++ st,fs-rftime-tuning; ++ st,hs-rftime-reduction; ++ st,hs-current-trim = <15>; ++ st,hs-impedance-trim = <1>; ++ st,squelch-level = <3>; ++ st,hs-rx-offset = <2>; ++ st,no-lsfs-sc; ++ }; ++ ++ vin:vin{ ++ compatible = "regulator-fixed"; ++ regulator-name = "vin"; ++ regulator-min-microvolt = <5000000>; ++ regulator-max-microvolt = <5000000>; ++ regulator-always-on; ++ }; ++ ++ aliases{ ++ serial0 = &uart4; ++ serial2 = &usart2; ++ serial5 = &uart5; ++ serial7 = &uart7; ++ serial1 = &uart8; ++ }; ++ ++ chosen{ ++ stdout-path = "serial0:115200n8"; ++ }; ++ ++}; /*root*/ ++ ++&pinctrl { ++ u-boot,dm-pre-reloc; ++ i2c1_pins_mx: i2c1-0 { ++ pins { ++ pinmux = , /* I2C1_SCL */ ++ ; /* I2C1_SDA */ ++ bias-disable; ++ drive-open-drain; ++ slew-rate = <0>; ++ }; ++ }; ++ ++ i2c1_pins_sleep_mx: i2c1-1 { ++ pins { ++ pinmux = , /* I2C1_SCL */ ++ ; /* I2C1_SDA */ ++ }; ++ }; ++ ++ i2c2_pins_mx: i2c2-0 { ++ pins { ++ pinmux = , /* I2C2_SCL */ ++ ; /* I2C2_SDA */ ++ bias-disable; ++ drive-open-drain; ++ slew-rate = <0>; ++ }; ++ }; ++ ++ i2c2_pins_sleep_mx: i2c2-1 { ++ pins { ++ pinmux = , /* I2C2_SCL */ ++ ; /* I2C2_SDA */ ++ }; ++ }; ++ ++ i2c5_pins_mx: i2c5-0 { ++ pins { ++ pinmux = , /* I2C5_SCL */ ++ ; /* I2C5_SDA */ ++ bias-disable; ++ drive-open-drain; ++ slew-rate = <0>; ++ }; ++ }; ++ ++ i2c5_pins_sleep_mx: i2c5-1 { ++ pins { ++ pinmux = , /* I2C5_SCL */ ++ ; /* I2C5_SDA */ ++ }; ++ }; ++ ++ spi2_pins_mx: spi2-0 { ++ pins1 { ++ pinmux = , /* SPI2_SCK */ ++ ; /* SPI2_MOSI */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <1>; ++ }; ++ ++ pins2 { ++ pinmux = ; /* SPI2_MISO */ ++ bias-disable; ++ }; ++ }; ++ ++ spi2_sleep_pins_mx: spi2-sleep-0 { ++ pins { ++ pinmux = , /* SPI2_SCK */ ++ , /* SPI2_MISO */ ++ ; /* SPI2_MOSI */ ++ }; ++ }; ++ ++ spi4_pins_mx: spi4-0 { ++ pins1 { ++ pinmux = , /* SPI4_SCK */ ++ ; /* SPI4_MOSI */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <1>; ++ }; ++ ++ pins2 { ++ pinmux = ; /* SPI4_MISO */ ++ bias-disable; ++ }; ++ }; ++ ++ spi4_sleep_pins_mx: spi4-sleep-0 { ++ pins { ++ pinmux = , /* SPI2_SCK */ ++ , /* SPI2_MISO */ ++ ; /* SPI2_MOSI */ ++ }; ++ }; ++ ++ usart2_pins_mx: usart2-0 { ++ pins1 { ++ pinmux = ; /* USART2_TX */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <0>; ++ }; ++ pins2 { ++ pinmux = ; /* USART2_RX */ ++ bias-disable; ++ }; ++ }; ++ ++ usart2_idle_pins_mx: usart2-idle-0 { ++ pins1 { ++ pinmux = ; /* USART2_TX */ ++ }; ++ pins2 { ++ pinmux = ; /* USART2_RX */ ++ bias-disable; ++ }; ++ }; ++ ++ usart2_sleep_pins_mx: usart2-sleep-0 { ++ pins { ++ pinmux = , /* USART2_TX */ ++ ; /* USART2_RX */ ++ }; ++ }; ++ ++ uart5_pins_mx: uart5-0 { ++ pins1 { ++ pinmux = ; /* USART5_TX */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <0>; ++ }; ++ pins2 { ++ pinmux = ; /* USART5_RX */ ++ bias-disable; ++ }; ++ }; ++ ++ uart5_idle_pins_mx: uart5-idle-0 { ++ pins1 { ++ pinmux = ; /* USART5_TX */ ++ }; ++ pins2 { ++ pinmux = ; /* USART5_RX */ ++ bias-disable; ++ }; ++ }; ++ ++ uart5_sleep_pins_mx: uart5-sleep-0 { ++ pins { ++ pinmux = , /* USART5_TX */ ++ ; /* USART5_RX */ ++ }; ++ }; ++ ++ uart7_pins_mx: uart7-0 { ++ pins1 { ++ pinmux = ; /* USART7_TX */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <0>; ++ }; ++ pins2 { ++ pinmux = ; /* USART7_RX */ ++ bias-disable; ++ }; ++ }; ++ ++ uart7_idle_pins_mx: uart7-idle-0 { ++ pins1 { ++ pinmux = ; /* USART7_TX */ ++ }; ++ pins2 { ++ pinmux = ; /* USART7_RX */ ++ bias-disable; ++ }; ++ }; ++ ++ uart7_sleep_pins_mx: uart7-sleep-0 { ++ pins { ++ pinmux = , /* USART7_TX */ ++ ; /* USART7_RX */ ++ }; ++ }; ++ ++ uart8_pins_mx: uart8-0 { ++ pins1 { ++ pinmux = ; /* USART8_TX */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <0>; ++ }; ++ pins2 { ++ pinmux = ; /* USART8_RX */ ++ bias-disable; ++ }; ++ }; ++ ++ uart8_idle_pins_mx: uart8-idle-0 { ++ pins1 { ++ pinmux = ; /* USART8_TX */ ++ }; ++ pins2 { ++ pinmux = ; /* USART8_RX */ ++ bias-disable; ++ }; ++ }; ++ ++ uart8_sleep_pins_mx: uart8-sleep-0 { ++ pins { ++ pinmux = , /* USART8_TX */ ++ ; /* USART8_RX */ ++ }; ++ }; ++ ++ m_can1_pins_mx: m-can1-0 { ++ pins1 { ++ pinmux = ; /* CAN1_TX */ ++ slew-rate = <0>; ++ drive-push-pull; ++ bias-disable; ++ }; ++ pins2 { ++ pinmux = ; /* CAN1_RX */ ++ bias-disable; ++ }; ++ }; ++ ++ m_can1_sleep_pins_mx: m_can1-sleep@0 { ++ pins { ++ pinmux = , /* CAN1_TX */ ++ ; /* CAN1_RX */ ++ }; ++ }; ++ ++ pwm1_pins_mx: pwm1-0 { ++ pins { ++ pinmux = ; /* TIM1_CH2 */ ++ bias-pull-down; ++ drive-push-pull; ++ slew-rate = <0>; ++ }; ++ }; ++ ++ pwm1_sleep_pins_mx: pwm1-sleep-0 { ++ pins { ++ pinmux = ; /* TIM1_CH1 */ ++ }; ++ }; ++ ++ pwm3_pins_mx: pwm3-0 { ++ pins { ++ pinmux = ; /* TIM3_CH2 */ ++ bias-pull-down; ++ drive-push-pull; ++ slew-rate = <0>; ++ }; ++ }; ++ ++ pwm3_sleep_pins_mx: pwm3-sleep-0 { ++ pins { ++ pinmux = ; /* TIM3_CH2 */ ++ }; ++ }; ++ ++ pwm4_pins_mx: pwm4-0 { ++ pins { ++ pinmux = ; /* TIM4_CH2 */ ++ bias-pull-down; ++ drive-push-pull; ++ slew-rate = <0>; ++ }; ++ }; ++ ++ pwm4_sleep_pins_mx: pwm4-sleep-0 { ++ pins { ++ pinmux = ; /* TIM4_CH2 */ ++ }; ++ }; ++ ++ pwm8_pins_mx: pwm8-0 { ++ pins { ++ pinmux = ; /* TIM8_CH2 */ ++ bias-pull-down; ++ drive-push-pull; ++ slew-rate = <0>; ++ }; ++ }; ++ ++ pwm8_sleep_pins_mx: pwm8-sleep-0 { ++ pins { ++ pinmux = ; /* TIM8_CH2 */ ++ }; ++ }; ++ ++ ++ pwm12_pins_mx: pwm12-0 { ++ pins { ++ pinmux = ; /* TIM12_CH2 */ ++ bias-pull-down; ++ drive-push-pull; ++ slew-rate = <0>; ++ }; ++ }; ++ ++ pwm12_sleep_pins_mx: pwm12-sleep-0 { ++ pins { ++ pinmux = ; /* TIM12_CH2 */ ++ }; ++ }; ++ ++ sdmmc1_pins_mx: sdmmc1_mx-0 { ++ u-boot,dm-pre-reloc; ++ pins1 { ++ u-boot,dm-pre-reloc; ++ pinmux = , /* SDMMC1_D0 */ ++ , /* SDMMC1_D1 */ ++ , /* SDMMC1_D2 */ ++ , /* SDMMC1_D3 */ ++ ; /* SDMMC1_CMD */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <1>; ++ }; ++ pins2 { ++ u-boot,dm-pre-reloc; ++ pinmux = ; /* SDMMC1_CK */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <2>; ++ }; ++ }; ++ ++ sdmmc1_opendrain_pins_mx: sdmmc1_opendrain_mx-0 { ++ u-boot,dm-pre-reloc; ++ pins1 { ++ u-boot,dm-pre-reloc; ++ pinmux = , /* SDMMC1_D0 */ ++ , /* SDMMC1_D1 */ ++ , /* SDMMC1_D2 */ ++ ; /* SDMMC1_D3 */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <1>; ++ }; ++ pins2 { ++ u-boot,dm-pre-reloc; ++ pinmux = ; /* SDMMC1_CK */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <2>; ++ }; ++ pins3 { ++ u-boot,dm-pre-reloc; ++ pinmux = ; /* SDMMC1_CMD */ ++ bias-disable; ++ drive-open-drain; ++ slew-rate = <1>; ++ }; ++ }; ++ ++ sdmmc1_sleep_pins_mx: sdmmc1_sleep_mx-0 { ++ u-boot,dm-pre-reloc; ++ pins { ++ u-boot,dm-pre-reloc; ++ pinmux = , /* SDMMC1_D0 */ ++ , /* SDMMC1_D1 */ ++ , /* SDMMC1_D2 */ ++ , /* SDMMC1_D3 */ ++ , /* SDMMC1_CK */ ++ ; /* SDMMC1_CMD */ ++ }; ++ }; ++ ++ uart4_pins_mx: uart4_mx-0 { ++ u-boot,dm-pre-reloc; ++ pins1 { ++ u-boot,dm-pre-reloc; ++ pinmux = ; /* UART4_RX */ ++ /* pull-up on rx to avoid floating level */ ++ bias-pull-up; ++ }; ++ pins2 { ++ u-boot,dm-pre-reloc; ++ pinmux = ; /* UART4_TX */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <0>; ++ }; ++ }; ++ ++ uart4_sleep_pins_mx: uart4_sleep_mx-0 { ++ u-boot,dm-pre-reloc; ++ pins { ++ u-boot,dm-pre-reloc; ++ pinmux = , /* UART4_RX */ ++ ; /* UART4_TX */ ++ }; ++ }; ++}; ++ ++&pinctrl_z { ++ u-boot,dm-pre-reloc; ++ ++ i2c4_pins_z_mx: i2c4_mx-0 { ++ u-boot,dm-pre-reloc; ++ pins { ++ u-boot,dm-pre-reloc; ++ pinmux = , /* I2C4_SCL */ ++ ; /* I2C4_SDA */ ++ bias-disable; ++ drive-open-drain; ++ slew-rate = <0>; ++ }; ++ }; ++ ++ i2c4_sleep_pins_z_mx: i2c4_sleep_mx-0 { ++ u-boot,dm-pre-reloc; ++ pins { ++ u-boot,dm-pre-reloc; ++ pinmux = , /* I2C4_SCL */ ++ ; /* I2C4_SDA */ ++ }; ++ }; ++ ++ spi6_pins_mx: spi6-0 { ++ pins1 { ++ pinmux = , /* SPI6_SCK */ ++ ; /* SPI6_MOSI */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <1>; ++ }; ++ ++ pins2 { ++ pinmux = ; /* SPI6_MISO */ ++ bias-disable; ++ }; ++ }; ++ ++ spi6_sleep_pins_mx: spi6-sleep-0 { ++ pins { ++ pinmux = , /* SPI6_SCK */ ++ , /* SPI6_MISO */ ++ ; /* SPI6_MOSI */ ++ }; ++ }; ++}; ++ ++&m4_rproc{ ++ memory-region = <&retram>, <&mcuram>, <&mcuram2>, <&vdev0vring0>, ++ <&vdev0vring1>, <&vdev0buffer>; ++ mboxes = <&ipcc 0>, <&ipcc 1>, <&ipcc 2>; ++ mbox-names = "vq0", "vq1", "shutdown"; ++ interrupt-parent = <&exti>; ++ interrupts = <68 1>; ++ wakeup-source; ++ status = "okay"; ++}; ++ ++&pwr_regulators { ++ vdd-supply = <&vdd>; ++ vdd_3v3_usbfs-supply = <&vdd_usb>; ++}; ++ ++ ++&crc1{ ++ status = "okay"; ++}; ++ ++&cryp1{ ++ u-boot,dm-pre-reloc; ++ status = "okay"; ++}; ++ ++&dma1{ ++ status = "okay"; ++ sram = <&dma_pool>; ++}; ++ ++&dma2{ ++ status = "okay"; ++ sram = <&dma_pool>; ++}; ++ ++&dts{ ++ status = "okay"; ++}; ++ ++&gpu{ ++ status = "okay"; ++ contiguous-area = <&gpu_reserved>; ++}; ++ ++&hash1{ ++ u-boot,dm-pre-reloc; ++ status = "okay"; ++}; ++ ++&hsem{ ++ status = "okay"; ++}; ++ ++&i2c1 { ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <&i2c1_pins_mx>; ++ pinctrl-1 = <&i2c1_pins_sleep_mx>; ++ i2c-scl-rising-time-ns = <100>; ++ i2c-scl-falling-time-ns = <7>; ++ status = "okay"; ++ /delete-property/dmas; ++ /delete-property/dma-names; ++}; ++ ++&i2c2 { ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <&i2c2_pins_mx>; ++ pinctrl-1 = <&i2c2_pins_sleep_mx>; ++ i2c-scl-rising-time-ns = <100>; ++ i2c-scl-falling-time-ns = <7>; ++ status = "okay"; ++ /delete-property/dmas; ++ /delete-property/dma-names; ++}; ++ ++&i2c5 { ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <&i2c5_pins_mx>; ++ pinctrl-1 = <&i2c5_pins_sleep_mx>; ++ i2c-scl-rising-time-ns = <100>; ++ i2c-scl-falling-time-ns = <7>; ++ status = "okay"; ++ /delete-property/dmas; ++ /delete-property/dma-names; ++}; ++ ++&i2c4{ ++ u-boot,dm-pre-reloc; ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <&i2c4_pins_z_mx>; ++ pinctrl-1 = <&i2c4_sleep_pins_z_mx>; ++ status = "okay"; ++ ++ i2c-scl-rising-time-ns = <185>; ++ i2c-scl-falling-time-ns = <20>; ++ clock-frequency = <400000>; ++ /delete-property/ dmas; ++ /delete-property/ dma-names; ++ ++ pmic:stpmic@33{ ++ compatible = "st,stpmic1"; ++ reg = <0x33>; ++ interrupts-extended = <&exti_pwr 55 IRQ_TYPE_EDGE_FALLING>; ++ interrupt-controller; ++ #interrupt-cells = <2>; ++ status = "okay"; ++ ++ regulators{ ++ compatible = "st,stpmic1-regulators"; ++ buck1-supply = <&vin>; ++ buck2-supply = <&vin>; ++ buck3-supply = <&vin>; ++ buck4-supply = <&vin>; ++ ldo1-supply = <&v3v3>; ++ ldo2-supply = <&vin>; ++ ldo3-supply = <&vdd_ddr>; ++ ldo4-supply = <&vin>; ++ ldo5-supply = <&vin>; ++ ldo6-supply = <&v3v3>; ++ vref_ddr-supply = <&vin>; ++ boost-supply = <&vin>; ++ pwr_sw1-supply = <&bst_out>; ++ pwr_sw2-supply = <&bst_out>; ++ ++ vddcore:buck1{ ++ regulator-name = "vddcore"; ++ regulator-min-microvolt = <1200000>; ++ regulator-max-microvolt = <1350000>; ++ regulator-always-on; ++ regulator-initial-mode = <0>; ++ regulator-over-current-protection; ++ }; ++ ++ vdd_ddr:buck2{ ++ regulator-name = "vdd_ddr"; ++ regulator-min-microvolt = <1350000>; ++ regulator-max-microvolt = <1350000>; ++ regulator-always-on; ++ regulator-initial-mode = <0>; ++ regulator-over-current-protection; ++ }; ++ ++ vdd:buck3{ ++ regulator-name = "vdd"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-always-on; ++ st,mask-reset; ++ regulator-initial-mode = <0>; ++ regulator-over-current-protection; ++ }; ++ ++ v3v3:buck4{ ++ regulator-name = "v3v3"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-always-on; ++ regulator-over-current-protection; ++ regulator-initial-mode = <0>; ++ }; ++ ++ v1v8_audio:ldo1{ ++ regulator-name = "v1v8_audio"; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ regulator-always-on; ++ interrupts = ; ++ }; ++ ++ v3v3_hdmi:ldo2{ ++ regulator-name = "v3v3_hdmi"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-always-on; ++ interrupts = ; ++ }; ++ ++ vtt_ddr:ldo3{ ++ regulator-name = "vtt_ddr"; ++ regulator-min-microvolt = <500000>; ++ regulator-max-microvolt = <750000>; ++ regulator-always-on; ++ regulator-over-current-protection; ++ }; ++ ++ vdd_usb:ldo4{ ++ regulator-name = "vdd_usb"; ++ interrupts = ; ++ }; ++ ++ vdda:ldo5{ ++ regulator-name = "vdda"; ++ regulator-min-microvolt = <2900000>; ++ regulator-max-microvolt = <2900000>; ++ interrupts = ; ++ regulator-boot-on; ++ }; ++ ++ v1v2_hdmi:ldo6{ ++ regulator-name = "v1v2_hdmi"; ++ regulator-min-microvolt = <1200000>; ++ regulator-max-microvolt = <1200000>; ++ regulator-always-on; ++ interrupts = ; ++ }; ++ ++ vref_ddr:vref_ddr{ ++ regulator-name = "vref_ddr"; ++ regulator-always-on; ++ regulator-over-current-protection; ++ }; ++ ++ bst_out:boost{ ++ regulator-name = "bst_out"; ++ interrupts = ; ++ }; ++ ++ vbus_otg:pwr_sw1{ ++ regulator-name = "vbus_otg"; ++ interrupts = ; ++ }; ++ ++ vbus_sw:pwr_sw2{ ++ regulator-name = "vbus_sw"; ++ interrupts = ; ++ regulator-active-discharge = <1>; ++ }; ++ }; ++ ++ onkey{ ++ compatible = "st,stpmic1-onkey"; ++ interrupts = , ; ++ interrupt-names = "onkey-falling", "onkey-rising"; ++ power-off-time-sec = <10>; ++ status = "okay"; ++ }; ++ ++ watchdog { ++ compatible = "st,stpmic1-wdt"; ++ status = "disabled"; ++ }; ++ }; ++ eeprom@50 { ++ compatible = "atmel,24c02"; ++ reg = <0x50>; ++ pagesize = <16>; ++ }; ++}; ++ ++&ipcc{ ++ status = "okay"; ++}; ++ ++&iwdg2{ ++ status = "okay"; ++ timeout-sec = <32>; ++}; ++ ++&mdma1{ ++ status = "okay"; ++}; ++ ++&rcc{ ++ u-boot,dm-pre-reloc; ++ status = "okay"; ++}; ++ ++&rng1{ ++ status = "okay"; ++}; ++ ++&rtc{ ++ status = "okay"; ++}; ++ ++&sdmmc1{ ++ u-boot,dm-pre-reloc; ++ pinctrl-names = "default", "opendrain", "sleep"; ++ pinctrl-0 = <&sdmmc1_pins_mx>; ++ pinctrl-1 = <&sdmmc1_opendrain_pins_mx>; ++ pinctrl-2 = <&sdmmc1_sleep_pins_mx>; ++ status = "okay"; ++ ++ cd-gpios = <&gpiog 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; ++ disable-wp; ++ st,neg-edge; ++ bus-width = <4>; ++ vmmc-supply = <&v3v3>; ++}; ++ ++&tamp{ ++ status = "okay"; ++}; ++ ++&uart4{ ++ u-boot,dm-pre-reloc; ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <&uart4_pins_mx>; ++ pinctrl-1 = <&uart4_sleep_pins_mx>; ++ status = "okay"; ++ ++ /delete-property/ dmas; ++ /delete-property/ dma-names; ++}; ++ ++&usbh_ehci{ ++ status = "okay"; ++ phys = <&usbphyc_port0>; ++}; ++ ++&usbh_ohci{ ++ status = "okay"; ++}; ++ ++&usbotg_hs{ ++ u-boot,dm-pre-reloc; ++ status = "okay"; ++ phys = <&usbphyc_port1 0>; ++ phy-names = "usb2-phy"; ++}; ++ ++&usbphyc{ ++ u-boot,dm-pre-reloc; ++ status = "okay"; ++}; ++ ++&usbphyc_port0{ ++ u-boot,dm-pre-reloc; ++ status = "okay"; ++ phy-supply = <&vdd_usb>; ++ st,phy-tuning = <&usb_phy_tuning>; ++}; ++ ++&usbphyc_port1{ ++ u-boot,dm-pre-reloc; ++ status = "okay"; ++ phy-supply = <&vdd_usb>; ++ st,phy-tuning = <&usb_phy_tuning>; ++}; ++ ++&adc { ++ vdd-supply = <&vdd>; ++ vdda-supply = <&vdda>; ++ vref-supply = <&vdda>; ++ status = "okay"; ++ adc1: adc@0 { ++ st,min-sample-time-nsecs = <5000>; ++ st,adc-channels = <0 1>; ++ status = "okay"; ++ }; ++ ++ adc2: adc@100 { ++ status = "okay"; ++ }; ++ ++ adc_temp: temp { ++ status = "okay"; ++ }; ++}; ++ ++&usbh_ohci{ ++ phys = <&usbphyc_port0>; ++}; ++ ++&cpu0{ ++ cpu-supply = <&vddcore>; ++}; ++ ++&cpu1{ ++ cpu-supply = <&vddcore>; ++}; ++ ++&sram{ ++ dma_pool:dma_pool@0{ ++ reg = <0x50000 0x10000>; ++ pool; ++ }; ++}; ++ ++&spi2 { ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <&spi2_pins_mx>; ++ pinctrl-1 = <&spi2_sleep_pins_mx>; ++ cs-gpios = <&gpioi 0 0>; ++ status = "okay"; ++ ++ spidev2: spidev2@0{ ++ compatible = "rohm,dh2228fv"; ++ spi-max-frequency = <30000000>; ++ reg = <0>; ++ }; ++}; ++ ++&spi4 { ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <&spi4_pins_mx>; ++ pinctrl-1 = <&spi4_sleep_pins_mx>; ++ cs-gpios = <&gpioe 11 0>; ++ status = "okay"; ++ ++ spidev4: spidev4@0{ ++ compatible = "rohm,dh2228fv"; ++ spi-max-frequency = <30000000>; ++ reg = <0>; ++ }; ++}; ++ ++&spi6 { ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <&spi6_pins_mx>; ++ pinctrl-1 = <&spi6_sleep_pins_mx>; ++ cs-gpios = <&gpioz 3 0>; ++ status = "okay"; ++ ++ spidev6: spidev6@0{ ++ compatible = "rohm,dh2228fv"; ++ spi-max-frequency = <30000000>; ++ reg = <0>; ++ }; ++}; ++ ++&usart2 { ++ pinctrl-names = "default", "sleep", "idle"; ++ pinctrl-0 = <&usart2_pins_mx>; ++ pinctrl-1 = <&usart2_sleep_pins_mx>; ++ pinctrl-2 = <&usart2_idle_pins_mx>; ++ status = "okay"; ++}; ++ ++&uart5 { ++ pinctrl-names = "default", "sleep", "idle"; ++ pinctrl-0 = <&uart5_pins_mx>; ++ pinctrl-1 = <&uart5_sleep_pins_mx>; ++ pinctrl-2 = <&uart5_idle_pins_mx>; ++ status = "okay"; ++}; ++ ++&uart7 { ++ pinctrl-names = "default", "sleep", "idle"; ++ pinctrl-0 = <&uart7_pins_mx>; ++ pinctrl-1 = <&uart7_sleep_pins_mx>; ++ pinctrl-2 = <&uart7_idle_pins_mx>; ++ status = "okay"; ++}; ++ ++&uart8 { ++ pinctrl-names = "default", "sleep", "idle"; ++ pinctrl-0 = <&uart8_pins_mx>; ++ pinctrl-1 = <&uart8_sleep_pins_mx>; ++ pinctrl-2 = <&uart8_idle_pins_mx>; ++ status = "okay"; ++}; ++ ++&m_can1 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&m_can1_pins_mx>; ++ status = "okay"; ++ can-transceiver { ++ max-bitrate = <5000000>; ++ }; ++}; ++ ++&timers1 { ++ status = "okay"; ++ /* spare dmas for other usage */ ++ /delete-property/dmas; ++ /delete-property/dma-names; ++ pwm1: pwm { ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <&pwm1_pins_mx>; ++ pinctrl-1 = <&pwm1_sleep_pins_mx>; ++ status = "okay"; ++ }; ++}; ++ ++&timers3 { ++ status = "okay"; ++ /* spare dmas for other usage */ ++ /delete-property/dmas; ++ /delete-property/dma-names; ++ pwm3: pwm { ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <&pwm3_pins_mx>; ++ pinctrl-1 = <&pwm3_sleep_pins_mx>; ++ status = "okay"; ++ }; ++}; ++ ++&timers4 { ++ status = "okay"; ++ /* spare dmas for other usage */ ++ /delete-property/dmas; ++ /delete-property/dma-names; ++ pwm4: pwm { ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <&pwm4_pins_mx>; ++ pinctrl-1 = <&pwm4_sleep_pins_mx>; ++ status = "okay"; ++ }; ++}; ++ ++&timers8 { ++ status = "okay"; ++ /* spare dmas for other usage */ ++ /delete-property/dmas; ++ /delete-property/dma-names; ++ pwm8: pwm { ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <&pwm8_pins_mx>; ++ pinctrl-1 = <&pwm8_sleep_pins_mx>; ++ status = "okay"; ++ }; ++}; ++ ++&timers12 { ++ status = "okay"; ++ /* spare dmas for other usage */ ++ /delete-property/dmas; ++ /delete-property/dma-names; ++ pwm12: pwm { ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <&pwm12_pins_mx>; ++ pinctrl-1 = <&pwm12_sleep_pins_mx>; ++ status = "okay"; ++ }; ++}; +-- +2.25.1 + diff --git a/buildroot/board/octavo/osd32mp1-brk/patches/uboot/0002-Add-OSD32MP1-BRK-build-config.patch b/buildroot/board/octavo/osd32mp1-brk/patches/uboot/0002-Add-OSD32MP1-BRK-build-config.patch new file mode 100644 index 0000000000..ff323562e6 --- /dev/null +++ b/buildroot/board/octavo/osd32mp1-brk/patches/uboot/0002-Add-OSD32MP1-BRK-build-config.patch @@ -0,0 +1,881 @@ +From cbe33390a338428d74a4549cb28e25af42d7f7d9 Mon Sep 17 00:00:00 2001 +From: "neeraj.dantu" +Date: Sun, 21 Nov 2021 23:31:02 -0600 +Subject: [PATCH 2/2] Add OSD32MP1-BRK build config + +Signed-off-by: Kory Maincent +--- + arch/arm/mach-stm32mp/Kconfig | 10 +- + board/octavo/osd32mp1-brk/Kconfig | 13 + + board/octavo/osd32mp1-brk/MAINTAINERS | 8 + + board/octavo/osd32mp1-brk/Makefile | 9 + + board/octavo/osd32mp1-brk/board.c | 631 +++++++++++++++++++++++++ + configs/osd32mp1_brk_trusted_defconfig | 141 ++++++ + 6 files changed, 811 insertions(+), 1 deletion(-) + create mode 100644 board/octavo/osd32mp1-brk/Kconfig + create mode 100644 board/octavo/osd32mp1-brk/MAINTAINERS + create mode 100644 board/octavo/osd32mp1-brk/Makefile + create mode 100644 board/octavo/osd32mp1-brk/board.c + create mode 100644 configs/osd32mp1_brk_trusted_defconfig + +diff --git a/arch/arm/mach-stm32mp/Kconfig b/arch/arm/mach-stm32mp/Kconfig +index 44bfac9000..006855acad 100644 +--- a/arch/arm/mach-stm32mp/Kconfig ++++ b/arch/arm/mach-stm32mp/Kconfig +@@ -92,6 +92,14 @@ config TARGET_DH_STM32MP1_PDK2 + help + Target the DH PDK2 development kit with STM32MP15x SoM. + ++config TARGET_OCTAVO_OSD32MP1_BRK ++ bool "Octavo OSD32MP1 BRK" ++ select STM32MP15x ++ imply BOOTCOUNT_LIMIT ++ imply CMD_BOOTCOUNT ++ help ++ Target the Octavo BRK board based on OSD32MP1 SiP. ++ + endchoice + + config SYS_TEXT_BASE +@@ -172,5 +180,5 @@ endif + source "arch/arm/mach-stm32mp/cmd_stm32prog/Kconfig" + source "board/st/stm32mp1/Kconfig" + source "board/dhelectronics/dh_stm32mp1/Kconfig" +- ++source "board/octavo/osd32mp1-brk/Kconfig" + endif +diff --git a/board/octavo/osd32mp1-brk/Kconfig b/board/octavo/osd32mp1-brk/Kconfig +new file mode 100644 +index 0000000000..907a09c170 +--- /dev/null ++++ b/board/octavo/osd32mp1-brk/Kconfig +@@ -0,0 +1,13 @@ ++if TARGET_OCTAVO_OSD32MP1_BRK ++ ++config SYS_BOARD ++ default "osd32mp1-brk" ++ ++config SYS_VENDOR ++ default "octavo" ++ ++config SYS_CONFIG_NAME ++ default "stm32mp1" ++ ++source "board/st/common/Kconfig" ++endif +diff --git a/board/octavo/osd32mp1-brk/MAINTAINERS b/board/octavo/osd32mp1-brk/MAINTAINERS +new file mode 100644 +index 0000000000..9c0addbc21 +--- /dev/null ++++ b/board/octavo/osd32mp1-brk/MAINTAINERS +@@ -0,0 +1,8 @@ ++OCTAVO osd32mp1-brk BOARD ++M: Martin Lesniak ++M: Neeraj Dantu ++S: Maintained ++F: arch/arm/dts/stm32mp157c-osd32mp1-brk* ++F: board/Octavo/osd32mp1-brk/ ++F: configs/osd32mp1_brk_trusted_defconfig ++F: include/configs/stm32mp1.h +diff --git a/board/octavo/osd32mp1-brk/Makefile b/board/octavo/osd32mp1-brk/Makefile +new file mode 100644 +index 0000000000..b368b396a4 +--- /dev/null ++++ b/board/octavo/osd32mp1-brk/Makefile +@@ -0,0 +1,9 @@ ++# SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause ++# ++# Copyright (C) 2018, STMicroelectronics - All Rights Reserved ++# ++ ++obj-y += ../../st/common/stpmic1.o board.o ++ ++obj-$(CONFIG_SYS_MTDPARTS_RUNTIME) += ../../st/common/stm32mp_mtdparts.o ++obj-$(CONFIG_SET_DFU_ALT_INFO) += ../../st/common/stm32mp_dfu.o +diff --git a/board/octavo/osd32mp1-brk/board.c b/board/octavo/osd32mp1-brk/board.c +new file mode 100644 +index 0000000000..fd97c9a390 +--- /dev/null ++++ b/board/octavo/osd32mp1-brk/board.c +@@ -0,0 +1,631 @@ ++// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause ++/* ++ * Copyright (C) 2018, STMicroelectronics - All Rights Reserved ++ */ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++/* SYSCFG registers */ ++#define SYSCFG_BOOTR 0x00 ++#define SYSCFG_PMCSETR 0x04 ++#define SYSCFG_IOCTRLSETR 0x18 ++#define SYSCFG_ICNR 0x1C ++#define SYSCFG_CMPCR 0x20 ++#define SYSCFG_CMPENSETR 0x24 ++#define SYSCFG_PMCCLRR 0x44 ++ ++#define SYSCFG_BOOTR_BOOT_MASK GENMASK(2, 0) ++#define SYSCFG_BOOTR_BOOTPD_SHIFT 4 ++ ++#define SYSCFG_IOCTRLSETR_HSLVEN_TRACE BIT(0) ++#define SYSCFG_IOCTRLSETR_HSLVEN_QUADSPI BIT(1) ++#define SYSCFG_IOCTRLSETR_HSLVEN_ETH BIT(2) ++#define SYSCFG_IOCTRLSETR_HSLVEN_SDMMC BIT(3) ++#define SYSCFG_IOCTRLSETR_HSLVEN_SPI BIT(4) ++ ++#define SYSCFG_CMPCR_SW_CTRL BIT(1) ++#define SYSCFG_CMPCR_READY BIT(8) ++ ++#define SYSCFG_CMPENSETR_MPU_EN BIT(0) ++ ++#define SYSCFG_PMCSETR_ETH_CLK_SEL BIT(16) ++#define SYSCFG_PMCSETR_ETH_REF_CLK_SEL BIT(17) ++ ++#define SYSCFG_PMCSETR_ETH_SELMII BIT(20) ++ ++#define SYSCFG_PMCSETR_ETH_SEL_MASK GENMASK(23, 21) ++#define SYSCFG_PMCSETR_ETH_SEL_GMII_MII 0 ++#define SYSCFG_PMCSETR_ETH_SEL_RGMII BIT(21) ++#define SYSCFG_PMCSETR_ETH_SEL_RMII BIT(23) ++ ++/* ++ * Get a global data pointer ++ */ ++DECLARE_GLOBAL_DATA_PTR; ++ ++int setup_mac_address(void) ++{ ++ struct udevice *dev; ++ ofnode eeprom; ++ unsigned char enetaddr[6]; ++ int ret; ++ ++ ret = eth_env_get_enetaddr("ethaddr", enetaddr); ++ if (ret) /* ethaddr is already set */ ++ return 0; ++ ++ eeprom = ofnode_path("/soc/i2c@5c002000/eeprom@50"); ++ if (!ofnode_valid(eeprom)) { ++ printf("Invalid hardware path to EEPROM!\n"); ++ return -ENODEV; ++ } ++ ++ ret = uclass_get_device_by_ofnode(UCLASS_I2C_EEPROM, eeprom, &dev); ++ if (ret) { ++ printf("Cannot find EEPROM!\n"); ++ return ret; ++ } ++ ++ ret = i2c_eeprom_read(dev, 0xfa, enetaddr, 0x6); ++ if (ret) { ++ printf("Error reading configuration EEPROM!\n"); ++ return ret; ++ } ++ ++ if (is_valid_ethaddr(enetaddr)) ++ eth_env_set_enetaddr("ethaddr", enetaddr); ++ ++ return 0; ++} ++ ++int checkboard(void) ++{ ++ char *mode; ++ const char *fdt_compat; ++ int fdt_compat_len; ++ ++ if (IS_ENABLED(CONFIG_STM32MP15x_STM32IMAGE)) ++ mode = "trusted - stm32image"; ++ else if (IS_ENABLED(CONFIG_TFABOOT)) ++ mode = "trusted"; ++ else ++ mode = "basic"; ++ ++ printf("Board: stm32mp1 in %s mode", mode); ++ fdt_compat = fdt_getprop(gd->fdt_blob, 0, "compatible", ++ &fdt_compat_len); ++ if (fdt_compat && fdt_compat_len) ++ printf(" (%s)", fdt_compat); ++ puts("\n"); ++ ++ return 0; ++} ++ ++static void board_key_check(void) ++{ ++ ofnode node; ++ struct gpio_desc gpio; ++ enum forced_boot_mode boot_mode = BOOT_NORMAL; ++ ++ if (!IS_ENABLED(CONFIG_FASTBOOT) && !IS_ENABLED(CONFIG_CMD_STM32PROG)) ++ return; ++ ++ node = ofnode_path("/config"); ++ if (!ofnode_valid(node)) { ++ debug("%s: no /config node?\n", __func__); ++ return; ++ } ++ if (IS_ENABLED(CONFIG_FASTBOOT)) { ++ if (gpio_request_by_name_nodev(node, "st,fastboot-gpios", 0, ++ &gpio, GPIOD_IS_IN)) { ++ debug("%s: could not find a /config/st,fastboot-gpios\n", ++ __func__); ++ } else { ++ if (dm_gpio_get_value(&gpio)) { ++ puts("Fastboot key pressed, "); ++ boot_mode = BOOT_FASTBOOT; ++ } ++ ++ dm_gpio_free(NULL, &gpio); ++ } ++ } ++ if (IS_ENABLED(CONFIG_CMD_STM32PROG)) { ++ if (gpio_request_by_name_nodev(node, "st,stm32prog-gpios", 0, ++ &gpio, GPIOD_IS_IN)) { ++ debug("%s: could not find a /config/st,stm32prog-gpios\n", ++ __func__); ++ } else { ++ if (dm_gpio_get_value(&gpio)) { ++ puts("STM32Programmer key pressed, "); ++ boot_mode = BOOT_STM32PROG; ++ } ++ dm_gpio_free(NULL, &gpio); ++ } ++ } ++ if (boot_mode != BOOT_NORMAL) { ++ puts("entering download mode...\n"); ++ clrsetbits_le32(TAMP_BOOT_CONTEXT, ++ TAMP_BOOT_FORCED_MASK, ++ boot_mode); ++ } ++} ++ ++int g_dnl_board_usb_cable_connected(void) ++{ ++ struct udevice *dwc2_udc_otg; ++ int ret; ++ ++ if (!IS_ENABLED(CONFIG_USB_GADGET_DWC2_OTG)) ++ return -ENODEV; ++ ret = uclass_get_device_by_driver(UCLASS_USB_GADGET_GENERIC, ++ DM_GET_DRIVER(dwc2_udc_otg), ++ &dwc2_udc_otg); ++ if (!ret) ++ debug("dwc2_udc_otg init failed\n"); ++ ++ return dwc2_udc_B_session_valid(dwc2_udc_otg); ++} ++ ++#ifdef CONFIG_USB_GADGET_DOWNLOAD ++#define STM32MP1_G_DNL_DFU_PRODUCT_NUM 0xdf11 ++#define STM32MP1_G_DNL_FASTBOOT_PRODUCT_NUM 0x0afb ++ ++int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name) ++{ ++ if (IS_ENABLED(CONFIG_DFU_OVER_USB) && ++ !strcmp(name, "usb_dnl_dfu")) ++ put_unaligned(STM32MP1_G_DNL_DFU_PRODUCT_NUM, &dev->idProduct); ++ else if (IS_ENABLED(CONFIG_FASTBOOT) && ++ !strcmp(name, "usb_dnl_fastboot")) ++ put_unaligned(STM32MP1_G_DNL_FASTBOOT_PRODUCT_NUM, ++ &dev->idProduct); ++ else ++ put_unaligned(CONFIG_USB_GADGET_PRODUCT_NUM, &dev->idProduct); ++ ++ return 0; ++} ++#endif /* CONFIG_USB_GADGET_DOWNLOAD */ ++ ++static int get_led(struct udevice **dev, char *led_string) ++{ ++ char *led_name; ++ int ret; ++ ++ led_name = fdtdec_get_config_string(gd->fdt_blob, led_string); ++ if (!led_name) { ++ pr_debug("%s: could not find %s config string\n", ++ __func__, led_string); ++ return -ENOENT; ++ } ++ ret = led_get_by_label(led_name, dev); ++ if (ret) { ++ debug("%s: get=%d\n", __func__, ret); ++ return ret; ++ } ++ ++ return 0; ++} ++ ++static int setup_led(enum led_state_t cmd) ++{ ++ struct udevice *dev; ++ int ret; ++ ++ if (!CONFIG_IS_ENABLED(LED)) ++ return 0; ++ ++ ret = get_led(&dev, "u-boot,boot-led"); ++ if (ret) ++ return ret; ++ ++ ret = led_set_state(dev, cmd); ++ return ret; ++} ++ ++static void __maybe_unused led_error_blink(u32 nb_blink) ++{ ++ int ret; ++ struct udevice *led; ++ u32 i; ++ ++ if (!nb_blink) ++ return; ++ ++ if (CONFIG_IS_ENABLED(LED)) { ++ ret = get_led(&led, "u-boot,error-led"); ++ if (!ret) { ++ /* make u-boot,error-led blinking */ ++ /* if U32_MAX and 125ms interval, for 17.02 years */ ++ for (i = 0; i < 2 * nb_blink; i++) { ++ led_set_state(led, LEDST_TOGGLE); ++ mdelay(125); ++ WATCHDOG_RESET(); ++ } ++ led_set_state(led, LEDST_ON); ++ } ++ } ++ ++ /* infinite: the boot process must be stopped */ ++ if (nb_blink == U32_MAX) ++ hang(); ++} ++ ++static void sysconf_init(void) ++{ ++ u8 *syscfg; ++ struct udevice *pwr_dev; ++ struct udevice *pwr_reg; ++ struct udevice *dev; ++ u32 otp = 0; ++ int ret; ++ u32 bootr, val; ++ ++ syscfg = (u8 *)syscon_get_first_range(STM32MP_SYSCON_SYSCFG); ++ ++ /* interconnect update : select master using the port 1 */ ++ /* LTDC = AXI_M9 */ ++ /* GPU = AXI_M8 */ ++ /* today information is hardcoded in U-Boot */ ++ writel(BIT(9), syscfg + SYSCFG_ICNR); ++ ++ /* disable Pull-Down for boot pin connected to VDD */ ++ bootr = readl(syscfg + SYSCFG_BOOTR); ++ bootr &= ~(SYSCFG_BOOTR_BOOT_MASK << SYSCFG_BOOTR_BOOTPD_SHIFT); ++ bootr |= (bootr & SYSCFG_BOOTR_BOOT_MASK) << SYSCFG_BOOTR_BOOTPD_SHIFT; ++ writel(bootr, syscfg + SYSCFG_BOOTR); ++ ++ /* High Speed Low Voltage Pad mode Enable for SPI, SDMMC, ETH, QSPI ++ * and TRACE. Needed above ~50MHz and conditioned by AFMUX selection. ++ * The customer will have to disable this for low frequencies ++ * or if AFMUX is selected but the function not used, typically for ++ * TRACE. Otherwise, impact on power consumption. ++ * ++ * WARNING: ++ * enabling High Speed mode while VDD>2.7V ++ * with the OTP product_below_2v5 (OTP 18, BIT 13) ++ * erroneously set to 1 can damage the IC! ++ * => U-Boot set the register only if VDD < 2.7V (in DT) ++ * but this value need to be consistent with board design ++ */ ++ ret = uclass_get_device_by_driver(UCLASS_PMIC, ++ DM_GET_DRIVER(stm32mp_pwr_pmic), ++ &pwr_dev); ++ if (!ret && IS_ENABLED(CONFIG_DM_REGULATOR)) { ++ ret = uclass_get_device_by_driver(UCLASS_MISC, ++ DM_GET_DRIVER(stm32mp_bsec), ++ &dev); ++ if (ret) { ++ pr_err("Can't find stm32mp_bsec driver\n"); ++ return; ++ } ++ ++ ret = misc_read(dev, STM32_BSEC_SHADOW(18), &otp, 4); ++ if (ret > 0) ++ otp = otp & BIT(13); ++ ++ /* get VDD = vdd-supply */ ++ ret = device_get_supply_regulator(pwr_dev, "vdd-supply", ++ &pwr_reg); ++ ++ /* check if VDD is Low Voltage */ ++ if (!ret) { ++ if (regulator_get_value(pwr_reg) < 2700000) { ++ writel(SYSCFG_IOCTRLSETR_HSLVEN_TRACE | ++ SYSCFG_IOCTRLSETR_HSLVEN_QUADSPI | ++ SYSCFG_IOCTRLSETR_HSLVEN_ETH | ++ SYSCFG_IOCTRLSETR_HSLVEN_SDMMC | ++ SYSCFG_IOCTRLSETR_HSLVEN_SPI, ++ syscfg + SYSCFG_IOCTRLSETR); ++ ++ if (!otp) ++ pr_err("product_below_2v5=0: HSLVEN protected by HW\n"); ++ } else { ++ if (otp) ++ pr_err("product_below_2v5=1: HSLVEN update is destructive, no update as VDD>2.7V\n"); ++ } ++ } else { ++ debug("VDD unknown"); ++ } ++ } ++ ++ /* activate automatic I/O compensation ++ * warning: need to ensure CSI enabled and ready in clock driver ++ */ ++ writel(SYSCFG_CMPENSETR_MPU_EN, syscfg + SYSCFG_CMPENSETR); ++ ++ /* poll until ready (1s timeout) */ ++ ret = readl_poll_timeout(syscfg + SYSCFG_CMPCR, val, ++ val & SYSCFG_CMPCR_READY, ++ 1000000); ++ if (ret) { ++ pr_err("SYSCFG: I/O compensation failed, timeout.\n"); ++ led_error_blink(10); ++ } ++ ++ clrbits_le32(syscfg + SYSCFG_CMPCR, SYSCFG_CMPCR_SW_CTRL); ++} ++ ++/* board dependent setup after realloc */ ++int board_init(void) ++{ ++ /* address of boot parameters */ ++ gd->bd->bi_boot_params = STM32_DDR_BASE + 0x100; ++ ++ if (CONFIG_IS_ENABLED(DM_GPIO_HOG)) ++ gpio_hog_probe_all(); ++ ++ board_key_check(); ++ ++ if (IS_ENABLED(CONFIG_DM_REGULATOR)) ++ regulators_enable_boot_on(_DEBUG); ++ ++ if (!IS_ENABLED(CONFIG_TFABOOT)) ++ sysconf_init(); ++ ++ if (CONFIG_IS_ENABLED(LED)) ++ led_default_state(); ++ ++ return 0; ++} ++ ++int board_late_init(void) ++{ ++ char *boot_device; ++ const void *fdt_compat; ++ int fdt_compat_len; ++ int ret; ++ u32 otp; ++ struct udevice *dev; ++ char buf[10]; ++ char dtb_name[256]; ++ int buf_len; ++ ++ if (IS_ENABLED(CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG)) { ++ fdt_compat = fdt_getprop(gd->fdt_blob, 0, "compatible", ++ &fdt_compat_len); ++ if (fdt_compat && fdt_compat_len) { ++ if (strncmp(fdt_compat, "st,", 3) != 0) { ++ env_set("board_name", fdt_compat); ++ } else { ++ env_set("board_name", fdt_compat + 3); ++ ++ buf_len = sizeof(dtb_name); ++ strncpy(dtb_name, fdt_compat + 3, buf_len); ++ buf_len -= strlen(fdt_compat + 3); ++ strncat(dtb_name, ".dtb", buf_len); ++ env_set("fdtfile", dtb_name); ++ } ++ } ++ ret = uclass_get_device_by_driver(UCLASS_MISC, ++ DM_GET_DRIVER(stm32mp_bsec), ++ &dev); ++ ++ if (!ret) ++ ret = misc_read(dev, STM32_BSEC_SHADOW(BSEC_OTP_BOARD), ++ &otp, sizeof(otp)); ++ if (ret > 0 && otp) { ++ snprintf(buf, sizeof(buf), "0x%04x", otp >> 16); ++ env_set("board_id", buf); ++ ++ snprintf(buf, sizeof(buf), "0x%04x", ++ ((otp >> 8) & 0xF) - 1 + 0xA); ++ env_set("board_rev", buf); ++ } ++ } ++ ++ /* Check the boot-source to disable bootdelay */ ++ boot_device = env_get("boot_device"); ++ if (!strcmp(boot_device, "serial") || !strcmp(boot_device, "usb")) ++ env_set("bootdelay", "0"); ++ ++ return 0; ++} ++ ++void board_quiesce_devices(void) ++{ ++ setup_led(LEDST_OFF); ++} ++ ++/* eth init function : weak called in eqos driver */ ++int board_interface_eth_init(struct udevice *dev, ++ phy_interface_t interface_type, ulong rate) ++{ ++ u8 *syscfg; ++ u32 value; ++ bool eth_clk_sel_reg = false; ++ bool eth_ref_clk_sel_reg = false; ++ ++ /* Gigabit Ethernet 125MHz clock selection. */ ++ eth_clk_sel_reg = dev_read_bool(dev, "st,eth_clk_sel"); ++ ++ /* Ethernet 50Mhz RMII clock selection */ ++ eth_ref_clk_sel_reg = ++ dev_read_bool(dev, "st,eth_ref_clk_sel"); ++ ++ syscfg = (u8 *)syscon_get_first_range(STM32MP_SYSCON_SYSCFG); ++ ++ if (!syscfg) ++ return -ENODEV; ++ ++ switch (interface_type) { ++ case PHY_INTERFACE_MODE_MII: ++ value = SYSCFG_PMCSETR_ETH_SEL_GMII_MII | ++ SYSCFG_PMCSETR_ETH_REF_CLK_SEL; ++ debug("%s: PHY_INTERFACE_MODE_MII\n", __func__); ++ break; ++ case PHY_INTERFACE_MODE_GMII: ++ if (eth_clk_sel_reg) ++ value = SYSCFG_PMCSETR_ETH_SEL_GMII_MII | ++ SYSCFG_PMCSETR_ETH_CLK_SEL; ++ else ++ value = SYSCFG_PMCSETR_ETH_SEL_GMII_MII; ++ debug("%s: PHY_INTERFACE_MODE_GMII\n", __func__); ++ break; ++ case PHY_INTERFACE_MODE_RMII: ++ if (eth_ref_clk_sel_reg) ++ value = SYSCFG_PMCSETR_ETH_SEL_RMII | ++ SYSCFG_PMCSETR_ETH_REF_CLK_SEL; ++ else ++ value = SYSCFG_PMCSETR_ETH_SEL_RMII; ++ debug("%s: PHY_INTERFACE_MODE_RMII\n", __func__); ++ break; ++ case PHY_INTERFACE_MODE_RGMII: ++ case PHY_INTERFACE_MODE_RGMII_ID: ++ case PHY_INTERFACE_MODE_RGMII_RXID: ++ case PHY_INTERFACE_MODE_RGMII_TXID: ++ if (eth_clk_sel_reg) ++ value = SYSCFG_PMCSETR_ETH_SEL_RGMII | ++ SYSCFG_PMCSETR_ETH_CLK_SEL; ++ else ++ value = SYSCFG_PMCSETR_ETH_SEL_RGMII; ++ debug("%s: PHY_INTERFACE_MODE_RGMII\n", __func__); ++ break; ++ default: ++ debug("%s: Do not manage %d interface\n", ++ __func__, interface_type); ++ /* Do not manage others interfaces */ ++ return -EINVAL; ++ } ++ ++ /* clear and set ETH configuration bits */ ++ writel(SYSCFG_PMCSETR_ETH_SEL_MASK | SYSCFG_PMCSETR_ETH_SELMII | ++ SYSCFG_PMCSETR_ETH_REF_CLK_SEL | SYSCFG_PMCSETR_ETH_CLK_SEL, ++ syscfg + SYSCFG_PMCCLRR); ++ writel(value, syscfg + SYSCFG_PMCSETR); ++ ++ return 0; ++} ++ ++enum env_location env_get_location(enum env_operation op, int prio) ++{ ++ u32 bootmode = get_bootmode(); ++ ++ if (prio) ++ return ENVL_UNKNOWN; ++ ++ switch (bootmode & TAMP_BOOT_DEVICE_MASK) { ++ case BOOT_FLASH_SD: ++ case BOOT_FLASH_EMMC: ++ if (CONFIG_IS_ENABLED(ENV_IS_IN_MMC)) ++ return ENVL_MMC; ++ else if (CONFIG_IS_ENABLED(ENV_IS_IN_EXT4)) ++ return ENVL_EXT4; ++ else ++ return ENVL_NOWHERE; ++ ++ case BOOT_FLASH_NAND: ++ case BOOT_FLASH_SPINAND: ++ if (CONFIG_IS_ENABLED(ENV_IS_IN_UBI)) ++ return ENVL_UBI; ++ else ++ return ENVL_NOWHERE; ++ ++ case BOOT_FLASH_NOR: ++ if (CONFIG_IS_ENABLED(ENV_IS_IN_SPI_FLASH)) ++ return ENVL_SPI_FLASH; ++ else ++ return ENVL_NOWHERE; ++ ++ default: ++ return ENVL_NOWHERE; ++ } ++} ++ ++const char *env_ext4_get_intf(void) ++{ ++ u32 bootmode = get_bootmode(); ++ ++ switch (bootmode & TAMP_BOOT_DEVICE_MASK) { ++ case BOOT_FLASH_SD: ++ case BOOT_FLASH_EMMC: ++ return "mmc"; ++ default: ++ return ""; ++ } ++} ++ ++const char *env_ext4_get_dev_part(void) ++{ ++ static char *const dev_part[] = {"0:auto", "1:auto", "2:auto"}; ++ u32 bootmode = get_bootmode(); ++ ++ return dev_part[(bootmode & TAMP_BOOT_INSTANCE_MASK) - 1]; ++} ++ ++int mmc_get_env_dev(void) ++{ ++ u32 bootmode; ++ ++ if (CONFIG_SYS_MMC_ENV_DEV >= 0) ++ return CONFIG_SYS_MMC_ENV_DEV; ++ ++ bootmode = get_bootmode(); ++ ++ /* use boot instance to select the correct mmc device identifier */ ++ return (bootmode & TAMP_BOOT_INSTANCE_MASK) - 1; ++} ++ ++#if defined(CONFIG_OF_BOARD_SETUP) ++int ft_board_setup(void *blob, struct bd_info *bd) ++{ ++ return 0; ++} ++#endif ++ ++static void board_copro_image_process(ulong fw_image, size_t fw_size) ++{ ++ int ret, id = 0; /* Copro id fixed to 0 as only one coproc on mp1 */ ++ ++ if (!rproc_is_initialized()) ++ if (rproc_init()) { ++ printf("Remote Processor %d initialization failed\n", ++ id); ++ return; ++ } ++ ++ ret = rproc_load(id, fw_image, fw_size); ++ printf("Load Remote Processor %d with data@addr=0x%08lx %u bytes:%s\n", ++ id, fw_image, fw_size, ret ? " Failed!" : " Success!"); ++ ++ if (!ret) ++ rproc_start(id); ++} ++ ++U_BOOT_FIT_LOADABLE_HANDLER(IH_TYPE_COPRO, board_copro_image_process); +diff --git a/configs/osd32mp1_brk_trusted_defconfig b/configs/osd32mp1_brk_trusted_defconfig +new file mode 100644 +index 0000000000..6d41af8886 +--- /dev/null ++++ b/configs/osd32mp1_brk_trusted_defconfig +@@ -0,0 +1,141 @@ ++CONFIG_ARM=y ++CONFIG_ARCH_STM32MP=y ++CONFIG_TFABOOT=y ++CONFIG_SYS_MALLOC_F_LEN=0x3000 ++CONFIG_ENV_OFFSET=0x480000 ++CONFIG_ENV_SECT_SIZE=0x40000 ++# CONFIG_TARGET_ST_STM32MP15x=y ++CONFIG_TARGET_OCTAVO_OSD32MP1_BRK=y ++CONFIG_CMD_STM32PROG=y ++CONFIG_ENV_OFFSET_REDUND=0x4C0000 ++CONFIG_DEFAULT_DEVICE_TREE="stm32mp157c-osd32mp1-brk" ++CONFIG_DISTRO_DEFAULTS=y ++CONFIG_FIT=y ++CONFIG_BOOTDELAY=1 ++CONFIG_BOOTCOMMAND="run bootcmd_stm32mp" ++CONFIG_SYS_PROMPT="OSD32MP> " ++# CONFIG_CMD_BOOTD is not set ++CONFIG_CMD_ADTIMG=y ++# CONFIG_CMD_ELF is not set ++CONFIG_CMD_EEPROM=y ++CONFIG_CMD_ERASEENV=y ++CONFIG_CMD_MEMINFO=y ++CONFIG_CMD_MEMTEST=y ++CONFIG_SYS_MEMTEST_START=0xc0000000 ++CONFIG_SYS_MEMTEST_END=0xc4000000 ++CONFIG_CMD_ADC=y ++CONFIG_CMD_CLK=y ++CONFIG_CMD_DFU=y ++CONFIG_CMD_FUSE=y ++CONFIG_CMD_GPIO=y ++CONFIG_CMD_I2C=y ++CONFIG_CMD_MMC=y ++CONFIG_CMD_REMOTEPROC=y ++CONFIG_CMD_SPI=y ++CONFIG_CMD_USB=y ++CONFIG_CMD_USB_MASS_STORAGE=y ++CONFIG_CMD_BMP=y ++CONFIG_CMD_CACHE=y ++CONFIG_CMD_TIME=y ++CONFIG_CMD_TIMER=y ++CONFIG_CMD_PMIC=y ++CONFIG_CMD_REGULATOR=y ++CONFIG_CMD_EXT4_WRITE=y ++CONFIG_CMD_MTDPARTS=y ++CONFIG_CMD_UBI=y ++CONFIG_ENV_IS_NOWHERE=y ++CONFIG_ENV_IS_IN_MMC=y ++CONFIG_ENV_IS_IN_UBI=y ++CONFIG_SYS_REDUNDAND_ENVIRONMENT=y ++CONFIG_ENV_UBI_PART="UBI" ++CONFIG_ENV_UBI_VOLUME="uboot_config" ++CONFIG_ENV_UBI_VOLUME_REDUND="uboot_config_r" ++CONFIG_SYS_RELOC_GD_ENV_ADDR=y ++CONFIG_SYS_MMC_ENV_DEV=-1 ++CONFIG_STM32_ADC=y ++CONFIG_CLK_SCMI=y ++CONFIG_SET_DFU_ALT_INFO=y ++CONFIG_USB_FUNCTION_FASTBOOT=y ++CONFIG_FASTBOOT_BUF_ADDR=0xC0000000 ++CONFIG_FASTBOOT_BUF_SIZE=0x02000000 ++CONFIG_FASTBOOT_USB_DEV=1 ++CONFIG_FASTBOOT_FLASH=y ++CONFIG_FASTBOOT_FLASH_MMC_DEV=1 ++CONFIG_GPIO_HOG=y ++CONFIG_DM_HWSPINLOCK=y ++CONFIG_HWSPINLOCK_STM32=y ++CONFIG_DM_I2C=y ++CONFIG_SYS_I2C_STM32F7=y ++CONFIG_LED=y ++CONFIG_LED_GPIO=y ++CONFIG_DM_MAILBOX=y ++CONFIG_STM32_IPCC=y ++CONFIG_STM32_FMC2_EBI=y ++CONFIG_I2C_EEPROM=y ++CONFIG_DM_MMC=y ++CONFIG_SUPPORT_EMMC_BOOT=y ++CONFIG_STM32_SDMMC2=y ++CONFIG_MTD=y ++CONFIG_DM_MTD=y ++CONFIG_SYS_MTDPARTS_RUNTIME=y ++CONFIG_MTD_RAW_NAND=y ++CONFIG_NAND_STM32_FMC2=y ++CONFIG_MTD_SPI_NAND=y ++CONFIG_DM_SPI_FLASH=y ++CONFIG_SPI_FLASH_MACRONIX=y ++CONFIG_SPI_FLASH_SPANSION=y ++CONFIG_SPI_FLASH_STMICRO=y ++CONFIG_SPI_FLASH_WINBOND=y ++# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set ++CONFIG_SPI_FLASH_MTD=y ++CONFIG_PHY_REALTEK=y ++CONFIG_DM_ETH=y ++CONFIG_DWC_ETH_QOS=y ++CONFIG_PHY=y ++CONFIG_PHY_STM32_USBPHYC=y ++CONFIG_PINCONF=y ++CONFIG_PINCTRL_STMFX=y ++CONFIG_DM_PMIC=y ++CONFIG_PMIC_STPMIC1=y ++CONFIG_DM_REGULATOR=y ++CONFIG_DM_REGULATOR_FIXED=y ++CONFIG_DM_REGULATOR_GPIO=y ++CONFIG_DM_REGULATOR_STM32_VREFBUF=y ++CONFIG_DM_REGULATOR_STPMIC1=y ++CONFIG_REMOTEPROC_STM32_COPRO=y ++CONFIG_RESET_SCMI=y ++CONFIG_DM_RNG=y ++CONFIG_RNG_STM32MP1=y ++CONFIG_DM_RTC=y ++CONFIG_RTC_STM32=y ++CONFIG_SERIAL_RX_BUFFER=y ++CONFIG_SPI=y ++CONFIG_DM_SPI=y ++CONFIG_STM32_QSPI=y ++CONFIG_STM32_SPI=y ++CONFIG_TEE=y ++CONFIG_OPTEE=y ++# CONFIG_OPTEE_TA_AVB is not set ++CONFIG_USB=y ++CONFIG_DM_USB=y ++CONFIG_DM_USB_GADGET=y ++CONFIG_USB_EHCI_HCD=y ++CONFIG_USB_EHCI_GENERIC=y ++CONFIG_USB_GADGET=y ++CONFIG_USB_GADGET_MANUFACTURER="STMicroelectronics" ++CONFIG_USB_GADGET_VENDOR_NUM=0x0483 ++CONFIG_USB_GADGET_PRODUCT_NUM=0x5720 ++CONFIG_USB_GADGET_DWC2_OTG=y ++CONFIG_DM_VIDEO=y ++CONFIG_BACKLIGHT_GPIO=y ++CONFIG_VIDEO_LCD_ORISETECH_OTM8009A=y ++CONFIG_VIDEO_LCD_RAYDIUM_RM68200=y ++CONFIG_VIDEO_STM32=y ++CONFIG_VIDEO_STM32_DSI=y ++CONFIG_VIDEO_STM32_MAX_XRES=1280 ++CONFIG_VIDEO_STM32_MAX_YRES=800 ++CONFIG_WDT=y ++CONFIG_WDT_STM32MP=y ++CONFIG_ERRNO_STR=y ++CONFIG_FDT_FIXUP_PARTITIONS=y ++CONFIG_LMB_RESERVED_REGIONS=16 +-- +2.25.1 + diff --git a/buildroot/board/octavo/osd32mp1-brk/readme.txt b/buildroot/board/octavo/osd32mp1-brk/readme.txt new file mode 100644 index 0000000000..8aae419f96 --- /dev/null +++ b/buildroot/board/octavo/osd32mp1-brk/readme.txt @@ -0,0 +1,35 @@ +OSD32MP1-BRK + +Intro +===== + +This configuration supports the OSD32MP1-BRK platform: + + https://octavosystems.com/octavo_products/osd32mp1-brk/ + +How to build +============ + + $ make octavo_osd32mp1_brk_defconfig + $ make + +How to write the microSD 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 microSD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX + +Boot the board +============== + + (1) Insert the microSD card. + + (2) Plug an USB-SERIAL cable on the RX, TX and GND pins + + (3) Plug a micro-USB cable to power-up the board. + + (4) The system will start, with the console on UART. diff --git a/buildroot/board/octavo/osd32mp1-brk/tfa-dts/osd32mp1_ddr_1x4Gb.dtsi b/buildroot/board/octavo/osd32mp1-brk/tfa-dts/osd32mp1_ddr_1x4Gb.dtsi new file mode 100644 index 0000000000..3cd2c3f5d1 --- /dev/null +++ b/buildroot/board/octavo/osd32mp1-brk/tfa-dts/osd32mp1_ddr_1x4Gb.dtsi @@ -0,0 +1,121 @@ +/* + * Copyright (C) 2015-2018, STMicroelectronics - All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause + * + */ + +/* + * File generated by STMicroelectronics STM32CubeMX DDR Tool for MPUs + * DDR type: DDR3 / DDR3L + * DDR width: 16bits + * DDR density: 4Gb + * System frequency: 533000Khz + * Relaxed Timing Mode: false + * Address mapping type: RBC + * + * Save Date: 2020.08.27, save Time: 15:22:11 + */ + +#define DDR_MEM_NAME "DDR3-DDR3L 16bits 533000Khz" +#define DDR_MEM_SPEED 533000 +#define DDR_MEM_SIZE 0x20000000 + +#define DDR_MSTR 0x00041401 +#define DDR_MRCTRL0 0x00000010 +#define DDR_MRCTRL1 0x00000000 +#define DDR_DERATEEN 0x00000000 +#define DDR_DERATEINT 0x00800000 +#define DDR_PWRCTL 0x00000000 +#define DDR_PWRTMG 0x00400010 +#define DDR_HWLPCTL 0x00000000 +#define DDR_RFSHCTL0 0x00210000 +#define DDR_RFSHCTL3 0x00000000 +#define DDR_RFSHTMG 0x0081008B +#define DDR_CRCPARCTL0 0x00000000 +#define DDR_DRAMTMG0 0x121B2414 +#define DDR_DRAMTMG1 0x000A041C +#define DDR_DRAMTMG2 0x0608090F +#define DDR_DRAMTMG3 0x0050400C +#define DDR_DRAMTMG4 0x08040608 +#define DDR_DRAMTMG5 0x06060403 +#define DDR_DRAMTMG6 0x02020002 +#define DDR_DRAMTMG7 0x00000202 +#define DDR_DRAMTMG8 0x00001005 +#define DDR_DRAMTMG14 0x000000A0 +#define DDR_ZQCTL0 0xC2000040 +#define DDR_DFITMG0 0x02060105 +#define DDR_DFITMG1 0x00000202 +#define DDR_DFILPCFG0 0x07000000 +#define DDR_DFIUPD0 0xC0400003 +#define DDR_DFIUPD1 0x00000000 +#define DDR_DFIUPD2 0x00000000 +#define DDR_DFIPHYMSTR 0x00000000 +#define DDR_ODTCFG 0x06000600 +#define DDR_ODTMAP 0x00000001 +#define DDR_SCHED 0x00000C01 +#define DDR_SCHED1 0x00000000 +#define DDR_PERFHPR1 0x01000001 +#define DDR_PERFLPR1 0x08000200 +#define DDR_PERFWR1 0x08000400 +#define DDR_DBG0 0x00000000 +#define DDR_DBG1 0x00000000 +#define DDR_DBGCMD 0x00000000 +#define DDR_POISONCFG 0x00000000 +#define DDR_PCCFG 0x00000010 +#define DDR_PCFGR_0 0x00010000 +#define DDR_PCFGW_0 0x00000000 +#define DDR_PCFGQOS0_0 0x02100C03 +#define DDR_PCFGQOS1_0 0x00800100 +#define DDR_PCFGWQOS0_0 0x01100C03 +#define DDR_PCFGWQOS1_0 0x01000200 +#define DDR_PCFGR_1 0x00010000 +#define DDR_PCFGW_1 0x00000000 +#define DDR_PCFGQOS0_1 0x02100C03 +#define DDR_PCFGQOS1_1 0x00800040 +#define DDR_PCFGWQOS0_1 0x01100C03 +#define DDR_PCFGWQOS1_1 0x01000200 +#define DDR_ADDRMAP1 0x00070707 +#define DDR_ADDRMAP2 0x00000000 +#define DDR_ADDRMAP3 0x1F000000 +#define DDR_ADDRMAP4 0x00001F1F +#define DDR_ADDRMAP5 0x06060606 +#define DDR_ADDRMAP6 0x0F060606 +#define DDR_ADDRMAP9 0x00000000 +#define DDR_ADDRMAP10 0x00000000 +#define DDR_ADDRMAP11 0x00000000 +#define DDR_PGCR 0x01442E02 +#define DDR_PTR0 0x0022AA5B +#define DDR_PTR1 0x04841104 +#define DDR_PTR2 0x042DA068 +#define DDR_ACIOCR 0x10400812 +#define DDR_DXCCR 0x00000C40 +#define DDR_DSGCR 0xF200011F +#define DDR_DCR 0x0000000B +#define DDR_DTPR0 0x38D488D0 +#define DDR_DTPR1 0x098B00D8 +#define DDR_DTPR2 0x10023600 +#define DDR_MR0 0x00000840 +#define DDR_MR1 0x00000000 +#define DDR_MR2 0x00000208 +#define DDR_MR3 0x00000000 +#define DDR_ODTCR 0x00010000 +#define DDR_ZQ0CR1 0x00000038 +#define DDR_DX0GCR 0x0000CE81 +#define DDR_DX0DLLCR 0x40000000 +#define DDR_DX0DQTR 0x00112121 +#define DDR_DX0DQSTR 0x3D200000 +#define DDR_DX1GCR 0x0000CE81 +#define DDR_DX1DLLCR 0x40000000 +#define DDR_DX1DQTR 0x11100121 +#define DDR_DX1DQSTR 0x3D200000 +#define DDR_DX2GCR 0x0000CE80 +#define DDR_DX2DLLCR 0x40000000 +#define DDR_DX2DQTR 0xFFFFFFFF +#define DDR_DX2DQSTR 0x3DB02000 +#define DDR_DX3GCR 0x0000CE80 +#define DDR_DX3DLLCR 0x40000000 +#define DDR_DX3DQTR 0xFFFFFFFF +#define DDR_DX3DQSTR 0x3DB02000 + +#include "stm32mp15-ddr.dtsi" diff --git a/buildroot/board/octavo/osd32mp1-brk/tfa-dts/stm32mp157c-osd32mp1-brk-fw-config.dts b/buildroot/board/octavo/osd32mp1-brk/tfa-dts/stm32mp157c-osd32mp1-brk-fw-config.dts new file mode 100644 index 0000000000..256d0db935 --- /dev/null +++ b/buildroot/board/octavo/osd32mp1-brk/tfa-dts/stm32mp157c-osd32mp1-brk-fw-config.dts @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +/* + * Copyright (c) 2020, STMicroelectronics - All Rights Reserved + */ + +#include "stm32mp15-ddr-512m-fw-config.dts" diff --git a/buildroot/board/octavo/osd32mp1-brk/tfa-dts/stm32mp157c-osd32mp1-brk.dts b/buildroot/board/octavo/osd32mp1-brk/tfa-dts/stm32mp157c-osd32mp1-brk.dts new file mode 100644 index 0000000000..4f21a21158 --- /dev/null +++ b/buildroot/board/octavo/osd32mp1-brk/tfa-dts/stm32mp157c-osd32mp1-brk.dts @@ -0,0 +1,547 @@ +/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */ +/* + * Copyright (C) STMicroelectronics 2020 - All Rights Reserved + * Author: STM32CubeMX code generation for STMicroelectronics. + */ + +/dts-v1/; +#include +#include +#include +#include + +#include "stm32mp157.dtsi" +#include "stm32mp15xc.dtsi" +#include "stm32mp15xxac-pinctrl.dtsi" +#include "osd32mp1_ddr_1x4Gb.dtsi" + +/ { + model = "Octavo OSD32MP1 BRK board"; + compatible = "st,stm32mp157c-osd32mp1-brk", "st,stm32mp157"; + + aliases { + serial0 = &uart4; + }; + + memory@c0000000 { + device_type = "memory"; + reg = <0xc0000000 0x20000000>; + }; + + vin: vin { + compatible = "regulator-fixed"; + regulator-name = "vin"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-always-on; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&bsec { + board_id: board_id@ec { + reg = <0xec 0x4>; + st,non-secure-otp; + }; +}; + +&clk_hse { + st,digbypass; +}; + +&cpu0 { + cpu-supply = <&vddcore>; +}; + +&cpu1 { + cpu-supply = <&vddcore>; +}; + +&hash1 { + status = "okay"; +}; + +&cryp1 { + status = "okay"; +}; + +&etzpc { + st,decprot = < + DECPROT(STM32MP1_ETZPC_USART1_ID, DECPROT_NS_RW, DECPROT_UNLOCK) + DECPROT(STM32MP1_ETZPC_SPI6_ID, DECPROT_NS_RW, DECPROT_UNLOCK) + DECPROT(STM32MP1_ETZPC_I2C4_ID, DECPROT_NS_RW, DECPROT_UNLOCK) + DECPROT(STM32MP1_ETZPC_I2C6_ID, DECPROT_NS_RW, DECPROT_UNLOCK) + DECPROT(STM32MP1_ETZPC_RNG1_ID, DECPROT_NS_RW, DECPROT_UNLOCK) + DECPROT(STM32MP1_ETZPC_HASH1_ID, DECPROT_NS_RW, DECPROT_UNLOCK) + DECPROT(STM32MP1_ETZPC_CRYP1_ID, DECPROT_NS_RW, DECPROT_UNLOCK) + DECPROT(STM32MP1_ETZPC_DDRCTRL_ID, DECPROT_NS_R_S_W, DECPROT_LOCK) + DECPROT(STM32MP1_ETZPC_DDRPHYC_ID, DECPROT_NS_R_S_W, DECPROT_LOCK) + DECPROT(STM32MP1_ETZPC_STGENC_ID, DECPROT_S_RW, DECPROT_LOCK) + DECPROT(STM32MP1_ETZPC_BKPSRAM_ID, DECPROT_S_RW, DECPROT_LOCK) + DECPROT(STM32MP1_ETZPC_IWDG1_ID, DECPROT_S_RW, DECPROT_LOCK) + >; +}; + + + +&i2c4 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c4_pins_z_mx>; + i2c-scl-rising-time-ns = <185>; + i2c-scl-falling-time-ns = <20>; + clock-frequency = <400000>; + status = "okay"; + secure-status = "okay"; + + pmic: stpmic@33 { + compatible = "st,stpmic1"; + reg = <0x33>; + interrupts-extended = <&exti_pwr 55 IRQ_TYPE_EDGE_FALLING>; + interrupt-controller; + #interrupt-cells = <2>; + status = "okay"; + secure-status = "okay"; + + regulators { + compatible = "st,stpmic1-regulators"; + buck1-supply = <&vin>; + buck2-supply = <&vin>; + buck3-supply = <&vin>; + buck4-supply = <&vin>; + ldo1-supply = <&v3v3>; + ldo2-supply = <&vin>; + ldo3-supply = <&vdd_ddr>; + ldo4-supply = <&vin>; + ldo5-supply = <&vin>; + ldo6-supply = <&v3v3>; + vref_ddr-supply = <&vin>; + boost-supply = <&vin>; + pwr_sw1-supply = <&bst_out>; + pwr_sw2-supply = <&bst_out>; + + vddcore: buck1 { + regulator-name = "vddcore"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1350000>; + regulator-always-on; + regulator-initial-mode = <0>; + regulator-over-current-protection; + lp-stop{ + regulator-on-in-suspend; + regulator-suspend-microvolt = <1200000>; + }; + standby-ddr-sr{ + regulator-off-in-suspend; + }; + standby-ddr-off{ + regulator-off-in-suspend; + }; + }; + + vdd_ddr: buck2 { + regulator-name = "vdd_ddr"; + regulator-min-microvolt = <1350000>; + regulator-max-microvolt = <1350000>; + regulator-always-on; + regulator-initial-mode = <0>; + regulator-over-current-protection; + lp-stop{ + regulator-suspend-microvolt = <1350000>; + regulator-on-in-suspend; + }; + standby-ddr-sr{ + regulator-suspend-microvolt = <1350000>; + regulator-on-in-suspend; + }; + standby-ddr-off{ + regulator-off-in-suspend; + }; + }; + + vdd: buck3 { + regulator-name = "vdd"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + st,mask-reset; + regulator-initial-mode = <0>; + regulator-over-current-protection; + lp-stop{ + regulator-suspend-microvolt = <3300000>; + regulator-on-in-suspend; + }; + standby-ddr-sr{ + regulator-suspend-microvolt = <3300000>; + regulator-on-in-suspend; + }; + standby-ddr-off{ + regulator-suspend-microvolt = <3300000>; + regulator-on-in-suspend; + }; + }; + + v3v3: buck4 { + regulator-name = "v3v3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + regulator-over-current-protection; + regulator-initial-mode = <0>; + lp-stop{ + regulator-suspend-microvolt = <3300000>; + regulator-on-in-suspend; + }; + standby-ddr-sr{ + regulator-off-in-suspend; + }; + standby-ddr-off{ + regulator-off-in-suspend; + }; + }; + + v1v8_ldo1: ldo1 { + regulator-name = "v1v8_audio"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-always-on; + standby-ddr-sr{ + regulator-off-in-suspend; + }; + standby-ddr-off{ + regulator-off-in-suspend; + }; + }; + + v3v3_ldo2: ldo2 { + regulator-name = "v3v3_hdmi"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + standby-ddr-sr{ + regulator-off-in-suspend; + }; + standby-ddr-off{ + regulator-off-in-suspend; + }; + }; + + vtt_ddr: ldo3 { + regulator-name = "vtt_ddr"; + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <750000>; + regulator-always-on; + regulator-over-current-protection; + lp-stop{ + regulator-off-in-suspend; + }; + standby-ddr-sr{ + regulator-off-in-suspend; + }; + standby-ddr-off{ + regulator-off-in-suspend; + }; + }; + + vdd_usb: ldo4 { + regulator-name = "vdd_usb"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + standby-ddr-sr{ + regulator-on-in-suspend; + }; + standby-ddr-off{ + regulator-off-in-suspend; + }; + }; + + vdda: ldo5 { + regulator-name = "vdda"; + regulator-min-microvolt = <2900000>; + regulator-max-microvolt = <2900000>; + regulator-boot-on; + standby-ddr-sr{ + regulator-off-in-suspend; + }; + standby-ddr-off{ + regulator-off-in-suspend; + }; + }; + + v1v2_ldo6: ldo6 { + regulator-name = "v1v2_ldo6"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + regulator-always-on; + standby-ddr-sr{ + regulator-off-in-suspend; + }; + standby-ddr-off{ + regulator-off-in-suspend; + }; + }; + + vref_ddr: vref_ddr { + regulator-name = "vref_ddr"; + regulator-always-on; + regulator-over-current-protection; + lp-stop{ + regulator-on-in-suspend; + }; + standby-ddr-sr{ + regulator-on-in-suspend; + }; + standby-ddr-off{ + regulator-off-in-suspend; + }; + }; + + bst_out: boost { + regulator-name = "bst_out"; + }; + + vbus_otg: pwr_sw1 { + regulator-name = "vbus_otg"; + }; + + vbus_sw: pwr_sw2 { + regulator-name = "vbus_sw"; + regulator-active-discharge = <1>; + }; + }; + }; +}; + +&iwdg2 { + timeout-sec = <32>; + secure-timeout-sec = <5>; + status = "okay"; + secure-status = "okay"; +}; + +&nvmem_layout { + nvmem-cells = <&cfg0_otp>, + <&part_number_otp>, + <&monotonic_otp>, + <&nand_otp>, + <&uid_otp>, + <&package_otp>, + <&hw2_otp>, + <&pkh_otp>, + <&board_id>; + + nvmem-cell-names = "cfg0_otp", + "part_number_otp", + "monotonic_otp", + "nand_otp", + "uid_otp", + "package_otp", + "hw2_otp", + "pkh_otp", + "board_id"; +}; + +&pwr_regulators { + system_suspend_supported_soc_modes = < + STM32_PM_CSLEEP_RUN + STM32_PM_CSTOP_ALLOW_LP_STOP + STM32_PM_CSTOP_ALLOW_STANDBY_DDR_SR + >; + system_off_soc_mode = ; + vdd-supply = <&vdd>; + vdd_3v3_usbfs-supply = <&vdd_usb>; +}; + +&rcc { + st,hsi-cal; + st,csi-cal; + st,cal-sec = <60>; + st,clksrc = < + CLK_MPU_PLL1P + CLK_AXI_PLL2P + CLK_MCU_PLL3P + CLK_PLL12_HSE + CLK_PLL3_HSE + CLK_PLL4_HSE + CLK_RTC_LSE + CLK_MCO1_DISABLED + CLK_MCO2_DISABLED + >; + + st,clkdiv = < + 1 /*MPU*/ + 0 /*AXI*/ + 0 /*MCU*/ + 1 /*APB1*/ + 1 /*APB2*/ + 1 /*APB3*/ + 1 /*APB4*/ + 2 /*APB5*/ + 23 /*RTC*/ + 0 /*MCO1*/ + 0 /*MCO2*/ + >; + + st,pkcs = < + CLK_CKPER_HSE + CLK_FMC_ACLK + CLK_QSPI_ACLK + CLK_ETH_DISABLED + CLK_SDMMC12_PLL4P + CLK_DSI_DSIPLL + CLK_STGEN_HSE + CLK_USBPHY_HSE + CLK_SPI2S1_PLL3Q + CLK_SPI2S23_PLL3Q + CLK_SPI45_HSI + CLK_SPI6_HSI + CLK_I2C46_HSI + CLK_SDMMC3_PLL4P + CLK_USBO_USBPHY + CLK_ADC_CKPER + CLK_CEC_LSE + CLK_I2C12_HSI + CLK_I2C35_HSI + CLK_UART1_HSI + CLK_UART24_HSI + CLK_UART35_HSI + CLK_UART6_HSI + CLK_UART78_HSI + CLK_SPDIF_PLL4P + CLK_FDCAN_PLL4R + CLK_SAI1_PLL3Q + CLK_SAI2_PLL3Q + CLK_SAI3_PLL3Q + CLK_SAI4_PLL3Q + CLK_RNG1_LSI + CLK_RNG2_LSI + CLK_LPTIM1_PCLK1 + CLK_LPTIM23_PCLK3 + CLK_LPTIM45_LSE + >; + + /* VCO = 1066.0 MHz => P = 266 (AXI), Q = 533 (GPU), R = 533 (DDR) */ + pll2: st,pll@1 { + compatible = "st,stm32mp1-pll"; + reg = <1>; + cfg = <2 65 1 0 0 PQR(1,1,1)>; + frac = <0x1400>; + }; + + /* VCO = 417.8 MHz => P = 209, Q = 24, R = 11 */ + pll3: st,pll@2 { + compatible = "st,stm32mp1-pll"; + reg = <2>; + cfg = <1 33 1 16 36 PQR(1,1,1)>; + frac = <0x1a04>; + }; + + /* VCO = 594.0 MHz => P = 99, Q = 74, R = 74 */ + pll4: st,pll@3 { + compatible = "st,stm32mp1-pll"; + reg = <3>; + cfg = <3 98 5 7 7 PQR(1,1,1)>; + }; +}; + +&rng1 { + status = "okay"; + secure-status = "okay"; +}; + +&rtc { + status = "okay"; + secure-status = "okay"; +}; + +&sdmmc1 { + pinctrl-names = "default"; + pinctrl-0 = <&sdmmc1_pins_mx>; + disable-wp; + st,neg-edge; + bus-width = <4>; + vmmc-supply = <&v3v3>; + status = "okay"; +}; + +&timers15 { + secure-status = "okay"; + st,hsi-cal-input = <7>; + st,csi-cal-input = <8>; +}; +&uart4 { + pinctrl-names = "default"; + pinctrl-0 = <&uart4_pins_mx>; + status = "okay"; +}; + +&usbotg_hs { + phys = <&usbphyc_port1 0>; + phy-names = "usb2-phy"; + usb-role-switch; + status = "okay"; +}; + +&usbphyc { + status = "okay"; +}; + +&usbphyc_port0 { + phy-supply = <&vdd_usb>; +}; + +&usbphyc_port1 { + phy-supply = <&vdd_usb>; +}; + + + + +&pinctrl { + sdmmc1_pins_mx: sdmmc1-b4-0 { + pins1 { + pinmux = , /* SDMMC1_D0 */ + , /* SDMMC1_D1 */ + , /* SDMMC1_D2 */ + , /* SDMMC1_D3 */ + ; /* SDMMC1_CMD */ + slew-rate = <1>; + drive-push-pull; + bias-disable; + }; + pins2 { + pinmux = ; /* SDMMC1_CK */ + slew-rate = <2>; + drive-push-pull; + bias-disable; + }; + }; + + uart4_pins_mx: uart4-0 { + pins1 { + pinmux = ; /* UART4_TX */ + bias-disable; + drive-push-pull; + slew-rate = <0>; + }; + pins2 { + pinmux = ; /* UART4_RX */ + bias-disable; + }; + }; +}; + +&pinctrl_z { + i2c4_pins_z_mx: i2c4-0 { + pins { + pinmux = , /* I2C4_SCL */ + ; /* I2C4_SDA */ + bias-disable; + drive-open-drain; + slew-rate = <0>; + }; + }; +}; diff --git a/buildroot/board/octavo/osd32mp1-red/genimage.cfg b/buildroot/board/octavo/osd32mp1-red/genimage.cfg new file mode 100644 index 0000000000..bdad191489 --- /dev/null +++ b/buildroot/board/octavo/osd32mp1-red/genimage.cfg @@ -0,0 +1,23 @@ +image sdcard.img { + hdimage { + partition-table-type = "gpt" + } + + partition fsbl1 { + image = "tf-a-stm32mp157c-osd32mp1-red.stm32" + } + + partition fsbl2 { + image = "tf-a-stm32mp157c-osd32mp1-red.stm32" + } + + partition fip { + image = "fip.bin" + size = 2M + } + + partition rootfs { + image = "rootfs.ext4" + bootable = "yes" + } +} diff --git a/buildroot/board/octavo/osd32mp1-red/linux-dts/stm32mp157c-osd32mp1-red.dts b/buildroot/board/octavo/osd32mp1-red/linux-dts/stm32mp157c-osd32mp1-red.dts new file mode 100644 index 0000000000..bf0e23c761 --- /dev/null +++ b/buildroot/board/octavo/osd32mp1-red/linux-dts/stm32mp157c-osd32mp1-red.dts @@ -0,0 +1,1440 @@ +/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */ +/* + * Copyright (C) Octavo Systems 2021 - All Rights Reserved + * Author: Neeraj Dantu for Octavo Systems + */ + +/dts-v1/; + +#include +#include "stm32mp157.dtsi" +#include "stm32mp15xc.dtsi" +#include "stm32mp15xxac-pinctrl.dtsi" +#include "stm32mp15-m4-srm.dtsi" +#include +#include +#include + +/ { + model = "Octavo OSD32MP1 RED board"; + compatible = "octavo,stm32mp157c-osd32mp1-red", "st,stm32mp157"; + + memory@c0000000 { + device_type = "memory"; + reg = <0xc0000000 0x20000000>; + }; + + wifi_pwrseq: wifi-pwrseq { + compatible = "mmc-pwrseq-simple"; + reset-gpios = <&gpiog 5 GPIO_ACTIVE_LOW>; + }; + + clocks { + clk_ext_camera: clk-ext-camera { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <24000000>; + }; + }; + + reserved-memory { + #address-cells = <1>; + #size-cells = <1>; + ranges; + + mcuram2:mcuram2@10000000{ + compatible = "shared-dma-pool"; + reg = <0x10000000 0x40000>; + no-map; + }; + + vdev0vring0:vdev0vring0@10040000{ + compatible = "shared-dma-pool"; + reg = <0x10040000 0x1000>; + no-map; + }; + + vdev0vring1:vdev0vring1@10041000{ + compatible = "shared-dma-pool"; + reg = <0x10041000 0x1000>; + no-map; + }; + + vdev0buffer:vdev0buffer@10042000{ + compatible = "shared-dma-pool"; + reg = <0x10042000 0x4000>; + no-map; + }; + + mcuram:mcuram@30000000{ + compatible = "shared-dma-pool"; + reg = <0x30000000 0x40000>; + no-map; + }; + + retram:retram@38000000{ + compatible = "shared-dma-pool"; + reg = <0x38000000 0x10000>; + no-map; + }; + + gpu_reserved:gpu@d4000000{ + reg = <0xd4000000 0x4000000>; + no-map; + }; + }; + + + aliases { + ethernet0 = ðernet0; + serial0 = &uart4; + serial1 = &usart3; + serial2 = &uart7; + serial3 = &usart2; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; + + led { + compatible = "gpio-leds"; + blue { + label = "heartbeat"; + gpios = <&gpiod 11 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "heartbeat"; + default-state = "off"; + }; + }; + + usb_phy_tuning:usb-phy-tuning{ + st,hs-dc-level = <2>; + st,fs-rftime-tuning; + st,hs-rftime-reduction; + st,hs-current-trim = <15>; + st,hs-impedance-trim = <1>; + st,squelch-level = <3>; + st,hs-rx-offset = <2>; + st,no-lsfs-sc; + }; + + vin:vin{ + compatible = "regulator-fixed"; + regulator-name = "vin"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-always-on; + }; + + sound { + compatible = "audio-graph-card"; + label = "STM32MP15-DK"; + dais = <&i2s2_port>; + status = "okay"; + }; +}; + +&pinctrl { + u-boot,dm-pre-reloc; + dcmi_pins_mx: dcmi_mx-0 { + pins { + pinmux = , /* DCMI_HSYNC */ + , /* DCMI_PIXCLK */ + , /* DCMI_D1 */ + , /* DCMI_D7 */ + , /* DCMI_D0 */ + , /* DCMI_D2 */ + , /* DCMI_D3 */ + , /* DCMI_D4 */ + , /* DCMI_D6 */ + , /* DCMI_VSYNC */ + , /* DCMI_D8 */ + , /* DCMI_D9 */ + , /* DCMI_D11 */ + , /* DCMI_D10 */ + ; /* DCMI_D5 */ + bias-disable; + }; + }; + + dcmi_sleep_pins_mx: dcmi_sleep_mx-0 { + pins { + pinmux = , /* DCMI_HSYNC */ + , /* DCMI_PIXCLK */ + , /* DCMI_D1 */ + , /* DCMI_D7 */ + , /* DCMI_D0 */ + , /* DCMI_D2 */ + , /* DCMI_D3 */ + , /* DCMI_D4 */ + , /* DCMI_D6 */ + , /* DCMI_VSYNC */ + , /* DCMI_D8 */ + , /* DCMI_D9 */ + , /* DCMI_D11 */ + , /* DCMI_D10 */ + ; /* DCMI_D5 */ + }; + }; + + eth1_pins_mx: eth1_mx-0 { + pins1 { + pinmux = , /* ETH1_RX_CLK */ + , /* ETH1_RX_CTL */ + , /* ETH1_RXD2 */ + , /* ETH1_RXD3 */ + , /* ETH1_RXD0 */ + ; /* ETH1_RXD1 */ + bias-disable; + }; + pins2 { + pinmux = ; /* ETH1_MDIO */ + bias-disable; + drive-push-pull; + slew-rate = <0>; + }; + pins3 { + pinmux = , /* ETH1_TX_CTL */ + , /* ETH1_MDC */ + , /* ETH1_TXD2 */ + , /* ETH1_TXD3 */ + , /* ETH1_GTX_CLK */ + , /* ETH1_TXD0 */ + ; /* ETH1_TXD1 */ + bias-disable; + drive-push-pull; + slew-rate = <2>; + }; + }; + + eth1_sleep_pins_mx: eth1_sleep_mx-0 { + pins { + pinmux = , /* ETH1_RX_CLK */ + , /* ETH1_MDIO */ + , /* ETH1_RX_CTL */ + , /* ETH1_RXD2 */ + , /* ETH1_RXD3 */ + , /* ETH1_TX_CTL */ + , /* ETH1_MDC */ + , /* ETH1_TXD2 */ + , /* ETH1_RXD0 */ + , /* ETH1_RXD1 */ + , /* ETH1_TXD3 */ + , /* ETH1_GTX_CLK */ + , /* ETH1_TXD0 */ + ; /* ETH1_TXD1 */ + }; + }; + + i2c1_pins_mx: i2c1_mx-0 { + pins { + pinmux = , /* I2C1_SCL */ + ; /* I2C1_SDA */ + bias-disable; + drive-open-drain; + slew-rate = <0>; + }; + }; + + i2c1_sleep_pins_mx: i2c1_sleep_mx-0 { + pins { + pinmux = , /* I2C1_SCL */ + ; /* I2C1_SDA */ + }; + }; + + i2c2_pins_mx: i2c2_mx-0 { + pins { + pinmux = ; /* I2C2_SDA */ + bias-disable; + drive-open-drain; + slew-rate = <0>; + }; + }; + + i2c2_sleep_pins_mx: i2c2_sleep_mx-0 { + pins { + pinmux = ; /* I2C2_SDA */ + }; + }; + + i2c5_pins_mx: i2c5_mx-0 { + pins { + pinmux = , /* I2C5_SCL */ + ; /* I2C5_SDA */ + bias-disable; + drive-open-drain; + slew-rate = <0>; + }; + }; + + i2c5_sleep_pins_mx: i2c5_sleep_mx-0 { + pins { + pinmux = , /* I2C5_SCL */ + ; /* I2C5_SDA */ + }; + }; + + i2s2_pins_mx: i2s2_mx-0 { + pins { + pinmux = , /* I2S2_WS */ + , /* I2S2_CK */ + ; /* I2S2_SDO */ + bias-disable; + drive-push-pull; + slew-rate = <1>; + }; + }; + + i2s2_sleep_pins_mx: i2s2_sleep_mx-0 { + pins { + pinmux = , /* I2S2_WS */ + , /* I2S2_CK */ + ; /* I2S2_SDO */ + }; + }; + + ltdc_pins_mx: ltdc_mx-0 { + pins1 { + pinmux = , /* LTDC_B5 */ + , /* LTDC_B6 */ + , /* LTDC_R5 */ + , /* LTDC_B7 */ + , /* LTDC_B0 */ + , /* LTDC_B3 */ + , /* LTDC_G1 */ + , /* LTDC_B4 */ + , /* LTDC_G0 */ + , /* LTDC_R7 */ + , /* LTDC_DE */ + , /* LTDC_B2 */ + , /* LTDC_B1 */ + , /* LTDC_R0 */ + , /* LTDC_R1 */ + , /* LTDC_G4 */ + , /* LTDC_R2 */ + , /* LTDC_R3 */ + , /* LTDC_R4 */ + , /* LTDC_R6 */ + , /* LTDC_G2 */ + , /* LTDC_G3 */ + , /* LTDC_G5 */ + , /* LTDC_G6 */ + , /* LTDC_G7 */ + , /* LTDC_VSYNC */ + ; /* LTDC_HSYNC */ + bias-disable; + drive-push-pull; + slew-rate = <0>; + }; + pins2 { + pinmux = ; /* LTDC_CLK */ + bias-disable; + drive-push-pull; + slew-rate = <1>; + }; + }; + + ltdc_sleep_pins_mx: ltdc_sleep_mx-0 { + pins { + pinmux = , /* LTDC_B5 */ + , /* LTDC_B6 */ + , /* LTDC_R5 */ + , /* LTDC_B7 */ + , /* LTDC_B0 */ + , /* LTDC_B3 */ + , /* LTDC_G1 */ + , /* LTDC_B4 */ + , /* LTDC_G0 */ + , /* LTDC_R7 */ + , /* LTDC_DE */ + , /* LTDC_CLK */ + , /* LTDC_B2 */ + , /* LTDC_B1 */ + , /* LTDC_R0 */ + , /* LTDC_R1 */ + , /* LTDC_G4 */ + , /* LTDC_R2 */ + , /* LTDC_R3 */ + , /* LTDC_R4 */ + , /* LTDC_R6 */ + , /* LTDC_G2 */ + , /* LTDC_G3 */ + , /* LTDC_G5 */ + , /* LTDC_G6 */ + , /* LTDC_G7 */ + , /* LTDC_VSYNC */ + ; /* LTDC_HSYNC */ + }; + }; + + sdmmc1_pins_mx: sdmmc1_mx-0 { + u-boot,dm-pre-reloc; + pins1 { + u-boot,dm-pre-reloc; + pinmux = , /* SDMMC1_D0 */ + , /* SDMMC1_D1 */ + , /* SDMMC1_D2 */ + , /* SDMMC1_D3 */ + ; /* SDMMC1_CMD */ + bias-disable; + drive-push-pull; + slew-rate = <1>; + }; + pins2 { + u-boot,dm-pre-reloc; + pinmux = ; /* SDMMC1_CK */ + bias-disable; + drive-push-pull; + slew-rate = <2>; + }; + }; + + sdmmc1_opendrain_pins_mx: sdmmc1_opendrain_mx-0 { + u-boot,dm-pre-reloc; + pins1 { + u-boot,dm-pre-reloc; + pinmux = , /* SDMMC1_D0 */ + , /* SDMMC1_D1 */ + , /* SDMMC1_D2 */ + ; /* SDMMC1_D3 */ + bias-disable; + drive-push-pull; + slew-rate = <1>; + }; + pins2 { + u-boot,dm-pre-reloc; + pinmux = ; /* SDMMC1_CK */ + bias-disable; + drive-push-pull; + slew-rate = <2>; + }; + pins3 { + u-boot,dm-pre-reloc; + pinmux = ; /* SDMMC1_CMD */ + bias-disable; + drive-open-drain; + slew-rate = <1>; + }; + }; + + sdmmc1_sleep_pins_mx: sdmmc1_sleep_mx-0 { + u-boot,dm-pre-reloc; + pins { + u-boot,dm-pre-reloc; + pinmux = , /* SDMMC1_D0 */ + , /* SDMMC1_D1 */ + , /* SDMMC1_D2 */ + , /* SDMMC1_D3 */ + , /* SDMMC1_CK */ + ; /* SDMMC1_CMD */ + }; + }; + + sdmmc2_pins_mx: sdmmc2_mx-0 { + u-boot,dm-pre-reloc; + pins1 { + u-boot,dm-pre-reloc; + pinmux = , /* SDMMC2_D4 */ + , /* SDMMC2_D5 */ + , /* SDMMC2_D2 */ + , /* SDMMC2_D3 */ + , /* SDMMC2_D0 */ + , /* SDMMC2_D1 */ + , /* SDMMC2_D7 */ + , /* SDMMC2_D6 */ + ; /* SDMMC2_CMD */ + bias-pull-up; + drive-push-pull; + slew-rate = <1>; + }; + pins2 { + u-boot,dm-pre-reloc; + pinmux = ; /* SDMMC2_CK */ + bias-pull-up; + drive-push-pull; + slew-rate = <2>; + }; + }; + + sdmmc2_opendrain_pins_mx: sdmmc2_opendrain_mx-0 { + u-boot,dm-pre-reloc; + pins1 { + u-boot,dm-pre-reloc; + pinmux = , /* SDMMC2_D4 */ + , /* SDMMC2_D5 */ + , /* SDMMC2_D2 */ + , /* SDMMC2_D3 */ + , /* SDMMC2_D0 */ + , /* SDMMC2_D1 */ + , /* SDMMC2_D7 */ + ; /* SDMMC2_D6 */ + bias-pull-up; + drive-push-pull; + slew-rate = <1>; + }; + pins2 { + u-boot,dm-pre-reloc; + pinmux = ; /* SDMMC2_CK */ + bias-pull-up; + drive-push-pull; + slew-rate = <2>; + }; + pins3 { + u-boot,dm-pre-reloc; + pinmux = ; /* SDMMC2_CMD */ + bias-pull-up; + drive-open-drain; + slew-rate = <1>; + }; + }; + + sdmmc2_sleep_pins_mx: sdmmc2_sleep_mx-0 { + u-boot,dm-pre-reloc; + pins { + u-boot,dm-pre-reloc; + pinmux = , /* SDMMC2_D4 */ + , /* SDMMC2_D5 */ + , /* SDMMC2_D2 */ + , /* SDMMC2_D3 */ + , /* SDMMC2_D0 */ + , /* SDMMC2_D1 */ + , /* SDMMC2_D7 */ + , /* SDMMC2_CK */ + , /* SDMMC2_D6 */ + ; /* SDMMC2_CMD */ + }; + }; + + sdmmc3_pins_mx: sdmmc3_mx-0 { + u-boot,dm-pre-reloc; + pins1 { + u-boot,dm-pre-reloc; + pinmux = , /* SDMMC3_D3 */ + , /* SDMMC3_D0 */ + , /* SDMMC3_CMD */ + , /* SDMMC3_D1 */ + ; /* SDMMC3_D2 */ + bias-disable; + drive-push-pull; + slew-rate = <1>; + }; + pins2 { + u-boot,dm-pre-reloc; + pinmux = ; /* SDMMC3_CK */ + bias-disable; + drive-push-pull; + slew-rate = <2>; + }; + }; + + sdmmc3_opendrain_pins_mx: sdmmc3_opendrain_mx-0 { + u-boot,dm-pre-reloc; + pins1 { + u-boot,dm-pre-reloc; + pinmux = , /* SDMMC3_D3 */ + , /* SDMMC3_D0 */ + , /* SDMMC3_D1 */ + ; /* SDMMC3_D2 */ + bias-disable; + drive-push-pull; + slew-rate = <1>; + }; + pins2 { + u-boot,dm-pre-reloc; + pinmux = ; /* SDMMC3_CMD */ + bias-disable; + drive-open-drain; + slew-rate = <1>; + }; + pins3 { + u-boot,dm-pre-reloc; + pinmux = ; /* SDMMC3_CK */ + bias-disable; + drive-push-pull; + slew-rate = <2>; + }; + }; + + sdmmc3_sleep_pins_mx: sdmmc3_sleep_mx-0 { + u-boot,dm-pre-reloc; + pins { + u-boot,dm-pre-reloc; + pinmux = , /* SDMMC3_D3 */ + , /* SDMMC3_D0 */ + , /* SDMMC3_CMD */ + , /* SDMMC3_D1 */ + , /* SDMMC3_D2 */ + ; /* SDMMC3_CK */ + }; + }; + + spi5_pins_mx: spi5_mx-0 { + pins { + pinmux = , /* SPI5_SCK */ + , /* SPI5_MISO */ + ; /* SPI5_MOSI */ + bias-disable; + drive-push-pull; + slew-rate = <1>; + }; + }; + + spi5_sleep_pins_mx: spi5_sleep_mx-0 { + pins { + pinmux = , /* SPI5_SCK */ + , /* SPI5_MISO */ + ; /* SPI5_MOSI */ + }; + }; + + tim5_pwm_pins_mx: tim5_pwm_mx-0 { + pins { + pinmux = ; /* TIM5_CH2 */ + bias-disable; + drive-push-pull; + slew-rate = <0>; + }; + }; + + tim5_pwm_sleep_pins_mx: tim5_pwm_sleep_mx-0 { + pins { + pinmux = ; /* TIM5_CH2 */ + }; + }; + + uart4_pins_mx: uart4_mx-0 { + u-boot,dm-pre-reloc; + pins1 { + u-boot,dm-pre-reloc; + pinmux = ; /* UART4_RX */ + bias-disable; + }; + pins2 { + u-boot,dm-pre-reloc; + pinmux = ; /* UART4_TX */ + bias-disable; + drive-push-pull; + slew-rate = <0>; + }; + }; + + uart4_sleep_pins_mx: uart4_sleep_mx-0 { + u-boot,dm-pre-reloc; + pins { + u-boot,dm-pre-reloc; + pinmux = , /* UART4_RX */ + ; /* UART4_TX */ + }; + }; + + usart2_pins_mx: usart2_mx-0 { + pins1 { + pinmux = , /* USART2_CTS */ + ; /* USART2_RX */ + bias-disable; + }; + pins2 { + pinmux = , /* USART2_RTS */ + ; /* USART2_TX */ + bias-disable; + drive-push-pull; + slew-rate = <0>; + }; + }; + + usart2_sleep_pins_mx: usart2_sleep_mx-0 { + pins { + pinmux = , /* USART2_CTS */ + , /* USART2_RTS */ + , /* USART2_TX */ + ; /* USART2_RX */ + }; + }; + + cec_pins_mx: cec-1 { + pins { + pinmux = ; + bias-disable; + drive-open-drain; + slew-rate = <0>; + }; + }; + + cec_sleep_pins_mx: cec-sleep-1 { + pins { + pinmux = ; /* HDMI_CEC */ + }; + }; + + stusb1600_pins_mx: stusb1600-0 { + pins { + pinmux = ; + bias-pull-up; + }; + }; + + m_can1_pins_mx: m_can1_sleep_mx-0 { + pins1 { + pinmux = ; /* CAN1_TX */ + slew-rate = <0>; + drive-push-pull; + bias-disable; + }; + pins2 { + pinmux = ; /* CAN1_RX */ + bias-disable; + }; + }; + + m_can1_sleep_pins_mx: m_can1_sleep-0 { + pins { + pinmux = , /* CAN1_TX */ + ; /* CAN1_RX */ + }; + }; + +}; + +&pinctrl_z { + u-boot,dm-pre-reloc; + + i2c2_pins_z_mx: i2c2_mx-0 { + pins { + pinmux = ; /* I2C2_SCL */ + bias-disable; + drive-open-drain; + slew-rate = <0>; + }; + }; + + i2c2_sleep_pins_z_mx: i2c2_sleep_mx-0 { + pins { + pinmux = ; /* I2C2_SCL */ + }; + }; + + i2c4_pins_z_mx: i2c4_mx-0 { + u-boot,dm-pre-reloc; + pins { + u-boot,dm-pre-reloc; + pinmux = , /* I2C4_SCL */ + ; /* I2C4_SDA */ + bias-disable; + drive-open-drain; + slew-rate = <0>; + }; + }; + + i2c4_sleep_pins_z_mx: i2c4_sleep_mx-0 { + u-boot,dm-pre-reloc; + pins { + u-boot,dm-pre-reloc; + pinmux = , /* I2C4_SCL */ + ; /* I2C4_SDA */ + }; + }; +}; + +&m4_rproc{ + memory-region = <&retram>, <&mcuram>, <&mcuram2>, <&vdev0vring0>, + <&vdev0vring1>, <&vdev0buffer>; + mboxes = <&ipcc 0>, <&ipcc 1>, <&ipcc 2>; + mbox-names = "vq0", "vq1", "shutdown"; + interrupt-parent = <&exti>; + interrupts = <68 1>; + wakeup-source; + status = "okay"; +}; + +&dcmi{ + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&dcmi_pins_mx>; + pinctrl-1 = <&dcmi_sleep_pins_mx>; + status = "okay"; + + port { + dcmi_0: endpoint { + remote-endpoint = <&ov5640_0>; + bus-width = <8>; + hsync-active = <0>; + vsync-active = <0>; + pclk-sample = <1>; + pclk-max-frequency = <77000000>; + }; + }; +}; + +&dsi{ + status = "okay"; + + ports { + port@0 { + reg = <0>; + dsi_in: endpoint { + remote-endpoint = <<dc_ep1_out>; + }; + }; + + port@1 { + reg = <1>; + dsi_out: endpoint { + remote-endpoint = <&panel_in>; + }; + }; + }; + + panel_otm8009a: panel-otm8009a@0 { + compatible = "orisetech,otm8009a"; + reg = <0>; + reset-gpios = <&gpioe 9 GPIO_ACTIVE_LOW>; + power-supply = <&v3v3>; + status = "okay"; + + port { + panel_in: endpoint { + remote-endpoint = <&dsi_out>; + }; + }; + }; +}; + +ðernet0{ + pinctrl-names = "default", "sleep"; + pinctrl-0 = <ð1_pins_mx>; + pinctrl-1 = <ð1_sleep_pins_mx>; + status = "okay"; + + + st,eth-clk-sel; //custom + phy-mode = "rgmii-id"; + max-speed = <1000>; + phy-handle = <&phy0>; + nvmem-cells = <ðernet_mac_address>; + nvmem-cell-names = "mac-address"; + + mdio0 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "snps,dwmac-mdio"; + phy0: ethernet-phy@0 { + reg = <3>; + }; + }; +}; + +&gpu{ + status = "okay"; + contiguous-area = <&gpu_reserved>; +}; + +&hash1 { + status = "okay"; +}; + +&hsem{ + status = "okay"; +}; + +&cryp1{ + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&i2c1{ + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&i2c1_pins_mx>; + pinctrl-1 = <&i2c1_sleep_pins_mx>; + status = "okay"; + i2c-scl-rising-time-ns = <100>; + i2c-scl-falling-time-ns = <7>; + /delete-property/dmas; + /delete-property/dma-names; + + touchscreen@2a { + compatible = "focaltech,ft6236"; + reg = <0x2a>; + interrupts = <2 2>; + interrupt-parent = <&gpiof>; + interrupt-controller; + touchscreen-size-x = <480>; + touchscreen-size-y = <800>; + panel = <&panel_otm8009a>; + vcc-supply = <&v3v3>; + status = "okay"; + }; + touchscreen@38 { + compatible = "focaltech,ft6236"; + reg = <0x38>; + interrupts = <2 2>; + interrupt-parent = <&gpiof>; + interrupt-controller; + touchscreen-size-x = <480>; + touchscreen-size-y = <800>; + panel = <&panel_otm8009a>; + vcc-supply = <&v3v3>; + status = "okay"; + }; + + hdmi-transmitter@39 { + compatible = "sil,sii9022"; + reg = <0x39>; + reset-gpios = <&gpiog 0 GPIO_ACTIVE_LOW>; + interrupts = <1 IRQ_TYPE_EDGE_FALLING>; + interrupt-parent = <&gpiog>; + #sound-dai-cells = <0>; + status = "okay"; + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + sii9022_in: endpoint { + remote-endpoint = <<dc_ep0_out>; + }; + }; + + port@3 { + reg = <3>; + sii9022_tx_endpoint: endpoint { + remote-endpoint = <&i2s2_endpoint>; + }; + }; + }; + }; +}; + +&i2c2{ + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&i2c2_pins_mx &i2c2_pins_z_mx>; + pinctrl-1 = <&i2c2_sleep_pins_mx &i2c2_sleep_pins_z_mx>; + status = "okay"; + i2c-scl-rising-time-ns = <185>; + i2c-scl-falling-time-ns = <20>; + /delete-property/dmas; + /delete-property/dma-names; + + ov5640: camera@3c { + compatible = "ovti,ov5640"; + reg = <0x3c>; + clocks = <&clk_ext_camera>; + clock-names = "xclk"; + DOVDD-supply = <&v3v3>; + //powerdown-gpios = <&stmfx_pinctrl 18 (GPIO_ACTIVE_HIGH | GPIO_PUSH_PULL)>; + //reset-gpios = <&stmfx_pinctrl 19 (GPIO_ACTIVE_LOW | GPIO_PUSH_PULL)>; + //powerdown-gpios = <&gpioc 3 GPIO_ACTIVE_HIGH>; //custom + //reset-gpios = <&gpioa 14 GPIO_ACTIVE_LOW>; //custom + rotation = <180>; + status = "okay"; + + port { + ov5640_0: endpoint { + remote-endpoint = <&dcmi_0>; + bus-width = <8>; + data-shift = <2>; /* lines 9:2 are used */ + hsync-active = <0>; + vsync-active = <0>; + pclk-sample = <1>; + pclk-max-frequency = <77000000>; + }; + }; + }; +}; + +&i2c4{ + u-boot,dm-pre-reloc; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&i2c4_pins_z_mx>; + pinctrl-1 = <&i2c4_sleep_pins_z_mx>; + status = "okay"; + i2c-scl-rising-time-ns = <185>; + i2c-scl-falling-time-ns = <20>; + clock-frequency = <400000>; + /delete-property/ dmas; + /delete-property/ dma-names; + + typec: stusb1600@28 { + compatible = "st,stusb1600"; + reg = <0x28>; + interrupt-parent = <&gpioe>; + interrupts = <8 IRQ_TYPE_EDGE_FALLING>; + pinctrl-0 = <&stusb1600_pins_mx>; + pinctrl-names = "default"; + status = "okay"; + vdd-supply = <&vin>; + + typec_con: connector { + compatible = "usb-c-connector"; + label = "USB-C"; + power-role = "dual"; + power-opmode = "default"; + + port { + con_usbotg_hs_ep: endpoint { + remote-endpoint = <&usbotg_hs_ep>; + }; + }; + }; + }; + + pmic:stpmic@33{ + compatible = "st,stpmic1"; + reg = <0x33>; + interrupts-extended = <&exti_pwr 55 IRQ_TYPE_EDGE_FALLING>; + interrupt-controller; + #interrupt-cells = <2>; + status = "okay"; + + st,main-control-register = <0x04>; + st,vin-control-register = <0xc0>; + st,usb-control-register = <0x20>; + + regulators{ + compatible = "st,stpmic1-regulators"; + buck1-supply = <&vin>; + buck2-supply = <&vin>; + buck3-supply = <&vin>; + buck4-supply = <&vin>; + ldo1-supply = <&v3v3>; + ldo2-supply = <&vin>; + ldo3-supply = <&vdd_ddr>; + ldo4-supply = <&vin>; + ldo5-supply = <&vin>; + ldo6-supply = <&v3v3>; + vref_ddr-supply = <&vin>; + boost-supply = <&vin>; + pwr_sw1-supply = <&bst_out>; + pwr_sw2-supply = <&bst_out>; + + + vddcore:buck1{ + regulator-name = "vddcore"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1350000>; + regulator-always-on; + regulator-initial-mode = <0>; + regulator-over-current-protection; + }; + + vdd_ddr:buck2{ + regulator-name = "vdd_ddr"; + regulator-min-microvolt = <1350000>; + regulator-max-microvolt = <1350000>; + regulator-always-on; + regulator-initial-mode = <0>; + regulator-over-current-protection; + }; + + vdd:buck3{ + regulator-name = "vdd"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + st,mask-reset; + regulator-initial-mode = <0>; + regulator-over-current-protection; + }; + + v3v3:buck4{ + regulator-name = "v3v3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + regulator-over-current-protection; + regulator-initial-mode = <0>; + }; + + v1v8_audio:ldo1{ + regulator-name = "v1v8_audio"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-always-on; + interrupts = ; + }; + + v3v3_hdmi:ldo2{ + regulator-name = "v3v3_hdmi"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + interrupts = ; + }; + + vtt_ddr:ldo3{ + regulator-name = "vtt_ddr"; + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <750000>; + regulator-always-on; + regulator-over-current-protection; + }; + + vdd_usb:ldo4{ + regulator-name = "vdd_usb"; + interrupts = ; + }; + + v3v3_eth:ldo5{ + regulator-name = "v3v3_eth"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + interrupts = ; + regulator-boot-on; + }; + + v3v3_dsi:ldo6{ + regulator-name = "v3v3_dsi"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + interrupts = ; + }; + + vref_ddr:vref_ddr{ + regulator-name = "vref_ddr"; + regulator-always-on; + regulator-over-current-protection; + }; + + bst_out:boost{ + regulator-name = "bst_out"; + interrupts = ; + regulator-always-on; + }; + + vbus_otg:pwr_sw1{ + regulator-name = "vbus_otg"; + interrupts = ; + regulator-active-discharge; + regulator-always-on; + }; + + vbus_sw:pwr_sw2{ + regulator-name = "vbus_sw"; + interrupts = ; + regulator-active-discharge = <1>; + regulator-always-on; + }; + }; + + onkey{ + compatible = "st,stpmic1-onkey"; + interrupts = , ; + interrupt-names = "onkey-falling", "onkey-rising"; + power-off-time-sec = <10>; + status = "okay"; + }; + + watchdog { + compatible = "st,stpmic1-wdt"; + status = "disabled"; + }; + }; + eeprom@50 { + compatible = "atmel,24c02"; + reg = <0x50>; + pagesize = <16>; + }; +}; + +&i2c5{ + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&i2c5_pins_mx>; + pinctrl-1 = <&i2c5_sleep_pins_mx>; + status = "okay"; + + /delete-property/dmas; + /delete-property/dma-names; + +}; + +&spi5 { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&spi5_pins_mx>; + pinctrl-1 = <&spi5_sleep_pins_mx>; + cs-gpios = <&gpiof 6 0>; + status = "okay"; + + spidev: spidev@0 { + compatible = "rohm,dh2228fv"; + spi-max-frequency = <30000000>; + reg = <0>; + }; +}; + +&i2s2{ + clocks = <&rcc SPI2>, <&rcc SPI2_K>, <&rcc PLL3_Q>, <&rcc PLL3_R>; + clock-names = "pclk", "i2sclk", "x8k", "x11k"; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&i2s2_pins_mx>; + pinctrl-1 = <&i2s2_sleep_pins_mx>; + status = "okay"; + + i2s2_port: port { + i2s2_endpoint: endpoint { + remote-endpoint = <&sii9022_tx_endpoint>; + format = "i2s"; + mclk-fs = <256>; + }; + }; +}; + +&ipcc{ + status = "okay"; +}; + +&iwdg2{ + status = "okay"; + timeout-sec = <32>; +}; + +<dc{ + pinctrl-names = "default", "sleep"; + pinctrl-0 = <<dc_pins_mx>; + pinctrl-1 = <<dc_sleep_pins_mx>; + status = "okay"; + port { + ltdc_ep0_out: endpoint@0 { + reg = <0>; + remote-endpoint = <&sii9022_in>; + }; + + ltdc_ep1_out: endpoint@1 { + reg = <1>; + remote-endpoint = <&dsi_in>; + }; + }; +}; + +&pwr_regulators { + vdd-supply = <&vdd>; + vdd_3v3_usbfs-supply = <&vdd_usb>; +}; + +&rcc{ + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&rng1{ + status = "okay"; +}; + +&rtc{ + status = "okay"; +}; + +&cec { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&cec_pins_mx>; + pinctrl-1 = <&cec_sleep_pins_mx>; + status = "okay"; +}; + +&cpu0{ + cpu-supply = <&vddcore>; +}; + +&cpu1{ + cpu-supply = <&vddcore>; +}; + +&crc1 { + status = "okay"; +}; + +&dts { + status = "okay"; +}; + +&sdmmc1{ + u-boot,dm-pre-reloc; + pinctrl-names = "default", "opendrain", "sleep"; + pinctrl-0 = <&sdmmc1_pins_mx>; + pinctrl-1 = <&sdmmc1_opendrain_pins_mx>; + pinctrl-2 = <&sdmmc1_sleep_pins_mx>; + status = "okay"; + + cd-gpios = <&gpioe 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; + disable-wp; + st,neg-edge; + bus-width = <4>; + vmmc-supply = <&v3v3>; +}; + +&sdmmc2{ + u-boot,dm-pre-reloc; + pinctrl-names = "default", "opendrain", "sleep"; + pinctrl-0 = <&sdmmc2_pins_mx>; + pinctrl-1 = <&sdmmc2_opendrain_pins_mx>; + pinctrl-2 = <&sdmmc2_sleep_pins_mx>; + status = "okay"; + non-removable; + no-sd; + no-sdio; + st,neg-edge; + bus-width = <8>; + vmmc-supply = <&v3v3>; + vqmmc-supply = <&v3v3>; + mmc-ddr-3_3v; +}; + +&sdmmc3{ + pinctrl-names = "default", "opendrain", "sleep"; + pinctrl-0 = <&sdmmc3_pins_mx>; + pinctrl-1 = <&sdmmc3_opendrain_pins_mx>; + pinctrl-2 = <&sdmmc3_sleep_pins_mx>; + arm,primecell-periphid = <0x10153180>; + non-removable; + st,neg-edge; + bus-width = <4>; + vmmc-supply = <&v3v3>; + mmc-pwrseq = <&wifi_pwrseq>; + #address-cells = <1>; + #size-cells = <0>; + keep-power-in-suspend; + status = "okay"; + + brcmf: bcrmf@1 { + reg = <1>; + compatible = "brcm,bcm4329-fmac"; + }; +}; + +&tamp{ + status = "okay"; +}; + +&timers5 { + /delete-property/dmas; + /delete-property/dma-names; + status = "okay"; + pwm { + pinctrl-0 = <&tim5_pwm_pins_mx>; + pinctrl-1 = <&tim5_pwm_sleep_pins_mx>; + pinctrl-names = "default", "sleep"; + status = "okay"; + }; + timer@4 { + status = "okay"; + }; +}; + +&uart4{ + u-boot,dm-pre-reloc; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&uart4_pins_mx>; + pinctrl-1 = <&uart4_sleep_pins_mx>; + /delete-property/dmas; + /delete-property/dma-names; + status = "okay"; +}; + +&usart2{ + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&usart2_pins_mx>; + pinctrl-1 = <&usart2_sleep_pins_mx>; + uart-has-rtscts; + status = "okay"; + + bluetooth { + shutdown-gpios = <&gpioe 10 GPIO_ACTIVE_HIGH>; + compatible = "brcm,bcm43438-bt"; + max-speed = <3000000>; + vbat-supply = <&v3v3>; + vddio-supply = <&v3v3>; + }; +}; + +&sram { + dma_pool: dma_pool@0 { + reg = <0x50000 0x10000>; + pool; + }; +}; + +&dma1 { + sram = <&dma_pool>; +}; + +&dma2 { + sram = <&dma_pool>; +}; + +&adc { + vdd-supply = <&vdd>; + vdda-supply = <&v3v3_eth>; + vref-supply = <&v3v3_eth>; + status = "okay"; + adc1: adc@0 { + st,min-sample-time-nsecs = <5000>; + st,adc-channels = <0 1>; + status = "okay"; + }; + + adc_temp: temp { + status = "okay"; + }; +}; + + +// WARNING: Do not try to enable DAC1 and DCMI +// This devices share the same pin PA4 +/* &dac { + pinctrl-names = "default"; + status = "okay"; + dac1: dac@1 { + pinctrl-0 = <&dac_ch1_pins_a>; + status = "disabled"; + }; + dac2: dac@2 { + pinctrl-0 = <&dac_ch2_pins_a>; + status = "okay"; + }; +};*/ + +&usbh_ehci { + phys = <&usbphyc_port0>; + phy-names = "usb"; + status = "okay"; +}; + +&usbh_ohci{ + phys = <&usbphyc_port0>; + phy-names = "usb"; + status = "okay"; +}; + +&usbotg_hs { + phys = <&usbphyc_port1 0>; + phy-names = "usb2-phy"; + usb-role-switch; + status = "okay"; + + port { + usbotg_hs_ep: endpoint { + remote-endpoint = <&con_usbotg_hs_ep>; + }; + }; +}; + +&usbphyc { + status = "okay"; +}; + +&usbphyc_port0 { + phy-supply = <&vdd_usb>; + st,phy-tuning = <&usb_phy_tuning>; +}; + +&usbphyc_port1 { + phy-supply = <&vdd_usb>; + st,phy-tuning = <&usb_phy_tuning>; +}; + +&m_can1 { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&m_can1_pins_mx>; + pinctrl-1 = <&m_can1_sleep_pins_mx>; + status = "okay"; +}; diff --git a/buildroot/board/octavo/osd32mp1-red/overlay/boot/extlinux/extlinux.conf b/buildroot/board/octavo/osd32mp1-red/overlay/boot/extlinux/extlinux.conf new file mode 100644 index 0000000000..b3f16b2247 --- /dev/null +++ b/buildroot/board/octavo/osd32mp1-red/overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label osd32mp1-red-buildroot + kernel /boot/zImage + devicetree /boot/stm32mp157c-osd32mp1-red.dtb + append root=/dev/mmcblk1p4 rootwait diff --git a/buildroot/board/octavo/osd32mp1-red/patches/uboot/0001-Add-OSD32MP1-RED-Device-Tree-support.patch b/buildroot/board/octavo/osd32mp1-red/patches/uboot/0001-Add-OSD32MP1-RED-Device-Tree-support.patch new file mode 100644 index 0000000000..9b075139ee --- /dev/null +++ b/buildroot/board/octavo/osd32mp1-red/patches/uboot/0001-Add-OSD32MP1-RED-Device-Tree-support.patch @@ -0,0 +1,1848 @@ +From 69029a32acdfac1499750f657c16ab3a3cbfa8f8 Mon Sep 17 00:00:00 2001 +From: Kory Maincent +Date: Mon, 3 Oct 2022 12:17:37 +0200 +Subject: [PATCH 1/2] Add OSD32MP1-RED Device Tree support + +Signed-off-by: Kory Maincent +--- + arch/arm/dts/Makefile | 3 +- + .../dts/stm32mp15-osd32mp1-ddr3-1x4Gb.dtsi | 119 ++ + .../dts/stm32mp157c-osd32mp1-red-u-boot.dtsi | 233 +++ + arch/arm/dts/stm32mp157c-osd32mp1-red.dts | 1445 +++++++++++++++++ + 4 files changed, 1799 insertions(+), 1 deletion(-) + create mode 100644 arch/arm/dts/stm32mp15-osd32mp1-ddr3-1x4Gb.dtsi + create mode 100644 arch/arm/dts/stm32mp157c-osd32mp1-red-u-boot.dtsi + create mode 100644 arch/arm/dts/stm32mp157c-osd32mp1-red.dts + +diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile +index 83677c3d4f..00b27c8695 100644 +--- a/arch/arm/dts/Makefile ++++ b/arch/arm/dts/Makefile +@@ -959,7 +959,8 @@ dtb-$(CONFIG_STM32MP15x) += \ + stm32mp157f-ed1.dtb \ + stm32mp157f-ev1.dtb \ + stm32mp15xx-dhcom-pdk2.dtb \ +- stm32mp15xx-dhcor-avenger96.dtb ++ stm32mp15xx-dhcor-avenger96.dtb \ ++ stm32mp157c-osd32mp1-red.dtb + + dtb-$(CONFIG_SOC_K3_AM6) += k3-am654-base-board.dtb k3-am654-r5-base-board.dtb + dtb-$(CONFIG_SOC_K3_J721E) += k3-j721e-common-proc-board.dtb \ +diff --git a/arch/arm/dts/stm32mp15-osd32mp1-ddr3-1x4Gb.dtsi b/arch/arm/dts/stm32mp15-osd32mp1-ddr3-1x4Gb.dtsi +new file mode 100644 +index 0000000000..362f3281b8 +--- /dev/null ++++ b/arch/arm/dts/stm32mp15-osd32mp1-ddr3-1x4Gb.dtsi +@@ -0,0 +1,119 @@ ++/* ++ * Copyright (C) 2015-2018, STMicroelectronics - All Rights Reserved ++ * ++ * SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause ++ * ++ */ ++ ++/* ++ * File generated by STMicroelectronics STM32CubeMX DDR Tool for MPUs ++ * DDR type: DDR3 / DDR3L ++ * DDR width: 16bits ++ * DDR density: 4Gb ++ * System frequency: 533000Khz ++ * Relaxed Timing Mode: false ++ * Address mapping type: RBC ++ * ++ * Save Date: 2020.08.20, save Time: 10:57:25 ++ */ ++ ++#define DDR_MEM_NAME "DDR3-DDR3L 16bits 533000Khz" ++#define DDR_MEM_SPEED 533000 ++#define DDR_MEM_SIZE 0x20000000 ++ ++#define DDR_MSTR 0x00041401 ++#define DDR_MRCTRL0 0x00000010 ++#define DDR_MRCTRL1 0x00000000 ++#define DDR_DERATEEN 0x00000000 ++#define DDR_DERATEINT 0x00800000 ++#define DDR_PWRCTL 0x00000000 ++#define DDR_PWRTMG 0x00400010 ++#define DDR_HWLPCTL 0x00000000 ++#define DDR_RFSHCTL0 0x00210000 ++#define DDR_RFSHCTL3 0x00000000 ++#define DDR_RFSHTMG 0x0081008B ++#define DDR_CRCPARCTL0 0x00000000 ++#define DDR_DRAMTMG0 0x121B2414 ++#define DDR_DRAMTMG1 0x000A041C ++#define DDR_DRAMTMG2 0x0608090F ++#define DDR_DRAMTMG3 0x0050400C ++#define DDR_DRAMTMG4 0x08040608 ++#define DDR_DRAMTMG5 0x06060403 ++#define DDR_DRAMTMG6 0x02020002 ++#define DDR_DRAMTMG7 0x00000202 ++#define DDR_DRAMTMG8 0x00001005 ++#define DDR_DRAMTMG14 0x000000A0 ++#define DDR_ZQCTL0 0xC2000040 ++#define DDR_DFITMG0 0x02060105 ++#define DDR_DFITMG1 0x00000202 ++#define DDR_DFILPCFG0 0x07000000 ++#define DDR_DFIUPD0 0xC0400003 ++#define DDR_DFIUPD1 0x00000000 ++#define DDR_DFIUPD2 0x00000000 ++#define DDR_DFIPHYMSTR 0x00000000 ++#define DDR_ODTCFG 0x06000600 ++#define DDR_ODTMAP 0x00000001 ++#define DDR_SCHED 0x00000C01 ++#define DDR_SCHED1 0x00000000 ++#define DDR_PERFHPR1 0x01000001 ++#define DDR_PERFLPR1 0x08000200 ++#define DDR_PERFWR1 0x08000400 ++#define DDR_DBG0 0x00000000 ++#define DDR_DBG1 0x00000000 ++#define DDR_DBGCMD 0x00000000 ++#define DDR_POISONCFG 0x00000000 ++#define DDR_PCCFG 0x00000010 ++#define DDR_PCFGR_0 0x00010000 ++#define DDR_PCFGW_0 0x00000000 ++#define DDR_PCFGQOS0_0 0x02100C03 ++#define DDR_PCFGQOS1_0 0x00800100 ++#define DDR_PCFGWQOS0_0 0x01100C03 ++#define DDR_PCFGWQOS1_0 0x01000200 ++#define DDR_PCFGR_1 0x00010000 ++#define DDR_PCFGW_1 0x00000000 ++#define DDR_PCFGQOS0_1 0x02100C03 ++#define DDR_PCFGQOS1_1 0x00800040 ++#define DDR_PCFGWQOS0_1 0x01100C03 ++#define DDR_PCFGWQOS1_1 0x01000200 ++#define DDR_ADDRMAP1 0x00070707 ++#define DDR_ADDRMAP2 0x00000000 ++#define DDR_ADDRMAP3 0x1F000000 ++#define DDR_ADDRMAP4 0x00001F1F ++#define DDR_ADDRMAP5 0x06060606 ++#define DDR_ADDRMAP6 0x0F060606 ++#define DDR_ADDRMAP9 0x00000000 ++#define DDR_ADDRMAP10 0x00000000 ++#define DDR_ADDRMAP11 0x00000000 ++#define DDR_PGCR 0x01442E02 ++#define DDR_PTR0 0x0022AA5B ++#define DDR_PTR1 0x04841104 ++#define DDR_PTR2 0x042DA068 ++#define DDR_ACIOCR 0x10400812 ++#define DDR_DXCCR 0x00000C40 ++#define DDR_DSGCR 0xF200011F ++#define DDR_DCR 0x0000000B ++#define DDR_DTPR0 0x38D488D0 ++#define DDR_DTPR1 0x098B00D8 ++#define DDR_DTPR2 0x10023600 ++#define DDR_MR0 0x00000840 ++#define DDR_MR1 0x00000000 ++#define DDR_MR2 0x00000208 ++#define DDR_MR3 0x00000000 ++#define DDR_ODTCR 0x00010000 ++#define DDR_ZQ0CR1 0x00000038 ++#define DDR_DX0GCR 0x0000CE81 ++#define DDR_DX0DLLCR 0x40000000 ++#define DDR_DX0DQTR 0xFFFFFFFF ++#define DDR_DX0DQSTR 0x3DB02000 ++#define DDR_DX1GCR 0x0000CE81 ++#define DDR_DX1DLLCR 0x40000000 ++#define DDR_DX1DQTR 0xFFFFFFFF ++#define DDR_DX1DQSTR 0x3DB02000 ++#define DDR_DX2GCR 0x0000CE80 ++#define DDR_DX2DLLCR 0x40000000 ++#define DDR_DX2DQTR 0xFFFFFFFF ++#define DDR_DX2DQSTR 0x3DB02000 ++#define DDR_DX3GCR 0x0000CE80 ++#define DDR_DX3DLLCR 0x40000000 ++#define DDR_DX3DQTR 0xFFFFFFFF ++#define DDR_DX3DQSTR 0x3DB02000 +diff --git a/arch/arm/dts/stm32mp157c-osd32mp1-red-u-boot.dtsi b/arch/arm/dts/stm32mp157c-osd32mp1-red-u-boot.dtsi +new file mode 100644 +index 0000000000..6da91e0bb8 +--- /dev/null ++++ b/arch/arm/dts/stm32mp157c-osd32mp1-red-u-boot.dtsi +@@ -0,0 +1,233 @@ ++/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause*/ ++/* ++ * Copyright (C) 2020, Octavo Systems LLC - All Rights Reserved ++ */ ++ ++/* For more information on Device Tree configuration, please refer to ++ * https://wiki.st.com/stm32mpu/wiki/Category:Device_tree_configuration ++ */ ++ ++#include ++#include "stm32mp15-osd32mp1-ddr3-1x4Gb.dtsi" ++#include "stm32mp15-u-boot.dtsi" ++#include "stm32mp15-ddr.dtsi" ++ ++ ++/ { ++ ++ aliases{ ++ i2c0 = &i2c4; ++ mmc0 = &sdmmc1; ++ usb0 = &usbotg_hs; ++ }; ++ ++ config{ ++ u-boot,boot-led = "heartbeat"; ++ u-boot,error-led = "error"; ++ u-boot,mmc-env-partition = "fip"; ++ }; ++ ++#ifdef CONFIG_STM32MP15x_STM32IMAGE ++ config { ++ u-boot,mmc-env-partition = "ssbl"; ++ }; ++ ++ /* only needed for boot with TF-A, witout FIP support */ ++ firmware { ++ optee { ++ compatible = "linaro,optee-tz"; ++ method = "smc"; ++ }; ++ }; ++ ++ reserved-memory { ++ optee@de000000 { ++ reg = <0xde000000 0x02000000>; ++ no-map; ++ }; ++ }; ++#endif ++ ++ led { ++ red { ++ label = "error"; ++ gpios = <&gpioa 13 GPIO_ACTIVE_LOW>; ++ default-state = "off"; ++ status = "okay"; ++ }; ++ ++ blue { ++ default-state = "on"; ++ }; ++ }; ++}; /*root*/ ++ ++#ifndef CONFIG_TFABOOT ++ ++&i2s2{ ++ clocks = <&rcc SPI2>, <&rcc SPI2_K>, <&rcc PLL3_Q>, <&rcc PLL3_R>; ++}; ++ ++ ++ ++&sai2{ ++ clocks = <&rcc SAI2>, <&rcc PLL3_Q>, <&rcc PLL3_R>; ++}; ++ ++ ++&clk_hse { ++ st,digbypass; ++}; ++ ++&rcc { ++ u-boot,dm-pre-reloc; ++ st,clksrc = < ++ CLK_MPU_PLL1P ++ CLK_AXI_PLL2P ++ CLK_MCU_PLL3P ++ CLK_PLL12_HSE ++ CLK_PLL3_HSE ++ CLK_PLL4_HSE ++ CLK_RTC_LSE ++ CLK_MCO1_DISABLED ++ CLK_MCO2_DISABLED ++ >; ++ st,clkdiv = < ++ 1 /*MPU*/ ++ 0 /*AXI*/ ++ 0 /*MCU*/ ++ 1 /*APB1*/ ++ 1 /*APB2*/ ++ 1 /*APB3*/ ++ 1 /*APB4*/ ++ 2 /*APB5*/ ++ 23 /*RTC*/ ++ 0 /*MCO1*/ ++ 0 /*MCO2*/ ++ >; ++ st,pkcs = < ++ CLK_CKPER_HSE ++ CLK_ETH_PLL3Q ++ CLK_SDMMC12_PLL4P ++ CLK_DSI_DSIPLL ++ CLK_STGEN_HSE ++ CLK_USBPHY_HSE ++ CLK_SPI2S1_PLL3Q ++ CLK_SPI2S23_CKPER ++ CLK_SPI45_PCLK2 ++ CLK_SPI6_DISABLED ++ CLK_I2C46_HSI ++ CLK_SDMMC3_PLL4P ++ CLK_USBO_USBPHY ++ CLK_ADC_CKPER ++ CLK_CEC_LSE ++ CLK_I2C12_HSI ++ CLK_I2C35_HSI ++ CLK_UART1_DISABLED ++ CLK_UART24_HSI ++ CLK_UART35_HSI ++ CLK_UART6_DISABLED ++ CLK_UART78_DISABLED ++ CLK_SPDIF_DISABLED ++ CLK_SAI1_DISABLED ++ CLK_SAI2_DISABLED ++ CLK_SAI3_DISABLED ++ CLK_SAI4_DISABLED ++ CLK_RNG1_LSI ++ CLK_LPTIM1_DISABLED ++ CLK_LPTIM23_DISABLED ++ CLK_LPTIM45_DISABLED ++ >; ++ pll1:st,pll@0 { ++ cfg = < 2 80 0 1 1 PQR(1,0,0) >; ++ frac = < 0x800>; ++ u-boot,dm-pre-reloc; ++ }; ++ pll2:st,pll@1 { ++ cfg = < 2 65 1 0 0 PQR(1,1,1) >; ++ frac = < 0x1400>; ++ u-boot,dm-pre-reloc; ++ }; ++ pll3:st,pll@2 { ++ cfg = < 1 61 3 5 36 PQR(1,1,0) >; ++ frac = < 0x1000 >; ++ u-boot,dm-pre-reloc; ++ }; ++ pll4:st,pll@3 { ++ cfg = < 3 98 5 7 7 PQR(1,1,1) >; ++ u-boot,dm-pre-reloc; ++ }; ++}; ++ ++&i2c4{ ++ u-boot,dm-pre-reloc; ++}; ++ ++&i2c4_pins_z_mx { ++ u-boot,dm-pre-reloc; ++ pins { ++ u-boot,dm-pre-reloc; ++ }; ++}; ++ ++&sdmmc1{ ++ u-boot,dm-pre-reloc; ++}; ++ ++&sdmmc2{ ++ u-boot,dm-pre-reloc; ++}; ++ ++&sdmmc1_pins_mx { ++ u-boot,dm-spl; ++ pins1 { ++ u-boot,dm-spl; ++ }; ++ pins2 { ++ u-boot,dm-spl; ++ }; ++}; ++ ++&sdmmc2_pins_mx { ++ u-boot,dm-spl; ++ pins1 { ++ u-boot,dm-spl; ++ }; ++ pins2 { ++ u-boot,dm-spl; ++ }; ++}; ++ ++#endif /*CONFIG_TFABOOT*/ ++ ++&cryp1{ ++ u-boot,dm-pre-reloc; ++}; ++ ++&hash1{ ++ u-boot,dm-pre-reloc; ++}; ++ ++&uart4{ ++ u-boot,dm-pre-reloc; ++}; ++ ++&usbotg_hs{ ++ u-boot,dm-pre-reloc; ++ u-boot,force-b-session-valid; ++ hnp-srp-disable; ++ dr_mode = "peripheral"; ++}; ++ ++&usbphyc{ ++ u-boot,dm-pre-reloc; ++}; ++ ++&usbphyc_port0{ ++ u-boot,dm-pre-reloc; ++}; ++ ++&usbphyc_port1{ ++ u-boot,dm-pre-reloc; ++}; ++ +diff --git a/arch/arm/dts/stm32mp157c-osd32mp1-red.dts b/arch/arm/dts/stm32mp157c-osd32mp1-red.dts +new file mode 100644 +index 0000000000..6104aff03d +--- /dev/null ++++ b/arch/arm/dts/stm32mp157c-osd32mp1-red.dts +@@ -0,0 +1,1445 @@ ++/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */ ++/* ++ * Copyright (C) Octavo Systems 2021 - All Rights Reserved ++ * Author: Neeraj Dantu for Octavo Systems ++ */ ++ ++/dts-v1/; ++ ++#include ++#include "stm32mp157.dtsi" ++#include "stm32mp15xc.dtsi" ++#include "stm32mp15xxac-pinctrl.dtsi" ++#include "stm32mp15-m4-srm.dtsi" ++#include ++#include ++#include ++ ++/ { ++ model = "Octavo OSD32MP1 RED board"; ++ compatible = "st,stm32mp157c-osd32mp1-red", "st,stm32mp157"; ++ ++ memory@c0000000 { ++ device_type = "memory"; ++ reg = <0xc0000000 0x20000000>; ++ }; ++ ++ wifi_pwrseq: wifi-pwrseq { ++ compatible = "mmc-pwrseq-simple"; ++ reset-gpios = <&gpiog 5 GPIO_ACTIVE_LOW>; ++ }; ++ ++ clocks { ++ clk_ext_camera: clk-ext-camera { ++ #clock-cells = <0>; ++ compatible = "fixed-clock"; ++ clock-frequency = <24000000>; ++ }; ++ }; ++ ++ reserved-memory { ++ #address-cells = <1>; ++ #size-cells = <1>; ++ ranges; ++ ++ mcuram2:mcuram2@10000000{ ++ compatible = "shared-dma-pool"; ++ reg = <0x10000000 0x40000>; ++ no-map; ++ }; ++ ++ vdev0vring0:vdev0vring0@10040000{ ++ compatible = "shared-dma-pool"; ++ reg = <0x10040000 0x1000>; ++ no-map; ++ }; ++ ++ vdev0vring1:vdev0vring1@10041000{ ++ compatible = "shared-dma-pool"; ++ reg = <0x10041000 0x1000>; ++ no-map; ++ }; ++ ++ vdev0buffer:vdev0buffer@10042000{ ++ compatible = "shared-dma-pool"; ++ reg = <0x10042000 0x4000>; ++ no-map; ++ }; ++ ++ mcuram:mcuram@30000000{ ++ compatible = "shared-dma-pool"; ++ reg = <0x30000000 0x40000>; ++ no-map; ++ }; ++ ++ retram:retram@38000000{ ++ compatible = "shared-dma-pool"; ++ reg = <0x38000000 0x10000>; ++ no-map; ++ }; ++ ++ gpu_reserved:gpu@d4000000{ ++ reg = <0xd4000000 0x4000000>; ++ no-map; ++ }; ++ }; ++ ++ ++ aliases { ++ ethernet0 = ðernet0; ++ serial0 = &uart4; ++ serial1 = &usart3; ++ serial2 = &uart7; ++ serial3 = &usart2; ++ }; ++ ++ chosen { ++ stdout-path = "serial0:115200n8"; ++ }; ++ ++ led { ++ compatible = "gpio-leds"; ++ blue { ++ label = "heartbeat"; ++ gpios = <&gpiod 11 GPIO_ACTIVE_HIGH>; ++ linux,default-trigger = "heartbeat"; ++ default-state = "off"; ++ }; ++ }; ++ ++ usb_phy_tuning:usb-phy-tuning{ ++ st,hs-dc-level = <2>; ++ st,fs-rftime-tuning; ++ st,hs-rftime-reduction; ++ st,hs-current-trim = <15>; ++ st,hs-impedance-trim = <1>; ++ st,squelch-level = <3>; ++ st,hs-rx-offset = <2>; ++ st,no-lsfs-sc; ++ }; ++ ++ vin:vin{ ++ compatible = "regulator-fixed"; ++ regulator-name = "vin"; ++ regulator-min-microvolt = <5000000>; ++ regulator-max-microvolt = <5000000>; ++ regulator-always-on; ++ }; ++ ++ sound { ++ compatible = "audio-graph-card"; ++ label = "STM32MP15-DK"; ++ routing = ++ "Playback" , "MCLK", ++ "Capture" , "MCLK", ++ "MICL" , "Mic Bias"; ++ dais = <&i2s2_port>; ++ status = "okay"; ++ }; ++}; ++ ++&pinctrl { ++ u-boot,dm-pre-reloc; ++ dcmi_pins_mx: dcmi_mx-0 { ++ pins { ++ pinmux = , /* DCMI_HSYNC */ ++ , /* DCMI_PIXCLK */ ++ , /* DCMI_D1 */ ++ , /* DCMI_D7 */ ++ , /* DCMI_D0 */ ++ , /* DCMI_D2 */ ++ , /* DCMI_D3 */ ++ , /* DCMI_D4 */ ++ , /* DCMI_D6 */ ++ , /* DCMI_VSYNC */ ++ , /* DCMI_D8 */ ++ , /* DCMI_D9 */ ++ , /* DCMI_D11 */ ++ , /* DCMI_D10 */ ++ ; /* DCMI_D5 */ ++ bias-disable; ++ }; ++ }; ++ ++ dcmi_sleep_pins_mx: dcmi_sleep_mx-0 { ++ pins { ++ pinmux = , /* DCMI_HSYNC */ ++ , /* DCMI_PIXCLK */ ++ , /* DCMI_D1 */ ++ , /* DCMI_D7 */ ++ , /* DCMI_D0 */ ++ , /* DCMI_D2 */ ++ , /* DCMI_D3 */ ++ , /* DCMI_D4 */ ++ , /* DCMI_D6 */ ++ , /* DCMI_VSYNC */ ++ , /* DCMI_D8 */ ++ , /* DCMI_D9 */ ++ , /* DCMI_D11 */ ++ , /* DCMI_D10 */ ++ ; /* DCMI_D5 */ ++ }; ++ }; ++ ++ eth1_pins_mx: eth1_mx-0 { ++ pins1 { ++ pinmux = , /* ETH1_RX_CLK */ ++ , /* ETH1_RX_CTL */ ++ , /* ETH1_RXD2 */ ++ , /* ETH1_RXD3 */ ++ , /* ETH1_RXD0 */ ++ ; /* ETH1_RXD1 */ ++ bias-disable; ++ }; ++ pins2 { ++ pinmux = ; /* ETH1_MDIO */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <0>; ++ }; ++ pins3 { ++ pinmux = , /* ETH1_TX_CTL */ ++ , /* ETH1_MDC */ ++ , /* ETH1_TXD2 */ ++ , /* ETH1_TXD3 */ ++ , /* ETH1_GTX_CLK */ ++ , /* ETH1_TXD0 */ ++ ; /* ETH1_TXD1 */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <2>; ++ }; ++ }; ++ ++ eth1_sleep_pins_mx: eth1_sleep_mx-0 { ++ pins { ++ pinmux = , /* ETH1_RX_CLK */ ++ , /* ETH1_MDIO */ ++ , /* ETH1_RX_CTL */ ++ , /* ETH1_RXD2 */ ++ , /* ETH1_RXD3 */ ++ , /* ETH1_TX_CTL */ ++ , /* ETH1_MDC */ ++ , /* ETH1_TXD2 */ ++ , /* ETH1_RXD0 */ ++ , /* ETH1_RXD1 */ ++ , /* ETH1_TXD3 */ ++ , /* ETH1_GTX_CLK */ ++ , /* ETH1_TXD0 */ ++ ; /* ETH1_TXD1 */ ++ }; ++ }; ++ ++ i2c1_pins_mx: i2c1_mx-0 { ++ pins { ++ pinmux = , /* I2C1_SCL */ ++ ; /* I2C1_SDA */ ++ bias-disable; ++ drive-open-drain; ++ slew-rate = <0>; ++ }; ++ }; ++ ++ i2c1_sleep_pins_mx: i2c1_sleep_mx-0 { ++ pins { ++ pinmux = , /* I2C1_SCL */ ++ ; /* I2C1_SDA */ ++ }; ++ }; ++ ++ i2c2_pins_mx: i2c2_mx-0 { ++ pins { ++ pinmux = ; /* I2C2_SDA */ ++ bias-disable; ++ drive-open-drain; ++ slew-rate = <0>; ++ }; ++ }; ++ ++ i2c2_sleep_pins_mx: i2c2_sleep_mx-0 { ++ pins { ++ pinmux = ; /* I2C2_SDA */ ++ }; ++ }; ++ ++ i2c5_pins_mx: i2c5_mx-0 { ++ pins { ++ pinmux = , /* I2C5_SCL */ ++ ; /* I2C5_SDA */ ++ bias-disable; ++ drive-open-drain; ++ slew-rate = <0>; ++ }; ++ }; ++ ++ i2c5_sleep_pins_mx: i2c5_sleep_mx-0 { ++ pins { ++ pinmux = , /* I2C5_SCL */ ++ ; /* I2C5_SDA */ ++ }; ++ }; ++ ++ i2s2_pins_mx: i2s2_mx-0 { ++ pins { ++ pinmux = , /* I2S2_WS */ ++ , /* I2S2_CK */ ++ ; /* I2S2_SDO */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <1>; ++ }; ++ }; ++ ++ i2s2_sleep_pins_mx: i2s2_sleep_mx-0 { ++ pins { ++ pinmux = , /* I2S2_WS */ ++ , /* I2S2_CK */ ++ ; /* I2S2_SDO */ ++ }; ++ }; ++ ++ ltdc_pins_mx: ltdc_mx-0 { ++ pins1 { ++ pinmux = , /* LTDC_B5 */ ++ , /* LTDC_B6 */ ++ , /* LTDC_R5 */ ++ , /* LTDC_B7 */ ++ , /* LTDC_B0 */ ++ , /* LTDC_B3 */ ++ , /* LTDC_G1 */ ++ , /* LTDC_B4 */ ++ , /* LTDC_G0 */ ++ , /* LTDC_R7 */ ++ , /* LTDC_DE */ ++ , /* LTDC_B2 */ ++ , /* LTDC_B1 */ ++ , /* LTDC_R0 */ ++ , /* LTDC_R1 */ ++ , /* LTDC_G4 */ ++ , /* LTDC_R2 */ ++ , /* LTDC_R3 */ ++ , /* LTDC_R4 */ ++ , /* LTDC_R6 */ ++ , /* LTDC_G2 */ ++ , /* LTDC_G3 */ ++ , /* LTDC_G5 */ ++ , /* LTDC_G6 */ ++ , /* LTDC_G7 */ ++ , /* LTDC_VSYNC */ ++ ; /* LTDC_HSYNC */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <0>; ++ }; ++ pins2 { ++ pinmux = ; /* LTDC_CLK */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <1>; ++ }; ++ }; ++ ++ ltdc_sleep_pins_mx: ltdc_sleep_mx-0 { ++ pins { ++ pinmux = , /* LTDC_B5 */ ++ , /* LTDC_B6 */ ++ , /* LTDC_R5 */ ++ , /* LTDC_B7 */ ++ , /* LTDC_B0 */ ++ , /* LTDC_B3 */ ++ , /* LTDC_G1 */ ++ , /* LTDC_B4 */ ++ , /* LTDC_G0 */ ++ , /* LTDC_R7 */ ++ , /* LTDC_DE */ ++ , /* LTDC_CLK */ ++ , /* LTDC_B2 */ ++ , /* LTDC_B1 */ ++ , /* LTDC_R0 */ ++ , /* LTDC_R1 */ ++ , /* LTDC_G4 */ ++ , /* LTDC_R2 */ ++ , /* LTDC_R3 */ ++ , /* LTDC_R4 */ ++ , /* LTDC_R6 */ ++ , /* LTDC_G2 */ ++ , /* LTDC_G3 */ ++ , /* LTDC_G5 */ ++ , /* LTDC_G6 */ ++ , /* LTDC_G7 */ ++ , /* LTDC_VSYNC */ ++ ; /* LTDC_HSYNC */ ++ }; ++ }; ++ ++ sdmmc1_pins_mx: sdmmc1_mx-0 { ++ u-boot,dm-pre-reloc; ++ pins1 { ++ u-boot,dm-pre-reloc; ++ pinmux = , /* SDMMC1_D0 */ ++ , /* SDMMC1_D1 */ ++ , /* SDMMC1_D2 */ ++ , /* SDMMC1_D3 */ ++ ; /* SDMMC1_CMD */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <1>; ++ }; ++ pins2 { ++ u-boot,dm-pre-reloc; ++ pinmux = ; /* SDMMC1_CK */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <2>; ++ }; ++ }; ++ ++ sdmmc1_opendrain_pins_mx: sdmmc1_opendrain_mx-0 { ++ u-boot,dm-pre-reloc; ++ pins1 { ++ u-boot,dm-pre-reloc; ++ pinmux = , /* SDMMC1_D0 */ ++ , /* SDMMC1_D1 */ ++ , /* SDMMC1_D2 */ ++ ; /* SDMMC1_D3 */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <1>; ++ }; ++ pins2 { ++ u-boot,dm-pre-reloc; ++ pinmux = ; /* SDMMC1_CK */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <2>; ++ }; ++ pins3 { ++ u-boot,dm-pre-reloc; ++ pinmux = ; /* SDMMC1_CMD */ ++ bias-disable; ++ drive-open-drain; ++ slew-rate = <1>; ++ }; ++ }; ++ ++ sdmmc1_sleep_pins_mx: sdmmc1_sleep_mx-0 { ++ u-boot,dm-pre-reloc; ++ pins { ++ u-boot,dm-pre-reloc; ++ pinmux = , /* SDMMC1_D0 */ ++ , /* SDMMC1_D1 */ ++ , /* SDMMC1_D2 */ ++ , /* SDMMC1_D3 */ ++ , /* SDMMC1_CK */ ++ ; /* SDMMC1_CMD */ ++ }; ++ }; ++ ++ sdmmc2_pins_mx: sdmmc2_mx-0 { ++ u-boot,dm-pre-reloc; ++ pins1 { ++ u-boot,dm-pre-reloc; ++ pinmux = , /* SDMMC2_D4 */ ++ , /* SDMMC2_D5 */ ++ , /* SDMMC2_D2 */ ++ , /* SDMMC2_D3 */ ++ , /* SDMMC2_D0 */ ++ , /* SDMMC2_D1 */ ++ , /* SDMMC2_D7 */ ++ , /* SDMMC2_D6 */ ++ ; /* SDMMC2_CMD */ ++ bias-pull-up; ++ drive-push-pull; ++ slew-rate = <1>; ++ }; ++ pins2 { ++ u-boot,dm-pre-reloc; ++ pinmux = ; /* SDMMC2_CK */ ++ bias-pull-up; ++ drive-push-pull; ++ slew-rate = <2>; ++ }; ++ }; ++ ++ sdmmc2_opendrain_pins_mx: sdmmc2_opendrain_mx-0 { ++ u-boot,dm-pre-reloc; ++ pins1 { ++ u-boot,dm-pre-reloc; ++ pinmux = , /* SDMMC2_D4 */ ++ , /* SDMMC2_D5 */ ++ , /* SDMMC2_D2 */ ++ , /* SDMMC2_D3 */ ++ , /* SDMMC2_D0 */ ++ , /* SDMMC2_D1 */ ++ , /* SDMMC2_D7 */ ++ ; /* SDMMC2_D6 */ ++ bias-pull-up; ++ drive-push-pull; ++ slew-rate = <1>; ++ }; ++ pins2 { ++ u-boot,dm-pre-reloc; ++ pinmux = ; /* SDMMC2_CK */ ++ bias-pull-up; ++ drive-push-pull; ++ slew-rate = <2>; ++ }; ++ pins3 { ++ u-boot,dm-pre-reloc; ++ pinmux = ; /* SDMMC2_CMD */ ++ bias-pull-up; ++ drive-open-drain; ++ slew-rate = <1>; ++ }; ++ }; ++ ++ sdmmc2_sleep_pins_mx: sdmmc2_sleep_mx-0 { ++ u-boot,dm-pre-reloc; ++ pins { ++ u-boot,dm-pre-reloc; ++ pinmux = , /* SDMMC2_D4 */ ++ , /* SDMMC2_D5 */ ++ , /* SDMMC2_D2 */ ++ , /* SDMMC2_D3 */ ++ , /* SDMMC2_D0 */ ++ , /* SDMMC2_D1 */ ++ , /* SDMMC2_D7 */ ++ , /* SDMMC2_CK */ ++ , /* SDMMC2_D6 */ ++ ; /* SDMMC2_CMD */ ++ }; ++ }; ++ ++ sdmmc3_pins_mx: sdmmc3_mx-0 { ++ u-boot,dm-pre-reloc; ++ pins1 { ++ u-boot,dm-pre-reloc; ++ pinmux = , /* SDMMC3_D3 */ ++ , /* SDMMC3_D0 */ ++ , /* SDMMC3_CMD */ ++ , /* SDMMC3_D1 */ ++ ; /* SDMMC3_D2 */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <1>; ++ }; ++ pins2 { ++ u-boot,dm-pre-reloc; ++ pinmux = ; /* SDMMC3_CK */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <2>; ++ }; ++ }; ++ ++ sdmmc3_opendrain_pins_mx: sdmmc3_opendrain_mx-0 { ++ u-boot,dm-pre-reloc; ++ pins1 { ++ u-boot,dm-pre-reloc; ++ pinmux = , /* SDMMC3_D3 */ ++ , /* SDMMC3_D0 */ ++ , /* SDMMC3_D1 */ ++ ; /* SDMMC3_D2 */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <1>; ++ }; ++ pins2 { ++ u-boot,dm-pre-reloc; ++ pinmux = ; /* SDMMC3_CMD */ ++ bias-disable; ++ drive-open-drain; ++ slew-rate = <1>; ++ }; ++ pins3 { ++ u-boot,dm-pre-reloc; ++ pinmux = ; /* SDMMC3_CK */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <2>; ++ }; ++ }; ++ ++ sdmmc3_sleep_pins_mx: sdmmc3_sleep_mx-0 { ++ u-boot,dm-pre-reloc; ++ pins { ++ u-boot,dm-pre-reloc; ++ pinmux = , /* SDMMC3_D3 */ ++ , /* SDMMC3_D0 */ ++ , /* SDMMC3_CMD */ ++ , /* SDMMC3_D1 */ ++ , /* SDMMC3_D2 */ ++ ; /* SDMMC3_CK */ ++ }; ++ }; ++ ++ spi5_pins_mx: spi5_mx-0 { ++ pins { ++ pinmux = , /* SPI5_SCK */ ++ , /* SPI5_MISO */ ++ ; /* SPI5_MOSI */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <1>; ++ }; ++ }; ++ ++ spi5_sleep_pins_mx: spi5_sleep_mx-0 { ++ pins { ++ pinmux = , /* SPI5_SCK */ ++ , /* SPI5_MISO */ ++ ; /* SPI5_MOSI */ ++ }; ++ }; ++ ++ tim5_pwm_pins_mx: tim5_pwm_mx-0 { ++ pins { ++ pinmux = ; /* TIM5_CH2 */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <0>; ++ }; ++ }; ++ ++ tim5_pwm_sleep_pins_mx: tim5_pwm_sleep_mx-0 { ++ pins { ++ pinmux = ; /* TIM5_CH2 */ ++ }; ++ }; ++ ++ uart4_pins_mx: uart4_mx-0 { ++ u-boot,dm-pre-reloc; ++ pins1 { ++ u-boot,dm-pre-reloc; ++ pinmux = ; /* UART4_RX */ ++ bias-disable; ++ }; ++ pins2 { ++ u-boot,dm-pre-reloc; ++ pinmux = ; /* UART4_TX */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <0>; ++ }; ++ }; ++ ++ uart4_sleep_pins_mx: uart4_sleep_mx-0 { ++ u-boot,dm-pre-reloc; ++ pins { ++ u-boot,dm-pre-reloc; ++ pinmux = , /* UART4_RX */ ++ ; /* UART4_TX */ ++ }; ++ }; ++ ++ usart2_pins_mx: usart2_mx-0 { ++ pins1 { ++ pinmux = , /* USART2_CTS */ ++ ; /* USART2_RX */ ++ bias-disable; ++ }; ++ pins2 { ++ pinmux = , /* USART2_RTS */ ++ ; /* USART2_TX */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <0>; ++ }; ++ }; ++ ++ usart2_sleep_pins_mx: usart2_sleep_mx-0 { ++ pins { ++ pinmux = , /* USART2_CTS */ ++ , /* USART2_RTS */ ++ , /* USART2_TX */ ++ ; /* USART2_RX */ ++ }; ++ }; ++ ++ cec_pins_mx: cec-1 { ++ pins { ++ pinmux = ; ++ bias-disable; ++ drive-open-drain; ++ slew-rate = <0>; ++ }; ++ }; ++ ++ cec_sleep_pins_mx: cec-sleep-1 { ++ pins { ++ pinmux = ; /* HDMI_CEC */ ++ }; ++ }; ++ ++ stusb1600_pins_mx: stusb1600-0 { ++ pins { ++ pinmux = ; ++ bias-pull-up; ++ }; ++ }; ++ ++ m_can1_pins_mx: m_can1_sleep_mx-0 { ++ pins1 { ++ pinmux = ; /* CAN1_TX */ ++ slew-rate = <0>; ++ drive-push-pull; ++ bias-disable; ++ }; ++ pins2 { ++ pinmux = ; /* CAN1_RX */ ++ bias-disable; ++ }; ++ }; ++ ++ m_can1_sleep_pins_mx: m_can1_sleep-0 { ++ pins { ++ pinmux = , /* CAN1_TX */ ++ ; /* CAN1_RX */ ++ }; ++ }; ++ ++}; ++ ++&pinctrl_z { ++ u-boot,dm-pre-reloc; ++ ++ i2c2_pins_z_mx: i2c2_mx-0 { ++ pins { ++ pinmux = ; /* I2C2_SCL */ ++ bias-disable; ++ drive-open-drain; ++ slew-rate = <0>; ++ }; ++ }; ++ ++ i2c2_sleep_pins_z_mx: i2c2_sleep_mx-0 { ++ pins { ++ pinmux = ; /* I2C2_SCL */ ++ }; ++ }; ++ ++ i2c4_pins_z_mx: i2c4_mx-0 { ++ u-boot,dm-pre-reloc; ++ pins { ++ u-boot,dm-pre-reloc; ++ pinmux = , /* I2C4_SCL */ ++ ; /* I2C4_SDA */ ++ bias-disable; ++ drive-open-drain; ++ slew-rate = <0>; ++ }; ++ }; ++ ++ i2c4_sleep_pins_z_mx: i2c4_sleep_mx-0 { ++ u-boot,dm-pre-reloc; ++ pins { ++ u-boot,dm-pre-reloc; ++ pinmux = , /* I2C4_SCL */ ++ ; /* I2C4_SDA */ ++ }; ++ }; ++}; ++ ++&m4_rproc{ ++ memory-region = <&retram>, <&mcuram>, <&mcuram2>, <&vdev0vring0>, ++ <&vdev0vring1>, <&vdev0buffer>; ++ mboxes = <&ipcc 0>, <&ipcc 1>, <&ipcc 2>; ++ mbox-names = "vq0", "vq1", "shutdown"; ++ interrupt-parent = <&exti>; ++ interrupts = <68 1>; ++ wakeup-source; ++ status = "okay"; ++}; ++ ++&dcmi{ ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <&dcmi_pins_mx>; ++ pinctrl-1 = <&dcmi_sleep_pins_mx>; ++ status = "okay"; ++ ++ port { ++ dcmi_0: endpoint { ++ remote-endpoint = <&ov5640_0>; ++ bus-width = <8>; ++ hsync-active = <0>; ++ vsync-active = <0>; ++ pclk-sample = <1>; ++ pclk-max-frequency = <77000000>; ++ }; ++ }; ++}; ++ ++&dsi{ ++ status = "okay"; ++ ++ ports { ++ port@0 { ++ reg = <0>; ++ dsi_in: endpoint { ++ remote-endpoint = <<dc_ep1_out>; ++ }; ++ }; ++ ++ port@1 { ++ reg = <1>; ++ dsi_out: endpoint { ++ remote-endpoint = <&panel_in>; ++ }; ++ }; ++ }; ++ ++ panel_otm8009a: panel-otm8009a@0 { ++ compatible = "orisetech,otm8009a"; ++ reg = <0>; ++ reset-gpios = <&gpioe 9 GPIO_ACTIVE_LOW>; ++ power-supply = <&v3v3>; ++ status = "okay"; ++ ++ port { ++ panel_in: endpoint { ++ remote-endpoint = <&dsi_out>; ++ }; ++ }; ++ }; ++}; ++ ++ðernet0{ ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <ð1_pins_mx>; ++ pinctrl-1 = <ð1_sleep_pins_mx>; ++ status = "okay"; ++ ++ ++ st,eth-clk-sel; //custom ++ phy-mode = "rgmii-id"; ++ max-speed = <1000>; ++ phy-handle = <&phy0>; ++ nvmem-cells = <ðernet_mac_address>; ++ nvmem-cell-names = "mac-address"; ++ ++ mdio0 { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ compatible = "snps,dwmac-mdio"; ++ phy0: ethernet-phy@0 { ++ reg = <3>; ++ }; ++ }; ++}; ++ ++&gpu{ ++ status = "okay"; ++ contiguous-area = <&gpu_reserved>; ++}; ++ ++&hash1 { ++ status = "okay"; ++}; ++ ++&hsem{ ++ status = "okay"; ++}; ++ ++&cryp1{ ++ u-boot,dm-pre-reloc; ++ status = "okay"; ++}; ++ ++&i2c1{ ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <&i2c1_pins_mx>; ++ pinctrl-1 = <&i2c1_sleep_pins_mx>; ++ status = "okay"; ++ i2c-scl-rising-time-ns = <100>; ++ i2c-scl-falling-time-ns = <7>; ++ /delete-property/dmas; ++ /delete-property/dma-names; ++ ++ touchscreen@2a { ++ compatible = "focaltech,ft6236"; ++ reg = <0x2a>; ++ interrupts = <2 2>; ++ interrupt-parent = <&gpiof>; ++ interrupt-controller; ++ touchscreen-size-x = <480>; ++ touchscreen-size-y = <800>; ++ panel = <&panel_otm8009a>; ++ vcc-supply = <&v3v3>; ++ status = "okay"; ++ }; ++ touchscreen@38 { ++ compatible = "focaltech,ft6236"; ++ reg = <0x38>; ++ interrupts = <2 2>; ++ interrupt-parent = <&gpiof>; ++ interrupt-controller; ++ touchscreen-size-x = <480>; ++ touchscreen-size-y = <800>; ++ panel = <&panel_otm8009a>; ++ vcc-supply = <&v3v3>; ++ status = "okay"; ++ }; ++ ++ hdmi-transmitter@39 { ++ compatible = "sil,sii9022"; ++ reg = <0x39>; ++ reset-gpios = <&gpiog 0 GPIO_ACTIVE_LOW>; ++ interrupts = <1 IRQ_TYPE_EDGE_FALLING>; ++ interrupt-parent = <&gpiog>; ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <<dc_pins_mx>; ++ pinctrl-1 = <<dc_sleep_pins_mx>; ++ status = "okay"; ++ ++ ports { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ port@0 { ++ reg = <0>; ++ sii9022_in: endpoint { ++ remote-endpoint = <<dc_ep0_out>; ++ }; ++ }; ++ ++ port@1 { ++ reg = <1>; ++ sii9022_tx_endpoint: endpoint { ++ remote-endpoint = <&i2s2_endpoint>; ++ }; ++ }; ++ }; ++ }; ++}; ++ ++&i2c2{ ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <&i2c2_pins_mx &i2c2_pins_z_mx>; ++ pinctrl-1 = <&i2c2_sleep_pins_mx &i2c2_sleep_pins_z_mx>; ++ status = "okay"; ++ i2c-scl-rising-time-ns = <185>; ++ i2c-scl-falling-time-ns = <20>; ++ /delete-property/dmas; ++ /delete-property/dma-names; ++ ++ ov5640: camera@3c { ++ compatible = "ovti,ov5640"; ++ reg = <0x3c>; ++ clocks = <&clk_ext_camera>; ++ clock-names = "xclk"; ++ DOVDD-supply = <&v3v3>; ++ //powerdown-gpios = <&stmfx_pinctrl 18 (GPIO_ACTIVE_HIGH | GPIO_PUSH_PULL)>; ++ //reset-gpios = <&stmfx_pinctrl 19 (GPIO_ACTIVE_LOW | GPIO_PUSH_PULL)>; ++ //powerdown-gpios = <&gpioc 3 GPIO_ACTIVE_HIGH>; //custom ++ //reset-gpios = <&gpioa 14 GPIO_ACTIVE_LOW>; //custom ++ rotation = <180>; ++ status = "okay"; ++ ++ port { ++ ov5640_0: endpoint { ++ remote-endpoint = <&dcmi_0>; ++ bus-width = <8>; ++ data-shift = <2>; /* lines 9:2 are used */ ++ hsync-active = <0>; ++ vsync-active = <0>; ++ pclk-sample = <1>; ++ pclk-max-frequency = <77000000>; ++ }; ++ }; ++ }; ++}; ++ ++&i2c4{ ++ u-boot,dm-pre-reloc; ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <&i2c4_pins_z_mx>; ++ pinctrl-1 = <&i2c4_sleep_pins_z_mx>; ++ status = "okay"; ++ i2c-scl-rising-time-ns = <185>; ++ i2c-scl-falling-time-ns = <20>; ++ clock-frequency = <400000>; ++ /delete-property/ dmas; ++ /delete-property/ dma-names; ++ ++ typec: stusb1600@28 { ++ compatible = "st,stusb1600"; ++ reg = <0x28>; ++ interrupt-parent = <&gpioe>; ++ interrupts = <8 IRQ_TYPE_EDGE_FALLING>; ++ pinctrl-0 = <&stusb1600_pins_mx>; ++ pinctrl-names = "default"; ++ status = "okay"; ++ vdd-supply = <&vin>; ++ ++ typec_con: connector { ++ compatible = "usb-c-connector"; ++ label = "USB-C"; ++ power-role = "dual"; ++ power-opmode = "default"; ++ ++ port { ++ con_usbotg_hs_ep: endpoint { ++ remote-endpoint = <&usbotg_hs_ep>; ++ }; ++ }; ++ }; ++ }; ++ ++ pmic:stpmic@33{ ++ compatible = "st,stpmic1"; ++ reg = <0x33>; ++ interrupts-extended = <&exti_pwr 55 IRQ_TYPE_EDGE_FALLING>; ++ interrupt-controller; ++ #interrupt-cells = <2>; ++ status = "okay"; ++ ++ st,main-control-register = <0x04>; ++ st,vin-control-register = <0xc0>; ++ st,usb-control-register = <0x20>; ++ ++ regulators{ ++ compatible = "st,stpmic1-regulators"; ++ buck1-supply = <&vin>; ++ buck2-supply = <&vin>; ++ buck3-supply = <&vin>; ++ buck4-supply = <&vin>; ++ ldo1-supply = <&v3v3>; ++ ldo2-supply = <&vin>; ++ ldo3-supply = <&vdd_ddr>; ++ ldo4-supply = <&vin>; ++ ldo5-supply = <&vin>; ++ ldo6-supply = <&v3v3>; ++ vref_ddr-supply = <&vin>; ++ boost-supply = <&vin>; ++ pwr_sw1-supply = <&bst_out>; ++ pwr_sw2-supply = <&bst_out>; ++ ++ ++ vddcore:buck1{ ++ regulator-name = "vddcore"; ++ regulator-min-microvolt = <1200000>; ++ regulator-max-microvolt = <1350000>; ++ regulator-always-on; ++ regulator-initial-mode = <0>; ++ regulator-over-current-protection; ++ }; ++ ++ vdd_ddr:buck2{ ++ regulator-name = "vdd_ddr"; ++ regulator-min-microvolt = <1350000>; ++ regulator-max-microvolt = <1350000>; ++ regulator-always-on; ++ regulator-initial-mode = <0>; ++ regulator-over-current-protection; ++ }; ++ ++ vdd:buck3{ ++ regulator-name = "vdd"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-always-on; ++ st,mask-reset; ++ regulator-initial-mode = <0>; ++ regulator-over-current-protection; ++ }; ++ ++ v3v3:buck4{ ++ regulator-name = "v3v3"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-always-on; ++ regulator-over-current-protection; ++ regulator-initial-mode = <0>; ++ }; ++ ++ v1v8_audio:ldo1{ ++ regulator-name = "v1v8_audio"; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ regulator-always-on; ++ interrupts = ; ++ }; ++ ++ v3v3_hdmi:ldo2{ ++ regulator-name = "v3v3_hdmi"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-always-on; ++ interrupts = ; ++ }; ++ ++ vtt_ddr:ldo3{ ++ regulator-name = "vtt_ddr"; ++ regulator-min-microvolt = <500000>; ++ regulator-max-microvolt = <750000>; ++ regulator-always-on; ++ regulator-over-current-protection; ++ }; ++ ++ vdd_usb:ldo4{ ++ regulator-name = "vdd_usb"; ++ interrupts = ; ++ }; ++ ++ v3v3_eth:ldo5{ ++ regulator-name = "v3v3_eth"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ interrupts = ; ++ regulator-boot-on; ++ }; ++ ++ v3v3_dsi:ldo6{ ++ regulator-name = "v3v3_dsi"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-always-on; ++ interrupts = ; ++ }; ++ ++ vref_ddr:vref_ddr{ ++ regulator-name = "vref_ddr"; ++ regulator-always-on; ++ regulator-over-current-protection; ++ }; ++ ++ bst_out:boost{ ++ regulator-name = "bst_out"; ++ interrupts = ; ++ regulator-always-on; ++ }; ++ ++ vbus_otg:pwr_sw1{ ++ regulator-name = "vbus_otg"; ++ interrupts = ; ++ regulator-active-discharge; ++ regulator-always-on; ++ }; ++ ++ vbus_sw:pwr_sw2{ ++ regulator-name = "vbus_sw"; ++ interrupts = ; ++ regulator-active-discharge = <1>; ++ regulator-always-on; ++ }; ++ }; ++ ++ onkey{ ++ compatible = "st,stpmic1-onkey"; ++ interrupts = , ; ++ interrupt-names = "onkey-falling", "onkey-rising"; ++ power-off-time-sec = <10>; ++ status = "okay"; ++ }; ++ ++ watchdog { ++ compatible = "st,stpmic1-wdt"; ++ status = "disabled"; ++ }; ++ }; ++ eeprom@50 { ++ compatible = "atmel,24c02"; ++ reg = <0x50>; ++ pagesize = <16>; ++ }; ++}; ++ ++&i2c5{ ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <&i2c5_pins_mx>; ++ pinctrl-1 = <&i2c5_sleep_pins_mx>; ++ status = "okay"; ++ ++ /delete-property/dmas; ++ /delete-property/dma-names; ++ ++}; ++ ++&spi5 { ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <&spi5_pins_mx>; ++ pinctrl-1 = <&spi5_sleep_pins_mx>; ++ cs-gpios = <&gpiof 6 0>; ++ status = "okay"; ++ ++ spidev: spidev@0 { ++ compatible = "rohm,dh2228fv"; ++ spi-max-frequency = <30000000>; ++ reg = <0>; ++ }; ++}; ++ ++&i2s2{ ++ clocks = <&rcc SPI2>, <&rcc SPI2_K>, <&rcc PLL3_Q>, <&rcc PLL3_R>; ++ clock-names = "pclk", "i2sclk", "x8k", "x11k"; ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <&i2s2_pins_mx>; ++ pinctrl-1 = <&i2s2_sleep_pins_mx>; ++ status = "okay"; ++ ++ i2s2_port: port { ++ i2s2_endpoint: endpoint { ++ remote-endpoint = <&sii9022_tx_endpoint>; ++ format = "i2s"; ++ mclk-fs = <256>; ++ }; ++ }; ++}; ++ ++&ipcc{ ++ status = "okay"; ++}; ++ ++&iwdg2{ ++ status = "okay"; ++ timeout-sec = <32>; ++}; ++ ++<dc{ ++ status = "okay"; ++ port { ++ ltdc_ep0_out: endpoint@0 { ++ reg = <0>; ++ remote-endpoint = <&sii9022_in>; ++ }; ++ ++ ltdc_ep1_out: endpoint@1 { ++ reg = <1>; ++ remote-endpoint = <&dsi_in>; ++ }; ++ }; ++}; ++ ++&pwr_regulators { ++ vdd-supply = <&vdd>; ++ vdd_3v3_usbfs-supply = <&vdd_usb>; ++}; ++ ++&rcc{ ++ u-boot,dm-pre-reloc; ++ status = "okay"; ++}; ++ ++&rng1{ ++ status = "okay"; ++}; ++ ++&rtc{ ++ status = "okay"; ++}; ++ ++&cec { ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <&cec_pins_mx>; ++ pinctrl-1 = <&cec_sleep_pins_mx>; ++ status = "okay"; ++}; ++ ++&cpu0{ ++ cpu-supply = <&vddcore>; ++}; ++ ++&cpu1{ ++ cpu-supply = <&vddcore>; ++}; ++ ++&crc1 { ++ status = "okay"; ++}; ++ ++&dts { ++ status = "okay"; ++}; ++ ++&sdmmc1{ ++ u-boot,dm-pre-reloc; ++ pinctrl-names = "default", "opendrain", "sleep"; ++ pinctrl-0 = <&sdmmc1_pins_mx>; ++ pinctrl-1 = <&sdmmc1_opendrain_pins_mx>; ++ pinctrl-2 = <&sdmmc1_sleep_pins_mx>; ++ status = "okay"; ++ ++ cd-gpios = <&gpioe 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; ++ disable-wp; ++ st,neg-edge; ++ bus-width = <4>; ++ vmmc-supply = <&v3v3>; ++}; ++ ++&sdmmc2{ ++ u-boot,dm-pre-reloc; ++ pinctrl-names = "default", "opendrain", "sleep"; ++ pinctrl-0 = <&sdmmc2_pins_mx>; ++ pinctrl-1 = <&sdmmc2_opendrain_pins_mx>; ++ pinctrl-2 = <&sdmmc2_sleep_pins_mx>; ++ status = "okay"; ++ non-removable; ++ no-sd; ++ no-sdio; ++ st,neg-edge; ++ bus-width = <8>; ++ vmmc-supply = <&v3v3>; ++ vqmmc-supply = <&v3v3>; ++ mmc-ddr-3_3v; ++}; ++ ++&sdmmc3{ ++ pinctrl-names = "default", "opendrain", "sleep"; ++ pinctrl-0 = <&sdmmc3_pins_mx>; ++ pinctrl-1 = <&sdmmc3_opendrain_pins_mx>; ++ pinctrl-2 = <&sdmmc3_sleep_pins_mx>; ++ arm,primecell-periphid = <0x10153180>; ++ non-removable; ++ st,neg-edge; ++ bus-width = <4>; ++ vmmc-supply = <&v3v3>; ++ //mmc-pwrseq = <&wifi_pwrseq>; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ keep-power-in-suspend; ++ status = "disabled"; ++ //status = "okay"; ++ ++ brcmf: bcrmf@1 { ++ reg = <1>; ++ compatible = "brcm,bcm4329-fmac"; ++ }; ++}; ++ ++&tamp{ ++ status = "okay"; ++}; ++ ++&timers5 { ++ /delete-property/dmas; ++ /delete-property/dma-names; ++ status = "okay"; ++ pwm { ++ pinctrl-0 = <&tim5_pwm_pins_mx>; ++ pinctrl-1 = <&tim5_pwm_sleep_pins_mx>; ++ pinctrl-names = "default", "sleep"; ++ status = "okay"; ++ }; ++ timer@4 { ++ status = "okay"; ++ }; ++}; ++ ++&uart4{ ++ u-boot,dm-pre-reloc; ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <&uart4_pins_mx>; ++ pinctrl-1 = <&uart4_sleep_pins_mx>; ++ /delete-property/dmas; ++ /delete-property/dma-names; ++ status = "okay"; ++}; ++ ++&usart2{ ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <&usart2_pins_mx>; ++ pinctrl-1 = <&usart2_sleep_pins_mx>; ++ uart-has-rtscts; ++ status = "okay"; ++ ++ bluetooth { ++ shutdown-gpios = <&gpioe 10 GPIO_ACTIVE_HIGH>; ++ compatible = "brcm,bcm43438-bt"; ++ max-speed = <3000000>; ++ vbat-supply = <&v3v3>; ++ vddio-supply = <&v3v3>; ++ }; ++}; ++ ++&sram { ++ dma_pool: dma_pool@0 { ++ reg = <0x50000 0x10000>; ++ pool; ++ }; ++}; ++ ++&dma1 { ++ sram = <&dma_pool>; ++}; ++ ++&dma2 { ++ sram = <&dma_pool>; ++}; ++ ++&adc { ++ vdd-supply = <&vdd>; ++ vdda-supply = <&v3v3_eth>; ++ vref-supply = <&v3v3_eth>; ++ status = "okay"; ++ adc1: adc@0 { ++ st,min-sample-time-nsecs = <5000>; ++ st,adc-channels = <0 1>; ++ status = "okay"; ++ }; ++ ++ adc_temp: temp { ++ status = "okay"; ++ }; ++}; ++ ++ ++// WARNING: Do not try to enable DAC1 and DCMI ++// This devices share the same pin PA4 ++/* &dac { ++ pinctrl-names = "default"; ++ status = "okay"; ++ dac1: dac@1 { ++ pinctrl-0 = <&dac_ch1_pins_a>; ++ status = "disabled"; ++ }; ++ dac2: dac@2 { ++ pinctrl-0 = <&dac_ch2_pins_a>; ++ status = "okay"; ++ }; ++};*/ ++ ++&usbh_ehci { ++ phys = <&usbphyc_port0>; ++ phy-names = "usb"; ++ status = "okay"; ++}; ++ ++&usbh_ohci{ ++ phys = <&usbphyc_port0>; ++ phy-names = "usb"; ++ status = "okay"; ++}; ++ ++&usbotg_hs { ++ phys = <&usbphyc_port1 0>; ++ phy-names = "usb2-phy"; ++ usb-role-switch; ++ status = "okay"; ++ ++ port { ++ usbotg_hs_ep: endpoint { ++ remote-endpoint = <&con_usbotg_hs_ep>; ++ }; ++ }; ++}; ++ ++&usbphyc { ++ status = "okay"; ++}; ++ ++&usbphyc_port0 { ++ phy-supply = <&vdd_usb>; ++ st,phy-tuning = <&usb_phy_tuning>; ++}; ++ ++&usbphyc_port1 { ++ phy-supply = <&vdd_usb>; ++ st,phy-tuning = <&usb_phy_tuning>; ++}; ++ ++&m_can1 { ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <&m_can1_pins_mx>; ++ pinctrl-1 = <&m_can1_sleep_pins_mx>; ++ status = "okay"; ++}; +-- +2.25.1 + diff --git a/buildroot/board/octavo/osd32mp1-red/patches/uboot/0002-configs-stm32mp15_trusted_defconfig-disable-environm.patch b/buildroot/board/octavo/osd32mp1-red/patches/uboot/0002-configs-stm32mp15_trusted_defconfig-disable-environm.patch new file mode 100644 index 0000000000..a2ec783e1b --- /dev/null +++ b/buildroot/board/octavo/osd32mp1-red/patches/uboot/0002-configs-stm32mp15_trusted_defconfig-disable-environm.patch @@ -0,0 +1,49 @@ +From 27a516e2ad464bf1de5e23e8277e0f6d6735bd21 Mon Sep 17 00:00:00 2001 +From: Kory Maincent +Date: Mon, 3 Oct 2022 12:20:40 +0200 +Subject: [PATCH 2/2] configs/stm32mp15_trusted_defconfig: disable environment + +Signed-off-by: Kory Maincent +--- + board/st/stm32mp1/stm32mp1.c | 4 ++++ + configs/stm32mp15_trusted_defconfig | 9 --------- + 2 files changed, 4 insertions(+), 9 deletions(-) + +diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c +index 48591b2f1e..ba510d843c 100644 +--- a/board/st/stm32mp1/stm32mp1.c ++++ b/board/st/stm32mp1/stm32mp1.c +@@ -78,6 +78,10 @@ DECLARE_GLOBAL_DATA_PTR; + #define USB_START_LOW_THRESHOLD_UV 1230000 + #define USB_START_HIGH_THRESHOLD_UV 2150000 + ++#ifndef CONFIG_SYS_MMC_ENV_DEV ++#define CONFIG_SYS_MMC_ENV_DEV -1 ++#endif ++ + int board_early_init_f(void) + { + /* nothing to do, only used in SPL */ +diff --git a/configs/stm32mp15_trusted_defconfig b/configs/stm32mp15_trusted_defconfig +index 2161ccbefa..fd3fed8fb0 100644 +--- a/configs/stm32mp15_trusted_defconfig ++++ b/configs/stm32mp15_trusted_defconfig +@@ -45,15 +45,6 @@ CONFIG_CMD_EXT4_WRITE=y + CONFIG_CMD_MTDPARTS=y + CONFIG_CMD_UBI=y + CONFIG_ENV_IS_NOWHERE=y +-CONFIG_ENV_IS_IN_MMC=y +-CONFIG_ENV_IS_IN_SPI_FLASH=y +-CONFIG_ENV_IS_IN_UBI=y +-CONFIG_SYS_REDUNDAND_ENVIRONMENT=y +-CONFIG_ENV_UBI_PART="UBI" +-CONFIG_ENV_UBI_VOLUME="uboot_config" +-CONFIG_ENV_UBI_VOLUME_REDUND="uboot_config_r" +-CONFIG_SYS_RELOC_GD_ENV_ADDR=y +-CONFIG_SYS_MMC_ENV_DEV=-1 + CONFIG_STM32_ADC=y + CONFIG_CLK_SCMI=y + CONFIG_SET_DFU_ALT_INFO=y +-- +2.25.1 + diff --git a/buildroot/board/octavo/osd32mp1-red/readme.txt b/buildroot/board/octavo/osd32mp1-red/readme.txt new file mode 100644 index 0000000000..e087e38640 --- /dev/null +++ b/buildroot/board/octavo/osd32mp1-red/readme.txt @@ -0,0 +1,37 @@ +OSD32MP1-RED + +Intro +===== + +This configuration supports the OSD32MP1-RED platform: + + https://octavosystems.com/octavo_products/osd32mp1-red/ + +How to build +============ + + $ make octavo_osd32mp1_red_defconfig + $ make + +How to write the microSD 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 microSD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX + +Boot the board +============== + + (1) Insert the microSD card in connector X5. + + (2) Plug an USB-SERIAL cable in the JP4 pin connector and run your serial + communication program on /dev/ttySTM0. + + (3) Plug an USB-C cable in the J2 connector or use barrel power supply to + power-up the board. + + (4) The system will start, with the console on UART. diff --git a/buildroot/board/octavo/osd32mp1-red/tfa-dts/osd32mp1_ddr_1x4Gb.dtsi b/buildroot/board/octavo/osd32mp1-red/tfa-dts/osd32mp1_ddr_1x4Gb.dtsi new file mode 100644 index 0000000000..3cd2c3f5d1 --- /dev/null +++ b/buildroot/board/octavo/osd32mp1-red/tfa-dts/osd32mp1_ddr_1x4Gb.dtsi @@ -0,0 +1,121 @@ +/* + * Copyright (C) 2015-2018, STMicroelectronics - All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause + * + */ + +/* + * File generated by STMicroelectronics STM32CubeMX DDR Tool for MPUs + * DDR type: DDR3 / DDR3L + * DDR width: 16bits + * DDR density: 4Gb + * System frequency: 533000Khz + * Relaxed Timing Mode: false + * Address mapping type: RBC + * + * Save Date: 2020.08.27, save Time: 15:22:11 + */ + +#define DDR_MEM_NAME "DDR3-DDR3L 16bits 533000Khz" +#define DDR_MEM_SPEED 533000 +#define DDR_MEM_SIZE 0x20000000 + +#define DDR_MSTR 0x00041401 +#define DDR_MRCTRL0 0x00000010 +#define DDR_MRCTRL1 0x00000000 +#define DDR_DERATEEN 0x00000000 +#define DDR_DERATEINT 0x00800000 +#define DDR_PWRCTL 0x00000000 +#define DDR_PWRTMG 0x00400010 +#define DDR_HWLPCTL 0x00000000 +#define DDR_RFSHCTL0 0x00210000 +#define DDR_RFSHCTL3 0x00000000 +#define DDR_RFSHTMG 0x0081008B +#define DDR_CRCPARCTL0 0x00000000 +#define DDR_DRAMTMG0 0x121B2414 +#define DDR_DRAMTMG1 0x000A041C +#define DDR_DRAMTMG2 0x0608090F +#define DDR_DRAMTMG3 0x0050400C +#define DDR_DRAMTMG4 0x08040608 +#define DDR_DRAMTMG5 0x06060403 +#define DDR_DRAMTMG6 0x02020002 +#define DDR_DRAMTMG7 0x00000202 +#define DDR_DRAMTMG8 0x00001005 +#define DDR_DRAMTMG14 0x000000A0 +#define DDR_ZQCTL0 0xC2000040 +#define DDR_DFITMG0 0x02060105 +#define DDR_DFITMG1 0x00000202 +#define DDR_DFILPCFG0 0x07000000 +#define DDR_DFIUPD0 0xC0400003 +#define DDR_DFIUPD1 0x00000000 +#define DDR_DFIUPD2 0x00000000 +#define DDR_DFIPHYMSTR 0x00000000 +#define DDR_ODTCFG 0x06000600 +#define DDR_ODTMAP 0x00000001 +#define DDR_SCHED 0x00000C01 +#define DDR_SCHED1 0x00000000 +#define DDR_PERFHPR1 0x01000001 +#define DDR_PERFLPR1 0x08000200 +#define DDR_PERFWR1 0x08000400 +#define DDR_DBG0 0x00000000 +#define DDR_DBG1 0x00000000 +#define DDR_DBGCMD 0x00000000 +#define DDR_POISONCFG 0x00000000 +#define DDR_PCCFG 0x00000010 +#define DDR_PCFGR_0 0x00010000 +#define DDR_PCFGW_0 0x00000000 +#define DDR_PCFGQOS0_0 0x02100C03 +#define DDR_PCFGQOS1_0 0x00800100 +#define DDR_PCFGWQOS0_0 0x01100C03 +#define DDR_PCFGWQOS1_0 0x01000200 +#define DDR_PCFGR_1 0x00010000 +#define DDR_PCFGW_1 0x00000000 +#define DDR_PCFGQOS0_1 0x02100C03 +#define DDR_PCFGQOS1_1 0x00800040 +#define DDR_PCFGWQOS0_1 0x01100C03 +#define DDR_PCFGWQOS1_1 0x01000200 +#define DDR_ADDRMAP1 0x00070707 +#define DDR_ADDRMAP2 0x00000000 +#define DDR_ADDRMAP3 0x1F000000 +#define DDR_ADDRMAP4 0x00001F1F +#define DDR_ADDRMAP5 0x06060606 +#define DDR_ADDRMAP6 0x0F060606 +#define DDR_ADDRMAP9 0x00000000 +#define DDR_ADDRMAP10 0x00000000 +#define DDR_ADDRMAP11 0x00000000 +#define DDR_PGCR 0x01442E02 +#define DDR_PTR0 0x0022AA5B +#define DDR_PTR1 0x04841104 +#define DDR_PTR2 0x042DA068 +#define DDR_ACIOCR 0x10400812 +#define DDR_DXCCR 0x00000C40 +#define DDR_DSGCR 0xF200011F +#define DDR_DCR 0x0000000B +#define DDR_DTPR0 0x38D488D0 +#define DDR_DTPR1 0x098B00D8 +#define DDR_DTPR2 0x10023600 +#define DDR_MR0 0x00000840 +#define DDR_MR1 0x00000000 +#define DDR_MR2 0x00000208 +#define DDR_MR3 0x00000000 +#define DDR_ODTCR 0x00010000 +#define DDR_ZQ0CR1 0x00000038 +#define DDR_DX0GCR 0x0000CE81 +#define DDR_DX0DLLCR 0x40000000 +#define DDR_DX0DQTR 0x00112121 +#define DDR_DX0DQSTR 0x3D200000 +#define DDR_DX1GCR 0x0000CE81 +#define DDR_DX1DLLCR 0x40000000 +#define DDR_DX1DQTR 0x11100121 +#define DDR_DX1DQSTR 0x3D200000 +#define DDR_DX2GCR 0x0000CE80 +#define DDR_DX2DLLCR 0x40000000 +#define DDR_DX2DQTR 0xFFFFFFFF +#define DDR_DX2DQSTR 0x3DB02000 +#define DDR_DX3GCR 0x0000CE80 +#define DDR_DX3DLLCR 0x40000000 +#define DDR_DX3DQTR 0xFFFFFFFF +#define DDR_DX3DQSTR 0x3DB02000 + +#include "stm32mp15-ddr.dtsi" diff --git a/buildroot/board/octavo/osd32mp1-red/tfa-dts/stm32mp157c-osd32mp1-red-fw-config.dts b/buildroot/board/octavo/osd32mp1-red/tfa-dts/stm32mp157c-osd32mp1-red-fw-config.dts new file mode 100644 index 0000000000..256d0db935 --- /dev/null +++ b/buildroot/board/octavo/osd32mp1-red/tfa-dts/stm32mp157c-osd32mp1-red-fw-config.dts @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +/* + * Copyright (c) 2020, STMicroelectronics - All Rights Reserved + */ + +#include "stm32mp15-ddr-512m-fw-config.dts" diff --git a/buildroot/board/octavo/osd32mp1-red/tfa-dts/stm32mp157c-osd32mp1-red.dts b/buildroot/board/octavo/osd32mp1-red/tfa-dts/stm32mp157c-osd32mp1-red.dts new file mode 100644 index 0000000000..7cf64d9d98 --- /dev/null +++ b/buildroot/board/octavo/osd32mp1-red/tfa-dts/stm32mp157c-osd32mp1-red.dts @@ -0,0 +1,571 @@ +/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */ +/* + * Copyright (C) STMicroelectronics 2020 - All Rights Reserved + * Author: STM32CubeMX code generation for STMicroelectronics. + */ + +/dts-v1/; +#include +#include +#include +#include + +#include "stm32mp157.dtsi" +#include "stm32mp15xc.dtsi" +#include "stm32mp15xxac-pinctrl.dtsi" +#include "osd32mp1_ddr_1x4Gb.dtsi" + +/ { + model = "Octavo OSD32MP1 RED board"; + compatible = "octavo,stm32mp157c-osd32mp1-red", "st,stm32mp157"; + + aliases { + serial0 = &uart4; + }; + + memory@c0000000 { + device_type = "memory"; + reg = <0xc0000000 0x20000000>; + }; + + vin: vin { + compatible = "regulator-fixed"; + regulator-name = "vin"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-always-on; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&bsec { + board_id: board_id@ec { + reg = <0xec 0x4>; + st,non-secure-otp; + }; +}; + +&clk_hse { + st,digbypass; +}; + +&cpu0 { + cpu-supply = <&vddcore>; +}; + +&cpu1 { + cpu-supply = <&vddcore>; +}; + +&hash1 { + status = "okay"; +}; + +&cryp1 { + status = "okay"; +}; + +&etzpc { + st,decprot = < + DECPROT(STM32MP1_ETZPC_DCMI_ID, DECPROT_NS_RW, DECPROT_UNLOCK) + DECPROT(STM32MP1_ETZPC_ETH_ID, DECPROT_NS_RW, DECPROT_UNLOCK) + DECPROT(STM32MP1_ETZPC_USART1_ID, DECPROT_NS_RW, DECPROT_UNLOCK) + DECPROT(STM32MP1_ETZPC_SPI6_ID, DECPROT_NS_RW, DECPROT_UNLOCK) + DECPROT(STM32MP1_ETZPC_I2C4_ID, DECPROT_NS_RW, DECPROT_UNLOCK) + DECPROT(STM32MP1_ETZPC_SPI2_ID, DECPROT_NS_RW, DECPROT_UNLOCK) + DECPROT(STM32MP1_ETZPC_I2C6_ID, DECPROT_NS_RW, DECPROT_UNLOCK) + DECPROT(STM32MP1_ETZPC_RNG1_ID, DECPROT_NS_RW, DECPROT_UNLOCK) + DECPROT(STM32MP1_ETZPC_HASH1_ID, DECPROT_NS_RW, DECPROT_UNLOCK) + DECPROT(STM32MP1_ETZPC_CRYP1_ID, DECPROT_NS_RW, DECPROT_UNLOCK) + DECPROT(STM32MP1_ETZPC_DDRCTRL_ID, DECPROT_NS_R_S_W, DECPROT_LOCK) + DECPROT(STM32MP1_ETZPC_DDRPHYC_ID, DECPROT_NS_R_S_W, DECPROT_LOCK) + DECPROT(STM32MP1_ETZPC_STGENC_ID, DECPROT_S_RW, DECPROT_LOCK) + DECPROT(STM32MP1_ETZPC_BKPSRAM_ID, DECPROT_S_RW, DECPROT_LOCK) + DECPROT(STM32MP1_ETZPC_IWDG1_ID, DECPROT_S_RW, DECPROT_LOCK) + >; +}; + + + +&i2c4 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c4_pins_z_mx>; + i2c-scl-rising-time-ns = <185>; + i2c-scl-falling-time-ns = <20>; + clock-frequency = <400000>; + status = "okay"; + secure-status = "okay"; + + pmic: stpmic@33 { + compatible = "st,stpmic1"; + reg = <0x33>; + interrupts-extended = <&exti_pwr 55 IRQ_TYPE_EDGE_FALLING>; + interrupt-controller; + #interrupt-cells = <2>; + status = "okay"; + secure-status = "okay"; + + regulators { + compatible = "st,stpmic1-regulators"; + buck1-supply = <&vin>; + buck2-supply = <&vin>; + buck3-supply = <&vin>; + buck4-supply = <&vin>; + ldo1-supply = <&v3v3>; + ldo2-supply = <&vin>; + ldo3-supply = <&vdd_ddr>; + ldo4-supply = <&vin>; + ldo5-supply = <&vin>; + ldo6-supply = <&v3v3>; + vref_ddr-supply = <&vin>; + boost-supply = <&vin>; + pwr_sw1-supply = <&bst_out>; + pwr_sw2-supply = <&bst_out>; + + vddcore: buck1 { + regulator-name = "vddcore"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1350000>; + regulator-always-on; + regulator-initial-mode = <0>; + regulator-over-current-protection; + lp-stop{ + regulator-on-in-suspend; + regulator-suspend-microvolt = <1200000>; + }; + standby-ddr-sr{ + regulator-off-in-suspend; + }; + standby-ddr-off{ + regulator-off-in-suspend; + }; + }; + + vdd_ddr: buck2 { + regulator-name = "vdd_ddr"; + regulator-min-microvolt = <1350000>; + regulator-max-microvolt = <1350000>; + regulator-always-on; + regulator-initial-mode = <0>; + regulator-over-current-protection; + lp-stop{ + regulator-suspend-microvolt = <1350000>; + regulator-on-in-suspend; + }; + standby-ddr-sr{ + regulator-suspend-microvolt = <1350000>; + regulator-on-in-suspend; + }; + standby-ddr-off{ + regulator-off-in-suspend; + }; + }; + + vdd: buck3 { + regulator-name = "vdd"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + st,mask-reset; + regulator-initial-mode = <0>; + regulator-over-current-protection; + lp-stop{ + regulator-suspend-microvolt = <3300000>; + regulator-on-in-suspend; + }; + standby-ddr-sr{ + regulator-suspend-microvolt = <3300000>; + regulator-on-in-suspend; + }; + standby-ddr-off{ + regulator-suspend-microvolt = <3300000>; + regulator-on-in-suspend; + }; + }; + + v3v3: buck4 { + regulator-name = "v3v3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + regulator-over-current-protection; + regulator-initial-mode = <0>; + lp-stop{ + regulator-suspend-microvolt = <3300000>; + regulator-on-in-suspend; + }; + standby-ddr-sr{ + regulator-off-in-suspend; + }; + standby-ddr-off{ + regulator-off-in-suspend; + }; + }; + + v1v8_ldo1: ldo1 { + regulator-name = "v1v8_audio"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-always-on; + standby-ddr-sr{ + regulator-off-in-suspend; + }; + standby-ddr-off{ + regulator-off-in-suspend; + }; + }; + + v3v3_ldo2: ldo2 { + regulator-name = "v3v3_hdmi"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + standby-ddr-sr{ + regulator-off-in-suspend; + }; + standby-ddr-off{ + regulator-off-in-suspend; + }; + }; + + vtt_ddr: ldo3 { + regulator-name = "vtt_ddr"; + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <750000>; + regulator-always-on; + regulator-over-current-protection; + lp-stop{ + regulator-off-in-suspend; + }; + standby-ddr-sr{ + regulator-off-in-suspend; + }; + standby-ddr-off{ + regulator-off-in-suspend; + }; + }; + + vdd_usb: ldo4 { + regulator-name = "vdd_usb"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + standby-ddr-sr{ + regulator-on-in-suspend; + }; + standby-ddr-off{ + regulator-off-in-suspend; + }; + }; + + vdda: ldo5 { + regulator-name = "vdda"; + regulator-min-microvolt = <2900000>; + regulator-max-microvolt = <2900000>; + regulator-boot-on; + standby-ddr-sr{ + regulator-off-in-suspend; + }; + standby-ddr-off{ + regulator-off-in-suspend; + }; + }; + + v1v2_ldo6: ldo6 { + regulator-name = "v1v2_ldo6"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + regulator-always-on; + standby-ddr-sr{ + regulator-off-in-suspend; + }; + standby-ddr-off{ + regulator-off-in-suspend; + }; + }; + + vref_ddr: vref_ddr { + regulator-name = "vref_ddr"; + regulator-always-on; + regulator-over-current-protection; + lp-stop{ + regulator-on-in-suspend; + }; + standby-ddr-sr{ + regulator-on-in-suspend; + }; + standby-ddr-off{ + regulator-off-in-suspend; + }; + }; + + bst_out: boost { + regulator-name = "bst_out"; + }; + + vbus_otg: pwr_sw1 { + regulator-name = "vbus_otg"; + }; + + vbus_sw: pwr_sw2 { + regulator-name = "vbus_sw"; + regulator-active-discharge = <1>; + }; + }; + }; +}; + +&iwdg2 { + timeout-sec = <32>; + secure-timeout-sec = <5>; + status = "okay"; + secure-status = "okay"; +}; + +&nvmem_layout { + nvmem-cells = <&cfg0_otp>, + <&part_number_otp>, + <&monotonic_otp>, + <&nand_otp>, + <&uid_otp>, + <&package_otp>, + <&hw2_otp>, + <&pkh_otp>, + <&board_id>; + + nvmem-cell-names = "cfg0_otp", + "part_number_otp", + "monotonic_otp", + "nand_otp", + "uid_otp", + "package_otp", + "hw2_otp", + "pkh_otp", + "board_id"; +}; + +&pwr_regulators { + system_suspend_supported_soc_modes = < + STM32_PM_CSLEEP_RUN + STM32_PM_CSTOP_ALLOW_LP_STOP + STM32_PM_CSTOP_ALLOW_STANDBY_DDR_SR + >; + system_off_soc_mode = ; + vdd-supply = <&vdd>; + vdd_3v3_usbfs-supply = <&vdd_usb>; +}; + +&rcc { + st,hsi-cal; + st,csi-cal; + st,cal-sec = <60>; + st,clksrc = < + CLK_MPU_PLL1P + CLK_AXI_PLL2P + CLK_MCU_PLL3P + CLK_PLL12_HSE + CLK_PLL3_HSE + CLK_PLL4_HSE + CLK_RTC_LSE + CLK_MCO1_DISABLED + CLK_MCO2_DISABLED + >; + + st,clkdiv = < + 1 /*MPU*/ + 0 /*AXI*/ + 0 /*MCU*/ + 1 /*APB1*/ + 1 /*APB2*/ + 1 /*APB3*/ + 1 /*APB4*/ + 2 /*APB5*/ + 23 /*RTC*/ + 0 /*MCO1*/ + 0 /*MCO2*/ + >; + + st,pkcs = < + CLK_CKPER_HSE + CLK_ETH_PLL3Q + CLK_SDMMC12_PLL4P + CLK_DSI_DSIPLL + CLK_STGEN_HSE + CLK_USBPHY_HSE + CLK_SPI2S1_PLL3Q + CLK_SPI2S23_CKPER + CLK_SPI45_PCLK2 + CLK_SPI6_DISABLED + CLK_I2C46_HSI + CLK_SDMMC3_PLL4P + CLK_USBO_USBPHY + CLK_ADC_CKPER + CLK_CEC_LSE + CLK_I2C12_HSI + CLK_I2C35_HSI + CLK_UART1_DISABLED + CLK_UART24_HSI + CLK_UART35_HSI + CLK_UART6_DISABLED + CLK_UART78_DISABLED + CLK_SPDIF_DISABLED + CLK_SAI1_DISABLED + CLK_SAI2_DISABLED + CLK_SAI3_DISABLED + CLK_SAI4_DISABLED + CLK_RNG1_LSI + CLK_LPTIM1_DISABLED + CLK_LPTIM23_DISABLED + CLK_LPTIM45_DISABLED + >; + + pll1:st,pll@0 { + cfg = < 2 80 0 1 1 PQR(1,0,0) >; + frac = < 0x800>; + }; + + pll2:st,pll@1 { + cfg = < 2 65 1 0 0 PQR(1,1,1) >; + frac = < 0x1400>; + }; + + pll3:st,pll@2 { + cfg = < 1 61 3 5 36 PQR(1,1,0) >; + frac = < 0x1000 >; + }; + + pll4: st,pll@3 { + cfg = < 3 98 5 7 7 PQR(1,1,1) >; + }; +}; + +&rng1 { + status = "okay"; + secure-status = "okay"; +}; + +&rtc { + status = "okay"; + secure-status = "okay"; +}; + +&sdmmc1 { + pinctrl-names = "default"; + pinctrl-0 = <&sdmmc1_pins_mx>; + disable-wp; + st,neg-edge; + bus-width = <4>; + vmmc-supply = <&v3v3>; + status = "okay"; +}; + +&sdmmc2{ + pinctrl-names = "default"; + pinctrl-0 = <&sdmmc2_pins_mx>; + status = "okay"; +}; + +&timers15 { + secure-status = "okay"; + st,hsi-cal-input = <7>; + st,csi-cal-input = <8>; +}; +&uart4 { + pinctrl-names = "default"; + pinctrl-0 = <&uart4_pins_mx>; + status = "okay"; +}; + +&usbotg_hs { + phys = <&usbphyc_port1 0>; + phy-names = "usb2-phy"; + usb-role-switch; + status = "okay"; +}; + +&usbphyc { + status = "okay"; +}; + +&usbphyc_port0 { + phy-supply = <&vdd_usb>; +}; + +&usbphyc_port1 { + phy-supply = <&vdd_usb>; +}; + + + + +&pinctrl { + sdmmc1_pins_mx: sdmmc1-b4-0 { + pins1 { + pinmux = , /* SDMMC1_D0 */ + , /* SDMMC1_D1 */ + , /* SDMMC1_D2 */ + , /* SDMMC1_D3 */ + ; /* SDMMC1_CMD */ + slew-rate = <1>; + drive-push-pull; + bias-disable; + }; + pins2 { + pinmux = ; /* SDMMC1_CK */ + slew-rate = <2>; + drive-push-pull; + bias-disable; + }; + }; + + sdmmc2_pins_mx: sdmmc2_mx-0 { + pins1 { + pinmux = , /* SDMMC2_D4 */ + , /* SDMMC2_D5 */ + , /* SDMMC2_D2 */ + , /* SDMMC2_D3 */ + , /* SDMMC2_D0 */ + , /* SDMMC2_D1 */ + , /* SDMMC2_D7 */ + , /* SDMMC2_D6 */ + ; /* SDMMC2_CMD */ + bias-pull-up; + drive-push-pull; + slew-rate = <1>; + }; + pins2 { + pinmux = ; /* SDMMC2_CK */ + bias-pull-up; + drive-push-pull; + slew-rate = <2>; + }; + }; + + uart4_pins_mx: uart4-0 { + pins1 { + pinmux = ; /* UART4_TX */ + bias-disable; + drive-push-pull; + slew-rate = <0>; + }; + pins2 { + pinmux = ; /* UART4_RX */ + bias-disable; + }; + }; +}; + +&pinctrl_z { + i2c4_pins_z_mx: i2c4-0 { + pins { + pinmux = , /* I2C4_SCL */ + ; /* I2C4_SDA */ + bias-disable; + drive-open-drain; + slew-rate = <0>; + }; + }; +}; diff --git a/buildroot/board/olimex/a20_olinuxino/patches/linux-headers/linux-headers.hash b/buildroot/board/olimex/a20_olinuxino/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/olimex/a20_olinuxino/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/olimex/a20_olinuxino/patches/linux/linux.hash b/buildroot/board/olimex/a20_olinuxino/patches/linux/linux.hash new file mode 100644 index 0000000000..4769129ac1 --- /dev/null +++ b/buildroot/board/olimex/a20_olinuxino/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 5fae869d6a24055c16ffc2d92669e3fb2b258e34d36c850bb8cf9def417ecfa0 linux-6.6.54.tar.xz diff --git a/buildroot/board/olimex/a20_olinuxino/patches/uboot/uboot.hash b/buildroot/board/olimex/a20_olinuxino/patches/uboot/uboot.hash new file mode 100644 index 0000000000..8491435683 --- /dev/null +++ b/buildroot/board/olimex/a20_olinuxino/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0 u-boot-2024.10.tar.bz2 diff --git a/buildroot/board/olimex/imx233_olinuxino/patches/linux-headers/linux-headers.hash b/buildroot/board/olimex/imx233_olinuxino/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/olimex/imx233_olinuxino/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/olimex/imx233_olinuxino/patches/linux/linux.hash b/buildroot/board/olimex/imx233_olinuxino/patches/linux/linux.hash new file mode 100644 index 0000000000..1dba724d0c --- /dev/null +++ b/buildroot/board/olimex/imx233_olinuxino/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 88b69611093613ce4494527685f833af0c31b986dcbeda7086f69f18f9e0b190 linux-6.1.83.tar.xz diff --git a/buildroot/board/olimex/imx233_olinuxino/patches/uboot/uboot.hash b/buildroot/board/olimex/imx233_olinuxino/patches/uboot/uboot.hash new file mode 100644 index 0000000000..c1aeddf06c --- /dev/null +++ b/buildroot/board/olimex/imx233_olinuxino/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a u-boot-2024.04.tar.bz2 diff --git a/buildroot/board/olimex/stmp1_olinuxino/genimage.cfg b/buildroot/board/olimex/stmp1_olinuxino/genimage.cfg index 2f00ee979a..02800db8d4 100644 --- a/buildroot/board/olimex/stmp1_olinuxino/genimage.cfg +++ b/buildroot/board/olimex/stmp1_olinuxino/genimage.cfg @@ -1,6 +1,6 @@ image sdcard.img { hdimage { - gpt = "true" + partition-table-type = "gpt" } partition fsbl1 { diff --git a/buildroot/board/olimex/stmp1_olinuxino/patches/linux-headers/linux-headers.hash b/buildroot/board/olimex/stmp1_olinuxino/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/olimex/stmp1_olinuxino/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/olimex/stmp1_olinuxino/patches/linux/linux.hash b/buildroot/board/olimex/stmp1_olinuxino/patches/linux/linux.hash new file mode 100644 index 0000000000..8691d5ffd3 --- /dev/null +++ b/buildroot/board/olimex/stmp1_olinuxino/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 5d3ca43b81056305860d7407c871eac4f8eafa603029ee67816574a31444fd93 linux-fc74113e14d76aea9482264ff42e07397b94553d-git4.tar.gz diff --git a/buildroot/board/olimex/stmp1_olinuxino/patches/uboot/uboot.hash b/buildroot/board/olimex/stmp1_olinuxino/patches/uboot/uboot.hash new file mode 100644 index 0000000000..a991a1922f --- /dev/null +++ b/buildroot/board/olimex/stmp1_olinuxino/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 6aaa18a9023db29ceaad5bca240605990b68a6bf348aaefad0bee8be8d37648e uboot-efadf793a0a5924e2c96362dc1df3e56622ebb97-git4.tar.gz diff --git a/buildroot/board/openblocks/a6/patches/linux-headers/linux-headers.hash b/buildroot/board/openblocks/a6/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/openblocks/a6/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/openblocks/a6/patches/linux/linux.hash b/buildroot/board/openblocks/a6/patches/linux/linux.hash new file mode 100644 index 0000000000..b207306a2b --- /dev/null +++ b/buildroot/board/openblocks/a6/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 0820fdb7971c6974338081c11fbf2dc869870501e7bdcac4d0ed58ba1f57b61c linux-4.14.336.tar.xz diff --git a/buildroot/board/orangepi/common/genimage.cfg b/buildroot/board/orangepi/common/genimage.cfg index a61c4a039f..c748108ca0 100644 --- a/buildroot/board/orangepi/common/genimage.cfg +++ b/buildroot/board/orangepi/common/genimage.cfg @@ -7,7 +7,7 @@ image sdcard.img { } hdimage { - partition-table-type = gpt + partition-table-type = "gpt" gpt-location = 1008K # 1MB - 16KB(GPT) gpt-no-backup = true } diff --git a/buildroot/board/orangepi/orangepi-lite/boot.cmd b/buildroot/board/orangepi/orangepi-lite/boot.cmd deleted file mode 100644 index 5c29dabfe8..0000000000 --- a/buildroot/board/orangepi/orangepi-lite/boot.cmd +++ /dev/null @@ -1,8 +0,0 @@ -setenv fdt_high ffffffff - -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-lite.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/buildroot/board/orangepi/orangepi-lite/genimage.cfg b/buildroot/board/orangepi/orangepi-lite/genimage.cfg deleted file mode 100644 index b422a751a8..0000000000 --- a/buildroot/board/orangepi/orangepi-lite/genimage.cfg +++ /dev/null @@ -1,37 +0,0 @@ -# Minimal SD card image for the OrangePi Lite -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h3-orangepi-lite.dtb", - "boot.scr" - } - } - - size = 10M -} - -image sdcard.img { - hdimage { - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - size = 1016K # 1MB - 8KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - size = 512M - } -} diff --git a/buildroot/board/orangepi/orangepi-lite/patches/linux-headers/linux-headers.hash b/buildroot/board/orangepi/orangepi-lite/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/orangepi/orangepi-lite/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/orangepi/orangepi-lite/patches/linux/linux.hash b/buildroot/board/orangepi/orangepi-lite/patches/linux/linux.hash new file mode 100644 index 0000000000..e8609babc9 --- /dev/null +++ b/buildroot/board/orangepi/orangepi-lite/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 b21d5795a3bead4f112916423222faa8a0f519e4201df343e3eb88dc9e4aaa30 linux-6.6.16.tar.xz diff --git a/buildroot/board/orangepi/orangepi-lite/patches/uboot/uboot.hash b/buildroot/board/orangepi/orangepi-lite/patches/uboot/uboot.hash new file mode 100644 index 0000000000..bc999536af --- /dev/null +++ b/buildroot/board/orangepi/orangepi-lite/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3 u-boot-2024.01.tar.bz2 diff --git a/buildroot/board/orangepi/orangepi-lite2/readme.txt b/buildroot/board/orangepi/orangepi-lite2/readme.txt index bed561b562..7f88250418 100644 --- a/buildroot/board/orangepi/orangepi-lite2/readme.txt +++ b/buildroot/board/orangepi/orangepi-lite2/readme.txt @@ -6,7 +6,7 @@ buildroot environment for the Orangepi Lite2. With the current configuration it will bring-up the board, and allow access through the serial console. Orangepi Lite2 link: -http://www.orangepi.org/Orange%20Pi%20Lite%202/ +http://www.orangepi.org/html/hardWare/computerAndMicrocontrollers/details/Orange-Pi-Lite-2.html Wiki link: https://openedev.amarulasolutions.com/display/ODWIKI/Orangepi+Lite2 diff --git a/buildroot/board/orangepi/orangepi-one-plus/readme.txt b/buildroot/board/orangepi/orangepi-one-plus/readme.txt index 87f6de8510..547f874288 100644 --- a/buildroot/board/orangepi/orangepi-one-plus/readme.txt +++ b/buildroot/board/orangepi/orangepi-one-plus/readme.txt @@ -6,7 +6,7 @@ buildroot environment for the Orangepi One Plus. With the current configuration it will bring-up the board, and allow access through the serial console. Orangepi One Plus link: -http://www.orangepi.org/OrangePiOneplus/ +http://www.orangepi.org/html/hardWare/computerAndMicrocontrollers/details/Orange-Pi-One-Plus.html Wiki link: https://openedev.amarulasolutions.com/display/ODWIKI/Orangepi+One+Plus diff --git a/buildroot/board/orangepi/orangepi-one/boot.cmd b/buildroot/board/orangepi/orangepi-one/boot.cmd deleted file mode 100644 index ab616e6ac9..0000000000 --- a/buildroot/board/orangepi/orangepi-one/boot.cmd +++ /dev/null @@ -1,8 +0,0 @@ -setenv fdt_high ffffffff - -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-one.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/buildroot/board/orangepi/orangepi-one/genimage.cfg b/buildroot/board/orangepi/orangepi-one/genimage.cfg deleted file mode 100644 index 2a14dcdec2..0000000000 --- a/buildroot/board/orangepi/orangepi-one/genimage.cfg +++ /dev/null @@ -1,37 +0,0 @@ -# Minimal SD card image for the OrangePi PC -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h3-orangepi-one.dtb", - "boot.scr" - } - } - - size = 10M -} - -image sdcard.img { - hdimage { - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - size = 1016K # 1MB - 8KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - size = 512M - } -} diff --git a/buildroot/board/orangepi/orangepi-pc-plus/boot.cmd b/buildroot/board/orangepi/orangepi-pc-plus/boot.cmd deleted file mode 100644 index c91f77942f..0000000000 --- a/buildroot/board/orangepi/orangepi-pc-plus/boot.cmd +++ /dev/null @@ -1,8 +0,0 @@ -setenv fdt_high ffffffff - -setenv bootargs console=ttyS0,115200 earlyprintk root=PARTLABEL=rootfs rootwait - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-pc-plus.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/buildroot/board/orangepi/orangepi-pc-plus/genimage.cfg b/buildroot/board/orangepi/orangepi-pc-plus/genimage.cfg deleted file mode 100644 index 3812d785d5..0000000000 --- a/buildroot/board/orangepi/orangepi-pc-plus/genimage.cfg +++ /dev/null @@ -1,43 +0,0 @@ -# Minimal SD card image for the OrangePi PC Plus -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h3-orangepi-pc-plus.dtb", - "boot.scr" - } - } - - size = 10M -} - -image sdcard.img { - hdimage { - # for root=PARTLABEL support - partition-table-type = "gpt" - # default GPT location conflicts with bootloaders, move it after - gpt-location = 1M - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - size = 1016K # 1MB - 8KB - } - - partition boot { - partition-type-uuid = "F" - bootable = "true" - image = "boot.vfat" - } - - # 'rootfs' will be used as the partition label, used - # with root=PARTLABEL=rootfs kernel command line - partition rootfs { - partition-type-uuid = "L" - image = "rootfs.ext4" - size = 512M - } -} diff --git a/buildroot/board/orangepi/orangepi-pc/boot.cmd b/buildroot/board/orangepi/orangepi-pc/boot.cmd deleted file mode 100644 index 9da625c803..0000000000 --- a/buildroot/board/orangepi/orangepi-pc/boot.cmd +++ /dev/null @@ -1,8 +0,0 @@ -setenv fdt_high ffffffff - -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-pc.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/buildroot/board/orangepi/orangepi-pc/genimage.cfg b/buildroot/board/orangepi/orangepi-pc/genimage.cfg deleted file mode 100644 index 14e326cc56..0000000000 --- a/buildroot/board/orangepi/orangepi-pc/genimage.cfg +++ /dev/null @@ -1,37 +0,0 @@ -# Minimal SD card image for the OrangePi PC -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h3-orangepi-pc.dtb", - "boot.scr" - } - } - - size = 10M -} - -image sdcard.img { - hdimage { - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - size = 1016K # 1MB - 8KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - size = 512M - } -} diff --git a/buildroot/board/orangepi/orangepi-pc/patches/linux-headers/linux-headers.hash b/buildroot/board/orangepi/orangepi-pc/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/orangepi/orangepi-pc/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/orangepi/orangepi-pc/patches/linux/linux.hash b/buildroot/board/orangepi/orangepi-pc/patches/linux/linux.hash new file mode 100644 index 0000000000..b763fc947a --- /dev/null +++ b/buildroot/board/orangepi/orangepi-pc/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 880ace63ca2291b8b639e9bd862cc828649d3e1e00ccfee5861473debd2e4dec linux-6.1.91.tar.xz diff --git a/buildroot/board/orangepi/orangepi-pc/patches/uboot/uboot.hash b/buildroot/board/orangepi/orangepi-pc/patches/uboot/uboot.hash new file mode 100644 index 0000000000..bc999536af --- /dev/null +++ b/buildroot/board/orangepi/orangepi-pc/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3 u-boot-2024.01.tar.bz2 diff --git a/buildroot/board/orangepi/orangepi-pc2/boot.cmd b/buildroot/board/orangepi/orangepi-pc2/boot.cmd deleted file mode 100644 index 4d4fc7bf67..0000000000 --- a/buildroot/board/orangepi/orangepi-pc2/boot.cmd +++ /dev/null @@ -1,6 +0,0 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r Image -fatload mmc 0 $fdt_addr_r sun50i-h5-orangepi-pc2.dtb - -booti $kernel_addr_r - $fdt_addr_r diff --git a/buildroot/board/orangepi/orangepi-pc2/genimage.cfg b/buildroot/board/orangepi/orangepi-pc2/genimage.cfg deleted file mode 100644 index cc8695c9f1..0000000000 --- a/buildroot/board/orangepi/orangepi-pc2/genimage.cfg +++ /dev/null @@ -1,40 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "sun50i-h5-orangepi-pc2.dtb", - "boot.scr" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - } - - partition spl { - in-partition-table = "no" - image = "sunxi-spl.bin" - offset = 8K - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot.itb" - offset = 40K - size = 1M # 1MB - 40KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/buildroot/board/orangepi/orangepi-pc2/readme.txt b/buildroot/board/orangepi/orangepi-pc2/readme.txt index 1200481952..6c699244ce 100644 --- a/buildroot/board/orangepi/orangepi-pc2/readme.txt +++ b/buildroot/board/orangepi/orangepi-pc2/readme.txt @@ -6,10 +6,10 @@ buildroot environment for the Orangepi PC2. With the current configuration it will bring-up the board, and allow access through the serial console. Orangepi PC2 link: -http://www.orangepi.org/orangepipc2/ +http://www.orangepi.org/html/hardWare/computerAndMicrocontrollers/details/Orange-Pi-PC-2.html -Wiki link: -https://openedev.amarulasolutions.com/display/ODWIKI/Orangepi+PC2 +Sunxi Wiki link: +https://linux-sunxi.org/Xunlong_Orange_Pi_PC_2 This configuration uses U-Boot mainline and kernel mainline. diff --git a/buildroot/board/orangepi/orangepi-plus/boot.cmd b/buildroot/board/orangepi/orangepi-plus/boot.cmd deleted file mode 100644 index 1a378cb918..0000000000 --- a/buildroot/board/orangepi/orangepi-plus/boot.cmd +++ /dev/null @@ -1,8 +0,0 @@ -setenv fdt_high ffffffff - -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-plus.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/buildroot/board/orangepi/orangepi-plus/genimage.cfg b/buildroot/board/orangepi/orangepi-plus/genimage.cfg deleted file mode 100644 index 1ca30258dc..0000000000 --- a/buildroot/board/orangepi/orangepi-plus/genimage.cfg +++ /dev/null @@ -1,36 +0,0 @@ -# Minimal SD card image for the OrangePi Plus\Plus2 -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h3-orangepi-plus.dtb", - "boot.scr" - } - } - - size = 10M -} - -image sdcard.img { - hdimage { - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - size = 1016K # 1MB - 8KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/buildroot/board/orangepi/orangepi-plus/readme.txt b/buildroot/board/orangepi/orangepi-plus/readme.txt deleted file mode 100644 index 7f871bcfab..0000000000 --- a/buildroot/board/orangepi/orangepi-plus/readme.txt +++ /dev/null @@ -1,29 +0,0 @@ -OrangePi Plus/Plus2 - -Intro -===== - -This default configuration will allow you to start experimenting with the -buildroot environment for the OrangePi Plus/Plus2. With the current configuration -it will bring-up the board, and allow access through the serial console. - -How to build it -=============== - -Configure Buildroot: - - $ make orangepi_plus_defconfig - -Compile everything and build the SD card image: - - $ make - -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 diff --git a/buildroot/board/orangepi/orangepi-prime/boot.cmd b/buildroot/board/orangepi/orangepi-prime/boot.cmd deleted file mode 100644 index 34887880d8..0000000000 --- a/buildroot/board/orangepi/orangepi-prime/boot.cmd +++ /dev/null @@ -1,6 +0,0 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r Image -fatload mmc 0 $fdt_addr_r sun50i-h5-orangepi-prime.dtb - -booti $kernel_addr_r - $fdt_addr_r diff --git a/buildroot/board/orangepi/orangepi-prime/genimage.cfg b/buildroot/board/orangepi/orangepi-prime/genimage.cfg deleted file mode 100644 index dde9a6485f..0000000000 --- a/buildroot/board/orangepi/orangepi-prime/genimage.cfg +++ /dev/null @@ -1,40 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "sun50i-h5-orangepi-prime.dtb", - "boot.scr" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - } - - partition spl { - in-partition-table = "no" - image = "sunxi-spl.bin" - offset = 8K - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot.itb" - offset = 40K - size = 1M # 1MB - 40KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/buildroot/board/orangepi/orangepi-prime/readme.txt b/buildroot/board/orangepi/orangepi-prime/readme.txt deleted file mode 100644 index 5811884d4d..0000000000 --- a/buildroot/board/orangepi/orangepi-prime/readme.txt +++ /dev/null @@ -1,37 +0,0 @@ -Intro -===== - -This default configuration will allow you to start experimenting with the -buildroot environment for the Orangepi Prime. With the current configuration -it will bring-up the board, and allow access through the serial console. - -Orangepi Prime link: -http://www.orangepi.org/OrangePiPrime/ - -Wiki link: -https://openedev.amarulasolutions.com/display/ODWIKI/Orangepi+Prime - -This configuration uses U-Boot mainline and kernel mainline. - -How to build -============ - - $ make orangepi_prime_defconfig - $ make - -Note: you will need access to the internet to download the required -sources. - -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 Orangepi Prime and power it up. The console -is on the serial line, 115200 8N1. diff --git a/buildroot/board/orangepi/orangepi-r1/genimage.cfg b/buildroot/board/orangepi/orangepi-r1/genimage.cfg index e93e802bd9..78b69269b7 100644 --- a/buildroot/board/orangepi/orangepi-r1/genimage.cfg +++ b/buildroot/board/orangepi/orangepi-r1/genimage.cfg @@ -28,7 +28,7 @@ image sdcard.img { } partition boot { - partition-type-uuid = "U" + partition-type-uuid = F bootable = "true" image = "boot.vfat" } @@ -36,7 +36,7 @@ image sdcard.img { # 'rootfs' will be used as the partition label, used # with root=PARTLABEL=rootfs kernel command line partition rootfs { - partition-type-uuid = "L" + partition-type-uuid = L image = "rootfs.ext4" size = 512M } diff --git a/buildroot/board/orangepi/orangepi-r1/patches/linux-headers/linux-headers.hash b/buildroot/board/orangepi/orangepi-r1/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/orangepi/orangepi-r1/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/orangepi/orangepi-r1/patches/linux/linux.hash b/buildroot/board/orangepi/orangepi-r1/patches/linux/linux.hash new file mode 100644 index 0000000000..2ec07fd81b --- /dev/null +++ b/buildroot/board/orangepi/orangepi-r1/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 d6ecff966f8c95ec4cb3bb303904f757b7de6a6bcfef0d0771cb852158e61c20 linux-6.6.31.tar.xz diff --git a/buildroot/board/orangepi/orangepi-r1/patches/uboot/uboot.hash b/buildroot/board/orangepi/orangepi-r1/patches/uboot/uboot.hash new file mode 100644 index 0000000000..bc999536af --- /dev/null +++ b/buildroot/board/orangepi/orangepi-r1/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3 u-boot-2024.01.tar.bz2 diff --git a/buildroot/board/orangepi/orangepi-rk3399/extlinux.conf b/buildroot/board/orangepi/orangepi-rk3399/extlinux.conf deleted file mode 100644 index 157c6a715e..0000000000 --- a/buildroot/board/orangepi/orangepi-rk3399/extlinux.conf +++ /dev/null @@ -1,4 +0,0 @@ -label RK3399_ORANGEPI linux - kernel /Image - devicetree /rk3399-orangepi.dtb - append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk1p4 rw rootwait diff --git a/buildroot/board/orangepi/orangepi-rk3399/genimage.cfg b/buildroot/board/orangepi/orangepi-rk3399/genimage.cfg deleted file mode 100644 index a02166172f..0000000000 --- a/buildroot/board/orangepi/orangepi-rk3399/genimage.cfg +++ /dev/null @@ -1,38 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "rk3399-orangepi.dtb", - "extlinux" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - partition-table-type = "gpt" - } - - partition loader1 { - image = "idbloader.img" - offset = 32K - } - - partition loader2 { - image = "u-boot.itb" - offset = 8M - } - - partition boot { - partition-type-uuid = F - bootable = "true" - image = "boot.vfat" - offset = 16M - } - - partition rootfs { - image = "rootfs.ext4" - } -} diff --git a/buildroot/board/orangepi/orangepi-rk3399/post-build.sh b/buildroot/board/orangepi/orangepi-rk3399/post-build.sh deleted file mode 100755 index ba29375c05..0000000000 --- a/buildroot/board/orangepi/orangepi-rk3399/post-build.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" - -install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf diff --git a/buildroot/board/orangepi/orangepi-rk3399/readme.txt b/buildroot/board/orangepi/orangepi-rk3399/readme.txt deleted file mode 100644 index 197e1fb448..0000000000 --- a/buildroot/board/orangepi/orangepi-rk3399/readme.txt +++ /dev/null @@ -1,56 +0,0 @@ -Orangepi Rk3399 -================ -http://www.orangepi.org/Orange%20Pi%20RK3399/ - -Build: -====== - $ make orangepi_rk3399_defconfig - $ make - -Files created in output directory -================================= - -output/images - -├── bl31.elf -├── boot.vfat -├── extlinux -├── idbloader.img -├── Image -├── rk3399-orangepi.dtb -├── rootfs.ext2 -├── rootfs.ext4 -> rootfs.ext2 -├── rootfs.tar -├── sdcard.img -├── u-boot.bin -└── u-boot.itb - -Creating bootable SD card: -========================== - -Simply invoke (as root) - -sudo dd if=output/images/sdcard.img of=/dev/sdX && sync - -Where X is your SD card device. - -Booting: -======== -Orangepi-RK3399 by default boots from emmc. For SD card boot to -happen, emmc should be empty. If emmc happens to have any bootable -image then erase emmc so that bootrom will look for a proper image in SD. - -emmc can be erased once after booted into linux as shown in below link. - -https://wiki.amarulasolutions.com/bsp/setup/rockchip/rk3399_emmc.html - -Serial console: ---------------- - -Baudrate for this board is 1500000. - -Login: ------- -Enter 'root' as login user, and the prompt is ready. - -https://wiki.amarulasolutions.com/bsp/rockchip/rk3399/orangepi.html diff --git a/buildroot/board/orangepi/orangepi-win/boot.cmd b/buildroot/board/orangepi/orangepi-win/boot.cmd deleted file mode 100644 index 2ddb769d6d..0000000000 --- a/buildroot/board/orangepi/orangepi-win/boot.cmd +++ /dev/null @@ -1,6 +0,0 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r Image -fatload mmc 0 $fdt_addr_r sun50i-a64-orangepi-win.dtb - -booti $kernel_addr_r - $fdt_addr_r diff --git a/buildroot/board/orangepi/orangepi-win/genimage.cfg b/buildroot/board/orangepi/orangepi-win/genimage.cfg deleted file mode 100644 index 98fd1a033d..0000000000 --- a/buildroot/board/orangepi/orangepi-win/genimage.cfg +++ /dev/null @@ -1,40 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "sun50i-a64-orangepi-win.dtb", - "boot.scr" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - } - - partition spl { - in-partition-table = "no" - image = "sunxi-spl.bin" - offset = 8K - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot.itb" - offset = 40K - size = 1M # 1MB - 40KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/buildroot/board/orangepi/orangepi-win/readme.txt b/buildroot/board/orangepi/orangepi-win/readme.txt deleted file mode 100644 index 93adddd86b..0000000000 --- a/buildroot/board/orangepi/orangepi-win/readme.txt +++ /dev/null @@ -1,37 +0,0 @@ -Intro -===== - -This default configuration will allow you to start experimenting with the -buildroot environment for the Orangepi Win/Win Plus. With the current configuration -it will bring-up the board, and allow access through the serial console. - -Orangepi Win/Win Plus link: -http://www.orangepi.org/OrangePiWin_WinPlus/ - -Wiki link: -https://openedev.amarulasolutions.com/display/ODWIKI/Orangepi+Win - -This configuration uses U-Boot mainline and kernel mainline. - -How to build -============ - - $ make orangepi_win_defconfig - $ make - -Note: you will need access to the internet to download the required -sources. - -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 Orangepi Win/Win Plus and power it up. The console -is on the serial line, 115200 8N1. diff --git a/buildroot/board/orangepi/orangepi-zero-plus/boot.cmd b/buildroot/board/orangepi/orangepi-zero-plus/boot.cmd deleted file mode 100644 index 18c4d521af..0000000000 --- a/buildroot/board/orangepi/orangepi-zero-plus/boot.cmd +++ /dev/null @@ -1,6 +0,0 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r Image -fatload mmc 0 $fdt_addr_r sun50i-h5-orangepi-zero-plus.dtb - -booti $kernel_addr_r - $fdt_addr_r diff --git a/buildroot/board/orangepi/orangepi-zero-plus/genimage.cfg b/buildroot/board/orangepi/orangepi-zero-plus/genimage.cfg deleted file mode 100644 index a8f3161c39..0000000000 --- a/buildroot/board/orangepi/orangepi-zero-plus/genimage.cfg +++ /dev/null @@ -1,40 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "sun50i-h5-orangepi-zero-plus.dtb", - "boot.scr" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - } - - partition spl { - in-partition-table = "no" - image = "sunxi-spl.bin" - offset = 8K - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot.itb" - offset = 40K - size = 1M # 1MB - 40KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/buildroot/board/orangepi/orangepi-zero-plus/readme.txt b/buildroot/board/orangepi/orangepi-zero-plus/readme.txt index 5556eae890..1e60e0f825 100644 --- a/buildroot/board/orangepi/orangepi-zero-plus/readme.txt +++ b/buildroot/board/orangepi/orangepi-zero-plus/readme.txt @@ -6,7 +6,7 @@ buildroot environment for the Orangepi Zero Plus. With the current configuration it will bring-up the board, and allow access through the serial console. Orangepi Zero Plus link: -http://www.orangepi.org/OrangePiZeroPlus/ +http://www.orangepi.org/html/hardWare/computerAndMicrocontrollers/details/Orange-Pi-Zero-Plus.html This configuration uses U-Boot mainline and kernel mainline. diff --git a/buildroot/board/orangepi/orangepi-zero-plus2/boot.cmd b/buildroot/board/orangepi/orangepi-zero-plus2/boot.cmd deleted file mode 100644 index aa5162004b..0000000000 --- a/buildroot/board/orangepi/orangepi-zero-plus2/boot.cmd +++ /dev/null @@ -1,6 +0,0 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=PARTLABEL=rootfs rootwait - -fatload mmc 0 $kernel_addr_r Image -fatload mmc 0 $fdt_addr_r sun50i-h5-orangepi-zero-plus2.dtb - -booti $kernel_addr_r - $fdt_addr_r diff --git a/buildroot/board/orangepi/orangepi-zero-plus2/genimage.cfg b/buildroot/board/orangepi/orangepi-zero-plus2/genimage.cfg deleted file mode 100644 index 5a7ee7707a..0000000000 --- a/buildroot/board/orangepi/orangepi-zero-plus2/genimage.cfg +++ /dev/null @@ -1,41 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "sun50i-h5-orangepi-zero-plus2.dtb", - "boot.scr" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - # for root=PARTLABEL support - partition-table-type = "gpt" - # default GPT location conflicts with bootloaders, move it after - gpt-location = 1M - } - - partition spl { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - size = 1016K # 1MB - 8KB - } - - partition boot { - partition-type-uuid = "F" - bootable = "true" - image = "boot.vfat" - } - - # 'rootfs' will be used as the partition label, used - # with root=PARTLABEL=rootfs kernel command line - partition rootfs { - partition-type-uuid = "L" - image = "rootfs.ext4" - size = 256M - } -} diff --git a/buildroot/board/orangepi/orangepi-zero-plus2/readme.txt b/buildroot/board/orangepi/orangepi-zero-plus2/readme.txt index 322ba0e12a..2df6dd9b11 100644 --- a/buildroot/board/orangepi/orangepi-zero-plus2/readme.txt +++ b/buildroot/board/orangepi/orangepi-zero-plus2/readme.txt @@ -6,7 +6,7 @@ buildroot environment for the Orangepi Zero Plus2. With the current configuratio it will bring-up the board, and allow access through the serial console. Orangepi Zero Plus2 link: -http://www.orangepi.org/OrangePiZeroPlus2/ +http://www.orangepi.org/html/hardWare/computerAndMicrocontrollers/details/Orange-Pi-Zero-Plus-2.html Wiki link: https://openedev.amarulasolutions.com/display/ODWIKI/Orangepi+Zero+Plus2 diff --git a/buildroot/board/orangepi/orangepi-zero/patches/linux/0001-ARM-dts-orange-pi-zero-interrupt-triggering-xr819.patch b/buildroot/board/orangepi/orangepi-zero/patches/linux/0001-ARM-dts-orange-pi-zero-interrupt-triggering-xr819.patch index 16207afcb1..6a5aa0bb63 100644 --- a/buildroot/board/orangepi/orangepi-zero/patches/linux/0001-ARM-dts-orange-pi-zero-interrupt-triggering-xr819.patch +++ b/buildroot/board/orangepi/orangepi-zero/patches/linux/0001-ARM-dts-orange-pi-zero-interrupt-triggering-xr819.patch @@ -13,13 +13,13 @@ This commit specifies XR819 interrupt configuration for the driver. Signed-off-by: Sergey Matyukevich --- - arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 3 +++ + arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts +diff --git a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts index b7ca916d871d..4e1a9050c6b4 100644 ---- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts -+++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts +--- a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts ++++ b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts @@ -125,6 +125,9 @@ */ xr819: sdio_wifi@1 { diff --git a/buildroot/board/orangepi/orangepi-zero/patches/linux/0002-ARM-dts-orange-pi-zero-enable-spi-nor.patch b/buildroot/board/orangepi/orangepi-zero/patches/linux/0002-ARM-dts-orange-pi-zero-enable-spi-nor.patch index e4c52ab911..ff350d68b4 100644 --- a/buildroot/board/orangepi/orangepi-zero/patches/linux/0002-ARM-dts-orange-pi-zero-enable-spi-nor.patch +++ b/buildroot/board/orangepi/orangepi-zero/patches/linux/0002-ARM-dts-orange-pi-zero-enable-spi-nor.patch @@ -1,4 +1,4 @@ -From 068c3baff3048a3db4ef2518ff917ce749cd8169 Mon Sep 17 00:00:00 2001 +From ddc295a04269437e5c726f63239689786354d44b Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Sat, 20 May 2017 11:24:26 +0300 Subject: [PATCH] ARM: dts: orange-pi-zero: enable SPI NOR @@ -9,34 +9,37 @@ For more information see: - http://linux-sunxi.org/Orange_Pi_Zero#SPI_NOR_flash Signed-off-by: Sergey Matyukevich +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- - arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) + .../boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) -diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts -index 4e1a9050c6b4..cdf19821b1f3 100644 ---- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts -+++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts -@@ -161,3 +161,19 @@ - /* USB VBUS is always on */ - status = "okay"; - }; -+ -+&spi0 { +diff --git a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts +index 6b74cc923e16..4012f8712cd7 100644 +--- a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts ++++ b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts +@@ -167,14 +167,18 @@ &ohci1 { + + &spi0 { + /* Disable SPI NOR by default: it optional on Orange Pi Zero boards */ +- status = "disabled"; + status = "okay"; -+ -+ flash@0 { -+ #address-cells = <1>; -+ #size-cells = <1>; + + flash@0 { + #address-cells = <1>; + #size-cells = <1>; +- compatible = "mxicy,mx25l1606e", "jedec,spi-nor"; + compatible = "mxicy,mx25l1606e", "winbond,w25q128"; -+ reg = <0>; -+ spi-max-frequency = <40000000>; + reg = <0>; + spi-max-frequency = <40000000>; + + partition@00000000 { + reg = <0x00000000 0x200000>; /* 2Mb */ + }; -+ }; -+}; + }; + }; + -- -2.11.0 +2.43.0 diff --git a/buildroot/board/orangepi/orangepi-zero/patches/linux/0003-ARM-dts-orange-pi-zero-enable-spidev.patch b/buildroot/board/orangepi/orangepi-zero/patches/linux/0003-ARM-dts-orange-pi-zero-enable-spidev.patch index ae0ed9ba3b..61dc97fd8b 100644 --- a/buildroot/board/orangepi/orangepi-zero/patches/linux/0003-ARM-dts-orange-pi-zero-enable-spidev.patch +++ b/buildroot/board/orangepi/orangepi-zero/patches/linux/0003-ARM-dts-orange-pi-zero-enable-spidev.patch @@ -1,4 +1,4 @@ -From 8dd1b2a696bb7e9914abd11cc6f5c0f54c33d626 Mon Sep 17 00:00:00 2001 +From 208b13119fc0f709935fc2fc13c0295b19edbbf5 Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Sat, 20 May 2017 15:36:51 +0300 Subject: [PATCH] ARM: dts: orange-pi-zero: enable spidev @@ -7,27 +7,28 @@ On orange-pi-zero board SPI1 pins are accessible via GPIO expansion port. This patch enables spidev driver for SPI1. Signed-off-by: Sergey Matyukevich +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- - arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 11 +++++++++++ + .../dts/allwinner/sun8i-h2-plus-orangepi-zero.dts | 11 +++++++++++ 1 file changed, 11 insertions(+) -diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts -index cdf19821b1f3..7242aaecb14f 100644 ---- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts -+++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts -@@ -59,6 +59,7 @@ - serial0 = &uart0; +diff --git a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts +index 4012f8712cd7..3552eb312747 100644 +--- a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts ++++ b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts +@@ -59,6 +59,7 @@ aliases { /* ethernet0 is the H3 emac, defined in sun8i-h3.dtsi */ + ethernet0 = &emac; ethernet1 = &xr819; + spi1 = &spi1; }; chosen { -@@ -177,3 +178,13 @@ - }; +@@ -182,6 +183,16 @@ partition@00000000 { }; }; -+ + +&spi1 { + status = "okay"; + @@ -37,6 +38,10 @@ index cdf19821b1f3..7242aaecb14f 100644 + spi-max-frequency = <10000000>; + }; +}; ++ + &uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_pa_pins>; -- -2.11.0 +2.43.0 diff --git a/buildroot/board/orangepi/orangepi-zero/patches/linux/0004-ARM-dts-orange-pi-zero-enable-uart.patch b/buildroot/board/orangepi/orangepi-zero/patches/linux/0004-ARM-dts-orange-pi-zero-enable-uart.patch index 839bc16087..41c23209ce 100644 --- a/buildroot/board/orangepi/orangepi-zero/patches/linux/0004-ARM-dts-orange-pi-zero-enable-uart.patch +++ b/buildroot/board/orangepi/orangepi-zero/patches/linux/0004-ARM-dts-orange-pi-zero-enable-uart.patch @@ -7,13 +7,13 @@ Enable uart1 and uart2 on orange-pi-zero board. Signed-off-by: Sergey Kuzminov --- - arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 4 ++-- + arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts +diff --git a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts index f19ed981da9d..03acf166ab70 100644 ---- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts -+++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts +--- a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts ++++ b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts @@ -184,13 +184,13 @@ &uart0 { &uart1 { pinctrl-names = "default"; diff --git a/buildroot/board/orangepi/orangepi-zero2w/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/buildroot/board/orangepi/orangepi-zero2w/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 0000000000..8b3df439a0 --- /dev/null +++ b/buildroot/board/orangepi/orangepi-zero2w/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally computed: +sha256 7efa89e1b4e4106ee05d68e876c8efbb146364d89cfd5d26bf4647b09c08f32b arm-trusted-firmware-v2.10-git4.tar.gz diff --git a/buildroot/board/orangepi/orangepi-zero2w/patches/linux-headers/linux-headers.hash b/buildroot/board/orangepi/orangepi-zero2w/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/orangepi/orangepi-zero2w/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/orangepi/orangepi-zero2w/patches/linux/linux.hash b/buildroot/board/orangepi/orangepi-zero2w/patches/linux/linux.hash new file mode 100644 index 0000000000..5a6f308c7b --- /dev/null +++ b/buildroot/board/orangepi/orangepi-zero2w/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 9e723232d603ab45ebf043c34714c48f277ab195c29abcb8472f2a4c3a5a1995 linux-6.8.6.tar.xz diff --git a/buildroot/board/orangepi/orangepi-zero2w/patches/uboot/uboot.hash b/buildroot/board/orangepi/orangepi-zero2w/patches/uboot/uboot.hash new file mode 100644 index 0000000000..97a2b4eaf9 --- /dev/null +++ b/buildroot/board/orangepi/orangepi-zero2w/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a u-boot-2024.04.tar.bz2 diff --git a/buildroot/board/orangepi/orangepi-zero2w/readme.txt b/buildroot/board/orangepi/orangepi-zero2w/readme.txt new file mode 100644 index 0000000000..84796579da --- /dev/null +++ b/buildroot/board/orangepi/orangepi-zero2w/readme.txt @@ -0,0 +1,32 @@ +Intro +===== + +This default configuration will allow you to start experimenting with the +buildroot environment for the OrangePi Zero2W. Current configuration will +bring-up the board and allow access through the serial console. + +Orangepi Zero 2W links: +- http://www.orangepi.org/html/hardWare/computerAndMicrocontrollers/details/Orange-Pi-Zero-2W.html +- https://linux-sunxi.org/Xunlong_Orange_Pi_Zero2W + +How to build +============ + + $ make orangepi_zero2w_defconfig + $ make + +Note: you will need access to the internet to download the required sources. + +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 Orangepi Zero2W and power it up. The console +is on the serial line, 115200 8N1. diff --git a/buildroot/board/orangepi/orangepi-zero3/readme.txt b/buildroot/board/orangepi/orangepi-zero3/readme.txt new file mode 100644 index 0000000000..4872a363e7 --- /dev/null +++ b/buildroot/board/orangepi/orangepi-zero3/readme.txt @@ -0,0 +1,34 @@ +Intro +===== + +This default configuration will allow you to start experimenting with the +buildroot environment for the Orangepi Zero3. With the current configuration +it will bring-up the board, and allow access through the serial console. + +Orangepi Zero3 link: +http://www.orangepi.org/html/hardWare/computerAndMicrocontrollers/details/Orange-Pi-Zero-3.html + +This configuration uses Orangepi's fork of U-Boot and Linux kernel. + +How to build +============ + + $ make orangepi_zero3_defconfig + $ make + +Note: you will need access to the internet to download the required +sources. + +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 Orangepi Zero3 and power it up. The console +is on the serial line, 115200 8N1. diff --git a/buildroot/board/pandaboard/genimage.cfg b/buildroot/board/pandaboard/genimage.cfg deleted file mode 100644 index dfe388227e..0000000000 --- a/buildroot/board/pandaboard/genimage.cfg +++ /dev/null @@ -1,27 +0,0 @@ -image boot.vfat { - vfat { - files = { - "MLO", - "u-boot.img" - } - } - - size = 8M -} - -image sdcard.img { - hdimage { - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - size = 512M - } -} diff --git a/buildroot/board/pandaboard/readme.txt b/buildroot/board/pandaboard/readme.txt deleted file mode 100644 index 80a20c2743..0000000000 --- a/buildroot/board/pandaboard/readme.txt +++ /dev/null @@ -1,46 +0,0 @@ -Pandaboard -========== - -This file documents the Buildroot support for the Pandaboard, a -low-power, low-cost single-board computer development platform based -on the Texas Instruments OMAP4 system on a chip (SoC). - -Configuring and building Buildroot ----------------------------------- - -Start from the defconfig: - - $ make pandaboard_defconfig - -You can edit build options the usual way: - - $ make menuconfig - -When you are happy with the setup, run: - - $ make - -The result of the build with the default settings should be these files: - - output/images - +-- MLO - +-- omap4-panda-a4.dtb - +-- omap4-panda.dtb - +-- omap4-panda-es.dtb - +-- rootfs.ext4 - +-- sdcard.img - +-- u-boot.img - +-- zImage - -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 - -Where /dev/sdX is the device node of your SD card (may be /dev/mmcblkX -instead depending on setup). diff --git a/buildroot/board/pc/genimage-efi.cfg b/buildroot/board/pc/genimage-efi.cfg index 035a077a78..c231e1b9b2 100644 --- a/buildroot/board/pc/genimage-efi.cfg +++ b/buildroot/board/pc/genimage-efi.cfg @@ -19,7 +19,7 @@ image disk.img { partition boot { image = "efi-part.vfat" - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + partition-type-uuid = U offset = 32K bootable = true } diff --git a/buildroot/board/pc/linux.config b/buildroot/board/pc/linux.config index f86352e1ea..43b15c94be 100644 --- a/buildroot/board/pc/linux.config +++ b/buildroot/board/pc/linux.config @@ -15,6 +15,7 @@ CONFIG_IP_NF_FILTER=y CONFIG_CFG80211=m CONFIG_CFG80211_WEXT=y CONFIG_MAC80211=m +CONFIG_PCI=y CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_VIRTIO_BLK=y @@ -63,7 +64,10 @@ CONFIG_DRM_I915=y CONFIG_DRM_QXL=y CONFIG_DRM_BOCHS=y CONFIG_DRM_VIRTIO_GPU=y +CONFIG_FB=y +CONFIG_FIRMWARE_EDID=y CONFIG_FB_VESA=y +CONFIG_FB_EFI=y CONFIG_SOUND=y CONFIG_SND=y CONFIG_SND_HDA_INTEL=y diff --git a/buildroot/board/pc/readme.txt b/buildroot/board/pc/readme.txt index 41aec50d36..99e8f442ea 100644 --- a/buildroot/board/pc/readme.txt +++ b/buildroot/board/pc/readme.txt @@ -42,8 +42,8 @@ Emulation in qemu (BIOS) 1. Edit grub-bios.cfg Since the driver will show up in the virtual machine as /dev/vda, - change board/pc/grub-bios.cfg to use root=/dev/vda2 instead of - root=/dev/sda2. Then rebuild grub2 and the image. + change board/pc/grub-bios.cfg to use root=/dev/vda1 instead of + root=/dev/sda1. Then rebuild grub2 and the image. 2. Run the emulation with: diff --git a/buildroot/board/pine64/pine64/genimage.cfg b/buildroot/board/pine64/pine64/genimage.cfg index 06b4ed1056..bd026c33c6 100644 --- a/buildroot/board/pine64/pine64/genimage.cfg +++ b/buildroot/board/pine64/pine64/genimage.cfg @@ -14,23 +14,17 @@ image sdcard.img { hdimage { } - partition spl { - in-partition-table = "no" - image = "sunxi-spl.bin" - offset = 8K - } - partition u-boot { in-partition-table = "no" - image = "u-boot.itb" - offset = 40K - size = 1M # 1MB - 40KB + image = "u-boot-sunxi-with-spl.bin" + offset = 8K } partition boot { partition-type = 0xC bootable = "true" image = "boot.vfat" + offset = 1M } partition rootfs { diff --git a/buildroot/board/pine64/pinecube/extlinux.conf b/buildroot/board/pine64/pinecube/extlinux.conf new file mode 100644 index 0000000000..6a18d9a2cb --- /dev/null +++ b/buildroot/board/pine64/pinecube/extlinux.conf @@ -0,0 +1,4 @@ +label buildroot + kernel /zImage + devicetree /sun8i-s3-pinecube.dtb + append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait rw diff --git a/buildroot/board/pine64/pinecube/genimage.cfg b/buildroot/board/pine64/pinecube/genimage.cfg new file mode 100644 index 0000000000..398d45e2f7 --- /dev/null +++ b/buildroot/board/pine64/pinecube/genimage.cfg @@ -0,0 +1,34 @@ +image boot.vfat { + vfat { + files = { + "zImage", + "sun8i-s3-pinecube.dtb", + "extlinux" + } + } + + size = 8M +} + +image sdcard.img { + hdimage { + } + + partition u-boot { + in-partition-table = "no" + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + size = 504K # 512KB - 8KB + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/buildroot/board/pine64/pinecube/post-build.sh b/buildroot/board/pine64/pinecube/post-build.sh new file mode 100755 index 0000000000..8dae08a47c --- /dev/null +++ b/buildroot/board/pine64/pinecube/post-build.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +BOARD_DIR="$(dirname "$0")" + +install -m 0644 -D "$BOARD_DIR"/extlinux.conf "$BINARIES_DIR"/extlinux/extlinux.conf diff --git a/buildroot/board/pine64/pinecube/readme.txt b/buildroot/board/pine64/pinecube/readme.txt new file mode 100644 index 0000000000..4cf6df2110 --- /dev/null +++ b/buildroot/board/pine64/pinecube/readme.txt @@ -0,0 +1,31 @@ +Intro +===== + +This directory contains a Buildroot configuration for building a +Pine64 PineCube. + +Board homepage: https://www.pine64.org/cube/ +Board wiki: https://wiki.pine64.org/wiki/PineCube + +How to build it +=============== + + $ make pine64_pinecube_defconfig + $ make + +Note: you will need access to the internet to download the required +sources. + +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 PineCube and power it up. The console +is on the serial port 2, 115200 8N1 (check Wiki for board pinout). diff --git a/buildroot/board/pine64/rock64/patches/uboot/0001-Makefile-rk3328-needs-itb-image-to-boot-properly.patch b/buildroot/board/pine64/rock64/patches/uboot/0001-Makefile-rk3328-needs-itb-image-to-boot-properly.patch index 2d35b78daa..7c84736034 100644 --- a/buildroot/board/pine64/rock64/patches/uboot/0001-Makefile-rk3328-needs-itb-image-to-boot-properly.patch +++ b/buildroot/board/pine64/rock64/patches/uboot/0001-Makefile-rk3328-needs-itb-image-to-boot-properly.patch @@ -1,4 +1,4 @@ -From 211bf049084e6e374dac253138fa813682910146 Mon Sep 17 00:00:00 2001 +From d312c4e40bf816823bdcfd066dd2511b23e83c9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20=C5=81yszczek?= Date: Tue, 5 Feb 2019 22:08:54 +0100 Subject: [PATCH] Makefile: rk3328 needs itb image to boot properly @@ -7,16 +7,18 @@ Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Łyszczek +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Makefile b/Makefile -index 8086f3c93e..a6425b5b03 100644 +index 149f83994814..ebbdf2596b9b 100644 --- a/Makefile +++ b/Makefile -@@ -799,6 +799,11 @@ ifneq ($(BUILD_ROM),) - ALL-$(CONFIG_X86_RESET_VECTOR) += u-boot.rom +@@ -923,6 +923,11 @@ ifeq ($(CONFIG_SYS_COREBOOT)$(CONFIG_SPL),yy) + ALL-$(CONFIG_BINMAN) += u-boot-x86-with-spl.bin endif +# rk3328 needs itb image to boot properly @@ -24,9 +26,9 @@ index 8086f3c93e..a6425b5b03 100644 +ALL-y += u-boot.itb +endif + - # enable combined SPL/u-boot/dtb rules for tegra - ifeq ($(CONFIG_TEGRA)$(CONFIG_SPL),yy) - ALL-y += u-boot-tegra.bin u-boot-nodtb-tegra.bin + # Build a combined spl + u-boot image for sunxi + ifeq ($(CONFIG_ARCH_SUNXI)$(CONFIG_SPL),yy) + ALL-y += u-boot-sunxi-with-spl.bin -- -2.18.1 +2.43.0 diff --git a/buildroot/board/pine64/rockpro64/extlinux.conf b/buildroot/board/pine64/rockpro64/extlinux.conf index ea081a1f0b..83467ef43c 100644 --- a/buildroot/board/pine64/rockpro64/extlinux.conf +++ b/buildroot/board/pine64/rockpro64/extlinux.conf @@ -1,4 +1,4 @@ label RK3399_ROCKPRO64 linux kernel /Image devicetree /rk3399-rockpro64.dtb - append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk0p4 rw rootwait + append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk1p4 rw rootwait diff --git a/buildroot/board/pine64/rockpro64/genimage.cfg b/buildroot/board/pine64/rockpro64/genimage.cfg index d3926f2df6..94fa2f7c06 100644 --- a/buildroot/board/pine64/rockpro64/genimage.cfg +++ b/buildroot/board/pine64/rockpro64/genimage.cfg @@ -26,7 +26,7 @@ image sdcard.img { } partition boot { - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + partition-type-uuid = F bootable = "true" image = "boot.vfat" offset = 16M diff --git a/buildroot/board/pine64/rockpro64/linux.fragment b/buildroot/board/pine64/rockpro64/linux.fragment new file mode 100644 index 0000000000..ed7dfd3d3e --- /dev/null +++ b/buildroot/board/pine64/rockpro64/linux.fragment @@ -0,0 +1,3 @@ +CONFIG_STMMAC_ETH=y +CONFIG_STMMAC_PLATFORM=y +CONFIG_DWMAC_ROCKCHIP=y diff --git a/buildroot/board/pine64/rockpro64/patches/linux-headers/linux-headers.hash b/buildroot/board/pine64/rockpro64/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/pine64/rockpro64/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/pine64/rockpro64/patches/linux/linux.hash b/buildroot/board/pine64/rockpro64/patches/linux/linux.hash new file mode 100644 index 0000000000..396c18dd5c --- /dev/null +++ b/buildroot/board/pine64/rockpro64/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://cdn.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 55e5bcbc68d66776fc46896291f0a24844beb57817345a854d65e3d055fa423e linux-6.10.14.tar.xz diff --git a/buildroot/board/pine64/rockpro64/patches/uboot/uboot.hash b/buildroot/board/pine64/rockpro64/patches/uboot/uboot.hash new file mode 100644 index 0000000000..904fa56c02 --- /dev/null +++ b/buildroot/board/pine64/rockpro64/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0 u-boot-2024.10.tar.bz2 diff --git a/buildroot/board/pine64/rockpro64/post-build.sh b/buildroot/board/pine64/rockpro64/post-build.sh index ba29375c05..e947745488 100755 --- a/buildroot/board/pine64/rockpro64/post-build.sh +++ b/buildroot/board/pine64/rockpro64/post-build.sh @@ -1,5 +1,5 @@ #!/bin/sh -BOARD_DIR="$(dirname $0)" +BOARD_DIR=$(dirname "$0") -install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf +install -m 0644 -D "$BOARD_DIR/extlinux.conf" "$BINARIES_DIR/extlinux/extlinux.conf" diff --git a/buildroot/board/pine64/star64/genimage.cfg b/buildroot/board/pine64/star64/genimage.cfg new file mode 100644 index 0000000000..74940016f4 --- /dev/null +++ b/buildroot/board/pine64/star64/genimage.cfg @@ -0,0 +1,24 @@ +# SD card image for the Pine64 Star64 board + +image sdcard.img { + hdimage { + partition-table-type = "gpt" + } + + partition spl { + image = "u-boot-spl.bin.normal.out" + partition-type-uuid = 2E54B353-1271-4842-806F-E436D6AF6985 + offset = 2M + } + + partition uboot { + image = "opensbi_uboot_payload.img" + partition-type-uuid = 5B193300-FC78-40CD-8002-E86C45580B47 + offset = 4M + } + + partition rootfs { + image = "rootfs.ext4" + bootable = true + } +} diff --git a/buildroot/board/pine64/star64/overlay/boot/extlinux/extlinux.conf b/buildroot/board/pine64/star64/overlay/boot/extlinux/extlinux.conf new file mode 100644 index 0000000000..db7cfb7b8b --- /dev/null +++ b/buildroot/board/pine64/star64/overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label star64 + kernel /boot/Image + devicetree /boot/jh7110-pine64-star64.dtb + append root=/dev/mmcblk1p3 earlycon=sbi diff --git a/buildroot/board/pine64/star64/post-build.sh b/buildroot/board/pine64/star64/post-build.sh new file mode 100755 index 0000000000..ed0a6ebd52 --- /dev/null +++ b/buildroot/board/pine64/star64/post-build.sh @@ -0,0 +1,9 @@ +#!/bin/bash +BOARD_DIR="$CONFIG_DIR"/board/pine64/star64 + +# Add header to the SPL +"$HOST_DIR"/bin/spl_tool -c -f "$BINARIES_DIR"/u-boot-spl.bin + +# Create the u-boot FIT image +cp "$BOARD_DIR"/star64-uboot-fit-image.its "$BINARIES_DIR" +mkimage -f "$BINARIES_DIR"/star64-uboot-fit-image.its -A riscv -O u-boot -T firmware "$BINARIES_DIR"/opensbi_uboot_payload.img diff --git a/buildroot/board/pine64/star64/readme.txt b/buildroot/board/pine64/star64/readme.txt new file mode 100644 index 0000000000..5e6ce25108 --- /dev/null +++ b/buildroot/board/pine64/star64/readme.txt @@ -0,0 +1,32 @@ +Pine64 Star64 +============= + +The Star64 is a low-cost RISC-V 64-bit based platform, powered by a +Starfive JH7110 processor. + +https://wiki.pine64.org/wiki/STAR64 + +How to build +============ + +$ make pine64_star64_defconfig +$ make + +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 conv=fdatasync + +Preparing the board +=================== + +Connect a TTL UART cable to pin 6 (GND), 8 (TX) and 10 (RX). + +Insert your SD card. + +Power-up the board using a 12V power supply. diff --git a/buildroot/board/pine64/star64/star64-uboot-fit-image.its b/buildroot/board/pine64/star64/star64-uboot-fit-image.its new file mode 100644 index 0000000000..08f603163a --- /dev/null +++ b/buildroot/board/pine64/star64/star64-uboot-fit-image.its @@ -0,0 +1,29 @@ +/dts-v1/; + +/ { + description = "U-boot-spl FIT image for JH7110 Pine64 Star64"; + #address-cells = <2>; + + images { + firmware { + description = "u-boot"; + data = /incbin/("fw_payload.bin"); + type = "firmware"; + arch = "riscv"; + os = "u-boot"; + load = <0x0 0x40000000>; + entry = <0x0 0x40000000>; + compression = "none"; + }; + }; + + configurations { + default = "config-1"; + + config-1 { + description = "U-boot-spl FIT config for JH7110 Pine64 Star64"; + firmware = "firmware"; + }; + }; +}; + diff --git a/buildroot/board/qemu/aarch64-ebbr/genimage.cfg b/buildroot/board/qemu/aarch64-ebbr/genimage.cfg new file mode 100644 index 0000000000..1ca8332b9c --- /dev/null +++ b/buildroot/board/qemu/aarch64-ebbr/genimage.cfg @@ -0,0 +1,31 @@ +image efi-part.vfat { + vfat { + file EFI { + image = "efi-part/EFI" + } + + file Image { + image = "Image" + } + } + + size = 128M +} + +image disk.img { + hdimage { + partition-table-type = "gpt" + } + + partition boot { + image = "efi-part.vfat" + partition-type-uuid = U + offset = 32K + bootable = true + } + + partition root { + partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae + image = "rootfs.ext2" + } +} diff --git a/buildroot/board/qemu/aarch64-ebbr/grub.cfg b/buildroot/board/qemu/aarch64-ebbr/grub.cfg new file mode 100644 index 0000000000..d99e19c4cd --- /dev/null +++ b/buildroot/board/qemu/aarch64-ebbr/grub.cfg @@ -0,0 +1,6 @@ +set default="0" +set timeout="5" + +menuentry "Buildroot" { + linux /Image root=PARTLABEL=root rootwait +} diff --git a/buildroot/board/qemu/aarch64-ebbr/post-image.sh b/buildroot/board/qemu/aarch64-ebbr/post-image.sh new file mode 100755 index 0000000000..c884a8b6f6 --- /dev/null +++ b/buildroot/board/qemu/aarch64-ebbr/post-image.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -eu + +BOARD_DIR=$(dirname "$0") + +# Create flash.bin TF-A FIP image from bl1.bin and fip.bin +dd if="${BINARIES_DIR}/bl1.bin" of="${BINARIES_DIR}/flash.bin" bs=1M +dd if="${BINARIES_DIR}/fip.bin" of="${BINARIES_DIR}/flash.bin" seek=64 bs=4096 conv=notrunc + +# Override the default GRUB configuration file with our own. +cp -f "${BOARD_DIR}/grub.cfg" "${BINARIES_DIR}/efi-part/EFI/BOOT/grub.cfg" diff --git a/buildroot/board/qemu/aarch64-ebbr/readme.txt b/buildroot/board/qemu/aarch64-ebbr/readme.txt new file mode 100644 index 0000000000..15353a8f68 --- /dev/null +++ b/buildroot/board/qemu/aarch64-ebbr/readme.txt @@ -0,0 +1,101 @@ +Introduction +============ + +The qemu_aarch64_ebbr_defconfig is meant to illustrate some aspects of the Arm +EBBR specification[1] and the Arm SystemReady IR[2] compliance program. +It allows building an AArch64 U-Boot based firmware implementing the subset of +UEFI defined by EBBR, as well as a Linux OS disk image booting with UEFI, to run +on Qemu. + +Building +======== + + $ make qemu_aarch64_ebbr_defconfig + $ make + +Generated files under output/images: + +* flash.bin: A firmware image comprising TF-A, OP-TEE and the U-Boot bootloader. + +* disk.img: An OS disk image comprising the GRUB bootloader, the Linux kernel + and the root filesystem. + +Running under Qemu +================== + +Run the emulation with: + + qemu-system-aarch64 \ + -M virt,secure=on,acpi=off \ + -bios output/images/flash.bin \ + -cpu cortex-a53 \ + -device virtio-blk-device,drive=hd0 \ + -device virtio-net-device,netdev=eth0 \ + -device virtio-rng-device,rng=rng0 \ + -drive file=output/images/disk.img,if=none,format=raw,id=hd0 \ + -m 2048 \ + -netdev user,id=eth0 \ + -nographic \ + -object rng-random,filename=/dev/urandom,id=rng0 \ + -rtc base=utc,clock=host \ + -smp 2 # qemu_aarch64_ebbr_defconfig + +The login prompt will appear in the terminal that started Qemu. + +Using the EBBR firmware to run another OS under Qemu +---------------------------------------------------- + +It is possible to use the generated firmware binary to install or run another OS +supporting the EBBR specification. + +To run another OS on emulation using a live or pre-installed image, use the same +Qemu command line as for the generated OS but adapt the OS image path in the +-drive stanza. +The image generated by the aarch64_efi_defconfig or the Arm ACS-IR images[3] are +examples of pre-installed OS images. + +To install another OS using an installer iso image, prepare a destination disk +image first with: + + qemu-img create -f qcow2 disk.qcow2 10G + +Then run the OS installer iso image on emulation with: + + qemu-system-aarch64 \ + -M virt,secure=on,acpi=off \ + -bios output/images/flash.bin \ + -cpu cortex-a53 \ + -device virtio-blk-device,drive=hd1 \ + -device virtio-blk-device,drive=hd0 \ + -device virtio-net-device,netdev=eth0 \ + -device virtio-rng-device,rng=rng0 \ + -drive file=,if=none,format=raw,readonly=on,id=hd0 \ + -drive file=disk.qcow2,if=none,id=hd1 \ + -m 2048 \ + -netdev user,id=eth0 \ + -nographic \ + -object rng-random,filename=/dev/urandom,id=rng0 \ + -rtc base=utc,clock=host \ + -smp 2 + +The installation medium will show up under the Linux OS installer as /dev/vda +and the destination disk as /dev/vdb. +To reboot into the installed OS, use the same Qemu command line as for the +installation, but without the two stanzas +referring to hd0. +Linux distributions such as Debian, Fedora, openSUSE or Ubuntu provide an OS +installer iso image. + +Miscellaneous +============= + +This configuration is inspired by the qemu_aarch64_virt_defconfig, the +aarch64_efi_defconfig and the Arm SystemReady IR IoT Integration, Test, and +Certification Guide[4]. + +Firmware update is currently not supported. + +[1]: https://github.com/ARM-software/ebbr +[2]: https://developer.arm.com/Architectures/Arm%20SystemReady%20IR +[3]: https://github.com/ARM-software/arm-systemready/tree/main/IR/prebuilt_images +[4]: https://developer.arm.com/documentation/DUI1101/latest/ diff --git a/buildroot/board/qemu/aarch64-ebbr/u-boot.fragment b/buildroot/board/qemu/aarch64-ebbr/u-boot.fragment new file mode 100644 index 0000000000..94aae9d2aa --- /dev/null +++ b/buildroot/board/qemu/aarch64-ebbr/u-boot.fragment @@ -0,0 +1,34 @@ +CONFIG_BOOTM_EFI=y +CONFIG_CMD_BOOTEFI=y +CONFIG_CMD_BOOTEFI_HELLO=y +CONFIG_CMD_BOOTEFI_HELLO_COMPILE=y +CONFIG_CMD_BOOTEFI_SELFTEST=y +CONFIG_CMD_EFIDEBUG=y +CONFIG_CMD_EFI_VARIABLE_FILE_STORE=y +CONFIG_CMD_GPT=y +CONFIG_CMD_NVEDIT_EFI=y +CONFIG_CMD_RNG=y +CONFIG_CMD_RTC=y +CONFIG_DM_RTC=y +CONFIG_EFI_DEVICE_PATH_TO_TEXT=y +CONFIG_EFI_GET_TIME=y +CONFIG_EFI_HAVE_RUNTIME_RESET=y +CONFIG_EFI_LOADER=y +CONFIG_EFI_LOADER_HII=y +CONFIG_EFI_MM_COMM_TEE=y +CONFIG_EFI_PARTITION=y +CONFIG_EFI_SECURE_BOOT=y +CONFIG_EFI_SET_TIME=y +CONFIG_EFI_UNICODE_CAPITALIZATION=y +CONFIG_EFI_UNICODE_COLLATION_PROTOCOL2=y +CONFIG_EFI_VARIABLE_FILE_STORE=y +CONFIG_FAT_WRITE=y +CONFIG_FIT=y +CONFIG_FS_FAT=y +CONFIG_OF_LIBFDT=y +CONFIG_OPTEE=y +CONFIG_PARTITION_TYPE_GUID=y +CONFIG_RNG_OPTEE=y +CONFIG_RTC_EMULATION=y +CONFIG_SCMI_FIRMWARE=y +CONFIG_TEE=y diff --git a/buildroot/board/qemu/aarch64-sbsa/genimage.cfg b/buildroot/board/qemu/aarch64-sbsa/genimage.cfg index bdf8a89d75..e7ac7f2ee1 100644 --- a/buildroot/board/qemu/aarch64-sbsa/genimage.cfg +++ b/buildroot/board/qemu/aarch64-sbsa/genimage.cfg @@ -19,7 +19,7 @@ image disk.img { partition boot { image = "efi-part.vfat" - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + partition-type-uuid = U offset = 32K bootable = true } diff --git a/buildroot/board/qemu/aarch64-sbsa/grub.cfg b/buildroot/board/qemu/aarch64-sbsa/grub.cfg index cd486caf4c..d99e19c4cd 100644 --- a/buildroot/board/qemu/aarch64-sbsa/grub.cfg +++ b/buildroot/board/qemu/aarch64-sbsa/grub.cfg @@ -2,5 +2,5 @@ set default="0" set timeout="5" menuentry "Buildroot" { - linux /Image root=/dev/sda2 rootwait console=ttyAMA0 + linux /Image root=PARTLABEL=root rootwait } diff --git a/buildroot/board/qemu/aarch64-sbsa/readme.txt b/buildroot/board/qemu/aarch64-sbsa/readme.txt index cf5f66d4d6..7d97d7f6ab 100644 --- a/buildroot/board/qemu/aarch64-sbsa/readme.txt +++ b/buildroot/board/qemu/aarch64-sbsa/readme.txt @@ -17,7 +17,7 @@ Run the emulation with: qemu-system-aarch64 \ -M sbsa-ref \ - -cpu cortex-a57 \ + -cpu neoverse-n1 \ -smp 4 \ -m 1024 \ -nographic \ diff --git a/buildroot/board/qemu/aarch64-virt/linux.config b/buildroot/board/qemu/aarch64-virt/linux.config index f9763b73b7..971b9fcf86 100644 --- a/buildroot/board/qemu/aarch64-virt/linux.config +++ b/buildroot/board/qemu/aarch64-virt/linux.config @@ -12,8 +12,7 @@ CONFIG_SCHED_AUTOGROUP=y CONFIG_PROFILING=y CONFIG_ARCH_VEXPRESS=y CONFIG_COMPAT=y -CONFIG_FW_CFG_SYSFS=y -CONFIG_FW_CFG_SYSFS_CMDLINE=y +CONFIG_ACPI=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_BLK_DEV_BSGLIB=y @@ -34,6 +33,8 @@ CONFIG_PCI=y CONFIG_PCI_HOST_GENERIC=y CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y +CONFIG_FW_CFG_SYSFS=y +CONFIG_FW_CFG_SYSFS_CMDLINE=y CONFIG_VIRTIO_BLK=y CONFIG_BLK_DEV_SD=y CONFIG_CHR_DEV_SG=y diff --git a/buildroot/board/qemu/arm-ebbr/genimage.cfg b/buildroot/board/qemu/arm-ebbr/genimage.cfg new file mode 100644 index 0000000000..3d4c9cff1a --- /dev/null +++ b/buildroot/board/qemu/arm-ebbr/genimage.cfg @@ -0,0 +1,31 @@ +image efi-part.vfat { + vfat { + file EFI { + image = "efi-part/EFI" + } + + file zImage { + image = "zImage" + } + } + + size = 128M +} + +image disk.img { + hdimage { + partition-table-type = "gpt" + } + + partition boot { + image = "efi-part.vfat" + partition-type-uuid = U + offset = 32K + bootable = true + } + + partition root { + partition-type-uuid = 69dad710-2ce4-4e3c-b16c-21a1d49abed3 + image = "rootfs.ext2" + } +} diff --git a/buildroot/board/qemu/arm-ebbr/grub.cfg b/buildroot/board/qemu/arm-ebbr/grub.cfg new file mode 100644 index 0000000000..ab3a6ec26b --- /dev/null +++ b/buildroot/board/qemu/arm-ebbr/grub.cfg @@ -0,0 +1,6 @@ +set default="0" +set timeout="5" + +menuentry "Buildroot" { + linux /zImage root=PARTLABEL=root rootwait +} diff --git a/buildroot/board/qemu/arm-ebbr/linux.fragment b/buildroot/board/qemu/arm-ebbr/linux.fragment new file mode 100644 index 0000000000..07554cf843 --- /dev/null +++ b/buildroot/board/qemu/arm-ebbr/linux.fragment @@ -0,0 +1,2 @@ +CONFIG_TEE=y +CONFIG_OPTEE=y diff --git a/buildroot/board/qemu/arm-ebbr/post-image.sh b/buildroot/board/qemu/arm-ebbr/post-image.sh new file mode 100755 index 0000000000..c884a8b6f6 --- /dev/null +++ b/buildroot/board/qemu/arm-ebbr/post-image.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -eu + +BOARD_DIR=$(dirname "$0") + +# Create flash.bin TF-A FIP image from bl1.bin and fip.bin +dd if="${BINARIES_DIR}/bl1.bin" of="${BINARIES_DIR}/flash.bin" bs=1M +dd if="${BINARIES_DIR}/fip.bin" of="${BINARIES_DIR}/flash.bin" seek=64 bs=4096 conv=notrunc + +# Override the default GRUB configuration file with our own. +cp -f "${BOARD_DIR}/grub.cfg" "${BINARIES_DIR}/efi-part/EFI/BOOT/grub.cfg" diff --git a/buildroot/board/qemu/arm-ebbr/readme.txt b/buildroot/board/qemu/arm-ebbr/readme.txt new file mode 100644 index 0000000000..19e114579f --- /dev/null +++ b/buildroot/board/qemu/arm-ebbr/readme.txt @@ -0,0 +1,70 @@ +Introduction +============ + +The qemu_arm_ebbr_defconfig is meant to illustrate some aspects of the Arm +EBBR specification[1] and the Arm SystemReady IR[2] compliance program. +It allows building a 32b ARMv7-A U-Boot based firmware implementing the subset +of UEFI defined by EBBR, as well as a Linux OS disk image booting with UEFI, to +run on Qemu. + +Building +======== + + $ make qemu_arm_ebbr_defconfig + $ make + +Generated files under output/images: + +* flash.bin: A firmware image comprising TF-A, OP-TEE and the U-Boot bootloader. + +* disk.img: An OS disk image comprising the GRUB bootloader, the Linux kernel + and the root filesystem. + +Running under Qemu +================== + +Run the emulation with: + + qemu-system-arm \ + -M virt,secure=on,acpi=off \ + -bios output/images/flash.bin \ + -cpu cortex-a15 \ + -device virtio-blk-device,drive=hd0 \ + -device virtio-net-device,netdev=eth0 \ + -device virtio-rng-device,rng=rng0 \ + -drive file=output/images/disk.img,if=none,format=raw,id=hd0 \ + -m 1024 \ + -netdev user,id=eth0 \ + -nographic \ + -object rng-random,filename=/dev/urandom,id=rng0 \ + -rtc base=utc,clock=host \ + -smp 2 # qemu_arm_ebbr_defconfig + +The login prompt will appear in the terminal that started Qemu. + +Using the EBBR firmware to run another OS under Qemu +---------------------------------------------------- + +It is possible to use the generated firmware binary to run another OS +supporting the EBBR specification. + +To run another OS on emulation using a live or pre-installed image, use the same +Qemu command line as for the generated OS but adapt the OS image path in the +-drive stanza. +The 32b Arm ACS-IR image[3] is an example of a pre-installed OS image. +Linux distributions such as Debian or openSUSE provide a pre-installed OS +image. + +Miscellaneous +============= + +This configuration is inspired by the qemu_arm_vexpress_tz_defconfig, the +qemu_aarch64_ebbr_defconfig and the Arm SystemReady IR IoT Integration, Test, +and Certification Guide[4]. + +Firmware update is currently not supported. + +[1]: https://github.com/ARM-software/ebbr +[2]: https://developer.arm.com/Architectures/Arm%20SystemReady%20IR +[3]: https://github.com/ARM-software/arm-systemready/tree/main/IR/prebuilt_images +[4]: https://developer.arm.com/documentation/DUI1101/latest/ diff --git a/buildroot/board/qemu/arm-ebbr/u-boot.fragment b/buildroot/board/qemu/arm-ebbr/u-boot.fragment new file mode 100644 index 0000000000..66fe910f16 --- /dev/null +++ b/buildroot/board/qemu/arm-ebbr/u-boot.fragment @@ -0,0 +1,35 @@ +CONFIG_BOOTM_EFI=y +CONFIG_CMD_BOOTEFI=y +CONFIG_CMD_BOOTEFI_HELLO=y +CONFIG_CMD_BOOTEFI_HELLO_COMPILE=y +CONFIG_CMD_BOOTEFI_SELFTEST=y +CONFIG_CMD_EFIDEBUG=y +CONFIG_CMD_EFI_VARIABLE_FILE_STORE=y +CONFIG_CMD_GPT=y +CONFIG_CMD_NVEDIT_EFI=y +CONFIG_CMD_RNG=y +CONFIG_CMD_RTC=y +CONFIG_DM_RTC=y +CONFIG_EFI_DEVICE_PATH_TO_TEXT=y +CONFIG_EFI_GET_TIME=y +CONFIG_EFI_HAVE_RUNTIME_RESET=y +CONFIG_EFI_LOADER=y +CONFIG_EFI_LOADER_HII=y +CONFIG_EFI_MM_COMM_TEE=y +CONFIG_EFI_PARTITION=y +CONFIG_EFI_SECURE_BOOT=y +CONFIG_EFI_SET_TIME=y +CONFIG_EFI_UNICODE_CAPITALIZATION=y +CONFIG_EFI_UNICODE_COLLATION_PROTOCOL2=y +CONFIG_EFI_VARIABLE_FILE_STORE=y +CONFIG_FAT_WRITE=y +CONFIG_FIT=y +CONFIG_FS_FAT=y +CONFIG_OF_LIBFDT=y +CONFIG_OPTEE=y +CONFIG_PARTITION_TYPE_GUID=y +CONFIG_RNG_OPTEE=y +CONFIG_RTC_EMULATION=y +CONFIG_SCMI_FIRMWARE=y +CONFIG_TEE=y +CONFIG_TEXT_BASE=0x60000000 diff --git a/buildroot/board/qemu/arm-versatile/linux-nommu.fragment b/buildroot/board/qemu/arm-versatile/linux-nommu.fragment deleted file mode 100644 index 6f1cc3f26d..0000000000 --- a/buildroot/board/qemu/arm-versatile/linux-nommu.fragment +++ /dev/null @@ -1,59 +0,0 @@ -# CONFIG_ARM_SINGLE_ARMV7M is not set -CONFIG_ARM_SINGLE_ARCH_VERSATILE=y -CONFIG_BINFMT_ELF_FDPIC=y -CONFIG_BINFMT_FLAT=y -# CONFIG_BLK_DEV_RAM is not set -# CONFIG_CRAMFS is not set -CONFIG_CMDLINE="" -# CONFIG_DEBUG_FS is not set -# CONFIG_DEBUG_KERNEL is not set -# CONFIG_DEBUG_USER is not set -# CONFIG_DRM is not set -# CONFIG_EEPROM_LEGACY is not set -# CONFIG_EXT2_FS is not set -CONFIG_EXT4_FS=y -CONFIG_FB_ARMCLCD=y -# CONFIG_FONTS is not set -CONFIG_FONT_8x16=y -CONFIG_FONT_8x8=y -# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set -# CONFIG_FTRACE is not set -# CONFIG_GPIO_PL061 is not set -# CONFIG_HIGH_RES_TIMERS is not set -CONFIG_HWMON=y -# CONFIG_I2C_VERSATILE is not set -CONFIG_INET_DIAG=y -CONFIG_INPUT_EVDEV=y -CONFIG_IPV6=y -# CONFIG_IP_MULTICAST is not set -# CONFIG_IP_PNP is not set -# CONFIG_MMU is not set -CONFIG_LOCALVERSION_AUTO=y -# CONFIG_LOGO is not set -CONFIG_LOG_BUF_SHIFT=17 -CONFIG_MDIO_DEVICE=y -# CONFIG_MINIX_FS is not set -# CONFIG_MMC is not set -# CONFIG_MTD is not set -# CONFIG_NEW_LEDS is not set -# CONFIG_NFSD is not set -# CONFIG_NFS_FS is not set -# CONFIG_NLS_CODEPAGE_850 is not set -# CONFIG_NLS_ISO8859_1 is not set -# CONFIG_NO_HZ_IDLE is not set -# CONFIG_NVMEM is not set -CONFIG_DRAM_BASE=0x00000000 -CONFIG_DRAM_SIZE=0x08000000 -CONFIG_INITRAMFS_SOURCE="${BR_BINARIES_DIR}/rootfs.cpio" -# CONFIG_PARTITION_ADVANCED is not set -# CONFIG_OABI_COMPAT is not set -CONFIG_PHYLIB=y -# CONFIG_ROMFS_FS is not set -# CONFIG_RTC_CLASS is not set -CONFIG_SERIAL_CORE=y -CONFIG_SERIO_SERPORT=y -CONFIG_SET_MEM_PARAM=y -CONFIG_SLUB=y -# CONFIG_SPI is not set -# CONFIG_SYNC_FILE is not set -# CONFIG_VFP is not set diff --git a/buildroot/board/qemu/arm-versatile/patches/linux/versatile-nommu.patch b/buildroot/board/qemu/arm-versatile/patches/linux/versatile-nommu.patch deleted file mode 100644 index 1a5130deb4..0000000000 --- a/buildroot/board/qemu/arm-versatile/patches/linux/versatile-nommu.patch +++ /dev/null @@ -1,122 +0,0 @@ -From 7c245ffc17a9ab6215830d4ecd8b2f9beddb487c Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb -Date: Fri, 1 Feb 2019 11:36:20 +0100 -Subject: [PATCH] arm-versatile-nommu: Linux patch - -Originally made by Waldemar Brodkorb from LKML. - -Rename CLKSRC_OF to TIMER_OF (kernel >= 4.13) -https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=bb0eb050a577a866cb47c2dc37596f1207f4c2d9 - -Remove GENERIC_CLOCKEVENTS since its enabled by default (kernel >= 5.11) -https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=0774a6ed294b963dc76df2d8342ab86d030759ec - -Select CONFIG_GENERIC_IRQ_MULTI_HANDLER since irqchip doesn't select it anymore (kernel >= 5.12) -https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=a79f7051cccb6f3bcd3d2a0a058c7d5c79bb0371 - -Signed-Off-by: Waldemar Brodkorb -[Gerome: reformated as a Git patch] -Signed-off-by: Gerome Burlats -[Romain: fix Waldemar's authorship in Git patch] -Signed-off-by: Romain Naour ---- - arch/arm/Kconfig | 11 +++++++++++ - arch/arm/Kconfig.debug | 3 ++- - arch/arm/include/asm/mach/map.h | 1 + - arch/arm/mach-versatile/Kconfig | 5 +++-- - arch/arm/mach-versatile/Makefile.boot | 3 +++ - arch/arm/mach-versatile/versatile_dt.c | 4 ++++ - 6 files changed, 24 insertions(+), 3 deletions(-) - create mode 100644 arch/arm/mach-versatile/Makefile.boot - -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index dcf2df6da98f..c2155c1a2eba 100644 ---- a/arch/arm/Kconfig -+++ b/arch/arm/Kconfig -@@ -337,6 +337,17 @@ config ARM_SINGLE_ARMV7M - select SPARSE_IRQ - select USE_OF - -+config ARM_SINGLE_ARCH_VERSATILE -+ bool "ARM Ltd. Versatile family" -+ depends on !MMU -+ select AUTO_ZRELADDR -+ select TIMER_OF -+ select COMMON_CLK -+ select GENERIC_IRQ_MULTI_HANDLER -+ select GPIOLIB -+ select SPARSE_IRQ -+ select USE_OF -+ - config ARCH_EP93XX - bool "EP93xx-based" - select ARCH_SPARSEMEM_ENABLE -diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug -index 98436702e0c7..7e63299ceb40 100644 ---- a/arch/arm/Kconfig.debug -+++ b/arch/arm/Kconfig.debug -@@ -1891,7 +1891,8 @@ config DEBUG_UNCOMPRESS - config UNCOMPRESS_INCLUDE - string - default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \ -- PLAT_SAMSUNG || ARM_SINGLE_ARMV7M -+ PLAT_SAMSUNG || ARM_SINGLE_ARMV7M || \ -+ ARM_SINGLE_ARCH_VERSATILE - default "mach/uncompress.h" - - config EARLY_PRINTK -diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h -index 92282558caf7..90bd9c069ffc 100644 ---- a/arch/arm/include/asm/mach/map.h -+++ b/arch/arm/include/asm/mach/map.h -@@ -59,6 +59,7 @@ extern int ioremap_page(unsigned long virt, unsigned long phys, - #else - #define iotable_init(map,num) do { } while (0) - #define vm_reserve_area_early(a,s,c) do { } while (0) -+#define debug_ll_io_init() do { } while (0) - #endif - - #endif -diff --git a/arch/arm/mach-versatile/Kconfig b/arch/arm/mach-versatile/Kconfig -index d88e7725bf99..d38b90157f13 100644 ---- a/arch/arm/mach-versatile/Kconfig -+++ b/arch/arm/mach-versatile/Kconfig -@@ -1,7 +1,8 @@ - # SPDX-License-Identifier: GPL-2.0 - config ARCH_VERSATILE -- bool "ARM Ltd. Versatile family" -- depends on ARCH_MULTI_V5 -+ bool "ARM Ltd. Versatile family" if ARCH_MULTI_V5 -+ depends on ARCH_MULTI_V5 || ARM_SINGLE_ARCH_VERSATILE -+ default y if ARM_SINGLE_ARCH_VERSATILE - select ARM_AMBA - select ARM_TIMER_SP804 - select ARM_VIC -diff --git a/arch/arm/mach-versatile/Makefile.boot b/arch/arm/mach-versatile/Makefile.boot -new file mode 100644 -index 000000000000..eacfc3f5c33e ---- /dev/null -+++ b/arch/arm/mach-versatile/Makefile.boot -@@ -0,0 +1,3 @@ -+# Empty file waiting for deletion once Makefile.boot isn't needed any more. -+# Patch waits for application at -+# http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=7889/1 . -diff --git a/arch/arm/mach-versatile/versatile_dt.c b/arch/arm/mach-versatile/versatile_dt.c -index 02ba68abe533..835b51bc597b 100644 ---- a/arch/arm/mach-versatile/versatile_dt.c -+++ b/arch/arm/mach-versatile/versatile_dt.c -@@ -22,7 +22,11 @@ - #include - - /* macro to get at MMIO space when running virtually */ -+#ifdef CONFIG_MMU - #define IO_ADDRESS(x) (((x) & 0x0fffffff) + (((x) >> 4) & 0x0f000000) + 0xf0000000) -+#else -+#define IO_ADDRESS(x) (x) -+#endif - #define __io_address(n) ((void __iomem __force *)IO_ADDRESS(n)) - - /* --- -2.31.1 - diff --git a/buildroot/board/qemu/arm-versatile/readme.txt b/buildroot/board/qemu/arm-versatile/readme.txt index 223bd55c01..757ef378e9 100644 --- a/buildroot/board/qemu/arm-versatile/readme.txt +++ b/buildroot/board/qemu/arm-versatile/readme.txt @@ -2,9 +2,5 @@ Run the emulation with: qemu-system-arm -M versatilepb -kernel output/images/zImage -dtb output/images/versatile-pb.dtb -drive file=output/images/rootfs.ext2,if=scsi,format=raw -append "rootwait root=/dev/sda console=ttyAMA0,115200" -serial stdio -net nic,model=rtl8139 -net user # qemu_arm_versatile_defconfig -Or for the noMMU emulation: - - qemu-system-arm -M versatilepb -kernel output/images/zImage -dtb output/images/versatile-pb.dtb -append "console=ttyAMA0,115200" -serial stdio -net user -net nic,model=smc91c111 # qemu_arm_versatile_nommu_defconfig - The login prompt will appear in the terminal that started Qemu. The graphical window is the framebuffer. diff --git a/buildroot/board/qemu/arm-vexpress-tz/readme.txt b/buildroot/board/qemu/arm-vexpress-tz/readme.txt index 3036dd54ca..920777afd4 100644 --- a/buildroot/board/qemu/arm-vexpress-tz/readme.txt +++ b/buildroot/board/qemu/arm-vexpress-tz/readme.txt @@ -26,7 +26,7 @@ If you want to emulate more cores, use "-smp {1|2|3|4}" to select the number of cores. Note: "-netdev user,id=vmnic -device virtio-net-device,netdev=vmnic" -brings network support that is used i.e. in OP-TEE regression tests. +brings network support that is used e.g. in OP-TEE regression tests. -- Boot Details -- @@ -38,7 +38,7 @@ non-secure bootloader (BL33 stage). QEMU natively hosts and loads in RAM the QEMU ARM target device tree. OP-TEE reads and modifies its content according to OP-TEE configuration. -Enable TF-A traces from LOG_LEVEL (I.e LOG_LEVEL=40) from +Enable TF-A traces from LOG_LEVEL (e.g. LOG_LEVEL=40) from BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES. @@ -53,7 +53,7 @@ serial interface. The OP-TEE OS uses the QEMU second serial interface. To get the OP-TEE OS traces, append a second -serial argument after --serial stdio in the QEMU command line. I.e, the following enables 2 serial +-serial stdio in the QEMU command line. E.g., the following enables 2 serial consoles over telnet connections: cd output/images && ../host/bin/qemu-system-arm \ @@ -62,7 +62,7 @@ consoles over telnet connections: -serial telnet:127.0.0.1:1235,server \ -serial telnet:127.0.0.1:1236,server \ -netdev user,id=vmnic -device virtio-net-device,netdev=vmnic \ - -semihosting-config enable,target=native \ + -semihosting-config enable=on,target=native \ -bios flash.bin QEMU is now waiting for the telnet connection. From another shell, open a @@ -91,7 +91,7 @@ From a first shell: -smp 1 -s -m 1024 -d unimp \ -serial stdio \ -netdev user,id=vmnic -device virtio-net-device,netdev=vmnic \ - -semihosting-config enable,target=native \ + -semihosting-config enable=on,target=native \ -bios flash.bin \ -S @@ -123,7 +123,7 @@ Emulation has started, TF-A has loaded OP-TEE and U-boot images in memory and has booted OP-TEE. Emulation stopped at OP-TEE core entry. Note: QEMU hosts a GDB service listening to TCP port 1234, as set through -qemu-system-arm command line option -s. +qemu-system-arm command line option -S. Note: To build the GDB server, the following extra options have to be added to the Buildroot configuration: diff --git a/buildroot/board/qemu/microblazebe-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch b/buildroot/board/qemu/microblazebe-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch deleted file mode 100644 index eb3859f858..0000000000 --- a/buildroot/board/qemu/microblazebe-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e96b73478232aa42b773cd19371808af69fd4b95 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sat, 25 Apr 2020 09:49:11 +0200 -Subject: [PATCH] net: xilinx: xemaclite: add 2.00.b revision - -Patch added for the kernel 3.14 -- fix networking in Qemu using a small patch -- disable DTS, because linux.bin does not include any DTB the - default Qemu included DTB is used and this is okay and works fine - -https://git.buildroot.net/buildroot/commit/board/qemu/microblazebe-mmu/xilinx-xemaclite.patch?id=fa2798548368d51998fad18d7f6d1ae0ed065b33 - -[Romain: convert to git format] -Signed-off-by: Romain Naour -Cc: Waldemar Brodkorb ---- - drivers/net/ethernet/xilinx/xilinx_emaclite.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c -index 0de52e70abcc..d8c13140ca77 100644 ---- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c -+++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c -@@ -1278,6 +1278,7 @@ static const struct of_device_id xemaclite_of_match[] = { - { .compatible = "xlnx,opb-ethernetlite-1.01.b", }, - { .compatible = "xlnx,xps-ethernetlite-1.00.a", }, - { .compatible = "xlnx,xps-ethernetlite-2.00.a", }, -+ { .compatible = "xlnx,xps-ethernetlite-2.00.b", }, - { .compatible = "xlnx,xps-ethernetlite-2.01.a", }, - { .compatible = "xlnx,xps-ethernetlite-3.00.a", }, - { /* end of list */ }, --- -2.25.3 - diff --git a/buildroot/board/qemu/microblazeel-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch b/buildroot/board/qemu/microblazeel-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch deleted file mode 100644 index eb3859f858..0000000000 --- a/buildroot/board/qemu/microblazeel-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e96b73478232aa42b773cd19371808af69fd4b95 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sat, 25 Apr 2020 09:49:11 +0200 -Subject: [PATCH] net: xilinx: xemaclite: add 2.00.b revision - -Patch added for the kernel 3.14 -- fix networking in Qemu using a small patch -- disable DTS, because linux.bin does not include any DTB the - default Qemu included DTB is used and this is okay and works fine - -https://git.buildroot.net/buildroot/commit/board/qemu/microblazebe-mmu/xilinx-xemaclite.patch?id=fa2798548368d51998fad18d7f6d1ae0ed065b33 - -[Romain: convert to git format] -Signed-off-by: Romain Naour -Cc: Waldemar Brodkorb ---- - drivers/net/ethernet/xilinx/xilinx_emaclite.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c -index 0de52e70abcc..d8c13140ca77 100644 ---- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c -+++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c -@@ -1278,6 +1278,7 @@ static const struct of_device_id xemaclite_of_match[] = { - { .compatible = "xlnx,opb-ethernetlite-1.01.b", }, - { .compatible = "xlnx,xps-ethernetlite-1.00.a", }, - { .compatible = "xlnx,xps-ethernetlite-2.00.a", }, -+ { .compatible = "xlnx,xps-ethernetlite-2.00.b", }, - { .compatible = "xlnx,xps-ethernetlite-2.01.a", }, - { .compatible = "xlnx,xps-ethernetlite-3.00.a", }, - { /* end of list */ }, --- -2.25.3 - diff --git a/buildroot/board/qemu/nios2-10m50/linux.fragment b/buildroot/board/qemu/nios2-10m50/linux.fragment deleted file mode 100644 index c7647cee8a..0000000000 --- a/buildroot/board/qemu/nios2-10m50/linux.fragment +++ /dev/null @@ -1,3 +0,0 @@ -# Embed the DTB in the kernel image -CONFIG_NIOS2_DTB_SOURCE_BOOL=y -CONFIG_NIOS2_DTB_SOURCE="10m50_devboard.dts" diff --git a/buildroot/board/qemu/nios2-10m50/readme.txt b/buildroot/board/qemu/nios2-10m50/readme.txt deleted file mode 100644 index f8f8f3b3a5..0000000000 --- a/buildroot/board/qemu/nios2-10m50/readme.txt +++ /dev/null @@ -1,5 +0,0 @@ -Run the emulation with: - - qemu-system-nios2 -kernel output/images/vmlinux -nographic # qemu_nios2_10m50_defconfig - -The login prompt will appear in the terminal that started Qemu. diff --git a/buildroot/board/qemu/or1k/readme.txt b/buildroot/board/qemu/or1k/readme.txt index 2ea797440a..ed0359a0f5 100644 --- a/buildroot/board/qemu/or1k/readme.txt +++ b/buildroot/board/qemu/or1k/readme.txt @@ -3,5 +3,3 @@ Run the emulation with: qemu-system-or1k -kernel output/images/vmlinux -nographic # qemu_or1k_defconfig The login prompt will appear in the terminal that started Qemu. - -Ethernet support is not working, yet. diff --git a/buildroot/board/qemu/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/buildroot/board/qemu/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 0000000000..4a0534d1ba --- /dev/null +++ b/buildroot/board/qemu/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,4 @@ +# Locally computed: +sha256 c9f0d0bf967d690edbf34b621728a6271856f2e26ed46081a285b6d627a358c5 arm-trusted-firmware-v2.7-git4.tar.gz +sha256 7efa89e1b4e4106ee05d68e876c8efbb146364d89cfd5d26bf4647b09c08f32b arm-trusted-firmware-v2.10-git4.tar.gz +sha256 c0f23ccc71c49989e9ad238acf334473c17b7c88f79a20c829c3d443e3794a22 arm-trusted-firmware-v2.11-git4.tar.gz diff --git a/buildroot/board/qemu/patches/binutils/binutils.hash b/buildroot/board/qemu/patches/binutils/binutils.hash new file mode 100644 index 0000000000..6affaadf25 --- /dev/null +++ b/buildroot/board/qemu/patches/binutils/binutils.hash @@ -0,0 +1,2 @@ +# locally computed +sha256 a76052c0c71d4025b117dcfc18ca7e189ac495a7645fa98c1bdaddca15cce815 xtensa_dc233c.tar.gz diff --git a/buildroot/board/qemu/patches/gcc-final/gcc-final.hash b/buildroot/board/qemu/patches/gcc-final/gcc-final.hash new file mode 100644 index 0000000000..84bf45ec66 --- /dev/null +++ b/buildroot/board/qemu/patches/gcc-final/gcc-final.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 a76052c0c71d4025b117dcfc18ca7e189ac495a7645fa98c1bdaddca15cce815 xtensa_dc233c.tar.gz diff --git a/buildroot/board/qemu/patches/gcc-initial/gcc-initial.hash b/buildroot/board/qemu/patches/gcc-initial/gcc-initial.hash new file mode 100644 index 0000000000..84bf45ec66 --- /dev/null +++ b/buildroot/board/qemu/patches/gcc-initial/gcc-initial.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 a76052c0c71d4025b117dcfc18ca7e189ac495a7645fa98c1bdaddca15cce815 xtensa_dc233c.tar.gz diff --git a/buildroot/board/qemu/patches/linux-headers/linux-headers.hash b/buildroot/board/qemu/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/qemu/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/qemu/patches/linux/linux.hash b/buildroot/board/qemu/patches/linux/linux.hash new file mode 100644 index 0000000000..deb1ad0ce5 --- /dev/null +++ b/buildroot/board/qemu/patches/linux/linux.hash @@ -0,0 +1,5 @@ +# sha256 locally computed +sha256 aaa824eaf07f61911d22b75ff090a403c3dd0bd73e23933e0bba8b5971436ce1 linux-6.6.32.tar.xz + +# sha256 locally computed +sha256 a76052c0c71d4025b117dcfc18ca7e189ac495a7645fa98c1bdaddca15cce815 xtensa_dc233c.tar.gz diff --git a/buildroot/board/qemu/patches/opensbi/opensbi.hash b/buildroot/board/qemu/patches/opensbi/opensbi.hash new file mode 100644 index 0000000000..1408f547b8 --- /dev/null +++ b/buildroot/board/qemu/patches/opensbi/opensbi.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 8fcbce598a73acc2c7f7d5607d46b9d5107d3ecbede8f68f42631dcfc25ef2b2 opensbi-1.2.tar.gz diff --git a/buildroot/board/qemu/patches/uboot/uboot.hash b/buildroot/board/qemu/patches/uboot/uboot.hash new file mode 100644 index 0000000000..7762ff3f8f --- /dev/null +++ b/buildroot/board/qemu/patches/uboot/uboot.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 68e065413926778e276ec3abd28bb32fa82abaa4a6898d570c1f48fbdb08bcd0 u-boot-2022.04.tar.bz2 +sha256 b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3 u-boot-2024.01.tar.bz2 diff --git a/buildroot/board/qemu/post-image.sh b/buildroot/board/qemu/post-image.sh index 88f0413496..fe46d0d4af 100755 --- a/buildroot/board/qemu/post-image.sh +++ b/buildroot/board/qemu/post-image.sh @@ -1,7 +1,7 @@ #!/bin/bash -QEMU_BOARD_DIR="$(dirname $0)" -DEFCONFIG_NAME="$(basename $2)" +QEMU_BOARD_DIR="$(dirname "$0")" +DEFCONFIG_NAME="$(basename "$2")" README_FILES="${QEMU_BOARD_DIR}/*/readme.txt" START_QEMU_SCRIPT="${BINARIES_DIR}/start-qemu.sh" @@ -12,7 +12,8 @@ fi # Search for "# qemu_*_defconfig" tag in all readme.txt files. # Qemu command line on multilines using back slash are accepted. -QEMU_CMD_LINE=$(sed -r ':a; /\\$/N; s/\\\n//; s/\t/ /; ta; /# '${DEFCONFIG_NAME}'$/!d; s/#.*//' ${README_FILES}) +# shellcheck disable=SC2086 # glob over each readme file +QEMU_CMD_LINE="$(sed -r ':a; /\\$/N; s/\\\n//; s/\t/ /; ta; /# '"${DEFCONFIG_NAME}"'$/!d; s/#.*//' ${README_FILES})" if [ -z "${QEMU_CMD_LINE}" ]; then # No Qemu cmd line found, can't test. @@ -41,21 +42,10 @@ case ${DEFCONFIG_NAME} in ;; esac -cat <<-_EOF_ > "${START_QEMU_SCRIPT}" - #!/bin/sh - ( - BINARIES_DIR="\${0%/*}/" - cd \${BINARIES_DIR} - - if [ "\${1}" = "serial-only" ]; then - EXTRA_ARGS='${SERIAL_ARGS}' - else - EXTRA_ARGS='${DEFAULT_ARGS}' - fi - - export PATH="${HOST_DIR}/bin:\${PATH}" - exec ${QEMU_CMD_LINE} \${EXTRA_ARGS} - ) -_EOF_ - +sed -e "s|@SERIAL_ARGS@|${SERIAL_ARGS}|g" \ + -e "s|@DEFAULT_ARGS@|${DEFAULT_ARGS}|g" \ + -e "s|@QEMU_CMD_LINE@|${QEMU_CMD_LINE}|g" \ + -e "s|@HOST_DIR@|${HOST_DIR}|g" \ + <"${QEMU_BOARD_DIR}/start-qemu.sh.in" \ + >"${START_QEMU_SCRIPT}" chmod +x "${START_QEMU_SCRIPT}" diff --git a/buildroot/board/qemu/ppc-mpc8544ds/patches/linux/0001-powerpc-Fix-mcpu-options-for-SPE-only-compiler.patch b/buildroot/board/qemu/ppc-mpc8544ds/patches/linux/0001-powerpc-Fix-mcpu-options-for-SPE-only-compiler.patch deleted file mode 100644 index b8c8a72587..0000000000 --- a/buildroot/board/qemu/ppc-mpc8544ds/patches/linux/0001-powerpc-Fix-mcpu-options-for-SPE-only-compiler.patch +++ /dev/null @@ -1,53 +0,0 @@ -From a0919e3177295f4aaa9006915adcddc31788d809 Mon Sep 17 00:00:00 2001 -From: Ben Hutchings -Date: Wed, 26 Dec 2018 00:00:40 +0000 -Subject: [PATCH] powerpc: Fix -mcpu= options for SPE-only compiler - -GCC for Debian's "powerpcspe" architecture only supports 32-bit -SPE targets, and using -mcpu=powerpc or -mcpu=powerpc64 is a fatal -error. - -* Change the test for a biarch compiler to pass both the -m32 and -m64 - options, so that it doesn't catch 32-bit-only compilers -* Add an ifdef CONFIG_PPC64 around the 64-bit CPU option definitions - -Signed-off-by: Ben Hutchings -[Romain: Patch from Debian repository: -https://salsa.debian.org/kernel-team/linux/-/blob/buster/debian/patches/bugfix/powerpc/powerpc-fix-mcpu-options-for-spe-only-compiler.patch] -Signed-off-by: Romain Naour ---- - arch/powerpc/Makefile | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile -index 5c8c06215dd4..e3dbea6d7ae0 100644 ---- a/arch/powerpc/Makefile -+++ b/arch/powerpc/Makefile -@@ -12,7 +12,7 @@ - # Rewritten by Cort Dougan and Paul Mackerras - # - --HAS_BIARCH := $(call cc-option-yn, -m32) -+HAS_BIARCH := $(call cc-option-yn, -m32 -m64) - - # Set default 32 bits cross compilers for vdso and boot wrapper - CROSS32_COMPILE ?= -@@ -164,6 +164,7 @@ CFLAGS-$(CONFIG_PPC32) += $(call cc-option, $(MULTIPLEWORD)) - - CFLAGS-$(CONFIG_PPC32) += $(call cc-option,-mno-readonly-in-sdata) - -+ifdef CONFIG_PPC64 - ifdef CONFIG_PPC_BOOK3S_64 - ifdef CONFIG_CPU_LITTLE_ENDIAN - CFLAGS-$(CONFIG_GENERIC_CPU) += -mcpu=power8 -@@ -175,6 +176,7 @@ endif - else - CFLAGS-$(CONFIG_GENERIC_CPU) += -mcpu=powerpc64 - endif -+endif - - ifdef CONFIG_FUNCTION_TRACER - CC_FLAGS_FTRACE := -pg --- -2.17.1 - diff --git a/buildroot/board/qemu/ppc64le-powernv8/readme.txt b/buildroot/board/qemu/ppc64le-powernv8/readme.txt index 059f55fbc9..b57c97464a 100644 --- a/buildroot/board/qemu/ppc64le-powernv8/readme.txt +++ b/buildroot/board/qemu/ppc64le-powernv8/readme.txt @@ -1,5 +1,5 @@ Run the emulation with: -qemu-system-ppc64 -M powernv9 -kernel vmlinux -append "console=hvc0 rootwait root=/dev/nvme0n1" -device nvme,bus=pcie.3,addr=0x0,drive=drive0,serial=1234 -drive file=./rootfs.ext2,if=none,id=drive0,format=raw,cache=none -device e1000e,netdev=net0,mac=C0:FF:EE:00:01:03,bus=pcie.1,addr=0x0 -netdev user,id=net0 -serial mon:stdio -nographic # qemu_ppc64le_powernv8_defconfig +qemu-system-ppc64 -M powernv9 -kernel output/images/vmlinux -append "console=hvc0 rootwait root=/dev/nvme0n1" -device nvme,bus=pcie.3,addr=0x0,drive=drive0,serial=1234 -drive file=output/images/rootfs.ext2,if=none,id=drive0,format=raw,cache=none -device e1000e,netdev=net0,mac=C0:FF:EE:00:01:03,bus=pcie.1,addr=0x0 -netdev user,id=net0 -serial mon:stdio -nographic # qemu_ppc64le_powernv8_defconfig The login prompt will appear in the terminal window. diff --git a/buildroot/board/qemu/ppc64le-pseries/readme.txt b/buildroot/board/qemu/ppc64le-pseries/readme.txt index 8ee72ea6cf..3d5577aa32 100644 --- a/buildroot/board/qemu/ppc64le-pseries/readme.txt +++ b/buildroot/board/qemu/ppc64le-pseries/readme.txt @@ -1,5 +1,5 @@ Run the emulation with: -qemu-system-ppc64 -M pseries -cpu POWER8 -m 256 -kernel output/images/vmlinux -append "console=hvc0 rootwait root=/dev/sda" -drive file=output/images/rootfs.ext2,if=scsi,index=0,format=raw -serial stdio -display curses # qemu_ppc64le_pseries_defconfig +qemu-system-ppc64 -M pseries,x-vof=on -cpu POWER8 -m 256 -kernel output/images/vmlinux -append "console=hvc0 rootwait root=/dev/sda" -drive file=output/images/rootfs.ext2,if=scsi,index=0,format=raw -serial stdio -display curses # qemu_ppc64le_pseries_defconfig The login prompt will appear in the terminal window. diff --git a/buildroot/board/qemu/riscv32-virt/linux-nommu.config b/buildroot/board/qemu/riscv32-virt/linux-nommu.config new file mode 100644 index 0000000000..784b12f18a --- /dev/null +++ b/buildroot/board/qemu/riscv32-virt/linux-nommu.config @@ -0,0 +1,21 @@ +CONFIG_BLK_DEV_INITRD=y +# CONFIG_MMU is not set +CONFIG_SOC_VIRT=y +CONFIG_NONPORTABLE=y +CONFIG_ARCH_RV32I=y +CONFIG_BINFMT_FLAT=y +CONFIG_SLOB=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_NETDEVICES=y +CONFIG_VIRTIO_BLK=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_OF_PLATFORM=y +CONFIG_VIRTIO_MMIO=y +CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y +CONFIG_VIRTIO_NET=y +CONFIG_EXT2_FS=y +CONFIG_PRINTK_TIME=y diff --git a/buildroot/board/qemu/riscv32-virt/readme.txt b/buildroot/board/qemu/riscv32-virt/readme.txt index 32b4333512..b4336e9357 100644 --- a/buildroot/board/qemu/riscv32-virt/readme.txt +++ b/buildroot/board/qemu/riscv32-virt/readme.txt @@ -1,5 +1,7 @@ Run Linux in emulation with: - qemu-system-riscv32 -M virt -bios output/images/fw_jump.elf -kernel output/images/Image -append "rootwait root=/dev/vda ro" -drive file=output/images/rootfs.ext2,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic # qemu_riscv32_virt_defconfig + qemu-system-riscv32 -M virt -bios output/images/fw_jump.elf -kernel output/images/Image -append "rootwait root=/dev/vda ro" -drive file=output/images/rootfs.ext2,format=raw -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic # qemu_riscv32_virt_defconfig + + qemu-system-riscv32 -M virt -bios none -kernel output/images/Image -append "rootwait root=/dev/vda ro" -drive file=output/images/rootfs.ext2,format=raw,id=hd0,if=none -device virtio-blk-device,drive=hd0 -nographic -cpu rv32,mmu=off -netdev user,id=eth0 -device virtio-net-device,netdev=eth0 # qemu_riscv32_nommu_virt_defconfig The login prompt will appear in the terminal that started Qemu. diff --git a/buildroot/board/qemu/riscv64-virt-efi/assemble-flash-images b/buildroot/board/qemu/riscv64-virt-efi/assemble-flash-images new file mode 100755 index 0000000000..abcaa2c93b --- /dev/null +++ b/buildroot/board/qemu/riscv64-virt-efi/assemble-flash-images @@ -0,0 +1,11 @@ +#! /bin/sh + +set -e + +BOARD_DIR="$(dirname "$0")" + +cp -f "${BOARD_DIR}"/grub.cfg "${BINARIES_DIR}"/efi-part/EFI/BOOT/grub.cfg + +# The QEMU riscv64 virt machine expects flash devices to be 32M. +truncate -s 32M "${BINARIES_DIR}"/RISCV_VIRT_CODE.fd +truncate -s 32M "${BINARIES_DIR}"/RISCV_VIRT_VARS.fd diff --git a/buildroot/board/qemu/riscv64-virt-efi/genimage.cfg b/buildroot/board/qemu/riscv64-virt-efi/genimage.cfg new file mode 100644 index 0000000000..46950591e0 --- /dev/null +++ b/buildroot/board/qemu/riscv64-virt-efi/genimage.cfg @@ -0,0 +1,34 @@ +image efi-part.vfat { + vfat { + file EFI { + image = "efi-part/EFI" + } + + file Image { + image = "Image" + } + } + + size = 64M +} + +image disk.img { + hdimage { + partition-table-type = "gpt" + } + + partition boot { + image = "efi-part.vfat" + partition-type-uuid = U + offset = 32K + bootable = true + } + + partition root { + # For partition-type-uuid value, see: + # https://uapi-group.org/specifications/specs/discoverable_partitions_specification/ + # SD_GPT_ROOT_RISCV64 + partition-type-uuid = 72ec70a6-cf74-40e6-bd49-4bda08e8f224 + image = "rootfs.ext2" + } +} diff --git a/buildroot/board/qemu/riscv64-virt-efi/grub.cfg b/buildroot/board/qemu/riscv64-virt-efi/grub.cfg new file mode 100644 index 0000000000..d99e19c4cd --- /dev/null +++ b/buildroot/board/qemu/riscv64-virt-efi/grub.cfg @@ -0,0 +1,6 @@ +set default="0" +set timeout="5" + +menuentry "Buildroot" { + linux /Image root=PARTLABEL=root rootwait +} diff --git a/buildroot/board/qemu/riscv64-virt-efi/readme.txt b/buildroot/board/qemu/riscv64-virt-efi/readme.txt new file mode 100644 index 0000000000..10d4ed966f --- /dev/null +++ b/buildroot/board/qemu/riscv64-virt-efi/readme.txt @@ -0,0 +1,35 @@ +Intro +===== + +This is a RISC-V 64bit UEFI Linux boot demo in QEmu virt machine. + +Build +===== + + make qemu_riscv64_virt_efi_defconfig + make + +Emulation +========= + +Run the emulation with: + + qemu-system-riscv64 \ + -M virt,pflash0=pflash0,pflash1=pflash1,acpi=off \ + -smp 4 \ + -m 1024 \ + -nographic \ + -blockdev node-name=pflash0,driver=file,read-only=on,filename=output/images/RISCV_VIRT_CODE.fd \ + -blockdev node-name=pflash1,driver=file,filename=output/images/RISCV_VIRT_VARS.fd \ + \ + -drive file=output/images/disk.img,format=raw \ + \ + -netdev user,id=net0 \ + -device virtio-net-device,netdev=net0 # qemu_riscv64_virt_efi_defconfig + +Note: for information, qemu version >= 8.0.0 is needed for this UEFI +Linux demo. It introduced the two pflash memories (previous versions +had only one). The host-qemu package in Buildroot (enabled in this +defconfig) is sufficient to run this demo. In case another qemu is +used (for example, from the host OS), make sure to check the version +requirement. diff --git a/buildroot/board/qemu/riscv64-virt/linux-nommu.config b/buildroot/board/qemu/riscv64-virt/linux-nommu.config new file mode 100644 index 0000000000..9adf494260 --- /dev/null +++ b/buildroot/board/qemu/riscv64-virt/linux-nommu.config @@ -0,0 +1,22 @@ +CONFIG_ARCH_RV64I=y +CONFIG_64BIT=y +CONFIG_BLK_DEV_INITRD=y +# CONFIG_MMU is not set +CONFIG_SOC_VIRT=y +CONFIG_NONPORTABLE=y +CONFIG_BINFMT_FLAT=y +CONFIG_SLOB=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_NETDEVICES=y +CONFIG_VIRTIO_BLK=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_OF_PLATFORM=y +CONFIG_VIRTIO_MMIO=y +CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y +CONFIG_VIRTIO_NET=y +CONFIG_EXT2_FS=y +CONFIG_PRINTK_TIME=y diff --git a/buildroot/board/qemu/riscv64-virt/readme.txt b/buildroot/board/qemu/riscv64-virt/readme.txt index 747a9ea674..f9e920a88b 100644 --- a/buildroot/board/qemu/riscv64-virt/readme.txt +++ b/buildroot/board/qemu/riscv64-virt/readme.txt @@ -1,5 +1,7 @@ Run Linux in emulation with: - qemu-system-riscv64 -M virt -bios output/images/fw_jump.elf -kernel output/images/Image -append "rootwait root=/dev/vda ro" -drive file=output/images/rootfs.ext2,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic # qemu_riscv64_virt_defconfig + qemu-system-riscv64 -M virt -bios output/images/fw_jump.elf -kernel output/images/Image -append "rootwait root=/dev/vda ro" -drive file=output/images/rootfs.ext2,format=raw -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic # qemu_riscv64_virt_defconfig + + qemu-system-riscv64 -M virt -bios none -kernel output/images/Image -append "rootwait root=/dev/vda ro" -drive file=output/images/rootfs.ext2,format=raw,id=hd0,if=none -device virtio-blk-device,drive=hd0 -nographic -cpu rv64,mmu=off -netdev user,id=net0 -device virtio-net-device,netdev=net0 # qemu_riscv64_nommu_virt_defconfig The login prompt will appear in the terminal that started Qemu. diff --git a/buildroot/board/qemu/sh4-r2d/readme.txt b/buildroot/board/qemu/sh4-r2d/readme.txt index b0799e47a8..24c3676d8a 100644 --- a/buildroot/board/qemu/sh4-r2d/readme.txt +++ b/buildroot/board/qemu/sh4-r2d/readme.txt @@ -1,6 +1,6 @@ Run the emulation with: - qemu-system-sh4 -M r2d -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=ide,format=raw -append "rootwait root=/dev/sda console=ttySC1,115200 noiotrap" -serial null -serial stdio -net nic,model=rtl8139 -net user # qemu_sh4_r2d_defconfig + qemu-system-sh4 -M r2d -kernel output/images/zImage -append "console=ttySC1,115200 noiotrap" -serial null -serial stdio -net nic,model=rtl8139 -net user # qemu_sh4_r2d_defconfig The login prompt will appear in the terminal that started Qemu. The graphical window is the framebuffer. diff --git a/buildroot/board/qemu/sh4eb-r2d/readme.txt b/buildroot/board/qemu/sh4eb-r2d/readme.txt index 9f3dd8b20b..577c54cd9d 100644 --- a/buildroot/board/qemu/sh4eb-r2d/readme.txt +++ b/buildroot/board/qemu/sh4eb-r2d/readme.txt @@ -1,6 +1,6 @@ Run the emulation with: - qemu-system-sh4eb -M r2d -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=ide,format=raw -append "rootwait root=/dev/sda console=ttySC1,115200 noiotrap" -serial null -serial stdio -net nic,model=rtl8139 -net user # qemu_sh4eb_r2d_defconfig + qemu-system-sh4eb -M r2d -kernel output/images/zImage -append "console=ttySC1,115200 noiotrap" -serial null -serial stdio -net nic,model=rtl8139 -net user # qemu_sh4eb_r2d_defconfig The login prompt will appear in the terminal that started Qemu. The graphical window is the framebuffer. diff --git a/buildroot/board/qemu/sparc-ss10/patches/linux-headers/linux-headers.hash b/buildroot/board/qemu/sparc-ss10/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/qemu/sparc-ss10/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/qemu/sparc-ss10/patches/linux/linux.hash b/buildroot/board/qemu/sparc-ss10/patches/linux/linux.hash new file mode 100644 index 0000000000..9d0d5466ca --- /dev/null +++ b/buildroot/board/qemu/sparc-ss10/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# sha256 locally computed +sha256 9e723232d603ab45ebf043c34714c48f277ab195c29abcb8472f2a4c3a5a1995 linux-6.8.6.tar.xz diff --git a/buildroot/board/qemu/start-qemu.sh.in b/buildroot/board/qemu/start-qemu.sh.in new file mode 100644 index 0000000000..38024b449e --- /dev/null +++ b/buildroot/board/qemu/start-qemu.sh.in @@ -0,0 +1,28 @@ +#!/bin/sh + +BINARIES_DIR="${0%/*}/" +# shellcheck disable=SC2164 +cd "${BINARIES_DIR}" + +mode_serial=false +mode_sys_qemu=false +while [ "$1" ]; do + case "$1" in + --serial-only|serial-only) mode_serial=true; shift;; + --use-system-qemu) mode_sys_qemu=true; shift;; + --) shift; break;; + *) echo "unknown option: $1" >&2; exit 1;; + esac +done + +if ${mode_serial}; then + EXTRA_ARGS='@SERIAL_ARGS@' +else + EXTRA_ARGS='@DEFAULT_ARGS@' +fi + +if ! ${mode_sys_qemu}; then + export PATH="@HOST_DIR@/bin:${PATH}" +fi + +exec @QEMU_CMD_LINE@ ${EXTRA_ARGS} "$@" diff --git a/buildroot/board/qmtech/zynq/patches/linux/0001-DTS-for-QMTech-Zynq-starter-kit.patch b/buildroot/board/qmtech/zynq/patches/linux/0001-DTS-for-QMTech-Zynq-starter-kit.patch deleted file mode 100644 index 86d8e387de..0000000000 --- a/buildroot/board/qmtech/zynq/patches/linux/0001-DTS-for-QMTech-Zynq-starter-kit.patch +++ /dev/null @@ -1,418 +0,0 @@ -From 22d955122ac0f7ac74ab74aadebf6b8edaf0bbbd Mon Sep 17 00:00:00 2001 -From: Julien Olivain -Date: Sun, 15 Dec 2019 18:45:40 +0100 -Subject: [PATCH] DTS for QMTech Zynq starter kit - -Signed-off-by: Martin Chabot -Signed-off-by: Julien Olivain ---- - arch/arm/boot/dts/zynq-qmtech.dts | 397 ++++++++++++++++++++++++++++++ - 1 file changed, 397 insertions(+) - create mode 100644 arch/arm/boot/dts/zynq-qmtech.dts - -diff --git a/arch/arm/boot/dts/zynq-qmtech.dts b/arch/arm/boot/dts/zynq-qmtech.dts -new file mode 100644 -index 000000000000..c6081dc0080e ---- /dev/null -+++ b/arch/arm/boot/dts/zynq-qmtech.dts -@@ -0,0 +1,397 @@ -+// SPDX-License-Identifier: GPL-2.0+ -+/* -+ * Copyright (C) 2011 - 2015 Xilinx -+ * Copyright (C) 2012 National Instruments Corp. -+ * Copyright (C) 2019 Martin Chabot -+ */ -+ -+/* Derived from: -+ * https://github.com/Xilinx/linux-xlnx/blob/xilinx-v2019.2.01/arch/arm/boot/dts/zynq-zc702.dts -+ */ -+ -+/dts-v1/; -+#include "zynq-7000.dtsi" -+ -+/ { -+ model = "QMTECH XC7Z010 Starter Kit"; -+ compatible = "xlnx,zynq-qmtech", "xlnx,zynq-zc702", "xlnx,zynq-7000"; -+ -+ aliases { -+ ethernet0 = &gem0; -+ i2c0 = &i2c0; -+ serial0 = &uart1; -+ spi0 = &qspi; -+ mmc0 = &sdhci0; -+ }; -+ -+ memory@0 { -+ device_type = "memory"; -+ reg = <0x0 0x20000000>; -+ }; -+ -+ chosen { -+ bootargs = ""; -+ stdout-path = "serial0:115200n8"; -+ }; -+ -+ leds { -+ compatible = "gpio-leds"; -+ -+ ds23 { -+ label = "ds23"; -+ gpios = <&gpio0 10 0>; -+ linux,default-trigger = "heartbeat"; -+ }; -+ }; -+ -+}; -+ -+&amba { -+ ocm: sram@fffc0000 { -+ compatible = "mmio-sram"; -+ reg = <0xfffc0000 0x10000>; -+ }; -+}; -+ -+&clkc { -+ ps-clk-frequency = <33333333>; -+}; -+ -+&gem0 { -+ status = "okay"; -+ phy-mode = "rgmii-id"; -+ phy-handle = <ðernet_phy>; -+ -+ ethernet_phy: ethernet-phy@0 { -+ reg = <0>; -+ device_type = "ethernet-phy"; -+ }; -+}; -+ -+&gpio0 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_gpio0_default>; -+}; -+ -+&i2c0 { -+ status = "disabled"; -+ clock-frequency = <400000>; -+ pinctrl-names = "default", "gpio"; -+ pinctrl-0 = <&pinctrl_i2c0_default>; -+ pinctrl-1 = <&pinctrl_i2c0_gpio>; -+ scl-gpios = <&gpio0 50 0>; -+ sda-gpios = <&gpio0 51 0>; -+ -+ i2c-mux@74 { -+ compatible = "nxp,pca9548"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ reg = <0x74>; -+ -+ i2c@0 { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ reg = <0>; -+ si570: clock-generator@5d { -+ #clock-cells = <0>; -+ compatible = "silabs,si570"; -+ temperature-stability = <50>; -+ reg = <0x5d>; -+ factory-fout = <156250000>; -+ clock-frequency = <148500000>; -+ }; -+ }; -+ -+ i2c@1 { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ reg = <1>; -+ adv7511: hdmi-tx@39 { -+ compatible = "adi,adv7511"; -+ reg = <0x39>; -+ adi,input-depth = <8>; -+ adi,input-colorspace = "yuv422"; -+ adi,input-clock = "1x"; -+ adi,input-style = <3>; -+ adi,input-justification = "right"; -+ }; -+ }; -+ -+ i2c@2 { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ reg = <2>; -+ eeprom@54 { -+ compatible = "atmel,24c08"; -+ reg = <0x54>; -+ }; -+ }; -+ -+ i2c@3 { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ reg = <3>; -+ gpio@21 { -+ compatible = "ti,tca6416"; -+ reg = <0x21>; -+ gpio-controller; -+ #gpio-cells = <2>; -+ }; -+ }; -+ -+ i2c@4 { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ reg = <4>; -+ rtc@51 { -+ compatible = "nxp,pcf8563"; -+ reg = <0x51>; -+ }; -+ }; -+ -+ i2c@7 { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ reg = <7>; -+ hwmon@52 { -+ compatible = "ti,ucd9248"; -+ reg = <52>; -+ }; -+ hwmon@53 { -+ compatible = "ti,ucd9248"; -+ reg = <53>; -+ }; -+ hwmon@54 { -+ compatible = "ti,ucd9248"; -+ reg = <54>; -+ }; -+ }; -+ }; -+}; -+ -+&pinctrl0 { -+ pinctrl_can0_default: can0-default { -+ mux { -+ function = "can0"; -+ groups = "can0_9_grp"; -+ }; -+ -+ conf { -+ groups = "can0_9_grp"; -+ slew-rate = <0>; -+ io-standard = <1>; -+ }; -+ -+ conf-rx { -+ pins = "MIO46"; -+ bias-high-impedance; -+ }; -+ -+ conf-tx { -+ pins = "MIO47"; -+ bias-disable; -+ }; -+ }; -+ -+ pinctrl_gem0_default: gem0-default { -+ mux { -+ function = "ethernet0"; -+ groups = "ethernet0_0_grp"; -+ }; -+ -+ conf { -+ groups = "ethernet0_0_grp"; -+ slew-rate = <0>; -+ io-standard = <4>; -+ }; -+ -+ conf-rx { -+ pins = "MIO22", "MIO23", "MIO24", "MIO25", "MIO26", "MIO27"; -+ bias-high-impedance; -+ low-power-disable; -+ }; -+ -+ conf-tx { -+ pins = "MIO16", "MIO17", "MIO18", "MIO19", "MIO20", "MIO21"; -+ bias-disable; -+ low-power-enable; -+ }; -+ -+ mux-mdio { -+ function = "mdio0"; -+ groups = "mdio0_0_grp"; -+ }; -+ -+ conf-mdio { -+ groups = "mdio0_0_grp"; -+ slew-rate = <0>; -+ io-standard = <1>; -+ bias-disable; -+ }; -+ }; -+ -+ pinctrl_gpio0_default: gpio0-default { -+ mux { -+ function = "gpio0"; -+ groups = "gpio0_7_grp", "gpio0_8_grp", "gpio0_9_grp", -+ "gpio0_10_grp", "gpio0_11_grp", "gpio0_12_grp", -+ "gpio0_13_grp", "gpio0_14_grp"; -+ }; -+ -+ conf { -+ groups = "gpio0_7_grp", "gpio0_8_grp", "gpio0_9_grp", -+ "gpio0_10_grp", "gpio0_11_grp", "gpio0_12_grp", -+ "gpio0_13_grp", "gpio0_14_grp"; -+ slew-rate = <0>; -+ io-standard = <1>; -+ }; -+ -+ conf-pull-up { -+ pins = "MIO9", "MIO10", "MIO11", "MIO12", "MIO13", "MIO14"; -+ bias-pull-up; -+ }; -+ -+ conf-pull-none { -+ pins = "MIO7", "MIO8"; -+ bias-disable; -+ }; -+ }; -+ -+ pinctrl_i2c0_default: i2c0-default { -+ mux { -+ groups = "i2c0_10_grp"; -+ function = "i2c0"; -+ }; -+ -+ conf { -+ groups = "i2c0_10_grp"; -+ bias-pull-up; -+ slew-rate = <0>; -+ io-standard = <1>; -+ }; -+ }; -+ -+ pinctrl_i2c0_gpio: i2c0-gpio { -+ mux { -+ groups = "gpio0_50_grp", "gpio0_51_grp"; -+ function = "gpio0"; -+ }; -+ -+ conf { -+ groups = "gpio0_50_grp", "gpio0_51_grp"; -+ slew-rate = <0>; -+ io-standard = <1>; -+ }; -+ }; -+ -+ pinctrl_sdhci0_default: sdhci0-default { -+ mux { -+ groups = "sdio0_2_grp"; -+ function = "sdio0"; -+ }; -+ -+ conf { -+ groups = "sdio0_2_grp"; -+ slew-rate = <0>; -+ io-standard = <1>; -+ bias-disable; -+ }; -+ -+ mux-cd { -+ groups = "gpio0_0_grp"; -+ function = "sdio0_cd"; -+ }; -+ -+ conf-cd { -+ groups = "gpio0_0_grp"; -+ bias-high-impedance; -+ bias-pull-up; -+ slew-rate = <0>; -+ io-standard = <1>; -+ }; -+ -+ mux-wp { -+ groups = "gpio0_15_grp"; -+ function = "sdio0_wp"; -+ }; -+ -+ conf-wp { -+ groups = "gpio0_15_grp"; -+ bias-high-impedance; -+ bias-pull-up; -+ slew-rate = <0>; -+ io-standard = <1>; -+ }; -+ }; -+ -+ pinctrl_uart1_default: uart1-default { -+ mux { -+ groups = "uart1_10_grp"; -+ function = "uart1"; -+ }; -+ -+ conf { -+ groups = "uart1_10_grp"; -+ slew-rate = <0>; -+ io-standard = <1>; -+ }; -+ -+ conf-rx { -+ pins = "MIO25"; -+ bias-high-impedance; -+ }; -+ -+ conf-tx { -+ pins = "MIO24"; -+ bias-disable; -+ }; -+ }; -+}; -+ -+&qspi { -+ u-boot,dm-pre-reloc; -+ status = "disabled"; -+ is-dual = <0>; -+ num-cs = <1>; -+ flash@0 { -+ compatible = "n25q128a11"; -+ reg = <0x0>; -+ spi-tx-bus-width = <1>; -+ spi-rx-bus-width = <4>; -+ spi-max-frequency = <50000000>; -+ #address-cells = <1>; -+ #size-cells = <1>; -+ partition@qspi-fsbl-uboot { -+ label = "qspi-fsbl-uboot"; -+ reg = <0x0 0x100000>; -+ }; -+ partition@qspi-linux { -+ label = "qspi-linux"; -+ reg = <0x100000 0x500000>; -+ }; -+ partition@qspi-device-tree { -+ label = "qspi-device-tree"; -+ reg = <0x600000 0x20000>; -+ }; -+ partition@qspi-rootfs { -+ label = "qspi-rootfs"; -+ reg = <0x620000 0x5E0000>; -+ }; -+ partition@qspi-bitstream { -+ label = "qspi-bitstream"; -+ reg = <0xC00000 0x400000>; -+ }; -+ }; -+}; -+ -+&sdhci0 { -+ u-boot,dm-pre-reloc; -+ status = "okay"; -+}; -+ -+&uart1 { -+ u-boot,dm-pre-reloc; -+ status = "okay"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_uart1_default>; -+}; --- -2.23.0 - diff --git a/buildroot/board/qmtech/zynq/readme.txt b/buildroot/board/qmtech/zynq/readme.txt deleted file mode 100644 index 5fb95bb90b..0000000000 --- a/buildroot/board/qmtech/zynq/readme.txt +++ /dev/null @@ -1,76 +0,0 @@ -******************************* -QMTECH Zynq XC7Z010 Starter Kit -******************************* - -This file documents the Buildroot support for the QMTECH [1] Zynq -XC7Z010 Starter Kit [2]. It is a low cost (~55$) Zynq based -development board. The board user manual is available at -[3]. Additional files are available on Github [4]. - - -Build -===== - -First, configure Buildroot for the QMTECH Zynq board: - - make zynq_qmtech_defconfig - -Build all components: - - make - -You will find in output/images/ the following files: - - boot.bin - - boot.vfat - - devicetree.dtb - - rootfs.cpio - - rootfs.cpio.gz - - rootfs.cpio.uboot - - rootfs.tar - - sdcard.img - - u-boot.bin - - u-boot.img - - uImage - - zynq-qmtech.dtb - - -Create a bootable micro SD card -=============================== - -To determine the device associated to the micro SD card have a look in -the /proc/partitions file: - - cat /proc/partitions - -Buildroot prepares a bootable "sdcard.img" image in the output/images/ -directory, ready to be dumped on a micro SD card. Launch the following -command as root: - - dd if=output/images/sdcard.img of=/dev/ - -*** WARNING! This will destroy all the card content. Use with care! *** - - -Boot the QMTECH Zynq board -========================== - -To boot your newly created system: -- put a mini USB cable into the J4 Debug USB Port and connect using a - terminal emulator at 115200 bps, 8n1, -- put the prepared micro SD card in the J2 micro SD card slot, -- plug the 5V power supply on the JP4 barrel jack. - -Enjoy! - - -[1]. QMTECH: - http://www.chinaqmtech.com/ - -[2]. QMTECH Zynq XC7Z010 Starter Kit Product Page: - http://www.chinaqmtech.com/xilinx_zynq_soc - -[3]. QMTECH Zynq XC7Z010 Starter Kit Hardware User Manual: - http://www.chinaqmtech.com/filedownload/32552 - -[4]. QMTECH Github: - https://github.com/ChinaQMTECH/ZYNQ_STARTER_KIT diff --git a/buildroot/board/radxa/rock5b/extlinux.conf b/buildroot/board/radxa/rock5b/extlinux.conf new file mode 100644 index 0000000000..c4198deaa0 --- /dev/null +++ b/buildroot/board/radxa/rock5b/extlinux.conf @@ -0,0 +1,4 @@ +label Radxa Rock 5b Linux + kernel /boot/Image + devicetree /boot/rk3588-rock-5b.dtb + append root=PARTLABEL=rootfs earlycon rootwait diff --git a/buildroot/board/radxa/rock5b/genimage.cfg b/buildroot/board/radxa/rock5b/genimage.cfg new file mode 100644 index 0000000000..070cc03dc2 --- /dev/null +++ b/buildroot/board/radxa/rock5b/genimage.cfg @@ -0,0 +1,25 @@ +# SD card image for Radxa Rock 5b + +image sdcard.img { + hdimage { + partition-table-type = "gpt" + } + + partition uboot { + in-partition-table = "false" + image = "u-boot-rockchip.bin" + offset = 32K + } + + partition uboot-env { + partition-type-uuid = 3de21764-95bd-54bd-a5c3-4abe786f38a8 + offset = 16M + size = 64K + } + + partition rootfs { + partition-type-uuid = L + image = "rootfs.ext2" + bootable = true + } +} diff --git a/buildroot/board/radxa/rock5b/linux.fragment b/buildroot/board/radxa/rock5b/linux.fragment new file mode 100644 index 0000000000..90f2f291ba --- /dev/null +++ b/buildroot/board/radxa/rock5b/linux.fragment @@ -0,0 +1,2 @@ +CONFIG_R8169=y +CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY=y diff --git a/buildroot/board/radxa/rock5b/patches/linux-headers/linux-headers.hash b/buildroot/board/radxa/rock5b/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/radxa/rock5b/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/radxa/rock5b/patches/linux/linux.hash b/buildroot/board/radxa/rock5b/patches/linux/linux.hash new file mode 100644 index 0000000000..005667b1f1 --- /dev/null +++ b/buildroot/board/radxa/rock5b/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 057263d0afc17d5253794afd3d239ba4da4aa734b22fa36c1665f41b95449b73 linux-6.11.3.tar.xz diff --git a/buildroot/board/radxa/rock5b/patches/uboot/uboot.hash b/buildroot/board/radxa/rock5b/patches/uboot/uboot.hash new file mode 100644 index 0000000000..904fa56c02 --- /dev/null +++ b/buildroot/board/radxa/rock5b/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0 u-boot-2024.10.tar.bz2 diff --git a/buildroot/board/radxa/rock5b/post-build.sh b/buildroot/board/radxa/rock5b/post-build.sh new file mode 100755 index 0000000000..d84a5da0b0 --- /dev/null +++ b/buildroot/board/radxa/rock5b/post-build.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +BOARD_DIR="$(dirname "$0")" + +install -m 0644 -D "$BOARD_DIR"/extlinux.conf "$TARGET_DIR"/boot/extlinux/extlinux.conf diff --git a/buildroot/board/radxa/rock5b/readme.txt b/buildroot/board/radxa/rock5b/readme.txt new file mode 100644 index 0000000000..441c28db25 --- /dev/null +++ b/buildroot/board/radxa/rock5b/readme.txt @@ -0,0 +1,57 @@ +RADXA ROCK 5B +============== +https://wiki.radxa.com/Rock5/hardware/5b + +Build: +====== + $ make rock5b_defconfig + $ make + +Files created in output directory +================================= + +output/images +. +├── Image +├── rk3588_bl31_v1.40.elf +├── rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin +├── rk3588-rock-5b.dtb +├── rootfs.ext2 +├── rootfs.ext4 +├── rootfs.tar +├── sdcard.img +├── u-boot.bin +└── u-boot-rockchip.bin + +Creating bootable SD card: +========================== + +Simply invoke (as root) + +sudo dd if=output/images/sdcard.img of=/dev/sdX && sync + +Where X is your SD card device. + +Booting: +======== + +Serial console: +--------------- +The Rock 5B has a 40-pin GPIO header. Its layout can be seen here: +https://wiki.radxa.com/Rock5/hardware/5b/gpio + +The Uart pins are as follows: + +pin 6: gnd +pin 8: tx +pin 10: rx + +Baudrate for this board is 1500000. + +Login: +------ +Enter 'root' as login user, and the prompt is ready. + +wiki link: +---------- +https://forum.radxa.com/c/rock5 diff --git a/buildroot/board/radxa/rock5b/u-boot.fragment b/buildroot/board/radxa/rock5b/u-boot.fragment new file mode 100644 index 0000000000..ceba8d609a --- /dev/null +++ b/buildroot/board/radxa/rock5b/u-boot.fragment @@ -0,0 +1,5 @@ +CONFIG_ENV_SIZE=0x10000 +CONFIG_PARTITION_TYPE_GUID=y +# CONFIG_ENV_IS_NOWHERE is not set +CONFIG_ENV_IS_IN_MMC=y +CONFIG_SYS_MMC_ENV_DEV=1 diff --git a/buildroot/board/radxa/rockpi-4/extlinux.conf b/buildroot/board/radxa/rockpi-4/extlinux.conf deleted file mode 100644 index 83374f174a..0000000000 --- a/buildroot/board/radxa/rockpi-4/extlinux.conf +++ /dev/null @@ -1,4 +0,0 @@ -label RK3399_ROCK_PI_4 linux - kernel /Image - devicetree /rk3399-rock-pi-4.dtb - append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk1p4 rw rootwait diff --git a/buildroot/board/radxa/rockpi-4/genimage.cfg b/buildroot/board/radxa/rockpi-4/genimage.cfg deleted file mode 100644 index 68cc4d61a8..0000000000 --- a/buildroot/board/radxa/rockpi-4/genimage.cfg +++ /dev/null @@ -1,39 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "rk3399-rock-pi-4.dtb", - "extlinux" - } - } - - size = 112M -} - -image sdcard.img { - hdimage { - partition-table-type = "gpt" - } - - partition loader1 { - image = "idbloader.img" - offset = 32K - } - - partition loader2 { - image = "u-boot.itb" - offset = 8M - } - - partition boot { - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b - bootable = "true" - image = "boot.vfat" - offset = 16M - } - - partition rootfs { - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae - image = "rootfs.ext4" - } -} diff --git a/buildroot/board/radxa/rockpi-4/post-build.sh b/buildroot/board/radxa/rockpi-4/post-build.sh deleted file mode 100755 index ba29375c05..0000000000 --- a/buildroot/board/radxa/rockpi-4/post-build.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" - -install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf diff --git a/buildroot/board/radxa/rockpi-4/readme.txt b/buildroot/board/radxa/rockpi-4/readme.txt deleted file mode 100644 index 1db7569ed9..0000000000 --- a/buildroot/board/radxa/rockpi-4/readme.txt +++ /dev/null @@ -1,61 +0,0 @@ -RADXA ROCK_PI_4 -================ -https://rockpi.org/rockpi4 - -ROCK Pi 4 is a Single Board Computer (SBC) from radxa. This guide is valid -for the below models: -- ROCK PI 4 Model A -- ROCK PI 4 Model B -- ROCK PI 4 Model C - -Build: -====== - $ make rock_pi_4_defconfig - $ make - -Files created in output directory -================================= - -output/images - -├── bl31.elf -├── boot.vfat -├── extlinux -├── idbloader.img -├── Image -├── rk3399-rock-pi-4.dtb -├── rootfs.ext2 -├── rootfs.ext4 -> rootfs.ext2 -├── rootfs.tar -├── sdcard.img -├── u-boot.bin -└── u-boot.itb - -Creating bootable SD card: -========================== - -Simply invoke (as root) - -sudo dd if=output/images/sdcard.img of=/dev/sdX && sync - -Where X is your SD card device. - -Booting: -======== - -Serial console: ---------------- -RockPi4 has a 40-pin GPIO header. The pin layout is as follows: - -pin 6: gnd -pin 8: tx -pin 10: rx - -Baudrate for this board is 1500000. - -Login: ------- -Enter 'root' as login user, and the prompt is ready. - -Wiki link: -https://wiki.amarulasolutions.com/bsp/rockchip/rk3399/rock-pi-4.html diff --git a/buildroot/board/radxa/rockpi-n10/extlinux.conf b/buildroot/board/radxa/rockpi-n10/extlinux.conf deleted file mode 100644 index b6a4c97cd9..0000000000 --- a/buildroot/board/radxa/rockpi-n10/extlinux.conf +++ /dev/null @@ -1,4 +0,0 @@ -label RK3399_ROCK_PI_N10 linux - kernel /Image - devicetree /rk3399pro-rock-pi-n10.dtb - append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk0p4 rw rootwait diff --git a/buildroot/board/radxa/rockpi-n10/genimage.cfg b/buildroot/board/radxa/rockpi-n10/genimage.cfg deleted file mode 100644 index 7f4b639bbc..0000000000 --- a/buildroot/board/radxa/rockpi-n10/genimage.cfg +++ /dev/null @@ -1,39 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "rk3399pro-rock-pi-n10.dtb", - "extlinux" - } - } - - size = 112M -} - -image sdcard.img { - hdimage { - partition-table-type = "gpt" - } - - partition loader1 { - image = "idbloader.img" - offset = 32K - } - - partition loader2 { - image = "u-boot.itb" - offset = 8M - } - - partition boot { - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b - bootable = "true" - image = "boot.vfat" - offset = 16M - } - - partition rootfs { - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae - image = "rootfs.ext4" - } -} diff --git a/buildroot/board/radxa/rockpi-n10/post-build.sh b/buildroot/board/radxa/rockpi-n10/post-build.sh deleted file mode 100755 index ba29375c05..0000000000 --- a/buildroot/board/radxa/rockpi-n10/post-build.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" - -install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf diff --git a/buildroot/board/radxa/rockpi-n10/readme.txt b/buildroot/board/radxa/rockpi-n10/readme.txt deleted file mode 100644 index 49decbb3d9..0000000000 --- a/buildroot/board/radxa/rockpi-n10/readme.txt +++ /dev/null @@ -1,61 +0,0 @@ -RADXA ROCKPI-N10 -================ -https://wiki.radxa.com/RockpiN10 - -Build: -====== - $ make rock_pi_n10_defconfig - $ make - -Files created in output directory -================================= - -output/images -. -├── bl31.elf -├── boot.vfat -├── extlinux -├── idbloader.img -├── Image -├── rk3399pro-rock-pi-n10.dtb -├── rootfs.ext2 -├── rootfs.ext4 -> rootfs.ext2 -├── rootfs.tar -├── sdcard.img -├── u-boot.bin -└── u-boot.itb - -Creating bootable SD card: -========================== - -Simply invoke (as root) - -sudo dd if=output/images/sdcard.img of=/dev/sdX && sync - -Where X is your SD card device. - -Booting: -======== - -Serial console: ---------------- -RockPi-N10 has a 40-pin GPIO header. The pin layout is as follows: - -pin 6: gnd -pin 8: tx -pin 10: rx - -Baudrate for this board is 1500000. - -The boot order on rockpi-n10 is emmc, sd. If emmc contains a valid Image, the board -always boots from emmc. To boot from SD, erase emmc as per the guide: - -https://wiki.amarulasolutions.com/bsp/setup/rockchip/rk3399_emmc.html - -Login: ------- -Enter 'root' as login user, and the prompt is ready. - -wiki link: ----------- -https://wiki.amarulasolutions.com/bsp/rockchip/rk3399pro/rock-pi-n10.html diff --git a/buildroot/board/radxa/rockpi-n8/genimage.cfg b/buildroot/board/radxa/rockpi-n8/genimage.cfg index 909a646499..bfcd92f590 100644 --- a/buildroot/board/radxa/rockpi-n8/genimage.cfg +++ b/buildroot/board/radxa/rockpi-n8/genimage.cfg @@ -26,7 +26,7 @@ image sdcard.img { } partition boot { - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + partition-type-uuid = F bootable = "true" image = "boot.vfat" offset = 16M diff --git a/buildroot/package/rpi-firmware/cmdline.txt b/buildroot/board/raspberrypi/cmdline.txt similarity index 100% rename from buildroot/package/rpi-firmware/cmdline.txt rename to buildroot/board/raspberrypi/cmdline.txt diff --git a/buildroot/board/raspberrypi/cmdline_5.txt b/buildroot/board/raspberrypi/cmdline_5.txt new file mode 100644 index 0000000000..ac457353e2 --- /dev/null +++ b/buildroot/board/raspberrypi/cmdline_5.txt @@ -0,0 +1 @@ +root=/dev/mmcblk0p2 rootwait console=tty1 console=ttyAMA10,115200 diff --git a/buildroot/board/raspberrypi/config_0w.txt b/buildroot/board/raspberrypi/config_0w.txt index 195bad449e..123e09cf56 100644 --- a/buildroot/board/raspberrypi/config_0w.txt +++ b/buildroot/board/raspberrypi/config_0w.txt @@ -22,8 +22,8 @@ gpu_mem_256=100 gpu_mem_512=100 gpu_mem_1024=100 -# fixes rpi (3B, 3B+, 3A+, 4B and Zero W) ttyAMA0 serial console +# Enable UART0 for serial console on ttyAMA0 dtoverlay=miniuart-bt # enable autoprobing of Bluetooth driver without need of hciattach/btattach -dtoverlay=krnbt=on +dtparam=krnbt=on diff --git a/buildroot/board/raspberrypi/config_3.txt b/buildroot/board/raspberrypi/config_3.txt index 195bad449e..123e09cf56 100644 --- a/buildroot/board/raspberrypi/config_3.txt +++ b/buildroot/board/raspberrypi/config_3.txt @@ -22,8 +22,8 @@ gpu_mem_256=100 gpu_mem_512=100 gpu_mem_1024=100 -# fixes rpi (3B, 3B+, 3A+, 4B and Zero W) ttyAMA0 serial console +# Enable UART0 for serial console on ttyAMA0 dtoverlay=miniuart-bt # enable autoprobing of Bluetooth driver without need of hciattach/btattach -dtoverlay=krnbt=on +dtparam=krnbt=on diff --git a/buildroot/board/raspberrypi/config_3_64bit.txt b/buildroot/board/raspberrypi/config_3_64bit.txt index 34412fa9e8..88206e9b14 100644 --- a/buildroot/board/raspberrypi/config_3_64bit.txt +++ b/buildroot/board/raspberrypi/config_3_64bit.txt @@ -22,11 +22,11 @@ gpu_mem_256=100 gpu_mem_512=100 gpu_mem_1024=100 -# fixes rpi (3B, 3B+, 3A+, 4B and Zero W) ttyAMA0 serial console +# Enable UART0 for serial console on ttyAMA0 dtoverlay=miniuart-bt # enable autoprobing of Bluetooth driver without need of hciattach/btattach -dtoverlay=krnbt=on +dtparam=krnbt=on # enable 64bits support arm_64bit=1 diff --git a/buildroot/board/raspberrypi/config_3_qt5we.txt b/buildroot/board/raspberrypi/config_3_qt5we.txt index 752310b179..3d81a4e5da 100644 --- a/buildroot/board/raspberrypi/config_3_qt5we.txt +++ b/buildroot/board/raspberrypi/config_3_qt5we.txt @@ -22,5 +22,5 @@ gpu_mem_256=100 gpu_mem_512=100 gpu_mem_1024=200 -# fixes rpi (3B, 3B+, 3A+, 4B and Zero W) ttyAMA0 serial console +# Enable UART0 for serial console on ttyAMA0 dtoverlay=miniuart-bt diff --git a/buildroot/board/raspberrypi/config_4.txt b/buildroot/board/raspberrypi/config_4.txt index ea02d3f071..9b77d23d74 100644 --- a/buildroot/board/raspberrypi/config_4.txt +++ b/buildroot/board/raspberrypi/config_4.txt @@ -22,8 +22,8 @@ gpu_mem_256=100 gpu_mem_512=100 gpu_mem_1024=100 -# fixes rpi (3B, 3B+, 3A+, 4B and Zero W) ttyAMA0 serial console +# Enable UART0 for serial console on ttyAMA0 dtoverlay=miniuart-bt # enable autoprobing of Bluetooth driver without need of hciattach/btattach -dtoverlay=krnbt=on +dtparam=krnbt=on diff --git a/buildroot/board/raspberrypi/config_4_64bit.txt b/buildroot/board/raspberrypi/config_4_64bit.txt index 41c7e97e99..fcb1c5c30a 100644 --- a/buildroot/board/raspberrypi/config_4_64bit.txt +++ b/buildroot/board/raspberrypi/config_4_64bit.txt @@ -22,15 +22,11 @@ gpu_mem_256=100 gpu_mem_512=100 gpu_mem_1024=100 -# fixes rpi (3B, 3B+, 3A+, 4B and Zero W) ttyAMA0 serial console +# Enable UART0 for serial console on ttyAMA0 dtoverlay=miniuart-bt # enable autoprobing of Bluetooth driver without need of hciattach/btattach -dtoverlay=krnbt=on - -dtoverlay=vc4-kms-v3d-pi4 -dtoverlay=imx219 -#dtoverlay=ov5647 +dtparam=krnbt=on # enable 64bits support arm_64bit=1 diff --git a/buildroot/board/raspberrypi/config_5.txt b/buildroot/board/raspberrypi/config_5.txt new file mode 100644 index 0000000000..bbed19fe46 --- /dev/null +++ b/buildroot/board/raspberrypi/config_5.txt @@ -0,0 +1,14 @@ +# Please note that this is only a sample, we recommend you to change it to fit +# your needs. +# You should override this file using BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE. +# See http://buildroot.org/manual.html#rootfs-custom +# and http://elinux.org/RPiconfig for a description of config.txt syntax + +kernel=Image + +# To use an external initramfs file +#initramfs rootfs.cpio.gz + +# Disable overscan assuming the display supports displaying the full resolution +# If the text shown on the screen disappears off the edge, comment this out +disable_overscan=1 diff --git a/buildroot/board/raspberrypi/config_cm4io.txt b/buildroot/board/raspberrypi/config_cm4io.txt index cf7e6df1a1..15751e7187 100644 --- a/buildroot/board/raspberrypi/config_cm4io.txt +++ b/buildroot/board/raspberrypi/config_cm4io.txt @@ -22,7 +22,7 @@ gpu_mem_256=100 gpu_mem_512=100 gpu_mem_1024=100 -# fixes rpi (3B, 3B+, 3A+, 4B and Zero W) ttyAMA0 serial console +# Enable UART0 for serial console on ttyAMA0 dtoverlay=miniuart-bt # enable RTC diff --git a/buildroot/board/raspberrypi/config_cm4io_64bit.txt b/buildroot/board/raspberrypi/config_cm4io_64bit.txt index 813f6eba7b..4884bda553 100644 --- a/buildroot/board/raspberrypi/config_cm4io_64bit.txt +++ b/buildroot/board/raspberrypi/config_cm4io_64bit.txt @@ -22,7 +22,7 @@ gpu_mem_256=100 gpu_mem_512=100 gpu_mem_1024=100 -# fixes rpi (3B, 3B+, 3A+, 4B and Zero W) ttyAMA0 serial console +# Enable UART0 for serial console on ttyAMA0 dtoverlay=miniuart-bt # enable RTC diff --git a/buildroot/board/raspberrypi/config_zero2w.txt b/buildroot/board/raspberrypi/config_zero2w.txt index 9e6b7f5ccf..123e09cf56 100644 --- a/buildroot/board/raspberrypi/config_zero2w.txt +++ b/buildroot/board/raspberrypi/config_zero2w.txt @@ -22,8 +22,8 @@ gpu_mem_256=100 gpu_mem_512=100 gpu_mem_1024=100 -# fixes rpi (3B, 3B+, 3A+, 4B ,zero W and zero 2) ttyAMA0 serial console +# Enable UART0 for serial console on ttyAMA0 dtoverlay=miniuart-bt # enable autoprobing of Bluetooth driver without need of hciattach/btattach -dtoverlay=krnbt=on +dtparam=krnbt=on diff --git a/buildroot/board/raspberrypi/genimage-raspberrypi.cfg b/buildroot/board/raspberrypi/genimage-raspberrypi.cfg deleted file mode 100644 index 04be16cce6..0000000000 --- a/buildroot/board/raspberrypi/genimage-raspberrypi.cfg +++ /dev/null @@ -1,33 +0,0 @@ -image boot.vfat { - vfat { - files = { - "bcm2708-rpi-b.dtb", - "bcm2708-rpi-b-plus.dtb", - "bcm2708-rpi-cm.dtb", - "rpi-firmware/bootcode.bin", - "rpi-firmware/cmdline.txt", - "rpi-firmware/config.txt", - "rpi-firmware/fixup.dat", - "rpi-firmware/start.elf", - "zImage" - } - } - - size = 32M -} - -image sdcard.img { - hdimage { - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/buildroot/board/raspberrypi/genimage-raspberrypi0.cfg b/buildroot/board/raspberrypi/genimage-raspberrypi0.cfg deleted file mode 100644 index 1fa3f5096f..0000000000 --- a/buildroot/board/raspberrypi/genimage-raspberrypi0.cfg +++ /dev/null @@ -1,31 +0,0 @@ -image boot.vfat { - vfat { - files = { - "bcm2708-rpi-zero.dtb", - "rpi-firmware/bootcode.bin", - "rpi-firmware/cmdline.txt", - "rpi-firmware/config.txt", - "rpi-firmware/fixup.dat", - "rpi-firmware/start.elf", - "zImage" - } - } - - size = 32M -} - -image sdcard.img { - hdimage { - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/buildroot/board/raspberrypi/genimage-raspberrypi0w.cfg b/buildroot/board/raspberrypi/genimage-raspberrypi0w.cfg deleted file mode 100644 index de7652f99e..0000000000 --- a/buildroot/board/raspberrypi/genimage-raspberrypi0w.cfg +++ /dev/null @@ -1,32 +0,0 @@ -image boot.vfat { - vfat { - files = { - "bcm2708-rpi-zero-w.dtb", - "rpi-firmware/bootcode.bin", - "rpi-firmware/cmdline.txt", - "rpi-firmware/config.txt", - "rpi-firmware/fixup.dat", - "rpi-firmware/start.elf", - "rpi-firmware/overlays", - "zImage" - } - } - - size = 32M -} - -image sdcard.img { - hdimage { - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/buildroot/board/raspberrypi/genimage-raspberrypi2.cfg b/buildroot/board/raspberrypi/genimage-raspberrypi2.cfg deleted file mode 100644 index acd23e7ca8..0000000000 --- a/buildroot/board/raspberrypi/genimage-raspberrypi2.cfg +++ /dev/null @@ -1,31 +0,0 @@ -image boot.vfat { - vfat { - files = { - "bcm2709-rpi-2-b.dtb", - "rpi-firmware/bootcode.bin", - "rpi-firmware/cmdline.txt", - "rpi-firmware/config.txt", - "rpi-firmware/fixup.dat", - "rpi-firmware/start.elf", - "zImage" - } - } - - size = 32M -} - -image sdcard.img { - hdimage { - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/buildroot/board/raspberrypi/genimage-raspberrypi3-64.cfg b/buildroot/board/raspberrypi/genimage-raspberrypi3-64.cfg deleted file mode 100644 index 8cbcd91638..0000000000 --- a/buildroot/board/raspberrypi/genimage-raspberrypi3-64.cfg +++ /dev/null @@ -1,34 +0,0 @@ -image boot.vfat { - vfat { - files = { - "bcm2710-rpi-3-b.dtb", - "bcm2710-rpi-3-b-plus.dtb", - "bcm2837-rpi-3-b.dtb", - "rpi-firmware/bootcode.bin", - "rpi-firmware/cmdline.txt", - "rpi-firmware/config.txt", - "rpi-firmware/fixup.dat", - "rpi-firmware/start.elf", - "rpi-firmware/overlays", - "Image" - } - } - - size = 32M -} - -image sdcard.img { - hdimage { - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/buildroot/board/raspberrypi/genimage-raspberrypi3.cfg b/buildroot/board/raspberrypi/genimage-raspberrypi3.cfg deleted file mode 100644 index a617823379..0000000000 --- a/buildroot/board/raspberrypi/genimage-raspberrypi3.cfg +++ /dev/null @@ -1,34 +0,0 @@ -image boot.vfat { - vfat { - files = { - "bcm2710-rpi-3-b.dtb", - "bcm2710-rpi-3-b-plus.dtb", - "bcm2710-rpi-cm3.dtb", - "rpi-firmware/bootcode.bin", - "rpi-firmware/cmdline.txt", - "rpi-firmware/config.txt", - "rpi-firmware/fixup.dat", - "rpi-firmware/start.elf", - "rpi-firmware/overlays", - "zImage" - } - } - - size = 32M -} - -image sdcard.img { - hdimage { - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/buildroot/board/raspberrypi/genimage-raspberrypi4-64.cfg b/buildroot/board/raspberrypi/genimage-raspberrypi4-64.cfg deleted file mode 100644 index 3ae938db20..0000000000 --- a/buildroot/board/raspberrypi/genimage-raspberrypi4-64.cfg +++ /dev/null @@ -1,31 +0,0 @@ -image boot.vfat { - vfat { - files = { - "bcm2711-rpi-4-b.dtb", - "rpi-firmware/cmdline.txt", - "rpi-firmware/config.txt", - "rpi-firmware/fixup4.dat", - "rpi-firmware/start4.elf", - "rpi-firmware/overlays", - "Image" - } - } - - size = 32M -} - -image sdcard.img { - hdimage { - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/buildroot/board/raspberrypi/genimage-raspberrypi4.cfg b/buildroot/board/raspberrypi/genimage-raspberrypi4.cfg deleted file mode 100644 index 2e578ad556..0000000000 --- a/buildroot/board/raspberrypi/genimage-raspberrypi4.cfg +++ /dev/null @@ -1,31 +0,0 @@ -image boot.vfat { - vfat { - files = { - "bcm2711-rpi-4-b.dtb", - "rpi-firmware/cmdline.txt", - "rpi-firmware/config.txt", - "rpi-firmware/fixup4.dat", - "rpi-firmware/start4.elf", - "rpi-firmware/overlays", - "zImage" - } - } - - size = 32M -} - -image sdcard.img { - hdimage { - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/buildroot/board/raspberrypi/genimage-raspberrypicm4io-64.cfg b/buildroot/board/raspberrypi/genimage-raspberrypicm4io-64.cfg deleted file mode 100644 index 73d31a57ba..0000000000 --- a/buildroot/board/raspberrypi/genimage-raspberrypicm4io-64.cfg +++ /dev/null @@ -1,31 +0,0 @@ -image boot.vfat { - vfat { - files = { - "bcm2711-rpi-cm4.dtb", - "rpi-firmware/cmdline.txt", - "rpi-firmware/config.txt", - "rpi-firmware/fixup4.dat", - "rpi-firmware/start4.elf", - "rpi-firmware/overlays", - "Image" - } - } - - size = 32M -} - -image sdcard.img { - hdimage { - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/buildroot/board/raspberrypi/genimage-raspberrypicm4io.cfg b/buildroot/board/raspberrypi/genimage-raspberrypicm4io.cfg deleted file mode 100644 index 4d09b03556..0000000000 --- a/buildroot/board/raspberrypi/genimage-raspberrypicm4io.cfg +++ /dev/null @@ -1,31 +0,0 @@ -image boot.vfat { - vfat { - files = { - "bcm2711-rpi-cm4.dtb", - "rpi-firmware/cmdline.txt", - "rpi-firmware/config.txt", - "rpi-firmware/fixup4.dat", - "rpi-firmware/start4.elf", - "rpi-firmware/overlays", - "zImage" - } - } - - size = 32M -} - -image sdcard.img { - hdimage { - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/buildroot/board/raspberrypi/genimage-raspberrypizero2w.cfg b/buildroot/board/raspberrypi/genimage-raspberrypizero2w.cfg deleted file mode 100644 index b510fea563..0000000000 --- a/buildroot/board/raspberrypi/genimage-raspberrypizero2w.cfg +++ /dev/null @@ -1,32 +0,0 @@ -image boot.vfat { - vfat { - files = { - "bcm2710-rpi-zero-2-w.dtb", - "rpi-firmware/bootcode.bin", - "rpi-firmware/cmdline.txt", - "rpi-firmware/config.txt", - "rpi-firmware/fixup.dat", - "rpi-firmware/start.elf", - "rpi-firmware/overlays", - "zImage" - } - } - - size = 32M -} - -image sdcard.img { - hdimage { - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/buildroot/board/raspberrypi/genimage.cfg.in b/buildroot/board/raspberrypi/genimage.cfg.in new file mode 100644 index 0000000000..fd38b86a0c --- /dev/null +++ b/buildroot/board/raspberrypi/genimage.cfg.in @@ -0,0 +1,25 @@ +image boot.vfat { + vfat { + files = { +#BOOT_FILES# + } + } + + size = 32M +} + +image sdcard.img { + hdimage { + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/buildroot/board/raspberrypi/linux-4k-page-size.fragment b/buildroot/board/raspberrypi/linux-4k-page-size.fragment new file mode 100644 index 0000000000..5df91df1aa --- /dev/null +++ b/buildroot/board/raspberrypi/linux-4k-page-size.fragment @@ -0,0 +1 @@ +CONFIG_ARM64_4K_PAGES=y diff --git a/buildroot/board/raspberrypi/patches/linux-headers/linux-headers.hash b/buildroot/board/raspberrypi/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/raspberrypi/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/raspberrypi/patches/linux/linux.hash b/buildroot/board/raspberrypi/patches/linux/linux.hash new file mode 100644 index 0000000000..8d43c25151 --- /dev/null +++ b/buildroot/board/raspberrypi/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 dab3052783c68c46a5bc645b1c38d9705da995ab42823566518b62eb1fa1ef97 linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz diff --git a/buildroot/board/raspberrypi/post-build.sh b/buildroot/board/raspberrypi/post-build.sh index 5e5eb71100..73026e5922 100755 --- a/buildroot/board/raspberrypi/post-build.sh +++ b/buildroot/board/raspberrypi/post-build.sh @@ -8,4 +8,9 @@ if [ -e ${TARGET_DIR}/etc/inittab ]; then grep -qE '^tty1::' ${TARGET_DIR}/etc/inittab || \ sed -i '/GENERIC_SERIAL/a\ tty1::respawn:/sbin/getty -L tty1 0 vt100 # HDMI console' ${TARGET_DIR}/etc/inittab +# systemd doesn't use /etc/inittab, enable getty.tty1.service instead +elif [ -d ${TARGET_DIR}/etc/systemd ]; then + mkdir -p "${TARGET_DIR}/etc/systemd/system/getty.target.wants" + ln -sf /lib/systemd/system/getty@.service \ + "${TARGET_DIR}/etc/systemd/system/getty.target.wants/getty@tty1.service" fi diff --git a/buildroot/board/raspberrypi/post-image.sh b/buildroot/board/raspberrypi/post-image.sh index 6cad20fb9e..9b9eac972b 100755 --- a/buildroot/board/raspberrypi/post-image.sh +++ b/buildroot/board/raspberrypi/post-image.sh @@ -7,6 +7,23 @@ BOARD_NAME="$(basename ${BOARD_DIR})" GENIMAGE_CFG="${BOARD_DIR}/genimage-${BOARD_NAME}.cfg" GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" +# generate genimage from template if a board specific variant doesn't exists +if [ ! -e "${GENIMAGE_CFG}" ]; then + GENIMAGE_CFG="${BINARIES_DIR}/genimage.cfg" + FILES=() + + for i in "${BINARIES_DIR}"/*.dtb "${BINARIES_DIR}"/rpi-firmware/*; do + FILES+=( "${i#${BINARIES_DIR}/}" ) + done + + KERNEL=$(sed -n 's/^kernel=//p' "${BINARIES_DIR}/rpi-firmware/config.txt") + FILES+=( "${KERNEL}" ) + + BOOT_FILES=$(printf '\\t\\t\\t"%s",\\n' "${FILES[@]}") + sed "s|#BOOT_FILES#|${BOOT_FILES}|" "${BOARD_DIR}/genimage.cfg.in" \ + > "${GENIMAGE_CFG}" +fi + # Pass an empty rootpath. genimage makes a full copy of the given rootpath to # ${GENIMAGE_TMP}/root so passing TARGET_DIR would be a waste of time and disk # space. We don't rely on genimage to build the rootfs image, just to insert a diff --git a/buildroot/board/raspberrypi/readme.txt b/buildroot/board/raspberrypi/readme.txt index c81fd801ae..81cd81a7f3 100644 --- a/buildroot/board/raspberrypi/readme.txt +++ b/buildroot/board/raspberrypi/readme.txt @@ -10,6 +10,7 @@ These instructions apply to all models of the Raspberry Pi: - the model B3 (aka Raspberry Pi 3). - the model B4 (aka Raspberry Pi 4). - the model CM4 (aka Raspberry Pi Compute Module 4 and IO Board). + - the model B5 (aka Raspberry Pi 5). How to build it =============== @@ -17,8 +18,8 @@ How to build it Configure Buildroot ------------------- -There are two RaspberryPi defconfig files in Buildroot, one for each -major variant, which you should base your work on: +There are several Raspberry Pi defconfig files in Buildroot, one for +each major variant, which you should base your work on: For models A, B, A+ or B+: @@ -28,6 +29,10 @@ For model Zero (model A+ in smaller form factor): $ make raspberrypi0_defconfig +or for model Zero W (model Zero with wireless LAN and Bluetooth): + + $ make raspberrypi0w_defconfig + For model Zero 2 W (model B3 in smaller form factor): $ make raspberrypizero2w_defconfig @@ -60,6 +65,10 @@ or for CM4 (on IO Board - 64 bit): $ make raspberrypicm4io_64_defconfig +For model 5 B: + + $ make raspberrypi5_defconfig + Build the rootfs ---------------- @@ -78,6 +87,7 @@ Result of the build After building, you should obtain this tree: output/images/ + +-- bcm2708-rpi-b-rev1.dtb [1] +-- bcm2708-rpi-b.dtb [1] +-- bcm2708-rpi-b-plus.dtb [1] +-- bcm2708-rpi-cm.dtb [1] @@ -85,12 +95,16 @@ After building, you should obtain this tree: +-- bcm2708-rpi-zero-w.dtb [1] +-- bcm2710-rpi-zero-2-w.dtb [1] +-- bcm2709-rpi-2-b.dtb [1] + +-- bcm2710-rpi-2-b.dtb [1] +-- bcm2710-rpi-3-b.dtb [1] +-- bcm2710-rpi-3-b-plus.dtb [1] +-- bcm2710-rpi-cm3.dtb [1] +-- bcm2711-rpi-4-b.dtb [1] + +-- bcm2711-rpi-400.dtb [1] +-- bcm2711-rpi-cm4.dtb [1] - +-- bcm2837-rpi-3-b.dtb [1] + +-- bcm2711-rpi-cm4s.dtb [1] + +-- bcm2712-rpi-5-b.dtb [1] + +-- bcm2712d0-rpi-5-b.dtb [1] +-- boot.vfat +-- rootfs.ext4 +-- rpi-firmware/ @@ -133,7 +147,7 @@ How to write to CM4 eMMC memory =============================== For CM4 modules without eMMC memory see above for booting from SD card, -for CM4 moduels with eMMC memory proceed as following: +for CM4 modules with eMMC memory proceed as following: - fit jumper on IO Board header J2 to disable eMMC boot - connect IO Board micro USB port (J11 USB slave) to your host linux system diff --git a/buildroot/board/raspberrypi5 b/buildroot/board/raspberrypi5 new file mode 120000 index 0000000000..fcdafc81ed --- /dev/null +++ b/buildroot/board/raspberrypi5 @@ -0,0 +1 @@ +raspberrypi \ No newline at end of file diff --git a/buildroot/board/seeed/stm32mp157c-odyssey/genimage.cfg b/buildroot/board/seeed/stm32mp157c-odyssey/genimage.cfg index 170dedc254..4c18a2eb04 100644 --- a/buildroot/board/seeed/stm32mp157c-odyssey/genimage.cfg +++ b/buildroot/board/seeed/stm32mp157c-odyssey/genimage.cfg @@ -1,6 +1,6 @@ image sdcard.img { hdimage { - gpt = "true" + partition-table-type = "gpt" } partition fsbl1 { diff --git a/buildroot/board/sheevaplug/patches/linux-headers/linux-headers.hash b/buildroot/board/sheevaplug/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/sheevaplug/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/sheevaplug/patches/linux/linux.hash b/buildroot/board/sheevaplug/patches/linux/linux.hash new file mode 100644 index 0000000000..b207306a2b --- /dev/null +++ b/buildroot/board/sheevaplug/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 0820fdb7971c6974338081c11fbf2dc869870501e7bdcac4d0ed58ba1f57b61c linux-4.14.336.tar.xz diff --git a/buildroot/board/sheevaplug/patches/uboot/uboot.hash b/buildroot/board/sheevaplug/patches/uboot/uboot.hash new file mode 100644 index 0000000000..d6818bac36 --- /dev/null +++ b/buildroot/board/sheevaplug/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 9f10df88bc91b35642e461217f73256bbaeeca9ae2db8db56197ba5e89e1f6d4 u-boot-2018.07.tar.bz2 diff --git a/buildroot/board/sifive/hifive-unleashed/genimage_sdcard.cfg b/buildroot/board/sifive/hifive-unleashed/genimage_sdcard.cfg index e66f221d73..99e3525a8c 100644 --- a/buildroot/board/sifive/hifive-unleashed/genimage_sdcard.cfg +++ b/buildroot/board/sifive/hifive-unleashed/genimage_sdcard.cfg @@ -6,18 +6,19 @@ image sdcard.img { partition u-boot-spl { image = "u-boot-spl.bin" offset = 17K - partition-type-uuid = 5B193300-FC78-40CD-8002-E86C45580B47 + partition-type-uuid = 5b193300-fc78-40cd-8002-e86c45580b47 } partition u-boot { image = "u-boot.itb" offset = 1041K - partition-type-uuid = 2E54B353-1271-4842-806F-E436D6AF6985 + partition-type-uuid = 2e54b353-1271-4842-806f-e436d6af6985 } partition rootfs { image = "rootfs.ext4" - partition-type-uuid = 0FC63DAF-8483-4772-8E79-3D69D8477DE4 + offset = 4076K + partition-type-uuid = 0fc63daf-8483-4772-8e79-3d69d8477de4 bootable = true } } diff --git a/buildroot/board/sifive/hifive-unleashed/genimage_spi-nor.cfg b/buildroot/board/sifive/hifive-unleashed/genimage_spi-nor.cfg index 903e675a90..14b7bb1e1c 100644 --- a/buildroot/board/sifive/hifive-unleashed/genimage_spi-nor.cfg +++ b/buildroot/board/sifive/hifive-unleashed/genimage_spi-nor.cfg @@ -8,12 +8,12 @@ image spi-nor.img { partition u-boot-spl { image = "u-boot-spl.bin" offset = 20K - partition-type-uuid = 5B193300-FC78-40CD-8002-E86C45580B47 + partition-type-uuid = 5b193300-fc78-40cd-8002-e86c45580b47 } partition u-boot { image = "u-boot.itb" offset = 1044K - partition-type-uuid = 2E54B353-1271-4842-806F-E436D6AF6985 + partition-type-uuid = 2e54b353-1271-4842-806f-e436d6af6985 } } diff --git a/buildroot/board/sifive/hifive-unleashed/readme.txt b/buildroot/board/sifive/hifive-unleashed/readme.txt index 3263913e9c..e9ccb26fa6 100644 --- a/buildroot/board/sifive/hifive-unleashed/readme.txt +++ b/buildroot/board/sifive/hifive-unleashed/readme.txt @@ -113,3 +113,20 @@ Booting the SPI flash on the board Make sure that the all DIP switches are set to the off position for default boot mode (MSEL mode = 0110) to boot from SPI flash. + +Testing under QEMU +================== + +The SD card image can be tested using QEMU: + +$ qemu-system-riscv64 -M sifive_u,msel=11 -smp 5 -m 8G \ + -display none -serial stdio -nic user \ + -bios output/images/u-boot-spl.bin \ + -drive file=output/images/sdcard.img,if=sd + +The SPI flash image can be tested with a slightly different command: + +$ qemu-system-riscv64 -M sifive_u,msel=6 -smp 5 -m 8G \ + -display none -serial stdio -nic user \ + -bios output/images/u-boot-spl.bin \ + -drive file=output/images/spi-nor.img,if=mtd diff --git a/buildroot/board/sinovoip/m1-plus/boot.cmd b/buildroot/board/sinovoip/m1-plus/boot.cmd deleted file mode 100644 index 4829996474..0000000000 --- a/buildroot/board/sinovoip/m1-plus/boot.cmd +++ /dev/null @@ -1,5 +0,0 @@ -setenv fdt_high ffffffff -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun7i-a20-bananapi-m1-plus.dtb -bootz $kernel_addr_r - $fdt_addr_r diff --git a/buildroot/board/sinovoip/m1-plus/genimage.cfg b/buildroot/board/sinovoip/m1-plus/genimage.cfg deleted file mode 100644 index 18a549e631..0000000000 --- a/buildroot/board/sinovoip/m1-plus/genimage.cfg +++ /dev/null @@ -1,38 +0,0 @@ -# Minimal SD card image for the Banana Pi M1+ -# Based on the Banana Pro genimage.cfg - -image boot.vfat { - vfat { - files = { - "zImage", - "sun7i-a20-bananapi-m1-plus.dtb", - "boot.scr" - } - } - - size = 10M -} - -image sdcard.img { - hdimage { - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - size = 1016K # 1MB - 8KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - size = 512M - } -} diff --git a/buildroot/board/sinovoip/m1-plus/linux-wifi.fragment b/buildroot/board/sinovoip/m1-plus/linux-wifi.fragment deleted file mode 100644 index 5576d738ad..0000000000 --- a/buildroot/board/sinovoip/m1-plus/linux-wifi.fragment +++ /dev/null @@ -1,10 +0,0 @@ -# Networking support -CONFIG_WIRELESS=y -CONFIG_CFG80211=y -CONFIG_CFG80211_WEXT=y -CONFIG_RFKILL=y - -# Network device support -CONFIG_WLAN=y -CONFIG_WLAN_VENDOR_BROADCOM=y -CONFIG_BRCMFMAC=m diff --git a/buildroot/board/sinovoip/m1-plus/patches/linux/0001-ARM-dts-sun7i-bananapi-m1-plus-Disable-OOB-IRQ-for-b.patch b/buildroot/board/sinovoip/m1-plus/patches/linux/0001-ARM-dts-sun7i-bananapi-m1-plus-Disable-OOB-IRQ-for-b.patch deleted file mode 100644 index b01b6b2829..0000000000 --- a/buildroot/board/sinovoip/m1-plus/patches/linux/0001-ARM-dts-sun7i-bananapi-m1-plus-Disable-OOB-IRQ-for-b.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 58bae4096a7bf8d5d3bfbddb82cb37dd0561c938 Mon Sep 17 00:00:00 2001 -From: Filip Skoneczny -Date: Sun, 10 Jan 2021 19:07:14 +0100 -Subject: [PATCH] ARM: dts: sun7i: bananapi-m1-plus: Disable OOB IRQ for brcm - wifi module - - Based on 23bc805. - BugLink: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=908438 - -Signed-off-by: Filip Skoneczny ---- - arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts b/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts -index 32d5d45a35c0..97f9987f51d7 100644 ---- a/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts -+++ b/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts -@@ -193,9 +193,14 @@ &mmc3 { - brcmf: wifi@1 { - reg = <1>; - compatible = "brcm,bcm4329-fmac"; -- interrupt-parent = <&pio>; -- interrupts = <7 15 IRQ_TYPE_LEVEL_LOW>; -- interrupt-names = "host-wake"; -+ /* -+ * OOB interrupt support is broken ATM, drv probe failing with: -+ * ieee80211 phy0: brcmf_attach: dongle is not responding: err=-110 -+ * -+ * interrupt-parent = <&pio>; -+ * interrupts = <7 15 IRQ_TYPE_LEVEL_LOW>; -+ * interrupt-names = "host-wake"; -+ */ - }; - }; - --- -2.25.1 - diff --git a/buildroot/board/sinovoip/m1-plus/post-build.sh b/buildroot/board/sinovoip/m1-plus/post-build.sh deleted file mode 100755 index 4ee6fa3bc4..0000000000 --- a/buildroot/board/sinovoip/m1-plus/post-build.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -# Remove all but the brcmfmac43362 firmware files -find $TARGET_DIR/lib/firmware/brcm -type f -not -name "brcmfmac43362*" -delete diff --git a/buildroot/board/sinovoip/m1-plus/readme.txt b/buildroot/board/sinovoip/m1-plus/readme.txt deleted file mode 100644 index ae647c21a9..0000000000 --- a/buildroot/board/sinovoip/m1-plus/readme.txt +++ /dev/null @@ -1,64 +0,0 @@ -Banana Pi M1+ - -Intro -===== - -This default configuration will allow you to start experimenting with the -Buildroot environment for the Banana Pi M1+. With the current configuration -it will bring-up the board, and allow access through the serial console. - -How to build it -=============== - -Configure Buildroot: - - $ make bananapi_m1_plus_defconfig - -Compile everything and build the SD card image: - - $ make - -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": - - $ dd if=output/images/sdcard.img of=/dev/sdX - -Notes: - - replace 'sdX' with the actual device with your micro SD card - - you may need to be root to do that (use 'sudo') - -Insert the micro SD card in your Banana Pi M1+ and power it up. The console -is on the debug TTL UART, 115200 8N1. - -Ethernet -========== - - # udhcpc -i eth0 - -Wifi -========== - - # wpa_passphrase YOUR_SSID >> /etc/wpa_supplicant.conf - (enter the wifi password and press enter) - # wpa_supplicant -i wlan0 -c /etc/wpa_supplicant.conf -B - # udhcpc -i wlan0 - -Note: - - replace 'YOUR_SSID' with the actual SSID from your access point - -Audio -========== - -For this example you need package alsa-utils. - -Connect a headphone to the 3.5mm jack (TRRS). Note, that the Banana Pi M1+ -has an on-board microphone, too. - - # amixer cset name='Power Amplifier DAC Playback Switch' on - # amixer cset name='Power Amplifier Mute Switch' on - # amixer cset name='Power Amplifier Volume' 42 diff --git a/buildroot/board/sinovoip/m1-plus/rootfs_overlay/lib/firmware/brcm/brcmfmac43362-sdio.sinovoip,bpi-m1-plus.txt b/buildroot/board/sinovoip/m1-plus/rootfs_overlay/lib/firmware/brcm/brcmfmac43362-sdio.sinovoip,bpi-m1-plus.txt deleted file mode 120000 index 93947975ee..0000000000 --- a/buildroot/board/sinovoip/m1-plus/rootfs_overlay/lib/firmware/brcm/brcmfmac43362-sdio.sinovoip,bpi-m1-plus.txt +++ /dev/null @@ -1 +0,0 @@ -brcmfmac43362-sdio.txt \ No newline at end of file diff --git a/buildroot/board/sinovoip/m1-plus/rootfs_overlay/lib/firmware/brcm/brcmfmac43362-sdio.txt b/buildroot/board/sinovoip/m1-plus/rootfs_overlay/lib/firmware/brcm/brcmfmac43362-sdio.txt deleted file mode 100644 index 14a554fdd8..0000000000 --- a/buildroot/board/sinovoip/m1-plus/rootfs_overlay/lib/firmware/brcm/brcmfmac43362-sdio.txt +++ /dev/null @@ -1,56 +0,0 @@ -#AP6210_NVRAM_V1.2_03192013 -manfid=0x2d0 -prodid=0x492 -vendid=0x14e4 -devid=0x4343 -boardtype=0x0598 - -# Board Revision is P307, same nvram file can be used for P304, P305, P306 and P307 as the tssi pa params used are same -#Please force the automatic RX PER data to the respective board directory if not using P307 board, for e.g. for P305 boards force the data into the following directory /projects/BCM43362/a1_labdata/boardtests/results/sdg_rev0305 -boardrev=0x1307 -boardnum=777 -xtalfreq=26000 -boardflags=0x80201 -boardflags2=0x80 -sromrev=3 -wl0id=0x431b -macaddr=00:90:4c:07:71:12 -aa2g=1 -ag0=2 -maxp2ga0=74 -cck2gpo=0x2222 -ofdm2gpo=0x44444444 -mcs2gpo0=0x6666 -mcs2gpo1=0x6666 -pa0maxpwr=56 - -#P207 PA params -#pa0b0=5447 -#pa0b1=-658 -#pa0b2=-175 - -#Same PA params for P304,P305, P306, P307 - -pa0b0=5447 -pa0b1=-607 -pa0b2=-160 -pa0itssit=62 -pa1itssit=62 - - -cckPwrOffset=5 -ccode=0 -rssismf2g=0xa -rssismc2g=0x3 -rssisav2g=0x7 -triso2g=0 -noise_cal_enable_2g=0 -noise_cal_po_2g=0 -swctrlmap_2g=0x04040404,0x02020202,0x02020202,0x010101,0x1ff -temp_add=29767 -temp_mult=425 - -btc_flags=0x6 -btc_params0=5000 -btc_params1=1000 -btc_params6=63 diff --git a/buildroot/board/sinovoip/m2-plus/boot.cmd b/buildroot/board/sinovoip/m2-plus/boot.cmd deleted file mode 100644 index d22464a1c1..0000000000 --- a/buildroot/board/sinovoip/m2-plus/boot.cmd +++ /dev/null @@ -1,7 +0,0 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -mmc dev 0 -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-h3-bananapi-m2-plus.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/buildroot/board/sinovoip/m2-plus/genimage.cfg b/buildroot/board/sinovoip/m2-plus/genimage.cfg deleted file mode 100644 index 9311e026dd..0000000000 --- a/buildroot/board/sinovoip/m2-plus/genimage.cfg +++ /dev/null @@ -1,34 +0,0 @@ -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h3-bananapi-m2-plus.dtb", - "boot.scr" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - size = 1016K # 1MB - 8KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/buildroot/board/sipeed/lichee_rv/genimage.cfg b/buildroot/board/sipeed/lichee_rv/genimage.cfg new file mode 100644 index 0000000000..d5df41203d --- /dev/null +++ b/buildroot/board/sipeed/lichee_rv/genimage.cfg @@ -0,0 +1,19 @@ +# Minimal SD card image for the sipeed Lichee RV + +image sdcard.img { + hdimage { + } + + partition u-boot { + in-partition-table = false + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + bootable = "true" + offset = 1M + } +} diff --git a/buildroot/board/sipeed/lichee_rv/overlay/boot/extlinux/extlinux.conf b/buildroot/board/sipeed/lichee_rv/overlay/boot/extlinux/extlinux.conf new file mode 100644 index 0000000000..91b2298628 --- /dev/null +++ b/buildroot/board/sipeed/lichee_rv/overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label linux + kernel /boot/Image + # use devicetree from u-boot + append console=ttyS0,115200 root=/dev/mmcblk0p1 ro rootwait diff --git a/buildroot/board/sipeed/lichee_rv/readme.txt b/buildroot/board/sipeed/lichee_rv/readme.txt new file mode 100644 index 0000000000..24e8141851 --- /dev/null +++ b/buildroot/board/sipeed/lichee_rv/readme.txt @@ -0,0 +1,26 @@ +Lichee RV +=============== + +Lichee RV - Nezha CM is a compute module with modular design, equipped +with Allwinner D1 chip (based on T-Head XuanTie C906 core), 512MB DDR3 RAM. +It can boot from TF card or SD-NAND, uses two sets of M.2 b key 67 pin +connectors to route all IO, making it convient for wide use and easy to replace. + +How to build +============ + +$ make sipeed_lichee_rv_defconfig +$ make + +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 + +Connect a TTL UART to the debug connector, insert the microSD card and +plug in a USB-C cable to the PWR connector to boot the system. diff --git a/buildroot/board/sipeed/lichee_rv_dock/genimage.cfg b/buildroot/board/sipeed/lichee_rv_dock/genimage.cfg new file mode 100644 index 0000000000..38078f0ae3 --- /dev/null +++ b/buildroot/board/sipeed/lichee_rv_dock/genimage.cfg @@ -0,0 +1,19 @@ +# Minimal SD card image for the sipeed Lichee RV dock + +image sdcard.img { + hdimage { + } + + partition u-boot { + in-partition-table = false + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + bootable = "true" + offset = 1M + } +} diff --git a/buildroot/board/sipeed/lichee_rv_dock/linux.fragment b/buildroot/board/sipeed/lichee_rv_dock/linux.fragment new file mode 100644 index 0000000000..10016889ab --- /dev/null +++ b/buildroot/board/sipeed/lichee_rv_dock/linux.fragment @@ -0,0 +1,7 @@ +CONFIG_BT=y +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_SERDEV=y +CONFIG_BT_HCIUART_3WIRE=y +CONFIG_BT_HCIUART_RTL=y +CONFIG_SERIAL_DEV_BUS=y +CONFIG_SERIAL_DEV_CTRL_TTYPORT=y diff --git a/buildroot/board/sipeed/lichee_rv_dock/overlay/etc/network/interfaces b/buildroot/board/sipeed/lichee_rv_dock/overlay/etc/network/interfaces new file mode 100644 index 0000000000..89e7d74aff --- /dev/null +++ b/buildroot/board/sipeed/lichee_rv_dock/overlay/etc/network/interfaces @@ -0,0 +1,6 @@ +auto lo +iface lo inet loopback + +auto wlan0 +iface wlan0 inet dhcp +wpa-conf /etc/wpa_supplicant.conf diff --git a/buildroot/board/sipeed/lichee_rv_dock/overlay/etc/wpa_supplicant.conf b/buildroot/board/sipeed/lichee_rv_dock/overlay/etc/wpa_supplicant.conf new file mode 100644 index 0000000000..b43292b0a7 --- /dev/null +++ b/buildroot/board/sipeed/lichee_rv_dock/overlay/etc/wpa_supplicant.conf @@ -0,0 +1,8 @@ +ap_scan=1 + +network={ + ssid="YOURSSID" + scan_ssid=1 + key_mgmt=WPA-PSK + psk="YOURPASSWD" +} diff --git a/buildroot/board/sipeed/lichee_rv_dock/readme.txt b/buildroot/board/sipeed/lichee_rv_dock/readme.txt new file mode 100644 index 0000000000..048ba64d26 --- /dev/null +++ b/buildroot/board/sipeed/lichee_rv_dock/readme.txt @@ -0,0 +1,45 @@ +Lichee RV dock +=============== + +Lichee RV Dock is a RISC-V Linux development kits with high integration, small +size and affordable price designed for opensource developer. It's equipped with +HDMI interface and it supports many screen by its screen convert board. It's +also equipped with many peripherals, including a UAB-A port, 2.4G Wifi-BT module, +an analog microphone and a speaker jack interface. + +How to build +============ + +$ make sipeed_lichee_rv_dock_defconfig +$ make + +Wifi +========== + +Edit board/sipeed/lichee_rv_dock/overlay/etc/wpa_supplicant.conf or +/etc/wpa_supplicant.conf once connected to the board: + +* Replace YOURSSID with your AP ssid +* Replace YOURPASSWD with your AP password + +Bluetooth +========== + +To make the device discoverable and pairable, once connected to the board: + +* bluetoothctl power on +* bluetoothctl discoverable yes +* bluetoothctl pairable yes + +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 + +Connect a TTL UART to the debug connector, insert the microSD card and +plug in a USB-C cable to the PWR connector to boot the system. diff --git a/buildroot/board/sipeed/licheepi_nano/genimage.cfg b/buildroot/board/sipeed/licheepi_nano/genimage.cfg new file mode 100644 index 0000000000..5e398eeb21 --- /dev/null +++ b/buildroot/board/sipeed/licheepi_nano/genimage.cfg @@ -0,0 +1,33 @@ +flash w25q128 { + pebsize = 65536 + numpebs = 256 + minimum-io-unit-size = 1 + sub-page-size = 1 + vid-header-offset = 64 +} + +image flash.bin { + flash {} + flashtype = w25q128 + + partition uboot { + image = "u-boot-sunxi-with-spl.bin" + size = 512K + } + + partition dtb { + image = "suniv-f1c100s-licheepi-nano.dtb" + size = 64K + } + + partition zimage { + image = "zImage" + size = 5M + } + + partition rootfs { + image = "rootfs.jffs2" + size = 0 + } +} + diff --git a/buildroot/board/sipeed/licheepi_nano/linux.fragment b/buildroot/board/sipeed/licheepi_nano/linux.fragment new file mode 100644 index 0000000000..af68f28167 --- /dev/null +++ b/buildroot/board/sipeed/licheepi_nano/linux.fragment @@ -0,0 +1,11 @@ +# CONFIG_NET is not set +# CONFIG_DRM is not set +# CONFIG_CMA is not set +# CONFIG_ARCH_MULTI_V7 is not set +CONFIG_UEVENT_HELPER=y +CONFIG_MTD=y +CONFIG_MTD_BLOCK=y +CONFIG_MTD_SPI_NOR=y +# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set +CONFIG_MTD_CMDLINE_PARTS=y +CONFIG_JFFS2_FS=y diff --git a/buildroot/board/sipeed/licheepi_nano/readme.txt b/buildroot/board/sipeed/licheepi_nano/readme.txt new file mode 100644 index 0000000000..1f1f8ef17d --- /dev/null +++ b/buildroot/board/sipeed/licheepi_nano/readme.txt @@ -0,0 +1,84 @@ +Intro +===== + +This directory contains a buildroot configuration for building a +LicheePi Nano image which can be flashed into the board. + +This frees the MMC port which can be used for an additional SD +card of for a WiFi adapter. + +How to build it +=============== + +Configure Buildroot +------------------- + + $ make sipeed_licheepi_nano_defconfig + +Build the rootfs +---------------- + +Note: you will need to have access to the network, since Buildroot +will download the packages' sources. + +You may now build your rootfs with: + + $ make + +(This may take a while, consider getting yourself a coffee ;-) ) + +Result of the build +------------------- + +After building, you should obtain this tree: + + output/images/ + +-- flash.bin + +-- rootfs.jffs2 + +-- rootfs.tar + +-- suniv-f1c100s-licheepi-nano.dtb + +-- u-boot.bin + +-- u-boot-sunxi-with-spl.bin + `-- zImage + +How to flash +============ + +Once the build process is finished you will have an image called +"flash.bin" in the output/images/ directory. It contains the +bootloader, the device tree, the kernel and the root file system. + +The device can be flashed when it is in special mode called "FEL +mode". There are multiple ways to enter this mode described here: +https://linux-sunxi.org/FEL#Entering_FEL_mode + +One way is to write one file from sunxi-tools to a SD card with: + + $ sudo dd if=./output/build/host-sunxi-tools-*/bin/fel-sdboot.sunxi of=/dev/sdX bs=1024 seek=8 + +Once the SD card is burned, insert it into your LicheePi Nano board, +and plug the USB cable. A new USB device should be visible with +lsusb: + + 1f3a:efe8 Allwinner Technology sunxi SoC OTG connector in FEL/flashing mode + +The image can be flashed with: + + $ sudo ./output/host/bin/sunxi-fel -p spiflash-write 0 output/images/flash.bin + +Once this completes, remove the SD card and power the board. Your +new system should come up now and start a console on the UART0 +serial port. + +Note +==== + +Some standard kernel features are disabled using the fragment in +order to reduce the size. They can be enabled again if other +features are disabled instead. + +For U-Boot, the upstream repository is preferred and the system +boots, but loading the image from the flash takes a long time. It +is much faster when using the branch "licheepi-nano-v2020.01" of +this fork: +https://github.com/florpor/u-boot diff --git a/buildroot/board/sipeed/licheepi_nano/uboot.fragment b/buildroot/board/sipeed/licheepi_nano/uboot.fragment new file mode 100644 index 0000000000..39f2bfe742 --- /dev/null +++ b/buildroot/board/sipeed/licheepi_nano/uboot.fragment @@ -0,0 +1,3 @@ +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=tty0 console=ttyS0,115200 panic=5 rootwait root=/dev/mtdblock3 rw rootfstype=jffs2 mtdparts=spi0.0:512k(uboot)ro,64k(dtb),5M(kernel)ro,-(rootfs)" +CONFIG_BOOTCOMMAND="sf probe 0 50000000; sf read 0x80C00000 0x80000 0x4000; sf read 0x80008000 0x90000 0x500000; bootz 0x80008000 - 0x80C00000" diff --git a/buildroot/board/licheepi/boot.cmd b/buildroot/board/sipeed/licheepi_zero/boot.cmd similarity index 100% rename from buildroot/board/licheepi/boot.cmd rename to buildroot/board/sipeed/licheepi_zero/boot.cmd diff --git a/buildroot/board/licheepi/genimage.cfg b/buildroot/board/sipeed/licheepi_zero/genimage.cfg similarity index 100% rename from buildroot/board/licheepi/genimage.cfg rename to buildroot/board/sipeed/licheepi_zero/genimage.cfg diff --git a/buildroot/board/sipeed/licheepi_zero/readme.txt b/buildroot/board/sipeed/licheepi_zero/readme.txt new file mode 100644 index 0000000000..2f122125b7 --- /dev/null +++ b/buildroot/board/sipeed/licheepi_zero/readme.txt @@ -0,0 +1,62 @@ +Intro +===== + +This directory contains a buildroot configuration for building a +LicheePi Zero. + +How to build it +=============== + +Configure Buildroot +------------------- + + $ make sipeed_licheepi_zero_defconfig + +Build the rootfs +---------------- + +Note: you will need to have access to the network, since Buildroot +will download the packages' sources. + +You may now build your rootfs with: + + $ make + +(This may take a while, consider getting yourself a coffee ;-) ) + +Result of the build +------------------- + +After building, you should obtain this tree: + + output/images/ + +-- boot.scr + +-- boot.vfat + +-- rootfs.ext2 + +-- rootfs.ext4 -> rootfs.ext2 + +-- rootfs.tar + +-- sdcard.img + +-- sun8i-v3s-licheepi-zero-dock.dtb + +-- sun8i-v3s-licheepi-zero.dtb + +-- u-boot.bin + +-- u-boot-sunxi-with-spl.bin + `-- zImage + +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 + +Alternatively, you can use the Etcher graphical tool to burn the image +to the SD card safely and on any platform: + +https://etcher.io/ + +Once the SD card is burned, insert it into your LicheePi Zero board, +and power it up. Your new system should come up now and start a +console on the UART0 serial port. diff --git a/buildroot/board/sipeed/maix-bit/linux-cpio.config b/buildroot/board/sipeed/maix-bit/linux-cpio.config new file mode 100644 index 0000000000..de2f8fd074 --- /dev/null +++ b/buildroot/board/sipeed/maix-bit/linux-cpio.config @@ -0,0 +1,2 @@ +CONFIG_SOC_CANAAN_K210_DTB_BUILTIN=y +CONFIG_SOC_CANAAN_K210_DTB_SOURCE="sipeed_maix_bit" diff --git a/buildroot/board/sipeed/maix-bit/readme.txt b/buildroot/board/sipeed/maix-bit/readme.txt new file mode 100644 index 0000000000..7cc53bca67 --- /dev/null +++ b/buildroot/board/sipeed/maix-bit/readme.txt @@ -0,0 +1,316 @@ +Sipeed MAIX-Bit Board +===================== + +The Sipeed MAXI-Bit board is a dual-core RISC-V 64-bits board based on the +Canaan Kendryte K210 SoC. + +Prerequisite +------------ + +In order to use the kflash utility to program this board, the user must have +access to the board USB serial device file. The simplest way to do this is to +add your user to the same group as this device file. Assume the device file is +/dev/ttyUSB0, first identify the device group name. In most cases, it is +either "dialout" or "uucp". Also verify that read-write access is enabled for +the group: + +``` +$ ls -l /dev/ttyUSB0 +crw-rw---- 1 root dialout 188, 0 May 26 13:48 /dev/ttyUSB0 +``` + +Then add yourself to that group (dialout in this example): + +``` +$ sudo usermod -a -G dialout $(whoami) +``` + +To enable the above, it is sometimes necessary to logout and login again. + +Buildroot Configuration +----------------------- + +Two buildroot configuration files are provided: + +(1) Direct Linux Kernel Boot + +This is defined by the sipeed_maix_bit_defconfig configuration. This +configuration allows building a bootable kernel image with a built-in initramfs +root file system (the board SD card is not used). The built kernel image can be +flashed directly to the board ROM for direct booting. No boot loader is +required. + +(2) U-Boot SD-Card Boot + +The sipeed_maix_bit_sdcard_defconfig configuration allows building a kernel +image with the root file system on the board SD card. U-Boot is used as the +boot loader. + +Both configuration files will also compile and install the kflash and +pyserial-miniterm host utilities to program bootable image files to the board +and open a serial terminal console. + +Direct Linux Kernel Boot +------------------------- + +Using the sipeed_maix_bit_defconfig configuration, the bootable kernel binary +image is built as follows. + +``` +$ make sipeed_maix_bit_defconfig +$ make +``` + +The bootable binary image is the output/images/loader.bin file. This image file +can be written to the board boot ROM using the kflash utility. + +``` +$ output/host/bin/kflash -b 1500000 -p /dev/ttyUSB0 -t output/images/loader.bin +``` + +Once the kernel image file is fully programmed, a terminal console is open and +the board can be rebooted by pressing the reset button on the board (if it does +not reboot automatically). + +The output will be similar to the following. + +``` +[ 0.000000] Linux version 5.18.0 (foo@bar.com) (riscv64-buildroot-linux-uclibc-gcc.br_real (Buildroot 2022.02-560-g6a2b542a09-dirty) 10.3.0, GNU ld (GNU Binutils) 2.32) #2 SMP Thu Apr 21 14:30:02 JST 2022 +[ 0.000000] Machine model: SiPeed MAIX BiT +[ 0.000000] earlycon: sifive0 at MMIO 0x0000000038000000 (options '115200n8') +[ 0.000000] printk: bootconsole [sifive0] enabled +[ 0.000000] Zone ranges: +[ 0.000000] DMA32 [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] Normal empty +[ 0.000000] Movable zone start for each node +[ 0.000000] Early memory node ranges +[ 0.000000] node 0: [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] Initmem setup node 0 [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] riscv: ISA extensions acdfim +[ 0.000000] riscv: ELF capabilities acdfim +[ 0.000000] percpu: max_distance=0x16000 too large for vmalloc space 0x0 +[ 0.000000] percpu: Embedded 11 pages/cpu s15264 r0 d29792 u45056 +[ 0.000000] percpu: wasting 10 pages per chunk +[ 0.000000] Built 1 zonelists, mobility grouping off. Total pages: 2020 +[ 0.000000] Kernel command line: earlycon console=ttySIF0 +[ 0.000000] Dentry cache hash table entries: 1024 (order: 1, 8192 bytes, linear) +[ 0.000000] Inode-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.000000] mem auto-init: stack:off, heap alloc:off, heap free:off +[ 0.000000] Memory: 5996K/8192K available (964K kernel code, 137K rwdata, 205K rodata, 530K init, 66K bss, 2196K reserved, 0K cma-reserved) +[ 0.000000] rcu: Hierarchical RCU implementation. +[ 0.000000] rcu: RCU calculated value of scheduler-enlistment delay is 25 jiffies. +[ 0.000000] NR_IRQS: 64, nr_irqs: 64, preallocated irqs: 0 +[ 0.000000] riscv-intc: 64 local interrupts mapped +[ 0.000000] plic: interrupt-controller@c000000: mapped 65 interrupts with 2 handlers for 4 contexts. +[ 0.000000] k210-clk: clock-controller: CPU running at 390 MHz +[ 0.000000] clint: timer@2000000: timer running at 7800000 Hz +[ 0.000000] clocksource: clint_clocksource: mask: 0xffffffffffffffff max_cycles: 0x3990be68b, max_idle_ns: 881590404272 ns +[ 0.000001] sched_clock: 64 bits at 7MHz, resolution 128ns, wraps every 4398046511054ns +[ 0.008188] Calibrating delay loop (skipped), value calculated using timer frequency.. 15.60 BogoMIPS (lpj=31200) +[ 0.018250] pid_max: default: 4096 minimum: 301 +[ 0.022860] Mount-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.029972] Mountpoint-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.040244] rcu: Hierarchical SRCU implementation. +[ 0.045121] smp: Bringing up secondary CPUs ... +[ 0.050225] smp: Brought up 1 node, 2 CPUs +[ 0.054355] devtmpfs: initialized +[ 0.071168] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 7645041785100000 ns +[ 0.080240] pinctrl core: initialized pinctrl subsystem +[ 0.119221] clocksource: Switched to clocksource clint_clocksource +[ 0.131498] workingset: timestamp_bits=62 max_order=11 bucket_order=0 +[ 0.176943] k210-sysctl 50440000.syscon: K210 system controller +[ 0.193558] k210-rst 50440000.syscon:reset-controller: K210 reset controller +[ 0.201526] cacheinfo: Unable to detect cache hierarchy for CPU 0 +[ 0.211611] i2c_dev: i2c /dev entries driver +[ 0.221375] k210-fpioa 502b0000.pinmux: K210 FPIOA pin controller +[ 0.233591] 38000000.serial: ttySIF0 at MMIO 0x38000000 (irq = 1, base_baud = 115200) is a SiFive UART v0 +[ 0.242529] printk: console [ttySIF0] enabled +[ 0.242529] printk: console [ttySIF0] enabled +[ 0.251165] printk: bootconsole [sifive0] disabled +[ 0.251165] printk: bootconsole [sifive0] disabled +[ 0.274348] Freeing unused kernel image (initmem) memory: 524K +[ 0.279504] This architecture does not have kernel memory protection. +[ 0.285908] Run /init as init process + __ _ + / / (_) ____ _ _ __ __ + / / | || _ \ | | | |\ \/ / + / /___| || | | || |_| | > < + /_____/|_||_| |_| \____|/_/\_\ + 64-bits RISC-V Kendryte K210 NOMMU + +/ # +``` + +To open a terminal console without re-flashing the board, the pyserial-miniterm +host tool can be used. + +``` +$ output/host/bin/pyserial-miniterm --raw --eol=LF /dev/ttyUSB0 115200 +``` + +The options "--raw" and "--eol=LF" are added here to avoid a double carriage +return each time a command is entered. + + +U-Boot SD-Card Boot +------------------- + +The build procedure is similar to the direct Linux kernel boot case. + +``` +$ make sipeed_maix_bit_sdcard_defconfig +$ make +``` + +The build process will generate two files under the output/images directory. + +* sdcard.img: The image file for the SD card filesystem. This image has 2 + partitions. The first partition is a vfat partition containing the kernel + uImage and the board device tree binary. The second partition is the root + filesystem with busybox installed. The second partition is formatted using + ext2 (rev1). + +* uboot.bin: U-Boot bootable binary to load and boot the kernel from the SD + card. + +The SD card can be prepared by writing the sdcard.img file, as follows. + +``` +$ sudo dd if=output/images/sdcard.img of=/dev/sdX bs=1M +$ sync +$ eject /dev/sdX +``` + +Where /dev/sdX is the device file name of the SD card. Once completed, the SD +card can be inserted into the board and the U-Boot binary image written to the +board boot flash using the kflash utility. + +``` +$ output/host/bin/kflash -b 1500000 -p /dev/ttyUSB0 -t output/images/u-boot.bin +``` + +The above command will program U-Boot image to the board boot ROM and open a +terminal console once the u-boot.bin file is fully programmed. Reboot into the +newly programmed environment by pressing the board reset button. + +The output will be similar to the following. + +``` +U-Boot 2022.04 (May 24 2022 - 17:08:34 +0900) + +DRAM: 8 MiB +Core: 34 devices, 17 uclasses, devicetree: separate +WDT: Not starting watchdog@50400000 +MMC: spi@53000000:slot@0: 0 +Loading Environment from SPIFlash... SF: Detected gd25lq128 with page size 256 Bytes, erase size 4 KiB, total 16 MiB +*** Warning - bad CRC, using default environment + +In: serial@38000000 +Out: serial@38000000 +Err: serial@38000000 +Hit any key to stop autoboot: 0 +1668562 bytes read in 933 ms (1.7 MiB/s) +10468 bytes read in 11 ms (928.7 KiB/s) +## Booting kernel from Legacy Image at 80060000 ... + Image Name: Linux + Image Type: RISC-V Linux Kernel Image (uncompressed) + Data Size: 1668498 Bytes = 1.6 MiB + Load Address: 80000000 + Entry Point: 80000000 + Verifying Checksum ... OK +## Flattened Device Tree blob at 80400000 + Booting using the fdt blob at 0x80400000 + Loading Kernel Image + Loading Device Tree to 00000000803fa000, end 00000000803ff8e3 ... OK + +Starting kernel ... + +[ 0.000000] Linux version 5.18.0 (foo@bar.com) (riscv64-buildroot-linux-uclibc-gcc.br_real (Buildroot 2022.02-1056-gc356b62332) 10.3.0, GNU ld (GNU Binutils) 2.37) #1 SMP Tue May 24 06:45:04 JST 2022 +[ 0.000000] Machine model: SiPeed MAIX BiT +[ 0.000000] earlycon: sifive0 at MMIO 0x0000000038000000 (options '115200n8') +[ 0.000000] printk: bootconsole [sifive0] enabled +[ 0.000000] Zone ranges: +[ 0.000000] DMA32 [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] Normal empty +[ 0.000000] Movable zone start for each node +[ 0.000000] Early memory node ranges +[ 0.000000] node 0: [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] Initmem setup node 0 [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] riscv: base ISA extensions acdfim +[ 0.000000] riscv: ELF capabilities acdfim +[ 0.000000] percpu: max_distance=0x16000 too large for vmalloc space 0x0 +[ 0.000000] percpu: Embedded 11 pages/cpu s15648 r0 d29408 u45056 +[ 0.000000] percpu: wasting 10 pages per chunk +[ 0.000000] Built 1 zonelists, mobility grouping off. Total pages: 2020 +[ 0.000000] Kernel command line: earlycon console=ttySIF0 root=/dev/mmcblk0p2 rootwait ro +[ 0.000000] Dentry cache hash table entries: 1024 (order: 1, 8192 bytes, linear) +[ 0.000000] Inode-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.000000] mem auto-init: stack:off, heap alloc:off, heap free:off +[ 0.000000] Memory: 6204K/8192K available (1134K kernel code, 150K rwdata, 239K rodata, 100K init, 68K bss, 1988K reserved, 0K cma-reserved) +[ 0.000000] rcu: Hierarchical RCU implementation. +[ 0.000000] rcu: RCU calculated value of scheduler-enlistment delay is 25 jiffies. +[ 0.000000] NR_IRQS: 64, nr_irqs: 64, preallocated irqs: 0 +[ 0.000000] riscv-intc: 64 local interrupts mapped +[ 0.000000] plic: interrupt-controller@c000000: mapped 65 interrupts with 2 handlers for 4 contexts. +[ 0.000000] k210-clk: clock-controller: CPU running at 390 MHz +[ 0.000000] clint: timer@2000000: timer running at 7800000 Hz +[ 0.000000] clocksource: clint_clocksource: mask: 0xffffffffffffffff max_cycles: 0x3990be68b, max_idle_ns: 881590404272 ns +[ 0.000001] sched_clock: 64 bits at 7MHz, resolution 128ns, wraps every 4398046511054ns +[ 0.008194] Calibrating delay loop (skipped), value calculated using timer frequency.. 15.60 BogoMIPS (lpj=31200) +[ 0.018257] pid_max: default: 4096 minimum: 301 +[ 0.022869] Mount-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.029982] Mountpoint-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.040424] rcu: Hierarchical SRCU implementation. +[ 0.045397] smp: Bringing up secondary CPUs ... +[ 0.050518] smp: Brought up 1 node, 2 CPUs +[ 0.054676] devtmpfs: initialized +[ 0.072365] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 7645041785100000 ns +[ 0.081396] pinctrl core: initialized pinctrl subsystem +[ 0.123762] clocksource: Switched to clocksource clint_clocksource +[ 0.136796] workingset: timestamp_bits=62 max_order=11 bucket_order=0 +[ 0.181768] k210-sysctl 50440000.syscon: K210 system controller +[ 0.198397] k210-rst 50440000.syscon:reset-controller: K210 reset controller +[ 0.207373] cacheinfo: Unable to detect cache hierarchy for CPU 0 +[ 0.218270] spi spi1.0: setup: ignoring unsupported mode bits a00 +[ 0.224786] i2c_dev: i2c /dev entries driver +[ 0.235984] k210-fpioa 502b0000.pinmux: K210 FPIOA pin controller +[ 0.249172] 38000000.serial: ttySIF0 at MMIO 0x38000000 (irq = 1, base_baud = 115200) is a SiFive UART v0 +[ 0.258078] printk: console [ttySIF0] enabled +[ 0.258078] printk: console [ttySIF0] enabled +[ 0.266707] printk: bootconsole [sifive0] disabled +[ 0.266707] printk: bootconsole [sifive0] disabled +[ 0.307910] mmc_spi spi3.0: SD/MMC host mmc0, no WP, no poweroff, cd polling +[ 0.319869] Waiting for root device /dev/mmcblk0p2... +[ 0.345016] mmc0: host does not support reading read-only switch, assuming write-enable +[ 0.352330] mmc0: new SDHC card on SPI +[ 0.359338] mmcblk0: mmc0:0000 SA16G 14.5 GiB +[ 0.367589] random: fast init done +[ 0.371533] mmcblk0: p1 p2 +[ 0.391794] random: get_random_bytes called from 0x0000000080095ae8 with crng_init=1 +[ 0.393388] VFS: Mounted root (ext2 filesystem) readonly on device 179:2. +[ 0.411377] devtmpfs: mounted +[ 0.413922] Freeing unused kernel image (initmem) memory: 96K +[ 0.419344] This architecture does not have kernel memory protection. +[ 0.425777] Run /sbin/init as init process +[ 0.718314] random: crng init done +[ 0.799903] init (1): drop_caches: 3 + __ _ + / / (_) ____ _ _ __ __ + / / | || _ \ | | | |\ \/ / + / /___| || | | || |_| | > < + /_____/|_||_| |_| \____|/_/\_\ + 64-bits RISC-V Kendryte K210 NOMMU + +/ # +``` + +Of note is that the kernel mounts the SD card as read-only by default to avoid +corruptions of the ext2 root file system when the board is powered down. This +is recommended as this board does not support clean shutdown or halt. + +Similarly to the initramfs build case, a console can be open without +re-flashing the board using the host tool pyserial-miniterm. + +``` +$ output/host/bin/pyserial-miniterm --raw --eol=LF /dev/ttyUSB0 115200 +``` diff --git a/buildroot/board/sipeed/maix-dock/linux-cpio.config b/buildroot/board/sipeed/maix-dock/linux-cpio.config new file mode 100644 index 0000000000..b1ca3166f8 --- /dev/null +++ b/buildroot/board/sipeed/maix-dock/linux-cpio.config @@ -0,0 +1,2 @@ +CONFIG_SOC_CANAAN_K210_DTB_BUILTIN=y +CONFIG_SOC_CANAAN_K210_DTB_SOURCE="sipeed_maix_dock" diff --git a/buildroot/board/sipeed/maix-dock/readme.txt b/buildroot/board/sipeed/maix-dock/readme.txt new file mode 100644 index 0000000000..5971f6e50b --- /dev/null +++ b/buildroot/board/sipeed/maix-dock/readme.txt @@ -0,0 +1,321 @@ +Sipeed MAIX-Dock Board +====================== + +The Sipeed MAXI-Dock board is a dual-core RISC-V 64-bits board based on the +Canaan Kendryte K210 SoC. + +Prerequisite +------------ + +In order to use the kflash utility to program this board, the user must have +access to the board USB serial device file. The simplest way to do this is to +add your user to the same group as this device file. Assume the device file is +/dev/ttyUSB0, first identify the device group name. In most cases, it is +either "dialout" or "uucp". Also verify that read-write access is enabled for +the group: + +``` +$ ls -l /dev/ttyUSB0 +crw-rw---- 1 root dialout 188, 0 May 26 13:48 /dev/ttyUSB0 +``` + +Then add yourself to that group (dialout in this example): + +``` +$ sudo usermod -a -G dialout $(whoami) +``` + +To enable the above, it is sometimes necessary to logout and login again. + +Buildroot Configuration +----------------------- + +Two buildroot configuration files are provided: + +(1) Direct Linux Kernel Boot + +This is defined by the sipeed_maix_dock_defconfig configuration. This +configuration allows building a bootable kernel image with a built-in initramfs +root file system (the board SD card is not used). The built kernel image can be +flashed directly to the board ROM for direct booting. No boot loader is +required. + +(2) U-Boot SD-Card Boot + +The sipeed_maix_dock_sdcard_defconfig configuration allows building a kernel +image with the root file system on the board SD card. U-Boot is used as the +boot loader. + +Note: U-Boot does not natively support the Sipeed MAIX-Dock board. However, the +board and device tree differences with the Sipeed MAIX-Bit board are small +enough for U-Boot to work. + +Both configuration files will also compile the pyserial-miniterm host tool open +a serial terminal console for the board. + +Direct Linux Kernel Boot +------------------------- + +Using the sipeed_maix_dock_defconfig configuration, the bootable kernel binary +image is built as follows. + +``` +$ make sipeed_maix_dock_defconfig +$ make +``` + +Both configuration files will also compile and install the kflash and +pyserial-miniterm host utilities to program bootable image files to the board +and open a serial terminal console. + +``` +$ output/host/bin/kflash -b 1500000 -p /dev/ttyUSB0 -t output/images/loader.bin +``` + +Once the kernel image file is fully programmed, a terminal console is open and +the board can be rebooted by pressing the reset button on the board (if it does +not reboot automatically). + +The output will be similar to the following. + +``` +[ 0.000000] Linux version 5.18.0 (foo@bar.com) (riscv64-buildroot-linux-uclibc-gcc.br_real (Buildroot 2022.02-560-g6a2b542a09-dirty) 10.3.0, GNU ld (GNU Binutils) 2.32) #2 SMP Thu Apr 21 15:47:42 JST 2022 +[ 0.000000] Machine model: SiPeed MAIX Dock +[ 0.000000] earlycon: sifive0 at MMIO 0x0000000038000000 (options '115200n8') +[ 0.000000] printk: bootconsole [sifive0] enabled +[ 0.000000] Zone ranges: +[ 0.000000] DMA32 [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] Normal empty +[ 0.000000] Movable zone start for each node +[ 0.000000] Early memory node ranges +[ 0.000000] node 0: [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] Initmem setup node 0 [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] riscv: ISA extensions acdfim +[ 0.000000] riscv: ELF capabilities acdfim +[ 0.000000] percpu: max_distance=0x16000 too large for vmalloc space 0x0 +[ 0.000000] percpu: Embedded 11 pages/cpu s15264 r0 d29792 u45056 +[ 0.000000] percpu: wasting 10 pages per chunk +[ 0.000000] Built 1 zonelists, mobility grouping off. Total pages: 2020 +[ 0.000000] Kernel command line: earlycon console=ttySIF0 +[ 0.000000] Dentry cache hash table entries: 1024 (order: 1, 8192 bytes, linear) +[ 0.000000] Inode-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.000000] mem auto-init: stack:off, heap alloc:off, heap free:off +[ 0.000000] Memory: 5980K/8192K available (964K kernel code, 137K rwdata, 205K rodata, 546K init, 66K bss, 2212K reserved, 0K cma-reserved) +[ 0.000000] rcu: Hierarchical RCU implementation. +[ 0.000000] rcu: RCU calculated value of scheduler-enlistment delay is 25 jiffies. +[ 0.000000] NR_IRQS: 64, nr_irqs: 64, preallocated irqs: 0 +[ 0.000000] riscv-intc: 64 local interrupts mapped +[ 0.000000] plic: interrupt-controller@c000000: mapped 65 interrupts with 2 handlers for 4 contexts. +[ 0.000000] k210-clk: clock-controller: CPU running at 390 MHz +[ 0.000000] clint: timer@2000000: timer running at 7800000 Hz +[ 0.000000] clocksource: clint_clocksource: mask: 0xffffffffffffffff max_cycles: 0x3990be68b, max_idle_ns: 881590404272 ns +[ 0.000001] sched_clock: 64 bits at 7MHz, resolution 128ns, wraps every 4398046511054ns +[ 0.008187] Calibrating delay loop (skipped), value calculated using timer frequency.. 15.60 BogoMIPS (lpj=31200) +[ 0.018250] pid_max: default: 4096 minimum: 301 +[ 0.022859] Mount-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.029971] Mountpoint-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.040238] rcu: Hierarchical SRCU implementation. +[ 0.045110] smp: Bringing up secondary CPUs ... +[ 0.050215] smp: Brought up 1 node, 2 CPUs +[ 0.054345] devtmpfs: initialized +[ 0.071112] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 7645041785100000 ns +[ 0.080182] pinctrl core: initialized pinctrl subsystem +[ 0.120689] clocksource: Switched to clocksource clint_clocksource +[ 0.133165] workingset: timestamp_bits=62 max_order=11 bucket_order=0 +[ 0.181750] k210-sysctl 50440000.syscon: K210 system controller +[ 0.198612] k210-rst 50440000.syscon:reset-controller: K210 reset controller +[ 0.206644] cacheinfo: Unable to detect cache hierarchy for CPU 0 +[ 0.216569] i2c_dev: i2c /dev entries driver +[ 0.225905] k210-fpioa 502b0000.pinmux: K210 FPIOA pin controller +[ 0.238866] 38000000.serial: ttySIF0 at MMIO 0x38000000 (irq = 1, base_baud = 115200) is a SiFive UART v0 +[ 0.247778] printk: console [ttySIF0] enabled +[ 0.247778] printk: console [ttySIF0] enabled +[ 0.256459] printk: bootconsole [sifive0] disabled +[ 0.256459] printk: bootconsole [sifive0] disabled +[ 0.268225] panel@0 enforce active low on chipselect handle +[ 0.285238] Freeing unused kernel image (initmem) memory: 540K +[ 0.290372] This architecture does not have kernel memory protection. +[ 0.296807] Run /init as init process + __ _ + / / (_) ____ _ _ __ __ + / / | || _ \ | | | |\ \/ / + / /___| || | | || |_| | > < + /_____/|_||_| |_| \____|/_/\_\ + 64-bits RISC-V Kendryte K210 NOMMU + +/ # +``` + +To open a terminal console without re-flashing the board, the pyserial-miniterm +host tool can be used. + +``` +$ output/host/bin/pyserial-miniterm --raw --eol=LF /dev/ttyUSB0 115200 +``` + +The options "--raw" and "--eol=LF" are added here to avoid a double carriage +return each time a command is entered. + + +U-Boot SD-Card Boot +------------------- + +The build procedure is similar to the built-in initramfs case. + +``` +$ make sipeed_maix_dock_sdcard_defconfig +$ make +``` + +The build process will generate two files under the output/images directory. + +* sdcard.img: The image file for the SD card filesystem. This image has 2 + partitions. The first partition is a vfat partition containing the kernel + uImage and the board device tree binary. The second partition is the root + filesystem with busybox installed. The second partition is formatted using + ext2 (rev1). + +* uboot.bin: U-Boot bootable binary to load and boot the kernel from the SD + card. + +The SD card can be prepared by writing the sdcard.img file, as follows. + +``` +$ sudo dd if=output/images/sdcard.img of=/dev/sdX bs=1M +$ sync +$ eject /dev/sdX +``` + +Where /dev/sdX is the device file name of the SD card. Once completed, the SD +card can be inserted into the board and the U-Boot binary image written to the +board boot flash using the kflash utility. + +``` +$ output/host/bin/kflash -b 1500000 -p /dev/ttyUSB0 -t output/images/u-boot.bin +``` + +The above command will program U-Boot image to the board boot ROM and open a +terminal console once the u-boot.bin file is fully programmed. Reboot into the +newly programmed environment by pressing the board reset button if it does not +reboot automatically. + +The output will be similar to the following. + +``` +U-Boot 2022.04 (Apr 21 2022 - 15:59:50 +0900) + +DRAM: 8 MiB +Core: 34 devices, 17 uclasses, devicetree: separate +WDT: Not starting watchdog@50400000 +MMC: spi@53000000:slot@0: 0 +Loading Environment from SPIFlash... SF: Detected w25q128fw with page size 256 Bytes, erase size 4 KiB, total 16 MiB +*** Warning - bad CRC, using default environment + +In: serial@38000000 +Out: serial@38000000 +Err: serial@38000000 +Hit any key to stop autoboot: 0 +1717730 bytes read in 957 ms (1.7 MiB/s) +10382 bytes read in 11 ms (920.9 KiB/s) +## Booting kernel from Legacy Image at 80060000 ... + Image Name: Linux + Image Type: RISC-V Linux Kernel Image (uncompressed) + Data Size: 1717666 Bytes = 1.6 MiB + Load Address: 80000000 + Entry Point: 80000000 + Verifying Checksum ... OK +## Flattened Device Tree blob at 80400000 + Booting using the fdt blob at 0x80400000 + Loading Kernel Image + Loading Device Tree to 00000000803fa000, end 00000000803ff88d ... OK + +Starting kernel ... + +[ 0.000000] Linux version 5.18.0 (foo@bar.com) (riscv64-buildroot-linux-uclibc-gcc.br_real (Buildroot 2022.02-560-g6a2b542a09-dirty) 10.3.0, GNU ld (GNU Binutils) 2.32) #1 SMP Thu Apr 21 16:00:03 JST 2022 +[ 0.000000] Machine model: SiPeed MAIX Dock +[ 0.000000] earlycon: sifive0 at MMIO 0x0000000038000000 (options '115200n8') +[ 0.000000] printk: bootconsole [sifive0] enabled +[ 0.000000] Zone ranges: +[ 0.000000] DMA32 [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] Normal empty +[ 0.000000] Movable zone start for each node +[ 0.000000] Early memory node ranges +[ 0.000000] node 0: [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] Initmem setup node 0 [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] riscv: ISA extensions acdfim +[ 0.000000] riscv: ELF capabilities acdfim +[ 0.000000] percpu: max_distance=0x16000 too large for vmalloc space 0x0 +[ 0.000000] percpu: Embedded 11 pages/cpu s15392 r0 d29664 u45056 +[ 0.000000] percpu: wasting 10 pages per chunk +[ 0.000000] Built 1 zonelists, mobility grouping off. Total pages: 2020 +[ 0.000000] Kernel command line: earlycon console=ttySIF0 root=/dev/mmcblk0p2 rootwait ro +[ 0.000000] Dentry cache hash table entries: 1024 (order: 1, 8192 bytes, linear) +[ 0.000000] Inode-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.000000] mem auto-init: stack:off, heap alloc:off, heap free:off +[ 0.000000] Memory: 6156K/8192K available (1180K kernel code, 151K rwdata, 239K rodata, 102K init, 69K bss, 2036K reserved, 0K cma-reserved) +[ 0.000000] rcu: Hierarchical RCU implementation. +[ 0.000000] rcu: RCU calculated value of scheduler-enlistment delay is 25 jiffies. +[ 0.000000] NR_IRQS: 64, nr_irqs: 64, preallocated irqs: 0 +[ 0.000000] riscv-intc: 64 local interrupts mapped +[ 0.000000] plic: interrupt-controller@c000000: mapped 65 interrupts with 2 handlers for 4 contexts. +[ 0.000000] k210-clk: clock-controller: CPU running at 390 MHz +[ 0.000000] clint: timer@2000000: timer running at 7800000 Hz +[ 0.000000] clocksource: clint_clocksource: mask: 0xffffffffffffffff max_cycles: 0x3990be68b, max_idle_ns: 881590404272 ns +[ 0.000001] sched_clock: 64 bits at 7MHz, resolution 128ns, wraps every 4398046511054ns +[ 0.008196] Calibrating delay loop (skipped), value calculated using timer frequency.. 15.60 BogoMIPS (lpj=31200) +[ 0.018256] pid_max: default: 4096 minimum: 301 +[ 0.022876] Mount-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.029980] Mountpoint-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.040401] rcu: Hierarchical SRCU implementation. +[ 0.045379] smp: Bringing up secondary CPUs ... +[ 0.050494] smp: Brought up 1 node, 2 CPUs +[ 0.054656] devtmpfs: initialized +[ 0.072338] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 7645041785100000 ns +[ 0.081415] pinctrl core: initialized pinctrl subsystem +[ 0.123902] clocksource: Switched to clocksource clint_clocksource +[ 0.136898] workingset: timestamp_bits=62 max_order=11 bucket_order=0 +[ 0.182570] k210-sysctl 50440000.syscon: K210 system controller +[ 0.198158] k210-rst 50440000.syscon:reset-controller: K210 reset controller +[ 0.207473] cacheinfo: Unable to detect cache hierarchy for CPU 0 +[ 0.219724] i2c_dev: i2c /dev entries driver +[ 0.230080] k210-fpioa 502b0000.pinmux: K210 FPIOA pin controller +[ 0.243091] 38000000.serial: ttySIF0 at MMIO 0x38000000 (irq = 1, base_baud = 115200) is a SiFive UART v0 +[ 0.252034] printk: console [ttySIF0] enabled +[ 0.252034] printk: console [ttySIF0] enabled +[ 0.260656] printk: bootconsole [sifive0] disabled +[ 0.260656] printk: bootconsole [sifive0] disabled +[ 0.272546] panel@0 enforce active low on chipselect handle +[ 0.308098] mmc_spi spi3.0: SD/MMC host mmc0, no WP, no poweroff, cd polling +[ 0.320197] Waiting for root device /dev/mmcblk0p2... +[ 0.344667] mmc0: host does not support reading read-only switch, assuming write-enable +[ 0.352020] mmc0: new SDHC card on SPI +[ 0.358566] mmcblk0: mmc0:0000 SA16G 14.5 GiB +[ 0.366866] random: fast init done +[ 0.371439] mmcblk0: p1 p2 +[ 0.391314] random: get_random_bytes called from 0x000000008009b7d2 with crng_init=1 +[ 0.400977] VFS: Mounted root (ext2 filesystem) readonly on device 179:2. +[ 0.410966] devtmpfs: mounted +[ 0.413521] Freeing unused kernel image (initmem) memory: 96K +[ 0.418944] This architecture does not have kernel memory protection. +[ 0.425370] Run /sbin/init as init process +[ 0.633502] random: crng init done + __ _ + / / (_) ____ _ _ __ __ + / / | || _ \ | | | |\ \/ / + / /___| || | | || |_| | > < + /_____/|_||_| |_| \____|/_/\_\ + 64-bits RISC-V Kendryte K210 NOMMU + +/ # +``` + +Of note is that the kernel mounts the SD card as read-only by default to avoid +corruptions of the ext2 root file system when the board is powered down. This +is recommended as this board does not support clean shutdown or halt. + +Similarly to the initramfs build case, a console can be open without +re-flashing the board using the host tool pyserial-miniterm. + +``` +$ output/host/bin/pyserial-miniterm --raw --eol=LF /dev/ttyUSB0 115200 +``` diff --git a/buildroot/board/sipeed/maix-go/linux-cpio.config b/buildroot/board/sipeed/maix-go/linux-cpio.config new file mode 100644 index 0000000000..ea8c30e266 --- /dev/null +++ b/buildroot/board/sipeed/maix-go/linux-cpio.config @@ -0,0 +1,2 @@ +CONFIG_SOC_CANAAN_K210_DTB_BUILTIN=y +CONFIG_SOC_CANAAN_K210_DTB_SOURCE="sipeed_maix_go" diff --git a/buildroot/board/sipeed/maix-go/readme.txt b/buildroot/board/sipeed/maix-go/readme.txt new file mode 100644 index 0000000000..9f930fb6ac --- /dev/null +++ b/buildroot/board/sipeed/maix-go/readme.txt @@ -0,0 +1,320 @@ +Sipeed MAIX-Go Board +==================== + +The Sipeed MAXI-Go board is a dual-core RISC-V 64-bits board based on the +Canaan Kendryte K210 SoC. + +Prerequisite +------------ + +In order to use the kflash utility to program this board, the user must have +access to the board USB serial device file. The simplest way to do this is to +add your user to the same group as this device file. Assume the device file is +/dev/ttyUSB0, first identify the device group name. In most cases, it is +either "dialout" or "uucp". Also verify that read-write access is enabled for +the group: + +``` +$ ls -l /dev/ttyUSB0 +crw-rw---- 1 root dialout 188, 0 May 26 13:48 /dev/ttyUSB0 +``` + +Then add yourself to that group (dialout in this example): + +``` +$ sudo usermod -a -G dialout $(whoami) +``` + +To enable the above, it is sometimes necessary to logout and login again. + +Buildroot Configuration +----------------------- + +Two buildroot configuration files are provided: + +(1) Direct Linux Kernel Boot + +This is defined by the sipeed_maix_go_defconfig configuration. This +configuration allows building a bootable kernel image with a built-in initramfs +root file system (the board SD card is not used). The built kernel image can be +flashed directly to the board ROM for direct booting. No boot loader is +required. + +(2) U-Boot SD-Card Boot + +The sipeed_maix_go_sdcard_defconfig configuration allows building a kernel +image with the root file system on the board SD card. U-Boot is used as the +boot loader. + +Note: U-Boot does not natively support the Sipeed MAIX-Go board. However, the +board and device tree differences with the Sipeed MAIX-bit board are small +enough for U-Boot to work. + +Both configuration files will also compile and install the kflash and +pyserial-miniterm host utilities to program bootable image files to the board +and open a serial terminal console. + +Direct Linux Kernel Boot +------------------------- + +Using the sipeed_maix_go_defconfig configuration, the bootable kernel binary +image is built as follows. + +``` +$ make sipeed_maix_go_defconfig +$ make +``` + +The bootable binary image is the output/images/loader.bin file. This image file +can be written to the board boot flash using the kflash utility. + +``` +$ output/host/bin/kflash -b 1500000 -p /dev/ttyUSB0 -t output/images/loader.bin +``` + +Once the kernel image file is fully programmed, a terminal console is open and +the board can be rebooted by pressing the reset button on the board (if it does +not reboot automatically). + +The output will be similar to the following. + +``` +[ 0.000000] Linux version 5.17.0 (foo@bar.com) (riscv64-buildroot-linux-uclibc-gcc.br_real (Buildroot 2022.02-560-g6a2b542a09-dirty) 10.3.0, GNU ld (GNU Binutils) 2.32) #2 SMP Thu Apr 21 16:09:24 JST 2022 +[ 0.000000] Machine model: SiPeed MAIX GO +[ 0.000000] earlycon: sifive0 at MMIO 0x0000000038000000 (options '115200n8') +[ 0.000000] printk: bootconsole [sifive0] enabled +[ 0.000000] Zone ranges: +[ 0.000000] DMA32 [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] Normal empty +[ 0.000000] Movable zone start for each node +[ 0.000000] Early memory node ranges +[ 0.000000] node 0: [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] Initmem setup node 0 [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] riscv: ISA extensions acdfim +[ 0.000000] riscv: ELF capabilities acdfim +[ 0.000000] percpu: max_distance=0x16000 too large for vmalloc space 0x0 +[ 0.000000] percpu: Embedded 11 pages/cpu s15264 r0 d29792 u45056 +[ 0.000000] percpu: wasting 10 pages per chunk +[ 0.000000] Built 1 zonelists, mobility grouping off. Total pages: 2020 +[ 0.000000] Kernel command line: earlycon console=ttySIF0 +[ 0.000000] Dentry cache hash table entries: 1024 (order: 1, 8192 bytes, linear) +[ 0.000000] Inode-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.000000] mem auto-init: stack:off, heap alloc:off, heap free:off +[ 0.000000] Memory: 5980K/8192K available (964K kernel code, 137K rwdata, 205K rodata, 546K init, 66K bss, 2212K reserved, 0K cma-reserved) +[ 0.000000] rcu: Hierarchical RCU implementation. +[ 0.000000] rcu: RCU calculated value of scheduler-enlistment delay is 25 jiffies. +[ 0.000000] NR_IRQS: 64, nr_irqs: 64, preallocated irqs: 0 +[ 0.000000] riscv-intc: 64 local interrupts mapped +[ 0.000000] plic: interrupt-controller@c000000: mapped 65 interrupts with 2 handlers for 4 contexts. +[ 0.000000] k210-clk: clock-controller: CPU running at 390 MHz +[ 0.000000] clint: timer@2000000: timer running at 7800000 Hz +[ 0.000000] clocksource: clint_clocksource: mask: 0xffffffffffffffff max_cycles: 0x3990be68b, max_idle_ns: 881590404272 ns +[ 0.000001] sched_clock: 64 bits at 7MHz, resolution 128ns, wraps every 4398046511054ns +[ 0.008193] Calibrating delay loop (skipped), value calculated using timer frequency.. 15.60 BogoMIPS (lpj=31200) +[ 0.018250] pid_max: default: 4096 minimum: 301 +[ 0.022862] Mount-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.029971] Mountpoint-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.040239] rcu: Hierarchical SRCU implementation. +[ 0.045118] smp: Bringing up secondary CPUs ... +[ 0.050204] smp: Brought up 1 node, 2 CPUs +[ 0.054336] devtmpfs: initialized +[ 0.071519] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 7645041785100000 ns +[ 0.080591] pinctrl core: initialized pinctrl subsystem +[ 0.121163] clocksource: Switched to clocksource clint_clocksource +[ 0.133221] workingset: timestamp_bits=62 max_order=11 bucket_order=0 +[ 0.180960] k210-sysctl 50440000.syscon: K210 system controller +[ 0.196811] k210-rst 50440000.syscon:reset-controller: K210 reset controller +[ 0.204879] cacheinfo: Unable to detect cache hierarchy for CPU 0 +[ 0.214087] i2c_dev: i2c /dev entries driver +[ 0.222736] k210-fpioa 502b0000.pinmux: K210 FPIOA pin controller +[ 0.236173] 38000000.serial: ttySIF0 at MMIO 0x38000000 (irq = 1, base_baud = 115200) is a SiFive UART v0 +[ 0.245104] printk: console [ttySIF0] enabled +[ 0.245104] printk: console [ttySIF0] enabled +[ 0.253726] printk: bootconsole [sifive0] disabled +[ 0.253726] printk: bootconsole [sifive0] disabled +[ 0.265588] panel@0 enforce active low on chipselect handle +[ 0.282358] Freeing unused kernel image (initmem) memory: 540K +[ 0.287492] This architecture does not have kernel memory protection. +[ 0.293926] Run /init as init process + __ _ + / / (_) ____ _ _ __ __ + / / | || _ \ | | | |\ \/ / + / /___| || | | || |_| | > < + /_____/|_||_| |_| \____|/_/\_\ + 64-bits RISC-V Kendryte K210 NOMMU + +/ # +``` + +To open a terminal console without re-flashing the board, the pyserial-miniterm +host tool can be used. + +``` +$ output/host/bin/pyserial-miniterm --raw --eol=LF /dev/ttyUSB0 115200 +``` + +The options "--raw" and "--eol=LF" are added here to avoid a double carriage +return each time a command is entered. + + +U-Boot SD-Card Boot +------------------- + +The build procedure is similar to the built-in initramfs case. + +``` +$ make sipeed_maix_go_sdcard_defconfig +$ make +``` + +The build process will generate two files under the output/images directory. + +* sdcard.img: The image file for the SD card filesystem. This image has 2 + partitions. The first partition is a vfat partition containing the kernel + uImage and the board device tree binary. The second partition is the root + filesystem with busybox installed. The second partition is formatted using + ext2 (rev1). + +* uboot.bin: U-Boot bootable binary to load and boot the kernel from the SD + card. + +The SD card can be prepared by writing the sdcard.img file, as follows. + +``` +$ sudo dd if=output/images/sdcard.img of=/dev/sdX bs=1M +$ sync +$ eject /dev/sdX +``` + +Where /dev/sdX is the device file name of the SD card. Once completed, the SD +card can be inserted into the board and the U-Boot binary image written to the +board boot flash using the kflash utility. + +``` +$ output/host/bin/kflash -b 1500000 -p /dev/ttyUSB0 -t output/images/u-boot.bin +``` + +The above command will program U-Boot image to the board boot ROM and open a +terminal console once the u-boot.bin file is fully programmed. Reboot into the +newly programmed environment by pressing the board reset button. + +The output will be similar to the following. + +``` +U-Boot 2022.04 (Apr 21 2022 - 16:28:58 +0900) + +DRAM: 8 MiB +Core: 34 devices, 17 uclasses, devicetree: separate +WDT: Not starting watchdog@50400000 +MMC: spi@53000000:slot@0: 0 +Loading Environment from SPIFlash... SF: Detected gd25lq128 with page size 256 Bytes, erase size 4 KiB, total 16 MiB +*** Warning - bad CRC, using default environment + +In: serial@38000000 +Out: serial@38000000 +Err: serial@38000000 +Hit any key to stop autoboot: 0 +1717730 bytes read in 956 ms (1.7 MiB/s) +10502 bytes read in 11 ms (931.6 KiB/s) +## Booting kernel from Legacy Image at 80060000 ... + Image Name: Linux + Image Type: RISC-V Linux Kernel Image (uncompressed) + Data Size: 1717666 Bytes = 1.6 MiB + Load Address: 80000000 + Entry Point: 80000000 + Verifying Checksum ... OK +## Flattened Device Tree blob at 80400000 + Booting using the fdt blob at 0x80400000 + Loading Kernel Image + Loading Device Tree to 00000000803fa000, end 00000000803ff905 ... OK + +Starting kernel ... + +[ 0.000000] Linux version 5.17.0 (foo@bar.com) (riscv64-buildroot-linux-uclibc-gcc.br_real (Buildroot 2022.02-560-g6a2b542a09-dirty) 10.3.0, GNU ld (GNU Binutils) 2.32) #1 SMP Thu Apr 21 16:29:10 JST 2022 +[ 0.000000] Machine model: SiPeed MAIX GO +[ 0.000000] earlycon: sifive0 at MMIO 0x0000000038000000 (options '115200n8') +[ 0.000000] printk: bootconsole [sifive0] enabled +[ 0.000000] Zone ranges: +[ 0.000000] DMA32 [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] Normal empty +[ 0.000000] Movable zone start for each node +[ 0.000000] Early memory node ranges +[ 0.000000] node 0: [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] Initmem setup node 0 [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] riscv: ISA extensions acdfim +[ 0.000000] riscv: ELF capabilities acdfim +[ 0.000000] percpu: max_distance=0x16000 too large for vmalloc space 0x0 +[ 0.000000] percpu: Embedded 11 pages/cpu s15392 r0 d29664 u45056 +[ 0.000000] percpu: wasting 10 pages per chunk +[ 0.000000] Built 1 zonelists, mobility grouping off. Total pages: 2020 +[ 0.000000] Kernel command line: earlycon console=ttySIF0 root=/dev/mmcblk0p2 rootwait ro +[ 0.000000] Dentry cache hash table entries: 1024 (order: 1, 8192 bytes, linear) +[ 0.000000] Inode-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.000000] mem auto-init: stack:off, heap alloc:off, heap free:off +[ 0.000000] Memory: 6156K/8192K available (1180K kernel code, 151K rwdata, 239K rodata, 102K init, 69K bss, 2036K reserved, 0K cma-reserved) +[ 0.000000] rcu: Hierarchical RCU implementation. +[ 0.000000] rcu: RCU calculated value of scheduler-enlistment delay is 25 jiffies. +[ 0.000000] NR_IRQS: 64, nr_irqs: 64, preallocated irqs: 0 +[ 0.000000] riscv-intc: 64 local interrupts mapped +[ 0.000000] plic: interrupt-controller@c000000: mapped 65 interrupts with 2 handlers for 4 contexts. +[ 0.000000] k210-clk: clock-controller: CPU running at 390 MHz +[ 0.000000] clint: timer@2000000: timer running at 7800000 Hz +[ 0.000000] clocksource: clint_clocksource: mask: 0xffffffffffffffff max_cycles: 0x3990be68b, max_idle_ns: 881590404272 ns +[ 0.000001] sched_clock: 64 bits at 7MHz, resolution 128ns, wraps every 4398046511054ns +[ 0.008201] Calibrating delay loop (skipped), value calculated using timer frequency.. 15.60 BogoMIPS (lpj=31200) +[ 0.018256] pid_max: default: 4096 minimum: 301 +[ 0.022875] Mount-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.029983] Mountpoint-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.040405] rcu: Hierarchical SRCU implementation. +[ 0.045387] smp: Bringing up secondary CPUs ... +[ 0.050501] smp: Brought up 1 node, 2 CPUs +[ 0.054662] devtmpfs: initialized +[ 0.072840] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 7645041785100000 ns +[ 0.081918] pinctrl core: initialized pinctrl subsystem +[ 0.124601] clocksource: Switched to clocksource clint_clocksource +[ 0.137869] workingset: timestamp_bits=62 max_order=11 bucket_order=0 +[ 0.183507] k210-sysctl 50440000.syscon: K210 system controller +[ 0.199987] k210-rst 50440000.syscon:reset-controller: K210 reset controller +[ 0.209219] cacheinfo: Unable to detect cache hierarchy for CPU 0 +[ 0.221062] i2c_dev: i2c /dev entries driver +[ 0.232254] k210-fpioa 502b0000.pinmux: K210 FPIOA pin controller +[ 0.245342] 38000000.serial: ttySIF0 at MMIO 0x38000000 (irq = 1, base_baud = 115200) is a SiFive UART v0 +[ 0.254281] printk: console [ttySIF0] enabled +[ 0.254281] printk: console [ttySIF0] enabled +[ 0.262908] printk: bootconsole [sifive0] disabled +[ 0.262908] printk: bootconsole [sifive0] disabled +[ 0.274939] panel@0 enforce active low on chipselect handle +[ 0.308760] mmc_spi spi3.0: SD/MMC host mmc0, no WP, no poweroff, cd polling +[ 0.321220] Waiting for root device /dev/mmcblk0p2... +[ 0.344805] mmc0: host does not support reading read-only switch, assuming write-enable +[ 0.352142] mmc0: new SDHC card on SPI +[ 0.358622] mmcblk0: mmc0:0000 SA16G 14.5 GiB +[ 0.366636] random: fast init done +[ 0.371323] mmcblk0: p1 p2 +[ 0.392887] random: get_random_bytes called from 0x000000008009b7d2 with crng_init=1 +[ 0.394338] VFS: Mounted root (ext2 filesystem) readonly on device 179:2. +[ 0.411277] devtmpfs: mounted +[ 0.413836] Freeing unused kernel image (initmem) memory: 96K +[ 0.419267] This architecture does not have kernel memory protection. +[ 0.425683] Run /sbin/init as init process +[ 0.594251] random: crng init done + __ _ + / / (_) ____ _ _ __ __ + / / | || _ \ | | | |\ \/ / + / /___| || | | || |_| | > < + /_____/|_||_| |_| \____|/_/\_\ + 64-bits RISC-V Kendryte K210 NOMMU + +/ # +``` + +Of note is that the kernel mounts the SD card as read-only by default to avoid +corruptions of the ext2 root file system when the board is powered down. This +is recommended as this board does not support clean shutdown or halt. + +Similarly to the initramfs build case, a console can be open without +re-flashing the board using the host tool pyserial-miniterm. + +``` +$ output/host/bin/pyserial-miniterm --raw --eol=LF /dev/ttyUSB0 115200 +``` diff --git a/buildroot/board/sipeed/maixduino/linux-cpio.config b/buildroot/board/sipeed/maixduino/linux-cpio.config new file mode 100644 index 0000000000..049a2550c5 --- /dev/null +++ b/buildroot/board/sipeed/maixduino/linux-cpio.config @@ -0,0 +1,2 @@ +CONFIG_SOC_CANAAN_K210_DTB_BUILTIN=y +CONFIG_SOC_CANAAN_K210_DTB_SOURCE="sipeed_maixduino" diff --git a/buildroot/board/sipeed/maixduino/readme.txt b/buildroot/board/sipeed/maixduino/readme.txt new file mode 100644 index 0000000000..53a9e5c2ac --- /dev/null +++ b/buildroot/board/sipeed/maixduino/readme.txt @@ -0,0 +1,292 @@ +Sipeed MAIXDUINO Board +====================== + +The Sipeed MAIXDUINO board is a dual-core RISC-V 64-bits board based on the +Canaan Kendryte K210 SoC. This board has the same form factor as the Arduino +UNO board. + +Prerequisite +------------ + +In order to use the kflash utility to program this board, the user must have +access to the board USB serial device file. The simplest way to do this is to +add your user to the same group as this device file. Assume the device file is +/dev/ttyUSB0, first identify the device group name. In most cases, it is +either "dialout" or "uucp". Also verify that read-write access is enabled for +the group: + +``` +$ ls -l /dev/ttyUSB0 +crw-rw---- 1 root dialout 188, 0 May 26 13:48 /dev/ttyUSB0 +``` + +Then add yourself to that group (dialout in this example): + +``` +$ sudo usermod -a -G dialout $(whoami) +``` + +To enable the above, it is sometimes necessary to logout and login again. + +Buildroot Configuration +----------------------- + +Two buildroot configurations are provided: + +(1) Direct Linux Kernel Boot + +This is defined by the sipeed_maixduino_defconfig configuration. This +configuration allows building a bootable kernel image with a built-in initramfs +root file system (the board SD card is not used). The built kernel image can be +flashed directly to the board ROM for direct booting. No boot loader is +required. + +(2) U-Boot SD-Card Boot + +The sipeed_maixduino_sdcard_defconfig configuration allows building a kernel +image with the root file system on the board SD card. U-Boot is used as the +boot loader. + +Note: U-Boot does not natively support the Sipeed MAIXDUINO board. However, the +board and device tree differences with the Sipeed MAIX-bit board are small +enough for U-Boot to work. + +Both configuration files will also compile and install the kflash and +pyserial-miniterm host utilities to program bootable image files to the board +and open a serial terminal console. + +Direct Linux Kernel Boot +------------------------ + +Using the sipeed_maixduino_defconfig configuration, the bootable kernel binary +image is built as follows. + +``` +$ make sipeed_maixduino_defconfig +$ make +``` + +The bootable binary image is the output/images/loader.bin file. This image file +can be written to the board boot flash using the kflash utility. + +``` +$ output/host/bin/kflash -b 1500000 -p /dev/ttyUSB0 -t output/images/loader.bin +``` + +Once the kernel image file is fully programmed, a terminal console is open and +the board can be rebooted by pressing the reset button on the board (if it does +not reboot automatically). + +The output will be similar to the following. + +``` +[ 0.000000] Linux version 5.18.0 (foo@bar.com) (riscv64-buildroot-linux-uclibc-gcc.br_real (Buildroot 2022.02-560-g6a2b542a09-dirty) 10.3.0, GNU ld (GNU Binutils) 2.32) #2 SMP Thu Apr 21 15:16:00 JST 2022 +[ 0.000000] Machine model: SiPeed MAIXDUINO +[ 0.000000] earlycon: sifive0 at MMIO 0x0000000038000000 (options '115200n8') +[ 0.000000] printk: bootconsole [sifive0] enabled +[ 0.000000] Zone ranges: +[ 0.000000] DMA32 [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] Normal empty +[ 0.000000] Movable zone start for each node +[ 0.000000] Early memory node ranges +[ 0.000000] node 0: [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] Initmem setup node 0 [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] riscv: ISA extensions acdfim +[ 0.000000] riscv: ELF capabilities acdfim +[ 0.000000] percpu: max_distance=0x16000 too large for vmalloc space 0x0 +[ 0.000000] percpu: Embedded 11 pages/cpu s15264 r0 d29792 u45056 +[ 0.000000] percpu: wasting 10 pages per chunk +[ 0.000000] Built 1 zonelists, mobility grouping off. Total pages: 2020 +[ 0.000000] Kernel command line: earlycon console=ttySIF0 +[ 0.000000] Dentry cache hash table entries: 1024 (order: 1, 8192 bytes, linear) +[ 0.000000] Inode-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.000000] mem auto-init: stack:off, heap alloc:off, heap free:off +[ 0.000000] Memory: 6000K/8192K available (964K kernel code, 137K rwdata, 205K rodata, 530K init, 66K bss, 2192K reserved, 0K cma-reserved) +[ 0.000000] rcu: Hierarchical RCU implementation. +[ 0.000000] rcu: RCU calculated value of scheduler-enlistment delay is 25 jiffies. +[ 0.000000] NR_IRQS: 64, nr_irqs: 64, preallocated irqs: 0 +[ 0.000000] riscv-intc: 64 local interrupts mapped +[ 0.000000] plic: interrupt-controller@c000000: mapped 65 interrupts with 2 handlers for 4 contexts. +[ 0.000000] k210-clk: clock-controller: CPU running at 390 MHz +[ 0.000000] clint: timer@2000000: timer running at 7800000 Hz +[ 0.000000] clocksource: clint_clocksource: mask: 0xffffffffffffffff max_cycles: 0x3990be68b, max_idle_ns: 881590404272 ns +[ 0.000001] sched_clock: 64 bits at 7MHz, resolution 128ns, wraps every 4398046511054ns +[ 0.008183] Calibrating delay loop (skipped), value calculated using timer frequency.. 15.60 BogoMIPS (lpj=31200) +[ 0.018249] pid_max: default: 4096 minimum: 301 +[ 0.022860] Mount-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.029971] Mountpoint-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.040242] rcu: Hierarchical SRCU implementation. +[ 0.045124] smp: Bringing up secondary CPUs ... +[ 0.050217] smp: Brought up 1 node, 2 CPUs +[ 0.054346] devtmpfs: initialized +[ 0.070924] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 7645041785100000 ns +[ 0.079996] pinctrl core: initialized pinctrl subsystem +[ 0.119893] clocksource: Switched to clocksource clint_clocksource +[ 0.131992] workingset: timestamp_bits=62 max_order=11 bucket_order=0 +[ 0.179099] k210-sysctl 50440000.syscon: K210 system controller +[ 0.194904] k210-rst 50440000.syscon:reset-controller: K210 reset controller +[ 0.203108] cacheinfo: Unable to detect cache hierarchy for CPU 0 +[ 0.213867] i2c_dev: i2c /dev entries driver +[ 0.223397] k210-fpioa 502b0000.pinmux: K210 FPIOA pin controller +[ 0.235632] 38000000.serial: ttySIF0 at MMIO 0x38000000 (irq = 1, base_baud = 115200) is a SiFive UART v0 +[ 0.244585] printk: console [ttySIF0] enabled +[ 0.244585] printk: console [ttySIF0] enabled +[ 0.253190] printk: bootconsole [sifive0] disabled +[ 0.253190] printk: bootconsole [sifive0] disabled +[ 0.264820] panel@0 enforce active low on chipselect handle +[ 0.281482] Freeing unused kernel image (initmem) memory: 524K +[ 0.286621] This architecture does not have kernel memory protection. +[ 0.293047] Run /init as init process + __ _ + / / (_) ____ _ _ __ __ + / / | || _ \ | | | |\ \/ / + / /___| || | | || |_| | > < + /_____/|_||_| |_| \____|/_/\_\ + 64-bits RISC-V Kendryte K210 NOMMU + +/ # +``` + +To open a terminal console without re-flashing the board, the pyserial-miniterm +host tool can be used. + +``` +$ output/host/bin/pyserial-miniterm --raw --eol=LF /dev/ttyUSB0 115200 +``` + +The options "--raw" and "--eol=LF" are added here to avoid a double carriage +return each time a command is entered. + + +U-Boot SD-Card Boot +------------------- + +The build procedure is similar to the built-in initramfs case. + +``` +$ make sipeed_maixduino_sdcard_defconfig +$ make +``` + +The build process will generate two files under the output/images directory. + +* sdcard.img: The image file for the SD card filesystem. This image has 2 + partitions. The first partition is a vfat partition containing the kernel + uImage and the board device tree binary. The second partition is the root + filesystem with busybox installed. The second partition is formatted using + ext2 (rev1). + +* uboot.bin: U-Boot bootable binary to load and boot the kernel from the SD + card. + +The SD card can be prepared by writing the sdcard.img file, as follows. + +``` +$ sudo dd if=output/images/sdcard.img of=/dev/sdX bs=1M +$ sync +$ eject /dev/sdX +``` + +Where /dev/sdX is the device file name of the SD card. Once completed, the SD +card can be inserted into the board and the U-Boot binary image written to the +board boot flash using the kflash utility. + +``` +$ output/host/bin/kflash -b 1500000 -p /dev/ttyUSB0 -t output/images/u-boot.bin +``` + +The above command will program U-Boot image to the board boot ROM and open a +terminal console once the u-boot.bin file is fully programmed. Reboot into the +newly programmed environment by pressing the board reset button. + +The output will be similar to the following. + +``` +[ 0.000000] Linux version 5.18.0 (foo@bar.com) (riscv64-buildroot-linux-uclibc-gcc.br_real (Buildroot 2022.02-560-g6a2b542a09-dirty) 10.3.0, GNU ld (GNU Binutils) 2.32) #1 SMP Thu Apr 21 15:30:18 JST 2022 +[ 0.000000] Machine model: SiPeed MAIXDUINO +[ 0.000000] earlycon: sifive0 at MMIO 0x0000000038000000 (options '115200n8') +[ 0.000000] printk: bootconsole [sifive0] enabled +[ 0.000000] Zone ranges: +[ 0.000000] DMA32 [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] Normal empty +[ 0.000000] Movable zone start for each node +[ 0.000000] Early memory node ranges +[ 0.000000] node 0: [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] Initmem setup node 0 [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] riscv: ISA extensions acdfim +[ 0.000000] riscv: ELF capabilities acdfim +[ 0.000000] percpu: max_distance=0x16000 too large for vmalloc space 0x0 +[ 0.000000] percpu: Embedded 11 pages/cpu s15392 r0 d29664 u45056 +[ 0.000000] percpu: wasting 10 pages per chunk +[ 0.000000] Built 1 zonelists, mobility grouping off. Total pages: 2020 +[ 0.000000] Kernel command line: earlycon console=ttySIF0 root=/dev/mmcblk0p2 rootwait ro +[ 0.000000] Dentry cache hash table entries: 1024 (order: 1, 8192 bytes, linear) +[ 0.000000] Inode-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.000000] mem auto-init: stack:off, heap alloc:off, heap free:off +[ 0.000000] Memory: 6156K/8192K available (1180K kernel code, 151K rwdata, 239K rodata, 102K init, 69K bss, 2036K reserved, 0K cma-reserved) +[ 0.000000] rcu: Hierarchical RCU implementation. +[ 0.000000] rcu: RCU calculated value of scheduler-enlistment delay is 25 jiffies. +[ 0.000000] NR_IRQS: 64, nr_irqs: 64, preallocated irqs: 0 +[ 0.000000] riscv-intc: 64 local interrupts mapped +[ 0.000000] plic: interrupt-controller@c000000: mapped 65 interrupts with 2 handlers for 4 contexts. +[ 0.000000] k210-clk: clock-controller: CPU running at 390 MHz +[ 0.000000] clint: timer@2000000: timer running at 7800000 Hz +[ 0.000000] clocksource: clint_clocksource: mask: 0xffffffffffffffff max_cycles: 0x3990be68b, max_idle_ns: 881590404272 ns +[ 0.000001] sched_clock: 64 bits at 7MHz, resolution 128ns, wraps every 4398046511054ns +[ 0.008191] Calibrating delay loop (skipped), value calculated using timer frequency.. 15.60 BogoMIPS (lpj=31200) +[ 0.018255] pid_max: default: 4096 minimum: 301 +[ 0.022876] Mount-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.029982] Mountpoint-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.040417] rcu: Hierarchical SRCU implementation. +[ 0.045397] smp: Bringing up secondary CPUs ... +[ 0.050513] smp: Brought up 1 node, 2 CPUs +[ 0.054680] devtmpfs: initialized +[ 0.072127] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 7645041785100000 ns +[ 0.081205] pinctrl core: initialized pinctrl subsystem +[ 0.125074] clocksource: Switched to clocksource clint_clocksource +[ 0.138311] workingset: timestamp_bits=62 max_order=11 bucket_order=0 +[ 0.183471] k210-sysctl 50440000.syscon: K210 system controller +[ 0.199873] k210-rst 50440000.syscon:reset-controller: K210 reset controller +[ 0.208858] cacheinfo: Unable to detect cache hierarchy for CPU 0 +[ 0.221586] i2c_dev: i2c /dev entries driver +[ 0.232786] k210-fpioa 502b0000.pinmux: K210 FPIOA pin controller +[ 0.246572] 38000000.serial: ttySIF0 at MMIO 0x38000000 (irq = 1, base_baud = 115200) is a SiFive UART v0 +[ 0.255508] printk: console [ttySIF0] enabled +[ 0.255508] printk: console [ttySIF0] enabled +[ 0.264137] printk: bootconsole [sifive0] disabled +[ 0.264137] printk: bootconsole [sifive0] disabled +[ 0.275560] panel@0 enforce active low on chipselect handle +[ 0.313245] mmc_spi spi3.0: SD/MMC host mmc0, no WP, no poweroff, cd polling +[ 0.322845] Waiting for root device /dev/mmcblk0p2... +[ 0.345869] mmc0: host does not support reading read-only switch, assuming write-enable +[ 0.353221] mmc0: new SDHC card on SPI +[ 0.360233] mmcblk0: mmc0:0000 SA16G 14.5 GiB +[ 0.368350] random: fast init done +[ 0.372926] mmcblk0: p1 p2 +[ 0.391887] random: get_random_bytes called from 0x000000008009b7d2 with crng_init=1 +[ 0.400427] VFS: Mounted root (ext2 filesystem) readonly on device 179:2. +[ 0.410128] devtmpfs: mounted +[ 0.412628] Freeing unused kernel image (initmem) memory: 96K +[ 0.418137] This architecture does not have kernel memory protection. +[ 0.424530] Run /sbin/init as init process +[ 0.563384] random: crng init done + __ _ + / / (_) ____ _ _ __ __ + / / | || _ \ | | | |\ \/ / + / /___| || | | || |_| | > < + /_____/|_||_| |_| \____|/_/\_\ + 64-bits RISC-V Kendryte K210 NOMMU + +/ # +``` + +Of note is that the kernel mounts the SD card as read-only by default to avoid +corruptions of the ext2 root file system when the board is powered down. This +is recommended as this board does not support clean shutdown or halt. + +Similarly to the initramfs build case, a console can be open without +re-flashing the board using the host tool pyserial-miniterm. + +``` +$ output/host/bin/pyserial-miniterm --raw --eol=LF /dev/ttyUSB0 115200 +``` diff --git a/buildroot/board/solidrun/clearfog/genimage.cfg b/buildroot/board/solidrun/clearfog/genimage.cfg index 8963619cc5..35aab62a8c 100644 --- a/buildroot/board/solidrun/clearfog/genimage.cfg +++ b/buildroot/board/solidrun/clearfog/genimage.cfg @@ -4,7 +4,7 @@ image sdcard.img { partition u-boot { in-partition-table = "no" - image = "u-boot-spl.kwb" + image = "u-boot-with-spl.kwb" offset = 512 } diff --git a/buildroot/board/solidrun/clearfog/patches/linux-headers/linux-headers.hash b/buildroot/board/solidrun/clearfog/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/solidrun/clearfog/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/solidrun/clearfog/patches/linux/linux.hash b/buildroot/board/solidrun/clearfog/patches/linux/linux.hash new file mode 100644 index 0000000000..b8935a250a --- /dev/null +++ b/buildroot/board/solidrun/clearfog/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 0ad83b1a1a780a1aad948d55aa55ee63c50c626f2d46910b9d2180028d100a5e linux-6.6.43.tar.xz diff --git a/buildroot/board/solidrun/clearfog/patches/uboot/uboot.hash b/buildroot/board/solidrun/clearfog/patches/uboot/uboot.hash new file mode 100644 index 0000000000..fe9b4f53dc --- /dev/null +++ b/buildroot/board/solidrun/clearfog/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f u-boot-2024.07.tar.bz2 diff --git a/buildroot/board/solidrun/macchiatobin/readme.txt b/buildroot/board/solidrun/macchiatobin/readme.txt index 7412951aab..ef5a6cba6b 100644 --- a/buildroot/board/solidrun/macchiatobin/readme.txt +++ b/buildroot/board/solidrun/macchiatobin/readme.txt @@ -13,9 +13,9 @@ How to build ============ Default configuration provides the following BSP versions: - - Linux v5.6.3 (mainline) - - U-Boot v2020.01 (mainline) - - ATF v1.5-18.12.2 (Marvell) + - Linux v5.10.5 + - U-Boot v2020.10 + - ATF v2.4 To build images run the following commands: diff --git a/buildroot/board/solidrun/mx6cubox/patches/linux-headers/linux-headers.hash b/buildroot/board/solidrun/mx6cubox/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/solidrun/mx6cubox/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/solidrun/mx6cubox/patches/linux/linux.hash b/buildroot/board/solidrun/mx6cubox/patches/linux/linux.hash new file mode 100644 index 0000000000..8b8381e619 --- /dev/null +++ b/buildroot/board/solidrun/mx6cubox/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 639e50060e3c8f23ed017cb10cfeacc6ba88ff5583812bb76859b4cc6a128291 linux-6.6.27.tar.xz diff --git a/buildroot/board/solidrun/mx6cubox/patches/uboot/uboot.hash b/buildroot/board/solidrun/mx6cubox/patches/uboot/uboot.hash new file mode 100644 index 0000000000..c1aeddf06c --- /dev/null +++ b/buildroot/board/solidrun/mx6cubox/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a u-boot-2024.04.tar.bz2 diff --git a/buildroot/board/spike/riscv32/patches/linux-headers/linux-headers.hash b/buildroot/board/spike/riscv32/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/spike/riscv32/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/spike/riscv32/patches/linux/linux.hash b/buildroot/board/spike/riscv32/patches/linux/linux.hash new file mode 100644 index 0000000000..a3b67a09a4 --- /dev/null +++ b/buildroot/board/spike/riscv32/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://cdn.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 fce3ee728712ed063aa8c14a8756c8ff8c7a46ba3827f61d2b04a73c7cf5dd9e linux-6.6.35.tar.xz diff --git a/buildroot/board/spike/riscv32/patches/opensbi/opensbi.hash b/buildroot/board/spike/riscv32/patches/opensbi/opensbi.hash new file mode 100644 index 0000000000..bc4058abe6 --- /dev/null +++ b/buildroot/board/spike/riscv32/patches/opensbi/opensbi.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 319b62a4186fbce9b81a0c5f0ec9f003a10c808397a72138bc9745d9b87b1eb1 opensbi-1.4.tar.gz diff --git a/buildroot/board/spike/riscv32/readme.txt b/buildroot/board/spike/riscv32/readme.txt new file mode 100644 index 0000000000..9cc49af9df --- /dev/null +++ b/buildroot/board/spike/riscv32/readme.txt @@ -0,0 +1,30 @@ +Linux on Spike RISC-V 32-bit ISA simulator +========================================== + +This configuration provides a minimal working setup to run a Linux +kernel in the Spike RISC-V ISA simulator. + +The Spike ISA simulator can be an interresting alternative to Qemu, in +some specific cases. For example: simulating new instructions (see [1]), +simulating riscv-openocd/gdb debug sessions (see [2], [3]), or +generating an accurate per-instruction log of execution (see +riscv-isa-sim spike -l option)... + +To run Buildroot Linux in Spike, use the commands: + + make spike_riscv32_defconfig + make + ./board/spike/riscv32/start.sh + +The boot is made with the standard RISC-V OpenSBI boot loader. In +order to keep the simulation simple, the rootfs is passed as an initrd +ramfs. + +[1]. +https://github.com/riscv-software-src/riscv-isa-sim/tree/v1.1.0#simulating-a-new-instruction + +[2]. +https://github.com/riscv-software-src/riscv-isa-sim/tree/v1.1.0#debugging-with-gdb + +[3]. +https://github.com/riscv-collab/riscv-openocd diff --git a/buildroot/board/spike/riscv32/start.sh b/buildroot/board/spike/riscv32/start.sh new file mode 100755 index 0000000000..43d2d9dcde --- /dev/null +++ b/buildroot/board/spike/riscv32/start.sh @@ -0,0 +1,23 @@ +#! /bin/sh + +SCRIPT_DIR="$(dirname "$0")" +BR_BASEDIR="$(readlink -e "${SCRIPT_DIR}/../../..")" + +# spike uses dtc at runtime startup, so make sure buildroot host +# directory is in the PATH +export PATH="${BR_BASEDIR}/output/host/usr/bin:$PATH" + +# Use Buildroot host spike by default, but allow the caller to +# redefine another spike binary +: "${SPIKE:=spike}" + +# Note 1: Kernel with initrd fail to boot on riscv32 when the system +# has more than 1GB of RAM. So we set exactly this amount of RAM. +# Note 2: The default spike ISA is RV64IMAFDC_zicntr_zihpm, so we need +# to force the RV32 ISA here. +exec "${SPIKE}" \ + -m1024 \ + --initrd "${BR_BASEDIR}"/output/images/rootfs.cpio \ + --isa="RV32IMAFDC_zicntr_zihpm" \ + "${@}" \ + "${BR_BASEDIR}"/output/images/fw_payload.elf diff --git a/buildroot/board/spike/riscv64/patches/linux-headers/linux-headers.hash b/buildroot/board/spike/riscv64/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/spike/riscv64/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/spike/riscv64/patches/linux/linux.hash b/buildroot/board/spike/riscv64/patches/linux/linux.hash new file mode 100644 index 0000000000..a3b67a09a4 --- /dev/null +++ b/buildroot/board/spike/riscv64/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://cdn.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 fce3ee728712ed063aa8c14a8756c8ff8c7a46ba3827f61d2b04a73c7cf5dd9e linux-6.6.35.tar.xz diff --git a/buildroot/board/spike/riscv64/patches/opensbi/opensbi.hash b/buildroot/board/spike/riscv64/patches/opensbi/opensbi.hash new file mode 100644 index 0000000000..bc4058abe6 --- /dev/null +++ b/buildroot/board/spike/riscv64/patches/opensbi/opensbi.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 319b62a4186fbce9b81a0c5f0ec9f003a10c808397a72138bc9745d9b87b1eb1 opensbi-1.4.tar.gz diff --git a/buildroot/board/spike/riscv64/readme.txt b/buildroot/board/spike/riscv64/readme.txt index 5ad7df46df..465fb06b39 100644 --- a/buildroot/board/spike/riscv64/readme.txt +++ b/buildroot/board/spike/riscv64/readme.txt @@ -20,11 +20,6 @@ The boot is made with the standard RISC-V OpenSBI boot loader. In order to keep the simulation simple, the rootfs is passed as an initrd ramfs. -Note: at the time of this writing, Spike v1.1.0 and OpenSBI v1.0 does -not support console input emulation for 32bit RISC-V systems. A 32bit -Linux system can boot and reach the login, but it's not possible to -login. See [4]. - [1]. https://github.com/riscv-software-src/riscv-isa-sim/tree/v1.1.0#simulating-a-new-instruction @@ -33,7 +28,4 @@ https://github.com/riscv-software-src/riscv-isa-sim/tree/v1.1.0#simulating-a-new https://github.com/riscv-software-src/riscv-isa-sim/tree/v1.1.0#debugging-with-gdb [3]. -https://github.com/riscv/riscv-openocd - -[4]. -https://github.com/riscv-software-src/opensbi/blob/v1.0/lib/utils/sys/htif.c#L127 +https://github.com/riscv-collab/riscv-openocd diff --git a/buildroot/board/stmicroelectronics/common/stm32f4xx/busybox.fragment b/buildroot/board/stmicroelectronics/common/stm32f4xx/busybox.fragment new file mode 100644 index 0000000000..d0bf2cb99d --- /dev/null +++ b/buildroot/board/stmicroelectronics/common/stm32f4xx/busybox.fragment @@ -0,0 +1,21 @@ +# CONFIG_FEATURE_HWIB is not set +# CONFIG_HOSTNAME is not set +# CONFIG_DNSDOMAINNAME is not set +# CONFIG_FEATURE_HTTPD_PORT_DEFAULT is not set +# CONFIG_IFCONFIG is not set +# CONFIG_FEATURE_IFCONFIG_HW is not set +# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set +# CONFIG_IFUP is not set +# CONFIG_IFDOWN is not set +# CONFIG_IP is not set +# CONFIG_IPADDR is not set +# CONFIG_IPLINK is not set +# CONFIG_IPROUTE is not set +# CONFIG_NC is not set +# CONFIG_NETSTAT is not set +# CONFIG_PING is not set +# CONFIG_ROUTE is not set +# CONFIG_TC is not set +# CONFIG_TELNET is not set +# CONFIG_WGET is not set +# CONFIG_UDHCPC is not set diff --git a/buildroot/board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh b/buildroot/board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh index e324afe59a..4fcce61500 100755 --- a/buildroot/board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh +++ b/buildroot/board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh @@ -1,8 +1,7 @@ #!/bin/sh +# Busybox is built without network support +sed -i '/hostname/d' ${TARGET_DIR}/etc/inittab + # Kernel is built without devpts support sed -i '/^devpts/d' ${TARGET_DIR}/etc/fstab - -# Kernel is built without network support -rm -f ${TARGET_DIR}/etc/init.d/S40network -rm -rf ${TARGET_DIR}/etc/network/ diff --git a/buildroot/board/stmicroelectronics/common/stm32mp157/post-image.sh b/buildroot/board/stmicroelectronics/common/stm32mp157/post-image.sh deleted file mode 100755 index 363c3127cf..0000000000 --- a/buildroot/board/stmicroelectronics/common/stm32mp157/post-image.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -# -# atf_image extracts the ATF binary image from DTB_FILE_NAME that appears in -# BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES in ${BR_CONFIG}, -# then prints the corresponding file name for the genimage -# configuration file -# -atf_image() -{ - local ATF_VARIABLES="$(sed -n 's/^BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="\([\/a-zA-Z0-9_=. \-]*\)"$/\1/p' ${BR2_CONFIG})" - - if grep -Eq "DTB_FILE_NAME=stm32mp157c-dk2.dtb" <<< ${ATF_VARIABLES}; then - echo "tf-a-stm32mp157c-dk2.stm32" - elif grep -Eq "DTB_FILE_NAME=stm32mp157a-dk1.dtb" <<< ${ATF_VARIABLES}; then - echo "tf-a-stm32mp157a-dk1.stm32" - elif grep -Eq "DTB_FILE_NAME=stm32mp157a-avenger96.dtb" <<< ${ATF_VARIABLES}; then - echo "tf-a-stm32mp157a-avenger96.stm32" - fi -} - -main() -{ - local ATFBIN="$(atf_image)" - local GENIMAGE_CFG="$(mktemp --suffix genimage.cfg)" - local GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" - - sed -e "s/%ATFBIN%/${ATFBIN}/" \ - board/stmicroelectronics/common/stm32mp157/genimage.cfg.template > ${GENIMAGE_CFG} - - support/scripts/genimage.sh -c ${GENIMAGE_CFG} - - rm -f ${GENIMAGE_CFG} - - exit $? -} - -main $@ diff --git a/buildroot/board/stmicroelectronics/common/stm32mp157/genimage.cfg.template b/buildroot/board/stmicroelectronics/common/stm32mp1xx/genimage.cfg.template similarity index 75% rename from buildroot/board/stmicroelectronics/common/stm32mp157/genimage.cfg.template rename to buildroot/board/stmicroelectronics/common/stm32mp1xx/genimage.cfg.template index 03fba8daf0..c2affd98ea 100644 --- a/buildroot/board/stmicroelectronics/common/stm32mp157/genimage.cfg.template +++ b/buildroot/board/stmicroelectronics/common/stm32mp1xx/genimage.cfg.template @@ -1,6 +1,6 @@ image sdcard.img { hdimage { - gpt = "true" + partition-table-type = "gpt" } partition fsbl1 { @@ -11,8 +11,8 @@ image sdcard.img { image = "%ATFBIN%" } - partition ssbl { - image = "u-boot.stm32" + partition fip { + image = "fip.bin" size = 2M } diff --git a/buildroot/board/stmicroelectronics/common/stm32mp1xx/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/buildroot/board/stmicroelectronics/common/stm32mp1xx/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 0000000000..2bc5030cf2 --- /dev/null +++ b/buildroot/board/stmicroelectronics/common/stm32mp1xx/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 72df0928138de111bf5e75fae47f88a4d1b4930ad52b7902e2b53e117be650c8 arm-trusted-firmware-v2.9-git4.tar.gz diff --git a/buildroot/board/stmicroelectronics/common/stm32mp1xx/patches/linux-headers/linux-headers.hash b/buildroot/board/stmicroelectronics/common/stm32mp1xx/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/stmicroelectronics/common/stm32mp1xx/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/stmicroelectronics/common/stm32mp1xx/patches/linux/linux.hash b/buildroot/board/stmicroelectronics/common/stm32mp1xx/patches/linux/linux.hash new file mode 100644 index 0000000000..95bd23c8d0 --- /dev/null +++ b/buildroot/board/stmicroelectronics/common/stm32mp1xx/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 f048267b7b88316c9ca708c68d15a9ae802dcfc943c3188c1273eb958c433281 linux-6.9.8.tar.xz diff --git a/buildroot/board/stmicroelectronics/common/stm32mp1xx/patches/uboot/uboot.hash b/buildroot/board/stmicroelectronics/common/stm32mp1xx/patches/uboot/uboot.hash new file mode 100644 index 0000000000..fe9b4f53dc --- /dev/null +++ b/buildroot/board/stmicroelectronics/common/stm32mp1xx/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f u-boot-2024.07.tar.bz2 diff --git a/buildroot/board/stmicroelectronics/common/stm32mp1xx/post-image.sh b/buildroot/board/stmicroelectronics/common/stm32mp1xx/post-image.sh new file mode 100755 index 0000000000..77547832ab --- /dev/null +++ b/buildroot/board/stmicroelectronics/common/stm32mp1xx/post-image.sh @@ -0,0 +1,34 @@ +#!/bin/sh -eu + +# +# atf_image extracts the ATF binary image from DTB_FILE_NAME that appears in +# BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES in ${BR_CONFIG}, +# then prints the corresponding file name for the genimage +# configuration file +# +atf_image() +{ + ATF_VARIABLES="$(sed -n 's/^BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="\([^\"]*\)"$/\1/p' ${BR2_CONFIG})" + # make sure DTB_FILE_NAME is set + printf '%s\n' "${ATF_VARIABLES}" | grep -Eq 'DTB_FILE_NAME=[0-9A-Za-z_\-]*' + # extract the value + DTB_FILE_NAME="$(printf '%s\n' "${ATF_VARIABLES}" | sed 's/.*DTB_FILE_NAME=\([a-zA-Z0-9_\-]*\)\.dtb.*/\1/')" + echo "tf-a-${DTB_FILE_NAME}.stm32" +} + +main() +{ + ATFBIN="$(atf_image)" + GENIMAGE_CFG="$(mktemp --suffix genimage.cfg)" + + sed -e "s/%ATFBIN%/${ATFBIN}/" \ + board/stmicroelectronics/common/stm32mp1xx/genimage.cfg.template > ${GENIMAGE_CFG} + + support/scripts/genimage.sh -c ${GENIMAGE_CFG} + + rm -f ${GENIMAGE_CFG} + + exit $? +} + +main $@ diff --git a/buildroot/board/stmicroelectronics/stm32f429-disco/linux.config b/buildroot/board/stmicroelectronics/stm32f429-disco/linux.config index 7b5c60f180..02d9c2d1e0 100644 --- a/buildroot/board/stmicroelectronics/stm32f429-disco/linux.config +++ b/buildroot/board/stmicroelectronics/stm32f429-disco/linux.config @@ -95,10 +95,6 @@ CONFIG_STM32_MDMA=y CONFIG_SYNC_FILE=y # CONFIG_VIRTIO_MENU is not set # CONFIG_VHOST_MENU is not set -CONFIG_IIO=y -CONFIG_IIO_BUFFER=y -CONFIG_IIO_TRIGGERED_BUFFER=y -CONFIG_IIO_STM32_TIMER_TRIGGER=y # CONFIG_FILE_LOCKING is not set # CONFIG_DNOTIFY is not set # CONFIG_INOTIFY_USER is not set diff --git a/buildroot/board/stmicroelectronics/stm32f429-disco/patches/linux-headers/linux-headers.hash b/buildroot/board/stmicroelectronics/stm32f429-disco/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/stmicroelectronics/stm32f429-disco/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/stmicroelectronics/stm32f429-disco/patches/linux/linux.hash b/buildroot/board/stmicroelectronics/stm32f429-disco/patches/linux/linux.hash new file mode 100644 index 0000000000..fc2057c3f2 --- /dev/null +++ b/buildroot/board/stmicroelectronics/stm32f429-disco/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 8bd8de3562fb006653e550a934e66ed9f80b7576258a03e2caa2e3ce1c1f9f24 linux-6.1.112.tar.xz diff --git a/buildroot/board/stmicroelectronics/stm32f469-disco/extlinux.conf b/buildroot/board/stmicroelectronics/stm32f469-disco/extlinux.conf index 1c2db4383b..65aa286a7a 100644 --- a/buildroot/board/stmicroelectronics/stm32f469-disco/extlinux.conf +++ b/buildroot/board/stmicroelectronics/stm32f469-disco/extlinux.conf @@ -1,4 +1,4 @@ label stm32f469-disco-buildroot - kernel /zImage - devicetree /stm32f469-disco.dtb - append console=ttySTM0,115200 root=/dev/mmcblk0p2 rw rootfstype=ext2 rootwait earlyprintk consoleblank=0 ignore_loglevel + kernel /boot/zImage + devicetree /boot/stm32f469-disco.dtb + append console=ttySTM0,115200 root=/dev/mmcblk0p1 rw rootfstype=ext2 rootwait earlyprintk consoleblank=0 ignore_loglevel diff --git a/buildroot/board/stmicroelectronics/stm32f469-disco/genimage.cfg b/buildroot/board/stmicroelectronics/stm32f469-disco/genimage.cfg index 517ead7751..e911a94e46 100644 --- a/buildroot/board/stmicroelectronics/stm32f469-disco/genimage.cfg +++ b/buildroot/board/stmicroelectronics/stm32f469-disco/genimage.cfg @@ -1,24 +1,7 @@ -image boot.vfat { - vfat { - files = { - "zImage", - "stm32f469-disco.dtb", - "extlinux" - } - } - - size = 16M -} - image sdcard.img { hdimage { } - partition u-boot { - partition-type = 0xC - image = "boot.vfat" - } - partition rootfs { partition-type = 0x83 image = "rootfs.ext2" diff --git a/buildroot/board/stmicroelectronics/stm32f469-disco/patches/linux-headers/linux-headers.hash b/buildroot/board/stmicroelectronics/stm32f469-disco/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/stmicroelectronics/stm32f469-disco/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/stmicroelectronics/stm32f469-disco/patches/linux/linux.hash b/buildroot/board/stmicroelectronics/stm32f469-disco/patches/linux/linux.hash new file mode 100644 index 0000000000..b241c795ba --- /dev/null +++ b/buildroot/board/stmicroelectronics/stm32f469-disco/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 b1751f18ece3df08d502dd87a9ab1a317dc0f9486355bf8ee62ba6af0b35da30 linux-5.15.167.tar.xz diff --git a/buildroot/board/stmicroelectronics/stm32f469-disco/patches/uboot/uboot.hash b/buildroot/board/stmicroelectronics/stm32f469-disco/patches/uboot/uboot.hash new file mode 100644 index 0000000000..904fa56c02 --- /dev/null +++ b/buildroot/board/stmicroelectronics/stm32f469-disco/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0 u-boot-2024.10.tar.bz2 diff --git a/buildroot/board/stmicroelectronics/stm32f469-disco/post-build.sh b/buildroot/board/stmicroelectronics/stm32f469-disco/post-build.sh index ec20fca7d9..03e9dcae82 100755 --- a/buildroot/board/stmicroelectronics/stm32f469-disco/post-build.sh +++ b/buildroot/board/stmicroelectronics/stm32f469-disco/post-build.sh @@ -1,4 +1,4 @@ #!/bin/sh -BOARD_DIR="$(dirname $0)" +BOARD_DIR="$(dirname "$0")" -install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf +install -m 0644 -D "${BOARD_DIR}"/extlinux.conf "${TARGET_DIR}"/boot/extlinux/extlinux.conf diff --git a/buildroot/board/stmicroelectronics/stm32f746-disco/extlinux.conf b/buildroot/board/stmicroelectronics/stm32f746-disco/extlinux.conf new file mode 100644 index 0000000000..40fc04dd10 --- /dev/null +++ b/buildroot/board/stmicroelectronics/stm32f746-disco/extlinux.conf @@ -0,0 +1,4 @@ +label stm32f746-disco-buildroot + kernel /boot/zImage + devicetree /boot/stm32f746-disco.dtb + append console=ttySTM0,115200 root=/dev/mmcblk0p1 rw rootwait consoleblank=0 ignore_loglevel diff --git a/buildroot/board/stmicroelectronics/stm32f746-disco/flash_sd.sh b/buildroot/board/stmicroelectronics/stm32f746-disco/flash_sd.sh new file mode 100755 index 0000000000..b4858cb9da --- /dev/null +++ b/buildroot/board/stmicroelectronics/stm32f746-disco/flash_sd.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +if [ $# -eq 0 ]; then + OUTPUT_DIR=output +else + OUTPUT_DIR=$1 +fi + +if ! test -d "${OUTPUT_DIR}" ; then + echo "ERROR: no output directory specified." + echo "Usage: $0 OUTPUT_DIR" + exit 1 +fi + +"${OUTPUT_DIR}"/host/bin/openocd -f board/stm32f746g-disco.cfg \ + -c "init" \ + -c "reset init" \ + -c "flash probe 0" \ + -c "flash info 0" \ + -c "flash write_image erase ${OUTPUT_DIR}/images/u-boot.bin 0x08000000" \ + -c "reset run" \ + -c "shutdown" diff --git a/buildroot/board/stmicroelectronics/stm32f746-disco/genimage.cfg b/buildroot/board/stmicroelectronics/stm32f746-disco/genimage.cfg new file mode 100644 index 0000000000..e911a94e46 --- /dev/null +++ b/buildroot/board/stmicroelectronics/stm32f746-disco/genimage.cfg @@ -0,0 +1,10 @@ +image sdcard.img { + hdimage { + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext2" + size = 32M + } +} diff --git a/buildroot/board/stmicroelectronics/stm32f746-disco/linux.fragment b/buildroot/board/stmicroelectronics/stm32f746-disco/linux.fragment new file mode 100644 index 0000000000..625fdced9e --- /dev/null +++ b/buildroot/board/stmicroelectronics/stm32f746-disco/linux.fragment @@ -0,0 +1,13 @@ +# CONFIG_PREEMPT is not set +# CONFIG_MULTIUSER is not set +# CONFIG_TIMERFD is not set +CONFIG_SET_MEM_PARAM=y +CONFIG_DRAM_BASE=0xC0000000 +CONFIG_DRAM_SIZE=0x01000000 +# CONFIG_GCC_PLUGINS is not set +# CONFIG_XIP_KERNEL is not set +# CONFIG_BLK_DEV is not set +# CONFIG_COMPAT_BRK is not set +# CONFIG_PROC_SYSCTL is not set +# CONFIG_CRYPTO is not set +CONFIG_RCU_TRACE=y \ No newline at end of file diff --git a/buildroot/board/stmicroelectronics/stm32f746-disco/patches/linux-headers/linux-headers.hash b/buildroot/board/stmicroelectronics/stm32f746-disco/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/stmicroelectronics/stm32f746-disco/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/stmicroelectronics/stm32f746-disco/patches/linux/linux.hash b/buildroot/board/stmicroelectronics/stm32f746-disco/patches/linux/linux.hash new file mode 100644 index 0000000000..b241c795ba --- /dev/null +++ b/buildroot/board/stmicroelectronics/stm32f746-disco/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 b1751f18ece3df08d502dd87a9ab1a317dc0f9486355bf8ee62ba6af0b35da30 linux-5.15.167.tar.xz diff --git a/buildroot/board/stmicroelectronics/stm32f746-disco/patches/uboot/uboot.hash b/buildroot/board/stmicroelectronics/stm32f746-disco/patches/uboot/uboot.hash new file mode 100644 index 0000000000..904fa56c02 --- /dev/null +++ b/buildroot/board/stmicroelectronics/stm32f746-disco/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0 u-boot-2024.10.tar.bz2 diff --git a/buildroot/board/stmicroelectronics/stm32f746-disco/post-build.sh b/buildroot/board/stmicroelectronics/stm32f746-disco/post-build.sh new file mode 100755 index 0000000000..03e9dcae82 --- /dev/null +++ b/buildroot/board/stmicroelectronics/stm32f746-disco/post-build.sh @@ -0,0 +1,4 @@ +#!/bin/sh +BOARD_DIR="$(dirname "$0")" + +install -m 0644 -D "${BOARD_DIR}"/extlinux.conf "${TARGET_DIR}"/boot/extlinux/extlinux.conf diff --git a/buildroot/board/stmicroelectronics/stm32f746-disco/readme.txt b/buildroot/board/stmicroelectronics/stm32f746-disco/readme.txt new file mode 100644 index 0000000000..4ac16da331 --- /dev/null +++ b/buildroot/board/stmicroelectronics/stm32f746-disco/readme.txt @@ -0,0 +1,31 @@ +STM32F746-DISCO +=================== + +This tutorial describes how to use the predefined Buildroot +configuration for the STM32F746-DISCO evaluation platform. + +Building +-------- + + make stm32f746_disco_sd_defconfig + make + +Flashing +-------- + + ./board/stmicroelectronics/stm32f746-disco/flash_sd.sh output/ + +It will flash the U-boot bootloader. + +Creating SD card +---------------- + +Buildroot prepares an "sdcard.img" image in the output/images/ directory, +ready to be dumped on a SD card. Launch the following command as root: + + dd if=output/images/sdcard.img of=/dev/ + +*** WARNING! This will destroy all the card content. Use with care! *** + +For details about the medium image layout and its content, see the +definition in board/stmicroelectronics/stm32f746-disco/genimage.cfg. diff --git a/buildroot/board/stmicroelectronics/stm32f769-disco/extlinux.conf b/buildroot/board/stmicroelectronics/stm32f769-disco/extlinux.conf new file mode 100644 index 0000000000..edc1582615 --- /dev/null +++ b/buildroot/board/stmicroelectronics/stm32f769-disco/extlinux.conf @@ -0,0 +1,4 @@ +label stm32f769-disco-buildroot + kernel /boot/zImage + devicetree /boot/stm32f769-disco.dtb + append console=ttySTM0,115200 root=/dev/mmcblk0p1 rw rootfstype=ext2 rootwait earlyprintk consoleblank=0 ignore_loglevel diff --git a/buildroot/board/stmicroelectronics/stm32f769-disco/flash_sd.sh b/buildroot/board/stmicroelectronics/stm32f769-disco/flash_sd.sh new file mode 100755 index 0000000000..0ff3ae7dbf --- /dev/null +++ b/buildroot/board/stmicroelectronics/stm32f769-disco/flash_sd.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +OUTPUT_DIR=$1 + +if ! test -d "${OUTPUT_DIR}" ; then + echo "ERROR: no output directory specified." + echo "Usage: $0 OUTPUT_DIR" + exit 1 +fi + +"${OUTPUT_DIR}"/host/bin/openocd -f board/stm32f769i-disco.cfg \ + -c "init" \ + -c "reset init" \ + -c "flash probe 0" \ + -c "flash info 0" \ + -c "flash write_image erase ${OUTPUT_DIR}/images/u-boot.bin 0x08000000" \ + -c "reset run" \ + -c "shutdown" diff --git a/buildroot/board/stmicroelectronics/stm32f769-disco/genimage.cfg b/buildroot/board/stmicroelectronics/stm32f769-disco/genimage.cfg new file mode 100644 index 0000000000..e911a94e46 --- /dev/null +++ b/buildroot/board/stmicroelectronics/stm32f769-disco/genimage.cfg @@ -0,0 +1,10 @@ +image sdcard.img { + hdimage { + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext2" + size = 32M + } +} diff --git a/buildroot/board/stmicroelectronics/stm32f769-disco/linux-sd.fragment b/buildroot/board/stmicroelectronics/stm32f769-disco/linux-sd.fragment new file mode 100644 index 0000000000..846229d0d4 --- /dev/null +++ b/buildroot/board/stmicroelectronics/stm32f769-disco/linux-sd.fragment @@ -0,0 +1 @@ +# CONFIG_XIP_KERNEL is not set diff --git a/buildroot/board/stmicroelectronics/stm32f769-disco/patches/linux-headers/linux-headers.hash b/buildroot/board/stmicroelectronics/stm32f769-disco/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/stmicroelectronics/stm32f769-disco/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/stmicroelectronics/stm32f769-disco/patches/linux/linux.hash b/buildroot/board/stmicroelectronics/stm32f769-disco/patches/linux/linux.hash new file mode 100644 index 0000000000..b241c795ba --- /dev/null +++ b/buildroot/board/stmicroelectronics/stm32f769-disco/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 b1751f18ece3df08d502dd87a9ab1a317dc0f9486355bf8ee62ba6af0b35da30 linux-5.15.167.tar.xz diff --git a/buildroot/board/stmicroelectronics/stm32f769-disco/patches/uboot/uboot.hash b/buildroot/board/stmicroelectronics/stm32f769-disco/patches/uboot/uboot.hash new file mode 100644 index 0000000000..904fa56c02 --- /dev/null +++ b/buildroot/board/stmicroelectronics/stm32f769-disco/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0 u-boot-2024.10.tar.bz2 diff --git a/buildroot/board/stmicroelectronics/stm32f769-disco/post-build.sh b/buildroot/board/stmicroelectronics/stm32f769-disco/post-build.sh new file mode 100755 index 0000000000..4510050941 --- /dev/null +++ b/buildroot/board/stmicroelectronics/stm32f769-disco/post-build.sh @@ -0,0 +1,7 @@ +#!/bin/sh +BOARD_DIR="$(dirname "$0")" + +# Kernel is built without devpts support +sed -i '/^devpts/d' "${TARGET_DIR}"/etc/fstab + +install -m 0644 -D "${BOARD_DIR}"/extlinux.conf "${TARGET_DIR}"/boot/extlinux/extlinux.conf diff --git a/buildroot/board/stmicroelectronics/stm32f769-disco/readme.txt b/buildroot/board/stmicroelectronics/stm32f769-disco/readme.txt new file mode 100644 index 0000000000..8f4f79a861 --- /dev/null +++ b/buildroot/board/stmicroelectronics/stm32f769-disco/readme.txt @@ -0,0 +1,32 @@ +STM32F769 Discovery +=================== + +This tutorial describes how to use the predefined Buildroot +configuration for the STM32F769 Discovery evaluation platform. + +Building +-------- + + make stm32f769_disco_sd_defconfig + make + +Flashing +-------- + + ./board/stmicroelectronics/stm32f769-disco/flash_sd.sh output/ + +It will flash the U-boot bootloader. + +Creating SD card +---------------- + +Buildroot prepares an"sdcard.img" image in the output/images/ directory, +ready to be dumped on a SD card. Launch the following command as root: + + dd if=output/images/sdcard.img of=/dev/ + +*** WARNING! This will destroy all the card content. Use with care! *** + +For details about the medium image layout and its content, see the +definition in board/stmicroelectronics/stm32f769-disco/genimage.cfg. + diff --git a/buildroot/board/synopsys/nsim/readme.txt b/buildroot/board/synopsys/nsim/readme.txt new file mode 100644 index 0000000000..cc89cf87ac --- /dev/null +++ b/buildroot/board/synopsys/nsim/readme.txt @@ -0,0 +1,43 @@ +How to build it +=============== + +Configure build for the selected nSIM target. For instance, for +ARC700 nSIM target use the following defauilt configuration: +$ make snps_arc700_nsim_defconfig + +Optionally modify the configuration: +$ make menuconfig + +Build: +$ make + +How to use it +============= + +Resulting image can be booted using ARC nSIM instruction set simulator. +Free version of nSIM is available for download: +- https://www.synopsys.com/cgi-bin/dwarcnsim/req1.cgi +It provides nsimdrv binary for Linux that can be used stand-alone +or with GDB. + +To run ARC700 image use the following command: +$ nsimdrv \ + -prop=nsim_mem-dev=uart0,kind=dwuart,base=0xf0000000,irq=24 \ + -prop=icache=32768,64,2,0 \ + -prop=dcache=32768,64,4,0 \ + -prop=nsim_isa_enable_timer_0=1 \ + -prop=nsim_isa_enable_timer_1=1 \ + -prop=nsim_isa_host_timer=1 \ + -prop=nsim_mmu=3 \ + -prop=nsim_isa_family=a700 \ + -prop=nsim_isa_atomic_option=1 \ + -prop=nsim_isa_dpfp=none \ + -prop=nsim_isa_shift_option=2 \ + -prop=nsim_isa_swap_option=1 \ + -prop=nsim_isa_bitscan_option=1 \ + -prop=nsim_isa_sat=1 \ + -prop=nsim_isa_mpy32=1 \ + -prop=isa_counters=1 \ + -prop=nsim_isa_pct_counters=8 \ + -prop=nsim_isa_pct_size=48 \ + output/images/vmlinux diff --git a/buildroot/board/technexion/imx8mmpico/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/buildroot/board/technexion/imx8mmpico/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 0000000000..98f425a89e --- /dev/null +++ b/buildroot/board/technexion/imx8mmpico/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 cfb927722272897f850681c78d5f129b0883a8efaba9c52d30e029086524f7ff imx-atf-lf-6.1.55-2.2.0.tar.gz diff --git a/buildroot/board/technexion/imx8mmpico/patches/linux-headers/linux-headers.hash b/buildroot/board/technexion/imx8mmpico/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/technexion/imx8mmpico/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/technexion/imx8mmpico/patches/linux/linux.hash b/buildroot/board/technexion/imx8mmpico/patches/linux/linux.hash new file mode 100644 index 0000000000..d88a78c458 --- /dev/null +++ b/buildroot/board/technexion/imx8mmpico/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 875716dc8fe6e0df55b40600877232d9a1d62f81950244e16d563621f636f16e linux-tn-imx-tn-mickledore_6.1.55-2.2.0_20240417.tar.gz diff --git a/buildroot/board/technexion/imx8mmpico/patches/uboot/uboot.hash b/buildroot/board/technexion/imx8mmpico/patches/uboot/uboot.hash new file mode 100644 index 0000000000..0f48f6f10b --- /dev/null +++ b/buildroot/board/technexion/imx8mmpico/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 fbcdf336960f38a14ac4e9a383c207952f8b81cf0b5fe38b53dfe6ad0e8fa089 u-boot-tn-imx-tn-mickledore_6.1.55-2.2.0_20240417.tar.gz diff --git a/buildroot/board/technexion/imx8mmpico/readme.txt b/buildroot/board/technexion/imx8mmpico/readme.txt index 3095d67b2c..56a8c9bdfe 100644 --- a/buildroot/board/technexion/imx8mmpico/readme.txt +++ b/buildroot/board/technexion/imx8mmpico/readme.txt @@ -46,7 +46,7 @@ J2: jumper on pins 2 and 4. In case the board was flashed with a wrong u-boot, or the eMMC is erased, u-boot can be loaded by USB Serial Download boot mode, using -imx-usb-loader. See [3] and [4]. +imx-usb-loader. See [3]. For flashing: - Plug the micro USB cable from the Debug USB Port, to your computer @@ -54,9 +54,13 @@ For flashing: In the U-Boot prompt launch: -=> ums 0 mmc 1 +=> ums 0 mmc ${mmcdev} This will mount the eMMC content in the host PC as a mass storage device. +Note: the ${mmcdev} id may change from one uboot version to another. The +actual id can be confirmed by running commands "mmc rescan" then +"mmc list", to find the eMMC entry. Finally it's possible to enter +directly the mmc device id, for example: "ums 0 mmc 2". To determine the device associated to the eMMC card have a look in the /proc/partitions file: @@ -70,12 +74,13 @@ Buildroot prepares a bootable "sdcard.img" image in the output/images/ directory, ready to be dumped on the eMMC. Launch the following command as root: - dd if=output/images/sdcard.img of=/dev/ + dd bs=1M if=output/images/sdcard.img of=/dev/ *** WARNING! This will destroy all the eMMC content. Use with care! *** This operation can take several minutes, depending on the image -size. When tested, a 2MB/s transfer rate was observed. +size. When tested, a 10MB/s transfer rate was observed. Note: the +blocksize "bs=1M" parameter gives better transfer performances. For details about the medium image layout, see the definition in board/freescale/common/imx/genimage.cfg.template. @@ -91,6 +96,5 @@ To boot your newly created system: Enjoy! [1]. https://www.technexion.com/products/system-on-modules/pico/pico-compute-modules/detail/PICO-IMX8M-MINI -[2]. https://www.technexion.com/products/pico-evaluation-kits/detail/PICOPIIMX8MM1GDEV -[3]. https://www.technexion.com/support/knowledgebase/boot-configuration-settings-for-pico-baseboards/ -[4]. https://www.technexion.com/support/knowledgebase/loading-bootable-software-images-onto-the-emmc-of-picosom-on-pico-pi/ +[2]. https://www.technexion.com/products/system-on-modules/evk/pico-pi-imx8m-mini/ +[3]. https://developer.technexion.com/docs/recover-to-factory-settings-pico-imx8m-mini diff --git a/buildroot/board/technexion/imx8mpico/readme.txt b/buildroot/board/technexion/imx8mpico/readme.txt deleted file mode 100644 index 1a04e44572..0000000000 --- a/buildroot/board/technexion/imx8mpico/readme.txt +++ /dev/null @@ -1,95 +0,0 @@ -**************************** -Technexion i.MX8M Pico board -**************************** - -This file documents the Buildroot support for the Technexion i.MX8M -Pico board. The Pico i.MX8M system-on-module [1] is present in -development kits like the Pico Pi i.MX8M [2]. - -Build -===== - -First, configure Buildroot for the i.MX8M Pico board: - - make imx8mpico_defconfig - -Build all components: - - make - -You will find in output/images/ the following files: - - bl31.bin - - boot.vfat - - Image - - imx8-boot-sd.bin - - lpddr4_pmu_train_fw.bin - - pico-8m-dcss-ili9881c.dtb - - pico-8m.dtb - - rootfs.ext4 - - sdcard.img - - signed_hdmi_imx8m.bin - - u-boot.imx - -Flashing sdcard.img on the eMMC -=============================== - -i.MX8M Pico board does not have a SD card slot. The storage is an -eMMC. An easy way to flash the eMMC is to use the u-boot ums -command. The boards are sold pre-flashed with such a u-boot. It is -assumed here that the board has already a working u-boot on eMMC and -jumpers are set to boot on eMMC. See [3]. - -Jumper configuration for eMMC boot: -J1: jumper on pins 4 and 6. -J2: jumper on pins 2 and 4. - -In case the board was flashed with a wrong u-boot, or the eMMC is -erased, u-boot can be loaded by USB Serial Download boot mode, using -imx-usb-loader. See [3] and [4]. - -For flashing: -- Plug the micro USB cable from the Debug USB Port, to your computer -- Plug the USB Type C to your computer, this will power up the board - -In the U-Boot prompt launch: - -=> ums 0 mmc 0 - -This will mount the eMMC content in the host PC as a mass storage device. - -To determine the device associated to the eMMC card have a look in the -/proc/partitions file: - - cat /proc/partitions - -If your system automatically mount some device partitions, make sure -to unmount them. - -Buildroot prepares a bootable "sdcard.img" image in the output/images/ -directory, ready to be dumped on the eMMC. Launch the following -command as root: - - dd if=output/images/sdcard.img of=/dev/ - -*** WARNING! This will destroy all the eMMC content. Use with care! *** - -This operation can take several minutes, depending on the image -size. When tested, a 2MB/s transfer rate was observed. - -For details about the medium image layout, see the definition in -board/freescale/common/imx/genimage.cfg.template. - -Boot the i.MX8M Pico board -========================== - -To boot your newly created system: -- put a micro USB cable into the Debug USB Port and connect using a terminal - emulator at 115200 bps, 8n1; -- power on the board, with USB Type C connector. - -Enjoy! - -[1]. https://www.technexion.com/products/system-on-modules/pico/pico-compute-modules/detail/PICO-IMX8M -[2]. https://www.technexion.com/products/system-on-modules/pico-evaluation-kits/detail/PICO-PI-IMX8M-BASIC -[3]. https://www.technexion.com/support/knowledgebase/boot-configuration-settings-for-pico-baseboards/ -[4]. https://www.technexion.com/support/knowledgebase/loading-bootable-software-images-onto-the-emmc-of-picosom-on-pico-pi/ diff --git a/buildroot/board/ti/am574x-idk/extlinux.conf b/buildroot/board/ti/am574x-idk/extlinux.conf new file mode 100644 index 0000000000..29e0ecfa14 --- /dev/null +++ b/buildroot/board/ti/am574x-idk/extlinux.conf @@ -0,0 +1,4 @@ +label am5749-idk-buildroot + kernel /zImage + fdtdir / + append console=ttyS0,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait diff --git a/buildroot/board/ti/am574x-idk/genimage.cfg b/buildroot/board/ti/am574x-idk/genimage.cfg new file mode 100644 index 0000000000..02a9ffe013 --- /dev/null +++ b/buildroot/board/ti/am574x-idk/genimage.cfg @@ -0,0 +1,30 @@ +image boot.vfat { + vfat { + files = { + "MLO", + "u-boot.img", + "zImage", + "am574x-idk.dtb", + "extlinux" + } + } + + size = 16M +} + +image sdcard.img { + hdimage { + } + + partition u-boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + size = 1G + } +} diff --git a/buildroot/board/ti/am574x-idk/post-build.sh b/buildroot/board/ti/am574x-idk/post-build.sh new file mode 100755 index 0000000000..5dcdb352eb --- /dev/null +++ b/buildroot/board/ti/am574x-idk/post-build.sh @@ -0,0 +1,4 @@ +#!/bin/sh +BOARD_DIR="$(dirname "$0")" + +install -m 0644 -D "${BOARD_DIR}"/extlinux.conf "${BINARIES_DIR}"/extlinux/extlinux.conf diff --git a/buildroot/board/ti/am574x-idk/readme.txt b/buildroot/board/ti/am574x-idk/readme.txt new file mode 100644 index 0000000000..4869984cf1 --- /dev/null +++ b/buildroot/board/ti/am574x-idk/readme.txt @@ -0,0 +1,28 @@ +Texas Instuments AM574x IDK Test and Development Board + +Description +=========== + +This configuration will build a basic image for the TI AM574x IDK +board: https://www.ti.com/tool/TMDSIDK574 + +How to build it +=============== + +Configure Buildroot: + + $ make am574x_idk_defconfig + +Compile everything and build the USB flash drive image: + + $ make + +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 diff --git a/buildroot/board/ti/am62ax-sk/genimage.cfg b/buildroot/board/ti/am62ax-sk/genimage.cfg new file mode 100644 index 0000000000..70d38faa58 --- /dev/null +++ b/buildroot/board/ti/am62ax-sk/genimage.cfg @@ -0,0 +1,33 @@ +image boot.vfat { + vfat { + files = { + "tiboot3.bin", + "tispl.bin", + "u-boot.img", + "k3-am62a7-sk.dtb", + "Image" + } + + file extlinux/extlinux.conf { + image = extlinux.conf + } + } + + size = 64M +} + +image sdcard.img { + hdimage { + } + + partition u-boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/buildroot/board/ti/am62ax-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/buildroot/board/ti/am62ax-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 0000000000..8b77e1f165 --- /dev/null +++ b/buildroot/board/ti/am62ax-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 c0f23ccc71c49989e9ad238acf334473c17b7c88f79a20c829c3d443e3794a22 arm-trusted-firmware-v2.11-git4.tar.gz diff --git a/buildroot/board/ti/am62ax-sk/patches/linux-headers/linux-headers.hash b/buildroot/board/ti/am62ax-sk/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/ti/am62ax-sk/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/ti/am62ax-sk/patches/linux/linux.hash b/buildroot/board/ti/am62ax-sk/patches/linux/linux.hash new file mode 100644 index 0000000000..53eb143894 --- /dev/null +++ b/buildroot/board/ti/am62ax-sk/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 774698422ee54c5f1e704456f37c65c06b51b4e9a8b0866f34580d86fef8e226 linux-6.10.tar.xz diff --git a/buildroot/board/ti/am62ax-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash b/buildroot/board/ti/am62ax-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash new file mode 120000 index 0000000000..b89e91d3e8 --- /dev/null +++ b/buildroot/board/ti/am62ax-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash @@ -0,0 +1 @@ +../uboot/uboot.hash \ No newline at end of file diff --git a/buildroot/board/ti/am62ax-sk/patches/uboot/uboot.hash b/buildroot/board/ti/am62ax-sk/patches/uboot/uboot.hash new file mode 100644 index 0000000000..fe9b4f53dc --- /dev/null +++ b/buildroot/board/ti/am62ax-sk/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f u-boot-2024.07.tar.bz2 diff --git a/buildroot/board/ti/am62ax-sk/readme.txt b/buildroot/board/ti/am62ax-sk/readme.txt new file mode 100644 index 0000000000..d7d529c180 --- /dev/null +++ b/buildroot/board/ti/am62ax-sk/readme.txt @@ -0,0 +1,39 @@ +Texas Instuments SK-AM62A Test and Development Board + +Description +=========== + +This configuration will build a complete image for the TI SK-AM62A +board: https://www.ti.com/tool/SK-AM62A-LP + +How to Build +============ + +Select the default configuration for the target: + +$ make ti_am62ax_sk_defconfig + +Optional: modify the configuration: + +$ make menuconfig + +IMPORTANT: make sure to use the tiboot3 firmware that match with the TI +K3 SoC boot ROM (tiboot3-am62ax-{gp/hs-fs/hs}-evm.bin) used on the board. +Use the BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN to name which tiboot3.bin +security variant we want to use. + +Build: + +$ make + +To copy the resultimg output image file to an SD card use dd: + +$ dd if=output/images/sdcard.img of=/dev/sdX bs=1M + +How to Run +========== + +Insert the SD card into the SK-AM62A board, and power it up through the +USB Type-C connector. The system should come up. You can use a +micro-USB cable to connect to the connector labeled UART to +communicate with the board. diff --git a/buildroot/board/ti/am62px-sk/genimage.cfg b/buildroot/board/ti/am62px-sk/genimage.cfg new file mode 100644 index 0000000000..b0a1bee8b9 --- /dev/null +++ b/buildroot/board/ti/am62px-sk/genimage.cfg @@ -0,0 +1,33 @@ +image boot.vfat { + vfat { + files = { + "tiboot3.bin", + "tispl.bin", + "u-boot.img", + "k3-am62p5-sk.dtb", + "Image" + } + + file extlinux/extlinux.conf { + image = extlinux.conf + } + } + + size = 64M +} + +image sdcard.img { + hdimage { + } + + partition u-boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/buildroot/board/ti/am62px-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/buildroot/board/ti/am62px-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 0000000000..8b77e1f165 --- /dev/null +++ b/buildroot/board/ti/am62px-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 c0f23ccc71c49989e9ad238acf334473c17b7c88f79a20c829c3d443e3794a22 arm-trusted-firmware-v2.11-git4.tar.gz diff --git a/buildroot/board/ti/am62px-sk/patches/linux-headers/linux-headers.hash b/buildroot/board/ti/am62px-sk/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/ti/am62px-sk/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/ti/am62px-sk/patches/linux/linux.hash b/buildroot/board/ti/am62px-sk/patches/linux/linux.hash new file mode 100644 index 0000000000..53eb143894 --- /dev/null +++ b/buildroot/board/ti/am62px-sk/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 774698422ee54c5f1e704456f37c65c06b51b4e9a8b0866f34580d86fef8e226 linux-6.10.tar.xz diff --git a/buildroot/board/ti/am62px-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash b/buildroot/board/ti/am62px-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash new file mode 120000 index 0000000000..b89e91d3e8 --- /dev/null +++ b/buildroot/board/ti/am62px-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash @@ -0,0 +1 @@ +../uboot/uboot.hash \ No newline at end of file diff --git a/buildroot/board/ti/am62px-sk/patches/uboot/uboot.hash b/buildroot/board/ti/am62px-sk/patches/uboot/uboot.hash new file mode 100644 index 0000000000..fe9b4f53dc --- /dev/null +++ b/buildroot/board/ti/am62px-sk/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f u-boot-2024.07.tar.bz2 diff --git a/buildroot/board/ti/am62px-sk/readme.txt b/buildroot/board/ti/am62px-sk/readme.txt new file mode 100644 index 0000000000..a20911c354 --- /dev/null +++ b/buildroot/board/ti/am62px-sk/readme.txt @@ -0,0 +1,39 @@ +Texas Instuments SK-AM62P5 Test and Development Board + +Description +=========== + +This configuration will build a complete image for the TI SK-AM62P +board: https://www.ti.com/tool/SK-AM62P. + +How to Build +============ + +Select the default configuration for the target: + +$ make ti_am62px_sk_defconfig + +Optional: modify the configuration: + +$ make menuconfig + +IMPORTANT: make sure to use the tiboot3 firmware that match with the TI +K3 SoC boot ROM (tiboot3-am62px-{hs-fs/hs}-evm.bin) used on the board. +Use the BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN to name which tiboot3.bin +security variant we want to use. + +Build: + +$ make + +To copy the resultimg output image file to an SD card use dd: + +$ dd if=output/images/sdcard.img of=/dev/sdX bs=1M + +How to Run +========== + +Insert the SD card into the SK-AM62P board, and power it up through the +USB Type-C connector. The system should come up. You can use a +micro-USB cable to connect to the connector labeled UART to +communicate with the board. diff --git a/buildroot/board/ti/am62x-sk/genimage.cfg b/buildroot/board/ti/am62x-sk/genimage.cfg new file mode 100644 index 0000000000..398209f4d8 --- /dev/null +++ b/buildroot/board/ti/am62x-sk/genimage.cfg @@ -0,0 +1,32 @@ +image boot.vfat { + vfat { + files = { + "tiboot3.bin", + "tispl.bin", + "u-boot.img", + "k3-am625-sk.dtb", + "Image" + } + file extlinux/extlinux.conf { + image = extlinux.conf + } + } + + size = 64M +} + +image sdcard.img { + hdimage { + } + + partition u-boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/buildroot/board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/buildroot/board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 0000000000..8b77e1f165 --- /dev/null +++ b/buildroot/board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 c0f23ccc71c49989e9ad238acf334473c17b7c88f79a20c829c3d443e3794a22 arm-trusted-firmware-v2.11-git4.tar.gz diff --git a/buildroot/board/ti/am62x-sk/patches/linux-headers/linux-headers.hash b/buildroot/board/ti/am62x-sk/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/ti/am62x-sk/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/ti/am62x-sk/patches/linux/linux.hash b/buildroot/board/ti/am62x-sk/patches/linux/linux.hash new file mode 100644 index 0000000000..706ddb8dbb --- /dev/null +++ b/buildroot/board/ti/am62x-sk/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 5ffceb2350db1547e69231a63df2d3beed015a313d7d7adf8b5cb71dedaeb16a linux-6.10.13.tar.xz diff --git a/buildroot/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash b/buildroot/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash new file mode 120000 index 0000000000..b89e91d3e8 --- /dev/null +++ b/buildroot/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash @@ -0,0 +1 @@ +../uboot/uboot.hash \ No newline at end of file diff --git a/buildroot/board/ti/am62x-sk/patches/uboot/uboot.hash b/buildroot/board/ti/am62x-sk/patches/uboot/uboot.hash new file mode 100644 index 0000000000..904fa56c02 --- /dev/null +++ b/buildroot/board/ti/am62x-sk/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0 u-boot-2024.10.tar.bz2 diff --git a/buildroot/board/ti/am62x-sk/readme.txt b/buildroot/board/ti/am62x-sk/readme.txt new file mode 100644 index 0000000000..a8d0c08dc0 --- /dev/null +++ b/buildroot/board/ti/am62x-sk/readme.txt @@ -0,0 +1,50 @@ +Texas Instuments SK-AM62 Test and Development Board + +Description +=========== + +This configuration will build a complete image for the TI SK-AM62 +board: https://www.ti.com/tool/SK-AM62. + +How to Build +============ + +Select the default configuration for the target: + +$ make ti_am62x_sk_defconfig + +Optional: modify the configuration: + +$ make menuconfig + +IMPORTANT: make sure to use the tiboot3 firmware that match with the TI +K3 SoC boot ROM (tiboot3-am62x-{gp/hs-fs/hs}-*.bin) used on the board. + +HS-FS should be the default for all TI AM6x devices but earlier version +of TI starter kit EVMs for AM6x was produced with a GP device. + +See further details on e2e Forum [1] : + + "Unfortunately with this transition any existing GP device based AM62x + (and AM64x) boards will no longer boot with MMC/SD card images generated" + +For such existing GP device based AM62x boards, users have to provide the +tiboot3.bin name using BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN. + +[1]: https://e2e.ti.com/support/processors-group/processors/f/processors-forum/1210443/faq-am625-generating-sitara-am62x-am62ax-am64x-gp-device-bootable-mmc-sd-card-images-using-sdk-v8-6-and-yocto + +Build: + +$ make + +To copy the resultimg output image file to an SD card use dd: + +$ dd if=output/images/sdcard.img of=/dev/sdX bs=1M + +How to Run +========== + +Insert the SD card into the SK-AM62 board, and power it up through the +USB Type-C connector. The system should come up. You can use a +micro-USB cable to connect to the connector labeled UART to +communicate with the board. diff --git a/buildroot/board/ti/am64x-sk/genimage.cfg b/buildroot/board/ti/am64x-sk/genimage.cfg new file mode 100644 index 0000000000..88dff8fe23 --- /dev/null +++ b/buildroot/board/ti/am64x-sk/genimage.cfg @@ -0,0 +1,32 @@ +image boot.vfat { + vfat { + files = { + "tiboot3.bin", + "tispl.bin", + "u-boot.img", + "k3-am642-sk.dtb", + "Image" + } + file extlinux/extlinux.conf { + image = extlinux.conf + } + } + + size = 64M +} + +image sdcard.img { + hdimage { + } + + partition u-boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/buildroot/board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/buildroot/board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 0000000000..8b77e1f165 --- /dev/null +++ b/buildroot/board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 c0f23ccc71c49989e9ad238acf334473c17b7c88f79a20c829c3d443e3794a22 arm-trusted-firmware-v2.11-git4.tar.gz diff --git a/buildroot/board/ti/am64x-sk/patches/linux-headers/linux-headers.hash b/buildroot/board/ti/am64x-sk/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/ti/am64x-sk/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/ti/am64x-sk/patches/linux/linux.hash b/buildroot/board/ti/am64x-sk/patches/linux/linux.hash new file mode 100644 index 0000000000..53eb143894 --- /dev/null +++ b/buildroot/board/ti/am64x-sk/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 774698422ee54c5f1e704456f37c65c06b51b4e9a8b0866f34580d86fef8e226 linux-6.10.tar.xz diff --git a/buildroot/board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash b/buildroot/board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash new file mode 120000 index 0000000000..b89e91d3e8 --- /dev/null +++ b/buildroot/board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash @@ -0,0 +1 @@ +../uboot/uboot.hash \ No newline at end of file diff --git a/buildroot/board/ti/am64x-sk/patches/uboot/uboot.hash b/buildroot/board/ti/am64x-sk/patches/uboot/uboot.hash new file mode 100644 index 0000000000..fe9b4f53dc --- /dev/null +++ b/buildroot/board/ti/am64x-sk/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f u-boot-2024.07.tar.bz2 diff --git a/buildroot/board/ti/am64x-sk/readme.txt b/buildroot/board/ti/am64x-sk/readme.txt new file mode 100644 index 0000000000..73215cb591 --- /dev/null +++ b/buildroot/board/ti/am64x-sk/readme.txt @@ -0,0 +1,50 @@ +Texas Instuments SK-AM64 Test and Development Board + +Description +=========== + +This configuration will build a complete image for the TI SK-AM64 +board: https://www.ti.com/tool/SK-AM64. + +How to Build +============ + +Select the default configuration for the target: + +$ make am64x_sk_defconfig + +Optional: modify the configuration: + +$ make menuconfig + +IMPORTANT: make sure to use the tiboot3 firmware that match with the TI +K3 SoC boot ROM (tiboot3-am64x-{gp/hs-fs/hs}-*.bin) used on the board. + +HS-FS should be the default for all TI AM6x devices but earlier version +of TI starter kit EVMs for AM6x was produced with a GP device. + +See further details on e2e Forum [1] : + + "Unfortunately with this transition any existing GP device based AM62x + (and AM64x) boards will no longer boot with MMC/SD card images generated" + +For such existing GP device based AM64x boards, users have to provide the +tiboot3.bin name using BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN. + +[1]: https://e2e.ti.com/support/processors-group/processors/f/processors-forum/1210443/faq-am625-generating-sitara-am62x-am62ax-am64x-gp-device-bootable-mmc-sd-card-images-using-sdk-v8-6-and-yocto + +Build: + +$ make + +To copy the resultimg output image file to an SD card use dd: + +$ dd if=output/images/sdcard.img of=/dev/sdX bs=1M + +How to Run +========== + +Insert the SD card into the SK-AM62 board, and power it up through the +USB Type-C connector. The system should come up. You can use a +micro-USB cable to connect to the connector labeled DEBUG CONSOLE to +communicate with the board. diff --git a/buildroot/board/ti/common/am6xx/post-build.sh b/buildroot/board/ti/common/am6xx/post-build.sh new file mode 100755 index 0000000000..d066e28fd0 --- /dev/null +++ b/buildroot/board/ti/common/am6xx/post-build.sh @@ -0,0 +1,58 @@ +#!/bin/sh -x + +# genimage will need to find the extlinux.conf +# in the binaries directory + +die() { + cat <&2 +Error: $@ + +Usage: ${0} -c -r [-x ] +EOF + exit 1 +} + +o='c:d:l:r:x:' +O='console:,devicetree:,label:,root:,extra-args:' +opts="$(getopt -n "${0##*/}" -o "${o}" -l "${O}" -- "${@}")" +eval set -- "${opts}" +while [ ${#} -gt 0 ]; do + case "${1}" in + (-c|--console) + CONSOLE="${2}"; shift 2 + ;; + (-d|--devicetree) + DEVICETREE="${2}"; shift 2 + ;; + (-l|--label) + LABEL="${2}"; shift 2 + ;; + (-r|--root) + ROOT="${2}"; shift 2 + ;; + (-x|--extra-args) + EXTRA_ARGS="${2}"; shift 2 + ;; + (--) + shift 1; break + ;; + esac +done + +[ -n "${CONSOLE}" ] || die "Missing \`console' argument" +[ -n "${DEVICETREE}" ] || die "Missing \`devicetree' argument" +[ -n "${LABEL}" ] || die "Missing \`label' argument" +[ -n "${ROOT}" ] || die "Missing \`root' argument" +append="console=${CONSOLE} root=${ROOT} rw rootfstype=ext4 rootwait" +if [ -n "${EXTRA_ARGS}" ]; then + append="${append} ${EXTRA_ARGS}" +fi + +mkdir -p "${BINARIES_DIR}" +cat <<-__HEADER_EOF > "${BINARIES_DIR}/extlinux.conf" + label ${LABEL} + kernel /Image + fdtdir / + devicetree /${DEVICETREE} + append ${append} + __HEADER_EOF diff --git a/buildroot/board/toradex/apalis-imx6/patches/linux-headers/linux-headers.hash b/buildroot/board/toradex/apalis-imx6/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/toradex/apalis-imx6/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/toradex/apalis-imx6/patches/linux/linux.hash b/buildroot/board/toradex/apalis-imx6/patches/linux/linux.hash new file mode 100644 index 0000000000..0697228724 --- /dev/null +++ b/buildroot/board/toradex/apalis-imx6/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 722ece80ee8dbcc04309c89139da8b1df6974e1ab4bb66d04c1906a576fa46fa linux-d899927728beca8357a5b4120b690cb3c1d80844-git4.tar.gz diff --git a/buildroot/board/toradex/apalis-imx6/patches/uboot/uboot.hash b/buildroot/board/toradex/apalis-imx6/patches/uboot/uboot.hash new file mode 100644 index 0000000000..6132435fed --- /dev/null +++ b/buildroot/board/toradex/apalis-imx6/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 f8d3e45d7944c9620ecacbd8f8824db42134c70e3b55efd6dab127bf763e48c2 uboot-30a1208727729dae22cb42f9ba9ba17efe5e6f77-git4.tar.gz diff --git a/buildroot/board/udoo/mx6qdl/patches/linux/0000-udoo-disable-usbh1.patch b/buildroot/board/udoo/mx6qdl/patches/linux/0000-udoo-disable-usbh1.patch deleted file mode 100644 index d151a40d6e..0000000000 --- a/buildroot/board/udoo/mx6qdl/patches/linux/0000-udoo-disable-usbh1.patch +++ /dev/null @@ -1,26 +0,0 @@ -[PATCH] ARM: dts: imx6qdl-udoo: Disable usbh1 to avoid kernel hang - -Currently the kernel hangs when USB Host1 is enabled due to the lack of -support for controlling the USB hub clock and GPIO reset line. - -Peter Chen has made several attempts to fix this problem, but his series -has not been applied yet, so better disable USB host1 for now to avoid -the kernel hang. - -Signed-off-by: Fabio Estevam ---- - -diff --git a/arch/arm/boot/dts/imx6qdl-udoo.dtsi b/arch/arm/boot/dts/imx6qdl-udoo.dtsi -index 828dd20cd27d..c9e122865312 100644 ---- a/arch/arm/boot/dts/imx6qdl-udoo.dtsi -+++ b/arch/arm/boot/dts/imx6qdl-udoo.dtsi -@@ -292,7 +292,8 @@ &usbh1 { - pinctrl-0 = <&pinctrl_usbh>; - vbus-supply = <®_usb_h1_vbus>; - clocks = <&clks IMX6QDL_CLK_CKO>; -- status = "okay"; -+ /* currently USB support causes a kernel hang. Disable it for now */ -+ status = "disabled"; - }; - - &usbotg { diff --git a/buildroot/board/udoo/mx6qdl/rootfs_overlay/boot/extlinux/extlinux.conf b/buildroot/board/udoo/mx6qdl/rootfs_overlay/boot/extlinux/extlinux.conf new file mode 100644 index 0000000000..cbb284f91b --- /dev/null +++ b/buildroot/board/udoo/mx6qdl/rootfs_overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +Label imx6qdl-udoo buildroot + kernel ../zImage + fdtdir ../ + append root=/dev/mmcblk2p1 rootwait rw diff --git a/buildroot/board/udoo/neo/patches/linux-headers/linux-headers.hash b/buildroot/board/udoo/neo/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/udoo/neo/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/udoo/neo/patches/linux/linux.hash b/buildroot/board/udoo/neo/patches/linux/linux.hash new file mode 100644 index 0000000000..b8935a250a --- /dev/null +++ b/buildroot/board/udoo/neo/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 0ad83b1a1a780a1aad948d55aa55ee63c50c626f2d46910b9d2180028d100a5e linux-6.6.43.tar.xz diff --git a/buildroot/board/udoo/neo/patches/uboot/uboot.hash b/buildroot/board/udoo/neo/patches/uboot/uboot.hash new file mode 100644 index 0000000000..0bfbf306ff --- /dev/null +++ b/buildroot/board/udoo/neo/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 81b4543227db228c03f8a1bf5ddbc813b0bb8f6555ce46064ef721a6fc680413 u-boot-2022.01.tar.bz2 diff --git a/buildroot/board/udoo/neo/readme.txt b/buildroot/board/udoo/neo/readme.txt index 94ebcc12f2..e9f9fbac1c 100644 --- a/buildroot/board/udoo/neo/readme.txt +++ b/buildroot/board/udoo/neo/readme.txt @@ -1,12 +1,36 @@ MX6X Udoo Neo board - +=================== http://www.udoo.org/udoo-neo/ +Build: +====== + To build a minimal support for these boards: $ make mx6sx_udoo_neo_defconfig $ make +Files created in the output directory: +====================================== + +output/images +. +├── boot.scr +├── imx6sx-udoo-neo-basic.dtb +├── imx6sx-udoo-neo-extended.dtb +├── imx6sx-udoo-neo-full.dtb +├── rootfs.ext2 +├── rootfs.ext4 -> rootfs.ext2 +├── rootfs.tar +├── sdcard.img +├── SPL +├── u-boot.bin +├── u-boot.img +└── zImage + +Creating bootable SD card: +========================== + Buildroot prepares a bootable "sdcard.img" image in the output/images/ directory, ready to be dumped on an SD card: @@ -14,3 +38,31 @@ dd if=output/images/sdcard.img of=/dev/ For details about the medium image layout, see the definition in board/freescale/common/imx/genimage.cfg.template_no_boot_part_spl. + +Booting: +======== + +Serial console: +--------------- +The Udoo Neo features the serial console "UART1" on the pin header "P7". The +Uart pins are as follows (see board labels): + +pin 46: rx +pin 47: tx + +Baudrate for this board is 115200. + +Login: +------ +Enter 'root' as login user, and the prompt is ready. + +Documentation: +============== + +documentation link: +------------------- +https://www.udoo.org/docs-neo/Introduction/Introduction.html + +forum link: +----------- +https://www.udoo.org/forum/forums/udoo-neo.39/ diff --git a/buildroot/board/uevm5432/extlinux.conf b/buildroot/board/uevm5432/extlinux.conf new file mode 100644 index 0000000000..50f3cd30fb --- /dev/null +++ b/buildroot/board/uevm5432/extlinux.conf @@ -0,0 +1,4 @@ +label uevm5432-buildroot + kernel /zImage + fdt /omap5-uevm.dtb + append root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait console=ttyO2,115200 diff --git a/buildroot/board/uevm5432/genimage.cfg b/buildroot/board/uevm5432/genimage.cfg index dfe388227e..7bb90e198b 100644 --- a/buildroot/board/uevm5432/genimage.cfg +++ b/buildroot/board/uevm5432/genimage.cfg @@ -2,7 +2,10 @@ image boot.vfat { vfat { files = { "MLO", - "u-boot.img" + "u-boot.img", + "zImage", + "omap5-uevm.dtb", + "extlinux" } } @@ -22,6 +25,5 @@ image sdcard.img { partition rootfs { partition-type = 0x83 image = "rootfs.ext4" - size = 512M } } diff --git a/buildroot/board/uevm5432/post-build.sh b/buildroot/board/uevm5432/post-build.sh new file mode 100755 index 0000000000..f90f76d8b5 --- /dev/null +++ b/buildroot/board/uevm5432/post-build.sh @@ -0,0 +1,6 @@ +#!/bin/sh +set -e + +BOARD_DIR="$(dirname "$0")" + +install -m 0644 -D "$BOARD_DIR"/extlinux.conf "$BINARIES_DIR"/extlinux/extlinux.conf diff --git a/buildroot/board/versal/genimage.cfg b/buildroot/board/versal/genimage.cfg new file mode 100644 index 0000000000..d994d3a2bf --- /dev/null +++ b/buildroot/board/versal/genimage.cfg @@ -0,0 +1,30 @@ +image boot.vfat { + vfat { + files = { + "boot.bin", + "system.dtb", + "Image" + } + file extlinux/extlinux.conf { + image = extlinux.conf + } + } + + size = 32M +} + +image sdcard.img { + hdimage { + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/buildroot/board/versal/post-build.sh b/buildroot/board/versal/post-build.sh new file mode 100755 index 0000000000..faa75a0de3 --- /dev/null +++ b/buildroot/board/versal/post-build.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +# genimage will need to find the extlinux.conf +# in the binaries directory + +CONSOLE="$2" +ROOT="$3" + +mkdir -p "${BINARIES_DIR}" +cat <<-__HEADER_EOF > "${BINARIES_DIR}/extlinux.conf" + label linux + kernel /Image + devicetree /system.dtb + append console=${CONSOLE} root=/dev/${ROOT} rw rootwait + __HEADER_EOF diff --git a/buildroot/board/versal/post-image.sh b/buildroot/board/versal/post-image.sh new file mode 100755 index 0000000000..22367d5028 --- /dev/null +++ b/buildroot/board/versal/post-image.sh @@ -0,0 +1,34 @@ +#!/bin/sh + +# By default U-Boot loads DTB from a file named "system.dtb", so +# let's use a symlink with that name that points to the *first* +# devicetree listed in the config. + +FIRST_DT=$(sed -nr \ + -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="(xilinx/)?([-_/[:alnum:]\\.]*).*"$|\2|p' \ + "${BR2_CONFIG}") + +[ -z "${FIRST_DT}" ] || ln -fs "${FIRST_DT}.dtb" "${BINARIES_DIR}/system.dtb" + +BOARD_DIR="$(dirname "$0")" + +mkdir -p "${BINARIES_DIR}" +cat <<-__HEADER_EOF > "${BINARIES_DIR}/bootgen.bif" + the_ROM_image: + { + image { + { type=bootimage, file=${BINARIES_DIR}/vpl_gen_fixed.pdi } + { type=bootloader, file=${BINARIES_DIR}/plm.elf } + { core=psm, file=${BINARIES_DIR}/psmfw.elf } + } + image { + id = 0x1c000000, name=apu_subsystem + { type=raw, load=0x00001000, file=${BINARIES_DIR}/u-boot.dtb } + { core=a72-0, exception_level=el-3, trustzone, file=${BINARIES_DIR}/bl31.elf } + { core=a72-0, exception_level=el-2, file=${BINARIES_DIR}/u-boot.elf } + } + } + __HEADER_EOF + +"${HOST_DIR}/bin/bootgen" -arch versal -image "${BINARIES_DIR}/bootgen.bif" -o "${BINARIES_DIR}/boot.bin" -w on +support/scripts/genimage.sh -c "${BOARD_DIR}/genimage.cfg" diff --git a/buildroot/board/versal/readme.txt b/buildroot/board/versal/readme.txt new file mode 100644 index 0000000000..4d8406fb1f --- /dev/null +++ b/buildroot/board/versal/readme.txt @@ -0,0 +1,62 @@ +This document describes the Buildroot support for the following +Xilinx Versal boards: + +****************************************** +Supported Versal Boards: +Xilinx VCK190 board +Xilinx VEK280 board +Xilinx VPK180 board +****************************************** + +Evaluation board features can be found here with the links below. + +VCK190: +https://www.xilinx.com/products/boards-and-kits/vck190.html + +VEK280: +https://www.xilinx.com/products/boards-and-kits/vek280.html + +VPK180: +https://www.xilinx.com/products/boards-and-kits/vpk180.html + + +How to build it +=============== + +Configure Buildroot: + + $ make versal_vck190_defconfig + +Compile everything and build the rootfs image: + + $ make + +Result of the build +------------------- + +After building, you should get a tree like this: + + output/images/ + +-- boot.bin + +-- boot.vfat + +-- Image + +-- rootfs.ext2 + +-- rootfs.ext4 -> rootfs.ext2 + +-- sdcard.img + +-- system.dtb -> versal-vck190-rev1.1.dtb + `-- versal-vck190-rev1.1.dtb + +How to write the SD card +======================== + +WARNING! This will destroy all the card content. Use with care! + +The sdcard.img file is a complete bootable image ready to be written +on the boot medium. To install it, simply copy the image to an SD +card: + + # dd if=output/images/sdcard.img of=/dev/sdX + +Where 'sdX' is the device node of the SD. + +Eject the SD card, insert it in the board, and power it up. diff --git a/buildroot/board/versal/vek280/patches/linux/0001-arm64-versal-Fix-vek280-memory-configuration.patch b/buildroot/board/versal/vek280/patches/linux/0001-arm64-versal-Fix-vek280-memory-configuration.patch new file mode 100644 index 0000000000..d894ad35d1 --- /dev/null +++ b/buildroot/board/versal/vek280/patches/linux/0001-arm64-versal-Fix-vek280-memory-configuration.patch @@ -0,0 +1,47 @@ +From: Michal Simek +Date: Mon, 15 Jul 2024 08:24:57 +0200 +Subject: [PATCH] arm64: versal: Fix vek280 memory configuration + +Board has 12GB total but Vivado wizard supports one channel LPDDR4 4GB +configuration (2GB low + 2GB high) or two channel LPDDR 8GB configuration +(2GB low + 6GB high). Wiring the remaining 4GB LPDDR can be done via board +tab but not available as option in wizard. That's why only describe 8GB by +default. + +Signed-off-by: Michal Simek +Signed-off-by: Neal Frager +Upstream: https://github.com/Xilinx/linux-xlnx/commit/3c7a97d99bdb3dd6b1f36d7d87d3a3c113dfe2ea +--- + arch/arm64/boot/dts/xilinx/versal-vek280-revA.dts | 2 +- + arch/arm64/boot/dts/xilinx/versal-vek280-revB.dts | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/arm64/boot/dts/xilinx/versal-vek280-revA.dts b/arch/arm64/boot/dts/xilinx/versal-vek280-revA.dts +index 1641dc0b5141..ad5d590318e6 100644 +--- a/arch/arm64/boot/dts/xilinx/versal-vek280-revA.dts ++++ b/arch/arm64/boot/dts/xilinx/versal-vek280-revA.dts +@@ -19,7 +19,7 @@ / { + + memory: memory@0 { + device_type = "memory"; +- reg = <0 0 0 0x80000000>, <0x8 0x0 0x7 0x80000000>; /* 32GB */ ++ reg = <0 0 0 0x80000000>, <0x8 0x80000000 0x1 0x80000000>; /* 2GB + 6GB */ + }; + + chosen { +diff --git a/arch/arm64/boot/dts/xilinx/versal-vek280-revB.dts b/arch/arm64/boot/dts/xilinx/versal-vek280-revB.dts +index fda47cd87b3a..80aae8fa4b11 100644 +--- a/arch/arm64/boot/dts/xilinx/versal-vek280-revB.dts ++++ b/arch/arm64/boot/dts/xilinx/versal-vek280-revB.dts +@@ -19,7 +19,7 @@ / { + + memory: memory@0 { + device_type = "memory"; +- reg = <0 0 0 0x80000000>, <0x8 0x0 0x7 0x80000000>; /* 32GB */ ++ reg = <0 0 0 0x80000000>, <0x8 0x80000000 0x1 0x80000000>; /* 2GB + 6GB */ + }; + + chosen { +-- +2.43.0 + diff --git a/buildroot/board/visionfive/genimage.cfg b/buildroot/board/visionfive/genimage.cfg new file mode 100644 index 0000000000..433387c901 --- /dev/null +++ b/buildroot/board/visionfive/genimage.cfg @@ -0,0 +1,21 @@ +# Minimal SD card image for the Starfive VisionFive board + +image sdcard.img { + hdimage { + } + + # u-boot is hard coded to look at 3rd partition + partition dummy1 { + size = 512 + } + + partition dummy2 { + size = 512 + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + bootable = "true" + } +} diff --git a/buildroot/board/visionfive/overlay/boot/extlinux/extlinux.conf b/buildroot/board/visionfive/overlay/boot/extlinux/extlinux.conf new file mode 100644 index 0000000000..44ac6f7944 --- /dev/null +++ b/buildroot/board/visionfive/overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label linux + kernel /boot/Image + devicetree /boot/jh7100-starfive-visionfive-v1.dtb + append console=ttyS0,115200 root=/dev/mmcblk0p3 diff --git a/buildroot/board/visionfive/overlay/boot/uEnv.txt b/buildroot/board/visionfive/overlay/boot/uEnv.txt new file mode 100644 index 0000000000..b831d2d230 --- /dev/null +++ b/buildroot/board/visionfive/overlay/boot/uEnv.txt @@ -0,0 +1,15 @@ +fdt_high=0xffffffffffffffff +initrd_high=0xffffffffffffffff + +scriptaddr=0x88100000 +script_offset_f=0x1fff000 +script_size_f=0x1000 + +kernel_addr_r=0x84000000 +kernel_comp_addr_r=0x90000000 +kernel_comp_size=0x10000000 + +fdt_addr_r=0x88000000 +ramdisk_addr_r=0x88300000 + +bootcmd=devnum=0; run mmc_boot diff --git a/buildroot/board/visionfive/readme.txt b/buildroot/board/visionfive/readme.txt new file mode 100644 index 0000000000..7aefa24167 --- /dev/null +++ b/buildroot/board/visionfive/readme.txt @@ -0,0 +1,32 @@ +Starfive VisionFive +=================== + +The VisionFive is a low-cost RISC-V 64-bit based platform, powered by a +Starfive JH7100 processor. + +https://doc-en.rvspace.org/Doc_Center/visionfive.html + +How to build +============ + +$ make visionfive_defconfig +$ make + +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 + +Preparing the board +=================== + +Connect a TTL UART cable to pin 6 (GND), 8 (TX) and 10 (RX). + +Insert your SD card. + +Power-up the board using an USB-C cable. diff --git a/buildroot/board/visionfive2/genimage.cfg b/buildroot/board/visionfive2/genimage.cfg new file mode 100644 index 0000000000..8133e740c0 --- /dev/null +++ b/buildroot/board/visionfive2/genimage.cfg @@ -0,0 +1,23 @@ +# Minimal SD card image for the Starfive VisionFive2 board + +image sdcard.img { + hdimage { + partition-table-type = "gpt" + } + + partition spl { + partition-type-uuid = 2E54B353-1271-4842-806F-E436D6AF6985 + image = "u-boot-spl.bin.normal.out" + } + + partition uboot { + partition-type-uuid = BC13C2FF-59E6-4262-A352-B275FD6F7172 + image = "u-boot.itb" + } + + partition rootfs { + partition-type-uuid = 0FC63DAF-8483-4772-8E79-3D69D8477DE4 + bootable = true + image = "rootfs.ext4" + } +} diff --git a/buildroot/board/visionfive2/genimage_spi-nor.cfg b/buildroot/board/visionfive2/genimage_spi-nor.cfg new file mode 100644 index 0000000000..8b1d13989a --- /dev/null +++ b/buildroot/board/visionfive2/genimage_spi-nor.cfg @@ -0,0 +1,36 @@ +flash nor-16M-256 { + pebsize = 4K + minimum-io-unit-size = 256 + numpebs = 4096 +} + +image spi-nor.img { + size = 16M + + flash { + } + + flashtype = "nor-16M-256" + + partition spl { + image = "u-boot-spl.bin.normal.out" + offset = 0K + size = 512K + } + + partition uboot-env { + offset = 960K + size = 64K + } + + partition uboot { + image = "u-boot.itb" + offset = 1M + size = 4M + } + + partition reserved-data { + offset = 6M + size = 10M + } +} diff --git a/buildroot/board/visionfive2/linux_defconfig b/buildroot/board/visionfive2/linux_defconfig new file mode 100644 index 0000000000..d6d1a65247 --- /dev/null +++ b/buildroot/board/visionfive2/linux_defconfig @@ -0,0 +1,234 @@ +CONFIG_SYSVIPC=y +# CONFIG_CROSS_MEMORY_ATTACH is not set +CONFIG_NO_HZ_IDLE=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_PSI=y +# CONFIG_CPU_ISOLATION is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_CGROUPS=y +CONFIG_CGROUP_SCHED=y +CONFIG_CGROUP_PIDS=y +CONFIG_CGROUP_CPUACCT=y +CONFIG_NAMESPACES=y +CONFIG_BLK_DEV_INITRD=y +# CONFIG_RD_BZIP2 is not set +# CONFIG_RD_LZMA is not set +# CONFIG_RD_XZ is not set +# CONFIG_RD_LZO is not set +# CONFIG_RD_LZ4 is not set +CONFIG_EXPERT=y +# CONFIG_SYSFS_SYSCALL is not set +CONFIG_PERF_EVENTS=y +CONFIG_SOC_STARFIVE=y +CONFIG_ERRATA_SIFIVE=y +CONFIG_NONPORTABLE=y +CONFIG_SMP=y +# CONFIG_RISCV_ISA_SVPBMT is not set +# CONFIG_COMPAT is not set +CONFIG_HIBERNATION=y +CONFIG_CPU_IDLE=y +CONFIG_RISCV_SBI_CPUIDLE=y +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=y +CONFIG_CPU_FREQ_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y +CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y +CONFIG_CPUFREQ_DT=y +CONFIG_JUMP_LABEL=y +# CONFIG_STACKPROTECTOR is not set +# CONFIG_GCC_PLUGINS is not set +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_COMPRESS_ZSTD=y +# CONFIG_BLOCK_LEGACY_AUTOLOAD is not set +CONFIG_BLK_WBT=y +# CONFIG_BLK_DEBUG_FS is not set +CONFIG_PARTITION_ADVANCED=y +# CONFIG_MQ_IOSCHED_DEADLINE is not set +# CONFIG_MQ_IOSCHED_KYBER is not set +CONFIG_KSM=y +# CONFIG_VM_EVENT_COUNTERS is not set +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_IP_MULTIPLE_TABLES=y +CONFIG_IP_PNP=y +CONFIG_INET_DIAG=m +# CONFIG_IPV6_SIT is not set +CONFIG_IPV6_MULTIPLE_TABLES=y +# CONFIG_WIRELESS is not set +# CONFIG_ETHTOOL_NETLINK is not set +CONFIG_PCI=y +CONFIG_PCIEPORTBUS=y +CONFIG_PCI_HOST_GENERIC=y +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +# CONFIG_STANDALONE is not set +# CONFIG_PREVENT_FIRMWARE_BUILD is not set +CONFIG_FW_LOADER=m +CONFIG_SIFIVE_CCACHE=y +CONFIG_EFI_DISABLE_RUNTIME=y +CONFIG_MTD=y +CONFIG_MTD_SPI_NOR=y +CONFIG_ZRAM=y +CONFIG_ZRAM_MEMORY_TRACKING=y +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_LOOP_MIN_COUNT=1 +CONFIG_BLK_DEV_NVME=y +CONFIG_SCSI=y +CONFIG_BLK_DEV_SD=y +CONFIG_BLK_DEV_SR=y +CONFIG_NETDEVICES=y +CONFIG_STMMAC_ETH=y +CONFIG_DWMAC_DWC_QOS_ETH=y +# CONFIG_DWMAC_GENERIC is not set +CONFIG_DWMAC_STARFIVE=y +CONFIG_MICROCHIP_PHY=y +CONFIG_MOTORCOMM_PHY=y +# CONFIG_WLAN is not set +# CONFIG_INPUT_KEYBOARD is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_SERIO is not set +# CONFIG_VT is not set +# CONFIG_LEGACY_PTYS is not set +# CONFIG_LDISC_AUTOLOAD is not set +CONFIG_SERIAL_8250=y +# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set +# CONFIG_SERIAL_8250_16550A_VARIANTS is not set +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_NR_UARTS=6 +CONFIG_SERIAL_8250_RUNTIME_UARTS=6 +CONFIG_SERIAL_8250_EXTENDED=y +CONFIG_SERIAL_8250_MANY_PORTS=y +CONFIG_SERIAL_8250_DW=y +CONFIG_SERIAL_OF_PLATFORM=y +CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM_JH7110=y +# CONFIG_I2C_COMPAT is not set +CONFIG_I2C_CHARDEV=y +# CONFIG_I2C_HELPER_AUTO is not set +CONFIG_I2C_DESIGNWARE_PLATFORM=y +CONFIG_SPI=y +CONFIG_SPI_CADENCE_QUADSPI=y +CONFIG_SPI_PL022=y +CONFIG_SPI_SPIDEV=y +# CONFIG_PTP_1588_CLOCK is not set +CONFIG_GPIOLIB_FASTPATH_LIMIT=128 +CONFIG_GPIO_SYSFS=y +CONFIG_POWER_RESET=y +CONFIG_POWER_RESET_GPIO_RESTART=y +CONFIG_SENSORS_SFCTEMP=y +CONFIG_THERMAL=y +CONFIG_CPU_THERMAL=y +CONFIG_THERMAL_EMULATION=y +CONFIG_WATCHDOG=y +CONFIG_MFD_AXP20X_I2C=y +CONFIG_REGULATOR=y +CONFIG_REGULATOR_FIXED_VOLTAGE=y +CONFIG_REGULATOR_AXP20X=y +CONFIG_MEDIA_SUPPORT=y +CONFIG_V4L_PLATFORM_DRIVERS=y +CONFIG_VIDEO_CADENCE_CSI2RX=y +CONFIG_VIDEO_IMX219=y +CONFIG_DRM=y +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_SOUND=y +CONFIG_SND=y +CONFIG_SND_SOC=y +CONFIG_SND_DESIGNWARE_I2S=y +CONFIG_SND_SOC_STARFIVE=y +CONFIG_SND_SOC_JH7110_PWMDAC=y +CONFIG_SND_SOC_JH7110_TDM=y +CONFIG_SND_SOC_WM8960=y +CONFIG_SND_SIMPLE_CARD=y +CONFIG_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_HCD_PLATFORM=y +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_OHCI_HCD_PLATFORM=y +CONFIG_USB_STORAGE=y +CONFIG_USB_UAS=y +CONFIG_USB_CDNS_SUPPORT=y +CONFIG_USB_CDNS3=y +CONFIG_USB_CDNS3_GADGET=y +CONFIG_USB_CDNS3_HOST=y +CONFIG_USB_CDNS3_STARFIVE=y +CONFIG_USB_GADGET=y +CONFIG_USB_CONFIGFS=y +CONFIG_USB_CONFIGFS_F_FS=y +CONFIG_MMC=y +# CONFIG_PWRSEQ_EMMC is not set +# CONFIG_PWRSEQ_SIMPLE is not set +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_PLTFM=y +CONFIG_MMC_SDHCI_OF_DWCMSHC=y +CONFIG_MMC_DW=y +CONFIG_MMC_DW_STARFIVE=y +CONFIG_DMADEVICES=y +CONFIG_AMBA_PL08X=y +CONFIG_DW_AXI_DMAC=y +CONFIG_DMATEST=y +# CONFIG_VIRTIO_MENU is not set +# CONFIG_VHOST_MENU is not set +CONFIG_STAGING=y +CONFIG_STAGING_MEDIA=y +CONFIG_VIDEO_STARFIVE_CAMSS=y +CONFIG_CLK_STARFIVE_JH7110_AON=y +CONFIG_CLK_STARFIVE_JH7110_STG=y +CONFIG_CLK_STARFIVE_JH7110_ISP=y +CONFIG_CLK_STARFIVE_JH7110_VOUT=y +# CONFIG_IOMMU_SUPPORT is not set +CONFIG_PWM=y +CONFIG_PHY_STARFIVE_JH7110_DPHY_RX=y +CONFIG_PHY_STARFIVE_JH7110_PCIE=y +CONFIG_PHY_STARFIVE_JH7110_USB=y +CONFIG_EXT4_FS=y +CONFIG_BTRFS_FS=y +CONFIG_BTRFS_FS_POSIX_ACL=y +# CONFIG_DNOTIFY is not set +CONFIG_FANOTIFY=y +CONFIG_AUTOFS_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_UTF8=y +CONFIG_EXFAT_FS=y +CONFIG_NTFS_FS=y +CONFIG_NTFS_RW=y +CONFIG_PROC_KCORE=y +CONFIG_PROC_CHILDREN=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_EFIVAR_FS=y +CONFIG_JFFS2_FS=y +CONFIG_NFS_FS=y +CONFIG_NFS_V4=y +CONFIG_NFS_V4_1=y +CONFIG_NFS_V4_2=y +CONFIG_ROOT_NFS=y +CONFIG_NLS_DEFAULT="iso8859-15" +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_ISO8859_15=y +CONFIG_LSM="" +CONFIG_CRYPTO_ZSTD=y +# CONFIG_RAID6_PQ_BENCHMARK is not set +# CONFIG_DEBUG_MISC is not set +CONFIG_STRIP_ASM_SYMS=y +CONFIG_DEBUG_SECTION_MISMATCH=y +# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set +CONFIG_DEBUG_FS=y +# CONFIG_SLUB_DEBUG is not set +CONFIG_DEBUG_RODATA_TEST=y +CONFIG_DEBUG_WX=y +CONFIG_SOFTLOCKUP_DETECTOR=y +CONFIG_WQ_WATCHDOG=y +# CONFIG_SCHED_DEBUG is not set +CONFIG_STACKTRACE=y +CONFIG_RCU_CPU_STALL_TIMEOUT=60 +# CONFIG_RCU_TRACE is not set +# CONFIG_FTRACE is not set +# CONFIG_RUNTIME_TESTING_MENU is not set diff --git a/buildroot/board/visionfive2/overlay/boot/extlinux/extlinux.conf b/buildroot/board/visionfive2/overlay/boot/extlinux/extlinux.conf new file mode 100644 index 0000000000..fd772f3675 --- /dev/null +++ b/buildroot/board/visionfive2/overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label linux + kernel /boot/Image + devicetree /boot/jh7110-starfive-visionfive-2-v1.3b.dtb + append console=ttyS0,115200 root=/dev/mmcblk1p3 diff --git a/buildroot/board/visionfive2/patches/linux-headers/linux-headers.hash b/buildroot/board/visionfive2/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/visionfive2/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/visionfive2/patches/linux/linux.hash b/buildroot/board/visionfive2/patches/linux/linux.hash new file mode 100644 index 0000000000..ccad8068dd --- /dev/null +++ b/buildroot/board/visionfive2/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 9ac322d85bcf98a04667d929f5c2666b15bd58c6c2d68dd512c72acbced07d04 linux-6.8.2.tar.xz diff --git a/buildroot/board/visionfive2/patches/opensbi/opensbi.hash b/buildroot/board/visionfive2/patches/opensbi/opensbi.hash new file mode 100644 index 0000000000..bc4058abe6 --- /dev/null +++ b/buildroot/board/visionfive2/patches/opensbi/opensbi.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 319b62a4186fbce9b81a0c5f0ec9f003a10c808397a72138bc9745d9b87b1eb1 opensbi-1.4.tar.gz diff --git a/buildroot/board/visionfive2/patches/uboot/uboot.hash b/buildroot/board/visionfive2/patches/uboot/uboot.hash new file mode 100644 index 0000000000..97a2b4eaf9 --- /dev/null +++ b/buildroot/board/visionfive2/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a u-boot-2024.04.tar.bz2 diff --git a/buildroot/board/visionfive2/post-image.sh b/buildroot/board/visionfive2/post-image.sh new file mode 100755 index 0000000000..3da106dc26 --- /dev/null +++ b/buildroot/board/visionfive2/post-image.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +support/scripts/genimage.sh -c board/visionfive2/genimage.cfg +support/scripts/genimage.sh -c board/visionfive2/genimage_spi-nor.cfg diff --git a/buildroot/board/visionfive2/readme.txt b/buildroot/board/visionfive2/readme.txt new file mode 100644 index 0000000000..cc4fece6e9 --- /dev/null +++ b/buildroot/board/visionfive2/readme.txt @@ -0,0 +1,56 @@ +Starfive VisionFive2 +==================== + +The VisionFive2 is a low-cost RISC-V 64-bit based platform, powered by a +Starfive JH7110 processor. + +https://doc-en.rvspace.org/Doc_Center/visionfive_2.html + +How to build +============ + +$ make visionfive2_defconfig +$ make + +Once the build process is finished you will have two images +in the output/images/ directory: +- sdcard.img +- spi-nor.img + +How to write the SPI NOR flash +============================= + +If you have a booting device use u-boot and tftp: + + # tftpboot 0x82000000 spi-nor.img + # sf probe + # sf update 0x82000000 0x0 {filesize} + +Otherwise, follow the recovery instruction: + +https://doc-en.rvspace.org/VisionFive2/Quick_Start_Guide/VisionFive2_SDK_QSG/recovering_bootloader%20-%20vf2.html + +How to write the SD card +======================== + +Copy the bootable "sdcard.img" onto an SD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX + +Preparing the board +=================== + +Connect a TTL UART cable to pin 6 (GND), 8 (TX) and 10 (RX). + +Use the correct mode for booting: +- SD card RGPIO_0=1, GRPIO_1=0 +- SPI NOR flash RGPIO_0=1, GRPIO_1=1 + +Note that Buildroot puts the bootloader both in SPI NOR and on the SD card, +so after flashing as instructed above, either boot mode should work. + +https://doc-en.rvspace.org/VisionFive2/Quick_Start_Guide/VisionFive2_SDK_QSG/boot_mode_settings.html + +Insert your SD card. + +Power-up the board using an USB-C cable. diff --git a/buildroot/board/xilinx/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/buildroot/board/xilinx/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 0000000000..e300398541 --- /dev/null +++ b/buildroot/board/xilinx/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 c3369c89eab4e452bbc76c630e5dccb6c0ae588c0175b6c8549aa0241deb06ef xlnx_rebase_v2.10_2024.1.tar.gz diff --git a/buildroot/board/xilinx/patches/linux-headers/linux-headers.hash b/buildroot/board/xilinx/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/buildroot/board/xilinx/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/buildroot/board/xilinx/patches/linux/linux.hash b/buildroot/board/xilinx/patches/linux/linux.hash new file mode 100644 index 0000000000..b007db4303 --- /dev/null +++ b/buildroot/board/xilinx/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 6415cfcfd74e943d6ae44f6c1edcae09bf6cd89410b03c4290bf1464a8368f84 xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz diff --git a/buildroot/board/xilinx/patches/uboot/uboot.hash b/buildroot/board/xilinx/patches/uboot/uboot.hash new file mode 100644 index 0000000000..a5ab9fae05 --- /dev/null +++ b/buildroot/board/xilinx/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 58e391a001d9d8ed347ab3258ff7c8435c866b1ff2b2c22ebc95af592444c0f5 xlnx_rebase_v2024.01_2024.1.tar.gz diff --git a/buildroot/board/xilinx/patches/xilinx-prebuilt/xilinx-prebuilt.hash b/buildroot/board/xilinx/patches/xilinx-prebuilt/xilinx-prebuilt.hash new file mode 100644 index 0000000000..c955cd79f5 --- /dev/null +++ b/buildroot/board/xilinx/patches/xilinx-prebuilt/xilinx-prebuilt.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 7abcba4e0e44e3a4adf9c1f971d918575226d7604dfd64a386baaa00c1c6c35f xilinx-prebuilt-xilinx_v2024.1.tar.gz diff --git a/buildroot/board/zynq/extlinux.conf b/buildroot/board/zynq/extlinux.conf new file mode 100644 index 0000000000..3c2ab4f46a --- /dev/null +++ b/buildroot/board/zynq/extlinux.conf @@ -0,0 +1,4 @@ +label linux + kernel /uImage + devicetree /system.dtb + append console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait diff --git a/buildroot/board/zynq/genimage.cfg b/buildroot/board/zynq/genimage.cfg index 67baca795e..78eb9275dd 100644 --- a/buildroot/board/zynq/genimage.cfg +++ b/buildroot/board/zynq/genimage.cfg @@ -3,12 +3,12 @@ image boot.vfat { files = { "boot.bin", "u-boot.img", - "devicetree.dtb", + "system.dtb", "uImage" } - file uramdisk.image.gz { - image = "rootfs.cpio.uboot" + file extlinux/extlinux.conf { + image = extlinux.conf } } @@ -24,4 +24,9 @@ image sdcard.img { bootable = "true" image = "boot.vfat" } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } } diff --git a/buildroot/board/zynq/post-build.sh b/buildroot/board/zynq/post-build.sh new file mode 100755 index 0000000000..810fe99879 --- /dev/null +++ b/buildroot/board/zynq/post-build.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +# genimage will need to find the extlinux.conf +# in the binaries directory + +BOARD_DIR="$(dirname "$0")" + +install -m 0644 -D "${BOARD_DIR}/extlinux.conf" "${BINARIES_DIR}/extlinux.conf" diff --git a/buildroot/board/zynq/post-image.sh b/buildroot/board/zynq/post-image.sh deleted file mode 100755 index 0cf92e0aa9..0000000000 --- a/buildroot/board/zynq/post-image.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -# By default U-Boot loads DTB from a file named "devicetree.dtb", so -# let's use a symlink with that name that points to the *first* -# devicetree listed in the config. - -FIRST_DT=$(sed -n \ - 's/^BR2_LINUX_KERNEL_INTREE_DTS_NAME="\([a-z0-9\-]*\).*"$/\1/p' \ - ${BR2_CONFIG}) - -[ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/devicetree.dtb - -support/scripts/genimage.sh -c board/zynq/genimage.cfg diff --git a/buildroot/board/zynq/post-image.sh b/buildroot/board/zynq/post-image.sh new file mode 120000 index 0000000000..775184415d --- /dev/null +++ b/buildroot/board/zynq/post-image.sh @@ -0,0 +1 @@ +../zynqmp/post-image.sh \ No newline at end of file diff --git a/buildroot/board/zynq/readme.txt b/buildroot/board/zynq/readme.txt index 162734963a..b2a4cefedd 100644 --- a/buildroot/board/zynq/readme.txt +++ b/buildroot/board/zynq/readme.txt @@ -1,7 +1,8 @@ This is the Buildroot support for Zynq boards. Zynq boards are available from Xilinx and some third party vendors, but the build procedure is very similar. -Currently, three boards are natively supported by Buildroot: +Currently, four boards are natively supported by Buildroot: + - Xilinx ZC702 board (zynq_zc702_defconfig) - Xilinx ZC706 board (zynq_zc706_defconfig) - Avnet ZedBoard (zynq_zed_defconfig) - Avnet MicroZed (zynq_microzed_defconfig) @@ -9,6 +10,7 @@ Currently, three boards are natively supported by Buildroot: Steps to create a working system for a Zynq board: 1) Configuration (do one of the following) + make zynq_zc702_defconfig (ZC702) make zynq_zc706_defconfig (ZC706) make zynq_zed_defconfig (Zedboard) make zynq_microzed_defconfig (MicroZed) @@ -31,12 +33,11 @@ kernel_image=myimage modeboot=myboot myboot=... -Note: -The DTB for MicroZed is the same as the one for the Zedboard (zynq-zed.dtb), -and this is the recommended solution, see -https://forums.xilinx.com/t5/Embedded-Linux/Microzed-default-device-tree-dts/td-p/432856. - References: + - ZC702 information including schematics, reference designs, and manuals are + available from + https://www.xilinx.com/products/boards-and-kits/ek-z7-zc702-g.html + - ZC706 information including schematics, reference designs, and manuals are available from http://www.xilinx.com/products/boards-and-kits/ek-z7-zc706-g.html. @@ -52,7 +53,7 @@ the upstream kernel and U-Boot, you simply need to change the following Buildroot options: - Kernel Device Tree file name (BR2_LINUX_KERNEL_INTREE_DTS_NAME) - - U-Boot board defconfig (BR2_TARGET_UBOOT_BOARD_DEFCONFIG) + - U-Boot (BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=") Custom ps7_init_gpl.c/h support: diff --git a/buildroot/board/zynqmp/extlinux.conf b/buildroot/board/zynqmp/extlinux.conf deleted file mode 100644 index ae3ec8614a..0000000000 --- a/buildroot/board/zynqmp/extlinux.conf +++ /dev/null @@ -1,5 +0,0 @@ -label linux - kernel /Image - devicetree /system.dtb - append console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait - diff --git a/buildroot/board/zynqmp/kria/kd240/kd240.sh b/buildroot/board/zynqmp/kria/kd240/kd240.sh new file mode 100755 index 0000000000..2203536a52 --- /dev/null +++ b/buildroot/board/zynqmp/kria/kd240/kd240.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +# This is a temporary work around for generating kd240 u-boot.itb. +# The problem is there is no way to currently configure u-boot to apply +# the carrier board dtb overlay during build, so all kd240 carrier board +# drivers are missing. +# This will be removed when u-boot can build the kd240 u-boot.itb natively. + +UBOOT_DIR="$4" + +fdtoverlay -o "${UBOOT_DIR}/fit-dtb.blob" \ + -i "${UBOOT_DIR}/arch/arm/dts/zynqmp-smk-k24-revA.dtb" \ + "${UBOOT_DIR}/arch/arm/dts/zynqmp-sck-kd-g-revA.dtbo" + +"${UBOOT_DIR}/tools/mkimage" -E -f "${UBOOT_DIR}/u-boot.its" \ + -B 0x8 "${BINARIES_DIR}/u-boot.itb" diff --git a/buildroot/board/zynqmp/kria/kd240/patches/uboot/0001-arm64-zynqmp-Enable-usb3-for-k24-som.patch b/buildroot/board/zynqmp/kria/kd240/patches/uboot/0001-arm64-zynqmp-Enable-usb3-for-k24-som.patch new file mode 100644 index 0000000000..0cc10d344e --- /dev/null +++ b/buildroot/board/zynqmp/kria/kd240/patches/uboot/0001-arm64-zynqmp-Enable-usb3-for-k24-som.patch @@ -0,0 +1,81 @@ +From 73c99c29508d7adfe11b6a81f13cf00efab5f9de Mon Sep 17 00:00:00 2001 +From: Neal Frager +Date: Tue, 4 Jun 2024 09:15:23 +0100 +Subject: [PATCH] arm64: zynqmp: Enable usb3 for k24 som + +This patch corrects the mio and pll configuration registers for using usb3 +on the kd240 starter kit. Without this patch, the usb3 to sd card bridge does +not initialize correctly and u-boot is unable to find the OS located on the +kd240 starter kit sd card. + +In addition, this patch correctly configures mio76 and mio77 as gpio pins +which are used as reset gpio pins on the kd240 starter kit. + +Signed-off-by: Neal Frager +Upstream: https://patchwork.ozlabs.org/project/uboot/patch/20240604083854.2033917-1-neal.frager@amd.com/ +--- + .../zynqmp/zynqmp-sm-k24-revA/psu_init_gpl.c | 23 ++++++++----------- + 1 file changed, 10 insertions(+), 13 deletions(-) + +diff --git a/board/xilinx/zynqmp/zynqmp-sm-k24-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-sm-k24-revA/psu_init_gpl.c +index 166e61431b..274203ffaa 100644 +--- a/board/xilinx/zynqmp/zynqmp-sm-k24-revA/psu_init_gpl.c ++++ b/board/xilinx/zynqmp/zynqmp-sm-k24-revA/psu_init_gpl.c +@@ -528,8 +528,8 @@ static unsigned long psu_mio_init_data(void) + psu_mask_write(0xFF180124, 0x000000FEU, 0x00000002U); + psu_mask_write(0xFF180128, 0x000000FEU, 0x00000002U); + psu_mask_write(0xFF18012C, 0x000000FEU, 0x00000002U); +- psu_mask_write(0xFF180130, 0x000000FEU, 0x000000C0U); +- psu_mask_write(0xFF180134, 0x000000FEU, 0x000000C0U); ++ psu_mask_write(0xFF180130, 0x000000FEU, 0x00000000U); ++ psu_mask_write(0xFF180134, 0x000000FEU, 0x00000000U); + psu_mask_write(0xFF180204, 0xFFFFFFFFU, 0x50000000U); + psu_mask_write(0xFF180208, 0xFFFFFFFFU, 0x00B02020U); + psu_mask_write(0xFF18020C, 0x00003FFFU, 0x00000FC0U); +@@ -569,21 +569,16 @@ static unsigned long psu_peripherals_init_data(void) + psu_mask_write(0xFD1A0100, 0x0001807CU, 0x00000000U); + psu_mask_write(0xFF5E0238, 0x001A0000U, 0x00000000U); + psu_mask_write(0xFF5E023C, 0x0093C018U, 0x00000000U); +- psu_mask_write(0xFF5E0230, 0x00000008U, 0x00000000U); ++ psu_mask_write(0xFF5E0230, 0x00000002U, 0x00000000U); + psu_mask_write(0xFF5E0238, 0x00000001U, 0x00000000U); + psu_mask_write(0xFF180390, 0x00000004U, 0x00000004U); + psu_mask_write(0xFF5E023C, 0x00000400U, 0x00000000U); +- psu_mask_write(0xFF5E0238, 0x00000040U, 0x00000000U); +- psu_mask_write(0xFF180310, 0x00008000U, 0x00000000U); +- psu_mask_write(0xFF180320, 0x33840000U, 0x02840000U); +- psu_mask_write(0xFF18031C, 0x7FFE0000U, 0x64500000U); +- psu_mask_write(0xFF180358, 0x00000008U, 0x00000008U); +- psu_mask_write(0xFF180324, 0x03C00000U, 0x00000000U); ++ psu_mask_write(0xFF5E0238, 0x00000080U, 0x00000000U); + psu_mask_write(0xFF5E0238, 0x00000400U, 0x00000000U); + psu_mask_write(0xFF5E0238, 0x00008000U, 0x00000000U); + psu_mask_write(0xFF5E0238, 0x00000010U, 0x00000000U); + psu_mask_write(0xFF5E0238, 0x00007800U, 0x00000000U); +- psu_mask_write(0xFF5E0238, 0x00000004U, 0x00000000U); ++ psu_mask_write(0xFF5E0238, 0x00000006U, 0x00000000U); + psu_mask_write(0xFF5E0238, 0x00040000U, 0x00000000U); + psu_mask_write(0xFF4B0024, 0x000000FFU, 0x000000FFU); + psu_mask_write(0xFFCA5000, 0x00001FFFU, 0x00000000U); +@@ -591,13 +586,15 @@ static unsigned long psu_peripherals_init_data(void) + psu_mask_write(0xFFA60040, 0x80000000U, 0x80000000U); + psu_mask_write(0xFF260020, 0xFFFFFFFFU, 0x05F5DD18U); + psu_mask_write(0xFF260000, 0x00000001U, 0x00000001U); +- psu_mask_write(0xFF5E0250, 0x00000F0FU, 0x00000202U); ++ psu_mask_write(0xFF0A0284, 0x03FFFFFFU, 0x01000000U); ++ psu_mask_write(0xFF0A0288, 0x03FFFFFFU, 0x01000000U); ++ psu_mask_write(0xFF0A0014, 0x03FF03FFU, 0x02FF0100U); + + mask_delay(1); +- psu_mask_write(0xFF5E0250, 0x00000F0FU, 0x00000002U); ++ psu_mask_write(0xFF0A0014, 0x03FF03FFU, 0x02FF0000U); + + mask_delay(5); +- psu_mask_write(0xFF5E0250, 0x00000F0FU, 0x00000202U); ++ psu_mask_write(0xFF0A0014, 0x03FF03FFU, 0x02FF0100U); + + return 1; + } +-- +2.25.1 + diff --git a/buildroot/board/zynqmp/kria/kd240/pm_cfg_obj.c b/buildroot/board/zynqmp/kria/kd240/pm_cfg_obj.c new file mode 100644 index 0000000000..13061ddcb3 --- /dev/null +++ b/buildroot/board/zynqmp/kria/kd240/pm_cfg_obj.c @@ -0,0 +1,494 @@ +/****************************************************************************** +* Copyright (c) 2017 - 2021 Xilinx, Inc. All rights reserved. +* SPDX-License-Identifier: MIT +******************************************************************************/ + +#include "xil_types.h" +#include "pm_defs.h" + +#define PM_CONFIG_MASTER_SECTION_ID 0x101U +#define PM_CONFIG_SLAVE_SECTION_ID 0x102U +#define PM_CONFIG_PREALLOC_SECTION_ID 0x103U +#define PM_CONFIG_POWER_SECTION_ID 0x104U +#define PM_CONFIG_RESET_SECTION_ID 0x105U +#define PM_CONFIG_SHUTDOWN_SECTION_ID 0x106U +#define PM_CONFIG_SET_CONFIG_SECTION_ID 0x107U +#define PM_CONFIG_GPO_SECTION_ID 0x108U + +#define PM_SLAVE_FLAG_IS_SHAREABLE 0x1U +#define PM_MASTER_USING_SLAVE_MASK 0x2U + +#define PM_CONFIG_GPO1_MIO_PIN_34_MAP (1U << 10U) +#define PM_CONFIG_GPO1_MIO_PIN_35_MAP (1U << 11U) +#define PM_CONFIG_GPO1_MIO_PIN_36_MAP (1U << 12U) +#define PM_CONFIG_GPO1_MIO_PIN_37_MAP (1U << 13U) + +#define PM_CONFIG_GPO1_BIT_2_MASK (1U << 2U) +#define PM_CONFIG_GPO1_BIT_3_MASK (1U << 3U) +#define PM_CONFIG_GPO1_BIT_4_MASK (1U << 4U) +#define PM_CONFIG_GPO1_BIT_5_MASK (1U << 5U) + +#define SUSPEND_TIMEOUT 0xFFFFFFFFU + +#define PM_CONFIG_OBJECT_TYPE_BASE 0x1U + + +#define PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK 0x00000001 +#define PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK 0x00000100 +#define PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK 0x00000200 + + + +#if defined (__ICCARM__) +#pragma language=save +#pragma language=extended +#endif +#if defined (__GNUC__) + const u32 XPm_ConfigObject[] __attribute__((used, section(".sys_cfg_data"))) = +#elif defined (__ICCARM__) +#pragma location = ".sys_cfg_data" +__root const u32 XPm_ConfigObject[] = +#endif +{ + /**********************************************************************/ + /* HEADER */ + 2, /* Number of remaining words in the header */ + 8, /* Number of sections included in config object */ + PM_CONFIG_OBJECT_TYPE_BASE, /* Type of config object as base */ + /**********************************************************************/ + /* MASTER SECTION */ + PM_CONFIG_MASTER_SECTION_ID, /* Master SectionID */ + 3U, /* No. of Masters*/ + + NODE_APU, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_0, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_1, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Wake permissions */ + + + /**********************************************************************/ + /* SLAVE SECTION */ + + + PM_CONFIG_SLAVE_SECTION_ID, /* Section ID */ + 35, /* Number of slaves */ + + NODE_OCM_BANK_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_0_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_0_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_1_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_1_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_L2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU_PP_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU_PP_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_USB_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_ETH_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_UART_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_UART_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SPI_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_I2C_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_DP, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GDMA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_ADMA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_QSPI, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPIO, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_CAN_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_EXTERN, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_DDR, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_IPI_APU, + 0U, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_0, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_1, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_RTC, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_PL, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + + /**********************************************************************/ + /* PREALLOC SECTION */ + + PM_CONFIG_PREALLOC_SECTION_ID, /* Preallaoc SectionID */ + 3U, /* No. of Masters*/ + + /* Prealloc for psu_cortexa53_0 */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, + 10, + NODE_DDR, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_L2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_3, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_QSPI, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_PL, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_APU, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_0 */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + 3, + NODE_TCM_0_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_0_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_1 */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + 3, + NODE_TCM_1_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_1_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + + /**********************************************************************/ + /* POWER SECTION */ + + PM_CONFIG_POWER_SECTION_ID, /* Power Section ID */ + 4U, /* Number of power nodes */ + + NODE_APU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_RPU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_FPD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_PLD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + + /**********************************************************************/ + /* RESET SECTION */ + + PM_CONFIG_RESET_SECTION_ID, /* Reset Section ID */ + 120U, /* Number of resets */ + + XILPM_RESET_PCIE_CFG, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_BRIDGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_CTRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRF, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GDMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SATA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APU_L2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DDR, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SOFT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_QSPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_NAND, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ADMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOU_CC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TIMESTAMP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R50, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R51, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_AMBA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_OCM, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_PGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RTC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SYSMON, 0, + XILPM_RESET_AFI_FM6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_LPD_SWDT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_FPD, PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + XILPM_RESET_RPU_DBG1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_DBG0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_VPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_7, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_8, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_9, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_10, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_11, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_12, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_13, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_14, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_15, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_16, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_17, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_18, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_19, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_20, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_21, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_22, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_23, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_24, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_25, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_26, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_27, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_28, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_29, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_30, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_31, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_LS, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PS_ONLY, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_92, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_93, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_94, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_95, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + + /**********************************************************************/ + /* SET CONFIG SECTION */ + PM_CONFIG_SET_CONFIG_SECTION_ID, /* Set Config Section ID */ + 0U, /* Permissions to load base config object */ + 0U, /* Permissions to load overlay config object */ + + /**********************************************************************/ + /* SHUTDOWN SECTION */ + + PM_CONFIG_SHUTDOWN_SECTION_ID, /* Shutdown Section ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* System Shutdown/Restart Permission */ + + /**********************************************************************/ + /* GPO SECTION */ + PM_CONFIG_GPO_SECTION_ID, /* GPO Section ID */ + 0, /* State of GPO pins */ +}; +#if defined (__ICCARM__) +#pragma language=restore +#endif diff --git a/buildroot/board/zynqmp/kria/kr260/kr260.sh b/buildroot/board/zynqmp/kria/kr260/kr260.sh new file mode 100755 index 0000000000..ac49fa5ee4 --- /dev/null +++ b/buildroot/board/zynqmp/kria/kr260/kr260.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +# This is a temporary work around for generating kr260 u-boot.itb. +# The problem is there is no way to currently configure u-boot to apply +# the carrier board dtb overlay during build, so all kr260 carrier board +# drivers are missing. +# This will be removed when u-boot can build the kr260 u-boot.itb natively. + +UBOOT_DIR="$4" + +fdtoverlay -o "${UBOOT_DIR}/fit-dtb.blob" \ + -i "${UBOOT_DIR}/arch/arm/dts/zynqmp-smk-k26-revA.dtb" \ + "${UBOOT_DIR}/arch/arm/dts/zynqmp-sck-kr-g-revB.dtbo" + +"${UBOOT_DIR}/tools/mkimage" -E -f "${UBOOT_DIR}/u-boot.its" \ + -B 0x8 "${BINARIES_DIR}/u-boot.itb" diff --git a/buildroot/board/zynqmp/kria/kr260/pm_cfg_obj.c b/buildroot/board/zynqmp/kria/kr260/pm_cfg_obj.c new file mode 100644 index 0000000000..9692a30d37 --- /dev/null +++ b/buildroot/board/zynqmp/kria/kr260/pm_cfg_obj.c @@ -0,0 +1,496 @@ +/****************************************************************************** +* Copyright (c) 2017 - 2021 Xilinx, Inc. All rights reserved. +* SPDX-License-Identifier: MIT +******************************************************************************/ + +#include "xil_types.h" +#include "pm_defs.h" + +#define PM_CONFIG_MASTER_SECTION_ID 0x101U +#define PM_CONFIG_SLAVE_SECTION_ID 0x102U +#define PM_CONFIG_PREALLOC_SECTION_ID 0x103U +#define PM_CONFIG_POWER_SECTION_ID 0x104U +#define PM_CONFIG_RESET_SECTION_ID 0x105U +#define PM_CONFIG_SHUTDOWN_SECTION_ID 0x106U +#define PM_CONFIG_SET_CONFIG_SECTION_ID 0x107U +#define PM_CONFIG_GPO_SECTION_ID 0x108U + +#define PM_SLAVE_FLAG_IS_SHAREABLE 0x1U +#define PM_MASTER_USING_SLAVE_MASK 0x2U + +#define PM_CONFIG_GPO1_MIO_PIN_34_MAP (1U << 10U) +#define PM_CONFIG_GPO1_MIO_PIN_35_MAP (1U << 11U) +#define PM_CONFIG_GPO1_MIO_PIN_36_MAP (1U << 12U) +#define PM_CONFIG_GPO1_MIO_PIN_37_MAP (1U << 13U) + +#define PM_CONFIG_GPO1_BIT_2_MASK (1U << 2U) +#define PM_CONFIG_GPO1_BIT_3_MASK (1U << 3U) +#define PM_CONFIG_GPO1_BIT_4_MASK (1U << 4U) +#define PM_CONFIG_GPO1_BIT_5_MASK (1U << 5U) + +#define SUSPEND_TIMEOUT 0xFFFFFFFFU + +#define PM_CONFIG_OBJECT_TYPE_BASE 0x1U + + +#define PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK 0x00000001 +#define PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK 0x00000100 +#define PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK 0x00000200 + + + +#if defined (__ICCARM__) +#pragma language=save +#pragma language=extended +#endif +#if defined (__GNUC__) + const u32 XPm_ConfigObject[] __attribute__((used, section(".sys_cfg_data"))) = +#elif defined (__ICCARM__) +#pragma location = ".sys_cfg_data" +__root const u32 XPm_ConfigObject[] = +#endif +{ + /**********************************************************************/ + /* HEADER */ + 2, /* Number of remaining words in the header */ + 8, /* Number of sections included in config object */ + PM_CONFIG_OBJECT_TYPE_BASE, /* Type of config object as base */ + /**********************************************************************/ + /* MASTER SECTION */ + PM_CONFIG_MASTER_SECTION_ID, /* Master SectionID */ + 3U, /* No. of Masters*/ + + NODE_APU, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_0, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_1, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Wake permissions */ + + + /**********************************************************************/ + /* SLAVE SECTION */ + + + PM_CONFIG_SLAVE_SECTION_ID, /* Section ID */ + 35, /* Number of slaves */ + + NODE_OCM_BANK_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_0_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_0_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_1_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_1_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_L2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU_PP_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU_PP_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_USB_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_USB_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_ETH_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_ETH_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_UART_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SPI_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_I2C_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_DP, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GDMA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_ADMA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_QSPI, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPIO, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_EXTERN, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_DDR, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_IPI_APU, + 0U, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_0, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_1, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_RTC, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_PL, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + + /**********************************************************************/ + /* PREALLOC SECTION */ + + PM_CONFIG_PREALLOC_SECTION_ID, /* Preallaoc SectionID */ + 3U, /* No. of Masters*/ + +/* Prealloc for psu_cortexa53_0 */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, + 10, + NODE_DDR, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_L2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_3, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_QSPI, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_PL, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_APU, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_0 */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + 3, + NODE_TCM_0_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_0_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_1 */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + 3, + NODE_TCM_1_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_1_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + + /**********************************************************************/ + /* POWER SECTION */ + + PM_CONFIG_POWER_SECTION_ID, /* Power Section ID */ + 4U, /* Number of power nodes */ + + NODE_APU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_RPU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_FPD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_PLD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + + /**********************************************************************/ + /* RESET SECTION */ + + PM_CONFIG_RESET_SECTION_ID, /* Reset Section ID */ + 120U, /* Number of resets */ + + XILPM_RESET_PCIE_CFG, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_BRIDGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_CTRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRF, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GDMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SATA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APU_L2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DDR, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SOFT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_QSPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_NAND, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ADMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOU_CC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TIMESTAMP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R50, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R51, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_AMBA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_OCM, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_PGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RTC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SYSMON, 0, + XILPM_RESET_AFI_FM6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_LPD_SWDT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_FPD, PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + XILPM_RESET_RPU_DBG1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_DBG0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_VPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_7, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_8, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_9, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_10, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_11, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_12, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_13, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_14, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_15, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_16, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_17, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_18, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_19, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_20, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_21, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_22, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_23, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_24, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_25, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_26, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_27, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_28, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_29, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_30, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_31, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_LS, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PS_ONLY, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_92, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_93, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_94, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_95, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + + /**********************************************************************/ + /* SET CONFIG SECTION */ + PM_CONFIG_SET_CONFIG_SECTION_ID, /* Set Config Section ID */ + 0U, /* Permissions to load base config object */ + 0U, /* Permissions to load overlay config object */ + + /**********************************************************************/ + /* SHUTDOWN SECTION */ + + PM_CONFIG_SHUTDOWN_SECTION_ID, /* Shutdown Section ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* System Shutdown/Restart Permission */ + + /**********************************************************************/ + /* GPO SECTION */ + PM_CONFIG_GPO_SECTION_ID, /* GPO Section ID */ + PM_CONFIG_GPO1_MIO_PIN_35_MAP | + 0, /* State of GPO pins */ +}; +#if defined (__ICCARM__) +#pragma language=restore +#endif + diff --git a/buildroot/board/zynqmp/kria/kv260/kv260.sh b/buildroot/board/zynqmp/kria/kv260/kv260.sh new file mode 100755 index 0000000000..dc92c51d43 --- /dev/null +++ b/buildroot/board/zynqmp/kria/kv260/kv260.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +# This is a temporary work around for generating kv260 u-boot.itb. +# The problem is there is no way to currently configure u-boot to apply +# the carrier board dtb overlay during build, so all kv260 carrier board +# drivers are missing. +# This will be removed when u-boot can build the kv260 u-boot.itb natively. + +UBOOT_DIR="$4" + +fdtoverlay -o "${UBOOT_DIR}/fit-dtb.blob" \ + -i "${UBOOT_DIR}/arch/arm/dts/zynqmp-smk-k26-revA.dtb" \ + "${UBOOT_DIR}/arch/arm/dts/zynqmp-sck-kv-g-revB.dtbo" + +"${UBOOT_DIR}/tools/mkimage" -E -f "${UBOOT_DIR}/u-boot.its" \ + -B 0x8 "${BINARIES_DIR}/u-boot.itb" diff --git a/buildroot/board/zynqmp/kria/kv260/pm_cfg_obj.c b/buildroot/board/zynqmp/kria/kv260/pm_cfg_obj.c new file mode 100644 index 0000000000..fc6c4024c6 --- /dev/null +++ b/buildroot/board/zynqmp/kria/kv260/pm_cfg_obj.c @@ -0,0 +1,497 @@ +/****************************************************************************** +* Copyright (c) 2017 - 2021 Xilinx, Inc. All rights reserved. +* SPDX-License-Identifier: MIT +******************************************************************************/ + +#include "xil_types.h" +#include "pm_defs.h" + +#define PM_CONFIG_MASTER_SECTION_ID 0x101U +#define PM_CONFIG_SLAVE_SECTION_ID 0x102U +#define PM_CONFIG_PREALLOC_SECTION_ID 0x103U +#define PM_CONFIG_POWER_SECTION_ID 0x104U +#define PM_CONFIG_RESET_SECTION_ID 0x105U +#define PM_CONFIG_SHUTDOWN_SECTION_ID 0x106U +#define PM_CONFIG_SET_CONFIG_SECTION_ID 0x107U +#define PM_CONFIG_GPO_SECTION_ID 0x108U + +#define PM_SLAVE_FLAG_IS_SHAREABLE 0x1U +#define PM_MASTER_USING_SLAVE_MASK 0x2U + +#define PM_CONFIG_GPO1_MIO_PIN_34_MAP (1U << 10U) +#define PM_CONFIG_GPO1_MIO_PIN_35_MAP (1U << 11U) +#define PM_CONFIG_GPO1_MIO_PIN_36_MAP (1U << 12U) +#define PM_CONFIG_GPO1_MIO_PIN_37_MAP (1U << 13U) + +#define PM_CONFIG_GPO1_BIT_2_MASK (1U << 2U) +#define PM_CONFIG_GPO1_BIT_3_MASK (1U << 3U) +#define PM_CONFIG_GPO1_BIT_4_MASK (1U << 4U) +#define PM_CONFIG_GPO1_BIT_5_MASK (1U << 5U) + +#define SUSPEND_TIMEOUT 0xFFFFFFFFU + +#define PM_CONFIG_OBJECT_TYPE_BASE 0x1U + + +#define PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK 0x00000001 +#define PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK 0x00000100 +#define PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK 0x00000200 + + + +#if defined (__ICCARM__) +#pragma language=save +#pragma language=extended +#endif +#if defined (__GNUC__) + const u32 XPm_ConfigObject[] __attribute__((used, section(".sys_cfg_data"))) = +#elif defined (__ICCARM__) +#pragma location = ".sys_cfg_data" +__root const u32 XPm_ConfigObject[] = +#endif +{ + /**********************************************************************/ + /* HEADER */ + 2, /* Number of remaining words in the header */ + 8, /* Number of sections included in config object */ + PM_CONFIG_OBJECT_TYPE_BASE, /* Type of config object as base */ + /**********************************************************************/ + /* MASTER SECTION */ + PM_CONFIG_MASTER_SECTION_ID, /* Master SectionID */ + 3U, /* No. of Masters*/ + + NODE_APU, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_0, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_1, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Wake permissions */ + + + /**********************************************************************/ + /* SLAVE SECTION */ + + + PM_CONFIG_SLAVE_SECTION_ID, /* Section ID */ + 34, /* Number of slaves */ + + NODE_OCM_BANK_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_0_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_0_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_1_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_1_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_L2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU_PP_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU_PP_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_USB_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_ETH_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_UART_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SPI_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_I2C_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SD_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_DP, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GDMA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_ADMA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_QSPI, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPIO, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_EXTERN, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_DDR, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_IPI_APU, + 0U, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_0, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_1, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_RTC, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_PL, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + + /**********************************************************************/ + /* PREALLOC SECTION */ + + PM_CONFIG_PREALLOC_SECTION_ID, /* Preallaoc SectionID */ + 3U, /* No. of Masters*/ + +/* Prealloc for psu_cortexa53_0 */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, + 11, + NODE_DDR, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_L2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_3, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_SD_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_QSPI, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_PL, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_APU, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_0 */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + 3, + NODE_TCM_0_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_0_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_1 */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + 3, + NODE_TCM_1_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_1_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + + /**********************************************************************/ + /* POWER SECTION */ + + PM_CONFIG_POWER_SECTION_ID, /* Power Section ID */ + 4U, /* Number of power nodes */ + + NODE_APU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_RPU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_FPD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_PLD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + + /**********************************************************************/ + /* RESET SECTION */ + + PM_CONFIG_RESET_SECTION_ID, /* Reset Section ID */ + 120U, /* Number of resets */ + + XILPM_RESET_PCIE_CFG, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_BRIDGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_CTRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRF, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GDMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SATA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APU_L2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DDR, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SOFT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_QSPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_NAND, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ADMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOU_CC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TIMESTAMP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R50, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R51, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_AMBA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_OCM, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_PGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RTC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SYSMON, 0, + XILPM_RESET_AFI_FM6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_LPD_SWDT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_FPD, PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + XILPM_RESET_RPU_DBG1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_DBG0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_VPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_7, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_8, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_9, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_10, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_11, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_12, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_13, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_14, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_15, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_16, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_17, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_18, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_19, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_20, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_21, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_22, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_23, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_24, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_25, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_26, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_27, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_28, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_29, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_30, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_31, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_LS, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PS_ONLY, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_92, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_93, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_94, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_95, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + + /**********************************************************************/ + /* SET CONFIG SECTION */ + PM_CONFIG_SET_CONFIG_SECTION_ID, /* Set Config Section ID */ + 0U, /* Permissions to load base config object */ + 0U, /* Permissions to load overlay config object */ + + /**********************************************************************/ + /* SHUTDOWN SECTION */ + + PM_CONFIG_SHUTDOWN_SECTION_ID, /* Shutdown Section ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* System Shutdown/Restart Permission */ + + /**********************************************************************/ + /* GPO SECTION */ + PM_CONFIG_GPO_SECTION_ID, /* GPO Section ID */ + PM_CONFIG_GPO1_MIO_PIN_35_MAP | + 0, /* State of GPO pins */ +}; +#if defined (__ICCARM__) +#pragma language=restore +#endif + diff --git a/buildroot/board/zynqmp/kria/readme.txt b/buildroot/board/zynqmp/kria/readme.txt new file mode 100644 index 0000000000..7d3a520fde --- /dev/null +++ b/buildroot/board/zynqmp/kria/readme.txt @@ -0,0 +1,118 @@ +************************************************** +Xilinx Kria SOM Starter Kits - ZynqMP SoC +************************************************** + +This document describes the Buildroot support for the Kria KD240, +KR260 and KV260 starter kits by Xilinx, based on Kria SOM including the +Zynq UltraScale+ MPSoC (aka ZynqMP). It has been tested with +the KD240, KR260 and KV260 production boards. + +Evaluation board features can be found here with the links below. + +KD240: +https://www.xilinx.com/products/som/kria/kd240-drives-starter-kit.html + +KR260: +https://www.xilinx.com/products/som/kria/kr260-robotics-starter-kit.html + +KV260: +https://www.xilinx.com/products/som/kria/kv260-vision-starter-kit.html + +How to build it +=============== + +Configure Buildroot: (use the command for the specific board) + + $ make zynqmp_kria_kd240_defconfig + $ make zynqmp_kria_kr260_defconfig + $ make zynqmp_kria_kv260_defconfig + +Compile everything and build the rootfs image: + + $ make + +Result of the build +------------------- + +After building, you should get a tree like this: + + output/images/ + +-- atf-uboot.ub + +-- bl31.bin + +-- boot.bin + +-- boot.vfat + +-- Image + +-- rootfs.ext2 + +-- rootfs.ext4 -> rootfs.ext2 + +-- sdcard.img + +-- system.dtb -> smk-k26-revA-sck-kv-g-revB.dtb + +-- u-boot.itb + `-- smk-k26-revA-sck-kv-g-revB.dtb + +How to write the SD card +======================== + +WARNING! This will destroy all the card content. Use with care! + +The sdcard.img file is a complete bootable image ready to be written +on the boot medium. To install it, simply copy the image to an SD +card: + + # dd if=output/images/sdcard.img of=/dev/sdX + +Where 'sdX' is the device node of the SD. + +Eject the SD card, insert it in the board, and power it up. + +How to write boot.bin and u-boot.itb to QSPI boot flash +======================================================= + +The Kria SOMs are preconfigured to boot initially from QSPI. +This makes these boards different from other ZynqMP boards +in that the boot.bin and u-boot.itb files need to be flashed +into the QSPI boot flash such that U-Boot can then load all +of the remaining images from the SD card. + +In addition, the Kria Starter Kits QSPI comes pre-flashed with +a utility designed to make updating the QSPI flash memory +easier. + +Instructions for using these utilities to update the files +in QSPI flash can be found on the wiki link below. + +https://xilinx-wiki.atlassian.net/wiki/spaces/A/pages/1641152513/Kria+K26+SOM#Boot-Firmware-Updates + +Additionally, it is possible to use u-boot for updating the +QSPI with new boot.bin and u-boot.itb images with the u-boot +commands below. + +KV260 Flashing Instructions: +Flashing u-boot.itb: + $ sf probe + $ fatload mmc 1 0x1000000 u-boot.itb + $ sf erase 0x280000 +$filesize + $ sf write 0x1000000 0x280000 $filesize + +Flashing boot.bin: + $ sf probe + $ fatload mmc 1 0x1000000 boot.bin + $ sf erase 0x200000 +$filesize + $ sf write 0x1000000 0x200000 $filesize + +KD240 / KR260 Flashing Instructions: +Flashing u-boot.itb: + $ usb start + $ sf probe + $ fatload usb 0 0x1000000 u-boot.itb + $ sf erase 0x280000 +$filesize + $ sf write 0x1000000 0x280000 $filesize + +Flashing boot.bin: + $ usb start + $ sf probe + $ fatload usb 0 0x1000000 boot.bin + $ sf erase 0x200000 +$filesize + $ sf write 0x1000000 0x200000 $filesize + +It is possible to boot the Buildroot generated SD card image without +updating the QSPI boot.bin image, so this is an optional step. diff --git a/buildroot/board/zynqmp/post-build.sh b/buildroot/board/zynqmp/post-build.sh index 9fd8bbf2c8..747991e3f1 100755 --- a/buildroot/board/zynqmp/post-build.sh +++ b/buildroot/board/zynqmp/post-build.sh @@ -3,6 +3,13 @@ # genimage will need to find the extlinux.conf # in the binaries directory -BOARD_DIR="$(dirname $0)" +CONSOLE="$2" +ROOT="$3" -install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux.conf +mkdir -p "${BINARIES_DIR}" +cat <<-__HEADER_EOF > "${BINARIES_DIR}/extlinux.conf" + label linux + kernel /Image + devicetree /system.dtb + append console="${CONSOLE}" root="/dev/${ROOT}" rw rootwait + __HEADER_EOF diff --git a/buildroot/board/zynqmp/post-image.sh b/buildroot/board/zynqmp/post-image.sh index ed6dbe188c..f44b66342d 100755 --- a/buildroot/board/zynqmp/post-image.sh +++ b/buildroot/board/zynqmp/post-image.sh @@ -5,11 +5,11 @@ # devicetree listed in the config. FIRST_DT=$(sed -nr \ - -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/([-_/[:alnum:]\\.]*).*"$|\1|p' \ - ${BR2_CONFIG}) + -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="(xilinx/)?([-_/[:alnum:]\\.]*).*"$|\2|p' \ + "${BR2_CONFIG}") -[ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/system.dtb +[ -z "${FIRST_DT}" ] || ln -fs "${FIRST_DT}.dtb" "${BINARIES_DIR}/system.dtb" -BOARD_DIR="$(dirname $0)" +BOARD_DIR="$(dirname "$0")" -support/scripts/genimage.sh -c $BOARD_DIR/genimage.cfg +support/scripts/genimage.sh -c "${BOARD_DIR}/genimage.cfg" diff --git a/buildroot/board/zynqmp/readme.txt b/buildroot/board/zynqmp/readme.txt index dcde422091..3f1b3a80c2 100644 --- a/buildroot/board/zynqmp/readme.txt +++ b/buildroot/board/zynqmp/readme.txt @@ -1,9 +1,9 @@ -****************************************** -Xilinx ZCU102 / ZCU106 boards - ZynqMP SoC -****************************************** +*************************************************** +Xilinx ZCU102 / ZCU104 / ZCU106 boards - ZynqMP SoC +*************************************************** -This document describes the Buildroot support for the ZCU102 and -ZCU106 boards by Xilinx, based on the Zynq UltraScale+ MPSoC (aka +This document describes the Buildroot support for the ZCU102, ZCU104 +and ZCU106 boards by Xilinx, based on the Zynq UltraScale+ MPSoC (aka ZynqMP). It has been tested with the ZCU102 and ZCU106 production boards. @@ -12,6 +12,9 @@ Evaluation board features can be found here with the links below. ZCU102: https://www.xilinx.com/products/boards-and-kits/zcu102.html +ZCU104: +https://www.xilinx.com/products/boards-and-kits/zcu104.html + ZCU106: https://www.xilinx.com/products/boards-and-kits/zcu106.html @@ -19,8 +22,10 @@ https://www.xilinx.com/products/boards-and-kits/zcu106.html How to build it =============== -Configure Buildroot: +Configure Buildroot: (use the command for the specific board) + $ make zynqmp_zcu102_defconfig + $ make zynqmp_zcu104_defconfig $ make zynqmp_zcu106_defconfig Compile everything and build the rootfs image: @@ -59,3 +64,29 @@ card: Where 'sdX' is the device node of the SD. Eject the SD card, insert it in the board, and power it up. + +============== +Important Note +============== + +The DDR memory on the original ZCU102 and ZCU106 boards is EOL. +The Buildroot defconfigs for these boards use the new DDR memory +which is configured by the u-boot spl initialization with the +Buildroot config options below. + +New DDR Memories: +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu102-rev1.0" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu106-rev1.0" + +If nothing is printing upon boot, most likely it is because the +board has the original DDR memories. To fix the problem, modify +the Buildroot defconfig file to use the u-boot spl initialization +for the original DDR memory using the config below for the target +board. + +Original DDR Memories: +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu102-revA" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu106-revA" + +For more information on this issue: +https://support.xilinx.com/s/article/71961?language=en_US diff --git a/buildroot/board/zynqmp/zcu102/pm_cfg_obj.c b/buildroot/board/zynqmp/zcu102/pm_cfg_obj.c index 68557c4cb4..04bfb16e35 100644 --- a/buildroot/board/zynqmp/zcu102/pm_cfg_obj.c +++ b/buildroot/board/zynqmp/zcu102/pm_cfg_obj.c @@ -30,6 +30,9 @@ #define SUSPEND_TIMEOUT 0xFFFFFFFFU +#define PM_CONFIG_OBJECT_TYPE_BASE 0x1U + + #define PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK 0x00000001 #define PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK 0x00000100 #define PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK 0x00000200 @@ -51,7 +54,7 @@ __root const u32 XPm_ConfigObject[] = /* HEADER */ 2, /* Number of remaining words in the header */ 8, /* Number of sections included in config object */ - 1U, /* Type of config object as base */ + PM_CONFIG_OBJECT_TYPE_BASE, /* Type of config object as base */ /**********************************************************************/ /* MASTER SECTION */ PM_CONFIG_MASTER_SECTION_ID, /* Master SectionID */ @@ -81,7 +84,7 @@ __root const u32 XPm_ConfigObject[] = PM_CONFIG_SLAVE_SECTION_ID, /* Section ID */ - 49, /* Number of slaves */ + 38, /* Number of slaves */ NODE_OCM_BANK_0, PM_SLAVE_FLAG_IS_SHAREABLE, @@ -131,10 +134,6 @@ __root const u32 XPm_ConfigObject[] = PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ - NODE_USB_1, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - NODE_TTC_0, PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ @@ -155,18 +154,6 @@ __root const u32 XPm_ConfigObject[] = PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ - NODE_ETH_0, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - - NODE_ETH_1, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - - NODE_ETH_2, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - NODE_ETH_3, PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ @@ -179,14 +166,6 @@ __root const u32 XPm_ConfigObject[] = PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ - NODE_SPI_0, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - - NODE_SPI_1, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - NODE_I2C_0, PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ @@ -195,10 +174,6 @@ __root const u32 XPm_ConfigObject[] = PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ - NODE_SD_0, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - NODE_SD_1, PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ @@ -215,10 +190,6 @@ __root const u32 XPm_ConfigObject[] = PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ - NODE_NAND, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - NODE_QSPI, PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ @@ -227,10 +198,6 @@ __root const u32 XPm_ConfigObject[] = PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ - NODE_CAN_0, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - NODE_CAN_1, PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ @@ -263,18 +230,10 @@ __root const u32 XPm_ConfigObject[] = PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ - NODE_PCAP, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - NODE_RTC, PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ - NODE_VCU, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - NODE_PL, PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ diff --git a/buildroot/board/zynqmp/zcu102/uboot.fragment b/buildroot/board/zynqmp/zcu102/uboot.fragment deleted file mode 100644 index 52d6d9dff8..0000000000 --- a/buildroot/board/zynqmp/zcu102/uboot.fragment +++ /dev/null @@ -1 +0,0 @@ -CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu102-rev1.0" diff --git a/buildroot/board/zynqmp/zcu104/pm_cfg_obj.c b/buildroot/board/zynqmp/zcu104/pm_cfg_obj.c new file mode 100644 index 0000000000..bd0b59cfc2 --- /dev/null +++ b/buildroot/board/zynqmp/zcu104/pm_cfg_obj.c @@ -0,0 +1,503 @@ +/****************************************************************************** +* Copyright (c) 2017 - 2021 Xilinx, Inc. All rights reserved. +* SPDX-License-Identifier: MIT +******************************************************************************/ + +#include "xil_types.h" +#include "pm_defs.h" + +#define PM_CONFIG_MASTER_SECTION_ID 0x101U +#define PM_CONFIG_SLAVE_SECTION_ID 0x102U +#define PM_CONFIG_PREALLOC_SECTION_ID 0x103U +#define PM_CONFIG_POWER_SECTION_ID 0x104U +#define PM_CONFIG_RESET_SECTION_ID 0x105U +#define PM_CONFIG_SHUTDOWN_SECTION_ID 0x106U +#define PM_CONFIG_SET_CONFIG_SECTION_ID 0x107U +#define PM_CONFIG_GPO_SECTION_ID 0x108U + +#define PM_SLAVE_FLAG_IS_SHAREABLE 0x1U +#define PM_MASTER_USING_SLAVE_MASK 0x2U + +#define PM_CONFIG_GPO1_MIO_PIN_34_MAP (1U << 10U) +#define PM_CONFIG_GPO1_MIO_PIN_35_MAP (1U << 11U) +#define PM_CONFIG_GPO1_MIO_PIN_36_MAP (1U << 12U) +#define PM_CONFIG_GPO1_MIO_PIN_37_MAP (1U << 13U) + +#define PM_CONFIG_GPO1_BIT_2_MASK (1U << 2U) +#define PM_CONFIG_GPO1_BIT_3_MASK (1U << 3U) +#define PM_CONFIG_GPO1_BIT_4_MASK (1U << 4U) +#define PM_CONFIG_GPO1_BIT_5_MASK (1U << 5U) + +#define SUSPEND_TIMEOUT 0xFFFFFFFFU + +#define PM_CONFIG_OBJECT_TYPE_BASE 0x1U + + +#define PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK 0x00000001 +#define PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK 0x00000100 +#define PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK 0x00000200 + + + +#if defined (__ICCARM__) +#pragma language=save +#pragma language=extended +#endif +#if defined (__GNUC__) + const u32 XPm_ConfigObject[] __attribute__((used, section(".sys_cfg_data"))) = +#elif defined (__ICCARM__) +#pragma location = ".sys_cfg_data" +__root const u32 XPm_ConfigObject[] = +#endif +{ + /**********************************************************************/ + /* HEADER */ + 2, /* Number of remaining words in the header */ + 8, /* Number of sections included in config object */ + PM_CONFIG_OBJECT_TYPE_BASE, /* Type of config object as base */ + /**********************************************************************/ + /* MASTER SECTION */ + PM_CONFIG_MASTER_SECTION_ID, /* Master SectionID */ + 3U, /* No. of Masters*/ + + NODE_APU, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_0, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_1, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Wake permissions */ + + + /**********************************************************************/ + /* SLAVE SECTION */ + + + PM_CONFIG_SLAVE_SECTION_ID, /* Section ID */ + 36, /* Number of slaves */ + + NODE_OCM_BANK_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_0_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_0_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_1_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_1_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_L2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU_PP_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU_PP_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_USB_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SATA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_ETH_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_UART_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_UART_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_I2C_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SD_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_DP, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GDMA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_ADMA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_QSPI, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPIO, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_CAN_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_EXTERN, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_DDR, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_IPI_APU, + 0U, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_0, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_1, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_RTC, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_PL, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + + /**********************************************************************/ + /* PREALLOC SECTION */ + + PM_CONFIG_PREALLOC_SECTION_ID, /* Preallaoc SectionID */ + 3U, /* No. of Masters*/ + + /* Prealloc for psu_cortexa53_0 */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, + 11, + NODE_DDR, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_L2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_3, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_SD_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_QSPI, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_PL, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_APU, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_0 */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + 3, + NODE_TCM_0_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_0_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_1 */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + 3, + NODE_TCM_1_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_1_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + + /**********************************************************************/ + /* POWER SECTION */ + + PM_CONFIG_POWER_SECTION_ID, /* Power Section ID */ + 4U, /* Number of power nodes */ + + NODE_APU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_RPU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_FPD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_PLD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + + /**********************************************************************/ + /* RESET SECTION */ + + PM_CONFIG_RESET_SECTION_ID, /* Reset Section ID */ + 120U, /* Number of resets */ + + XILPM_RESET_PCIE_CFG, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_BRIDGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_CTRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRF, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GDMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SATA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APU_L2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DDR, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SOFT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_QSPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_NAND, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ADMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOU_CC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TIMESTAMP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R50, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R51, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_AMBA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_OCM, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_PGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RTC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SYSMON, 0, + XILPM_RESET_AFI_FM6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_LPD_SWDT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_FPD, PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + XILPM_RESET_RPU_DBG1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_DBG0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_VPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_7, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_8, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_9, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_10, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_11, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_12, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_13, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_14, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_15, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_16, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_17, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_18, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_19, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_20, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_21, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_22, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_23, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_24, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_25, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_26, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_27, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_28, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_29, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_30, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_31, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_LS, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PS_ONLY, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_92, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_93, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_94, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_95, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + + /**********************************************************************/ + /* SET CONFIG SECTION */ + PM_CONFIG_SET_CONFIG_SECTION_ID, /* Set Config Section ID */ + 0U, /* Permissions to load base config object */ + 0U, /* Permissions to load overlay config object */ + + /**********************************************************************/ + /* SHUTDOWN SECTION */ + + PM_CONFIG_SHUTDOWN_SECTION_ID, /* Shutdown Section ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* System Shutdown/Restart Permission */ + + /**********************************************************************/ + /* GPO SECTION */ + PM_CONFIG_GPO_SECTION_ID, /* GPO Section ID */ + 0, /* State of GPO pins */ +}; +#if defined (__ICCARM__) +#pragma language=restore +#endif diff --git a/buildroot/board/zynqmp/zcu106/patches/uboot/0001-arm64-zynqmp-zynqmp-zcu102-revA-Fix-DP-PLL-configura.patch b/buildroot/board/zynqmp/zcu106/patches/uboot/0001-arm64-zynqmp-zynqmp-zcu102-revA-Fix-DP-PLL-configura.patch deleted file mode 100644 index 4281880da0..0000000000 --- a/buildroot/board/zynqmp/zcu106/patches/uboot/0001-arm64-zynqmp-zynqmp-zcu102-revA-Fix-DP-PLL-configura.patch +++ /dev/null @@ -1,40 +0,0 @@ -From aaaa10b613165b7790fe1c084de007240b5bd77a Mon Sep 17 00:00:00 2001 -From: Neal Frager -Date: Thu, 5 May 2022 13:34:43 +0100 -Subject: [PATCH 1/1] arm64: zynqmp: zynqmp-zcu102-revA: Fix DP PLL - configuration - -This patch fixes the DP audio and video PLL configurations -for the zynqmp-zcu106-revA evaluation board - -The Linux DP driver expects the DP to be using the following PLL config: - - DP video PLL should use the VPLL (0x0) - - DP audio PLL should use the RPLL (0x3) - -Register 0xFD1A0070 configures the DP video PLL. -Register 0xFD1A0074 configures the DP audio PLL. - -Signed-off-by: Neal Frager -Signed-off-by: Michal Simek ---- - board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -index 15f0be1a43..cbc436289f 100644 ---- a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -+++ b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -@@ -81,8 +81,8 @@ static unsigned long psu_clock_init_data(void) - psu_mask_write(0xFF5E0104, 0x00000007U, 0x00000000U); - psu_mask_write(0xFF5E0128, 0x01003F07U, 0x01000F00U); - psu_mask_write(0xFD1A00A0, 0x01003F07U, 0x01000200U); -- psu_mask_write(0xFD1A0070, 0x013F3F07U, 0x01010203U); -- psu_mask_write(0xFD1A0074, 0x013F3F07U, 0x01013C00U); -+ psu_mask_write(0xFD1A0070, 0x013F3F07U, 0x01010500U); -+ psu_mask_write(0xFD1A0074, 0x013F3F07U, 0x01013C03U); - psu_mask_write(0xFD1A007C, 0x013F3F07U, 0x01011303U); - psu_mask_write(0xFD1A0060, 0x03003F07U, 0x03000100U); - psu_mask_write(0xFD1A0068, 0x01003F07U, 0x01000200U); --- -2.17.1 - diff --git a/buildroot/board/zynqmp/zcu106/pm_cfg_obj.c b/buildroot/board/zynqmp/zcu106/pm_cfg_obj.c index 6d15d510e9..54a1afa902 100644 --- a/buildroot/board/zynqmp/zcu106/pm_cfg_obj.c +++ b/buildroot/board/zynqmp/zcu106/pm_cfg_obj.c @@ -30,6 +30,9 @@ #define SUSPEND_TIMEOUT 0xFFFFFFFFU +#define PM_CONFIG_OBJECT_TYPE_BASE 0x1U + + #define PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK 0x00000001 #define PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK 0x00000100 #define PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK 0x00000200 @@ -51,7 +54,7 @@ __root const u32 XPm_ConfigObject[] = /* HEADER */ 2, /* Number of remaining words in the header */ 8, /* Number of sections included in config object */ - 1U, /* Type of config object as base */ + PM_CONFIG_OBJECT_TYPE_BASE, /* Type of config object as base */ /**********************************************************************/ /* MASTER SECTION */ PM_CONFIG_MASTER_SECTION_ID, /* Master SectionID */ @@ -81,7 +84,7 @@ __root const u32 XPm_ConfigObject[] = PM_CONFIG_SLAVE_SECTION_ID, /* Section ID */ - 49, /* Number of slaves */ + 38, /* Number of slaves */ NODE_OCM_BANK_0, PM_SLAVE_FLAG_IS_SHAREABLE, @@ -131,10 +134,6 @@ __root const u32 XPm_ConfigObject[] = PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ - NODE_USB_1, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - NODE_TTC_0, PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ @@ -155,18 +154,6 @@ __root const u32 XPm_ConfigObject[] = PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ - NODE_ETH_0, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - - NODE_ETH_1, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - - NODE_ETH_2, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - NODE_ETH_3, PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ @@ -179,14 +166,6 @@ __root const u32 XPm_ConfigObject[] = PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ - NODE_SPI_0, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - - NODE_SPI_1, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - NODE_I2C_0, PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ @@ -195,10 +174,6 @@ __root const u32 XPm_ConfigObject[] = PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ - NODE_SD_0, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - NODE_SD_1, PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ @@ -215,10 +190,6 @@ __root const u32 XPm_ConfigObject[] = PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ - NODE_NAND, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - NODE_QSPI, PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ @@ -227,10 +198,6 @@ __root const u32 XPm_ConfigObject[] = PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ - NODE_CAN_0, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - NODE_CAN_1, PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ @@ -259,14 +226,6 @@ __root const u32 XPm_ConfigObject[] = PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ - NODE_PCIE, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - - NODE_PCAP, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - NODE_RTC, PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ diff --git a/buildroot/board/zynqmp/zcu106/uboot.fragment b/buildroot/board/zynqmp/zcu106/uboot.fragment deleted file mode 100644 index cd571171ac..0000000000 --- a/buildroot/board/zynqmp/zcu106/uboot.fragment +++ /dev/null @@ -1 +0,0 @@ -CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu106-revA" diff --git a/buildroot/boot/Config.in b/buildroot/boot/Config.in index 40472ae07d..5c8d0e7ee5 100644 --- a/buildroot/boot/Config.in +++ b/buildroot/boot/Config.in @@ -1,28 +1,24 @@ menu "Bootloaders" source "boot/afboot-stm32/Config.in" -source "boot/at91bootstrap/Config.in" source "boot/at91bootstrap3/Config.in" -source "boot/at91dataflashboot/Config.in" source "boot/arm-trusted-firmware/Config.in" source "boot/barebox/Config.in" -source "boot/beaglev-ddrinit/Config.in" -source "boot/beaglev-secondboot/Config.in" source "boot/binaries-marvell/Config.in" source "boot/boot-wrapper-aarch64/Config.in" source "boot/edk2/Config.in" source "boot/grub2/Config.in" -source "boot/gummiboot/Config.in" -source "boot/lpc32xxcdl/Config.in" source "boot/mv-ddr-marvell/Config.in" source "boot/mxs-bootlets/Config.in" source "boot/optee-os/Config.in" source "boot/opensbi/Config.in" source "boot/s500-bootloader/Config.in" source "boot/shim/Config.in" -source "boot/sun20i-d1-spl/Config.in" source "boot/syslinux/Config.in" +source "boot/ti-k3-boot-firmware/Config.in" +source "boot/ti-k3-r5-loader/Config.in" source "boot/uboot/Config.in" source "boot/vexpress-firmware/Config.in" +source "boot/xilinx-prebuilt/Config.in" endmenu diff --git a/buildroot/boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch b/buildroot/boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch new file mode 100644 index 0000000000..27a81b45d5 --- /dev/null +++ b/buildroot/boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch @@ -0,0 +1,36 @@ +From d65b07d6fe438e760fdbc33a8e42650a27d5b417 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 31 Dec 2022 11:09:38 +0100 +Subject: [PATCH] Makefile: disable stack-protector + +Disable stack-protector to avoid the following build failure: + +/home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld -T stm32f429.lds --gc-sections -o stm32f469i-disco.elf stm32f469i-disco.o gpio.o mpu.o qspi.o start_kernel.o usart-f4.o +/home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.o: in function `main': +stm32f469i-disco.c:(.text.startup.main+0x3b0): undefined reference to `__stack_chk_guard' +/home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.c:(.text.startup.main+0x4c0): undefined reference to `__stack_chk_fail' +/home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.c:(.text.startup.main+0x4ec): undefined reference to `__stack_chk_guard' + +Fixes: + - http://autobuild.buildroot.org/results/fa6ffab24c3998f21034ab24e8d2852cacde08c1 + +Signed-off-by: Fabrice Fontaine +--- + Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile b/Makefile +index 8f42be1..8da7a25 100644 +--- a/Makefile ++++ b/Makefile +@@ -14,6 +14,7 @@ CFLAGS := -mthumb -mcpu=cortex-m4 + CFLAGS += -ffunction-sections -fdata-sections + CFLAGS += -Os -std=gnu99 -Wall + CFLAGS += -fno-builtin ++CFLAGS += -fno-stack-protector + LINKERFLAGS := --gc-sections + + obj-y += gpio.o mpu.o qspi.o start_kernel.o +-- +2.35.1 + diff --git a/buildroot/boot/arm-trusted-firmware/Config.in b/buildroot/boot/arm-trusted-firmware/Config.in index b1fc03e10b..5ba4e08370 100644 --- a/buildroot/boot/arm-trusted-firmware/Config.in +++ b/buildroot/boot/arm-trusted-firmware/Config.in @@ -1,7 +1,6 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE bool "ARM Trusted Firmware (ATF)" - depends on (BR2_ARM_CPU_ARMV8A || BR2_ARM_CPU_ARMV7A) && \ - (BR2_TARGET_UBOOT || BR2_TARGET_EDK2) + depends on (BR2_ARM_CPU_ARMV8A || BR2_ARM_CPU_ARMV7A) help Enable this option if you want to build the ATF for your ARM based embedded device. @@ -15,7 +14,17 @@ choice Select the specific ATF version you want to use config BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION - bool "v2.5" + bool "v2.11" + +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_10_VERSION + bool "latest lts-v2.10.x" + help + Select the latest LTS v2.10.x version available + +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_8_VERSION + bool "latest lts-v2.8.x" + help + Select the latest LTS v2.8.x version available config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION bool "Custom version" @@ -43,7 +52,9 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE config BR2_TARGET_ARM_TRUSTED_FIRMWARE_VERSION string - default "v2.5" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION + default "v2.11" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION + default "lts-v2.10.5" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_10_VERSION + default "lts-v2.8.20" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_8_VERSION default "custom" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL default BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION \ if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT @@ -66,7 +77,13 @@ endif config BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM string "ATF platform" help - Target plaform to build for. + Target platform to build for. + +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD + string "ATF target board" + help + Target board to build for. In many cases, this can be left + empty. config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_DTS_PATH string "Device Tree Source file paths" @@ -124,8 +141,27 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE endchoice +choice + prompt "BL33" + default BR2_TARGET_ARM_TRUSTED_FIRMWARE_NONE_AS_BL33 + help + Select the image to include as BL33. + +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_NONE_AS_BL33 + bool "None" + +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_AS_BL33 + bool "Barebox" + depends on BR2_TARGET_BAREBOX + help + This option allows to embed the Barebox generic BL33 image in + the ARM Trusted Firmware. It ensures that the Barebox package + gets built before ATF, and that the appropriate BL33 + variable pointing to the generic bl33 image is passed + when building ATF. + config BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33 - bool "Use U-Boot as BL33" + bool "U-Boot" depends on BR2_TARGET_UBOOT help This option allows to embed u-boot.bin as the BL33 part of @@ -133,6 +169,32 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33 gets built before ATF, and that the appropriate BL33 variable pointing to u-boot.bin is passed when building ATF. +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_EDK2_AS_BL33 + bool "EDK2" + depends on BR2_TARGET_EDK2 + help + This option allows to embed EDK2 as the BL33 part of + the ARM Trusted Firmware. It ensures that the EDK2 package + gets built before ATF, and that the appropriate BL33 + variable pointing to the EDK2 is passed when building ATF. + + Do not choose this option if you intend to build ATF and EDK2 + for the 'qemu_sbsa' platform. In this case, due to the EDK2 + build system, the dependency between ATF and EDK is reversed. + +endchoice + +if BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_AS_BL33 + +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_BL33_IMAGE + string "Barebox BL33 image name" + default "*-generic-bl33.img" + help + Name of the Barebox BL33 image to include in ATF, it must + have been installed to BINARIES_DIR by the Barebox package. + +endif + if BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33 config BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE @@ -144,18 +206,13 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE endif -config BR2_TARGET_ARM_TRUSTED_FIRMWARE_EDK2_AS_BL33 - bool "Use EDK2 as BL33" - depends on BR2_TARGET_EDK2 +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_RCW + bool "Include NXP RCW in BL2" + depends on BR2_PACKAGE_HOST_QORIQ_RCW help - This option allows to embed EDK2 as the BL33 part of - the ARM Trusted Firmware. It ensures that the EDK2 package - gets built before ATF, and that the appropriate BL33 - variable pointing to the EDK2 is passed when building ATF. - - Do not choose this option if you intend to build ATF and EDK2 - for the 'qemu_sbsa' platform. In this case, due to the EDK2 - build system, the dependency between ATF and EDK is reversed. + Include the NXP RCW (Reset Control Word) in BL2. See + package/qoriq-rcw/ for more details. This is mostly useful + on NXP LayerScape platforms. config BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_TARGETS string "Additional ATF make targets" @@ -199,7 +256,6 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN config BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP bool "Build with SSP" - default y depends on BR2_TOOLCHAIN_HAS_SSP depends on !BR2_SSP_NONE help @@ -213,10 +269,6 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP config BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP_LEVEL string - # While newer versions of TF-A support "none" as - # ENABLE_STACK_PROTECTOR value, older versions (e.g 2.0) only - # supported "0" to disable SSP. - default "0" if !BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP default "default" if BR2_SSP_REGULAR default "strong" if BR2_SSP_STRONG default "all" if BR2_SSP_ALL diff --git a/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.hash b/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.hash deleted file mode 100644 index 80402ec374..0000000000 --- a/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 d12a824afcc5cb90d005f9820f3274f1319cef1bb282e40a6a190b75900206d3 arm-trusted-firmware-v2.5.tar.gz -sha256 0171b0795501ee90634fbc4a7835e2fb215d9423daf1cf5b0d0682adde12c597 docs/license.rst diff --git a/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.mk index 1ac645c793..172a930b5c 100644 --- a/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -6,7 +6,7 @@ ARM_TRUSTED_FIRMWARE_VERSION = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_VERSION)) -ifeq ($(ARM_TRUSTED_FIRMWARE_VERSION),custom) +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL),y) # Handle custom ATF tarballs as specified by the configuration ARM_TRUSTED_FIRMWARE_TARBALL = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION)) ARM_TRUSTED_FIRMWARE_SITE = $(patsubst %/,%,$(dir $(ARM_TRUSTED_FIRMWARE_TARBALL))) @@ -16,16 +16,17 @@ ARM_TRUSTED_FIRMWARE_SITE = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUST ARM_TRUSTED_FIRMWARE_SITE_METHOD = git else # Handle stable official ATF versions -ARM_TRUSTED_FIRMWARE_SITE = $(call github,ARM-software,arm-trusted-firmware,$(ARM_TRUSTED_FIRMWARE_VERSION)) +ARM_TRUSTED_FIRMWARE_SITE = https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git +ARM_TRUSTED_FIRMWARE_SITE_METHOD = git # The licensing of custom or from-git versions is unknown. # This is valid only for the latest (i.e. known) version. -ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION),y) +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_10_VERSION)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_8_VERSION),y) ARM_TRUSTED_FIRMWARE_LICENSE = BSD-3-Clause ARM_TRUSTED_FIRMWARE_LICENSE_FILES = docs/license.rst endif endif -ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION),y) +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE):$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT),y:y) BR_NO_CHECK_HASH_FOR += $(ARM_TRUSTED_FIRMWARE_SOURCE) endif @@ -36,27 +37,53 @@ ARM_TRUSTED_FIRMWARE_DEPENDENCIES += host-dtc endif ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN),y) -ARM_TRUSTED_FIRMWARE_DEPENDENCIES += host-arm-gnu-a-toolchain +ARM_TRUSTED_FIRMWARE_DEPENDENCIES += host-arm-gnu-toolchain endif ARM_TRUSTED_FIRMWARE_PLATFORM = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM)) +ARM_TRUSTED_FIRMWARE_TARGET_BOARD = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD)) + ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_DEBUG),y) ARM_TRUSTED_FIRMWARE_MAKE_OPTS += DEBUG=1 +ifneq ($(ARM_TRUSTED_FIRMWARE_TARGET_BOARD),) +ARM_TRUSTED_FIRMWARE_IMG_DIR = $(@D)/build/$(ARM_TRUSTED_FIRMWARE_PLATFORM)/$(ARM_TRUSTED_FIRMWARE_TARGET_BOARD)/debug +else ARM_TRUSTED_FIRMWARE_IMG_DIR = $(@D)/build/$(ARM_TRUSTED_FIRMWARE_PLATFORM)/debug +endif +else +ifneq ($(ARM_TRUSTED_FIRMWARE_TARGET_BOARD),) +ARM_TRUSTED_FIRMWARE_IMG_DIR = $(@D)/build/$(ARM_TRUSTED_FIRMWARE_PLATFORM)/$(ARM_TRUSTED_FIRMWARE_TARGET_BOARD)/release else ARM_TRUSTED_FIRMWARE_IMG_DIR = $(@D)/build/$(ARM_TRUSTED_FIRMWARE_PLATFORM)/release endif +endif ARM_TRUSTED_FIRMWARE_MAKE_OPTS += \ + $(if $(VERBOSE),V=1) \ CROSS_COMPILE="$(TARGET_CROSS)" \ - $(if $(BR2_PIC_PIE),CFLAGS="-fno-PIE") \ + BUILD_STRING=$(ARM_TRUSTED_FIRMWARE_VERSION) \ $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES)) \ - PLAT=$(ARM_TRUSTED_FIRMWARE_PLATFORM) + PLAT=$(ARM_TRUSTED_FIRMWARE_PLATFORM) \ + TARGET_BOARD=$(ARM_TRUSTED_FIRMWARE_TARGET_BOARD) \ + HOSTCC="$(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS)" + +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP),y) +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += \ + ENABLE_STACK_PROTECTOR=$(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP_LEVEL)) +else +ARM_TRUSTED_FIRMWARE_CFLAGS += -fno-stack-protector +endif + +ifeq ($(BR2_PIC_PIE),y) +ARM_TRUSTED_FIRMWARE_CFLAGS += -fno-PIE +ARM_TRUSTED_FIRMWARE_LDFLAGS += -no-pie +endif ARM_TRUSTED_FIRMWARE_MAKE_ENV += \ $(TARGET_MAKE_ENV) \ - ENABLE_STACK_PROTECTOR=$(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP_LEVEL)) + CFLAGS="$(ARM_TRUSTED_FIRMWARE_CFLAGS)" \ + LDFLAGS="$(ARM_TRUSTED_FIRMWARE_LDFLAGS)" ifeq ($(BR2_ARM_CPU_ARMV7A),y) ARM_TRUSTED_FIRMWARE_MAKE_OPTS += ARM_ARCH_MAJOR=7 @@ -84,6 +111,12 @@ ARM_TRUSTED_FIRMWARE_MAKE_OPTS += AARCH32_SP=optee endif endif # BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_AS_BL33),y) +ARM_TRUSTED_FIRMWARE_BAREBOX_BIN = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_BL33_IMAGE)) +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += BL33=$(BINARIES_DIR)/$(ARM_TRUSTED_FIRMWARE_BAREBOX_BIN) +ARM_TRUSTED_FIRMWARE_DEPENDENCIES += barebox +endif + ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_EDK2_AS_BL33),y) ARM_TRUSTED_FIRMWARE_DEPENDENCIES += edk2 # Since the flash device name vary between platforms, we use the variable @@ -119,18 +152,12 @@ ARM_TRUSTED_FIRMWARE_MAKE_TARGETS = all ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP),y) ARM_TRUSTED_FIRMWARE_MAKE_TARGETS += fip ARM_TRUSTED_FIRMWARE_DEPENDENCIES += host-openssl -# fiptool only exists in newer (>= 1.3) versions of ATF, so we build -# it conditionally. We need to explicitly build it as it requires -# OpenSSL, and therefore needs to be passed proper variables to find -# the host OpenSSL. -define ARM_TRUSTED_FIRMWARE_BUILD_FIPTOOL - if test -d $(@D)/tools/fiptool; then \ - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/tools/fiptool \ - $(ARM_TRUSTED_FIRMWARE_MAKE_OPTS) \ - CPPFLAGS="$(HOST_CPPFLAGS)" \ - LDLIBS="$(HOST_LDFLAGS) -lcrypto" ; \ - fi -endef +endif + +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_RCW),y) +ARM_TRUSTED_FIRMWARE_DEPENDENCIES += host-qoriq-rcw +ARM_TRUSTED_FIRMWARE_MAKE_TARGETS += pbl +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += RCW=$(BINARIES_DIR)/PBL.bin endif ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31),y) @@ -172,7 +199,6 @@ define ARM_TRUSTED_FIRMWARE_BUILD_CMDS $(if $(ARM_TRUSTED_FIRMWARE_CUSTOM_DTS_PATH), cp -f $(ARM_TRUSTED_FIRMWARE_CUSTOM_DTS_PATH) $(@D)/fdts/ ) - $(ARM_TRUSTED_FIRMWARE_BUILD_FIPTOOL) $(ARM_TRUSTED_FIRMWARE_MAKE_ENV) $(MAKE) -C $(@D) \ $(ARM_TRUSTED_FIRMWARE_MAKE_OPTS) \ $(ARM_TRUSTED_FIRMWARE_MAKE_TARGETS) @@ -190,7 +216,7 @@ endef # Configuration check ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE)$(BR_BUILDING),yy) -ifeq ($(ARM_TRUSTED_FIRMWARE_VERSION),custom) +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL),y) ifeq ($(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION)),) $(error No tarball location specified. Please check BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION) endif diff --git a/buildroot/boot/arm-trusted-firmware/lts-v2.10.5/arm-trusted-firmware.hash b/buildroot/boot/arm-trusted-firmware/lts-v2.10.5/arm-trusted-firmware.hash new file mode 100644 index 0000000000..6657337118 --- /dev/null +++ b/buildroot/boot/arm-trusted-firmware/lts-v2.10.5/arm-trusted-firmware.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 62af6f1f2e9406d761ace03025f6bf22a0670578b1d0b76092dc1db455746dad arm-trusted-firmware-lts-v2.10.5-git4.tar.gz +sha256 130d0c6e5159fa454b1e969fd281fa1d388819aefb203f65dd282544b5ab7ba9 docs/license.rst diff --git a/buildroot/boot/arm-trusted-firmware/lts-v2.8.20/0001-build-tools-avoid-unnecessary-link.patch b/buildroot/boot/arm-trusted-firmware/lts-v2.8.20/0001-build-tools-avoid-unnecessary-link.patch new file mode 100644 index 0000000000..9e0ea74248 --- /dev/null +++ b/buildroot/boot/arm-trusted-firmware/lts-v2.8.20/0001-build-tools-avoid-unnecessary-link.patch @@ -0,0 +1,77 @@ +From aa57ce632c629fe72ff417e261e0f5bfd8db6bab Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= +Date: Tue, 4 Jul 2023 16:14:02 +0200 +Subject: [PATCH] build(tools): avoid unnecessary link +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +In their respective makefiles, cert_create, encrypt_fw and fiptool +depend on the --openssl phony target as a prerequisite. This forces +those tools to be re-linked each time. + +Move the dependencies on the --openssl target from the tools to their +makefiles all targets, to avoid unnecessary linking while preserving the +OpenSSL version printing done in the --openssl targets when in debug. + +Fixes: cf2dd17ddda2 ("refactor(security): add OpenSSL 1.x compatibility") +Signed-off-by: Vincent Stehlé +Change-Id: I98a3ab30f36dffc253cecaaf3a57d2712522135d +Upstream: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/commit/?id=aa57ce632c629fe72ff417e261e0f5bfd8db6bab +--- + tools/cert_create/Makefile | 4 ++-- + tools/encrypt_fw/Makefile | 4 ++-- + tools/fiptool/Makefile | 4 ++-- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/tools/cert_create/Makefile b/tools/cert_create/Makefile +index 042e844626..b911d19d2b 100644 +--- a/tools/cert_create/Makefile ++++ b/tools/cert_create/Makefile +@@ -85,9 +85,9 @@ HOSTCC ?= gcc + + .PHONY: all clean realclean --openssl + +-all: ${BINARY} ++all: --openssl ${BINARY} + +-${BINARY}: --openssl ${OBJECTS} Makefile ++${BINARY}: ${OBJECTS} Makefile + @echo " HOSTLD $@" + @echo 'const char build_msg[] = "Built : "__TIME__", "__DATE__; \ + const char platform_msg[] = "${PLAT_MSG}";' | \ +diff --git a/tools/encrypt_fw/Makefile b/tools/encrypt_fw/Makefile +index 2939b142be..924e5febab 100644 +--- a/tools/encrypt_fw/Makefile ++++ b/tools/encrypt_fw/Makefile +@@ -65,9 +65,9 @@ HOSTCC ?= gcc + + .PHONY: all clean realclean --openssl + +-all: ${BINARY} ++all: --openssl ${BINARY} + +-${BINARY}: --openssl ${OBJECTS} Makefile ++${BINARY}: ${OBJECTS} Makefile + @echo " HOSTLD $@" + @echo 'const char build_msg[] = "Built : "__TIME__", "__DATE__;' | \ + ${HOSTCC} -c ${HOSTCCFLAGS} -xc - -o src/build_msg.o +diff --git a/tools/fiptool/Makefile b/tools/fiptool/Makefile +index 2ebee33931..4bdebd9235 100644 +--- a/tools/fiptool/Makefile ++++ b/tools/fiptool/Makefile +@@ -68,9 +68,9 @@ DEPS := $(patsubst %.o,%.d,$(OBJECTS)) + + .PHONY: all clean distclean --openssl + +-all: ${PROJECT} ++all: --openssl ${PROJECT} + +-${PROJECT}: --openssl ${OBJECTS} Makefile ++${PROJECT}: ${OBJECTS} Makefile + @echo " HOSTLD $@" + ${Q}${HOSTCC} ${OBJECTS} -o $@ ${LDLIBS} + @${ECHO_BLANK_LINE} +-- +2.25.1 + diff --git a/buildroot/boot/arm-trusted-firmware/lts-v2.8.20/arm-trusted-firmware.hash b/buildroot/boot/arm-trusted-firmware/lts-v2.8.20/arm-trusted-firmware.hash new file mode 100644 index 0000000000..6368bf7f98 --- /dev/null +++ b/buildroot/boot/arm-trusted-firmware/lts-v2.8.20/arm-trusted-firmware.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 a90617cc2c1791c98d36b9e3d9a7f3f77029897e00c4279ff4ef559b769e9d7b arm-trusted-firmware-lts-v2.8.20-git4.tar.gz +sha256 130d0c6e5159fa454b1e969fd281fa1d388819aefb203f65dd282544b5ab7ba9 docs/license.rst diff --git a/buildroot/boot/arm-trusted-firmware/v2.11/arm-trusted-firmware.hash b/buildroot/boot/arm-trusted-firmware/v2.11/arm-trusted-firmware.hash new file mode 100644 index 0000000000..984978dc11 --- /dev/null +++ b/buildroot/boot/arm-trusted-firmware/v2.11/arm-trusted-firmware.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 c0f23ccc71c49989e9ad238acf334473c17b7c88f79a20c829c3d443e3794a22 arm-trusted-firmware-v2.11-git4.tar.gz +sha256 03d5088ff4fbfe989f3c807117356191c263cf27d62ee6916bde8532611728ed docs/license.rst diff --git a/buildroot/boot/arm-trusted-firmware/v2.2/0001-PATCH-feat-build-add-support-for-new-binutils-versio.patch b/buildroot/boot/arm-trusted-firmware/v2.2/0001-PATCH-feat-build-add-support-for-new-binutils-versio.patch new file mode 100644 index 0000000000..d4d2b068f3 --- /dev/null +++ b/buildroot/boot/arm-trusted-firmware/v2.2/0001-PATCH-feat-build-add-support-for-new-binutils-versio.patch @@ -0,0 +1,59 @@ +From 5e1beb793c06352e87c46eca1144ff1fe8555103 Mon Sep 17 00:00:00 2001 +From: Heiko Thiery +Date: Mon, 10 Jul 2023 10:43:03 +0200 +Subject: [PATCH] [PATCH] feat(build): add support for new binutils versions + +Users of GNU ld (BPF) from binutils 2.39+ will observe multiple instaces +of a new warning when linking the bl*.elf in the form: + + ld.bfd: warning: stm32mp1_helper.o: missing .note.GNU-stack section implies executable stack + ld.bfd: NOTE: This behaviour is deprecated and will be removed in a future version of the linker + ld.bfd: warning: bl2.elf has a LOAD segment with RWX permissions + ld.bfd: warning: bl32.elf has a LOAD segment with RWX permissions + +These new warnings are enbaled by default to secure elf binaries: + - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=ba951afb99912da01a6e8434126b8fac7aa75107 + - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=0d38576a34ec64a1b4500c9277a8e9d0f07e6774 + +Fix it in a similar way to what the Linux kernel does, see: +https://lore.kernel.org/all/20220810222442.2296651-1-ndesaulniers@google.com/ + +Following the reasoning there, we set "-z noexecstack" for all linkers +(although LLVM's LLD defaults to it) and optional add +--no-warn-rwx-segments since this a ld.bfd related. + +Signed-off-by: Marco Felsch +Signed-off-by: Robert Schwebel +Change-Id: I9430f5fa5036ca88da46cd3b945754d62616b617 + +Signed-off-by: Heiko Thiery +Upstream: https://github.com/ARM-software/arm-trusted-firmware/commit/1f49db5f25cdd4e43825c9bcc0575070b80f628c +--- + Makefile | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 721246d51..5893cf422 100644 +--- a/Makefile ++++ b/Makefile +@@ -297,11 +297,16 @@ endif + + GCC_V_OUTPUT := $(shell $(CC) -v 2>&1) + ++TF_LDFLAGS += -z noexecstack ++ + ifneq ($(findstring armlink,$(notdir $(LD))),) + TF_LDFLAGS += --diag_error=warning --lto_level=O1 + TF_LDFLAGS += --remove --info=unused,unusedsymbols + else +-TF_LDFLAGS += --fatal-warnings -O1 ++# With ld.bfd version 2.39 and newer new warnings are added. Skip those since we ++# are not loaded by a elf loader. ++TF_LDFLAGS += $(call ld_option, --no-warn-rwx-segments) ++TF_LDFLAGS += -O1 + TF_LDFLAGS += --gc-sections + endif + TF_LDFLAGS += $(TF_LDFLAGS_$(ARCH)) +-- +2.30.2 + diff --git a/buildroot/boot/arm-trusted-firmware/v2.3/0001-feat-build-add-support-for-new-binutils-versions.patch b/buildroot/boot/arm-trusted-firmware/v2.3/0001-feat-build-add-support-for-new-binutils-versions.patch new file mode 100644 index 0000000000..335c18553a --- /dev/null +++ b/buildroot/boot/arm-trusted-firmware/v2.3/0001-feat-build-add-support-for-new-binutils-versions.patch @@ -0,0 +1,61 @@ +From 0f75b03c008eacb9818af3a56dc088e72a623d17 Mon Sep 17 00:00:00 2001 +From: Marco Felsch +Date: Wed, 9 Nov 2022 12:59:09 +0100 +Subject: [PATCH] feat(build): add support for new binutils versions + +Users of GNU ld (BPF) from binutils 2.39+ will observe multiple instaces +of a new warning when linking the bl*.elf in the form: + + ld.bfd: warning: stm32mp1_helper.o: missing .note.GNU-stack section implies executable stack + ld.bfd: NOTE: This behaviour is deprecated and will be removed in a future version of the linker + ld.bfd: warning: bl2.elf has a LOAD segment with RWX permissions + ld.bfd: warning: bl32.elf has a LOAD segment with RWX permissions + +These new warnings are enbaled by default to secure elf binaries: + - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=ba951afb99912da01a6e8434126b8fac7aa75107 + - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=0d38576a34ec64a1b4500c9277a8e9d0f07e6774 + +Fix it in a similar way to what the Linux kernel does, see: +https://lore.kernel.org/all/20220810222442.2296651-1-ndesaulniers@google.com/ + +Following the reasoning there, we set "-z noexecstack" for all linkers +(although LLVM's LLD defaults to it) and optional add +--no-warn-rwx-segments since this a ld.bfd related. + +Signed-off-by: Marco Felsch +Signed-off-by: Robert Schwebel +Change-Id: I9430f5fa5036ca88da46cd3b945754d62616b617 +Signed-off-by: Heiko Thiery +Upstream: https://github.com/ARM-software/arm-trusted-firmware/commit/1f49db5f25cdd4e43825c9bcc0575070b80f628c +--- + Makefile | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 1ddb7b844..470956b19 100644 +--- a/Makefile ++++ b/Makefile +@@ -416,6 +416,8 @@ endif + + GCC_V_OUTPUT := $(shell $(CC) -v 2>&1) + ++TF_LDFLAGS += -z noexecstack ++ + # LD = armlink + ifneq ($(findstring armlink,$(notdir $(LD))),) + TF_LDFLAGS += --diag_error=warning --lto_level=O1 +@@ -442,7 +444,10 @@ TF_LDFLAGS += $(subst --,-Xlinker --,$(TF_LDFLAGS_$(ARCH))) + + # LD = gcc-ld (ld) or llvm-ld (ld.lld) or other + else +-TF_LDFLAGS += --fatal-warnings -O1 ++# With ld.bfd version 2.39 and newer new warnings are added. Skip those since we ++# are not loaded by a elf loader. ++TF_LDFLAGS += $(call ld_option, --no-warn-rwx-segments) ++TF_LDFLAGS += -O1 + TF_LDFLAGS += --gc-sections + # ld.lld doesn't recognize the errata flags, + # therefore don't add those in that case +-- +2.30.2 + diff --git a/buildroot/boot/arm-trusted-firmware/v2.4/0001-feat-build-add-support-for-new-binutils-versions.patch b/buildroot/boot/arm-trusted-firmware/v2.4/0001-feat-build-add-support-for-new-binutils-versions.patch new file mode 100644 index 0000000000..335c18553a --- /dev/null +++ b/buildroot/boot/arm-trusted-firmware/v2.4/0001-feat-build-add-support-for-new-binutils-versions.patch @@ -0,0 +1,61 @@ +From 0f75b03c008eacb9818af3a56dc088e72a623d17 Mon Sep 17 00:00:00 2001 +From: Marco Felsch +Date: Wed, 9 Nov 2022 12:59:09 +0100 +Subject: [PATCH] feat(build): add support for new binutils versions + +Users of GNU ld (BPF) from binutils 2.39+ will observe multiple instaces +of a new warning when linking the bl*.elf in the form: + + ld.bfd: warning: stm32mp1_helper.o: missing .note.GNU-stack section implies executable stack + ld.bfd: NOTE: This behaviour is deprecated and will be removed in a future version of the linker + ld.bfd: warning: bl2.elf has a LOAD segment with RWX permissions + ld.bfd: warning: bl32.elf has a LOAD segment with RWX permissions + +These new warnings are enbaled by default to secure elf binaries: + - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=ba951afb99912da01a6e8434126b8fac7aa75107 + - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=0d38576a34ec64a1b4500c9277a8e9d0f07e6774 + +Fix it in a similar way to what the Linux kernel does, see: +https://lore.kernel.org/all/20220810222442.2296651-1-ndesaulniers@google.com/ + +Following the reasoning there, we set "-z noexecstack" for all linkers +(although LLVM's LLD defaults to it) and optional add +--no-warn-rwx-segments since this a ld.bfd related. + +Signed-off-by: Marco Felsch +Signed-off-by: Robert Schwebel +Change-Id: I9430f5fa5036ca88da46cd3b945754d62616b617 +Signed-off-by: Heiko Thiery +Upstream: https://github.com/ARM-software/arm-trusted-firmware/commit/1f49db5f25cdd4e43825c9bcc0575070b80f628c +--- + Makefile | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 1ddb7b844..470956b19 100644 +--- a/Makefile ++++ b/Makefile +@@ -416,6 +416,8 @@ endif + + GCC_V_OUTPUT := $(shell $(CC) -v 2>&1) + ++TF_LDFLAGS += -z noexecstack ++ + # LD = armlink + ifneq ($(findstring armlink,$(notdir $(LD))),) + TF_LDFLAGS += --diag_error=warning --lto_level=O1 +@@ -442,7 +444,10 @@ TF_LDFLAGS += $(subst --,-Xlinker --,$(TF_LDFLAGS_$(ARCH))) + + # LD = gcc-ld (ld) or llvm-ld (ld.lld) or other + else +-TF_LDFLAGS += --fatal-warnings -O1 ++# With ld.bfd version 2.39 and newer new warnings are added. Skip those since we ++# are not loaded by a elf loader. ++TF_LDFLAGS += $(call ld_option, --no-warn-rwx-segments) ++TF_LDFLAGS += -O1 + TF_LDFLAGS += --gc-sections + # ld.lld doesn't recognize the errata flags, + # therefore don't add those in that case +-- +2.30.2 + diff --git a/buildroot/boot/arm-trusted-firmware/v2.5/0001-feat-build-add-support-for-new-binutils-versions.patch b/buildroot/boot/arm-trusted-firmware/v2.5/0001-feat-build-add-support-for-new-binutils-versions.patch new file mode 100644 index 0000000000..335c18553a --- /dev/null +++ b/buildroot/boot/arm-trusted-firmware/v2.5/0001-feat-build-add-support-for-new-binutils-versions.patch @@ -0,0 +1,61 @@ +From 0f75b03c008eacb9818af3a56dc088e72a623d17 Mon Sep 17 00:00:00 2001 +From: Marco Felsch +Date: Wed, 9 Nov 2022 12:59:09 +0100 +Subject: [PATCH] feat(build): add support for new binutils versions + +Users of GNU ld (BPF) from binutils 2.39+ will observe multiple instaces +of a new warning when linking the bl*.elf in the form: + + ld.bfd: warning: stm32mp1_helper.o: missing .note.GNU-stack section implies executable stack + ld.bfd: NOTE: This behaviour is deprecated and will be removed in a future version of the linker + ld.bfd: warning: bl2.elf has a LOAD segment with RWX permissions + ld.bfd: warning: bl32.elf has a LOAD segment with RWX permissions + +These new warnings are enbaled by default to secure elf binaries: + - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=ba951afb99912da01a6e8434126b8fac7aa75107 + - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=0d38576a34ec64a1b4500c9277a8e9d0f07e6774 + +Fix it in a similar way to what the Linux kernel does, see: +https://lore.kernel.org/all/20220810222442.2296651-1-ndesaulniers@google.com/ + +Following the reasoning there, we set "-z noexecstack" for all linkers +(although LLVM's LLD defaults to it) and optional add +--no-warn-rwx-segments since this a ld.bfd related. + +Signed-off-by: Marco Felsch +Signed-off-by: Robert Schwebel +Change-Id: I9430f5fa5036ca88da46cd3b945754d62616b617 +Signed-off-by: Heiko Thiery +Upstream: https://github.com/ARM-software/arm-trusted-firmware/commit/1f49db5f25cdd4e43825c9bcc0575070b80f628c +--- + Makefile | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 1ddb7b844..470956b19 100644 +--- a/Makefile ++++ b/Makefile +@@ -416,6 +416,8 @@ endif + + GCC_V_OUTPUT := $(shell $(CC) -v 2>&1) + ++TF_LDFLAGS += -z noexecstack ++ + # LD = armlink + ifneq ($(findstring armlink,$(notdir $(LD))),) + TF_LDFLAGS += --diag_error=warning --lto_level=O1 +@@ -442,7 +444,10 @@ TF_LDFLAGS += $(subst --,-Xlinker --,$(TF_LDFLAGS_$(ARCH))) + + # LD = gcc-ld (ld) or llvm-ld (ld.lld) or other + else +-TF_LDFLAGS += --fatal-warnings -O1 ++# With ld.bfd version 2.39 and newer new warnings are added. Skip those since we ++# are not loaded by a elf loader. ++TF_LDFLAGS += $(call ld_option, --no-warn-rwx-segments) ++TF_LDFLAGS += -O1 + TF_LDFLAGS += --gc-sections + # ld.lld doesn't recognize the errata flags, + # therefore don't add those in that case +-- +2.30.2 + diff --git a/buildroot/boot/arm-trusted-firmware/v2.6/0001-feat-build-add-support-for-new-binutils-versions.patch b/buildroot/boot/arm-trusted-firmware/v2.6/0001-feat-build-add-support-for-new-binutils-versions.patch new file mode 100644 index 0000000000..335c18553a --- /dev/null +++ b/buildroot/boot/arm-trusted-firmware/v2.6/0001-feat-build-add-support-for-new-binutils-versions.patch @@ -0,0 +1,61 @@ +From 0f75b03c008eacb9818af3a56dc088e72a623d17 Mon Sep 17 00:00:00 2001 +From: Marco Felsch +Date: Wed, 9 Nov 2022 12:59:09 +0100 +Subject: [PATCH] feat(build): add support for new binutils versions + +Users of GNU ld (BPF) from binutils 2.39+ will observe multiple instaces +of a new warning when linking the bl*.elf in the form: + + ld.bfd: warning: stm32mp1_helper.o: missing .note.GNU-stack section implies executable stack + ld.bfd: NOTE: This behaviour is deprecated and will be removed in a future version of the linker + ld.bfd: warning: bl2.elf has a LOAD segment with RWX permissions + ld.bfd: warning: bl32.elf has a LOAD segment with RWX permissions + +These new warnings are enbaled by default to secure elf binaries: + - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=ba951afb99912da01a6e8434126b8fac7aa75107 + - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=0d38576a34ec64a1b4500c9277a8e9d0f07e6774 + +Fix it in a similar way to what the Linux kernel does, see: +https://lore.kernel.org/all/20220810222442.2296651-1-ndesaulniers@google.com/ + +Following the reasoning there, we set "-z noexecstack" for all linkers +(although LLVM's LLD defaults to it) and optional add +--no-warn-rwx-segments since this a ld.bfd related. + +Signed-off-by: Marco Felsch +Signed-off-by: Robert Schwebel +Change-Id: I9430f5fa5036ca88da46cd3b945754d62616b617 +Signed-off-by: Heiko Thiery +Upstream: https://github.com/ARM-software/arm-trusted-firmware/commit/1f49db5f25cdd4e43825c9bcc0575070b80f628c +--- + Makefile | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 1ddb7b844..470956b19 100644 +--- a/Makefile ++++ b/Makefile +@@ -416,6 +416,8 @@ endif + + GCC_V_OUTPUT := $(shell $(CC) -v 2>&1) + ++TF_LDFLAGS += -z noexecstack ++ + # LD = armlink + ifneq ($(findstring armlink,$(notdir $(LD))),) + TF_LDFLAGS += --diag_error=warning --lto_level=O1 +@@ -442,7 +444,10 @@ TF_LDFLAGS += $(subst --,-Xlinker --,$(TF_LDFLAGS_$(ARCH))) + + # LD = gcc-ld (ld) or llvm-ld (ld.lld) or other + else +-TF_LDFLAGS += --fatal-warnings -O1 ++# With ld.bfd version 2.39 and newer new warnings are added. Skip those since we ++# are not loaded by a elf loader. ++TF_LDFLAGS += $(call ld_option, --no-warn-rwx-segments) ++TF_LDFLAGS += -O1 + TF_LDFLAGS += --gc-sections + # ld.lld doesn't recognize the errata flags, + # therefore don't add those in that case +-- +2.30.2 + diff --git a/buildroot/boot/arm-trusted-firmware/v2.7/0001-feat-build-add-support-for-new-binutils-versions.patch b/buildroot/boot/arm-trusted-firmware/v2.7/0001-feat-build-add-support-for-new-binutils-versions.patch new file mode 100644 index 0000000000..335c18553a --- /dev/null +++ b/buildroot/boot/arm-trusted-firmware/v2.7/0001-feat-build-add-support-for-new-binutils-versions.patch @@ -0,0 +1,61 @@ +From 0f75b03c008eacb9818af3a56dc088e72a623d17 Mon Sep 17 00:00:00 2001 +From: Marco Felsch +Date: Wed, 9 Nov 2022 12:59:09 +0100 +Subject: [PATCH] feat(build): add support for new binutils versions + +Users of GNU ld (BPF) from binutils 2.39+ will observe multiple instaces +of a new warning when linking the bl*.elf in the form: + + ld.bfd: warning: stm32mp1_helper.o: missing .note.GNU-stack section implies executable stack + ld.bfd: NOTE: This behaviour is deprecated and will be removed in a future version of the linker + ld.bfd: warning: bl2.elf has a LOAD segment with RWX permissions + ld.bfd: warning: bl32.elf has a LOAD segment with RWX permissions + +These new warnings are enbaled by default to secure elf binaries: + - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=ba951afb99912da01a6e8434126b8fac7aa75107 + - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=0d38576a34ec64a1b4500c9277a8e9d0f07e6774 + +Fix it in a similar way to what the Linux kernel does, see: +https://lore.kernel.org/all/20220810222442.2296651-1-ndesaulniers@google.com/ + +Following the reasoning there, we set "-z noexecstack" for all linkers +(although LLVM's LLD defaults to it) and optional add +--no-warn-rwx-segments since this a ld.bfd related. + +Signed-off-by: Marco Felsch +Signed-off-by: Robert Schwebel +Change-Id: I9430f5fa5036ca88da46cd3b945754d62616b617 +Signed-off-by: Heiko Thiery +Upstream: https://github.com/ARM-software/arm-trusted-firmware/commit/1f49db5f25cdd4e43825c9bcc0575070b80f628c +--- + Makefile | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 1ddb7b844..470956b19 100644 +--- a/Makefile ++++ b/Makefile +@@ -416,6 +416,8 @@ endif + + GCC_V_OUTPUT := $(shell $(CC) -v 2>&1) + ++TF_LDFLAGS += -z noexecstack ++ + # LD = armlink + ifneq ($(findstring armlink,$(notdir $(LD))),) + TF_LDFLAGS += --diag_error=warning --lto_level=O1 +@@ -442,7 +444,10 @@ TF_LDFLAGS += $(subst --,-Xlinker --,$(TF_LDFLAGS_$(ARCH))) + + # LD = gcc-ld (ld) or llvm-ld (ld.lld) or other + else +-TF_LDFLAGS += --fatal-warnings -O1 ++# With ld.bfd version 2.39 and newer new warnings are added. Skip those since we ++# are not loaded by a elf loader. ++TF_LDFLAGS += $(call ld_option, --no-warn-rwx-segments) ++TF_LDFLAGS += -O1 + TF_LDFLAGS += --gc-sections + # ld.lld doesn't recognize the errata flags, + # therefore don't add those in that case +-- +2.30.2 + diff --git a/buildroot/boot/arm-trusted-firmware/v2.8/0001-feat-build-add-support-for-new-binutils-versions.patch b/buildroot/boot/arm-trusted-firmware/v2.8/0001-feat-build-add-support-for-new-binutils-versions.patch new file mode 100644 index 0000000000..335c18553a --- /dev/null +++ b/buildroot/boot/arm-trusted-firmware/v2.8/0001-feat-build-add-support-for-new-binutils-versions.patch @@ -0,0 +1,61 @@ +From 0f75b03c008eacb9818af3a56dc088e72a623d17 Mon Sep 17 00:00:00 2001 +From: Marco Felsch +Date: Wed, 9 Nov 2022 12:59:09 +0100 +Subject: [PATCH] feat(build): add support for new binutils versions + +Users of GNU ld (BPF) from binutils 2.39+ will observe multiple instaces +of a new warning when linking the bl*.elf in the form: + + ld.bfd: warning: stm32mp1_helper.o: missing .note.GNU-stack section implies executable stack + ld.bfd: NOTE: This behaviour is deprecated and will be removed in a future version of the linker + ld.bfd: warning: bl2.elf has a LOAD segment with RWX permissions + ld.bfd: warning: bl32.elf has a LOAD segment with RWX permissions + +These new warnings are enbaled by default to secure elf binaries: + - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=ba951afb99912da01a6e8434126b8fac7aa75107 + - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=0d38576a34ec64a1b4500c9277a8e9d0f07e6774 + +Fix it in a similar way to what the Linux kernel does, see: +https://lore.kernel.org/all/20220810222442.2296651-1-ndesaulniers@google.com/ + +Following the reasoning there, we set "-z noexecstack" for all linkers +(although LLVM's LLD defaults to it) and optional add +--no-warn-rwx-segments since this a ld.bfd related. + +Signed-off-by: Marco Felsch +Signed-off-by: Robert Schwebel +Change-Id: I9430f5fa5036ca88da46cd3b945754d62616b617 +Signed-off-by: Heiko Thiery +Upstream: https://github.com/ARM-software/arm-trusted-firmware/commit/1f49db5f25cdd4e43825c9bcc0575070b80f628c +--- + Makefile | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 1ddb7b844..470956b19 100644 +--- a/Makefile ++++ b/Makefile +@@ -416,6 +416,8 @@ endif + + GCC_V_OUTPUT := $(shell $(CC) -v 2>&1) + ++TF_LDFLAGS += -z noexecstack ++ + # LD = armlink + ifneq ($(findstring armlink,$(notdir $(LD))),) + TF_LDFLAGS += --diag_error=warning --lto_level=O1 +@@ -442,7 +444,10 @@ TF_LDFLAGS += $(subst --,-Xlinker --,$(TF_LDFLAGS_$(ARCH))) + + # LD = gcc-ld (ld) or llvm-ld (ld.lld) or other + else +-TF_LDFLAGS += --fatal-warnings -O1 ++# With ld.bfd version 2.39 and newer new warnings are added. Skip those since we ++# are not loaded by a elf loader. ++TF_LDFLAGS += $(call ld_option, --no-warn-rwx-segments) ++TF_LDFLAGS += -O1 + TF_LDFLAGS += --gc-sections + # ld.lld doesn't recognize the errata flags, + # therefore don't add those in that case +-- +2.30.2 + diff --git a/buildroot/boot/arm-trusted-firmware/v2.8/0002-build-tools-avoid-unnecessary-link.patch b/buildroot/boot/arm-trusted-firmware/v2.8/0002-build-tools-avoid-unnecessary-link.patch new file mode 100644 index 0000000000..9e0ea74248 --- /dev/null +++ b/buildroot/boot/arm-trusted-firmware/v2.8/0002-build-tools-avoid-unnecessary-link.patch @@ -0,0 +1,77 @@ +From aa57ce632c629fe72ff417e261e0f5bfd8db6bab Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= +Date: Tue, 4 Jul 2023 16:14:02 +0200 +Subject: [PATCH] build(tools): avoid unnecessary link +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +In their respective makefiles, cert_create, encrypt_fw and fiptool +depend on the --openssl phony target as a prerequisite. This forces +those tools to be re-linked each time. + +Move the dependencies on the --openssl target from the tools to their +makefiles all targets, to avoid unnecessary linking while preserving the +OpenSSL version printing done in the --openssl targets when in debug. + +Fixes: cf2dd17ddda2 ("refactor(security): add OpenSSL 1.x compatibility") +Signed-off-by: Vincent Stehlé +Change-Id: I98a3ab30f36dffc253cecaaf3a57d2712522135d +Upstream: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/commit/?id=aa57ce632c629fe72ff417e261e0f5bfd8db6bab +--- + tools/cert_create/Makefile | 4 ++-- + tools/encrypt_fw/Makefile | 4 ++-- + tools/fiptool/Makefile | 4 ++-- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/tools/cert_create/Makefile b/tools/cert_create/Makefile +index 042e844626..b911d19d2b 100644 +--- a/tools/cert_create/Makefile ++++ b/tools/cert_create/Makefile +@@ -85,9 +85,9 @@ HOSTCC ?= gcc + + .PHONY: all clean realclean --openssl + +-all: ${BINARY} ++all: --openssl ${BINARY} + +-${BINARY}: --openssl ${OBJECTS} Makefile ++${BINARY}: ${OBJECTS} Makefile + @echo " HOSTLD $@" + @echo 'const char build_msg[] = "Built : "__TIME__", "__DATE__; \ + const char platform_msg[] = "${PLAT_MSG}";' | \ +diff --git a/tools/encrypt_fw/Makefile b/tools/encrypt_fw/Makefile +index 2939b142be..924e5febab 100644 +--- a/tools/encrypt_fw/Makefile ++++ b/tools/encrypt_fw/Makefile +@@ -65,9 +65,9 @@ HOSTCC ?= gcc + + .PHONY: all clean realclean --openssl + +-all: ${BINARY} ++all: --openssl ${BINARY} + +-${BINARY}: --openssl ${OBJECTS} Makefile ++${BINARY}: ${OBJECTS} Makefile + @echo " HOSTLD $@" + @echo 'const char build_msg[] = "Built : "__TIME__", "__DATE__;' | \ + ${HOSTCC} -c ${HOSTCCFLAGS} -xc - -o src/build_msg.o +diff --git a/tools/fiptool/Makefile b/tools/fiptool/Makefile +index 2ebee33931..4bdebd9235 100644 +--- a/tools/fiptool/Makefile ++++ b/tools/fiptool/Makefile +@@ -68,9 +68,9 @@ DEPS := $(patsubst %.o,%.d,$(OBJECTS)) + + .PHONY: all clean distclean --openssl + +-all: ${PROJECT} ++all: --openssl ${PROJECT} + +-${PROJECT}: --openssl ${OBJECTS} Makefile ++${PROJECT}: ${OBJECTS} Makefile + @echo " HOSTLD $@" + ${Q}${HOSTCC} ${OBJECTS} -o $@ ${LDLIBS} + @${ECHO_BLANK_LINE} +-- +2.25.1 + diff --git a/buildroot/boot/arm-trusted-firmware/v2.9/0001-build-tools-avoid-unnecessary-link.patch b/buildroot/boot/arm-trusted-firmware/v2.9/0001-build-tools-avoid-unnecessary-link.patch new file mode 100644 index 0000000000..9e0ea74248 --- /dev/null +++ b/buildroot/boot/arm-trusted-firmware/v2.9/0001-build-tools-avoid-unnecessary-link.patch @@ -0,0 +1,77 @@ +From aa57ce632c629fe72ff417e261e0f5bfd8db6bab Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= +Date: Tue, 4 Jul 2023 16:14:02 +0200 +Subject: [PATCH] build(tools): avoid unnecessary link +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +In their respective makefiles, cert_create, encrypt_fw and fiptool +depend on the --openssl phony target as a prerequisite. This forces +those tools to be re-linked each time. + +Move the dependencies on the --openssl target from the tools to their +makefiles all targets, to avoid unnecessary linking while preserving the +OpenSSL version printing done in the --openssl targets when in debug. + +Fixes: cf2dd17ddda2 ("refactor(security): add OpenSSL 1.x compatibility") +Signed-off-by: Vincent Stehlé +Change-Id: I98a3ab30f36dffc253cecaaf3a57d2712522135d +Upstream: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/commit/?id=aa57ce632c629fe72ff417e261e0f5bfd8db6bab +--- + tools/cert_create/Makefile | 4 ++-- + tools/encrypt_fw/Makefile | 4 ++-- + tools/fiptool/Makefile | 4 ++-- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/tools/cert_create/Makefile b/tools/cert_create/Makefile +index 042e844626..b911d19d2b 100644 +--- a/tools/cert_create/Makefile ++++ b/tools/cert_create/Makefile +@@ -85,9 +85,9 @@ HOSTCC ?= gcc + + .PHONY: all clean realclean --openssl + +-all: ${BINARY} ++all: --openssl ${BINARY} + +-${BINARY}: --openssl ${OBJECTS} Makefile ++${BINARY}: ${OBJECTS} Makefile + @echo " HOSTLD $@" + @echo 'const char build_msg[] = "Built : "__TIME__", "__DATE__; \ + const char platform_msg[] = "${PLAT_MSG}";' | \ +diff --git a/tools/encrypt_fw/Makefile b/tools/encrypt_fw/Makefile +index 2939b142be..924e5febab 100644 +--- a/tools/encrypt_fw/Makefile ++++ b/tools/encrypt_fw/Makefile +@@ -65,9 +65,9 @@ HOSTCC ?= gcc + + .PHONY: all clean realclean --openssl + +-all: ${BINARY} ++all: --openssl ${BINARY} + +-${BINARY}: --openssl ${OBJECTS} Makefile ++${BINARY}: ${OBJECTS} Makefile + @echo " HOSTLD $@" + @echo 'const char build_msg[] = "Built : "__TIME__", "__DATE__;' | \ + ${HOSTCC} -c ${HOSTCCFLAGS} -xc - -o src/build_msg.o +diff --git a/tools/fiptool/Makefile b/tools/fiptool/Makefile +index 2ebee33931..4bdebd9235 100644 +--- a/tools/fiptool/Makefile ++++ b/tools/fiptool/Makefile +@@ -68,9 +68,9 @@ DEPS := $(patsubst %.o,%.d,$(OBJECTS)) + + .PHONY: all clean distclean --openssl + +-all: ${PROJECT} ++all: --openssl ${PROJECT} + +-${PROJECT}: --openssl ${OBJECTS} Makefile ++${PROJECT}: ${OBJECTS} Makefile + @echo " HOSTLD $@" + ${Q}${HOSTCC} ${OBJECTS} -o $@ ${LDLIBS} + @${ECHO_BLANK_LINE} +-- +2.25.1 + diff --git a/buildroot/boot/at91bootstrap/0001-eabi-fix.patch b/buildroot/boot/at91bootstrap/0001-eabi-fix.patch deleted file mode 100644 index eab3c20928..0000000000 --- a/buildroot/boot/at91bootstrap/0001-eabi-fix.patch +++ /dev/null @@ -1,334 +0,0 @@ -When using an EABI toolchain, the default compilation generates -references to __aeabi_unwind_cpp_pr0(). This symbol is defined in -libgcc, but we don't want to use it for a bootloader. - -Therefore, this patch passes some additional CFLAGS to disable the -generation of such references by avoiding unwind tables, exceptions, -etc. - -Signed-off-by: Thomas Petazzoni ---- - board/at91cap9adk/dataflash/Makefile | 2 +- - board/at91cap9adk/norflash/Makefile | 2 +- - board/at91cap9stk/nandflash/Makefile | 2 +- - board/at91sam9260ek/dataflash/Makefile | 2 +- - board/at91sam9260ek/nandflash/Makefile | 2 +- - board/at91sam9261ek/dataflash/Makefile | 2 +- - board/at91sam9261ek/nandflash/Makefile | 2 +- - board/at91sam9263ek/dataflash/Makefile | 2 +- - board/at91sam9263ek/nandflash/Makefile | 2 +- - board/at91sam9g10ek/dataflash/Makefile | 2 +- - board/at91sam9g10ek/nandflash/Makefile | 2 +- - board/at91sam9g20ek/dataflash/Makefile | 2 +- - board/at91sam9g20ek/nandflash/Makefile | 2 +- - board/at91sam9g45ekes/nandflash/Makefile | 2 +- - board/at91sam9m10ekes/dataflash/Makefile | 2 +- - board/at91sam9m10ekes/nandflash/Makefile | 2 +- - board/at91sam9m10g45ek/dataflash/Makefile | 2 +- - board/at91sam9m10g45ek/nandflash/Makefile | 2 +- - board/at91sam9rlek/dataflash/Makefile | 2 +- - board/at91sam9rlek/nandflash/Makefile | 2 +- - board/at91sam9xeek/dataflash/Makefile | 2 +- - board/at91sam9xeek/nandflash/Makefile | 2 +- - lib/Makefile | 2 +- - 23 files changed, 23 insertions(+), 23 deletions(-) - -Index: Bootstrap-v1.16/board/at91cap9adk/dataflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91cap9adk/dataflash/Makefile -+++ Bootstrap-v1.16/board/at91cap9adk/dataflash/Makefile -@@ -34,7 +34,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL) -+CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm9 -c -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91cap9adk/norflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91cap9adk/norflash/Makefile -+++ Bootstrap-v1.16/board/at91cap9adk/norflash/Makefile -@@ -34,7 +34,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL) -+CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm9 -c -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91cap9stk/nandflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91cap9stk/nandflash/Makefile -+++ Bootstrap-v1.16/board/at91cap9stk/nandflash/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL) -+CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm9 -c -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - -Index: Bootstrap-v1.16/board/at91sam9260ek/dataflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9260ek/dataflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9260ek/dataflash/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm926ej-s -Os -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm926ej-s -Os -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm926ej-s -c -Os -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9260ek/nandflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9260ek/nandflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9260ek/nandflash/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm926ej-s -Os -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm926ej-s -Os -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm926ej-s -c -Os -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9261ek/dataflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9261ek/dataflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9261ek/dataflash/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm9 -c -Os -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9261ek/nandflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9261ek/nandflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9261ek/nandflash/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm9 -c -Os -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9263ek/dataflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9263ek/dataflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9263ek/dataflash/Makefile -@@ -34,7 +34,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm9 -c -Os -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9263ek/nandflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9263ek/nandflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9263ek/nandflash/Makefile -@@ -33,7 +33,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm9 -O0 -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm9 -O0 -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm9 -c -Os -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9g10ek/dataflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9g10ek/dataflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9g10ek/dataflash/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm9 -c -Os -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9g10ek/nandflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9g10ek/nandflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9g10ek/nandflash/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm9 -c -Os -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9g20ek/dataflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9g20ek/dataflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9g20ek/dataflash/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm926ej-s -Os -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm926ej-s -Os -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm926ej-s -c -Os -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9g20ek/nandflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9g20ek/nandflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9g20ek/nandflash/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm926ej-s -Os -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm926ej-s -Os -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm926ej-s -c -Os -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9g45ekes/nandflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9g45ekes/nandflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9g45ekes/nandflash/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm926ej-s -O2 -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm926ej-s -O2 -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm926ej-s -c -O2 -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9m10ekes/dataflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9m10ekes/dataflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9m10ekes/dataflash/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm926ej-s -O2 -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm926ej-s -O2 -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm926ej-s -c -O2 -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9m10ekes/nandflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9m10ekes/nandflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9m10ekes/nandflash/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm926ej-s -O2 -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm926ej-s -O2 -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm926ej-s -c -O2 -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9m10g45ek/dataflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9m10g45ek/dataflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9m10g45ek/dataflash/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm926ej-s -O2 -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm926ej-s -O2 -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm926ej-s -c -O2 -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9m10g45ek/nandflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9m10g45ek/nandflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9m10g45ek/nandflash/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm926ej-s -O2 -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm926ej-s -O2 -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm926ej-s -c -O2 -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9rlek/dataflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9rlek/dataflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9rlek/dataflash/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm926ej-s -Os -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm926ej-s -Os -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm926ej-s -c -Os -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9rlek/nandflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9rlek/nandflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9rlek/nandflash/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm926ej-s -Os -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm926ej-s -Os -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm926ej-s -c -Os -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9xeek/dataflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9xeek/dataflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9xeek/dataflash/Makefile -@@ -38,7 +38,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm9 -c -Os -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9xeek/nandflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9xeek/nandflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9xeek/nandflash/Makefile -@@ -38,7 +38,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm9 -c -Os -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/lib/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/lib/Makefile -+++ Bootstrap-v1.16/lib/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm926ej-s -Os -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm926ej-s -Os -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm926ej-s -c -Os -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. diff --git a/buildroot/boot/at91bootstrap/0002-gcc-4.6.x-ldscript-fix.patch b/buildroot/boot/at91bootstrap/0002-gcc-4.6.x-ldscript-fix.patch deleted file mode 100644 index e4ed04e865..0000000000 --- a/buildroot/boot/at91bootstrap/0002-gcc-4.6.x-ldscript-fix.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b783d1f9bf985c0981e755bd2c13e091e9d6837f Mon Sep 17 00:00:00 2001 -From: Gregory Hermant -Date: Tue, 6 Nov 2012 09:38:50 +0100 -Subject: [PATCH] at91bootstrap: fix overlap linker issue - -The linker script of the at91bootstrap package has to be modified when -built from gcc-4.6.x version. Indeed a section named text.startup is -created and has to be added into the text section. - -Signed-off-by: Gregory Hermant ---- - elf32-littlearm.lds | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/elf32-littlearm.lds b/elf32-littlearm.lds -index a33952f..4f3ba25 100644 ---- a/elf32-littlearm.lds -+++ b/elf32-littlearm.lds -@@ -7,6 +7,7 @@ SECTIONS - .text : { - _stext = .; - *(.text) -+ *(.text*) - *(.rodata) /* read-only data (constants) */ - *(.rodata*) - . = ALIGN(4); --- -1.7.9.5 - diff --git a/buildroot/boot/at91bootstrap/0003-u-boot-relocation-fix.patch b/buildroot/boot/at91bootstrap/0003-u-boot-relocation-fix.patch deleted file mode 100644 index 0c9b9114cb..0000000000 --- a/buildroot/boot/at91bootstrap/0003-u-boot-relocation-fix.patch +++ /dev/null @@ -1,284 +0,0 @@ -From d4e4a1aad559e35d84b445d1379be94ad036984e Mon Sep 17 00:00:00 2001 -From: Alexandre Belloni -Date: Thu, 25 Oct 2012 22:57:14 +0200 -Subject: [PATCH] u-boot relocation fix - -Every AT91SAM plaforms were broken between 2010.12 and 2011.03 because -of the relocation changes. - -We have to get JUMP_ADDR consistant with what is used by u-boot -(CONFIG_SYS_TEXT_BASE). - -I didn't know what to do with at91sam9m10g45ek as it doesn't seems to be -converted yet. But anyway, that means that it is either not working or -doesn't care so changing it here shouldn't harm. - -We also have to increase the IMG_SIZE as u-boot as grown larger than the -default value. As requested on the u-boot ML, we assume that it could -be up to 495kB big. - -It means that now, you have to flash your kernel at 0x00084000 instead -of 0x00042000. And so you also have to load it from that adress from -u-boot. - -Then, remember that you could decrease IMG_SIZE to boot faster. - -Signed-off-by: Alexandre Belloni ---- - board/at91sam9260ek/dataflash/at91sam9260ek.h | 4 ++-- - board/at91sam9260ek/nandflash/at91sam9260ek.h | 2 +- - board/at91sam9261ek/dataflash/at91sam9261ek.h | 4 ++-- - board/at91sam9261ek/nandflash/at91sam9261ek.h | 2 +- - board/at91sam9263ek/dataflash/at91sam9263ek.h | 4 ++-- - board/at91sam9263ek/nandflash/at91sam9263ek.h | 2 +- - board/at91sam9g10ek/dataflash/at91sam9g10ek.h | 4 ++-- - board/at91sam9g10ek/nandflash/at91sam9g10ek.h | 2 +- - board/at91sam9g20ek/dataflash/at91sam9g20ek.h | 4 ++-- - board/at91sam9g20ek/nandflash/at91sam9g20ek.h | 2 +- - board/at91sam9m10ekes/dataflash/at91sam9m10ekes.h | 2 +- - .../at91sam9m10g45ek/dataflash/at91sam9m10g45ek.h | 2 +- - board/at91sam9rlek/dataflash/at91sam9rlek.h | 4 ++-- - board/at91sam9rlek/nandflash/at91sam9rlek.h | 2 +- - board/at91sam9xeek/dataflash/at91sam9xeek.h | 4 ++-- - board/at91sam9xeek/nandflash/at91sam9xeek.h | 2 +- - 16 files changed, 23 insertions(+), 23 deletions(-) - -diff --git a/board/at91sam9260ek/dataflash/at91sam9260ek.h b/board/at91sam9260ek/dataflash/at91sam9260ek.h -index 1834246..91081a1 100644 ---- a/board/at91sam9260ek/dataflash/at91sam9260ek.h -+++ b/board/at91sam9260ek/dataflash/at91sam9260ek.h -@@ -74,10 +74,10 @@ - #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS1_DATAFLASH /* Boot on SPI NCS0 */ - - #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ --#define IMG_SIZE 0x33900 /* Image Size in DataFlash */ -+#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */ - - #define MACH_TYPE 0x44B /* AT91SAM9260-EK */ --#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ -+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ - - /* ******************************************************************* */ - /* Application Settings */ -diff --git a/board/at91sam9260ek/nandflash/at91sam9260ek.h b/board/at91sam9260ek/nandflash/at91sam9260ek.h -index 2cac601..f8fdff2 100644 ---- a/board/at91sam9260ek/nandflash/at91sam9260ek.h -+++ b/board/at91sam9260ek/nandflash/at91sam9260ek.h -@@ -92,7 +92,7 @@ - #define IMG_SIZE 0x40000 /* Image Size in NandFlash */ - - #define MACH_TYPE 0x44B /* AT91SAM9260-EK */ --#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ -+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ - - /* ******************************************************************* */ - /* Application Settings */ -diff --git a/board/at91sam9261ek/dataflash/at91sam9261ek.h b/board/at91sam9261ek/dataflash/at91sam9261ek.h -index 8ce30e9..276ba3d 100644 ---- a/board/at91sam9261ek/dataflash/at91sam9261ek.h -+++ b/board/at91sam9261ek/dataflash/at91sam9261ek.h -@@ -97,10 +97,10 @@ - #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS0_DATAFLASH /* Boot on SPI NCS0 */ - - #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ --#define IMG_SIZE 0x33900 /* Image Size in DataFlash */ -+#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */ - - #define MACH_TYPE 0x350 /* AT91SAM9261-EK */ --#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ -+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ - - /* ******************************************************************* */ - /* Application Settings */ -diff --git a/board/at91sam9261ek/nandflash/at91sam9261ek.h b/board/at91sam9261ek/nandflash/at91sam9261ek.h -index badc3ac..e628c97 100644 ---- a/board/at91sam9261ek/nandflash/at91sam9261ek.h -+++ b/board/at91sam9261ek/nandflash/at91sam9261ek.h -@@ -114,7 +114,7 @@ - #define IMG_SIZE 0x40000 /* Image Size in NandFlash */ - - #define MACH_TYPE 0x350 /* AT91SAM9261-EK */ --#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ -+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ - - /* ******************************************************************* */ - /* Application Settings */ -diff --git a/board/at91sam9263ek/dataflash/at91sam9263ek.h b/board/at91sam9263ek/dataflash/at91sam9263ek.h -index 5c9da4b..870f9e2 100644 ---- a/board/at91sam9263ek/dataflash/at91sam9263ek.h -+++ b/board/at91sam9263ek/dataflash/at91sam9263ek.h -@@ -96,10 +96,10 @@ - #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS0_DATAFLASH /* Boot on SPI NCS0 */ - - #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ --#define IMG_SIZE 0x33900 /* Image Size in DataFlash */ -+#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */ - - #define MACH_TYPE 0x4B2 /* AT91SAM9263-EK */ --#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ -+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ - - /* ******************************************************************* */ - /* Application Settings */ -diff --git a/board/at91sam9263ek/nandflash/at91sam9263ek.h b/board/at91sam9263ek/nandflash/at91sam9263ek.h -index 505afc7..8ab4f46 100644 ---- a/board/at91sam9263ek/nandflash/at91sam9263ek.h -+++ b/board/at91sam9263ek/nandflash/at91sam9263ek.h -@@ -108,7 +108,7 @@ - #define IMG_SIZE 0x40000 /* Image Size in NandFlash */ - - #define MACH_TYPE 1202 /* AT91SAM9263-EK */ --#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ -+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ - - /* ******************************************************************* */ - /* Application Settings */ -diff --git a/board/at91sam9g10ek/dataflash/at91sam9g10ek.h b/board/at91sam9g10ek/dataflash/at91sam9g10ek.h -index b2faf44..f4f556b 100644 ---- a/board/at91sam9g10ek/dataflash/at91sam9g10ek.h -+++ b/board/at91sam9g10ek/dataflash/at91sam9g10ek.h -@@ -98,10 +98,10 @@ - #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS0_DATAFLASH /* Boot on SPI NCS0 */ - - #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ --#define IMG_SIZE 0x33900 /* Image Size in DataFlash */ -+#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */ - - #define MACH_TYPE 0x350 /* AT91SAM9261-EK */ --#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ -+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ - - /* ******************************************************************* */ - /* Application Settings */ -diff --git a/board/at91sam9g10ek/nandflash/at91sam9g10ek.h b/board/at91sam9g10ek/nandflash/at91sam9g10ek.h -index 66c40a3..6c3ecda 100644 ---- a/board/at91sam9g10ek/nandflash/at91sam9g10ek.h -+++ b/board/at91sam9g10ek/nandflash/at91sam9g10ek.h -@@ -115,7 +115,7 @@ - #define IMG_SIZE 0x40000 /* Image Size in NandFlash */ - - #define MACH_TYPE 0x350 /* AT91SAM9G10-EK */ --#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ -+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ - - /* ******************************************************************* */ - /* Application Settings */ -diff --git a/board/at91sam9g20ek/dataflash/at91sam9g20ek.h b/board/at91sam9g20ek/dataflash/at91sam9g20ek.h -index eea0439..7fc70d6 100644 ---- a/board/at91sam9g20ek/dataflash/at91sam9g20ek.h -+++ b/board/at91sam9g20ek/dataflash/at91sam9g20ek.h -@@ -75,10 +75,10 @@ - #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS1_DATAFLASH /* Boot on SPI NCS1 */ - - #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ --#define IMG_SIZE 0x33900 /* Image Size in DataFlash */ -+#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */ - - #define MACH_TYPE 0x658 /* AT91SAM9G20-EK */ --#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ -+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ - - /* ******************************************************************* */ - /* Application Settings */ -diff --git a/board/at91sam9g20ek/nandflash/at91sam9g20ek.h b/board/at91sam9g20ek/nandflash/at91sam9g20ek.h -index 31bd499..e797e4d 100644 ---- a/board/at91sam9g20ek/nandflash/at91sam9g20ek.h -+++ b/board/at91sam9g20ek/nandflash/at91sam9g20ek.h -@@ -93,7 +93,7 @@ - #define IMG_SIZE 0x40000 /* Image Size in NandFlash */ - - #define MACH_TYPE 0x658 /* AT91SAM9G20-EK */ --#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ -+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ - - /* ******************************************************************* */ - /* Application Settings */ -diff --git a/board/at91sam9m10ekes/dataflash/at91sam9m10ekes.h b/board/at91sam9m10ekes/dataflash/at91sam9m10ekes.h -index a60fd41..5587a00 100644 ---- a/board/at91sam9m10ekes/dataflash/at91sam9m10ekes.h -+++ b/board/at91sam9m10ekes/dataflash/at91sam9m10ekes.h -@@ -89,7 +89,7 @@ - #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS0_DATAFLASH /* Boot on SPI NCS0 */ - - #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ --#define IMG_SIZE 0x33900 /* Image Size in DataFlash */ -+#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */ - - #define MACH_TYPE 0x9CD /* AT91SAM9M10-EKES */ - #define JUMP_ADDR 0x73F00000 /* Final Jump Address */ -diff --git a/board/at91sam9m10g45ek/dataflash/at91sam9m10g45ek.h b/board/at91sam9m10g45ek/dataflash/at91sam9m10g45ek.h -index 5c726b5..9090097 100644 ---- a/board/at91sam9m10g45ek/dataflash/at91sam9m10g45ek.h -+++ b/board/at91sam9m10g45ek/dataflash/at91sam9m10g45ek.h -@@ -85,7 +85,7 @@ - #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS0_DATAFLASH /* Boot on SPI NCS0 */ - - #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ --#define IMG_SIZE 0x33900 /* Image Size in DataFlash */ -+#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */ - - #define MACH_TYPE 0x726 /* AT91SAM9M10G45-EK */ - #define JUMP_ADDR 0x73F00000 /* Final Jump Address */ -diff --git a/board/at91sam9rlek/dataflash/at91sam9rlek.h b/board/at91sam9rlek/dataflash/at91sam9rlek.h -index 05c42dc..150f17e 100644 ---- a/board/at91sam9rlek/dataflash/at91sam9rlek.h -+++ b/board/at91sam9rlek/dataflash/at91sam9rlek.h -@@ -89,10 +89,10 @@ - #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS0_DATAFLASH /* Boot on SPI NCS0 */ - - #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ --#define IMG_SIZE 0x33900 /* Image Size in DataFlash */ -+#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */ - - #define MACH_TYPE 1326 /* AT91SAM9RL-EK */ --#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ -+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ - - /* ******************************************************************* */ - /* Application Settings */ -diff --git a/board/at91sam9rlek/nandflash/at91sam9rlek.h b/board/at91sam9rlek/nandflash/at91sam9rlek.h -index 656b4ba..594db8f 100644 ---- a/board/at91sam9rlek/nandflash/at91sam9rlek.h -+++ b/board/at91sam9rlek/nandflash/at91sam9rlek.h -@@ -112,7 +112,7 @@ - #define IMG_SIZE 0x40000 /* Image Size in NandFlash */ - - #define MACH_TYPE 1326 /* AT91SAM9RL-EK */ --#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ -+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ - - /* ******************************************************************* */ - /* Application Settings */ -diff --git a/board/at91sam9xeek/dataflash/at91sam9xeek.h b/board/at91sam9xeek/dataflash/at91sam9xeek.h -index 27d1822..08e515d 100644 ---- a/board/at91sam9xeek/dataflash/at91sam9xeek.h -+++ b/board/at91sam9xeek/dataflash/at91sam9xeek.h -@@ -74,10 +74,10 @@ - #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS1_DATAFLASH /* Boot on SPI NCS1 */ - - #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ --#define IMG_SIZE 0x33900 /* Image Size in DataFlash */ -+#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */ - - #define MACH_TYPE 0x44B /* AT91SAM9XE-EK same id as AT91SAM9260-EK*/ --#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ -+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ - - /* ******************************************************************* */ - /* Application Settings */ -diff --git a/board/at91sam9xeek/nandflash/at91sam9xeek.h b/board/at91sam9xeek/nandflash/at91sam9xeek.h -index 5dbc63e..9fac7cb 100644 ---- a/board/at91sam9xeek/nandflash/at91sam9xeek.h -+++ b/board/at91sam9xeek/nandflash/at91sam9xeek.h -@@ -94,7 +94,7 @@ - #define IMG_SIZE 0x40000 /* Image Size in NandFlash */ - - #define MACH_TYPE 0x44B /* AT91SAM9XE-EK same id as AT91SAM9260-EK*/ --#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ -+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ - - /* ******************************************************************* */ - /* Application Settings */ --- -1.7.9.5 - diff --git a/buildroot/boot/at91bootstrap/Config.in b/buildroot/boot/at91bootstrap/Config.in deleted file mode 100644 index 0f6430fd8d..0000000000 --- a/buildroot/boot/at91bootstrap/Config.in +++ /dev/null @@ -1,49 +0,0 @@ -config BR2_TARGET_AT91BOOTSTRAP - bool "AT91 Bootstrap" - depends on BR2_arm926t - help - AT91Bootstrap is a first level bootloader for the Atmel AT91 - devices. It integrates algorithms for: - - Device initialization such as clock configuration, PIO - settings... - - Peripheral drivers such as PIO, PMC or SDRAMC... - - Physical media algorithm such as DataFlash, NandFlash, NOR - Flash... - -if BR2_TARGET_AT91BOOTSTRAP - -config BR2_TARGET_AT91BOOTSTRAP_CUSTOM_PATCH_DIR - string "custom patch dir" - help - If your board requires custom patches, add the path to the - directory containing the patches here. The patches must be - named at91bootstrap--.patch. - - Most users may leave this empty - -config BR2_TARGET_AT91BOOTSTRAP_BOARD - string "Bootstrap board" - default "" - help - This is used to do a make _config - -choice - prompt "Boot Memory" - default BR2_TARGET_AT91BOOTSTRAP_DATAFLASH - help - Select Chip for which AT91 bootstrap should be built - -config BR2_TARGET_AT91BOOTSTRAP_DATAFLASH - bool "Data Flash" - -config BR2_TARGET_AT91BOOTSTRAP_NANDFLASH - bool "NAND Flash" - -endchoice - -config BR2_TARGET_AT91BOOTSTRAP_MEMORY - string - default "dataflash" if BR2_TARGET_AT91BOOTSTRAP_DATAFLASH - default "nandflash" if BR2_TARGET_AT91BOOTSTRAP_NANDFLASH - -endif diff --git a/buildroot/boot/at91bootstrap/at91bootstrap.hash b/buildroot/boot/at91bootstrap/at91bootstrap.hash deleted file mode 100644 index d9f8db8897..0000000000 --- a/buildroot/boot/at91bootstrap/at91bootstrap.hash +++ /dev/null @@ -1,3 +0,0 @@ -# locally computed -sha256 d66192a274247f4baa39fa932eadf903d7add55641d89d30402f967c4f2282a5 AT91Bootstrap1.16.zip -sha256 6a3ac5dfcf19e6bac1b1109d30d72818768a3855e2594b84fe2b012b5fe0e77b include/sdramc.h diff --git a/buildroot/boot/at91bootstrap/at91bootstrap.mk b/buildroot/boot/at91bootstrap/at91bootstrap.mk deleted file mode 100644 index 1a084756fd..0000000000 --- a/buildroot/boot/at91bootstrap/at91bootstrap.mk +++ /dev/null @@ -1,49 +0,0 @@ -################################################################################ -# -# at91bootstrap -# -################################################################################ - -AT91BOOTSTRAP_VERSION = 1.16 -AT91BOOTSTRAP_SITE = ftp://www.at91.com/pub/at91bootstrap -AT91BOOTSTRAP_SOURCE = AT91Bootstrap$(AT91BOOTSTRAP_VERSION).zip -AT91BOOTSTRAP_LICENSE = BSD-Source-Code -AT91BOOTSTRAP_LICENSE_FILES = include/sdramc.h - -AT91BOOTSTRAP_BOARD = $(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP_BOARD)) -AT91BOOTSTRAP_MEMORY = $(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP_MEMORY)) -AT91BOOTSTRAP_MAKE_SUBDIR = board/$(AT91BOOTSTRAP_BOARD)/$(AT91BOOTSTRAP_MEMORY) -AT91BOOTSTRAP_BINARY = $(AT91BOOTSTRAP_MAKE_SUBDIR)/$(AT91BOOTSTRAP_MEMORY)_$(AT91BOOTSTRAP_BOARD).bin - -AT91BOOTSTRAP_INSTALL_IMAGES = YES -AT91BOOTSTRAP_INSTALL_TARGET = NO - -define AT91BOOTSTRAP_EXTRACT_CMDS - $(UNZIP) -d $(BUILD_DIR) $(AT91BOOTSTRAP_DL_DIR)/$(AT91BOOTSTRAP_SOURCE) - mv $(BUILD_DIR)/Bootstrap-v$(AT91BOOTSTRAP_VERSION)/* $(@D) - rmdir $(BUILD_DIR)/Bootstrap-v$(AT91BOOTSTRAP_VERSION) -endef - -ifneq ($(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP_CUSTOM_PATCH_DIR)),) -define AT91BOOTSTRAP_APPLY_CUSTOM_PATCHES - $(APPLY_PATCHES) $(@D) $(BR2_TARGET_AT91BOOTSTRAP_CUSTOM_PATCH_DIR) \*.patch -endef - -AT91BOOTSTRAP_POST_PATCH_HOOKS += AT91BOOTSTRAP_APPLY_CUSTOM_PATCHES -endif - -define AT91BOOTSTRAP_BUILD_CMDS - $(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C $(@D)/$(AT91BOOTSTRAP_MAKE_SUBDIR) -endef - -define AT91BOOTSTRAP_INSTALL_IMAGES_CMDS - cp $(@D)/$(AT91BOOTSTRAP_BINARY) $(BINARIES_DIR) -endef - -$(eval $(generic-package)) - -ifeq ($(BR2_TARGET_AT91BOOTSTRAP)$(BR_BUILDING),yy) -ifeq ($(AT91BOOTSTRAP_BOARD),) -$(error No AT91Bootstrap board name set. Check your BR2_TARGET_AT91BOOTSTRAP_BOARD setting) -endif -endif diff --git a/buildroot/boot/at91dataflashboot/0001-do-not-install.patch b/buildroot/boot/at91dataflashboot/0001-do-not-install.patch deleted file mode 100644 index 41d97ad20e..0000000000 --- a/buildroot/boot/at91dataflashboot/0001-do-not-install.patch +++ /dev/null @@ -1,22 +0,0 @@ -Disable the automatic installation of at91dataflashboot since it tries -to install things to /tftpboot, which is not possible when not -building as root. - -Signed-off-by: Thomas Petazzoni ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: at91dataflashboot-1.05/Makefile -=================================================================== ---- at91dataflashboot-1.05.orig/Makefile -+++ at91dataflashboot-1.05/Makefile -@@ -40,7 +40,7 @@ - - I=config.h com.h dataflash.h embedded_services.h main.h stdio.h include/AT91RM9200.h include/lib_AT91RM9200.h - --all: clean $(BINNAME) $(LSSNAME) install -+all: clean $(BINNAME) $(LSSNAME) - $(SIZE) $(OUTNAME) - - # C objects here diff --git a/buildroot/boot/at91dataflashboot/0002-eabi-fixes.patch b/buildroot/boot/at91dataflashboot/0002-eabi-fixes.patch deleted file mode 100644 index e38905f7cb..0000000000 --- a/buildroot/boot/at91dataflashboot/0002-eabi-fixes.patch +++ /dev/null @@ -1,43 +0,0 @@ -Get at91dataflashboot to build with EABI toolchains, by providing the -__aeabi_uidiv and __aeabi_uidivmod symbols. The code is based on -U-Boot's code. - -Signed-off-by: Thomas Petazzoni ---- - _udivsi3.S | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -Index: DataflashBoot-1.05/_udivsi3.S -=================================================================== ---- DataflashBoot-1.05.orig/_udivsi3.S -+++ DataflashBoot-1.05/_udivsi3.S -@@ -12,8 +12,11 @@ - .text - .globl __udivsi3 - .type __udivsi3 ,function -+ .globl __aeabi_uidiv -+ .type __aeabi_uidiv ,function - .align 0 - __udivsi3 : -+ __aeabi_uidiv: - cmp divisor, #0 - beq Ldiv0 - mov curbit, #1 -@@ -68,6 +71,17 @@ - mov r0, #0 @ about as wrong as it could be - ldmia sp!, {pc} - .size __udivsi3 , . - __udivsi3 -+ -+.globl __aeabi_uidivmod -+__aeabi_uidivmod: -+ -+ stmfd sp!, {r0, r1, ip, lr} -+ bl __aeabi_uidiv -+ ldmfd sp!, {r1, r2, ip, lr} -+ mul r3, r0, r2 -+ sub r1, r1, r3 -+ mov pc, lr -+ - /* # 235 "libgcc1.S" */ - /* # 320 "libgcc1.S" */ - /* # 421 "libgcc1.S" */ diff --git a/buildroot/boot/at91dataflashboot/Config.in b/buildroot/boot/at91dataflashboot/Config.in deleted file mode 100644 index 8b37d84409..0000000000 --- a/buildroot/boot/at91dataflashboot/Config.in +++ /dev/null @@ -1,3 +0,0 @@ -config BR2_TARGET_AT91DATAFLASHBOOT - bool "AT91 DataFlashBoot" - depends on BR2_arm && BR2_arm926t diff --git a/buildroot/boot/at91dataflashboot/at91dataflashboot.hash b/buildroot/boot/at91dataflashboot/at91dataflashboot.hash deleted file mode 100644 index 57df4e5389..0000000000 --- a/buildroot/boot/at91dataflashboot/at91dataflashboot.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 2cfeb6a9236e1a743c8010f05e504dbc92169ef42d9a6cf7948954a577bfc386 DataflashBoot-1.05.tar.bz2 diff --git a/buildroot/boot/at91dataflashboot/at91dataflashboot.mk b/buildroot/boot/at91dataflashboot/at91dataflashboot.mk deleted file mode 100644 index 0ad8b6fc44..0000000000 --- a/buildroot/boot/at91dataflashboot/at91dataflashboot.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# at91dataflashboot -# -################################################################################ - -AT91DATAFLASHBOOT_VERSION = 1.05 -AT91DATAFLASHBOOT_SOURCE = DataflashBoot-$(AT91DATAFLASHBOOT_VERSION).tar.bz2 -AT91DATAFLASHBOOT_SITE = ftp://www.at91.com/pub/buildroot - -AT91DATAFLASHBOOT_INSTALL_TARGET = NO -AT91DATAFLASHBOOT_INSTALL_IMAGES = YES - -define AT91DATAFLASHBOOT_BUILD_CMDS - make -C $(@D) CROSS_COMPILE=$(TARGET_CROSS) -endef - -define AT91DATAFLASHBOOT_INSTALL_IMAGES_CMDS - cp $(@D)/DataflashBoot-$(AT91DATAFLASHBOOT_VERSION).bin $(BINARIES_DIR) -endef - -$(eval $(generic-package)) diff --git a/buildroot/boot/barebox/Config.in b/buildroot/boot/barebox/Config.in index 23f8a5ac8a..0bd3386795 100644 --- a/buildroot/boot/barebox/Config.in +++ b/buildroot/boot/barebox/Config.in @@ -12,7 +12,7 @@ choice Select the specific Barebox version you want to use config BR2_TARGET_BAREBOX_LATEST_VERSION - bool "2021.12.0" + bool "2022.12.0" config BR2_TARGET_BAREBOX_CUSTOM_VERSION bool "Custom version" @@ -40,7 +40,7 @@ endif config BR2_TARGET_BAREBOX_VERSION string - default "2021.12.0" if BR2_TARGET_BAREBOX_LATEST_VERSION + default "2022.12.0" if BR2_TARGET_BAREBOX_LATEST_VERSION default BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION default "custom" if BR2_TARGET_BAREBOX_CUSTOM_TARBALL default BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT @@ -54,6 +54,18 @@ config BR2_TARGET_BAREBOX_CUSTOM_PATCH_DIR Most users may leave this empty +config BR2_TARGET_BAREBOX_NEEDS_OPENSSL + bool "Barebox needs OpenSSL" + help + Select this option if your Barebox board configuration + requires OpenSSL to be available on the host. + +config BR2_TARGET_BAREBOX_NEEDS_LIBUSB + bool "Barebox needs LibUSB" + help + Select this option if your Barebox board configuration + requires libUSB to be available on the host. + if BR2_TARGET_BAREBOX_CUSTOM_GIT config BR2_TARGET_BAREBOX_CUSTOM_GIT_REPO_URL @@ -64,7 +76,7 @@ config BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION endif -source boot/barebox/barebox/Config.in +source "boot/barebox/barebox/Config.in" menuconfig BR2_TARGET_BAREBOX_AUX bool "Build barebox with an auxiliary config" @@ -78,7 +90,7 @@ menuconfig BR2_TARGET_BAREBOX_AUX if BR2_TARGET_BAREBOX_AUX -source boot/barebox/barebox-aux/Config.in +source "boot/barebox/barebox-aux/Config.in" endif diff --git a/buildroot/boot/barebox/barebox-aux/Config.in b/buildroot/boot/barebox/barebox-aux/Config.in index d39d24f763..4b0201ea67 100644 --- a/buildroot/boot/barebox/barebox-aux/Config.in +++ b/buildroot/boot/barebox/barebox-aux/Config.in @@ -36,8 +36,13 @@ config BR2_TARGET_BAREBOX_AUX_IMAGE_FILE the images directory. If left empty, defaults to: - - barebox.bin for barebox versions older than 2012.10. - - barebox-flash-image for later versions. + - all images as listed in barebox-flash-images (>= v2015.12.0) + - the image pointed at by barebox-flash-image (>= v2012.10.0) + - barebox.bin for even older barebox versions + + In any case, this only influences the artifacts collected by + Buildroot. They will still need to be referenced from image + packages or flashed separately onto the hardware. config BR2_TARGET_BAREBOX_AUX_CUSTOM_ENV bool "Generate an environment image" diff --git a/buildroot/boot/barebox/barebox.hash b/buildroot/boot/barebox/barebox.hash index 0a853866b5..161fc43d43 100644 --- a/buildroot/boot/barebox/barebox.hash +++ b/buildroot/boot/barebox/barebox.hash @@ -1,8 +1,8 @@ -# From https://www.barebox.org/download/barebox-2021.12.0.tar.bz2.md5 -md5 199b6d7ff3441cec2062ab18a52454dc barebox-2021.12.0.tar.bz2 +# From https://www.barebox.org/download/barebox-2022.12.0.tar.bz2.md5 +md5 e4bf25cbf1e0b0c9a67ee56214617b9c barebox-2022.12.0.tar.bz2 # Locally calculated -sha256 555569fe9e71524e0bf927eaa2c1aa2e81ee2c34dd71e39fe21620db6ccc8aa6 barebox-2021.12.0.tar.bz2 +sha256 9f570d4ae089560bd6c17b2b7d21cdb6557ecb00612c77ecee72ac47575a6b74 barebox-2022.12.0.tar.bz2 # License files, locally computed sha256 ab1122aa9f9073ad1ec824edcd970b16a6a7881a34a18fd56c080debb2dca5d4 COPYING diff --git a/buildroot/boot/barebox/barebox.mk b/buildroot/boot/barebox/barebox.mk index 6506294d6d..929ed48ada 100644 --- a/buildroot/boot/barebox/barebox.mk +++ b/buildroot/boot/barebox/barebox.mk @@ -17,7 +17,7 @@ define inner-barebox-package $(1)_VERSION = $$(call qstrip,$$(BR2_TARGET_BAREBOX_VERSION)) -ifeq ($$($(1)_VERSION),custom) +ifeq ($$(BR2_TARGET_BAREBOX_CUSTOM_TARBALL),y) # Handle custom Barebox tarballs as specified by the configuration $(1)_TARBALL = $$(call qstrip,$$(BR2_TARGET_BAREBOX_CUSTOM_TARBALL_LOCATION)) $(1)_SITE = $$(patsubst %/,%,$$(dir $$($(1)_TARBALL))) @@ -26,7 +26,7 @@ else ifeq ($$(BR2_TARGET_BAREBOX_CUSTOM_GIT),y) $(1)_SITE = $$(call qstrip,$$(BR2_TARGET_BAREBOX_CUSTOM_GIT_REPO_URL)) $(1)_SITE_METHOD = git # Override the default value of _SOURCE to 'barebox-*' so that it is not -# downloaded a second time for barebox-aux; also alows avoiding the hash +# downloaded a second time for barebox-aux; also allows avoiding the hash # check: $(1)_SOURCE = barebox-$$($(1)_VERSION)$$(BR_FMT_VERSION_git).tar.gz else @@ -43,6 +43,14 @@ ifeq ($(BR2_TARGET_BAREBOX_LATEST_VERSION),y) $(1)_LICENSE_FILES = COPYING endif +ifeq ($(BR2_TARGET_BAREBOX_NEEDS_OPENSSL),y) +BAREBOX_DEPENDENCIES += host-openssl host-pkgconf +endif + +ifeq ($(BR2_TARGET_BAREBOX_NEEDS_LIBUSB),y) +BAREBOX_DEPENDENCIES += host-libusb host-pkgconf +endif + $(1)_CUSTOM_EMBEDDED_ENV_PATH = $$(call qstrip,$$(BR2_TARGET_$(1)_CUSTOM_EMBEDDED_ENV_PATH)) ifneq ($$(call qstrip,$$(BR2_TARGET_BAREBOX_CUSTOM_PATCH_DIR)),) @@ -73,6 +81,19 @@ endif $(1)_MAKE_FLAGS = ARCH=$$($(1)_ARCH) CROSS_COMPILE="$$(TARGET_CROSS)" $(1)_MAKE_ENV = $$(TARGET_MAKE_ENV) +$(1)_MAKE_ENV += \ + PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ + PKG_CONFIG_SYSROOT_DIR="/" \ + PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ + PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \ + PKG_CONFIG_LIBDIR="$(HOST_DIR)/lib/pkgconfig:$(HOST_DIR)/share/pkgconfig" + +ifeq ($$(BR2_REPRODUCIBLE),y) +$(1)_MAKE_ENV += \ + KBUILD_BUILD_USER=buildroot \ + KBUILD_BUILD_HOST=buildroot \ + KBUILD_BUILD_TIMESTAMP="$$(shell LC_ALL=C TZ='UTC' date -d @$(SOURCE_DATE_EPOCH))" +endif ifeq ($$(BR2_TARGET_$(1)_USE_DEFCONFIG),y) $(1)_KCONFIG_DEFCONFIG = $$(call qstrip,$$(BR2_TARGET_$(1)_BOARD_DEFCONFIG))_defconfig @@ -121,7 +142,7 @@ endef define $(1)_BUILD_CMDS $$($(1)_BUILD_BAREBOXENV_CMDS) - $$(TARGET_MAKE_ENV) $$(MAKE) $$($(1)_MAKE_FLAGS) -C $$(@D) + $$($(1)_MAKE_ENV) $$(MAKE) $$($(1)_MAKE_FLAGS) -C $$(@D) $$($(1)_BUILD_CUSTOM_ENV) endef @@ -130,6 +151,8 @@ $(1)_IMAGE_FILES = $$(call qstrip,$$(BR2_TARGET_$(1)_IMAGE_FILE)) define $(1)_INSTALL_IMAGES_CMDS if test -n "$$($(1)_IMAGE_FILES)"; then \ cp -L $$(foreach image,$$($(1)_IMAGE_FILES),$$(@D)/$$(image)) $$(BINARIES_DIR) ; \ + elif test -e $$(@D)/barebox-flash-images ; then \ + cp -L $$(foreach image,$$(shell cat $$(@D)/barebox-flash-images),$$(@D)/$$(image)) $$(BINARIES_DIR) ; \ elif test -h $$(@D)/barebox-flash-image ; then \ cp -L $$(@D)/barebox-flash-image $$(BINARIES_DIR)/barebox.bin ; \ else \ diff --git a/buildroot/boot/barebox/barebox/Config.in b/buildroot/boot/barebox/barebox/Config.in index 958e294e40..2fd70a84ae 100644 --- a/buildroot/boot/barebox/barebox/Config.in +++ b/buildroot/boot/barebox/barebox/Config.in @@ -36,8 +36,13 @@ config BR2_TARGET_BAREBOX_IMAGE_FILE the images directory. If left empty, defaults to: - - barebox.bin for barebox versions older than 2012.10. - - barebox-flash-image for later versions. + - all images as listed in barebox-flash-images (>= v2015.12.0) + - the image pointed at by barebox-flash-image (>= v2012.10.0) + - barebox.bin for even older barebox versions + + In any case, this only influences the artifacts collected by + Buildroot. They will still need to be referenced from image + packages or flashed separately onto the hardware. config BR2_TARGET_BAREBOX_BAREBOXENV bool "bareboxenv tool in target" diff --git a/buildroot/boot/beaglev-ddrinit/Config.in b/buildroot/boot/beaglev-ddrinit/Config.in deleted file mode 100644 index 7ca92a7b9b..0000000000 --- a/buildroot/boot/beaglev-ddrinit/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_TARGET_BEAGLEV_DDRINIT - bool "beaglev-ddrinit" - depends on BR2_riscv - depends on BR2_HOSTARCH = "x86_64" # host-riscv64-elf-toolchain - help - This package builds the DDRinit firmware used on the BeagleV - platform. - - https://github.com/starfive-tech/beagle_ddrinit diff --git a/buildroot/boot/beaglev-ddrinit/beaglev-ddrinit.hash b/buildroot/boot/beaglev-ddrinit/beaglev-ddrinit.hash deleted file mode 100644 index 2aaab53a3b..0000000000 --- a/buildroot/boot/beaglev-ddrinit/beaglev-ddrinit.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed -sha256 2d491f64bd77de9dfd4b8ae6c00e83670e80c205cc20917fefa6194b1dc1fe4e beaglev-ddrinit-c0839f25246d9e308c23498d344ca13d8a7ad6ed.tar.gz -sha256 284d26192537710910ec1f112ec5f4c981601ae23702391986d6ce0b8ba90813 LICENSE diff --git a/buildroot/boot/beaglev-ddrinit/beaglev-ddrinit.mk b/buildroot/boot/beaglev-ddrinit/beaglev-ddrinit.mk deleted file mode 100644 index 76406ed4c5..0000000000 --- a/buildroot/boot/beaglev-ddrinit/beaglev-ddrinit.mk +++ /dev/null @@ -1,28 +0,0 @@ -################################################################################ -# -# beaglev-ddrinit -# -################################################################################ - -# Commit on the 'starfive' branch -BEAGLEV_DDRINIT_VERSION = c0839f25246d9e308c23498d344ca13d8a7ad6ed -BEAGLEV_DDRINIT_SITE = $(call github,starfive-tech,beagle_ddrinit,$(BEAGLEV_DDRINIT_VERSION)) -BEAGLEV_DDRINIT_INSTALL_TARGET = NO -BEAGLEV_DDRINIT_INSTALL_IMAGES = YES -BEAGLEV_DDRINIT_DEPENDENCIES = host-riscv64-elf-toolchain -BEAGLEV_DDRINIT_LICENSE = GPL-2.0+ -BEAGLEV_DDRINIT_LICENSE_FILES = LICENSE - -define BEAGLEV_DDRINIT_BUILD_CMDS - $(MAKE) -C $(@D)/build \ - CROSSCOMPILE=$(HOST_DIR)/bin/riscv64-unknown-elf- \ - SUFFIX=buildroot \ - GIT_VERSION=$(BEAGLEV_DDRINIT_VERSION) -endef - -define BEAGLEV_DDRINIT_INSTALL_IMAGES_CMDS - $(INSTALL) -D -m 0644 $(@D)/build/ddrinit-2133-buildroot.bin.out \ - $(BINARIES_DIR)/ddrinit-2133-buildroot.bin.out -endef - -$(eval $(generic-package)) diff --git a/buildroot/boot/beaglev-secondboot/Config.in b/buildroot/boot/beaglev-secondboot/Config.in deleted file mode 100644 index a9695fc138..0000000000 --- a/buildroot/boot/beaglev-secondboot/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_TARGET_BEAGLEV_SECONDBOOT - bool "beaglev-secondboot" - depends on BR2_riscv - depends on BR2_HOSTARCH = "x86_64" # host-riscv64-elf-toolchain - help - This package builds the SecondBoot firmware used on the - BeagleV platform. - - https://github.com/starfive-tech/beagle_secondBoot diff --git a/buildroot/boot/beaglev-secondboot/beaglev-secondboot.hash b/buildroot/boot/beaglev-secondboot/beaglev-secondboot.hash deleted file mode 100644 index efc93347b1..0000000000 --- a/buildroot/boot/beaglev-secondboot/beaglev-secondboot.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed -sha256 fe4d37f3ff38e7f2da70a08f9cb1668c0b928e85d2e0935bd985f910b3ce30e9 beaglev-secondboot-2d20047960044308126117ad56bc08a1164e82b2.tar.gz -sha256 284d26192537710910ec1f112ec5f4c981601ae23702391986d6ce0b8ba90813 LICENSE diff --git a/buildroot/boot/beaglev-secondboot/beaglev-secondboot.mk b/buildroot/boot/beaglev-secondboot/beaglev-secondboot.mk deleted file mode 100644 index a423c6c6a6..0000000000 --- a/buildroot/boot/beaglev-secondboot/beaglev-secondboot.mk +++ /dev/null @@ -1,28 +0,0 @@ -################################################################################ -# -# beaglev-secondboot -# -################################################################################ - -# Commit on the 'starfive' branch -BEAGLEV_SECONDBOOT_VERSION = 2d20047960044308126117ad56bc08a1164e82b2 -BEAGLEV_SECONDBOOT_SITE = $(call github,starfive-tech,beagle_secondBoot,$(BEAGLEV_SECONDBOOT_VERSION)) -BEAGLEV_SECONDBOOT_INSTALL_TARGET = NO -BEAGLEV_SECONDBOOT_INSTALL_IMAGES = YES -BEAGLEV_SECONDBOOT_DEPENDENCIES = host-riscv64-elf-toolchain -BEAGLEV_SECONDBOOT_LICENSE = GPL-2.0+ -BEAGLEV_SECONDBOOT_LICENSE_FILES = LICENSE - -define BEAGLEV_SECONDBOOT_BUILD_CMDS - $(MAKE) -C $(@D)/build \ - CROSSCOMPILE=$(HOST_DIR)/bin/riscv64-unknown-elf- \ - SUFFIX=buildroot \ - GIT_VERSION=$(BEAGLEV_SECONDBOOT_VERSION) -endef - -define BEAGLEV_SECONDBOOT_INSTALL_IMAGES_CMDS - $(INSTALL) -D -m 0644 $(@D)/build/bootloader-BEAGLEV-buildroot.bin.out \ - $(BINARIES_DIR)/bootloader-BEAGLEV-buildroot.bin.out -endef - -$(eval $(generic-package)) diff --git a/buildroot/boot/binaries-marvell/binaries-marvell.hash b/buildroot/boot/binaries-marvell/binaries-marvell.hash index a7d5928a5d..654fb94ec0 100644 --- a/buildroot/boot/binaries-marvell/binaries-marvell.hash +++ b/buildroot/boot/binaries-marvell/binaries-marvell.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d818c95bcd4d5c026238d6e554151184ed7fea15bce1f861f9068b97b4cd320a binaries-marvell-c5d3ef2b63ba66d8717ecbe679fd2e639cde88ee.tar.gz -sha256 e6d08ef60068ee72c68835001a24eb832dcba27cac0dde0f179dfb428be050ca README.md +sha256 d818c95bcd4d5c026238d6e554151184ed7fea15bce1f861f9068b97b4cd320a binaries-marvell-c5d3ef2b63ba66d8717ecbe679fd2e639cde88ee.tar.gz +sha256 e6d08ef60068ee72c68835001a24eb832dcba27cac0dde0f179dfb428be050ca README.md diff --git a/buildroot/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk b/buildroot/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk index 30b352f8e7..95f7e22760 100644 --- a/buildroot/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk +++ b/buildroot/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk @@ -4,7 +4,7 @@ # ################################################################################ -BOOT_WRAPPER_AARCH64_VERSION = 8d5a765251d9113c3c0f9fa14de42a9e7486fe8a +BOOT_WRAPPER_AARCH64_VERSION = 9f26a1c1f27bd6b5b66c265114848007fc22e4aa BOOT_WRAPPER_AARCH64_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/mark/boot-wrapper-aarch64.git BOOT_WRAPPER_AARCH64_SITE_METHOD = git BOOT_WRAPPER_AARCH64_LICENSE = BSD-3-Clause diff --git a/buildroot/boot/edk2/0001-MdeModulePkg-UsbBusDxe-fix-NOOPT-build-error.patch b/buildroot/boot/edk2/0001-MdeModulePkg-UsbBusDxe-fix-NOOPT-build-error.patch deleted file mode 100644 index f4f1b1565a..0000000000 --- a/buildroot/boot/edk2/0001-MdeModulePkg-UsbBusDxe-fix-NOOPT-build-error.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 59aa67f7a4d8efc564b46fe467aaf6eccec17183 Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann -Date: Mon, 20 Dec 2021 22:32:38 +0800 -Subject: [PATCH] MdeModulePkg/UsbBusDxe: fix NOOPT build error - -gcc-11 (fedora 35): - -/home/kraxel/projects/edk2/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c: In function ?UsbIoBulkTransfer?: -/home/kraxel/projects/edk2/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c:277:12: error: ?UsbHcBulkTransfer? accessing 80 bytes in a region of size 8 [-Werror=stringop-overflow=] - -Signed-off-by: Gerd Hoffmann -Reviewed-by: Hao A Wu -(cherry picked from commit ae8272ef787d80950803c521a13a308651bdc62e) -Signed-off-by: Romain Naour ---- - MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c | 2 +- - MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c -index 7529e03e85..b2ce97ca37 100644 ---- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c -+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c -@@ -285,7 +285,7 @@ UsbHcBulkTransfer ( - IN UINT8 DevSpeed, - IN UINTN MaxPacket, - IN UINT8 BufferNum, -- IN OUT VOID *Data[EFI_USB_MAX_BULK_BUFFER_NUM], -+ IN OUT VOID *Data[], - IN OUT UINTN *DataLength, - IN OUT UINT8 *DataToggle, - IN UINTN TimeOut, -diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h -index 1d2b8a6174..1316a5981f 100644 ---- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h -+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h -@@ -149,7 +149,7 @@ UsbHcBulkTransfer ( - IN UINT8 DevSpeed, - IN UINTN MaxPacket, - IN UINT8 BufferNum, -- IN OUT VOID *Data[EFI_USB_MAX_BULK_BUFFER_NUM], -+ IN OUT VOID *Data[], - IN OUT UINTN *DataLength, - IN OUT UINT8 *DataToggle, - IN UINTN TimeOut, --- -2.35.3 - diff --git a/buildroot/boot/edk2/0001-OvmfPkg-QemuVideoDxe-add-feature-PCD-to-remap-frameb.patch b/buildroot/boot/edk2/0001-OvmfPkg-QemuVideoDxe-add-feature-PCD-to-remap-frameb.patch new file mode 100644 index 0000000000..5f6ceb289d --- /dev/null +++ b/buildroot/boot/edk2/0001-OvmfPkg-QemuVideoDxe-add-feature-PCD-to-remap-frameb.patch @@ -0,0 +1,129 @@ +From 921c78f57a16b00debd58899a48e7045015c374b Mon Sep 17 00:00:00 2001 +From: Ard Biesheuvel +Date: Mon, 17 Jun 2024 17:07:41 +0200 +Subject: [PATCH] OvmfPkg/QemuVideoDxe: add feature PCD to remap framebuffer + W/C + +Some platforms (such as SBSA-QEMU on recent builds of the emulator) only +tolerate misaligned accesses to normal memory, and raise alignment +faults on such accesses to device memory, which is the default for PCIe +MMIO BARs. + +When emulating a PCIe graphics controller, the framebuffer is typically +exposed via a MMIO BAR, while the disposition of the region is closer to +memory (no side effects on reads or writes, except for the changing +picture on the screen; direct random access to any pixel in the image). + +In order to permit the use of such controllers on platforms that only +tolerate these types of accesses for normal memory, it is necessary to +remap the memory. Use the DXE services to set the desired capabilities +and attributes. + +Hide this behavior under a feature PCD so only platforms that really +need it can enable it. (OVMF on x86 has no need for this) + +Signed-off-by: Ard Biesheuvel +Upstream: https://github.com/tianocore/edk2/commit/c1d1910be6e04a8b1a73090cf2881fb698947a6e +Signed-off-by: Romain Naour +--- + OvmfPkg/OvmfPkg.dec | 5 +++++ + OvmfPkg/QemuVideoDxe/Gop.c | 19 +++++++++++++++++++ + OvmfPkg/QemuVideoDxe/Qemu.h | 2 +- + OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf | 4 ++++ + 4 files changed, 29 insertions(+), 1 deletion(-) + +diff --git a/OvmfPkg/OvmfPkg.dec b/OvmfPkg/OvmfPkg.dec +index 51be9a5959..2c40de8a13 100644 +--- a/OvmfPkg/OvmfPkg.dec ++++ b/OvmfPkg/OvmfPkg.dec +@@ -444,3 +444,8 @@ + + ## This feature flag indicates the firmware build supports secure boot. + gUefiOvmfPkgTokenSpaceGuid.PcdSecureBootSupported|FALSE|BOOLEAN|0x6d ++ ++ ## Whether QemuVideoDxe should perform a EFI_MEMORY_WC remap of the PCI ++ # framebuffer. This might be required on platforms that do not tolerate ++ # misaligned accesses otherwise. ++ gUefiOvmfPkgTokenSpaceGuid.PcdRemapFrameBufferWriteCombine|FALSE|BOOLEAN|0x75 +diff --git a/OvmfPkg/QemuVideoDxe/Gop.c b/OvmfPkg/QemuVideoDxe/Gop.c +index b11eed7558..a29c025afd 100644 +--- a/OvmfPkg/QemuVideoDxe/Gop.c ++++ b/OvmfPkg/QemuVideoDxe/Gop.c +@@ -9,6 +9,8 @@ + + #include "Qemu.h" + ++#include ++ + STATIC + VOID + QemuVideoCompleteModeInfo ( +@@ -54,6 +56,7 @@ QemuVideoCompleteModeData ( + EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *Info; + EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *FrameBufDesc; + QEMU_VIDEO_MODE_DATA *ModeData; ++ EFI_STATUS Status; + + ModeData = &Private->ModeData[Mode->Mode]; + Info = Mode->Info; +@@ -79,6 +82,22 @@ QemuVideoCompleteModeData ( + (UINT64)Mode->FrameBufferSize + )); + ++ if (FeaturePcdGet (PcdRemapFrameBufferWriteCombine)) { ++ Status = gDS->SetMemorySpaceCapabilities ( ++ FrameBufDesc->AddrRangeMin, ++ FrameBufDesc->AddrLen, ++ EFI_MEMORY_UC | EFI_MEMORY_WC | EFI_MEMORY_XP ++ ); ++ ASSERT_EFI_ERROR (Status); ++ ++ Status = gDS->SetMemorySpaceAttributes ( ++ FrameBufDesc->AddrRangeMin, ++ FrameBufDesc->AddrLen, ++ EFI_MEMORY_WC | EFI_MEMORY_XP ++ ); ++ ASSERT_EFI_ERROR (Status); ++ } ++ + FreePool (FrameBufDesc); + return EFI_SUCCESS; + } +diff --git a/OvmfPkg/QemuVideoDxe/Qemu.h b/OvmfPkg/QemuVideoDxe/Qemu.h +index 57341a0bbf..a3da725fbf 100644 +--- a/OvmfPkg/QemuVideoDxe/Qemu.h ++++ b/OvmfPkg/QemuVideoDxe/Qemu.h +@@ -13,7 +13,7 @@ + #ifndef _QEMU_H_ + #define _QEMU_H_ + +-#include ++#include + #include + #include + #include +diff --git a/OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf b/OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf +index 43a6e07faa..4c0870171b 100644 +--- a/OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf ++++ b/OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf +@@ -44,6 +44,7 @@ + + [LibraryClasses] + BaseMemoryLib ++ DxeServicesTableLib + FrameBufferBltLib + DebugLib + DevicePathLib +@@ -61,6 +62,9 @@ + gEfiDevicePathProtocolGuid # PROTOCOL BY_START + gEfiPciIoProtocolGuid # PROTOCOL TO_START + ++[FeaturePcd] ++ gUefiOvmfPkgTokenSpaceGuid.PcdRemapFrameBufferWriteCombine ++ + [Pcd] + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfHostBridgePciDevId + gUefiOvmfPkgTokenSpaceGuid.PcdVideoResolutionSource +-- +2.45.0 + diff --git a/buildroot/boot/edk2/Config.in b/buildroot/boot/edk2/Config.in index df723122ee..4e6e7d122c 100644 --- a/buildroot/boot/edk2/Config.in +++ b/buildroot/boot/edk2/Config.in @@ -2,6 +2,7 @@ config BR2_TARGET_EDK2_ARCH_SUPPORTS bool default y if BR2_aarch64 default y if BR2_i386 + default y if BR2_RISCV_64 default y if BR2_x86_64 config BR2_TARGET_EDK2 @@ -20,6 +21,7 @@ if BR2_TARGET_EDK2 choice prompt "Platform" default BR2_TARGET_EDK2_PLATFORM_OVMF_I386 if BR2_i386 + default BR2_TARGET_EDK2_PLATFORM_OVMF_RISCV if BR2_RISCV_64 default BR2_TARGET_EDK2_PLATFORM_OVMF_X64 if BR2_x86_64 default BR2_TARGET_EDK2_PLATFORM_ARM_VIRT_QEMU if BR2_aarch64 @@ -31,6 +33,14 @@ config BR2_TARGET_EDK2_PLATFORM_OVMF_I386 This platform will boot from flash address 0x0. It should therefore be used as the first bootloader. +config BR2_TARGET_EDK2_PLATFORM_OVMF_RISCV + bool "RISC-V" + depends on BR2_RISCV_64 + help + Platform configuration for RISC-V QEMU targeting the Virt + machine. This platform will only boot from flash address + 0x0. It should therefore be used as the first bootloader. + config BR2_TARGET_EDK2_PLATFORM_OVMF_X64 bool "x86-64" depends on BR2_x86_64 @@ -88,6 +98,7 @@ config BR2_TARGET_EDK2_PLATFORM_SOLIDRUN_ARMADA80X0MCBIN bool "SolidRun MacchiatoBin" depends on BR2_aarch64 depends on BR2_TARGET_ARM_TRUSTED_FIRMWARE + select BR2_PACKAGE_EDK2_NON_OSI select BR2_PACKAGE_HOST_DTC select BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP help @@ -107,6 +118,21 @@ comment "QEMU SBSA depends on ATF not using EDK2 as BL33" endchoice +config BR2_TARGET_EDK2_OVMF_DEBUG_ON_SERIAL + bool "OVMF Debug on Serial" + depends on BR2_ENABLE_DEBUG + depends on BR2_TARGET_EDK2_PLATFORM_OVMF_I386 || \ + BR2_TARGET_EDK2_PLATFORM_OVMF_X64 + help + When EDK2 OVMF is built with debug, messages are printed to + IO port 0x402. Those messages are not shown in the normal + Qemu emulated serial port. Enabling this option will print + debug messages on the emulated serial port, potentially + mixing messages with UEFI serial console output. + + See OVMF README: + https://github.com/tianocore/edk2/blob/master/OvmfPkg/README + config BR2_TARGET_EDK2_FD_NAME string default "OVMF" if BR2_TARGET_EDK2_PLATFORM_OVMF_I386 diff --git a/buildroot/boot/edk2/edk2.hash b/buildroot/boot/edk2/edk2.hash index f28e9ce841..abcf3c6b8e 100644 --- a/buildroot/boot/edk2/edk2.hash +++ b/buildroot/boot/edk2/edk2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 04791c13b414a6d1877182a6d565cb762c30aa63e49bb4d495fca68ef4dd209d edk2-edk2-stable202102-br1.tar.gz +sha256 4595b9d9d14c06bd03f575e4b7623574a4a874ef465652ecdc224099a5b14fc7 edk2-edk2-stable202405-git4.tar.gz sha256 50ce20c9cfdb0e19ee34fe0a51fc0afe961f743697b068359ab2f862b494df80 License.txt diff --git a/buildroot/boot/edk2/edk2.mk b/buildroot/boot/edk2/edk2.mk index 2b12de53cb..145a9a80ae 100644 --- a/buildroot/boot/edk2/edk2.mk +++ b/buildroot/boot/edk2/edk2.mk @@ -4,11 +4,11 @@ # ################################################################################ -EDK2_VERSION = edk2-stable202102 +EDK2_VERSION = edk2-stable202405 EDK2_SITE = https://github.com/tianocore/edk2 EDK2_SITE_METHOD = git -EDK2_LICENSE = BSD-2-Clause -EDK2_LICENSE_FILE = License.txt +EDK2_LICENSE = BSD-2-Clause-Patent +EDK2_LICENSE_FILES = License.txt EDK2_CPE_ID_VENDOR = tianocore EDK2_DEPENDENCIES = edk2-platforms host-python3 host-acpica host-util-linux EDK2_INSTALL_TARGET = NO @@ -16,8 +16,15 @@ EDK2_INSTALL_IMAGES = YES ifeq ($(BR2_ENABLE_DEBUG),y) EDK2_BUILD_TYPE = DEBUG +ifeq ($(BR2_TARGET_EDK2_OVMF_DEBUG_ON_SERIAL),y) +# DEBUG_ON_SERIAL_PORT is only tested to be set, so don't disable it, as +# it would still be set. +EDK2_BUILD_OPTS += -DDEBUG_ON_SERIAL_PORT +endif else EDK2_BUILD_TYPE = RELEASE +# DEBUG_ON_SERIAL_PORT is only valid in debug builds, so useless to set +# it (enabled or disabled) on a release build. endif # Build system notes. @@ -47,7 +54,7 @@ endif EDK2_GIT_SUBMODULES = YES EDK2_BUILD_PACKAGES = $(@D)/Build/Buildroot -EDK2_PACKAGES_PATH = $(@D):$(EDK2_BUILD_PACKAGES):$(STAGING_DIR)/usr/share/edk2-platforms +EDK2_PACKAGES_PATHS = $(@D) $(EDK2_BUILD_PACKAGES) $(STAGING_DIR)/usr/share/edk2-platforms ifeq ($(BR2_TARGET_EDK2_PLATFORM_OVMF_I386),y) EDK2_ARCH = IA32 @@ -75,6 +82,12 @@ EDK2_PACKAGE_NAME = ArmVirtPkg EDK2_PLATFORM_NAME = ArmVirtQemuKernel EDK2_BUILD_DIR = $(EDK2_PLATFORM_NAME)-$(EDK2_ARCH) +else ifeq ($(BR2_TARGET_EDK2_PLATFORM_ARM_SGI575),y) +EDK2_ARCH = AARCH64 +EDK2_PACKAGE_NAME = Platform/ARM/SgiPkg/Sgi575 +EDK2_PLATFORM_NAME = Sgi575 +EDK2_BUILD_DIR = $(EDK2_PLATFORM_NAME) + else ifeq ($(BR2_TARGET_EDK2_PLATFORM_ARM_VEXPRESS_FVP_AARCH64),y) EDK2_ARCH = AARCH64 EDK2_PACKAGE_NAME = Platform/ARM/VExpressPkg @@ -102,12 +115,13 @@ endef else ifeq ($(BR2_TARGET_EDK2_PLATFORM_SOLIDRUN_ARMADA80X0MCBIN),y) EDK2_ARCH = AARCH64 -EDK2_DEPENDENCIES += host-dtc arm-trusted-firmware +EDK2_DEPENDENCIES += host-dtc arm-trusted-firmware edk2-non-osi EDK2_PACKAGE_NAME = Platform/SolidRun/Armada80x0McBin EDK2_PLATFORM_NAME = Armada80x0McBin EDK2_BUILD_DIR = $(EDK2_PLATFORM_NAME)-$(EDK2_ARCH) EDK2_BUILD_ENV += DTC_PREFIX=$(HOST_DIR)/bin/ EDK2_BUILD_OPTS += -D INCLUDE_TFTP_COMMAND +EDK2_PACKAGES_PATHS += $(STAGING_DIR)/usr/share/edk2-non-osi else ifeq ($(BR2_TARGET_EDK2_PLATFORM_QEMU_SBSA),y) EDK2_ARCH = AARCH64 @@ -122,13 +136,27 @@ define EDK2_PRE_BUILD_QEMU_SBSA ln -srf $(BINARIES_DIR)/{bl1.bin,fip.bin} $(EDK2_BUILD_PACKAGES)/Platform/Qemu/Sbsa/ endef +else ifeq ($(BR2_TARGET_EDK2_PLATFORM_OVMF_RISCV),y) +EDK2_ARCH = RISCV64 +EDK2_PACKAGE_NAME = OvmfPkg/RiscVVirt +EDK2_PLATFORM_NAME = RiscVVirtQemu +EDK2_BUILD_DIR = $(EDK2_PLATFORM_NAME) + endif EDK2_BASETOOLS_OPTS = \ EXTRA_LDFLAGS="$(HOST_LDFLAGS)" \ EXTRA_OPTFLAGS="$(HOST_CPPFLAGS)" +EDK2_PACKAGES_PATH = $(subst $(space),:,$(strip $(EDK2_PACKAGES_PATHS))) + +# EDK2 "build" script internally uses and calls "make", which controls +# its own flags. It is mainly tested while not being a sub-make. In +# order to stay in that configuration, we avoid leaking top-level +# Buildroot make flags into EDK2 build by clearing the MAKEFLAGS +# environment variable. EDK2_BUILD_ENV += \ + MAKEFLAGS= \ WORKSPACE=$(@D) \ PACKAGES_PATH=$(EDK2_PACKAGES_PATH) \ PYTHON_COMMAND=$(HOST_DIR)/bin/python3 \ diff --git a/buildroot/boot/grub2/0001-Add-missing-grub-core-extra_deps.lst-file-in-release.patch b/buildroot/boot/grub2/0001-Add-missing-grub-core-extra_deps.lst-file-in-release.patch new file mode 100644 index 0000000000..2a7c206b2d --- /dev/null +++ b/buildroot/boot/grub2/0001-Add-missing-grub-core-extra_deps.lst-file-in-release.patch @@ -0,0 +1,37 @@ +From 4d4dae6a52b1749642261a15f5dcc1e3d4150b36 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Fri, 22 Dec 2023 19:02:53 +0100 +Subject: [PATCH] Add missing grub-core/extra_deps.lst file in release tarball + +A file is missing in the grub-2.12 release tarballs (both .gz and .xz). +See [1]. The issue was reported in [2] and fixed upstream in [3]. + +This patch adds the missing file, on top of the release tarball. This +patch won't apply on upstream git, since the file is present in the +source repository. Since the issue is fixed upstream in [3], it is +expected upcoming releases tarballs will include the file. + +The file content was fetched from the upstream git repo: +https://git.savannah.gnu.org/gitweb/?p=grub.git;a=blob_plain;f=grub-core/extra_deps.lst;hb=refs/tags/grub-2.12 + +[1] https://ftp.gnu.org/gnu/grub/grub-2.12.tar.xz +[2] https://lists.gnu.org/archive/html/grub-devel/2023-12/msg00054.html +[3] https://git.savannah.gnu.org/gitweb/?p=grub.git;a=commit;h=b835601c7639ed1890f2d3db91900a8506011a8e + +Signed-off-by: Julien Olivain +Upstream: Fixed by: https://git.savannah.gnu.org/gitweb/?p=grub.git;a=commit;h=b835601c7639ed1890f2d3db91900a8506011a8e +--- + grub-core/extra_deps.lst | 1 + + 1 file changed, 1 insertion(+) + create mode 100644 grub-core/extra_deps.lst + +diff --git a/grub-core/extra_deps.lst b/grub-core/extra_deps.lst +new file mode 100644 +index 0000000..f44ad6a +--- /dev/null ++++ b/grub-core/extra_deps.lst +@@ -0,0 +1 @@ ++depends bli part_gpt +-- +2.43.0 + diff --git a/buildroot/boot/grub2/0001-build-Fix-GRUB-i386-pc-build-with-Ubuntu-gcc.patch b/buildroot/boot/grub2/0001-build-Fix-GRUB-i386-pc-build-with-Ubuntu-gcc.patch deleted file mode 100644 index 357c825f3c..0000000000 --- a/buildroot/boot/grub2/0001-build-Fix-GRUB-i386-pc-build-with-Ubuntu-gcc.patch +++ /dev/null @@ -1,313 +0,0 @@ -From 6643507ce30f775008e093580f0c9499dfb2c485 Mon Sep 17 00:00:00 2001 -From: Simon Hardy -Date: Tue, 24 Mar 2020 13:29:12 +0000 -Subject: build: Fix GRUB i386-pc build with Ubuntu gcc - -With recent versions of gcc on Ubuntu a very large lzma_decompress.img file is -output. (e.g. 134479600 bytes instead of 2864.) This causes grub-mkimage to -fail with: "error: Decompressor is too big." - -This seems to be caused by a section .note.gnu.property that is placed at an -offset such that objcopy needs to pad the img file with zeros. - -This issue is present on: -Ubuntu 19.10 with gcc (Ubuntu 8.3.0-26ubuntu1~19.10) 8.3.0 -Ubuntu 19.10 with gcc (Ubuntu 9.2.1-9ubuntu2) 9.2.1 20191008 - -This issue is not present on: -Ubuntu 19.10 with gcc (Ubuntu 7.5.0-3ubuntu1~19.10) 7.5.0 -RHEL 8.0 with gcc 8.3.1 20190507 (Red Hat 8.3.1-4) - -The issue can be fixed by removing the section using objcopy as shown in -this patch. - -Signed-off-by: Simon Hardy -Reviewed-by: Daniel Kiper -[Retrieved (and updated to directly patch Makefile.in instead of -gentpl.py to avoid adding a dependency on python) from: -http://git.savannah.gnu.org/cgit/grub.git/commit/?id=6643507ce30f775008e093580f0c9499dfb2c485] -Signed-off-by: Fabrice Fontaine -[yann.morin.1998@free.fr: - - keep the part patching gentpl.py - - restore it as a git-formatted patch - - introduce the hunk about the generated .am file -] -Signed-off-by: Yann E. MORIN ---- - gentpl.py | 2 1 1 0 +- - grub-core/Makefile.in | 38 19 19 0 +++++++++++++++++++------------------- - 2 files changed, 20 insertions(+), 20 deletions(-) - -diff --git a/gentpl.py b/gentpl.py -index 387588c05..c86550d4f 100644 ---- a/gentpl.py -+++ b/gentpl.py -@@ -766,7 +766,7 @@ def image(defn, platform): - if test x$(TARGET_APPLE_LINKER) = x1; then \ - $(MACHO2IMG) $< $@; \ - else \ -- $(TARGET_OBJCOPY) $(""" + cname(defn) + """_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; \ -+ $(TARGET_OBJCOPY) $(""" + cname(defn) + """_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; \ - fi - """) - -diff --git a/grub-core/Makefile.core.am b/grub-core/Makefile.core.am -index 387588c05..c86550d4f 100644 ---- a/grub-core/Makefile.core.am -+++ 2/grub-core/Makefile.core.am -@@ -22897,7 +22897,7 @@ - CLEANFILES += boot.img - - boot.img: boot.image$(EXEEXT) -- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - endif - -@@ -22918,7 +22918,7 @@ - CLEANFILES += boot.img - - boot.img: boot.image$(EXEEXT) -- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - endif - -@@ -22939,7 +22939,7 @@ - CLEANFILES += boot.img - - boot.img: boot.image$(EXEEXT) -- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - endif - -@@ -22960,7 +22960,7 @@ - CLEANFILES += boot_hybrid.img - - boot_hybrid.img: boot_hybrid.image$(EXEEXT) -- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(boot_hybrid_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(boot_hybrid_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - endif - -@@ -22981,7 +22981,7 @@ - CLEANFILES += cdboot.img - - cdboot.img: cdboot.image$(EXEEXT) -- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(cdboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(cdboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - endif - -@@ -23002,7 +23002,7 @@ - CLEANFILES += cdboot.img - - cdboot.img: cdboot.image$(EXEEXT) -- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(cdboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(cdboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - endif - -@@ -23023,7 +23023,7 @@ - CLEANFILES += pxeboot.img - - pxeboot.img: pxeboot.image$(EXEEXT) -- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(pxeboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(pxeboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - endif - -@@ -23044,7 +23044,7 @@ - CLEANFILES += diskboot.img - - diskboot.img: diskboot.image$(EXEEXT) -- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(diskboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(diskboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - endif - -@@ -23065,7 +23065,7 @@ - CLEANFILES += diskboot.img - - diskboot.img: diskboot.image$(EXEEXT) -- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(diskboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(diskboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - endif - -@@ -23086,7 +23086,7 @@ - CLEANFILES += lnxboot.img - - lnxboot.img: lnxboot.image$(EXEEXT) -- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(lnxboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(lnxboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - endif - -@@ -23107,7 +23107,7 @@ - CLEANFILES += xz_decompress.img - - xz_decompress.img: xz_decompress.image$(EXEEXT) -- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - endif - -@@ -23128,7 +23128,7 @@ - CLEANFILES += xz_decompress.img - - xz_decompress.img: xz_decompress.image$(EXEEXT) -- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - endif - -@@ -23149,7 +23149,7 @@ - CLEANFILES += xz_decompress.img - - xz_decompress.img: xz_decompress.image$(EXEEXT) -- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - endif - -@@ -23170,7 +23170,7 @@ - CLEANFILES += none_decompress.img - - none_decompress.img: none_decompress.image$(EXEEXT) -- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - endif - -@@ -23191,7 +23191,7 @@ - CLEANFILES += none_decompress.img - - none_decompress.img: none_decompress.image$(EXEEXT) -- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - endif - -@@ -23212,7 +23212,7 @@ - CLEANFILES += none_decompress.img - - none_decompress.img: none_decompress.image$(EXEEXT) -- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - endif - -@@ -23233,7 +23233,7 @@ - CLEANFILES += lzma_decompress.img - - lzma_decompress.img: lzma_decompress.image$(EXEEXT) -- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(lzma_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(lzma_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - endif - -@@ -23254,7 +23254,7 @@ - CLEANFILES += fwstart.img - - fwstart.img: fwstart.image$(EXEEXT) -- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(fwstart_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(fwstart_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - endif - -@@ -23275,7 +23275,7 @@ - CLEANFILES += fwstart_fuloong2f.img - - fwstart_fuloong2f.img: fwstart_fuloong2f.image$(EXEEXT) -- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(fwstart_fuloong2f_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(fwstart_fuloong2f_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - endif - -diff --git a/grub-core/Makefile.in b/grub-core/Makefile.in -index 387588c05..c86550d4f 100644 ---- a/grub-core/Makefile.in -+++ b/grub-core/Makefile.in -@@ -46531,61 +46531,61 @@ - @COND_riscv64_efi_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(TARGET_STRIP) -S -x $(kernel_exec) -o $@.bin $<; $(TARGET_OBJCONV) -f$(TARGET_MODULE_FORMAT) -nr:_grub_mod_init:grub_mod_init -nr:_grub_mod_fini:grub_mod_fini -ed2022 -ed2016 -wd1106 -nu -nd $@.bin $@; rm -f $@.bin; elif test ! -z '$(TARGET_OBJ2ELF)'; then $(TARGET_STRIP) $(kernel_exec_STRIPFLAGS) -o $@.bin $< && $(TARGET_OBJ2ELF) $@.bin $@ || (rm -f $@; rm -f $@.bin; exit 1); rm -f $@.bin; else $(TARGET_STRIP) $(kernel_exec_STRIPFLAGS) -o $@ $<; fi - - @COND_i386_pc_TRUE@boot.img: boot.image$(EXEEXT) --@COND_i386_pc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+@COND_i386_pc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - @COND_i386_qemu_TRUE@boot.img: boot.image$(EXEEXT) --@COND_i386_qemu_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+@COND_i386_qemu_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - @COND_sparc64_ieee1275_TRUE@boot.img: boot.image$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+@COND_sparc64_ieee1275_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - @COND_i386_pc_TRUE@boot_hybrid.img: boot_hybrid.image$(EXEEXT) --@COND_i386_pc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(boot_hybrid_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+@COND_i386_pc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(boot_hybrid_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - @COND_i386_pc_TRUE@cdboot.img: cdboot.image$(EXEEXT) --@COND_i386_pc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(cdboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+@COND_i386_pc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(cdboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - @COND_sparc64_ieee1275_TRUE@cdboot.img: cdboot.image$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(cdboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+@COND_sparc64_ieee1275_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(cdboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - @COND_i386_pc_TRUE@pxeboot.img: pxeboot.image$(EXEEXT) --@COND_i386_pc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(pxeboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+@COND_i386_pc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(pxeboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - @COND_i386_pc_TRUE@diskboot.img: diskboot.image$(EXEEXT) --@COND_i386_pc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(diskboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+@COND_i386_pc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(diskboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - @COND_sparc64_ieee1275_TRUE@diskboot.img: diskboot.image$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(diskboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+@COND_sparc64_ieee1275_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(diskboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - @COND_i386_pc_TRUE@lnxboot.img: lnxboot.image$(EXEEXT) --@COND_i386_pc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(lnxboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+@COND_i386_pc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(lnxboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - @COND_mips_loongson_TRUE@xz_decompress.img: xz_decompress.image$(EXEEXT) --@COND_mips_loongson_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+@COND_mips_loongson_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - @COND_mips_arc_TRUE@xz_decompress.img: xz_decompress.image$(EXEEXT) --@COND_mips_arc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+@COND_mips_arc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - @COND_mips_qemu_mips_TRUE@xz_decompress.img: xz_decompress.image$(EXEEXT) --@COND_mips_qemu_mips_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+@COND_mips_qemu_mips_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - @COND_mips_loongson_TRUE@none_decompress.img: none_decompress.image$(EXEEXT) --@COND_mips_loongson_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+@COND_mips_loongson_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - @COND_mips_arc_TRUE@none_decompress.img: none_decompress.image$(EXEEXT) --@COND_mips_arc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+@COND_mips_arc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - @COND_mips_qemu_mips_TRUE@none_decompress.img: none_decompress.image$(EXEEXT) --@COND_mips_qemu_mips_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+@COND_mips_qemu_mips_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - @COND_i386_pc_TRUE@lzma_decompress.img: lzma_decompress.image$(EXEEXT) --@COND_i386_pc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(lzma_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+@COND_i386_pc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(lzma_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - @COND_mips_loongson_TRUE@fwstart.img: fwstart.image$(EXEEXT) --@COND_mips_loongson_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(fwstart_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+@COND_mips_loongson_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(fwstart_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - @COND_mips_loongson_TRUE@fwstart_fuloong2f.img: fwstart_fuloong2f.image$(EXEEXT) --@COND_mips_loongson_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(fwstart_fuloong2f_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+@COND_mips_loongson_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(fwstart_fuloong2f_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - @COND_MAN_PAGES_TRUE@@COND_emu_TRUE@grub-emu.1: grub-emu - @COND_MAN_PAGES_TRUE@@COND_emu_TRUE@ chmod a+x grub-emu diff --git a/buildroot/boot/grub2/0002-yylex-Make-lexer-fatal-errors-actually-be-fatal.patch b/buildroot/boot/grub2/0002-yylex-Make-lexer-fatal-errors-actually-be-fatal.patch deleted file mode 100644 index 001dda820b..0000000000 --- a/buildroot/boot/grub2/0002-yylex-Make-lexer-fatal-errors-actually-be-fatal.patch +++ /dev/null @@ -1,73 +0,0 @@ -From a7ab0cc98fa89a3d5098c29cbe44bcd24b0a6454 Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Wed, 15 Apr 2020 15:45:02 -0400 -Subject: [PATCH] yylex: Make lexer fatal errors actually be fatal -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -When presented with a command that can't be tokenized to anything -smaller than YYLMAX characters, the parser calls YY_FATAL_ERROR(errmsg), -expecting that will stop further processing, as such: - - #define YY_DO_BEFORE_ACTION \ - yyg->yytext_ptr = yy_bp; \ - yyleng = (int) (yy_cp - yy_bp); \ - yyg->yy_hold_char = *yy_cp; \ - *yy_cp = '\0'; \ - if ( yyleng >= YYLMAX ) \ - YY_FATAL_ERROR( "token too large, exceeds YYLMAX" ); \ - yy_flex_strncpy( yytext, yyg->yytext_ptr, yyleng + 1 , yyscanner); \ - yyg->yy_c_buf_p = yy_cp; - -The code flex generates expects that YY_FATAL_ERROR() will either return -for it or do some form of longjmp(), or handle the error in some way at -least, and so the strncpy() call isn't in an "else" clause, and thus if -YY_FATAL_ERROR() is *not* actually fatal, it does the call with the -questionable limit, and predictable results ensue. - -Unfortunately, our implementation of YY_FATAL_ERROR() is: - - #define YY_FATAL_ERROR(msg) \ - do { \ - grub_printf (_("fatal error: %s\n"), _(msg)); \ - } while (0) - -The same pattern exists in yyless(), and similar problems exist in users -of YY_INPUT(), several places in the main parsing loop, -yy_get_next_buffer(), yy_load_buffer_state(), yyensure_buffer_stack, -yy_scan_buffer(), etc. - -All of these callers expect YY_FATAL_ERROR() to actually be fatal, and -the things they do if it returns after calling it are wildly unsafe. - -Fixes: CVE-2020-10713 - -Signed-off-by: Peter Jones -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/script/yylex.l | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/grub-core/script/yylex.l b/grub-core/script/yylex.l -index 7b44c37b7..b7203c823 100644 ---- a/grub-core/script/yylex.l -+++ b/grub-core/script/yylex.l -@@ -37,11 +37,11 @@ - - /* - * As we don't have access to yyscanner, we cannot do much except to -- * print the fatal error. -+ * print the fatal error and exit. - */ - #define YY_FATAL_ERROR(msg) \ - do { \ -- grub_printf (_("fatal error: %s\n"), _(msg)); \ -+ grub_fatal (_("fatal error: %s\n"), _(msg));\ - } while (0) - - #define COPY(str, hint) \ --- -2.26.2 - diff --git a/buildroot/boot/grub2/0003-safemath-Add-some-arithmetic-primitives-that-check-f.patch b/buildroot/boot/grub2/0003-safemath-Add-some-arithmetic-primitives-that-check-f.patch deleted file mode 100644 index 5c52113468..0000000000 --- a/buildroot/boot/grub2/0003-safemath-Add-some-arithmetic-primitives-that-check-f.patch +++ /dev/null @@ -1,128 +0,0 @@ -From 782a4580a5e347793443aa8e9152db1bf4a0fff8 Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Mon, 15 Jun 2020 10:58:42 -0400 -Subject: [PATCH] safemath: Add some arithmetic primitives that check for - overflow -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This adds a new header, include/grub/safemath.h, that includes easy to -use wrappers for __builtin_{add,sub,mul}_overflow() declared like: - - bool OP(a, b, res) - -where OP is grub_add, grub_sub or grub_mul. OP() returns true in the -case where the operation would overflow and res is not modified. -Otherwise, false is returned and the operation is executed. - -These arithmetic primitives require newer compiler versions. So, bump -these requirements in the INSTALL file too. - -Signed-off-by: Peter Jones -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - INSTALL | 22 ++-------------------- - include/grub/compiler.h | 8 ++++++++ - include/grub/safemath.h | 37 +++++++++++++++++++++++++++++++++++++ - 3 files changed, 47 insertions(+), 20 deletions(-) - create mode 100644 include/grub/safemath.h - -diff --git a/INSTALL b/INSTALL -index 8acb40902..dcb9b7d7b 100644 ---- a/INSTALL -+++ b/INSTALL -@@ -11,27 +11,9 @@ GRUB depends on some software packages installed into your system. If - you don't have any of them, please obtain and install them before - configuring the GRUB. - --* GCC 4.1.3 or later -- Note: older versions may work but support is limited -- -- Experimental support for clang 3.3 or later (results in much bigger binaries) -+* GCC 5.1.0 or later -+ Experimental support for clang 3.8.0 or later (results in much bigger binaries) - for i386, x86_64, arm (including thumb), arm64, mips(el), powerpc, sparc64 -- Note: clang 3.2 or later works for i386 and x86_64 targets but results in -- much bigger binaries. -- earlier versions not tested -- Note: clang 3.2 or later works for arm -- earlier versions not tested -- Note: clang on arm64 is not supported due to -- https://llvm.org/bugs/show_bug.cgi?id=26030 -- Note: clang 3.3 or later works for mips(el) -- earlier versions fail to generate .reginfo and hence gprel relocations -- fail. -- Note: clang 3.2 or later works for powerpc -- earlier versions not tested -- Note: clang 3.5 or later works for sparc64 -- earlier versions return "error: unable to interface with target machine" -- Note: clang has no support for ia64 and hence you can't compile GRUB -- for ia64 with clang - * GNU Make - * GNU Bison 2.3 or later - * GNU gettext 0.17 or later -diff --git a/include/grub/compiler.h b/include/grub/compiler.h -index c9e1d7a73..8f3be3ae7 100644 ---- a/include/grub/compiler.h -+++ b/include/grub/compiler.h -@@ -48,4 +48,12 @@ - # define WARN_UNUSED_RESULT - #endif - -+#if defined(__clang__) && defined(__clang_major__) && defined(__clang_minor__) -+# define CLANG_PREREQ(maj,min) \ -+ ((__clang_major__ > (maj)) || \ -+ (__clang_major__ == (maj) && __clang_minor__ >= (min))) -+#else -+# define CLANG_PREREQ(maj,min) 0 -+#endif -+ - #endif /* ! GRUB_COMPILER_HEADER */ -diff --git a/include/grub/safemath.h b/include/grub/safemath.h -new file mode 100644 -index 000000000..c17b89bba ---- /dev/null -+++ b/include/grub/safemath.h -@@ -0,0 +1,37 @@ -+/* -+ * GRUB -- GRand Unified Bootloader -+ * Copyright (C) 2020 Free Software Foundation, Inc. -+ * -+ * GRUB is free software: you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation, either version 3 of the License, or -+ * (at your option) any later version. -+ * -+ * GRUB is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with GRUB. If not, see . -+ * -+ * Arithmetic operations that protect against overflow. -+ */ -+ -+#ifndef GRUB_SAFEMATH_H -+#define GRUB_SAFEMATH_H 1 -+ -+#include -+ -+/* These appear in gcc 5.1 and clang 3.8. */ -+#if GNUC_PREREQ(5, 1) || CLANG_PREREQ(3, 8) -+ -+#define grub_add(a, b, res) __builtin_add_overflow(a, b, res) -+#define grub_sub(a, b, res) __builtin_sub_overflow(a, b, res) -+#define grub_mul(a, b, res) __builtin_mul_overflow(a, b, res) -+ -+#else -+#error gcc 5.1 or newer or clang 3.8 or newer is required -+#endif -+ -+#endif /* GRUB_SAFEMATH_H */ --- -2.26.2 - diff --git a/buildroot/boot/grub2/0004-calloc-Make-sure-we-always-have-an-overflow-checking.patch b/buildroot/boot/grub2/0004-calloc-Make-sure-we-always-have-an-overflow-checking.patch deleted file mode 100644 index a2e19f0eaf..0000000000 --- a/buildroot/boot/grub2/0004-calloc-Make-sure-we-always-have-an-overflow-checking.patch +++ /dev/null @@ -1,246 +0,0 @@ -From 5775eb40862b67468ced816e6d7560dbe22a3670 Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Mon, 15 Jun 2020 12:15:29 -0400 -Subject: [PATCH] calloc: Make sure we always have an overflow-checking - calloc() available -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This tries to make sure that everywhere in this source tree, we always have -an appropriate version of calloc() (i.e. grub_calloc(), xcalloc(), etc.) -available, and that they all safely check for overflow and return NULL when -it would occur. - -Signed-off-by: Peter Jones -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/kern/emu/misc.c | 12 +++++++++ - grub-core/kern/emu/mm.c | 10 ++++++++ - grub-core/kern/mm.c | 40 ++++++++++++++++++++++++++++++ - grub-core/lib/libgcrypt_wrap/mem.c | 11 ++++++-- - grub-core/lib/posix_wrap/stdlib.h | 8 +++++- - include/grub/emu/misc.h | 1 + - include/grub/mm.h | 6 +++++ - 7 files changed, 85 insertions(+), 3 deletions(-) - -diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c -index 65db79baa..dfd8a8ec4 100644 ---- a/grub-core/kern/emu/misc.c -+++ b/grub-core/kern/emu/misc.c -@@ -85,6 +85,18 @@ grub_util_error (const char *fmt, ...) - exit (1); - } - -+void * -+xcalloc (grub_size_t nmemb, grub_size_t size) -+{ -+ void *p; -+ -+ p = calloc (nmemb, size); -+ if (!p) -+ grub_util_error ("%s", _("out of memory")); -+ -+ return p; -+} -+ - void * - xmalloc (grub_size_t size) - { -diff --git a/grub-core/kern/emu/mm.c b/grub-core/kern/emu/mm.c -index f262e95e3..145b01d37 100644 ---- a/grub-core/kern/emu/mm.c -+++ b/grub-core/kern/emu/mm.c -@@ -25,6 +25,16 @@ - #include - #include - -+void * -+grub_calloc (grub_size_t nmemb, grub_size_t size) -+{ -+ void *ret; -+ ret = calloc (nmemb, size); -+ if (!ret) -+ grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory")); -+ return ret; -+} -+ - void * - grub_malloc (grub_size_t size) - { -diff --git a/grub-core/kern/mm.c b/grub-core/kern/mm.c -index ee88ff611..f2822a836 100644 ---- a/grub-core/kern/mm.c -+++ b/grub-core/kern/mm.c -@@ -67,8 +67,10 @@ - #include - #include - #include -+#include - - #ifdef MM_DEBUG -+# undef grub_calloc - # undef grub_malloc - # undef grub_zalloc - # undef grub_realloc -@@ -375,6 +377,30 @@ grub_memalign (grub_size_t align, grub_size_t size) - return 0; - } - -+/* -+ * Allocate NMEMB instances of SIZE bytes and return the pointer, or error on -+ * integer overflow. -+ */ -+void * -+grub_calloc (grub_size_t nmemb, grub_size_t size) -+{ -+ void *ret; -+ grub_size_t sz = 0; -+ -+ if (grub_mul (nmemb, size, &sz)) -+ { -+ grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is detected")); -+ return NULL; -+ } -+ -+ ret = grub_memalign (0, sz); -+ if (!ret) -+ return NULL; -+ -+ grub_memset (ret, 0, sz); -+ return ret; -+} -+ - /* Allocate SIZE bytes and return the pointer. */ - void * - grub_malloc (grub_size_t size) -@@ -561,6 +587,20 @@ grub_mm_dump (unsigned lineno) - grub_printf ("\n"); - } - -+void * -+grub_debug_calloc (const char *file, int line, grub_size_t nmemb, grub_size_t size) -+{ -+ void *ptr; -+ -+ if (grub_mm_debug) -+ grub_printf ("%s:%d: calloc (0x%" PRIxGRUB_SIZE ", 0x%" PRIxGRUB_SIZE ") = ", -+ file, line, size); -+ ptr = grub_calloc (nmemb, size); -+ if (grub_mm_debug) -+ grub_printf ("%p\n", ptr); -+ return ptr; -+} -+ - void * - grub_debug_malloc (const char *file, int line, grub_size_t size) - { -diff --git a/grub-core/lib/libgcrypt_wrap/mem.c b/grub-core/lib/libgcrypt_wrap/mem.c -index beeb661a3..74c6eafe5 100644 ---- a/grub-core/lib/libgcrypt_wrap/mem.c -+++ b/grub-core/lib/libgcrypt_wrap/mem.c -@@ -4,6 +4,7 @@ - #include - #include - #include -+#include - - GRUB_MOD_LICENSE ("GPLv3+"); - -@@ -36,7 +37,10 @@ void * - gcry_xcalloc (size_t n, size_t m) - { - void *ret; -- ret = grub_zalloc (n * m); -+ size_t sz; -+ if (grub_mul (n, m, &sz)) -+ grub_fatal ("gcry_xcalloc would overflow"); -+ ret = grub_zalloc (sz); - if (!ret) - grub_fatal ("gcry_xcalloc failed"); - return ret; -@@ -56,7 +60,10 @@ void * - gcry_xcalloc_secure (size_t n, size_t m) - { - void *ret; -- ret = grub_zalloc (n * m); -+ size_t sz; -+ if (grub_mul (n, m, &sz)) -+ grub_fatal ("gcry_xcalloc would overflow"); -+ ret = grub_zalloc (sz); - if (!ret) - grub_fatal ("gcry_xcalloc failed"); - return ret; -diff --git a/grub-core/lib/posix_wrap/stdlib.h b/grub-core/lib/posix_wrap/stdlib.h -index 3b46f47ff..7a8d385e9 100644 ---- a/grub-core/lib/posix_wrap/stdlib.h -+++ b/grub-core/lib/posix_wrap/stdlib.h -@@ -21,6 +21,7 @@ - - #include - #include -+#include - - static inline void - free (void *ptr) -@@ -37,7 +38,12 @@ malloc (grub_size_t size) - static inline void * - calloc (grub_size_t size, grub_size_t nelem) - { -- return grub_zalloc (size * nelem); -+ grub_size_t sz; -+ -+ if (grub_mul (size, nelem, &sz)) -+ return NULL; -+ -+ return grub_zalloc (sz); - } - - static inline void * -diff --git a/include/grub/emu/misc.h b/include/grub/emu/misc.h -index ce464cfd0..ff9c48a64 100644 ---- a/include/grub/emu/misc.h -+++ b/include/grub/emu/misc.h -@@ -47,6 +47,7 @@ grub_util_device_is_mapped (const char *dev); - #define GRUB_HOST_PRIuLONG_LONG "llu" - #define GRUB_HOST_PRIxLONG_LONG "llx" - -+void * EXPORT_FUNC(xcalloc) (grub_size_t nmemb, grub_size_t size) WARN_UNUSED_RESULT; - void * EXPORT_FUNC(xmalloc) (grub_size_t size) WARN_UNUSED_RESULT; - void * EXPORT_FUNC(xrealloc) (void *ptr, grub_size_t size) WARN_UNUSED_RESULT; - char * EXPORT_FUNC(xstrdup) (const char *str) WARN_UNUSED_RESULT; -diff --git a/include/grub/mm.h b/include/grub/mm.h -index 28e2e53eb..9c38dd3ca 100644 ---- a/include/grub/mm.h -+++ b/include/grub/mm.h -@@ -29,6 +29,7 @@ - #endif - - void grub_mm_init_region (void *addr, grub_size_t size); -+void *EXPORT_FUNC(grub_calloc) (grub_size_t nmemb, grub_size_t size); - void *EXPORT_FUNC(grub_malloc) (grub_size_t size); - void *EXPORT_FUNC(grub_zalloc) (grub_size_t size); - void EXPORT_FUNC(grub_free) (void *ptr); -@@ -48,6 +49,9 @@ extern int EXPORT_VAR(grub_mm_debug); - void grub_mm_dump_free (void); - void grub_mm_dump (unsigned lineno); - -+#define grub_calloc(nmemb, size) \ -+ grub_debug_calloc (GRUB_FILE, __LINE__, nmemb, size) -+ - #define grub_malloc(size) \ - grub_debug_malloc (GRUB_FILE, __LINE__, size) - -@@ -63,6 +67,8 @@ void grub_mm_dump (unsigned lineno); - #define grub_free(ptr) \ - grub_debug_free (GRUB_FILE, __LINE__, ptr) - -+void *EXPORT_FUNC(grub_debug_calloc) (const char *file, int line, -+ grub_size_t nmemb, grub_size_t size); - void *EXPORT_FUNC(grub_debug_malloc) (const char *file, int line, - grub_size_t size); - void *EXPORT_FUNC(grub_debug_zalloc) (const char *file, int line, --- -2.26.2 - diff --git a/buildroot/boot/grub2/0005-calloc-Use-calloc-at-most-places.patch b/buildroot/boot/grub2/0005-calloc-Use-calloc-at-most-places.patch deleted file mode 100644 index 096c2dfc40..0000000000 --- a/buildroot/boot/grub2/0005-calloc-Use-calloc-at-most-places.patch +++ /dev/null @@ -1,1840 +0,0 @@ -From 8185711241d73931269f402bb6799f7e2c58f04b Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Mon, 15 Jun 2020 12:26:01 -0400 -Subject: [PATCH] calloc: Use calloc() at most places -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This modifies most of the places we do some form of: - - X = malloc(Y * Z); - -to use calloc(Y, Z) instead. - -Among other issues, this fixes: - - allocation of integer overflow in grub_png_decode_image_header() - reported by Chris Coulson, - - allocation of integer overflow in luks_recover_key() - reported by Chris Coulson, - - allocation of integer overflow in grub_lvm_detect() - reported by Chris Coulson. - -Fixes: CVE-2020-14308 - -Signed-off-by: Peter Jones -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/bus/usb/usbhub.c | 8 ++++---- - grub-core/commands/efi/lsefisystab.c | 3 ++- - grub-core/commands/legacycfg.c | 6 +++--- - grub-core/commands/menuentry.c | 2 +- - grub-core/commands/nativedisk.c | 2 +- - grub-core/commands/parttool.c | 12 +++++++++--- - grub-core/commands/regexp.c | 2 +- - grub-core/commands/search_wrap.c | 2 +- - grub-core/disk/diskfilter.c | 4 ++-- - grub-core/disk/ieee1275/ofdisk.c | 2 +- - grub-core/disk/ldm.c | 14 +++++++------- - grub-core/disk/luks.c | 2 +- - grub-core/disk/lvm.c | 8 ++++---- - grub-core/disk/xen/xendisk.c | 2 +- - grub-core/efiemu/loadcore.c | 2 +- - grub-core/efiemu/mm.c | 6 +++--- - grub-core/font/font.c | 3 +-- - grub-core/fs/affs.c | 6 +++--- - grub-core/fs/btrfs.c | 6 +++--- - grub-core/fs/hfs.c | 2 +- - grub-core/fs/hfsplus.c | 6 +++--- - grub-core/fs/iso9660.c | 2 +- - grub-core/fs/ntfs.c | 4 ++-- - grub-core/fs/sfs.c | 2 +- - grub-core/fs/tar.c | 2 +- - grub-core/fs/udf.c | 4 ++-- - grub-core/fs/zfs/zfs.c | 4 ++-- - grub-core/gfxmenu/gui_string_util.c | 2 +- - grub-core/gfxmenu/widget-box.c | 4 ++-- - grub-core/io/gzio.c | 2 +- - grub-core/kern/efi/efi.c | 6 +++--- - grub-core/kern/emu/hostdisk.c | 2 +- - grub-core/kern/fs.c | 2 +- - grub-core/kern/misc.c | 2 +- - grub-core/kern/parser.c | 2 +- - grub-core/kern/uboot/uboot.c | 2 +- - grub-core/lib/libgcrypt/cipher/ac.c | 8 ++++---- - grub-core/lib/libgcrypt/cipher/primegen.c | 4 ++-- - grub-core/lib/libgcrypt/cipher/pubkey.c | 4 ++-- - grub-core/lib/priority_queue.c | 2 +- - grub-core/lib/reed_solomon.c | 7 +++---- - grub-core/lib/relocator.c | 10 +++++----- - grub-core/lib/zstd/fse_decompress.c | 2 +- - grub-core/loader/arm/linux.c | 2 +- - grub-core/loader/efi/chainloader.c | 2 +- - grub-core/loader/i386/bsdXX.c | 2 +- - grub-core/loader/i386/xnu.c | 4 ++-- - grub-core/loader/macho.c | 2 +- - grub-core/loader/multiboot_elfxx.c | 2 +- - grub-core/loader/xnu.c | 2 +- - grub-core/mmap/mmap.c | 4 ++-- - grub-core/net/bootp.c | 2 +- - grub-core/net/dns.c | 10 +++++----- - grub-core/net/net.c | 4 ++-- - grub-core/normal/charset.c | 10 +++++----- - grub-core/normal/cmdline.c | 14 +++++++------- - grub-core/normal/menu_entry.c | 14 +++++++------- - grub-core/normal/menu_text.c | 4 ++-- - grub-core/normal/term.c | 4 ++-- - grub-core/osdep/linux/getroot.c | 6 +++--- - grub-core/osdep/unix/config.c | 2 +- - grub-core/osdep/windows/getroot.c | 2 +- - grub-core/osdep/windows/hostdisk.c | 4 ++-- - grub-core/osdep/windows/init.c | 2 +- - grub-core/osdep/windows/platform.c | 4 ++-- - grub-core/osdep/windows/relpath.c | 2 +- - grub-core/partmap/gpt.c | 2 +- - grub-core/partmap/msdos.c | 2 +- - grub-core/script/execute.c | 2 +- - grub-core/tests/fake_input.c | 2 +- - grub-core/tests/video_checksum.c | 6 +++--- - grub-core/video/capture.c | 2 +- - grub-core/video/emu/sdl.c | 2 +- - grub-core/video/i386/pc/vga.c | 2 +- - grub-core/video/readers/png.c | 2 +- - include/grub/unicode.h | 4 ++-- - util/getroot.c | 2 +- - util/grub-file.c | 2 +- - util/grub-fstest.c | 4 ++-- - util/grub-install-common.c | 2 +- - util/grub-install.c | 4 ++-- - util/grub-mkimagexx.c | 6 ++---- - util/grub-mkrescue.c | 4 ++-- - util/grub-mkstandalone.c | 2 +- - util/grub-pe2elf.c | 12 +++++------- - util/grub-probe.c | 4 ++-- - 86 files changed, 176 insertions(+), 175 deletions(-) - -diff --git a/grub-core/bus/usb/usbhub.c b/grub-core/bus/usb/usbhub.c -index 34a7ff1b5..a06cce302 100644 ---- a/grub-core/bus/usb/usbhub.c -+++ b/grub-core/bus/usb/usbhub.c -@@ -149,8 +149,8 @@ grub_usb_add_hub (grub_usb_device_t dev) - grub_usb_set_configuration (dev, 1); - - dev->nports = hubdesc.portcnt; -- dev->children = grub_zalloc (hubdesc.portcnt * sizeof (dev->children[0])); -- dev->ports = grub_zalloc (dev->nports * sizeof (dev->ports[0])); -+ dev->children = grub_calloc (hubdesc.portcnt, sizeof (dev->children[0])); -+ dev->ports = grub_calloc (dev->nports, sizeof (dev->ports[0])); - if (!dev->children || !dev->ports) - { - grub_free (dev->children); -@@ -268,8 +268,8 @@ grub_usb_controller_dev_register_iter (grub_usb_controller_t controller, void *d - - /* Query the number of ports the root Hub has. */ - hub->nports = controller->dev->hubports (controller); -- hub->devices = grub_zalloc (sizeof (hub->devices[0]) * hub->nports); -- hub->ports = grub_zalloc (sizeof (hub->ports[0]) * hub->nports); -+ hub->devices = grub_calloc (hub->nports, sizeof (hub->devices[0])); -+ hub->ports = grub_calloc (hub->nports, sizeof (hub->ports[0])); - if (!hub->devices || !hub->ports) - { - grub_free (hub->devices); -diff --git a/grub-core/commands/efi/lsefisystab.c b/grub-core/commands/efi/lsefisystab.c -index df1030221..cd81507f5 100644 ---- a/grub-core/commands/efi/lsefisystab.c -+++ b/grub-core/commands/efi/lsefisystab.c -@@ -71,7 +71,8 @@ grub_cmd_lsefisystab (struct grub_command *cmd __attribute__ ((unused)), - grub_printf ("Vendor: "); - - for (vendor_utf16 = st->firmware_vendor; *vendor_utf16; vendor_utf16++); -- vendor = grub_malloc (4 * (vendor_utf16 - st->firmware_vendor) + 1); -+ /* Allocate extra 3 bytes to simplify math. */ -+ vendor = grub_calloc (4, vendor_utf16 - st->firmware_vendor + 1); - if (!vendor) - return grub_errno; - *grub_utf16_to_utf8 ((grub_uint8_t *) vendor, st->firmware_vendor, -diff --git a/grub-core/commands/legacycfg.c b/grub-core/commands/legacycfg.c -index db7a8f002..5e3ec0d5e 100644 ---- a/grub-core/commands/legacycfg.c -+++ b/grub-core/commands/legacycfg.c -@@ -314,7 +314,7 @@ grub_cmd_legacy_kernel (struct grub_command *mycmd __attribute__ ((unused)), - if (argc < 2) - return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected")); - -- cutargs = grub_malloc (sizeof (cutargs[0]) * (argc - 1)); -+ cutargs = grub_calloc (argc - 1, sizeof (cutargs[0])); - if (!cutargs) - return grub_errno; - cutargc = argc - 1; -@@ -436,7 +436,7 @@ grub_cmd_legacy_kernel (struct grub_command *mycmd __attribute__ ((unused)), - { - char rbuf[3] = "-r"; - bsdargc = cutargc + 2; -- bsdargs = grub_malloc (sizeof (bsdargs[0]) * bsdargc); -+ bsdargs = grub_calloc (bsdargc, sizeof (bsdargs[0])); - if (!bsdargs) - { - err = grub_errno; -@@ -559,7 +559,7 @@ grub_cmd_legacy_initrdnounzip (struct grub_command *mycmd __attribute__ ((unused - return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("can't find command `%s'"), - "module"); - -- newargs = grub_malloc ((argc + 1) * sizeof (newargs[0])); -+ newargs = grub_calloc (argc + 1, sizeof (newargs[0])); - if (!newargs) - return grub_errno; - grub_memcpy (newargs + 1, args, argc * sizeof (newargs[0])); -diff --git a/grub-core/commands/menuentry.c b/grub-core/commands/menuentry.c -index 2c5363da7..9164df744 100644 ---- a/grub-core/commands/menuentry.c -+++ b/grub-core/commands/menuentry.c -@@ -154,7 +154,7 @@ grub_normal_add_menu_entry (int argc, const char **args, - goto fail; - - /* Save argc, args to pass as parameters to block arg later. */ -- menu_args = grub_malloc (sizeof (char*) * (argc + 1)); -+ menu_args = grub_calloc (argc + 1, sizeof (char *)); - if (! menu_args) - goto fail; - -diff --git a/grub-core/commands/nativedisk.c b/grub-core/commands/nativedisk.c -index 699447d11..7c8f97f6a 100644 ---- a/grub-core/commands/nativedisk.c -+++ b/grub-core/commands/nativedisk.c -@@ -195,7 +195,7 @@ grub_cmd_nativedisk (grub_command_t cmd __attribute__ ((unused)), - else - path_prefix = prefix; - -- mods = grub_malloc (argc * sizeof (mods[0])); -+ mods = grub_calloc (argc, sizeof (mods[0])); - if (!mods) - return grub_errno; - -diff --git a/grub-core/commands/parttool.c b/grub-core/commands/parttool.c -index 22b46b187..051e31320 100644 ---- a/grub-core/commands/parttool.c -+++ b/grub-core/commands/parttool.c -@@ -59,7 +59,13 @@ grub_parttool_register(const char *part_name, - for (nargs = 0; args[nargs].name != 0; nargs++); - cur->nargs = nargs; - cur->args = (struct grub_parttool_argdesc *) -- grub_malloc ((nargs + 1) * sizeof (struct grub_parttool_argdesc)); -+ grub_calloc (nargs + 1, sizeof (struct grub_parttool_argdesc)); -+ if (!cur->args) -+ { -+ grub_free (cur); -+ curhandle--; -+ return -1; -+ } - grub_memcpy (cur->args, args, - (nargs + 1) * sizeof (struct grub_parttool_argdesc)); - -@@ -257,7 +263,7 @@ grub_cmd_parttool (grub_command_t cmd __attribute__ ((unused)), - return err; - } - -- parsed = (int *) grub_zalloc (argc * sizeof (int)); -+ parsed = (int *) grub_calloc (argc, sizeof (int)); - - for (i = 1; i < argc; i++) - if (! parsed[i]) -@@ -290,7 +296,7 @@ grub_cmd_parttool (grub_command_t cmd __attribute__ ((unused)), - } - ptool = cur; - pargs = (struct grub_parttool_args *) -- grub_zalloc (ptool->nargs * sizeof (struct grub_parttool_args)); -+ grub_calloc (ptool->nargs, sizeof (struct grub_parttool_args)); - for (j = i; j < argc; j++) - if (! parsed[j]) - { -diff --git a/grub-core/commands/regexp.c b/grub-core/commands/regexp.c -index f00b184c8..4019164f3 100644 ---- a/grub-core/commands/regexp.c -+++ b/grub-core/commands/regexp.c -@@ -116,7 +116,7 @@ grub_cmd_regexp (grub_extcmd_context_t ctxt, int argc, char **args) - if (ret) - goto fail; - -- matches = grub_zalloc (sizeof (*matches) * (regex.re_nsub + 1)); -+ matches = grub_calloc (regex.re_nsub + 1, sizeof (*matches)); - if (! matches) - goto fail; - -diff --git a/grub-core/commands/search_wrap.c b/grub-core/commands/search_wrap.c -index d7fd26b94..47fc8eb99 100644 ---- a/grub-core/commands/search_wrap.c -+++ b/grub-core/commands/search_wrap.c -@@ -122,7 +122,7 @@ grub_cmd_search (grub_extcmd_context_t ctxt, int argc, char **args) - for (i = 0; state[SEARCH_HINT_BAREMETAL].args[i]; i++) - nhints++; - -- hints = grub_malloc (sizeof (hints[0]) * nhints); -+ hints = grub_calloc (nhints, sizeof (hints[0])); - if (!hints) - return grub_errno; - j = 0; -diff --git a/grub-core/disk/diskfilter.c b/grub-core/disk/diskfilter.c -index c3b578acf..68ca9e0be 100644 ---- a/grub-core/disk/diskfilter.c -+++ b/grub-core/disk/diskfilter.c -@@ -1134,7 +1134,7 @@ grub_diskfilter_make_raid (grub_size_t uuidlen, char *uuid, int nmemb, - array->lvs->segments->node_count = nmemb; - array->lvs->segments->raid_member_size = disk_size; - array->lvs->segments->nodes -- = grub_zalloc (nmemb * sizeof (array->lvs->segments->nodes[0])); -+ = grub_calloc (nmemb, sizeof (array->lvs->segments->nodes[0])); - array->lvs->segments->stripe_size = stripe_size; - for (i = 0; i < nmemb; i++) - { -@@ -1226,7 +1226,7 @@ insert_array (grub_disk_t disk, const struct grub_diskfilter_pv_id *id, - grub_partition_t p; - for (p = disk->partition; p; p = p->parent) - s++; -- pv->partmaps = xmalloc (s * sizeof (pv->partmaps[0])); -+ pv->partmaps = xcalloc (s, sizeof (pv->partmaps[0])); - s = 0; - for (p = disk->partition; p; p = p->parent) - pv->partmaps[s++] = xstrdup (p->partmap->name); -diff --git a/grub-core/disk/ieee1275/ofdisk.c b/grub-core/disk/ieee1275/ofdisk.c -index f73257e66..03674cb47 100644 ---- a/grub-core/disk/ieee1275/ofdisk.c -+++ b/grub-core/disk/ieee1275/ofdisk.c -@@ -297,7 +297,7 @@ dev_iterate (const struct grub_ieee1275_devalias *alias) - /* Power machines documentation specify 672 as maximum SAS disks in - one system. Using a slightly larger value to be safe. */ - table_size = 768; -- table = grub_malloc (table_size * sizeof (grub_uint64_t)); -+ table = grub_calloc (table_size, sizeof (grub_uint64_t)); - - if (!table) - { -diff --git a/grub-core/disk/ldm.c b/grub-core/disk/ldm.c -index 2a22d2d6c..e6323701a 100644 ---- a/grub-core/disk/ldm.c -+++ b/grub-core/disk/ldm.c -@@ -323,8 +323,8 @@ make_vg (grub_disk_t disk, - lv->segments->type = GRUB_DISKFILTER_MIRROR; - lv->segments->node_count = 0; - lv->segments->node_alloc = 8; -- lv->segments->nodes = grub_zalloc (sizeof (*lv->segments->nodes) -- * lv->segments->node_alloc); -+ lv->segments->nodes = grub_calloc (lv->segments->node_alloc, -+ sizeof (*lv->segments->nodes)); - if (!lv->segments->nodes) - goto fail2; - ptr = vblk[i].dynamic; -@@ -543,8 +543,8 @@ make_vg (grub_disk_t disk, - { - comp->segment_alloc = 8; - comp->segment_count = 0; -- comp->segments = grub_malloc (sizeof (*comp->segments) -- * comp->segment_alloc); -+ comp->segments = grub_calloc (comp->segment_alloc, -+ sizeof (*comp->segments)); - if (!comp->segments) - goto fail2; - } -@@ -590,8 +590,8 @@ make_vg (grub_disk_t disk, - } - comp->segments->node_count = read_int (ptr + 1, *ptr); - comp->segments->node_alloc = comp->segments->node_count; -- comp->segments->nodes = grub_zalloc (sizeof (*comp->segments->nodes) -- * comp->segments->node_alloc); -+ comp->segments->nodes = grub_calloc (comp->segments->node_alloc, -+ sizeof (*comp->segments->nodes)); - if (!lv->segments->nodes) - goto fail2; - } -@@ -1017,7 +1017,7 @@ grub_util_ldm_embed (struct grub_disk *disk, unsigned int *nsectors, - *nsectors = lv->size; - if (*nsectors > max_nsectors) - *nsectors = max_nsectors; -- *sectors = grub_malloc (*nsectors * sizeof (**sectors)); -+ *sectors = grub_calloc (*nsectors, sizeof (**sectors)); - if (!*sectors) - return grub_errno; - for (i = 0; i < *nsectors; i++) -diff --git a/grub-core/disk/luks.c b/grub-core/disk/luks.c -index 86c50c612..18b3a8bb1 100644 ---- a/grub-core/disk/luks.c -+++ b/grub-core/disk/luks.c -@@ -336,7 +336,7 @@ luks_recover_key (grub_disk_t source, - && grub_be_to_cpu32 (header.keyblock[i].stripes) > max_stripes) - max_stripes = grub_be_to_cpu32 (header.keyblock[i].stripes); - -- split_key = grub_malloc (keysize * max_stripes); -+ split_key = grub_calloc (keysize, max_stripes); - if (!split_key) - return grub_errno; - -diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c -index 7b265c780..d1df640b3 100644 ---- a/grub-core/disk/lvm.c -+++ b/grub-core/disk/lvm.c -@@ -173,7 +173,7 @@ grub_lvm_detect (grub_disk_t disk, - first one. */ - - /* Allocate buffer space for the circular worst-case scenario. */ -- metadatabuf = grub_malloc (2 * mda_size); -+ metadatabuf = grub_calloc (2, mda_size); - if (! metadatabuf) - goto fail; - -@@ -426,7 +426,7 @@ grub_lvm_detect (grub_disk_t disk, - #endif - goto lvs_fail; - } -- lv->segments = grub_zalloc (sizeof (*seg) * lv->segment_count); -+ lv->segments = grub_calloc (lv->segment_count, sizeof (*seg)); - seg = lv->segments; - - for (i = 0; i < lv->segment_count; i++) -@@ -483,8 +483,8 @@ grub_lvm_detect (grub_disk_t disk, - if (seg->node_count != 1) - seg->stripe_size = grub_lvm_getvalue (&p, "stripe_size = "); - -- seg->nodes = grub_zalloc (sizeof (*stripe) -- * seg->node_count); -+ seg->nodes = grub_calloc (seg->node_count, -+ sizeof (*stripe)); - stripe = seg->nodes; - - p = grub_strstr (p, "stripes = ["); -diff --git a/grub-core/disk/xen/xendisk.c b/grub-core/disk/xen/xendisk.c -index 48476cbbf..d6612eebd 100644 ---- a/grub-core/disk/xen/xendisk.c -+++ b/grub-core/disk/xen/xendisk.c -@@ -426,7 +426,7 @@ grub_xendisk_init (void) - if (!ctr) - return; - -- virtdisks = grub_malloc (ctr * sizeof (virtdisks[0])); -+ virtdisks = grub_calloc (ctr, sizeof (virtdisks[0])); - if (!virtdisks) - return; - if (grub_xenstore_dir ("device/vbd", fill, &ctr)) -diff --git a/grub-core/efiemu/loadcore.c b/grub-core/efiemu/loadcore.c -index 44085ef81..2b924623f 100644 ---- a/grub-core/efiemu/loadcore.c -+++ b/grub-core/efiemu/loadcore.c -@@ -201,7 +201,7 @@ grub_efiemu_count_symbols (const Elf_Ehdr *e) - - grub_efiemu_nelfsyms = (unsigned) s->sh_size / (unsigned) s->sh_entsize; - grub_efiemu_elfsyms = (struct grub_efiemu_elf_sym *) -- grub_malloc (sizeof (struct grub_efiemu_elf_sym) * grub_efiemu_nelfsyms); -+ grub_calloc (grub_efiemu_nelfsyms, sizeof (struct grub_efiemu_elf_sym)); - - /* Relocators */ - for (i = 0, s = (Elf_Shdr *) ((char *) e + e->e_shoff); -diff --git a/grub-core/efiemu/mm.c b/grub-core/efiemu/mm.c -index 52a032f7b..9b8e0d0ad 100644 ---- a/grub-core/efiemu/mm.c -+++ b/grub-core/efiemu/mm.c -@@ -554,11 +554,11 @@ grub_efiemu_mmap_sort_and_uniq (void) - /* Initialize variables*/ - grub_memset (present, 0, sizeof (int) * GRUB_EFI_MAX_MEMORY_TYPE); - scanline_events = (struct grub_efiemu_mmap_scan *) -- grub_malloc (sizeof (struct grub_efiemu_mmap_scan) * 2 * mmap_num); -+ grub_calloc (mmap_num, sizeof (struct grub_efiemu_mmap_scan) * 2); - - /* Number of chunks can't increase more than by factor of 2 */ - result = (grub_efi_memory_descriptor_t *) -- grub_malloc (sizeof (grub_efi_memory_descriptor_t) * 2 * mmap_num); -+ grub_calloc (mmap_num, sizeof (grub_efi_memory_descriptor_t) * 2); - if (!result || !scanline_events) - { - grub_free (result); -@@ -660,7 +660,7 @@ grub_efiemu_mm_do_alloc (void) - - /* Preallocate mmap */ - efiemu_mmap = (grub_efi_memory_descriptor_t *) -- grub_malloc (mmap_reserved_size * sizeof (grub_efi_memory_descriptor_t)); -+ grub_calloc (mmap_reserved_size, sizeof (grub_efi_memory_descriptor_t)); - if (!efiemu_mmap) - { - grub_efiemu_unload (); -diff --git a/grub-core/font/font.c b/grub-core/font/font.c -index 85a292557..8e118b315 100644 ---- a/grub-core/font/font.c -+++ b/grub-core/font/font.c -@@ -293,8 +293,7 @@ load_font_index (grub_file_t file, grub_uint32_t sect_length, struct - font->num_chars = sect_length / FONT_CHAR_INDEX_ENTRY_SIZE; - - /* Allocate the character index array. */ -- font->char_index = grub_malloc (font->num_chars -- * sizeof (struct char_index_entry)); -+ font->char_index = grub_calloc (font->num_chars, sizeof (struct char_index_entry)); - if (!font->char_index) - return 1; - font->bmp_idx = grub_malloc (0x10000 * sizeof (grub_uint16_t)); -diff --git a/grub-core/fs/affs.c b/grub-core/fs/affs.c -index 6b6a2bc91..220b3712f 100644 ---- a/grub-core/fs/affs.c -+++ b/grub-core/fs/affs.c -@@ -301,7 +301,7 @@ grub_affs_read_symlink (grub_fshelp_node_t node) - return 0; - } - latin1[symlink_size] = 0; -- utf8 = grub_malloc (symlink_size * GRUB_MAX_UTF8_PER_LATIN1 + 1); -+ utf8 = grub_calloc (GRUB_MAX_UTF8_PER_LATIN1 + 1, symlink_size); - if (!utf8) - { - grub_free (latin1); -@@ -422,7 +422,7 @@ grub_affs_iterate_dir (grub_fshelp_node_t dir, - return 1; - } - -- hashtable = grub_zalloc (data->htsize * sizeof (*hashtable)); -+ hashtable = grub_calloc (data->htsize, sizeof (*hashtable)); - if (!hashtable) - return 1; - -@@ -628,7 +628,7 @@ grub_affs_label (grub_device_t device, char **label) - len = file.namelen; - if (len > sizeof (file.name)) - len = sizeof (file.name); -- *label = grub_malloc (len * GRUB_MAX_UTF8_PER_LATIN1 + 1); -+ *label = grub_calloc (GRUB_MAX_UTF8_PER_LATIN1 + 1, len); - if (*label) - *grub_latin1_to_utf8 ((grub_uint8_t *) *label, file.name, len) = '\0'; - } -diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c -index 48bd3d04a..11272efc1 100644 ---- a/grub-core/fs/btrfs.c -+++ b/grub-core/fs/btrfs.c -@@ -413,7 +413,7 @@ lower_bound (struct grub_btrfs_data *data, - { - desc->allocated = 16; - desc->depth = 0; -- desc->data = grub_malloc (sizeof (desc->data[0]) * desc->allocated); -+ desc->data = grub_calloc (desc->allocated, sizeof (desc->data[0])); - if (!desc->data) - return grub_errno; - } -@@ -752,7 +752,7 @@ raid56_read_retry (struct grub_btrfs_data *data, - grub_err_t ret = GRUB_ERR_OUT_OF_MEMORY; - grub_uint64_t i, failed_devices; - -- buffers = grub_zalloc (sizeof(*buffers) * nstripes); -+ buffers = grub_calloc (nstripes, sizeof (*buffers)); - if (!buffers) - goto cleanup; - -@@ -2160,7 +2160,7 @@ grub_btrfs_embed (grub_device_t device __attribute__ ((unused)), - *nsectors = 64 * 2 - 1; - if (*nsectors > max_nsectors) - *nsectors = max_nsectors; -- *sectors = grub_malloc (*nsectors * sizeof (**sectors)); -+ *sectors = grub_calloc (*nsectors, sizeof (**sectors)); - if (!*sectors) - return grub_errno; - for (i = 0; i < *nsectors; i++) -diff --git a/grub-core/fs/hfs.c b/grub-core/fs/hfs.c -index ac0a40990..3fe842b4d 100644 ---- a/grub-core/fs/hfs.c -+++ b/grub-core/fs/hfs.c -@@ -1360,7 +1360,7 @@ grub_hfs_label (grub_device_t device, char **label) - grub_size_t len = data->sblock.volname[0]; - if (len > sizeof (data->sblock.volname) - 1) - len = sizeof (data->sblock.volname) - 1; -- *label = grub_malloc (len * MAX_UTF8_PER_MAC_ROMAN + 1); -+ *label = grub_calloc (MAX_UTF8_PER_MAC_ROMAN + 1, len); - if (*label) - macroman_to_utf8 (*label, data->sblock.volname + 1, - len + 1, 0); -diff --git a/grub-core/fs/hfsplus.c b/grub-core/fs/hfsplus.c -index 54786bb1c..dae43becc 100644 ---- a/grub-core/fs/hfsplus.c -+++ b/grub-core/fs/hfsplus.c -@@ -720,7 +720,7 @@ list_nodes (void *record, void *hook_arg) - if (! filename) - return 0; - -- keyname = grub_malloc (grub_be_to_cpu16 (catkey->namelen) * sizeof (*keyname)); -+ keyname = grub_calloc (grub_be_to_cpu16 (catkey->namelen), sizeof (*keyname)); - if (!keyname) - { - grub_free (filename); -@@ -1007,7 +1007,7 @@ grub_hfsplus_label (grub_device_t device, char **label) - grub_hfsplus_btree_recptr (&data->catalog_tree, node, ptr); - - label_len = grub_be_to_cpu16 (catkey->namelen); -- label_name = grub_malloc (label_len * sizeof (*label_name)); -+ label_name = grub_calloc (label_len, sizeof (*label_name)); - if (!label_name) - { - grub_free (node); -@@ -1029,7 +1029,7 @@ grub_hfsplus_label (grub_device_t device, char **label) - } - } - -- *label = grub_malloc (label_len * GRUB_MAX_UTF8_PER_UTF16 + 1); -+ *label = grub_calloc (label_len, GRUB_MAX_UTF8_PER_UTF16 + 1); - if (! *label) - { - grub_free (label_name); -diff --git a/grub-core/fs/iso9660.c b/grub-core/fs/iso9660.c -index 49c0c632b..4f1b52a55 100644 ---- a/grub-core/fs/iso9660.c -+++ b/grub-core/fs/iso9660.c -@@ -331,7 +331,7 @@ grub_iso9660_convert_string (grub_uint8_t *us, int len) - int i; - grub_uint16_t t[MAX_NAMELEN / 2 + 1]; - -- p = grub_malloc (len * GRUB_MAX_UTF8_PER_UTF16 + 1); -+ p = grub_calloc (len, GRUB_MAX_UTF8_PER_UTF16 + 1); - if (! p) - return NULL; - -diff --git a/grub-core/fs/ntfs.c b/grub-core/fs/ntfs.c -index fc4e1f678..2f34f76da 100644 ---- a/grub-core/fs/ntfs.c -+++ b/grub-core/fs/ntfs.c -@@ -556,8 +556,8 @@ get_utf8 (grub_uint8_t *in, grub_size_t len) - grub_uint16_t *tmp; - grub_size_t i; - -- buf = grub_malloc (len * GRUB_MAX_UTF8_PER_UTF16 + 1); -- tmp = grub_malloc (len * sizeof (tmp[0])); -+ buf = grub_calloc (len, GRUB_MAX_UTF8_PER_UTF16 + 1); -+ tmp = grub_calloc (len, sizeof (tmp[0])); - if (!buf || !tmp) - { - grub_free (buf); -diff --git a/grub-core/fs/sfs.c b/grub-core/fs/sfs.c -index 50c1fe72f..90f7fb379 100644 ---- a/grub-core/fs/sfs.c -+++ b/grub-core/fs/sfs.c -@@ -266,7 +266,7 @@ grub_sfs_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock) - node->next_extent = node->block; - node->cache_size = 0; - -- node->cache = grub_malloc (sizeof (node->cache[0]) * cache_size); -+ node->cache = grub_calloc (cache_size, sizeof (node->cache[0])); - if (!node->cache) - { - grub_errno = 0; -diff --git a/grub-core/fs/tar.c b/grub-core/fs/tar.c -index 7d63e0c99..c551ed6b5 100644 ---- a/grub-core/fs/tar.c -+++ b/grub-core/fs/tar.c -@@ -120,7 +120,7 @@ grub_cpio_find_file (struct grub_archelp_data *data, char **name, - if (data->linkname_alloc < linksize + 1) - { - char *n; -- n = grub_malloc (2 * (linksize + 1)); -+ n = grub_calloc (2, linksize + 1); - if (!n) - return grub_errno; - grub_free (data->linkname); -diff --git a/grub-core/fs/udf.c b/grub-core/fs/udf.c -index dc8b6e2d1..a83761674 100644 ---- a/grub-core/fs/udf.c -+++ b/grub-core/fs/udf.c -@@ -873,7 +873,7 @@ read_string (const grub_uint8_t *raw, grub_size_t sz, char *outbuf) - { - unsigned i; - utf16len = sz - 1; -- utf16 = grub_malloc (utf16len * sizeof (utf16[0])); -+ utf16 = grub_calloc (utf16len, sizeof (utf16[0])); - if (!utf16) - return NULL; - for (i = 0; i < utf16len; i++) -@@ -883,7 +883,7 @@ read_string (const grub_uint8_t *raw, grub_size_t sz, char *outbuf) - { - unsigned i; - utf16len = (sz - 1) / 2; -- utf16 = grub_malloc (utf16len * sizeof (utf16[0])); -+ utf16 = grub_calloc (utf16len, sizeof (utf16[0])); - if (!utf16) - return NULL; - for (i = 0; i < utf16len; i++) -diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c -index 2f72e42bf..381dde556 100644 ---- a/grub-core/fs/zfs/zfs.c -+++ b/grub-core/fs/zfs/zfs.c -@@ -3325,7 +3325,7 @@ dnode_get_fullpath (const char *fullpath, struct subvolume *subvol, - } - subvol->nkeys = 0; - zap_iterate (&keychain_dn, 8, count_zap_keys, &ctx, data); -- subvol->keyring = grub_zalloc (subvol->nkeys * sizeof (subvol->keyring[0])); -+ subvol->keyring = grub_calloc (subvol->nkeys, sizeof (subvol->keyring[0])); - if (!subvol->keyring) - { - grub_free (fsname); -@@ -4336,7 +4336,7 @@ grub_zfs_embed (grub_device_t device __attribute__ ((unused)), - *nsectors = (VDEV_BOOT_SIZE >> GRUB_DISK_SECTOR_BITS); - if (*nsectors > max_nsectors) - *nsectors = max_nsectors; -- *sectors = grub_malloc (*nsectors * sizeof (**sectors)); -+ *sectors = grub_calloc (*nsectors, sizeof (**sectors)); - if (!*sectors) - return grub_errno; - for (i = 0; i < *nsectors; i++) -diff --git a/grub-core/gfxmenu/gui_string_util.c b/grub-core/gfxmenu/gui_string_util.c -index a9a415e31..ba1e1eab3 100644 ---- a/grub-core/gfxmenu/gui_string_util.c -+++ b/grub-core/gfxmenu/gui_string_util.c -@@ -55,7 +55,7 @@ canonicalize_path (const char *path) - if (*p == '/') - components++; - -- char **path_array = grub_malloc (components * sizeof (*path_array)); -+ char **path_array = grub_calloc (components, sizeof (*path_array)); - if (! path_array) - return 0; - -diff --git a/grub-core/gfxmenu/widget-box.c b/grub-core/gfxmenu/widget-box.c -index b60602889..470597ded 100644 ---- a/grub-core/gfxmenu/widget-box.c -+++ b/grub-core/gfxmenu/widget-box.c -@@ -303,10 +303,10 @@ grub_gfxmenu_create_box (const char *pixmaps_prefix, - box->content_height = 0; - box->raw_pixmaps = - (struct grub_video_bitmap **) -- grub_malloc (BOX_NUM_PIXMAPS * sizeof (struct grub_video_bitmap *)); -+ grub_calloc (BOX_NUM_PIXMAPS, sizeof (struct grub_video_bitmap *)); - box->scaled_pixmaps = - (struct grub_video_bitmap **) -- grub_malloc (BOX_NUM_PIXMAPS * sizeof (struct grub_video_bitmap *)); -+ grub_calloc (BOX_NUM_PIXMAPS, sizeof (struct grub_video_bitmap *)); - - /* Initialize all pixmap pointers to NULL so that proper destruction can - be performed if an error is encountered partway through construction. */ -diff --git a/grub-core/io/gzio.c b/grub-core/io/gzio.c -index 6208a9763..43d98a7bd 100644 ---- a/grub-core/io/gzio.c -+++ b/grub-core/io/gzio.c -@@ -554,7 +554,7 @@ huft_build (unsigned *b, /* code lengths in bits (all assumed <= BMAX) */ - z = 1 << j; /* table entries for j-bit table */ - - /* allocate and link in new table */ -- q = (struct huft *) grub_zalloc ((z + 1) * sizeof (struct huft)); -+ q = (struct huft *) grub_calloc (z + 1, sizeof (struct huft)); - if (! q) - { - if (h) -diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c -index 6e1ceb905..dc31caa21 100644 ---- a/grub-core/kern/efi/efi.c -+++ b/grub-core/kern/efi/efi.c -@@ -202,7 +202,7 @@ grub_efi_set_variable(const char *var, const grub_efi_guid_t *guid, - - len = grub_strlen (var); - len16 = len * GRUB_MAX_UTF16_PER_UTF8; -- var16 = grub_malloc ((len16 + 1) * sizeof (var16[0])); -+ var16 = grub_calloc (len16 + 1, sizeof (var16[0])); - if (!var16) - return grub_errno; - len16 = grub_utf8_to_utf16 (var16, len16, (grub_uint8_t *) var, len, NULL); -@@ -237,7 +237,7 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid, - - len = grub_strlen (var); - len16 = len * GRUB_MAX_UTF16_PER_UTF8; -- var16 = grub_malloc ((len16 + 1) * sizeof (var16[0])); -+ var16 = grub_calloc (len16 + 1, sizeof (var16[0])); - if (!var16) - return NULL; - len16 = grub_utf8_to_utf16 (var16, len16, (grub_uint8_t *) var, len, NULL); -@@ -383,7 +383,7 @@ grub_efi_get_filename (grub_efi_device_path_t *dp0) - while (len > 0 && fp->path_name[len - 1] == 0) - len--; - -- dup_name = grub_malloc (len * sizeof (*dup_name)); -+ dup_name = grub_calloc (len, sizeof (*dup_name)); - if (!dup_name) - { - grub_free (name); -diff --git a/grub-core/kern/emu/hostdisk.c b/grub-core/kern/emu/hostdisk.c -index e9ec680cd..d975265b2 100644 ---- a/grub-core/kern/emu/hostdisk.c -+++ b/grub-core/kern/emu/hostdisk.c -@@ -615,7 +615,7 @@ static char * - grub_util_path_concat_real (size_t n, int ext, va_list ap) - { - size_t totlen = 0; -- char **l = xmalloc ((n + ext) * sizeof (l[0])); -+ char **l = xcalloc (n + ext, sizeof (l[0])); - char *r, *p, *pi; - size_t i; - int first = 1; -diff --git a/grub-core/kern/fs.c b/grub-core/kern/fs.c -index 2b85f4950..f90be6566 100644 ---- a/grub-core/kern/fs.c -+++ b/grub-core/kern/fs.c -@@ -151,7 +151,7 @@ grub_fs_blocklist_open (grub_file_t file, const char *name) - while (p); - - /* Allocate a block list. */ -- blocks = grub_zalloc (sizeof (struct grub_fs_block) * (num + 1)); -+ blocks = grub_calloc (num + 1, sizeof (struct grub_fs_block)); - if (! blocks) - return 0; - -diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c -index 3b633d51f..a7abd367a 100644 ---- a/grub-core/kern/misc.c -+++ b/grub-core/kern/misc.c -@@ -690,7 +690,7 @@ parse_printf_args (const char *fmt0, struct printf_args *args, - args->ptr = args->prealloc; - else - { -- args->ptr = grub_malloc (args->count * sizeof (args->ptr[0])); -+ args->ptr = grub_calloc (args->count, sizeof (args->ptr[0])); - if (!args->ptr) - { - grub_errno = GRUB_ERR_NONE; -diff --git a/grub-core/kern/parser.c b/grub-core/kern/parser.c -index 78175aac2..619db3122 100644 ---- a/grub-core/kern/parser.c -+++ b/grub-core/kern/parser.c -@@ -213,7 +213,7 @@ grub_parser_split_cmdline (const char *cmdline, - return grub_errno; - grub_memcpy (args, buffer, bp - buffer); - -- *argv = grub_malloc (sizeof (char *) * (*argc + 1)); -+ *argv = grub_calloc (*argc + 1, sizeof (char *)); - if (!*argv) - { - grub_free (args); -diff --git a/grub-core/kern/uboot/uboot.c b/grub-core/kern/uboot/uboot.c -index be4816fe6..aac8f9ae1 100644 ---- a/grub-core/kern/uboot/uboot.c -+++ b/grub-core/kern/uboot/uboot.c -@@ -133,7 +133,7 @@ grub_uboot_dev_enum (void) - return num_devices; - - max_devices = 2; -- enum_devices = grub_malloc (sizeof(struct device_info) * max_devices); -+ enum_devices = grub_calloc (max_devices, sizeof(struct device_info)); - if (!enum_devices) - return 0; - -diff --git a/grub-core/lib/libgcrypt/cipher/ac.c b/grub-core/lib/libgcrypt/cipher/ac.c -index f5e946a2d..63f6fcd11 100644 ---- a/grub-core/lib/libgcrypt/cipher/ac.c -+++ b/grub-core/lib/libgcrypt/cipher/ac.c -@@ -185,7 +185,7 @@ ac_data_mpi_copy (gcry_ac_mpi_t *data_mpis, unsigned int data_mpis_n, - gcry_mpi_t mpi; - char *label; - -- data_mpis_new = gcry_malloc (sizeof (*data_mpis_new) * data_mpis_n); -+ data_mpis_new = gcry_calloc (data_mpis_n, sizeof (*data_mpis_new)); - if (! data_mpis_new) - { - err = gcry_error_from_errno (errno); -@@ -572,7 +572,7 @@ _gcry_ac_data_to_sexp (gcry_ac_data_t data, gcry_sexp_t *sexp, - } - - /* Add MPI list. */ -- arg_list = gcry_malloc (sizeof (*arg_list) * (data_n + 1)); -+ arg_list = gcry_calloc (data_n + 1, sizeof (*arg_list)); - if (! arg_list) - { - err = gcry_error_from_errno (errno); -@@ -1283,7 +1283,7 @@ ac_data_construct (const char *identifier, int include_flags, - /* We build a list of arguments to pass to - gcry_sexp_build_array(). */ - data_length = _gcry_ac_data_length (data); -- arg_list = gcry_malloc (sizeof (*arg_list) * (data_length * 2)); -+ arg_list = gcry_calloc (data_length, sizeof (*arg_list) * 2); - if (! arg_list) - { - err = gcry_error_from_errno (errno); -@@ -1593,7 +1593,7 @@ _gcry_ac_key_pair_generate (gcry_ac_handle_t handle, unsigned int nbits, - arg_list_n += 2; - - /* Allocate list. */ -- arg_list = gcry_malloc (sizeof (*arg_list) * arg_list_n); -+ arg_list = gcry_calloc (arg_list_n, sizeof (*arg_list)); - if (! arg_list) - { - err = gcry_error_from_errno (errno); -diff --git a/grub-core/lib/libgcrypt/cipher/primegen.c b/grub-core/lib/libgcrypt/cipher/primegen.c -index 2788e349f..b12e79b19 100644 ---- a/grub-core/lib/libgcrypt/cipher/primegen.c -+++ b/grub-core/lib/libgcrypt/cipher/primegen.c -@@ -383,7 +383,7 @@ prime_generate_internal (int need_q_factor, - } - - /* Allocate an array to track pool usage. */ -- pool_in_use = gcry_malloc (n * sizeof *pool_in_use); -+ pool_in_use = gcry_calloc (n, sizeof *pool_in_use); - if (!pool_in_use) - { - err = gpg_err_code_from_errno (errno); -@@ -765,7 +765,7 @@ gen_prime (unsigned int nbits, int secret, int randomlevel, - if (nbits < 16) - log_fatal ("can't generate a prime with less than %d bits\n", 16); - -- mods = gcry_xmalloc( no_of_small_prime_numbers * sizeof *mods ); -+ mods = gcry_xcalloc( no_of_small_prime_numbers, sizeof *mods); - /* Make nbits fit into gcry_mpi_t implementation. */ - val_2 = mpi_alloc_set_ui( 2 ); - val_3 = mpi_alloc_set_ui( 3); -diff --git a/grub-core/lib/libgcrypt/cipher/pubkey.c b/grub-core/lib/libgcrypt/cipher/pubkey.c -index 910982141..ca087ad75 100644 ---- a/grub-core/lib/libgcrypt/cipher/pubkey.c -+++ b/grub-core/lib/libgcrypt/cipher/pubkey.c -@@ -2941,7 +2941,7 @@ gcry_pk_encrypt (gcry_sexp_t *r_ciph, gcry_sexp_t s_data, gcry_sexp_t s_pkey) - * array to a format string, so we have to do it this way :-(. */ - /* FIXME: There is now such a format specifier, so we can - change the code to be more clear. */ -- arg_list = malloc (nelem * sizeof *arg_list); -+ arg_list = calloc (nelem, sizeof *arg_list); - if (!arg_list) - { - rc = gpg_err_code_from_syserror (); -@@ -3233,7 +3233,7 @@ gcry_pk_sign (gcry_sexp_t *r_sig, gcry_sexp_t s_hash, gcry_sexp_t s_skey) - } - strcpy (p, "))"); - -- arg_list = malloc (nelem * sizeof *arg_list); -+ arg_list = calloc (nelem, sizeof *arg_list); - if (!arg_list) - { - rc = gpg_err_code_from_syserror (); -diff --git a/grub-core/lib/priority_queue.c b/grub-core/lib/priority_queue.c -index 659be0b7f..7d5e7c05a 100644 ---- a/grub-core/lib/priority_queue.c -+++ b/grub-core/lib/priority_queue.c -@@ -92,7 +92,7 @@ grub_priority_queue_new (grub_size_t elsize, - { - struct grub_priority_queue *ret; - void *els; -- els = grub_malloc (elsize * 8); -+ els = grub_calloc (8, elsize); - if (!els) - return 0; - ret = (struct grub_priority_queue *) grub_malloc (sizeof (*ret)); -diff --git a/grub-core/lib/reed_solomon.c b/grub-core/lib/reed_solomon.c -index ee9fa7b4f..467305b46 100644 ---- a/grub-core/lib/reed_solomon.c -+++ b/grub-core/lib/reed_solomon.c -@@ -20,6 +20,7 @@ - #include - #include - #include -+#define xcalloc calloc - #define xmalloc malloc - #define grub_memset memset - #define grub_memcpy memcpy -@@ -158,11 +159,9 @@ rs_encode (gf_single_t *data, grub_size_t s, grub_size_t rs) - gf_single_t *rs_polynomial; - int i, j; - gf_single_t *m; -- m = xmalloc ((s + rs) * sizeof (gf_single_t)); -+ m = xcalloc (s + rs, sizeof (gf_single_t)); - grub_memcpy (m, data, s * sizeof (gf_single_t)); -- grub_memset (m + s, 0, rs * sizeof (gf_single_t)); -- rs_polynomial = xmalloc ((rs + 1) * sizeof (gf_single_t)); -- grub_memset (rs_polynomial, 0, (rs + 1) * sizeof (gf_single_t)); -+ rs_polynomial = xcalloc (rs + 1, sizeof (gf_single_t)); - rs_polynomial[rs] = 1; - /* Multiply with X - a^r */ - for (j = 0; j < rs; j++) -diff --git a/grub-core/lib/relocator.c b/grub-core/lib/relocator.c -index ea3ebc719..5847aac36 100644 ---- a/grub-core/lib/relocator.c -+++ b/grub-core/lib/relocator.c -@@ -495,9 +495,9 @@ malloc_in_range (struct grub_relocator *rel, - } - #endif - -- eventt = grub_malloc (maxevents * sizeof (events[0])); -+ eventt = grub_calloc (maxevents, sizeof (events[0])); - counter = grub_malloc ((DIGITSORT_MASK + 2) * sizeof (counter[0])); -- events = grub_malloc (maxevents * sizeof (events[0])); -+ events = grub_calloc (maxevents, sizeof (events[0])); - if (!events || !eventt || !counter) - { - grub_dprintf ("relocator", "events or counter allocation failed %d\n", -@@ -963,7 +963,7 @@ malloc_in_range (struct grub_relocator *rel, - #endif - unsigned cural = 0; - int oom = 0; -- res->subchunks = grub_malloc (sizeof (res->subchunks[0]) * nallocs); -+ res->subchunks = grub_calloc (nallocs, sizeof (res->subchunks[0])); - if (!res->subchunks) - oom = 1; - res->nsubchunks = nallocs; -@@ -1562,8 +1562,8 @@ grub_relocator_prepare_relocs (struct grub_relocator *rel, grub_addr_t addr, - count[(chunk->src & 0xff) + 1]++; - } - } -- from = grub_malloc (nchunks * sizeof (sorted[0])); -- to = grub_malloc (nchunks * sizeof (sorted[0])); -+ from = grub_calloc (nchunks, sizeof (sorted[0])); -+ to = grub_calloc (nchunks, sizeof (sorted[0])); - if (!from || !to) - { - grub_free (from); -diff --git a/grub-core/lib/zstd/fse_decompress.c b/grub-core/lib/zstd/fse_decompress.c -index 72bbead5b..2227b84bc 100644 ---- a/grub-core/lib/zstd/fse_decompress.c -+++ b/grub-core/lib/zstd/fse_decompress.c -@@ -82,7 +82,7 @@ - FSE_DTable* FSE_createDTable (unsigned tableLog) - { - if (tableLog > FSE_TABLELOG_ABSOLUTE_MAX) tableLog = FSE_TABLELOG_ABSOLUTE_MAX; -- return (FSE_DTable*)malloc( FSE_DTABLE_SIZE_U32(tableLog) * sizeof (U32) ); -+ return (FSE_DTable*)calloc( FSE_DTABLE_SIZE_U32(tableLog), sizeof (U32) ); - } - - void FSE_freeDTable (FSE_DTable* dt) -diff --git a/grub-core/loader/arm/linux.c b/grub-core/loader/arm/linux.c -index 51684914c..d70c17486 100644 ---- a/grub-core/loader/arm/linux.c -+++ b/grub-core/loader/arm/linux.c -@@ -78,7 +78,7 @@ linux_prepare_atag (void *target_atag) - - /* some place for cmdline, initrd and terminator. */ - tmp_size = get_atag_size (atag_orig) + 20 + (arg_size) / 4; -- tmp_atag = grub_malloc (tmp_size * sizeof (grub_uint32_t)); -+ tmp_atag = grub_calloc (tmp_size, sizeof (grub_uint32_t)); - if (!tmp_atag) - return grub_errno; - -diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c -index cd92ea3f2..daf8c6b54 100644 ---- a/grub-core/loader/efi/chainloader.c -+++ b/grub-core/loader/efi/chainloader.c -@@ -116,7 +116,7 @@ copy_file_path (grub_efi_file_path_device_path_t *fp, - fp->header.type = GRUB_EFI_MEDIA_DEVICE_PATH_TYPE; - fp->header.subtype = GRUB_EFI_FILE_PATH_DEVICE_PATH_SUBTYPE; - -- path_name = grub_malloc (len * GRUB_MAX_UTF16_PER_UTF8 * sizeof (*path_name)); -+ path_name = grub_calloc (len, GRUB_MAX_UTF16_PER_UTF8 * sizeof (*path_name)); - if (!path_name) - return; - -diff --git a/grub-core/loader/i386/bsdXX.c b/grub-core/loader/i386/bsdXX.c -index af6741d15..a8d8bf7da 100644 ---- a/grub-core/loader/i386/bsdXX.c -+++ b/grub-core/loader/i386/bsdXX.c -@@ -48,7 +48,7 @@ read_headers (grub_file_t file, const char *filename, Elf_Ehdr *e, char **shdr) - if (e->e_ident[EI_CLASS] != SUFFIX (ELFCLASS)) - return grub_error (GRUB_ERR_BAD_OS, N_("invalid arch-dependent ELF magic")); - -- *shdr = grub_malloc ((grub_uint32_t) e->e_shnum * e->e_shentsize); -+ *shdr = grub_calloc (e->e_shnum, e->e_shentsize); - if (! *shdr) - return grub_errno; - -diff --git a/grub-core/loader/i386/xnu.c b/grub-core/loader/i386/xnu.c -index e64ed08f5..b7d176b5d 100644 ---- a/grub-core/loader/i386/xnu.c -+++ b/grub-core/loader/i386/xnu.c -@@ -295,7 +295,7 @@ grub_xnu_devprop_add_property_utf8 (struct grub_xnu_devprop_device_descriptor *d - return grub_errno; - - len = grub_strlen (name); -- utf16 = grub_malloc (sizeof (grub_uint16_t) * len); -+ utf16 = grub_calloc (len, sizeof (grub_uint16_t)); - if (!utf16) - { - grub_free (utf8); -@@ -331,7 +331,7 @@ grub_xnu_devprop_add_property_utf16 (struct grub_xnu_devprop_device_descriptor * - grub_uint16_t *utf16; - grub_err_t err; - -- utf16 = grub_malloc (sizeof (grub_uint16_t) * namelen); -+ utf16 = grub_calloc (namelen, sizeof (grub_uint16_t)); - if (!utf16) - return grub_errno; - grub_memcpy (utf16, name, sizeof (grub_uint16_t) * namelen); -diff --git a/grub-core/loader/macho.c b/grub-core/loader/macho.c -index 085f9c689..05710c48e 100644 ---- a/grub-core/loader/macho.c -+++ b/grub-core/loader/macho.c -@@ -97,7 +97,7 @@ grub_macho_file (grub_file_t file, const char *filename, int is_64bit) - if (grub_file_seek (macho->file, sizeof (struct grub_macho_fat_header)) - == (grub_off_t) -1) - goto fail; -- archs = grub_malloc (sizeof (struct grub_macho_fat_arch) * narchs); -+ archs = grub_calloc (narchs, sizeof (struct grub_macho_fat_arch)); - if (!archs) - goto fail; - if (grub_file_read (macho->file, archs, -diff --git a/grub-core/loader/multiboot_elfxx.c b/grub-core/loader/multiboot_elfxx.c -index 70cd1db51..cc6853692 100644 ---- a/grub-core/loader/multiboot_elfxx.c -+++ b/grub-core/loader/multiboot_elfxx.c -@@ -217,7 +217,7 @@ CONCAT(grub_multiboot_load_elf, XX) (mbi_load_data_t *mld) - { - grub_uint8_t *shdr, *shdrptr; - -- shdr = grub_malloc ((grub_uint32_t) ehdr->e_shnum * ehdr->e_shentsize); -+ shdr = grub_calloc (ehdr->e_shnum, ehdr->e_shentsize); - if (!shdr) - return grub_errno; - -diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c -index 7f74d1d6f..77d7060e1 100644 ---- a/grub-core/loader/xnu.c -+++ b/grub-core/loader/xnu.c -@@ -800,7 +800,7 @@ grub_cmd_xnu_mkext (grub_command_t cmd __attribute__ ((unused)), - if (grub_be_to_cpu32 (head.magic) == GRUB_MACHO_FAT_MAGIC) - { - narchs = grub_be_to_cpu32 (head.nfat_arch); -- archs = grub_malloc (sizeof (struct grub_macho_fat_arch) * narchs); -+ archs = grub_calloc (narchs, sizeof (struct grub_macho_fat_arch)); - if (! archs) - { - grub_file_close (file); -diff --git a/grub-core/mmap/mmap.c b/grub-core/mmap/mmap.c -index 6a31cbae3..57b4e9a72 100644 ---- a/grub-core/mmap/mmap.c -+++ b/grub-core/mmap/mmap.c -@@ -143,9 +143,9 @@ grub_mmap_iterate (grub_memory_hook_t hook, void *hook_data) - - /* Initialize variables. */ - ctx.scanline_events = (struct grub_mmap_scan *) -- grub_malloc (sizeof (struct grub_mmap_scan) * 2 * mmap_num); -+ grub_calloc (mmap_num, sizeof (struct grub_mmap_scan) * 2); - -- present = grub_zalloc (sizeof (present[0]) * current_priority); -+ present = grub_calloc (current_priority, sizeof (present[0])); - - if (! ctx.scanline_events || !present) - { -diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c -index 04cfbb045..653957200 100644 ---- a/grub-core/net/bootp.c -+++ b/grub-core/net/bootp.c -@@ -766,7 +766,7 @@ grub_cmd_bootp (struct grub_command *cmd __attribute__ ((unused)), - if (ncards == 0) - return grub_error (GRUB_ERR_NET_NO_CARD, N_("no network card found")); - -- ifaces = grub_zalloc (ncards * sizeof (ifaces[0])); -+ ifaces = grub_calloc (ncards, sizeof (ifaces[0])); - if (!ifaces) - return grub_errno; - -diff --git a/grub-core/net/dns.c b/grub-core/net/dns.c -index 5d9afe093..e332d5eb4 100644 ---- a/grub-core/net/dns.c -+++ b/grub-core/net/dns.c -@@ -285,8 +285,8 @@ recv_hook (grub_net_udp_socket_t sock __attribute__ ((unused)), - ptr++; - ptr += 4; - } -- *data->addresses = grub_malloc (sizeof ((*data->addresses)[0]) -- * grub_be_to_cpu16 (head->ancount)); -+ *data->addresses = grub_calloc (grub_be_to_cpu16 (head->ancount), -+ sizeof ((*data->addresses)[0])); - if (!*data->addresses) - { - grub_errno = GRUB_ERR_NONE; -@@ -406,8 +406,8 @@ recv_hook (grub_net_udp_socket_t sock __attribute__ ((unused)), - dns_cache[h].addresses = 0; - dns_cache[h].name = grub_strdup (data->oname); - dns_cache[h].naddresses = *data->naddresses; -- dns_cache[h].addresses = grub_malloc (*data->naddresses -- * sizeof (dns_cache[h].addresses[0])); -+ dns_cache[h].addresses = grub_calloc (*data->naddresses, -+ sizeof (dns_cache[h].addresses[0])); - dns_cache[h].limit_time = grub_get_time_ms () + 1000 * ttl_all; - if (!dns_cache[h].addresses || !dns_cache[h].name) - { -@@ -479,7 +479,7 @@ grub_net_dns_lookup (const char *name, - } - } - -- sockets = grub_malloc (sizeof (sockets[0]) * n_servers); -+ sockets = grub_calloc (n_servers, sizeof (sockets[0])); - if (!sockets) - return grub_errno; - -diff --git a/grub-core/net/net.c b/grub-core/net/net.c -index d5d726a31..38f19dfc9 100644 ---- a/grub-core/net/net.c -+++ b/grub-core/net/net.c -@@ -333,8 +333,8 @@ grub_cmd_ipv6_autoconf (struct grub_command *cmd __attribute__ ((unused)), - ncards++; - } - -- ifaces = grub_zalloc (ncards * sizeof (ifaces[0])); -- slaacs = grub_zalloc (ncards * sizeof (slaacs[0])); -+ ifaces = grub_calloc (ncards, sizeof (ifaces[0])); -+ slaacs = grub_calloc (ncards, sizeof (slaacs[0])); - if (!ifaces || !slaacs) - { - grub_free (ifaces); -diff --git a/grub-core/normal/charset.c b/grub-core/normal/charset.c -index b0ab47d73..d57fb72fa 100644 ---- a/grub-core/normal/charset.c -+++ b/grub-core/normal/charset.c -@@ -203,7 +203,7 @@ grub_utf8_to_ucs4_alloc (const char *msg, grub_uint32_t **unicode_msg, - { - grub_size_t msg_len = grub_strlen (msg); - -- *unicode_msg = grub_malloc (msg_len * sizeof (grub_uint32_t)); -+ *unicode_msg = grub_calloc (msg_len, sizeof (grub_uint32_t)); - - if (!*unicode_msg) - return -1; -@@ -488,7 +488,7 @@ grub_unicode_aglomerate_comb (const grub_uint32_t *in, grub_size_t inlen, - } - else - { -- n = grub_malloc (sizeof (n[0]) * (out->ncomb + 1)); -+ n = grub_calloc (out->ncomb + 1, sizeof (n[0])); - if (!n) - { - grub_errno = GRUB_ERR_NONE; -@@ -842,7 +842,7 @@ grub_bidi_line_logical_to_visual (const grub_uint32_t *logical, - } \ - } - -- visual = grub_malloc (sizeof (visual[0]) * logical_len); -+ visual = grub_calloc (logical_len, sizeof (visual[0])); - if (!visual) - return -1; - -@@ -1165,8 +1165,8 @@ grub_bidi_logical_to_visual (const grub_uint32_t *logical, - { - const grub_uint32_t *line_start = logical, *ptr; - struct grub_unicode_glyph *visual_ptr; -- *visual_out = visual_ptr = grub_malloc (3 * sizeof (visual_ptr[0]) -- * (logical_len + 2)); -+ *visual_out = visual_ptr = grub_calloc (logical_len + 2, -+ 3 * sizeof (visual_ptr[0])); - if (!visual_ptr) - return -1; - for (ptr = logical; ptr <= logical + logical_len; ptr++) -diff --git a/grub-core/normal/cmdline.c b/grub-core/normal/cmdline.c -index c037d5050..c57242e2e 100644 ---- a/grub-core/normal/cmdline.c -+++ b/grub-core/normal/cmdline.c -@@ -41,7 +41,7 @@ grub_err_t - grub_set_history (int newsize) - { - grub_uint32_t **old_hist_lines = hist_lines; -- hist_lines = grub_malloc (sizeof (grub_uint32_t *) * newsize); -+ hist_lines = grub_calloc (newsize, sizeof (grub_uint32_t *)); - - /* Copy the old lines into the new buffer. */ - if (old_hist_lines) -@@ -114,7 +114,7 @@ static void - grub_history_set (int pos, grub_uint32_t *s, grub_size_t len) - { - grub_free (hist_lines[pos]); -- hist_lines[pos] = grub_malloc ((len + 1) * sizeof (grub_uint32_t)); -+ hist_lines[pos] = grub_calloc (len + 1, sizeof (grub_uint32_t)); - if (!hist_lines[pos]) - { - grub_print_error (); -@@ -349,7 +349,7 @@ grub_cmdline_get (const char *prompt_translated) - char *ret; - unsigned nterms; - -- buf = grub_malloc (max_len * sizeof (grub_uint32_t)); -+ buf = grub_calloc (max_len, sizeof (grub_uint32_t)); - if (!buf) - return 0; - -@@ -377,7 +377,7 @@ grub_cmdline_get (const char *prompt_translated) - FOR_ACTIVE_TERM_OUTPUTS(cur) - nterms++; - -- cl_terms = grub_malloc (sizeof (cl_terms[0]) * nterms); -+ cl_terms = grub_calloc (nterms, sizeof (cl_terms[0])); - if (!cl_terms) - { - grub_free (buf); -@@ -385,7 +385,7 @@ grub_cmdline_get (const char *prompt_translated) - } - cl_term_cur = cl_terms; - -- unicode_msg = grub_malloc (msg_len * sizeof (grub_uint32_t)); -+ unicode_msg = grub_calloc (msg_len, sizeof (grub_uint32_t)); - if (!unicode_msg) - { - grub_free (buf); -@@ -495,7 +495,7 @@ grub_cmdline_get (const char *prompt_translated) - grub_uint32_t *insert; - - insertlen = grub_strlen (insertu8); -- insert = grub_malloc ((insertlen + 1) * sizeof (grub_uint32_t)); -+ insert = grub_calloc (insertlen + 1, sizeof (grub_uint32_t)); - if (!insert) - { - grub_free (insertu8); -@@ -602,7 +602,7 @@ grub_cmdline_get (const char *prompt_translated) - - grub_free (kill_buf); - -- kill_buf = grub_malloc ((n + 1) * sizeof(grub_uint32_t)); -+ kill_buf = grub_calloc (n + 1, sizeof (grub_uint32_t)); - if (grub_errno) - { - grub_print_error (); -diff --git a/grub-core/normal/menu_entry.c b/grub-core/normal/menu_entry.c -index cdf3590a3..1993995be 100644 ---- a/grub-core/normal/menu_entry.c -+++ b/grub-core/normal/menu_entry.c -@@ -95,8 +95,8 @@ init_line (struct screen *screen, struct line *linep) - { - linep->len = 0; - linep->max_len = 80; -- linep->buf = grub_malloc ((linep->max_len + 1) * sizeof (linep->buf[0])); -- linep->pos = grub_zalloc (screen->nterms * sizeof (linep->pos[0])); -+ linep->buf = grub_calloc (linep->max_len + 1, sizeof (linep->buf[0])); -+ linep->pos = grub_calloc (screen->nterms, sizeof (linep->pos[0])); - if (! linep->buf || !linep->pos) - { - grub_free (linep->buf); -@@ -287,7 +287,7 @@ update_screen (struct screen *screen, struct per_term_screen *term_screen, - pos = linep->pos + (term_screen - screen->terms); - - if (!*pos) -- *pos = grub_zalloc ((linep->len + 1) * sizeof (**pos)); -+ *pos = grub_calloc (linep->len + 1, sizeof (**pos)); - - if (i == region_start || linep == screen->lines + screen->line - || (i > region_start && mode == ALL_LINES)) -@@ -471,7 +471,7 @@ insert_string (struct screen *screen, const char *s, int update) - - /* Insert the string. */ - current_linep = screen->lines + screen->line; -- unicode_msg = grub_malloc ((p - s) * sizeof (grub_uint32_t)); -+ unicode_msg = grub_calloc (p - s, sizeof (grub_uint32_t)); - - if (!unicode_msg) - return 0; -@@ -1023,7 +1023,7 @@ complete (struct screen *screen, int continuous, int update) - if (completion_buffer.buf) - { - buflen = grub_strlen (completion_buffer.buf); -- ucs4 = grub_malloc (sizeof (grub_uint32_t) * (buflen + 1)); -+ ucs4 = grub_calloc (buflen + 1, sizeof (grub_uint32_t)); - - if (!ucs4) - { -@@ -1268,7 +1268,7 @@ grub_menu_entry_run (grub_menu_entry_t entry) - for (i = 0; i < (unsigned) screen->num_lines; i++) - { - grub_free (screen->lines[i].pos); -- screen->lines[i].pos = grub_zalloc (screen->nterms * sizeof (screen->lines[i].pos[0])); -+ screen->lines[i].pos = grub_calloc (screen->nterms, sizeof (screen->lines[i].pos[0])); - if (! screen->lines[i].pos) - { - grub_print_error (); -@@ -1278,7 +1278,7 @@ grub_menu_entry_run (grub_menu_entry_t entry) - } - } - -- screen->terms = grub_zalloc (screen->nterms * sizeof (screen->terms[0])); -+ screen->terms = grub_calloc (screen->nterms, sizeof (screen->terms[0])); - if (!screen->terms) - { - grub_print_error (); -diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c -index e22bb91f6..18240e76c 100644 ---- a/grub-core/normal/menu_text.c -+++ b/grub-core/normal/menu_text.c -@@ -78,7 +78,7 @@ grub_print_message_indented_real (const char *msg, int margin_left, - grub_size_t msg_len = grub_strlen (msg) + 2; - int ret = 0; - -- unicode_msg = grub_malloc (msg_len * sizeof (grub_uint32_t)); -+ unicode_msg = grub_calloc (msg_len, sizeof (grub_uint32_t)); - - if (!unicode_msg) - return 0; -@@ -211,7 +211,7 @@ print_entry (int y, int highlight, grub_menu_entry_t entry, - - title = entry ? entry->title : ""; - title_len = grub_strlen (title); -- unicode_title = grub_malloc (title_len * sizeof (*unicode_title)); -+ unicode_title = grub_calloc (title_len, sizeof (*unicode_title)); - if (! unicode_title) - /* XXX How to show this error? */ - return; -diff --git a/grub-core/normal/term.c b/grub-core/normal/term.c -index a1e5c5a0d..cc8c173b6 100644 ---- a/grub-core/normal/term.c -+++ b/grub-core/normal/term.c -@@ -264,7 +264,7 @@ grub_term_save_pos (void) - FOR_ACTIVE_TERM_OUTPUTS(cur) - cnt++; - -- ret = grub_malloc (cnt * sizeof (ret[0])); -+ ret = grub_calloc (cnt, sizeof (ret[0])); - if (!ret) - return NULL; - -@@ -1013,7 +1013,7 @@ grub_xnputs (const char *str, grub_size_t msg_len) - - grub_error_push (); - -- unicode_str = grub_malloc (msg_len * sizeof (grub_uint32_t)); -+ unicode_str = grub_calloc (msg_len, sizeof (grub_uint32_t)); - - grub_error_pop (); - -diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c -index 90d92d3ad..5b41ad022 100644 ---- a/grub-core/osdep/linux/getroot.c -+++ b/grub-core/osdep/linux/getroot.c -@@ -168,7 +168,7 @@ grub_util_raid_getmembers (const char *name, int bootable) - if (ret != 0) - grub_util_error (_("ioctl GET_ARRAY_INFO error: %s"), strerror (errno)); - -- devicelist = xmalloc ((info.nr_disks + 1) * sizeof (char *)); -+ devicelist = xcalloc (info.nr_disks + 1, sizeof (char *)); - - for (i = 0, j = 0; j < info.nr_disks; i++) - { -@@ -241,7 +241,7 @@ grub_find_root_devices_from_btrfs (const char *dir) - return NULL; - } - -- ret = xmalloc ((fsi.num_devices + 1) * sizeof (ret[0])); -+ ret = xcalloc (fsi.num_devices + 1, sizeof (ret[0])); - - for (i = 1; i <= fsi.max_id && j < fsi.num_devices; i++) - { -@@ -396,7 +396,7 @@ grub_find_root_devices_from_mountinfo (const char *dir, char **relroot) - if (relroot) - *relroot = NULL; - -- entries = xmalloc (entry_max * sizeof (*entries)); -+ entries = xcalloc (entry_max, sizeof (*entries)); - - again: - fp = grub_util_fopen ("/proc/self/mountinfo", "r"); -diff --git a/grub-core/osdep/unix/config.c b/grub-core/osdep/unix/config.c -index 65effa9f3..7d6325138 100644 ---- a/grub-core/osdep/unix/config.c -+++ b/grub-core/osdep/unix/config.c -@@ -89,7 +89,7 @@ grub_util_load_config (struct grub_util_config *cfg) - argv[0] = "sh"; - argv[1] = "-c"; - -- script = xmalloc (4 * strlen (cfgfile) + 300); -+ script = xcalloc (4, strlen (cfgfile) + 300); - - ptr = script; - memcpy (ptr, ". '", 3); -diff --git a/grub-core/osdep/windows/getroot.c b/grub-core/osdep/windows/getroot.c -index 661d95461..eada663b2 100644 ---- a/grub-core/osdep/windows/getroot.c -+++ b/grub-core/osdep/windows/getroot.c -@@ -59,7 +59,7 @@ grub_get_mount_point (const TCHAR *path) - - for (ptr = path; *ptr; ptr++); - allocsize = (ptr - path + 10) * 2; -- out = xmalloc (allocsize * sizeof (out[0])); -+ out = xcalloc (allocsize, sizeof (out[0])); - - /* When pointing to EFI system partition GetVolumePathName fails - for ESP root and returns abberant information for everything -diff --git a/grub-core/osdep/windows/hostdisk.c b/grub-core/osdep/windows/hostdisk.c -index 355100789..0be327394 100644 ---- a/grub-core/osdep/windows/hostdisk.c -+++ b/grub-core/osdep/windows/hostdisk.c -@@ -111,7 +111,7 @@ grub_util_get_windows_path_real (const char *path) - - while (1) - { -- fpa = xmalloc (alloc * sizeof (fpa[0])); -+ fpa = xcalloc (alloc, sizeof (fpa[0])); - - len = GetFullPathName (tpath, alloc, fpa, NULL); - if (len >= alloc) -@@ -399,7 +399,7 @@ grub_util_fd_opendir (const char *name) - for (l = 0; name_windows[l]; l++); - for (l--; l >= 0 && (name_windows[l] == '\\' || name_windows[l] == '/'); l--); - l++; -- pattern = xmalloc ((l + 3) * sizeof (pattern[0])); -+ pattern = xcalloc (l + 3, sizeof (pattern[0])); - memcpy (pattern, name_windows, l * sizeof (pattern[0])); - pattern[l] = '\\'; - pattern[l + 1] = '*'; -diff --git a/grub-core/osdep/windows/init.c b/grub-core/osdep/windows/init.c -index e8ffd62c6..6297de632 100644 ---- a/grub-core/osdep/windows/init.c -+++ b/grub-core/osdep/windows/init.c -@@ -161,7 +161,7 @@ grub_util_host_init (int *argc __attribute__ ((unused)), - LPWSTR *targv; - - targv = CommandLineToArgvW (tcmdline, argc); -- *argv = xmalloc ((*argc + 1) * sizeof (argv[0])); -+ *argv = xcalloc (*argc + 1, sizeof (argv[0])); - - for (i = 0; i < *argc; i++) - (*argv)[i] = grub_util_tchar_to_utf8 (targv[i]); -diff --git a/grub-core/osdep/windows/platform.c b/grub-core/osdep/windows/platform.c -index 7eb53fe01..1ef86bf58 100644 ---- a/grub-core/osdep/windows/platform.c -+++ b/grub-core/osdep/windows/platform.c -@@ -225,8 +225,8 @@ grub_install_register_efi (grub_device_t efidir_grub_dev, - grub_util_error ("%s", _("no EFI routines are available when running in BIOS mode")); - - distrib8_len = grub_strlen (efi_distributor); -- distributor16 = xmalloc ((distrib8_len + 1) * GRUB_MAX_UTF16_PER_UTF8 -- * sizeof (grub_uint16_t)); -+ distributor16 = xcalloc (distrib8_len + 1, -+ GRUB_MAX_UTF16_PER_UTF8 * sizeof (grub_uint16_t)); - distrib16_len = grub_utf8_to_utf16 (distributor16, distrib8_len * GRUB_MAX_UTF16_PER_UTF8, - (const grub_uint8_t *) efi_distributor, - distrib8_len, 0); -diff --git a/grub-core/osdep/windows/relpath.c b/grub-core/osdep/windows/relpath.c -index cb0861744..478e8ef14 100644 ---- a/grub-core/osdep/windows/relpath.c -+++ b/grub-core/osdep/windows/relpath.c -@@ -72,7 +72,7 @@ grub_make_system_path_relative_to_its_root (const char *path) - if (dirwindows[0] && dirwindows[1] == ':') - offset = 2; - } -- ret = xmalloc (sizeof (ret[0]) * (flen - offset + 2)); -+ ret = xcalloc (flen - offset + 2, sizeof (ret[0])); - if (dirwindows[offset] != '\\' - && dirwindows[offset] != '/' - && dirwindows[offset]) -diff --git a/grub-core/partmap/gpt.c b/grub-core/partmap/gpt.c -index 103f6796f..72a2e37cd 100644 ---- a/grub-core/partmap/gpt.c -+++ b/grub-core/partmap/gpt.c -@@ -199,7 +199,7 @@ gpt_partition_map_embed (struct grub_disk *disk, unsigned int *nsectors, - *nsectors = ctx.len; - if (*nsectors > max_nsectors) - *nsectors = max_nsectors; -- *sectors = grub_malloc (*nsectors * sizeof (**sectors)); -+ *sectors = grub_calloc (*nsectors, sizeof (**sectors)); - if (!*sectors) - return grub_errno; - for (i = 0; i < *nsectors; i++) -diff --git a/grub-core/partmap/msdos.c b/grub-core/partmap/msdos.c -index 7b8e45076..ee3f24982 100644 ---- a/grub-core/partmap/msdos.c -+++ b/grub-core/partmap/msdos.c -@@ -337,7 +337,7 @@ pc_partition_map_embed (struct grub_disk *disk, unsigned int *nsectors, - avail_nsectors = *nsectors; - if (*nsectors > max_nsectors) - *nsectors = max_nsectors; -- *sectors = grub_malloc (*nsectors * sizeof (**sectors)); -+ *sectors = grub_calloc (*nsectors, sizeof (**sectors)); - if (!*sectors) - return grub_errno; - for (i = 0; i < *nsectors; i++) -diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c -index ee299fd0e..c8d6806fe 100644 ---- a/grub-core/script/execute.c -+++ b/grub-core/script/execute.c -@@ -553,7 +553,7 @@ gettext_append (struct grub_script_argv *result, const char *orig_str) - for (iptr = orig_str; *iptr; iptr++) - if (*iptr == '$') - dollar_cnt++; -- ctx.allowed_strings = grub_malloc (sizeof (ctx.allowed_strings[0]) * dollar_cnt); -+ ctx.allowed_strings = grub_calloc (dollar_cnt, sizeof (ctx.allowed_strings[0])); - - if (parse_string (orig_str, gettext_save_allow, &ctx, 0)) - goto fail; -diff --git a/grub-core/tests/fake_input.c b/grub-core/tests/fake_input.c -index 2d6085298..b5eb516be 100644 ---- a/grub-core/tests/fake_input.c -+++ b/grub-core/tests/fake_input.c -@@ -49,7 +49,7 @@ grub_terminal_input_fake_sequence (int *seq_in, int nseq_in) - saved = grub_term_inputs; - if (seq) - grub_free (seq); -- seq = grub_malloc (nseq_in * sizeof (seq[0])); -+ seq = grub_calloc (nseq_in, sizeof (seq[0])); - if (!seq) - return; - -diff --git a/grub-core/tests/video_checksum.c b/grub-core/tests/video_checksum.c -index 74d5b65e5..44d081069 100644 ---- a/grub-core/tests/video_checksum.c -+++ b/grub-core/tests/video_checksum.c -@@ -336,7 +336,7 @@ grub_video_capture_write_bmp (const char *fname, - { - case 4: - { -- grub_uint8_t *buffer = xmalloc (mode_info->width * 3); -+ grub_uint8_t *buffer = xcalloc (3, mode_info->width); - grub_uint32_t rmask = ((1 << mode_info->red_mask_size) - 1); - grub_uint32_t gmask = ((1 << mode_info->green_mask_size) - 1); - grub_uint32_t bmask = ((1 << mode_info->blue_mask_size) - 1); -@@ -367,7 +367,7 @@ grub_video_capture_write_bmp (const char *fname, - } - case 3: - { -- grub_uint8_t *buffer = xmalloc (mode_info->width * 3); -+ grub_uint8_t *buffer = xcalloc (3, mode_info->width); - grub_uint32_t rmask = ((1 << mode_info->red_mask_size) - 1); - grub_uint32_t gmask = ((1 << mode_info->green_mask_size) - 1); - grub_uint32_t bmask = ((1 << mode_info->blue_mask_size) - 1); -@@ -407,7 +407,7 @@ grub_video_capture_write_bmp (const char *fname, - } - case 2: - { -- grub_uint8_t *buffer = xmalloc (mode_info->width * 3); -+ grub_uint8_t *buffer = xcalloc (3, mode_info->width); - grub_uint16_t rmask = ((1 << mode_info->red_mask_size) - 1); - grub_uint16_t gmask = ((1 << mode_info->green_mask_size) - 1); - grub_uint16_t bmask = ((1 << mode_info->blue_mask_size) - 1); -diff --git a/grub-core/video/capture.c b/grub-core/video/capture.c -index 4f83c7441..4d3195e01 100644 ---- a/grub-core/video/capture.c -+++ b/grub-core/video/capture.c -@@ -89,7 +89,7 @@ grub_video_capture_start (const struct grub_video_mode_info *mode_info, - framebuffer.mode_info = *mode_info; - framebuffer.mode_info.blit_format = grub_video_get_blit_format (&framebuffer.mode_info); - -- framebuffer.ptr = grub_malloc (framebuffer.mode_info.height * framebuffer.mode_info.pitch); -+ framebuffer.ptr = grub_calloc (framebuffer.mode_info.height, framebuffer.mode_info.pitch); - if (!framebuffer.ptr) - return grub_errno; - -diff --git a/grub-core/video/emu/sdl.c b/grub-core/video/emu/sdl.c -index a2f639f66..0ebab6f57 100644 ---- a/grub-core/video/emu/sdl.c -+++ b/grub-core/video/emu/sdl.c -@@ -172,7 +172,7 @@ grub_video_sdl_set_palette (unsigned int start, unsigned int count, - if (start + count > mode_info.number_of_colors) - count = mode_info.number_of_colors - start; - -- tmp = grub_malloc (count * sizeof (tmp[0])); -+ tmp = grub_calloc (count, sizeof (tmp[0])); - for (i = 0; i < count; i++) - { - tmp[i].r = palette_data[i].r; -diff --git a/grub-core/video/i386/pc/vga.c b/grub-core/video/i386/pc/vga.c -index 01f47112d..b2f776c99 100644 ---- a/grub-core/video/i386/pc/vga.c -+++ b/grub-core/video/i386/pc/vga.c -@@ -127,7 +127,7 @@ grub_video_vga_setup (unsigned int width, unsigned int height, - - vga_height = height ? : 480; - -- framebuffer.temporary_buffer = grub_malloc (vga_height * VGA_WIDTH); -+ framebuffer.temporary_buffer = grub_calloc (vga_height, VGA_WIDTH); - framebuffer.front_page = 0; - framebuffer.back_page = 0; - if (!framebuffer.temporary_buffer) -diff --git a/grub-core/video/readers/png.c b/grub-core/video/readers/png.c -index 777e71334..61bd64537 100644 ---- a/grub-core/video/readers/png.c -+++ b/grub-core/video/readers/png.c -@@ -309,7 +309,7 @@ grub_png_decode_image_header (struct grub_png_data *data) - if (data->is_16bit || data->is_gray || data->is_palette) - #endif - { -- data->image_data = grub_malloc (data->image_height * data->row_bytes); -+ data->image_data = grub_calloc (data->image_height, data->row_bytes); - if (grub_errno) - return grub_errno; - -diff --git a/include/grub/unicode.h b/include/grub/unicode.h -index a0403e91f..4de986a85 100644 ---- a/include/grub/unicode.h -+++ b/include/grub/unicode.h -@@ -293,7 +293,7 @@ grub_unicode_glyph_dup (const struct grub_unicode_glyph *in) - grub_memcpy (out, in, sizeof (*in)); - if (in->ncomb > ARRAY_SIZE (out->combining_inline)) - { -- out->combining_ptr = grub_malloc (in->ncomb * sizeof (out->combining_ptr[0])); -+ out->combining_ptr = grub_calloc (in->ncomb, sizeof (out->combining_ptr[0])); - if (!out->combining_ptr) - { - grub_free (out); -@@ -315,7 +315,7 @@ grub_unicode_set_glyph (struct grub_unicode_glyph *out, - grub_memcpy (out, in, sizeof (*in)); - if (in->ncomb > ARRAY_SIZE (out->combining_inline)) - { -- out->combining_ptr = grub_malloc (in->ncomb * sizeof (out->combining_ptr[0])); -+ out->combining_ptr = grub_calloc (in->ncomb, sizeof (out->combining_ptr[0])); - if (!out->combining_ptr) - return; - grub_memcpy (out->combining_ptr, in->combining_ptr, -diff --git a/util/getroot.c b/util/getroot.c -index 847406fba..a5eaa64fd 100644 ---- a/util/getroot.c -+++ b/util/getroot.c -@@ -200,7 +200,7 @@ make_device_name (const char *drive) - char *ret, *ptr; - const char *iptr; - -- ret = xmalloc (strlen (drive) * 2); -+ ret = xcalloc (2, strlen (drive)); - ptr = ret; - for (iptr = drive; *iptr; iptr++) - { -diff --git a/util/grub-file.c b/util/grub-file.c -index 50c18b683..b2e7dd69f 100644 ---- a/util/grub-file.c -+++ b/util/grub-file.c -@@ -54,7 +54,7 @@ main (int argc, char *argv[]) - - grub_util_host_init (&argc, &argv); - -- argv2 = xmalloc (argc * sizeof (argv2[0])); -+ argv2 = xcalloc (argc, sizeof (argv2[0])); - - if (argc == 2 && strcmp (argv[1], "--version") == 0) - { -diff --git a/util/grub-fstest.c b/util/grub-fstest.c -index f14e02d97..57246af7c 100644 ---- a/util/grub-fstest.c -+++ b/util/grub-fstest.c -@@ -650,7 +650,7 @@ argp_parser (int key, char *arg, struct argp_state *state) - if (args_count < num_disks) - { - if (args_count == 0) -- images = xmalloc (num_disks * sizeof (images[0])); -+ images = xcalloc (num_disks, sizeof (images[0])); - images[args_count] = grub_canonicalize_file_name (arg); - args_count++; - return 0; -@@ -734,7 +734,7 @@ main (int argc, char *argv[]) - - grub_util_host_init (&argc, &argv); - -- args = xmalloc (argc * sizeof (args[0])); -+ args = xcalloc (argc, sizeof (args[0])); - - argp_parse (&argp, argc, argv, 0, 0, 0); - -diff --git a/util/grub-install-common.c b/util/grub-install-common.c -index ca0ac612a..0295d40f5 100644 ---- a/util/grub-install-common.c -+++ b/util/grub-install-common.c -@@ -286,7 +286,7 @@ handle_install_list (struct install_list *il, const char *val, - il->n_entries++; - } - il->n_alloc = il->n_entries + 1; -- il->entries = xmalloc (il->n_alloc * sizeof (il->entries[0])); -+ il->entries = xcalloc (il->n_alloc, sizeof (il->entries[0])); - ptr = val; - for (ce = il->entries; ; ce++) - { -diff --git a/util/grub-install.c b/util/grub-install.c -index 8a55ad4b8..a82725f29 100644 ---- a/util/grub-install.c -+++ b/util/grub-install.c -@@ -626,7 +626,7 @@ device_map_check_duplicates (const char *dev_map) - if (! fp) - return; - -- d = xmalloc (alloced * sizeof (d[0])); -+ d = xcalloc (alloced, sizeof (d[0])); - - while (fgets (buf, sizeof (buf), fp)) - { -@@ -1260,7 +1260,7 @@ main (int argc, char *argv[]) - ndev++; - } - -- grub_drives = xmalloc (sizeof (grub_drives[0]) * (ndev + 1)); -+ grub_drives = xcalloc (ndev + 1, sizeof (grub_drives[0])); - - for (curdev = grub_devices, curdrive = grub_drives; *curdev; curdev++, - curdrive++) -diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c -index bc087c2b5..d97d0e7be 100644 ---- a/util/grub-mkimagexx.c -+++ b/util/grub-mkimagexx.c -@@ -2294,10 +2294,8 @@ SUFFIX (grub_mkimage_load_image) (const char *kernel_path, - + grub_host_to_target16 (e->e_shstrndx) * smd.section_entsize); - smd.strtab = (char *) e + grub_host_to_target_addr (s->sh_offset); - -- smd.addrs = xmalloc (sizeof (*smd.addrs) * smd.num_sections); -- memset (smd.addrs, 0, sizeof (*smd.addrs) * smd.num_sections); -- smd.vaddrs = xmalloc (sizeof (*smd.vaddrs) * smd.num_sections); -- memset (smd.vaddrs, 0, sizeof (*smd.vaddrs) * smd.num_sections); -+ smd.addrs = xcalloc (smd.num_sections, sizeof (*smd.addrs)); -+ smd.vaddrs = xcalloc (smd.num_sections, sizeof (*smd.vaddrs)); - - SUFFIX (locate_sections) (e, kernel_path, &smd, layout, image_target); - -diff --git a/util/grub-mkrescue.c b/util/grub-mkrescue.c -index ce2cbc4f1..51831027f 100644 ---- a/util/grub-mkrescue.c -+++ b/util/grub-mkrescue.c -@@ -441,8 +441,8 @@ main (int argc, char *argv[]) - xorriso = xstrdup ("xorriso"); - label_font = grub_util_path_concat (2, pkgdatadir, "unicode.pf2"); - -- argp_argv = xmalloc (sizeof (argp_argv[0]) * argc); -- xorriso_tail_argv = xmalloc (sizeof (argp_argv[0]) * argc); -+ argp_argv = xcalloc (argc, sizeof (argp_argv[0])); -+ xorriso_tail_argv = xcalloc (argc, sizeof (argp_argv[0])); - - xorriso_tail_argc = 0; - /* Program name */ -diff --git a/util/grub-mkstandalone.c b/util/grub-mkstandalone.c -index 4907d44c0..edf309717 100644 ---- a/util/grub-mkstandalone.c -+++ b/util/grub-mkstandalone.c -@@ -296,7 +296,7 @@ main (int argc, char *argv[]) - grub_util_host_init (&argc, &argv); - grub_util_disable_fd_syncs (); - -- files = xmalloc ((argc + 1) * sizeof (files[0])); -+ files = xcalloc (argc + 1, sizeof (files[0])); - - argp_parse (&argp, argc, argv, 0, 0, 0); - -diff --git a/util/grub-pe2elf.c b/util/grub-pe2elf.c -index 0d4084a10..11331294f 100644 ---- a/util/grub-pe2elf.c -+++ b/util/grub-pe2elf.c -@@ -100,9 +100,9 @@ write_section_data (FILE* fp, const char *name, char *image, - char *pe_strtab = (image + pe_chdr->symtab_offset - + pe_chdr->num_symbols * sizeof (struct grub_pe32_symbol)); - -- section_map = xmalloc ((2 * pe_chdr->num_sections + 5) * sizeof (int)); -+ section_map = xcalloc (2 * pe_chdr->num_sections + 5, sizeof (int)); - section_map[0] = 0; -- shdr = xmalloc ((2 * pe_chdr->num_sections + 5) * sizeof (shdr[0])); -+ shdr = xcalloc (2 * pe_chdr->num_sections + 5, sizeof (shdr[0])); - idx = 1; - idx_reloc = pe_chdr->num_sections + 1; - -@@ -233,7 +233,7 @@ write_reloc_section (FILE* fp, const char *name, char *image, - - pe_sec = pe_shdr + shdr[i].sh_link; - pe_rel = (struct grub_pe32_reloc *) (image + pe_sec->relocations_offset); -- rel = (elf_reloc_t *) xmalloc (pe_sec->num_relocations * sizeof (elf_reloc_t)); -+ rel = (elf_reloc_t *) xcalloc (pe_sec->num_relocations, sizeof (elf_reloc_t)); - num_rels = 0; - modified = 0; - -@@ -365,12 +365,10 @@ write_symbol_table (FILE* fp, const char *name, char *image, - pe_symtab = (struct grub_pe32_symbol *) (image + pe_chdr->symtab_offset); - pe_strtab = (char *) (pe_symtab + pe_chdr->num_symbols); - -- symtab = (Elf_Sym *) xmalloc ((pe_chdr->num_symbols + 1) * -- sizeof (Elf_Sym)); -- memset (symtab, 0, (pe_chdr->num_symbols + 1) * sizeof (Elf_Sym)); -+ symtab = (Elf_Sym *) xcalloc (pe_chdr->num_symbols + 1, sizeof (Elf_Sym)); - num_syms = 1; - -- symtab_map = (int *) xmalloc (pe_chdr->num_symbols * sizeof (int)); -+ symtab_map = (int *) xcalloc (pe_chdr->num_symbols, sizeof (int)); - - for (i = 0; i < (int) pe_chdr->num_symbols; - i += pe_symtab->num_aux + 1, pe_symtab += pe_symtab->num_aux + 1) -diff --git a/util/grub-probe.c b/util/grub-probe.c -index 81d27eead..cbe6ed94c 100644 ---- a/util/grub-probe.c -+++ b/util/grub-probe.c -@@ -361,8 +361,8 @@ probe (const char *path, char **device_names, char delim) - grub_util_pull_device (*curdev); - ndev++; - } -- -- drives_names = xmalloc (sizeof (drives_names[0]) * (ndev + 1)); -+ -+ drives_names = xcalloc (ndev + 1, sizeof (drives_names[0])); - - for (curdev = device_names, curdrive = drives_names; *curdev; curdev++, - curdrive++) --- -2.26.2 - diff --git a/buildroot/boot/grub2/0006-malloc-Use-overflow-checking-primitives-where-we-do-.patch b/buildroot/boot/grub2/0006-malloc-Use-overflow-checking-primitives-where-we-do-.patch deleted file mode 100644 index aaad725633..0000000000 --- a/buildroot/boot/grub2/0006-malloc-Use-overflow-checking-primitives-where-we-do-.patch +++ /dev/null @@ -1,1326 +0,0 @@ -From 4ad7e85adc3803788d65707a9db11fd681aebe4a Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Mon, 15 Jun 2020 12:28:27 -0400 -Subject: [PATCH] malloc: Use overflow checking primitives where we do - complex allocations -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This attempts to fix the places where we do the following where -arithmetic_expr may include unvalidated data: - - X = grub_malloc(arithmetic_expr); - -It accomplishes this by doing the arithmetic ahead of time using grub_add(), -grub_sub(), grub_mul() and testing for overflow before proceeding. - -Among other issues, this fixes: - - allocation of integer overflow in grub_video_bitmap_create() - reported by Chris Coulson, - - allocation of integer overflow in grub_png_decode_image_header() - reported by Chris Coulson, - - allocation of integer overflow in grub_squash_read_symlink() - reported by Chris Coulson, - - allocation of integer overflow in grub_ext2_read_symlink() - reported by Chris Coulson, - - allocation of integer overflow in read_section_as_string() - reported by Chris Coulson. - -Fixes: CVE-2020-14309, CVE-2020-14310, CVE-2020-14311 - -Signed-off-by: Peter Jones -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/commands/legacycfg.c | 29 +++++++++++++++---- - grub-core/commands/wildcard.c | 36 ++++++++++++++++++++---- - grub-core/disk/ldm.c | 32 +++++++++++++++------ - grub-core/font/font.c | 7 ++++- - grub-core/fs/btrfs.c | 28 +++++++++++++------ - grub-core/fs/ext2.c | 10 ++++++- - grub-core/fs/iso9660.c | 51 ++++++++++++++++++++++++---------- - grub-core/fs/sfs.c | 27 ++++++++++++++---- - grub-core/fs/squash4.c | 45 ++++++++++++++++++++++-------- - grub-core/fs/udf.c | 41 +++++++++++++++++---------- - grub-core/fs/xfs.c | 11 +++++--- - grub-core/fs/zfs/zfs.c | 22 ++++++++++----- - grub-core/fs/zfs/zfscrypt.c | 7 ++++- - grub-core/lib/arg.c | 20 +++++++++++-- - grub-core/loader/i386/bsd.c | 8 +++++- - grub-core/net/dns.c | 9 +++++- - grub-core/normal/charset.c | 10 +++++-- - grub-core/normal/cmdline.c | 14 ++++++++-- - grub-core/normal/menu_entry.c | 13 +++++++-- - grub-core/script/argv.c | 16 +++++++++-- - grub-core/script/lexer.c | 21 ++++++++++++-- - grub-core/video/bitmap.c | 25 +++++++++++------ - grub-core/video/readers/png.c | 13 +++++++-- - 23 files changed, 382 insertions(+), 113 deletions(-) - -diff --git a/grub-core/commands/legacycfg.c b/grub-core/commands/legacycfg.c -index 5e3ec0d5e..cc5971f4d 100644 ---- a/grub-core/commands/legacycfg.c -+++ b/grub-core/commands/legacycfg.c -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - - GRUB_MOD_LICENSE ("GPLv3+"); - -@@ -104,13 +105,22 @@ legacy_file (const char *filename) - if (newsuffix) - { - char *t; -- -+ grub_size_t sz; -+ -+ if (grub_add (grub_strlen (suffix), grub_strlen (newsuffix), &sz) || -+ grub_add (sz, 1, &sz)) -+ { -+ grub_errno = GRUB_ERR_OUT_OF_RANGE; -+ goto fail_0; -+ } -+ - t = suffix; -- suffix = grub_realloc (suffix, grub_strlen (suffix) -- + grub_strlen (newsuffix) + 1); -+ suffix = grub_realloc (suffix, sz); - if (!suffix) - { - grub_free (t); -+ -+ fail_0: - grub_free (entrysrc); - grub_free (parsed); - grub_free (newsuffix); -@@ -154,13 +164,22 @@ legacy_file (const char *filename) - else - { - char *t; -+ grub_size_t sz; -+ -+ if (grub_add (grub_strlen (entrysrc), grub_strlen (parsed), &sz) || -+ grub_add (sz, 1, &sz)) -+ { -+ grub_errno = GRUB_ERR_OUT_OF_RANGE; -+ goto fail_1; -+ } - - t = entrysrc; -- entrysrc = grub_realloc (entrysrc, grub_strlen (entrysrc) -- + grub_strlen (parsed) + 1); -+ entrysrc = grub_realloc (entrysrc, sz); - if (!entrysrc) - { - grub_free (t); -+ -+ fail_1: - grub_free (parsed); - grub_free (suffix); - return grub_errno; -diff --git a/grub-core/commands/wildcard.c b/grub-core/commands/wildcard.c -index 4a106ca04..cc3290311 100644 ---- a/grub-core/commands/wildcard.c -+++ b/grub-core/commands/wildcard.c -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - - #include - -@@ -48,6 +49,7 @@ merge (char **dest, char **ps) - int i; - int j; - char **p; -+ grub_size_t sz; - - if (! dest) - return ps; -@@ -60,7 +62,12 @@ merge (char **dest, char **ps) - for (j = 0; ps[j]; j++) - ; - -- p = grub_realloc (dest, sizeof (char*) * (i + j + 1)); -+ if (grub_add (i, j, &sz) || -+ grub_add (sz, 1, &sz) || -+ grub_mul (sz, sizeof (char *), &sz)) -+ return dest; -+ -+ p = grub_realloc (dest, sz); - if (! p) - { - grub_free (dest); -@@ -115,8 +122,15 @@ make_regex (const char *start, const char *end, regex_t *regexp) - char ch; - int i = 0; - unsigned len = end - start; -- char *buffer = grub_malloc (len * 2 + 2 + 1); /* worst case size. */ -+ char *buffer; -+ grub_size_t sz; - -+ /* Worst case size is (len * 2 + 2 + 1). */ -+ if (grub_mul (len, 2, &sz) || -+ grub_add (sz, 3, &sz)) -+ return 1; -+ -+ buffer = grub_malloc (sz); - if (! buffer) - return 1; - -@@ -226,6 +240,7 @@ match_devices_iter (const char *name, void *data) - struct match_devices_ctx *ctx = data; - char **t; - char *buffer; -+ grub_size_t sz; - - /* skip partitions if asked to. */ - if (ctx->noparts && grub_strchr (name, ',')) -@@ -239,11 +254,16 @@ match_devices_iter (const char *name, void *data) - if (regexec (ctx->regexp, buffer, 0, 0, 0)) - { - grub_dprintf ("expand", "not matched\n"); -+ fail: - grub_free (buffer); - return 0; - } - -- t = grub_realloc (ctx->devs, sizeof (char*) * (ctx->ndev + 2)); -+ if (grub_add (ctx->ndev, 2, &sz) || -+ grub_mul (sz, sizeof (char *), &sz)) -+ goto fail; -+ -+ t = grub_realloc (ctx->devs, sz); - if (! t) - { - grub_free (buffer); -@@ -300,6 +320,7 @@ match_files_iter (const char *name, - struct match_files_ctx *ctx = data; - char **t; - char *buffer; -+ grub_size_t sz; - - /* skip . and .. names */ - if (grub_strcmp(".", name) == 0 || grub_strcmp("..", name) == 0) -@@ -315,9 +336,14 @@ match_files_iter (const char *name, - if (! buffer) - return 1; - -- t = grub_realloc (ctx->files, sizeof (char*) * (ctx->nfile + 2)); -- if (! t) -+ if (grub_add (ctx->nfile, 2, &sz) || -+ grub_mul (sz, sizeof (char *), &sz)) -+ goto fail; -+ -+ t = grub_realloc (ctx->files, sz); -+ if (!t) - { -+ fail: - grub_free (buffer); - return 1; - } -diff --git a/grub-core/disk/ldm.c b/grub-core/disk/ldm.c -index e6323701a..58f8a53e1 100644 ---- a/grub-core/disk/ldm.c -+++ b/grub-core/disk/ldm.c -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - - #ifdef GRUB_UTIL - #include -@@ -289,6 +290,7 @@ make_vg (grub_disk_t disk, - struct grub_ldm_vblk vblk[GRUB_DISK_SECTOR_SIZE - / sizeof (struct grub_ldm_vblk)]; - unsigned i; -+ grub_size_t sz; - err = grub_disk_read (disk, cursec, 0, - sizeof(vblk), &vblk); - if (err) -@@ -350,7 +352,13 @@ make_vg (grub_disk_t disk, - grub_free (lv); - goto fail2; - } -- lv->name = grub_malloc (*ptr + 1); -+ if (grub_add (*ptr, 1, &sz)) -+ { -+ grub_free (lv->internal_id); -+ grub_free (lv); -+ goto fail2; -+ } -+ lv->name = grub_malloc (sz); - if (!lv->name) - { - grub_free (lv->internal_id); -@@ -599,10 +607,13 @@ make_vg (grub_disk_t disk, - if (lv->segments->node_alloc == lv->segments->node_count) - { - void *t; -- lv->segments->node_alloc *= 2; -- t = grub_realloc (lv->segments->nodes, -- sizeof (*lv->segments->nodes) -- * lv->segments->node_alloc); -+ grub_size_t sz; -+ -+ if (grub_mul (lv->segments->node_alloc, 2, &lv->segments->node_alloc) || -+ grub_mul (lv->segments->node_alloc, sizeof (*lv->segments->nodes), &sz)) -+ goto fail2; -+ -+ t = grub_realloc (lv->segments->nodes, sz); - if (!t) - goto fail2; - lv->segments->nodes = t; -@@ -723,10 +734,13 @@ make_vg (grub_disk_t disk, - if (comp->segment_alloc == comp->segment_count) - { - void *t; -- comp->segment_alloc *= 2; -- t = grub_realloc (comp->segments, -- comp->segment_alloc -- * sizeof (*comp->segments)); -+ grub_size_t sz; -+ -+ if (grub_mul (comp->segment_alloc, 2, &comp->segment_alloc) || -+ grub_mul (comp->segment_alloc, sizeof (*comp->segments), &sz)) -+ goto fail2; -+ -+ t = grub_realloc (comp->segments, sz); - if (!t) - goto fail2; - comp->segments = t; -diff --git a/grub-core/font/font.c b/grub-core/font/font.c -index 8e118b315..5edb477ac 100644 ---- a/grub-core/font/font.c -+++ b/grub-core/font/font.c -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - GRUB_MOD_LICENSE ("GPLv3+"); - -@@ -360,9 +361,13 @@ static char * - read_section_as_string (struct font_file_section *section) - { - char *str; -+ grub_size_t sz; - grub_ssize_t ret; - -- str = grub_malloc (section->length + 1); -+ if (grub_add (section->length, 1, &sz)) -+ return NULL; -+ -+ str = grub_malloc (sz); - if (!str) - return 0; - -diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c -index 11272efc1..2b65bd56a 100644 ---- a/grub-core/fs/btrfs.c -+++ b/grub-core/fs/btrfs.c -@@ -40,6 +40,7 @@ - #include - #include - #include -+#include - - GRUB_MOD_LICENSE ("GPLv3+"); - -@@ -329,9 +330,13 @@ save_ref (struct grub_btrfs_leaf_descriptor *desc, - if (desc->allocated < desc->depth) - { - void *newdata; -- desc->allocated *= 2; -- newdata = grub_realloc (desc->data, sizeof (desc->data[0]) -- * desc->allocated); -+ grub_size_t sz; -+ -+ if (grub_mul (desc->allocated, 2, &desc->allocated) || -+ grub_mul (desc->allocated, sizeof (desc->data[0]), &sz)) -+ return GRUB_ERR_OUT_OF_RANGE; -+ -+ newdata = grub_realloc (desc->data, sz); - if (!newdata) - return grub_errno; - desc->data = newdata; -@@ -622,16 +627,21 @@ find_device (struct grub_btrfs_data *data, grub_uint64_t id) - if (data->n_devices_attached > data->n_devices_allocated) - { - void *tmp; -- data->n_devices_allocated = 2 * data->n_devices_attached + 1; -- data->devices_attached -- = grub_realloc (tmp = data->devices_attached, -- data->n_devices_allocated -- * sizeof (data->devices_attached[0])); -+ grub_size_t sz; -+ -+ if (grub_mul (data->n_devices_attached, 2, &data->n_devices_allocated) || -+ grub_add (data->n_devices_allocated, 1, &data->n_devices_allocated) || -+ grub_mul (data->n_devices_allocated, sizeof (data->devices_attached[0]), &sz)) -+ goto fail; -+ -+ data->devices_attached = grub_realloc (tmp = data->devices_attached, sz); - if (!data->devices_attached) - { -+ data->devices_attached = tmp; -+ -+ fail: - if (ctx.dev_found) - grub_device_close (ctx.dev_found); -- data->devices_attached = tmp; - return NULL; - } - } -diff --git a/grub-core/fs/ext2.c b/grub-core/fs/ext2.c -index 9b389802a..ac33bcd68 100644 ---- a/grub-core/fs/ext2.c -+++ b/grub-core/fs/ext2.c -@@ -46,6 +46,7 @@ - #include - #include - #include -+#include - - GRUB_MOD_LICENSE ("GPLv3+"); - -@@ -703,6 +704,7 @@ grub_ext2_read_symlink (grub_fshelp_node_t node) - { - char *symlink; - struct grub_fshelp_node *diro = node; -+ grub_size_t sz; - - if (! diro->inode_read) - { -@@ -717,7 +719,13 @@ grub_ext2_read_symlink (grub_fshelp_node_t node) - } - } - -- symlink = grub_malloc (grub_le_to_cpu32 (diro->inode.size) + 1); -+ if (grub_add (grub_le_to_cpu32 (diro->inode.size), 1, &sz)) -+ { -+ grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is detected")); -+ return NULL; -+ } -+ -+ symlink = grub_malloc (sz); - if (! symlink) - return 0; - -diff --git a/grub-core/fs/iso9660.c b/grub-core/fs/iso9660.c -index 4f1b52a55..7ba5b300b 100644 ---- a/grub-core/fs/iso9660.c -+++ b/grub-core/fs/iso9660.c -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - GRUB_MOD_LICENSE ("GPLv3+"); - -@@ -531,8 +532,13 @@ add_part (struct iterate_dir_ctx *ctx, - int len2) - { - int size = ctx->symlink ? grub_strlen (ctx->symlink) : 0; -+ grub_size_t sz; - -- ctx->symlink = grub_realloc (ctx->symlink, size + len2 + 1); -+ if (grub_add (size, len2, &sz) || -+ grub_add (sz, 1, &sz)) -+ return; -+ -+ ctx->symlink = grub_realloc (ctx->symlink, sz); - if (! ctx->symlink) - return; - -@@ -560,17 +566,24 @@ susp_iterate_dir (struct grub_iso9660_susp_entry *entry, - { - grub_size_t off = 0, csize = 1; - char *old; -+ grub_size_t sz; -+ - csize = entry->len - 5; - old = ctx->filename; - if (ctx->filename_alloc) - { - off = grub_strlen (ctx->filename); -- ctx->filename = grub_realloc (ctx->filename, csize + off + 1); -+ if (grub_add (csize, off, &sz) || -+ grub_add (sz, 1, &sz)) -+ return GRUB_ERR_OUT_OF_RANGE; -+ ctx->filename = grub_realloc (ctx->filename, sz); - } - else - { - off = 0; -- ctx->filename = grub_zalloc (csize + 1); -+ if (grub_add (csize, 1, &sz)) -+ return GRUB_ERR_OUT_OF_RANGE; -+ ctx->filename = grub_zalloc (sz); - } - if (!ctx->filename) - { -@@ -776,14 +789,18 @@ grub_iso9660_iterate_dir (grub_fshelp_node_t dir, - if (node->have_dirents >= node->alloc_dirents) - { - struct grub_fshelp_node *new_node; -- node->alloc_dirents *= 2; -- new_node = grub_realloc (node, -- sizeof (struct grub_fshelp_node) -- + ((node->alloc_dirents -- - ARRAY_SIZE (node->dirents)) -- * sizeof (node->dirents[0]))); -+ grub_size_t sz; -+ -+ if (grub_mul (node->alloc_dirents, 2, &node->alloc_dirents) || -+ grub_sub (node->alloc_dirents, ARRAY_SIZE (node->dirents), &sz) || -+ grub_mul (sz, sizeof (node->dirents[0]), &sz) || -+ grub_add (sz, sizeof (struct grub_fshelp_node), &sz)) -+ goto fail_0; -+ -+ new_node = grub_realloc (node, sz); - if (!new_node) - { -+ fail_0: - if (ctx.filename_alloc) - grub_free (ctx.filename); - grub_free (node); -@@ -799,14 +816,18 @@ grub_iso9660_iterate_dir (grub_fshelp_node_t dir, - * sizeof (node->dirents[0]) < grub_strlen (ctx.symlink) + 1) - { - struct grub_fshelp_node *new_node; -- new_node = grub_realloc (node, -- sizeof (struct grub_fshelp_node) -- + ((node->alloc_dirents -- - ARRAY_SIZE (node->dirents)) -- * sizeof (node->dirents[0])) -- + grub_strlen (ctx.symlink) + 1); -+ grub_size_t sz; -+ -+ if (grub_sub (node->alloc_dirents, ARRAY_SIZE (node->dirents), &sz) || -+ grub_mul (sz, sizeof (node->dirents[0]), &sz) || -+ grub_add (sz, sizeof (struct grub_fshelp_node) + 1, &sz) || -+ grub_add (sz, grub_strlen (ctx.symlink), &sz)) -+ goto fail_1; -+ -+ new_node = grub_realloc (node, sz); - if (!new_node) - { -+ fail_1: - if (ctx.filename_alloc) - grub_free (ctx.filename); - grub_free (node); -diff --git a/grub-core/fs/sfs.c b/grub-core/fs/sfs.c -index 90f7fb379..de2b107a4 100644 ---- a/grub-core/fs/sfs.c -+++ b/grub-core/fs/sfs.c -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - - GRUB_MOD_LICENSE ("GPLv3+"); - -@@ -307,10 +308,15 @@ grub_sfs_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock) - if (node->cache && node->cache_size >= node->cache_allocated) - { - struct cache_entry *e = node->cache; -- e = grub_realloc (node->cache,node->cache_allocated * 2 -- * sizeof (e[0])); -+ grub_size_t sz; -+ -+ if (grub_mul (node->cache_allocated, 2 * sizeof (e[0]), &sz)) -+ goto fail; -+ -+ e = grub_realloc (node->cache, sz); - if (!e) - { -+ fail: - grub_errno = 0; - grub_free (node->cache); - node->cache = 0; -@@ -477,10 +483,16 @@ grub_sfs_create_node (struct grub_fshelp_node **node, - grub_size_t len = grub_strlen (name); - grub_uint8_t *name_u8; - int ret; -+ grub_size_t sz; -+ -+ if (grub_mul (len, GRUB_MAX_UTF8_PER_LATIN1, &sz) || -+ grub_add (sz, 1, &sz)) -+ return 1; -+ - *node = grub_malloc (sizeof (**node)); - if (!*node) - return 1; -- name_u8 = grub_malloc (len * GRUB_MAX_UTF8_PER_LATIN1 + 1); -+ name_u8 = grub_malloc (sz); - if (!name_u8) - { - grub_free (*node); -@@ -724,8 +736,13 @@ grub_sfs_label (grub_device_t device, char **label) - data = grub_sfs_mount (disk); - if (data) - { -- grub_size_t len = grub_strlen (data->label); -- *label = grub_malloc (len * GRUB_MAX_UTF8_PER_LATIN1 + 1); -+ grub_size_t sz, len = grub_strlen (data->label); -+ -+ if (grub_mul (len, GRUB_MAX_UTF8_PER_LATIN1, &sz) || -+ grub_add (sz, 1, &sz)) -+ return GRUB_ERR_OUT_OF_RANGE; -+ -+ *label = grub_malloc (sz); - if (*label) - *grub_latin1_to_utf8 ((grub_uint8_t *) *label, - (const grub_uint8_t *) data->label, -diff --git a/grub-core/fs/squash4.c b/grub-core/fs/squash4.c -index 95d5c1e1f..785123894 100644 ---- a/grub-core/fs/squash4.c -+++ b/grub-core/fs/squash4.c -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - #include - - #include "xz.h" -@@ -459,7 +460,17 @@ grub_squash_read_symlink (grub_fshelp_node_t node) - { - char *ret; - grub_err_t err; -- ret = grub_malloc (grub_le_to_cpu32 (node->ino.symlink.namelen) + 1); -+ grub_size_t sz; -+ -+ if (grub_add (grub_le_to_cpu32 (node->ino.symlink.namelen), 1, &sz)) -+ { -+ grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is detected")); -+ return NULL; -+ } -+ -+ ret = grub_malloc (sz); -+ if (!ret) -+ return NULL; - - err = read_chunk (node->data, ret, - grub_le_to_cpu32 (node->ino.symlink.namelen), -@@ -506,11 +517,16 @@ grub_squash_iterate_dir (grub_fshelp_node_t dir, - - { - grub_fshelp_node_t node; -- node = grub_malloc (sizeof (*node) + dir->stsize * sizeof (dir->stack[0])); -+ grub_size_t sz; -+ -+ if (grub_mul (dir->stsize, sizeof (dir->stack[0]), &sz) || -+ grub_add (sz, sizeof (*node), &sz)) -+ return 0; -+ -+ node = grub_malloc (sz); - if (!node) - return 0; -- grub_memcpy (node, dir, -- sizeof (*node) + dir->stsize * sizeof (dir->stack[0])); -+ grub_memcpy (node, dir, sz); - if (hook (".", GRUB_FSHELP_DIR, node, hook_data)) - return 1; - -@@ -518,12 +534,15 @@ grub_squash_iterate_dir (grub_fshelp_node_t dir, - { - grub_err_t err; - -- node = grub_malloc (sizeof (*node) + dir->stsize * sizeof (dir->stack[0])); -+ if (grub_mul (dir->stsize, sizeof (dir->stack[0]), &sz) || -+ grub_add (sz, sizeof (*node), &sz)) -+ return 0; -+ -+ node = grub_malloc (sz); - if (!node) - return 0; - -- grub_memcpy (node, dir, -- sizeof (*node) + dir->stsize * sizeof (dir->stack[0])); -+ grub_memcpy (node, dir, sz); - - node->stsize--; - err = read_chunk (dir->data, &node->ino, sizeof (node->ino), -@@ -557,6 +576,7 @@ grub_squash_iterate_dir (grub_fshelp_node_t dir, - enum grub_fshelp_filetype filetype = GRUB_FSHELP_REG; - struct grub_squash_dirent di; - struct grub_squash_inode ino; -+ grub_size_t sz; - - err = read_chunk (dir->data, &di, sizeof (di), - grub_le_to_cpu64 (dir->data->sb.diroffset) -@@ -589,13 +609,16 @@ grub_squash_iterate_dir (grub_fshelp_node_t dir, - if (grub_le_to_cpu16 (di.type) == SQUASH_TYPE_SYMLINK) - filetype = GRUB_FSHELP_SYMLINK; - -- node = grub_malloc (sizeof (*node) -- + (dir->stsize + 1) * sizeof (dir->stack[0])); -+ if (grub_add (dir->stsize, 1, &sz) || -+ grub_mul (sz, sizeof (dir->stack[0]), &sz) || -+ grub_add (sz, sizeof (*node), &sz)) -+ return 0; -+ -+ node = grub_malloc (sz); - if (! node) - return 0; - -- grub_memcpy (node, dir, -- sizeof (*node) + dir->stsize * sizeof (dir->stack[0])); -+ grub_memcpy (node, dir, sz - sizeof(dir->stack[0])); - - node->ino = ino; - node->stack[node->stsize].ino_chunk = grub_le_to_cpu32 (dh.ino_chunk); -diff --git a/grub-core/fs/udf.c b/grub-core/fs/udf.c -index a83761674..21ac7f446 100644 ---- a/grub-core/fs/udf.c -+++ b/grub-core/fs/udf.c -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - GRUB_MOD_LICENSE ("GPLv3+"); - -@@ -890,9 +891,19 @@ read_string (const grub_uint8_t *raw, grub_size_t sz, char *outbuf) - utf16[i] = (raw[2 * i + 1] << 8) | raw[2*i + 2]; - } - if (!outbuf) -- outbuf = grub_malloc (utf16len * GRUB_MAX_UTF8_PER_UTF16 + 1); -+ { -+ grub_size_t size; -+ -+ if (grub_mul (utf16len, GRUB_MAX_UTF8_PER_UTF16, &size) || -+ grub_add (size, 1, &size)) -+ goto fail; -+ -+ outbuf = grub_malloc (size); -+ } - if (outbuf) - *grub_utf16_to_utf8 ((grub_uint8_t *) outbuf, utf16, utf16len) = '\0'; -+ -+ fail: - grub_free (utf16); - return outbuf; - } -@@ -1005,7 +1016,7 @@ grub_udf_read_symlink (grub_fshelp_node_t node) - grub_size_t sz = U64 (node->block.fe.file_size); - grub_uint8_t *raw; - const grub_uint8_t *ptr; -- char *out, *optr; -+ char *out = NULL, *optr; - - if (sz < 4) - return NULL; -@@ -1013,14 +1024,16 @@ grub_udf_read_symlink (grub_fshelp_node_t node) - if (!raw) - return NULL; - if (grub_udf_read_file (node, NULL, NULL, 0, sz, (char *) raw) < 0) -- { -- grub_free (raw); -- return NULL; -- } -+ goto fail_1; - -- out = grub_malloc (sz * 2 + 1); -+ if (grub_mul (sz, 2, &sz) || -+ grub_add (sz, 1, &sz)) -+ goto fail_0; -+ -+ out = grub_malloc (sz); - if (!out) - { -+ fail_0: - grub_free (raw); - return NULL; - } -@@ -1031,17 +1044,17 @@ grub_udf_read_symlink (grub_fshelp_node_t node) - { - grub_size_t s; - if ((grub_size_t) (ptr - raw + 4) > sz) -- goto fail; -+ goto fail_1; - if (!(ptr[2] == 0 && ptr[3] == 0)) -- goto fail; -+ goto fail_1; - s = 4 + ptr[1]; - if ((grub_size_t) (ptr - raw + s) > sz) -- goto fail; -+ goto fail_1; - switch (*ptr) - { - case 1: - if (ptr[1]) -- goto fail; -+ goto fail_1; - /* Fallthrough. */ - case 2: - /* in 4 bytes. out: 1 byte. */ -@@ -1066,11 +1079,11 @@ grub_udf_read_symlink (grub_fshelp_node_t node) - if (optr != out) - *optr++ = '/'; - if (!read_string (ptr + 4, s - 4, optr)) -- goto fail; -+ goto fail_1; - optr += grub_strlen (optr); - break; - default: -- goto fail; -+ goto fail_1; - } - ptr += s; - } -@@ -1078,7 +1091,7 @@ grub_udf_read_symlink (grub_fshelp_node_t node) - grub_free (raw); - return out; - -- fail: -+ fail_1: - grub_free (raw); - grub_free (out); - grub_error (GRUB_ERR_BAD_FS, "invalid symlink"); -diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c -index 96ffecbfc..ea6590290 100644 ---- a/grub-core/fs/xfs.c -+++ b/grub-core/fs/xfs.c -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - - GRUB_MOD_LICENSE ("GPLv3+"); - -@@ -899,6 +900,7 @@ static struct grub_xfs_data * - grub_xfs_mount (grub_disk_t disk) - { - struct grub_xfs_data *data = 0; -+ grub_size_t sz; - - data = grub_zalloc (sizeof (struct grub_xfs_data)); - if (!data) -@@ -913,10 +915,11 @@ grub_xfs_mount (grub_disk_t disk) - if (!grub_xfs_sb_valid(data)) - goto fail; - -- data = grub_realloc (data, -- sizeof (struct grub_xfs_data) -- - sizeof (struct grub_xfs_inode) -- + grub_xfs_inode_size(data) + 1); -+ if (grub_add (grub_xfs_inode_size (data), -+ sizeof (struct grub_xfs_data) - sizeof (struct grub_xfs_inode) + 1, &sz)) -+ goto fail; -+ -+ data = grub_realloc (data, sz); - - if (! data) - goto fail; -diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c -index 381dde556..36d0373a6 100644 ---- a/grub-core/fs/zfs/zfs.c -+++ b/grub-core/fs/zfs/zfs.c -@@ -55,6 +55,7 @@ - #include - #include - #include -+#include - - GRUB_MOD_LICENSE ("GPLv3+"); - -@@ -773,11 +774,14 @@ fill_vdev_info (struct grub_zfs_data *data, - if (data->n_devices_attached > data->n_devices_allocated) - { - void *tmp; -- data->n_devices_allocated = 2 * data->n_devices_attached + 1; -- data->devices_attached -- = grub_realloc (tmp = data->devices_attached, -- data->n_devices_allocated -- * sizeof (data->devices_attached[0])); -+ grub_size_t sz; -+ -+ if (grub_mul (data->n_devices_attached, 2, &data->n_devices_allocated) || -+ grub_add (data->n_devices_allocated, 1, &data->n_devices_allocated) || -+ grub_mul (data->n_devices_allocated, sizeof (data->devices_attached[0]), &sz)) -+ return GRUB_ERR_OUT_OF_RANGE; -+ -+ data->devices_attached = grub_realloc (tmp = data->devices_attached, sz); - if (!data->devices_attached) - { - data->devices_attached = tmp; -@@ -3468,14 +3472,18 @@ grub_zfs_nvlist_lookup_nvlist (const char *nvlist, const char *name) - { - char *nvpair; - char *ret; -- grub_size_t size; -+ grub_size_t size, sz; - int found; - - found = nvlist_find_value (nvlist, name, DATA_TYPE_NVLIST, &nvpair, - &size, 0); - if (!found) - return 0; -- ret = grub_zalloc (size + 3 * sizeof (grub_uint32_t)); -+ -+ if (grub_add (size, 3 * sizeof (grub_uint32_t), &sz)) -+ return 0; -+ -+ ret = grub_zalloc (sz); - if (!ret) - return 0; - grub_memcpy (ret, nvlist, sizeof (grub_uint32_t)); -diff --git a/grub-core/fs/zfs/zfscrypt.c b/grub-core/fs/zfs/zfscrypt.c -index 1402e0bc2..de3b015f5 100644 ---- a/grub-core/fs/zfs/zfscrypt.c -+++ b/grub-core/fs/zfs/zfscrypt.c -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -82,9 +83,13 @@ grub_zfs_add_key (grub_uint8_t *key_in, - int passphrase) - { - struct grub_zfs_wrap_key *key; -+ grub_size_t sz; -+ - if (!passphrase && keylen > 32) - keylen = 32; -- key = grub_malloc (sizeof (*key) + keylen); -+ if (grub_add (sizeof (*key), keylen, &sz)) -+ return GRUB_ERR_OUT_OF_RANGE; -+ key = grub_malloc (sz); - if (!key) - return grub_errno; - key->is_passphrase = passphrase; -diff --git a/grub-core/lib/arg.c b/grub-core/lib/arg.c -index fd7744a6f..3288609a5 100644 ---- a/grub-core/lib/arg.c -+++ b/grub-core/lib/arg.c -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - - /* Built-in parser for default options. */ - static const struct grub_arg_option help_options[] = -@@ -216,7 +217,13 @@ static inline grub_err_t - add_arg (char ***argl, int *num, char *s) - { - char **p = *argl; -- *argl = grub_realloc (*argl, (++(*num) + 1) * sizeof (char *)); -+ grub_size_t sz; -+ -+ if (grub_add (++(*num), 1, &sz) || -+ grub_mul (sz, sizeof (char *), &sz)) -+ return grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is detected")); -+ -+ *argl = grub_realloc (*argl, sz); - if (! *argl) - { - grub_free (p); -@@ -431,6 +438,7 @@ grub_arg_list_alloc(grub_extcmd_t extcmd, int argc, - grub_size_t argcnt; - struct grub_arg_list *list; - const struct grub_arg_option *options; -+ grub_size_t sz0, sz1; - - options = extcmd->options; - if (! options) -@@ -443,7 +451,15 @@ grub_arg_list_alloc(grub_extcmd_t extcmd, int argc, - argcnt += ((grub_size_t) argc + 1) / 2 + 1; /* max possible for any option */ - } - -- list = grub_zalloc (sizeof (*list) * i + sizeof (char*) * argcnt); -+ if (grub_mul (sizeof (*list), i, &sz0) || -+ grub_mul (sizeof (char *), argcnt, &sz1) || -+ grub_add (sz0, sz1, &sz0)) -+ { -+ grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is detected")); -+ return 0; -+ } -+ -+ list = grub_zalloc (sz0); - if (! list) - return 0; - -diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c -index 3730ed382..b92cbe98d 100644 ---- a/grub-core/loader/i386/bsd.c -+++ b/grub-core/loader/i386/bsd.c -@@ -35,6 +35,7 @@ - #include - #include - #include -+#include - #include - #ifdef GRUB_MACHINE_PCBIOS - #include -@@ -1012,11 +1013,16 @@ grub_netbsd_add_modules (void) - struct grub_netbsd_btinfo_modules *mods; - unsigned i; - grub_err_t err; -+ grub_size_t sz; - - for (mod = netbsd_mods; mod; mod = mod->next) - modcnt++; - -- mods = grub_malloc (sizeof (*mods) + sizeof (mods->mods[0]) * modcnt); -+ if (grub_mul (modcnt, sizeof (mods->mods[0]), &sz) || -+ grub_add (sz, sizeof (*mods), &sz)) -+ return GRUB_ERR_OUT_OF_RANGE; -+ -+ mods = grub_malloc (sz); - if (!mods) - return grub_errno; - -diff --git a/grub-core/net/dns.c b/grub-core/net/dns.c -index e332d5eb4..906ec7d67 100644 ---- a/grub-core/net/dns.c -+++ b/grub-core/net/dns.c -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - struct dns_cache_element - { -@@ -51,9 +52,15 @@ grub_net_add_dns_server (const struct grub_net_network_level_address *s) - { - int na = dns_servers_alloc * 2; - struct grub_net_network_level_address *ns; -+ grub_size_t sz; -+ - if (na < 8) - na = 8; -- ns = grub_realloc (dns_servers, na * sizeof (ns[0])); -+ -+ if (grub_mul (na, sizeof (ns[0]), &sz)) -+ return GRUB_ERR_OUT_OF_RANGE; -+ -+ ns = grub_realloc (dns_servers, sz); - if (!ns) - return grub_errno; - dns_servers_alloc = na; -diff --git a/grub-core/normal/charset.c b/grub-core/normal/charset.c -index d57fb72fa..4dfcc3107 100644 ---- a/grub-core/normal/charset.c -+++ b/grub-core/normal/charset.c -@@ -48,6 +48,7 @@ - #include - #include - #include -+#include - - #if HAVE_FONT_SOURCE - #include "widthspec.h" -@@ -464,6 +465,7 @@ grub_unicode_aglomerate_comb (const grub_uint32_t *in, grub_size_t inlen, - { - struct grub_unicode_combining *n; - unsigned j; -+ grub_size_t sz; - - if (!haveout) - continue; -@@ -477,10 +479,14 @@ grub_unicode_aglomerate_comb (const grub_uint32_t *in, grub_size_t inlen, - n = out->combining_inline; - else if (out->ncomb > (int) ARRAY_SIZE (out->combining_inline)) - { -- n = grub_realloc (out->combining_ptr, -- sizeof (n[0]) * (out->ncomb + 1)); -+ if (grub_add (out->ncomb, 1, &sz) || -+ grub_mul (sz, sizeof (n[0]), &sz)) -+ goto fail; -+ -+ n = grub_realloc (out->combining_ptr, sz); - if (!n) - { -+ fail: - grub_errno = GRUB_ERR_NONE; - continue; - } -diff --git a/grub-core/normal/cmdline.c b/grub-core/normal/cmdline.c -index c57242e2e..de03fe63b 100644 ---- a/grub-core/normal/cmdline.c -+++ b/grub-core/normal/cmdline.c -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - static grub_uint32_t *kill_buf; - -@@ -307,12 +308,21 @@ cl_insert (struct cmdline_term *cl_terms, unsigned nterms, - if (len + (*llen) >= (*max_len)) - { - grub_uint32_t *nbuf; -- (*max_len) *= 2; -- nbuf = grub_realloc ((*buf), sizeof (grub_uint32_t) * (*max_len)); -+ grub_size_t sz; -+ -+ if (grub_mul (*max_len, 2, max_len) || -+ grub_mul (*max_len, sizeof (grub_uint32_t), &sz)) -+ { -+ grub_errno = GRUB_ERR_OUT_OF_RANGE; -+ goto fail; -+ } -+ -+ nbuf = grub_realloc ((*buf), sz); - if (nbuf) - (*buf) = nbuf; - else - { -+ fail: - grub_print_error (); - grub_errno = GRUB_ERR_NONE; - (*max_len) /= 2; -diff --git a/grub-core/normal/menu_entry.c b/grub-core/normal/menu_entry.c -index 1993995be..50eef918c 100644 ---- a/grub-core/normal/menu_entry.c -+++ b/grub-core/normal/menu_entry.c -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - - enum update_mode - { -@@ -113,10 +114,18 @@ ensure_space (struct line *linep, int extra) - { - if (linep->max_len < linep->len + extra) - { -- linep->max_len = 2 * (linep->len + extra); -- linep->buf = grub_realloc (linep->buf, (linep->max_len + 1) * sizeof (linep->buf[0])); -+ grub_size_t sz0, sz1; -+ -+ if (grub_add (linep->len, extra, &sz0) || -+ grub_mul (sz0, 2, &sz0) || -+ grub_add (sz0, 1, &sz1) || -+ grub_mul (sz1, sizeof (linep->buf[0]), &sz1)) -+ return 0; -+ -+ linep->buf = grub_realloc (linep->buf, sz1); - if (! linep->buf) - return 0; -+ linep->max_len = sz0; - } - - return 1; -diff --git a/grub-core/script/argv.c b/grub-core/script/argv.c -index 217ec5d1e..5751fdd57 100644 ---- a/grub-core/script/argv.c -+++ b/grub-core/script/argv.c -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - - /* Return nearest power of two that is >= v. */ - static unsigned -@@ -81,11 +82,16 @@ int - grub_script_argv_next (struct grub_script_argv *argv) - { - char **p = argv->args; -+ grub_size_t sz; - - if (argv->args && argv->argc && argv->args[argv->argc - 1] == 0) - return 0; - -- p = grub_realloc (p, round_up_exp ((argv->argc + 2) * sizeof (char *))); -+ if (grub_add (argv->argc, 2, &sz) || -+ grub_mul (sz, sizeof (char *), &sz)) -+ return 1; -+ -+ p = grub_realloc (p, round_up_exp (sz)); - if (! p) - return 1; - -@@ -105,13 +111,19 @@ grub_script_argv_append (struct grub_script_argv *argv, const char *s, - { - grub_size_t a; - char *p = argv->args[argv->argc - 1]; -+ grub_size_t sz; - - if (! s) - return 0; - - a = p ? grub_strlen (p) : 0; - -- p = grub_realloc (p, round_up_exp ((a + slen + 1) * sizeof (char))); -+ if (grub_add (a, slen, &sz) || -+ grub_add (sz, 1, &sz) || -+ grub_mul (sz, sizeof (char), &sz)) -+ return 1; -+ -+ p = grub_realloc (p, round_up_exp (sz)); - if (! p) - return 1; - -diff --git a/grub-core/script/lexer.c b/grub-core/script/lexer.c -index c6bd3172f..5fb0cbd0b 100644 ---- a/grub-core/script/lexer.c -+++ b/grub-core/script/lexer.c -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - - #define yytext_ptr char * - #include "grub_script.tab.h" -@@ -110,10 +111,14 @@ grub_script_lexer_record (struct grub_parser_param *parser, char *str) - old = lexer->recording; - if (lexer->recordlen < len) - lexer->recordlen = len; -- lexer->recordlen *= 2; -+ -+ if (grub_mul (lexer->recordlen, 2, &lexer->recordlen)) -+ goto fail; -+ - lexer->recording = grub_realloc (lexer->recording, lexer->recordlen); - if (!lexer->recording) - { -+ fail: - grub_free (old); - lexer->recordpos = 0; - lexer->recordlen = 0; -@@ -130,7 +135,7 @@ int - grub_script_lexer_yywrap (struct grub_parser_param *parserstate, - const char *input) - { -- grub_size_t len = 0; -+ grub_size_t len = 0, sz; - char *p = 0; - char *line = 0; - YY_BUFFER_STATE buffer; -@@ -168,12 +173,22 @@ grub_script_lexer_yywrap (struct grub_parser_param *parserstate, - } - else if (len && line[len - 1] != '\n') - { -- p = grub_realloc (line, len + 2); -+ if (grub_add (len, 2, &sz)) -+ { -+ grub_free (line); -+ grub_script_yyerror (parserstate, N_("overflow is detected")); -+ return 1; -+ } -+ -+ p = grub_realloc (line, sz); - if (p) - { - p[len++] = '\n'; - p[len] = '\0'; - } -+ else -+ grub_free (line); -+ - line = p; - } - -diff --git a/grub-core/video/bitmap.c b/grub-core/video/bitmap.c -index b2e031566..6256e209a 100644 ---- a/grub-core/video/bitmap.c -+++ b/grub-core/video/bitmap.c -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - - GRUB_MOD_LICENSE ("GPLv3+"); - -@@ -58,7 +59,7 @@ grub_video_bitmap_create (struct grub_video_bitmap **bitmap, - enum grub_video_blit_format blit_format) - { - struct grub_video_mode_info *mode_info; -- unsigned int size; -+ grub_size_t size; - - if (!bitmap) - return grub_error (GRUB_ERR_BUG, "invalid argument"); -@@ -137,19 +138,25 @@ grub_video_bitmap_create (struct grub_video_bitmap **bitmap, - - mode_info->pitch = width * mode_info->bytes_per_pixel; - -- /* Calculate size needed for the data. */ -- size = (width * mode_info->bytes_per_pixel) * height; -+ /* Calculate size needed for the data. */ -+ if (grub_mul (width, mode_info->bytes_per_pixel, &size) || -+ grub_mul (size, height, &size)) -+ { -+ grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is detected")); -+ goto fail; -+ } - - (*bitmap)->data = grub_zalloc (size); - if (! (*bitmap)->data) -- { -- grub_free (*bitmap); -- *bitmap = 0; -- -- return grub_errno; -- } -+ goto fail; - - return GRUB_ERR_NONE; -+ -+ fail: -+ grub_free (*bitmap); -+ *bitmap = NULL; -+ -+ return grub_errno; - } - - /* Frees all resources allocated by bitmap. */ -diff --git a/grub-core/video/readers/png.c b/grub-core/video/readers/png.c -index 61bd64537..0157ff742 100644 ---- a/grub-core/video/readers/png.c -+++ b/grub-core/video/readers/png.c -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - - GRUB_MOD_LICENSE ("GPLv3+"); - -@@ -301,9 +302,17 @@ grub_png_decode_image_header (struct grub_png_data *data) - data->bpp <<= 1; - - data->color_bits = color_bits; -- data->row_bytes = data->image_width * data->bpp; -+ -+ if (grub_mul (data->image_width, data->bpp, &data->row_bytes)) -+ return grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is detected")); -+ - if (data->color_bits <= 4) -- data->row_bytes = (data->image_width * data->color_bits + 7) / 8; -+ { -+ if (grub_mul (data->image_width, data->color_bits + 7, &data->row_bytes)) -+ return grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is detected")); -+ -+ data->row_bytes >>= 3; -+ } - - #ifndef GRUB_CPU_WORDS_BIGENDIAN - if (data->is_16bit || data->is_gray || data->is_palette) --- -2.26.2 - diff --git a/buildroot/boot/grub2/0007-iso9660-Don-t-leak-memory-on-realloc-failures.patch b/buildroot/boot/grub2/0007-iso9660-Don-t-leak-memory-on-realloc-failures.patch deleted file mode 100644 index 6b0aee080c..0000000000 --- a/buildroot/boot/grub2/0007-iso9660-Don-t-leak-memory-on-realloc-failures.patch +++ /dev/null @@ -1,72 +0,0 @@ -From e0dd17a3ce79c6622dc78c96e1f2ef1b20e2bf7b Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Sat, 4 Jul 2020 12:25:09 -0400 -Subject: [PATCH] iso9660: Don't leak memory on realloc() failures -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Peter Jones -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/fs/iso9660.c | 24 ++++++++++++++++++++---- - 1 file changed, 20 insertions(+), 4 deletions(-) - -diff --git a/grub-core/fs/iso9660.c b/grub-core/fs/iso9660.c -index 7ba5b300b..5ec4433b8 100644 ---- a/grub-core/fs/iso9660.c -+++ b/grub-core/fs/iso9660.c -@@ -533,14 +533,20 @@ add_part (struct iterate_dir_ctx *ctx, - { - int size = ctx->symlink ? grub_strlen (ctx->symlink) : 0; - grub_size_t sz; -+ char *new; - - if (grub_add (size, len2, &sz) || - grub_add (sz, 1, &sz)) - return; - -- ctx->symlink = grub_realloc (ctx->symlink, sz); -- if (! ctx->symlink) -- return; -+ new = grub_realloc (ctx->symlink, sz); -+ if (!new) -+ { -+ grub_free (ctx->symlink); -+ ctx->symlink = NULL; -+ return; -+ } -+ ctx->symlink = new; - - grub_memcpy (ctx->symlink + size, part, len2); - ctx->symlink[size + len2] = 0; -@@ -634,7 +640,12 @@ susp_iterate_dir (struct grub_iso9660_susp_entry *entry, - is the length. Both are part of the `Component - Record'. */ - if (ctx->symlink && !ctx->was_continue) -- add_part (ctx, "/", 1); -+ { -+ add_part (ctx, "/", 1); -+ if (grub_errno) -+ return grub_errno; -+ } -+ - add_part (ctx, (char *) &entry->data[pos + 2], - entry->data[pos + 1]); - ctx->was_continue = (entry->data[pos] & 1); -@@ -653,6 +664,11 @@ susp_iterate_dir (struct grub_iso9660_susp_entry *entry, - add_part (ctx, "/", 1); - break; - } -+ -+ /* Check if grub_realloc() failed in add_part(). */ -+ if (grub_errno) -+ return grub_errno; -+ - /* In pos + 1 the length of the `Component Record' is - stored. */ - pos += entry->data[pos + 1] + 2; --- -2.26.2 - diff --git a/buildroot/boot/grub2/0008-font-Do-not-load-more-than-one-NAME-section.patch b/buildroot/boot/grub2/0008-font-Do-not-load-more-than-one-NAME-section.patch deleted file mode 100644 index f4616292fe..0000000000 --- a/buildroot/boot/grub2/0008-font-Do-not-load-more-than-one-NAME-section.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 73bc7a964c9496d5b0f00dbd69959dacf5adcebe Mon Sep 17 00:00:00 2001 -From: Daniel Kiper -Date: Tue, 7 Jul 2020 15:36:26 +0200 -Subject: [PATCH] font: Do not load more than one NAME section -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The GRUB font file can have one NAME section only. Though if somebody -crafts a broken font file with many NAME sections and loads it then the -GRUB leaks memory. So, prevent against that by loading first NAME -section and failing in controlled way on following one. - -Reported-by: Chris Coulson -Signed-off-by: Daniel Kiper -Reviewed-by: Jan Setje-Eilers -Signed-off-by: Stefan Sørensen ---- - grub-core/font/font.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/grub-core/font/font.c b/grub-core/font/font.c -index 5edb477ac..d09bb38d8 100644 ---- a/grub-core/font/font.c -+++ b/grub-core/font/font.c -@@ -532,6 +532,12 @@ grub_font_load (const char *filename) - if (grub_memcmp (section.name, FONT_FORMAT_SECTION_NAMES_FONT_NAME, - sizeof (FONT_FORMAT_SECTION_NAMES_FONT_NAME) - 1) == 0) - { -+ if (font->name != NULL) -+ { -+ grub_error (GRUB_ERR_BAD_FONT, "invalid font file: too many NAME sections"); -+ goto fail; -+ } -+ - font->name = read_section_as_string (§ion); - if (!font->name) - goto fail; --- -2.26.2 - diff --git a/buildroot/boot/grub2/0009-gfxmenu-Fix-double-free-in-load_image.patch b/buildroot/boot/grub2/0009-gfxmenu-Fix-double-free-in-load_image.patch deleted file mode 100644 index 732d166642..0000000000 --- a/buildroot/boot/grub2/0009-gfxmenu-Fix-double-free-in-load_image.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 9ff609f0e7798bc5fb04f791131c98e7693bdd9b Mon Sep 17 00:00:00 2001 -From: Alexey Makhalov -Date: Wed, 8 Jul 2020 20:41:56 +0000 -Subject: [PATCH] gfxmenu: Fix double free in load_image() -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -self->bitmap should be zeroed after free. Otherwise, there is a chance -to double free (USE_AFTER_FREE) it later in rescale_image(). - -Fixes: CID 292472 - -Signed-off-by: Alexey Makhalov -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/gfxmenu/gui_image.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/grub-core/gfxmenu/gui_image.c b/grub-core/gfxmenu/gui_image.c -index 29784ed2d..6b2e976f1 100644 ---- a/grub-core/gfxmenu/gui_image.c -+++ b/grub-core/gfxmenu/gui_image.c -@@ -195,7 +195,10 @@ load_image (grub_gui_image_t self, const char *path) - return grub_errno; - - if (self->bitmap && (self->bitmap != self->raw_bitmap)) -- grub_video_bitmap_destroy (self->bitmap); -+ { -+ grub_video_bitmap_destroy (self->bitmap); -+ self->bitmap = 0; -+ } - if (self->raw_bitmap) - grub_video_bitmap_destroy (self->raw_bitmap); - --- -2.26.2 - diff --git a/buildroot/boot/grub2/0010-xnu-Fix-double-free-in-grub_xnu_devprop_add_property.patch b/buildroot/boot/grub2/0010-xnu-Fix-double-free-in-grub_xnu_devprop_add_property.patch deleted file mode 100644 index 72cf58d446..0000000000 --- a/buildroot/boot/grub2/0010-xnu-Fix-double-free-in-grub_xnu_devprop_add_property.patch +++ /dev/null @@ -1,58 +0,0 @@ -From dc9777dc17697b196c415c53187a55861d41fd2a Mon Sep 17 00:00:00 2001 -From: Alexey Makhalov -Date: Wed, 8 Jul 2020 21:30:43 +0000 -Subject: [PATCH] xnu: Fix double free in grub_xnu_devprop_add_property() -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -grub_xnu_devprop_add_property() should not free utf8 and utf16 as it get -allocated and freed in the caller. - -Minor improvement: do prop fields initialization after memory allocations. - -Fixes: CID 292442, CID 292457, CID 292460, CID 292466 - -Signed-off-by: Alexey Makhalov -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/loader/i386/xnu.c | 17 ++++++++--------- - 1 file changed, 8 insertions(+), 9 deletions(-) - -diff --git a/grub-core/loader/i386/xnu.c b/grub-core/loader/i386/xnu.c -index b7d176b5d..e9e119259 100644 ---- a/grub-core/loader/i386/xnu.c -+++ b/grub-core/loader/i386/xnu.c -@@ -262,20 +262,19 @@ grub_xnu_devprop_add_property (struct grub_xnu_devprop_device_descriptor *dev, - if (!prop) - return grub_errno; - -- prop->name = utf8; -- prop->name16 = utf16; -- prop->name16len = utf16len; -- -- prop->length = datalen; -- prop->data = grub_malloc (prop->length); -+ prop->data = grub_malloc (datalen); - if (!prop->data) - { -- grub_free (prop->name); -- grub_free (prop->name16); - grub_free (prop); - return grub_errno; - } -- grub_memcpy (prop->data, data, prop->length); -+ grub_memcpy (prop->data, data, datalen); -+ -+ prop->name = utf8; -+ prop->name16 = utf16; -+ prop->name16len = utf16len; -+ prop->length = datalen; -+ - grub_list_push (GRUB_AS_LIST_P (&dev->properties), - GRUB_AS_LIST (prop)); - return GRUB_ERR_NONE; --- -2.26.2 - diff --git a/buildroot/boot/grub2/0011-lzma-Make-sure-we-don-t-dereference-past-array.patch b/buildroot/boot/grub2/0011-lzma-Make-sure-we-don-t-dereference-past-array.patch deleted file mode 100644 index a7d5a48e5c..0000000000 --- a/buildroot/boot/grub2/0011-lzma-Make-sure-we-don-t-dereference-past-array.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 78829f0c230680e386fff9f420bb1631bc20f761 Mon Sep 17 00:00:00 2001 -From: Konrad Rzeszutek Wilk -Date: Thu, 9 Jul 2020 03:05:23 +0000 -Subject: [PATCH] lzma: Make sure we don't dereference past array -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The two dimensional array p->posSlotEncoder[4][64] is being dereferenced -using the GetLenToPosState() macro which checks if len is less than 5, -and if so subtracts 2 from it. If len = 0, that is 0 - 2 = 4294967294. -Obviously we don't want to dereference that far out so we check if the -position found is greater or equal kNumLenToPosStates (4) and bail out. - -N.B.: Upstream LZMA 18.05 and later has this function completely rewritten -without any history. - -Fixes: CID 51526 - -Signed-off-by: Konrad Rzeszutek Wilk -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/lib/LzmaEnc.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/grub-core/lib/LzmaEnc.c b/grub-core/lib/LzmaEnc.c -index f2ec04a8c..753e56a95 100644 ---- a/grub-core/lib/LzmaEnc.c -+++ b/grub-core/lib/LzmaEnc.c -@@ -1877,13 +1877,19 @@ static SRes LzmaEnc_CodeOneBlock(CLzmaEnc *p, Bool useLimits, UInt32 maxPackSize - } - else - { -- UInt32 posSlot; -+ UInt32 posSlot, lenToPosState; - RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 0); - p->state = kMatchNextStates[p->state]; - LenEnc_Encode2(&p->lenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices); - pos -= LZMA_NUM_REPS; - GetPosSlot(pos, posSlot); -- RcTree_Encode(&p->rc, p->posSlotEncoder[GetLenToPosState(len)], kNumPosSlotBits, posSlot); -+ lenToPosState = GetLenToPosState(len); -+ if (lenToPosState >= kNumLenToPosStates) -+ { -+ p->result = SZ_ERROR_DATA; -+ return CheckErrors(p); -+ } -+ RcTree_Encode(&p->rc, p->posSlotEncoder[lenToPosState], kNumPosSlotBits, posSlot); - - if (posSlot >= kStartPosModelIndex) - { --- -2.26.2 - diff --git a/buildroot/boot/grub2/0012-term-Fix-overflow-on-user-inputs.patch b/buildroot/boot/grub2/0012-term-Fix-overflow-on-user-inputs.patch deleted file mode 100644 index 77b01a4818..0000000000 --- a/buildroot/boot/grub2/0012-term-Fix-overflow-on-user-inputs.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 8d3b6f9da468f666e3a7976657f2ab5c52762a21 Mon Sep 17 00:00:00 2001 -From: Konrad Rzeszutek Wilk -Date: Tue, 7 Jul 2020 15:12:25 -0400 -Subject: [PATCH] term: Fix overflow on user inputs -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This requires a very weird input from the serial interface but can cause -an overflow in input_buf (keys) overwriting the next variable (npending) -with the user choice: - -(pahole output) - -struct grub_terminfo_input_state { - int input_buf[6]; /* 0 24 */ - int npending; /* 24 4 */ <- CORRUPT - ...snip... - -The magic string requires causing this is "ESC,O,],0,1,2,q" and we overflow -npending with "q" (aka increase npending to 161). The simplest fix is to -just to disallow overwrites input_buf, which exactly what this patch does. - -Fixes: CID 292449 - -Signed-off-by: Konrad Rzeszutek Wilk -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/term/terminfo.c | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/grub-core/term/terminfo.c b/grub-core/term/terminfo.c -index d317efa36..5fa94c0c3 100644 ---- a/grub-core/term/terminfo.c -+++ b/grub-core/term/terminfo.c -@@ -398,7 +398,7 @@ grub_terminfo_getwh (struct grub_term_output *term) - } - - static void --grub_terminfo_readkey (struct grub_term_input *term, int *keys, int *len, -+grub_terminfo_readkey (struct grub_term_input *term, int *keys, int *len, int max_len, - int (*readkey) (struct grub_term_input *term)) - { - int c; -@@ -414,6 +414,9 @@ grub_terminfo_readkey (struct grub_term_input *term, int *keys, int *len, - if (c == -1) \ - return; \ - \ -+ if (*len >= max_len) \ -+ return; \ -+ \ - keys[*len] = c; \ - (*len)++; \ - } -@@ -602,8 +605,8 @@ grub_terminfo_getkey (struct grub_term_input *termi) - return ret; - } - -- grub_terminfo_readkey (termi, data->input_buf, -- &data->npending, data->readkey); -+ grub_terminfo_readkey (termi, data->input_buf, &data->npending, -+ GRUB_TERMINFO_READKEY_MAX_LEN, data->readkey); - - #if defined(__powerpc__) && defined(GRUB_MACHINE_IEEE1275) - if (data->npending == 1 && data->input_buf[0] == GRUB_TERM_ESC --- -2.26.2 - diff --git a/buildroot/boot/grub2/0013-udf-Fix-memory-leak.patch b/buildroot/boot/grub2/0013-udf-Fix-memory-leak.patch deleted file mode 100644 index d79de90593..0000000000 --- a/buildroot/boot/grub2/0013-udf-Fix-memory-leak.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 748b691761d31bfff7e9d0d210caa606294c2b52 Mon Sep 17 00:00:00 2001 -From: Konrad Rzeszutek Wilk -Date: Tue, 7 Jul 2020 22:02:31 -0400 -Subject: [PATCH] udf: Fix memory leak -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes: CID 73796 - -Signed-off-by: Konrad Rzeszutek Wilk -Reviewed-by: Daniel Kiper -Reviewed-by: Jan Setje-Eilers -Signed-off-by: Stefan Sørensen ---- - grub-core/fs/udf.c | 17 +++++++++++++---- - 1 file changed, 13 insertions(+), 4 deletions(-) - -diff --git a/grub-core/fs/udf.c b/grub-core/fs/udf.c -index 21ac7f446..2ac5c1d00 100644 ---- a/grub-core/fs/udf.c -+++ b/grub-core/fs/udf.c -@@ -965,8 +965,10 @@ grub_udf_iterate_dir (grub_fshelp_node_t dir, - return 0; - - if (grub_udf_read_icb (dir->data, &dirent.icb, child)) -- return 0; -- -+ { -+ grub_free (child); -+ return 0; -+ } - if (dirent.characteristics & GRUB_UDF_FID_CHAR_PARENT) - { - /* This is the parent directory. */ -@@ -988,11 +990,18 @@ grub_udf_iterate_dir (grub_fshelp_node_t dir, - dirent.file_ident_length, - (char *) raw)) - != dirent.file_ident_length) -- return 0; -+ { -+ grub_free (child); -+ return 0; -+ } - - filename = read_string (raw, dirent.file_ident_length, 0); - if (!filename) -- grub_print_error (); -+ { -+ /* As the hook won't get called. */ -+ grub_free (child); -+ grub_print_error (); -+ } - - if (filename && hook (filename, type, child, hook_data)) - { --- -2.26.2 - diff --git a/buildroot/boot/grub2/0014-multiboot2-Fix-memory-leak-if-grub_create_loader_cmd.patch b/buildroot/boot/grub2/0014-multiboot2-Fix-memory-leak-if-grub_create_loader_cmd.patch deleted file mode 100644 index f3e2a04141..0000000000 --- a/buildroot/boot/grub2/0014-multiboot2-Fix-memory-leak-if-grub_create_loader_cmd.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 49bf3faa106498e151306fc780c63194a14751e3 Mon Sep 17 00:00:00 2001 -From: Konrad Rzeszutek Wilk -Date: Fri, 26 Jun 2020 10:51:43 -0400 -Subject: [PATCH] multiboot2: Fix memory leak if - grub_create_loader_cmdline() fails -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes: CID 292468 - -Signed-off-by: Konrad Rzeszutek Wilk -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/loader/multiboot_mbi2.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/grub-core/loader/multiboot_mbi2.c b/grub-core/loader/multiboot_mbi2.c -index 53da78615..0efc66062 100644 ---- a/grub-core/loader/multiboot_mbi2.c -+++ b/grub-core/loader/multiboot_mbi2.c -@@ -1070,7 +1070,11 @@ grub_multiboot2_add_module (grub_addr_t start, grub_size_t size, - err = grub_create_loader_cmdline (argc, argv, newmod->cmdline, - newmod->cmdline_size, GRUB_VERIFY_MODULE_CMDLINE); - if (err) -- return err; -+ { -+ grub_free (newmod->cmdline); -+ grub_free (newmod); -+ return err; -+ } - - if (modules_last) - modules_last->next = newmod; --- -2.26.2 - diff --git a/buildroot/boot/grub2/0015-tftp-Do-not-use-priority-queue.patch b/buildroot/boot/grub2/0015-tftp-Do-not-use-priority-queue.patch deleted file mode 100644 index 833606befe..0000000000 --- a/buildroot/boot/grub2/0015-tftp-Do-not-use-priority-queue.patch +++ /dev/null @@ -1,283 +0,0 @@ -From b6c4a1b204740fe52b32e7f530831a59f4038e20 Mon Sep 17 00:00:00 2001 -From: Alexey Makhalov -Date: Thu, 9 Jul 2020 08:10:40 +0000 -Subject: [PATCH] tftp: Do not use priority queue -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -There is not need to reassemble the order of blocks. Per RFC 1350, -server must wait for the ACK, before sending next block. Data packets -can be served immediately without putting them to priority queue. - -Logic to handle incoming packet is this: - - if packet block id equal to expected block id, then - process the packet, - - if packet block id is less than expected - this is retransmit - of old packet, then ACK it and drop the packet, - - if packet block id is more than expected - that shouldn't - happen, just drop the packet. - -It makes the tftp receive path code simpler, smaller and faster. -As a benefit, this change fixes CID# 73624 and CID# 96690, caused -by following while loop: - - while (cmp_block (grub_be_to_cpu16 (tftph->u.data.block), data->block + 1) == 0) - -where tftph pointer is not moving from one iteration to another, causing -to serve same packet again. Luckily, double serving didn't happen due to -data->block++ during the first iteration. - -Fixes: CID 73624, CID 96690 - -Signed-off-by: Alexey Makhalov -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/net/tftp.c | 168 ++++++++++++++----------------------------- - 1 file changed, 53 insertions(+), 115 deletions(-) - -diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c -index 7d90bf66e..b4297bc8d 100644 ---- a/grub-core/net/tftp.c -+++ b/grub-core/net/tftp.c -@@ -25,7 +25,6 @@ - #include - #include - #include --#include - #include - - GRUB_MOD_LICENSE ("GPLv3+"); -@@ -106,31 +105,8 @@ typedef struct tftp_data - int have_oack; - struct grub_error_saved save_err; - grub_net_udp_socket_t sock; -- grub_priority_queue_t pq; - } *tftp_data_t; - --static int --cmp_block (grub_uint16_t a, grub_uint16_t b) --{ -- grub_int16_t i = (grub_int16_t) (a - b); -- if (i > 0) -- return +1; -- if (i < 0) -- return -1; -- return 0; --} -- --static int --cmp (const void *a__, const void *b__) --{ -- struct grub_net_buff *a_ = *(struct grub_net_buff **) a__; -- struct grub_net_buff *b_ = *(struct grub_net_buff **) b__; -- struct tftphdr *a = (struct tftphdr *) a_->data; -- struct tftphdr *b = (struct tftphdr *) b_->data; -- /* We want the first elements to be on top. */ -- return -cmp_block (grub_be_to_cpu16 (a->u.data.block), grub_be_to_cpu16 (b->u.data.block)); --} -- - static grub_err_t - ack (tftp_data_t data, grub_uint64_t block) - { -@@ -207,73 +183,60 @@ tftp_receive (grub_net_udp_socket_t sock __attribute__ ((unused)), - return GRUB_ERR_NONE; - } - -- err = grub_priority_queue_push (data->pq, &nb); -- if (err) -- return err; -- -- { -- struct grub_net_buff **nb_top_p, *nb_top; -- while (1) -- { -- nb_top_p = grub_priority_queue_top (data->pq); -- if (!nb_top_p) -- return GRUB_ERR_NONE; -- nb_top = *nb_top_p; -- tftph = (struct tftphdr *) nb_top->data; -- if (cmp_block (grub_be_to_cpu16 (tftph->u.data.block), data->block + 1) >= 0) -- break; -- ack (data, grub_be_to_cpu16 (tftph->u.data.block)); -- grub_netbuff_free (nb_top); -- grub_priority_queue_pop (data->pq); -- } -- while (cmp_block (grub_be_to_cpu16 (tftph->u.data.block), data->block + 1) == 0) -- { -- unsigned size; -- -- grub_priority_queue_pop (data->pq); -- -- if (file->device->net->packs.count < 50) -+ /* Ack old/retransmitted block. */ -+ if (grub_be_to_cpu16 (tftph->u.data.block) < data->block + 1) -+ ack (data, grub_be_to_cpu16 (tftph->u.data.block)); -+ /* Ignore unexpected block. */ -+ else if (grub_be_to_cpu16 (tftph->u.data.block) > data->block + 1) -+ grub_dprintf ("tftp", "TFTP unexpected block # %d\n", tftph->u.data.block); -+ else -+ { -+ unsigned size; -+ -+ if (file->device->net->packs.count < 50) -+ { - err = ack (data, data->block + 1); -- else -- { -- file->device->net->stall = 1; -- err = 0; -- } -- if (err) -- return err; -- -- err = grub_netbuff_pull (nb_top, sizeof (tftph->opcode) + -- sizeof (tftph->u.data.block)); -- if (err) -- return err; -- size = nb_top->tail - nb_top->data; -- -- data->block++; -- if (size < data->block_size) -- { -- if (data->ack_sent < data->block) -- ack (data, data->block); -- file->device->net->eof = 1; -- file->device->net->stall = 1; -- grub_net_udp_close (data->sock); -- data->sock = NULL; -- } -- /* Prevent garbage in broken cards. Is it still necessary -- given that IP implementation has been fixed? -- */ -- if (size > data->block_size) -- { -- err = grub_netbuff_unput (nb_top, size - data->block_size); -- if (err) -- return err; -- } -- /* If there is data, puts packet in socket list. */ -- if ((nb_top->tail - nb_top->data) > 0) -- grub_net_put_packet (&file->device->net->packs, nb_top); -- else -- grub_netbuff_free (nb_top); -- } -- } -+ if (err) -+ return err; -+ } -+ else -+ file->device->net->stall = 1; -+ -+ err = grub_netbuff_pull (nb, sizeof (tftph->opcode) + -+ sizeof (tftph->u.data.block)); -+ if (err) -+ return err; -+ size = nb->tail - nb->data; -+ -+ data->block++; -+ if (size < data->block_size) -+ { -+ if (data->ack_sent < data->block) -+ ack (data, data->block); -+ file->device->net->eof = 1; -+ file->device->net->stall = 1; -+ grub_net_udp_close (data->sock); -+ data->sock = NULL; -+ } -+ /* -+ * Prevent garbage in broken cards. Is it still necessary -+ * given that IP implementation has been fixed? -+ */ -+ if (size > data->block_size) -+ { -+ err = grub_netbuff_unput (nb, size - data->block_size); -+ if (err) -+ return err; -+ } -+ /* If there is data, puts packet in socket list. */ -+ if ((nb->tail - nb->data) > 0) -+ { -+ grub_net_put_packet (&file->device->net->packs, nb); -+ /* Do not free nb. */ -+ return GRUB_ERR_NONE; -+ } -+ } -+ grub_netbuff_free (nb); - return GRUB_ERR_NONE; - case TFTP_ERROR: - data->have_oack = 1; -@@ -287,19 +250,6 @@ tftp_receive (grub_net_udp_socket_t sock __attribute__ ((unused)), - } - } - --static void --destroy_pq (tftp_data_t data) --{ -- struct grub_net_buff **nb_p; -- while ((nb_p = grub_priority_queue_top (data->pq))) -- { -- grub_netbuff_free (*nb_p); -- grub_priority_queue_pop (data->pq); -- } -- -- grub_priority_queue_destroy (data->pq); --} -- - static grub_err_t - tftp_open (struct grub_file *file, const char *filename) - { -@@ -372,17 +322,9 @@ tftp_open (struct grub_file *file, const char *filename) - file->not_easily_seekable = 1; - file->data = data; - -- data->pq = grub_priority_queue_new (sizeof (struct grub_net_buff *), cmp); -- if (!data->pq) -- { -- grub_free (data); -- return grub_errno; -- } -- - err = grub_net_resolve_address (file->device->net->server, &addr); - if (err) - { -- destroy_pq (data); - grub_free (data); - return err; - } -@@ -392,7 +334,6 @@ tftp_open (struct grub_file *file, const char *filename) - file); - if (!data->sock) - { -- destroy_pq (data); - grub_free (data); - return grub_errno; - } -@@ -406,7 +347,6 @@ tftp_open (struct grub_file *file, const char *filename) - if (err) - { - grub_net_udp_close (data->sock); -- destroy_pq (data); - grub_free (data); - return err; - } -@@ -423,7 +363,6 @@ tftp_open (struct grub_file *file, const char *filename) - if (grub_errno) - { - grub_net_udp_close (data->sock); -- destroy_pq (data); - grub_free (data); - return grub_errno; - } -@@ -466,7 +405,6 @@ tftp_close (struct grub_file *file) - grub_print_error (); - grub_net_udp_close (data->sock); - } -- destroy_pq (data); - grub_free (data); - return GRUB_ERR_NONE; - } --- -2.26.2 - diff --git a/buildroot/boot/grub2/0016-relocator-Protect-grub_relocator_alloc_chunk_addr-in.patch b/buildroot/boot/grub2/0016-relocator-Protect-grub_relocator_alloc_chunk_addr-in.patch deleted file mode 100644 index 293b9f89b3..0000000000 --- a/buildroot/boot/grub2/0016-relocator-Protect-grub_relocator_alloc_chunk_addr-in.patch +++ /dev/null @@ -1,153 +0,0 @@ -From 1c7b619c84f229c1602c1958bcd054b6d9937562 Mon Sep 17 00:00:00 2001 -From: Alexey Makhalov -Date: Wed, 15 Jul 2020 06:42:37 +0000 -Subject: [PATCH] relocator: Protect grub_relocator_alloc_chunk_addr() - input args against integer underflow/overflow -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Use arithmetic macros from safemath.h to accomplish it. In this commit, -I didn't want to be too paranoid to check every possible math equation -for overflow/underflow. Only obvious places (with non zero chance of -overflow/underflow) were refactored. - -Signed-off-by: Alexey Makhalov -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/loader/i386/linux.c | 9 +++++++-- - grub-core/loader/i386/pc/linux.c | 9 +++++++-- - grub-core/loader/i386/xen.c | 12 ++++++++++-- - grub-core/loader/xnu.c | 11 +++++++---- - 4 files changed, 31 insertions(+), 10 deletions(-) - -diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c -index d0501e229..02a73463a 100644 ---- a/grub-core/loader/i386/linux.c -+++ b/grub-core/loader/i386/linux.c -@@ -36,6 +36,7 @@ - #include - #include - #include -+#include - - GRUB_MOD_LICENSE ("GPLv3+"); - -@@ -547,9 +548,13 @@ grub_linux_boot (void) - - { - grub_relocator_chunk_t ch; -+ grub_size_t sz; -+ -+ if (grub_add (ctx.real_size, efi_mmap_size, &sz)) -+ return GRUB_ERR_OUT_OF_RANGE; -+ - err = grub_relocator_alloc_chunk_addr (relocator, &ch, -- ctx.real_mode_target, -- (ctx.real_size + efi_mmap_size)); -+ ctx.real_mode_target, sz); - if (err) - return err; - real_mode_mem = get_virtual_current_address (ch); -diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c -index 47ea2945e..31f09922b 100644 ---- a/grub-core/loader/i386/pc/linux.c -+++ b/grub-core/loader/i386/pc/linux.c -@@ -35,6 +35,7 @@ - #include - #include - #include -+#include - - GRUB_MOD_LICENSE ("GPLv3+"); - -@@ -218,8 +219,12 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), - setup_sects = GRUB_LINUX_DEFAULT_SETUP_SECTS; - - real_size = setup_sects << GRUB_DISK_SECTOR_BITS; -- grub_linux16_prot_size = grub_file_size (file) -- - real_size - GRUB_DISK_SECTOR_SIZE; -+ if (grub_sub (grub_file_size (file), real_size, &grub_linux16_prot_size) || -+ grub_sub (grub_linux16_prot_size, GRUB_DISK_SECTOR_SIZE, &grub_linux16_prot_size)) -+ { -+ grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is detected")); -+ goto fail; -+ } - - if (! grub_linux_is_bzimage - && GRUB_LINUX_ZIMAGE_ADDR + grub_linux16_prot_size -diff --git a/grub-core/loader/i386/xen.c b/grub-core/loader/i386/xen.c -index 8f662c8ac..cd24874ca 100644 ---- a/grub-core/loader/i386/xen.c -+++ b/grub-core/loader/i386/xen.c -@@ -41,6 +41,7 @@ - #include - #include - #include -+#include - - GRUB_MOD_LICENSE ("GPLv3+"); - -@@ -636,6 +637,7 @@ grub_cmd_xen (grub_command_t cmd __attribute__ ((unused)), - grub_relocator_chunk_t ch; - grub_addr_t kern_start; - grub_addr_t kern_end; -+ grub_size_t sz; - - if (argc == 0) - return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected")); -@@ -703,8 +705,14 @@ grub_cmd_xen (grub_command_t cmd __attribute__ ((unused)), - - xen_state.max_addr = ALIGN_UP (kern_end, PAGE_SIZE); - -- err = grub_relocator_alloc_chunk_addr (xen_state.relocator, &ch, kern_start, -- kern_end - kern_start); -+ -+ if (grub_sub (kern_end, kern_start, &sz)) -+ { -+ err = GRUB_ERR_OUT_OF_RANGE; -+ goto fail; -+ } -+ -+ err = grub_relocator_alloc_chunk_addr (xen_state.relocator, &ch, kern_start, sz); - if (err) - goto fail; - kern_chunk_src = get_virtual_current_address (ch); -diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c -index 77d7060e1..9ae4ceb35 100644 ---- a/grub-core/loader/xnu.c -+++ b/grub-core/loader/xnu.c -@@ -34,6 +34,7 @@ - #include - #include - #include -+#include - - GRUB_MOD_LICENSE ("GPLv3+"); - -@@ -59,15 +60,17 @@ grub_xnu_heap_malloc (int size, void **src, grub_addr_t *target) - { - grub_err_t err; - grub_relocator_chunk_t ch; -+ grub_addr_t tgt; -+ -+ if (grub_add (grub_xnu_heap_target_start, grub_xnu_heap_size, &tgt)) -+ return GRUB_ERR_OUT_OF_RANGE; - -- err = grub_relocator_alloc_chunk_addr (grub_xnu_relocator, &ch, -- grub_xnu_heap_target_start -- + grub_xnu_heap_size, size); -+ err = grub_relocator_alloc_chunk_addr (grub_xnu_relocator, &ch, tgt, size); - if (err) - return err; - - *src = get_virtual_current_address (ch); -- *target = grub_xnu_heap_target_start + grub_xnu_heap_size; -+ *target = tgt; - grub_xnu_heap_size += size; - grub_dprintf ("xnu", "val=%p\n", *src); - return GRUB_ERR_NONE; --- -2.26.2 - diff --git a/buildroot/boot/grub2/0017-relocator-Protect-grub_relocator_alloc_chunk_align-m.patch b/buildroot/boot/grub2/0017-relocator-Protect-grub_relocator_alloc_chunk_align-m.patch deleted file mode 100644 index e04e72abac..0000000000 --- a/buildroot/boot/grub2/0017-relocator-Protect-grub_relocator_alloc_chunk_align-m.patch +++ /dev/null @@ -1,341 +0,0 @@ -From 0cfbbca3ccd84d36ffb1bcd6644ada7c73b19fc0 Mon Sep 17 00:00:00 2001 -From: Alexey Makhalov -Date: Wed, 8 Jul 2020 01:44:38 +0000 -Subject: [PATCH] relocator: Protect grub_relocator_alloc_chunk_align() - max_addr against integer underflow -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This commit introduces integer underflow mitigation in max_addr calculation -in grub_relocator_alloc_chunk_align() invocation. - -It consists of 2 fixes: - 1. Introduced grub_relocator_alloc_chunk_align_safe() wrapper function to perform - sanity check for min/max and size values, and to make safe invocation of - grub_relocator_alloc_chunk_align() with validated max_addr value. Replace all - invocations such as grub_relocator_alloc_chunk_align(..., min_addr, max_addr - size, size, ...) - by grub_relocator_alloc_chunk_align_safe(..., min_addr, max_addr, size, ...). - 2. Introduced UP_TO_TOP32(s) macro for the cases where max_addr is 32-bit top - address (0xffffffff - size + 1) or similar. - -Signed-off-by: Alexey Makhalov -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/lib/i386/relocator.c | 28 ++++++++++---------------- - grub-core/lib/mips/relocator.c | 6 ++---- - grub-core/lib/powerpc/relocator.c | 6 ++---- - grub-core/lib/x86_64/efi/relocator.c | 7 +++---- - grub-core/loader/i386/linux.c | 5 ++--- - grub-core/loader/i386/multiboot_mbi.c | 7 +++---- - grub-core/loader/i386/pc/linux.c | 6 ++---- - grub-core/loader/mips/linux.c | 9 +++------ - grub-core/loader/multiboot.c | 2 +- - grub-core/loader/multiboot_elfxx.c | 10 ++++----- - grub-core/loader/multiboot_mbi2.c | 10 ++++----- - grub-core/loader/xnu_resume.c | 2 +- - include/grub/relocator.h | 29 +++++++++++++++++++++++++++ - 13 files changed, 69 insertions(+), 58 deletions(-) - -diff --git a/grub-core/lib/i386/relocator.c b/grub-core/lib/i386/relocator.c -index 71dd4f0ab..34cbe834f 100644 ---- a/grub-core/lib/i386/relocator.c -+++ b/grub-core/lib/i386/relocator.c -@@ -83,11 +83,10 @@ grub_relocator32_boot (struct grub_relocator *rel, - /* Specific memory range due to Global Descriptor Table for use by payload - that we will store in returned chunk. The address range and preference - are based on "THE LINUX/x86 BOOT PROTOCOL" specification. */ -- err = grub_relocator_alloc_chunk_align (rel, &ch, 0x1000, -- 0x9a000 - RELOCATOR_SIZEOF (32), -- RELOCATOR_SIZEOF (32), 16, -- GRUB_RELOCATOR_PREFERENCE_LOW, -- avoid_efi_bootservices); -+ err = grub_relocator_alloc_chunk_align_safe (rel, &ch, 0x1000, 0x9a000, -+ RELOCATOR_SIZEOF (32), 16, -+ GRUB_RELOCATOR_PREFERENCE_LOW, -+ avoid_efi_bootservices); - if (err) - return err; - -@@ -125,13 +124,10 @@ grub_relocator16_boot (struct grub_relocator *rel, - grub_relocator_chunk_t ch; - - /* Put it higher than the byte it checks for A20 check. */ -- err = grub_relocator_alloc_chunk_align (rel, &ch, 0x8010, -- 0xa0000 - RELOCATOR_SIZEOF (16) -- - GRUB_RELOCATOR16_STACK_SIZE, -- RELOCATOR_SIZEOF (16) -- + GRUB_RELOCATOR16_STACK_SIZE, 16, -- GRUB_RELOCATOR_PREFERENCE_NONE, -- 0); -+ err = grub_relocator_alloc_chunk_align_safe (rel, &ch, 0x8010, 0xa0000, -+ RELOCATOR_SIZEOF (16) + -+ GRUB_RELOCATOR16_STACK_SIZE, 16, -+ GRUB_RELOCATOR_PREFERENCE_NONE, 0); - if (err) - return err; - -@@ -183,11 +179,9 @@ grub_relocator64_boot (struct grub_relocator *rel, - void *relst; - grub_relocator_chunk_t ch; - -- err = grub_relocator_alloc_chunk_align (rel, &ch, min_addr, -- max_addr - RELOCATOR_SIZEOF (64), -- RELOCATOR_SIZEOF (64), 16, -- GRUB_RELOCATOR_PREFERENCE_NONE, -- 0); -+ err = grub_relocator_alloc_chunk_align_safe (rel, &ch, min_addr, max_addr, -+ RELOCATOR_SIZEOF (64), 16, -+ GRUB_RELOCATOR_PREFERENCE_NONE, 0); - if (err) - return err; - -diff --git a/grub-core/lib/mips/relocator.c b/grub-core/lib/mips/relocator.c -index 9d5f49cb9..743b213e6 100644 ---- a/grub-core/lib/mips/relocator.c -+++ b/grub-core/lib/mips/relocator.c -@@ -120,10 +120,8 @@ grub_relocator32_boot (struct grub_relocator *rel, - unsigned i; - grub_addr_t vtarget; - -- err = grub_relocator_alloc_chunk_align (rel, &ch, 0, -- (0xffffffff - stateset_size) -- + 1, stateset_size, -- sizeof (grub_uint32_t), -+ err = grub_relocator_alloc_chunk_align (rel, &ch, 0, UP_TO_TOP32 (stateset_size), -+ stateset_size, sizeof (grub_uint32_t), - GRUB_RELOCATOR_PREFERENCE_NONE, 0); - if (err) - return err; -diff --git a/grub-core/lib/powerpc/relocator.c b/grub-core/lib/powerpc/relocator.c -index bdf2b111b..8ffb8b686 100644 ---- a/grub-core/lib/powerpc/relocator.c -+++ b/grub-core/lib/powerpc/relocator.c -@@ -115,10 +115,8 @@ grub_relocator32_boot (struct grub_relocator *rel, - unsigned i; - grub_relocator_chunk_t ch; - -- err = grub_relocator_alloc_chunk_align (rel, &ch, 0, -- (0xffffffff - stateset_size) -- + 1, stateset_size, -- sizeof (grub_uint32_t), -+ err = grub_relocator_alloc_chunk_align (rel, &ch, 0, UP_TO_TOP32 (stateset_size), -+ stateset_size, sizeof (grub_uint32_t), - GRUB_RELOCATOR_PREFERENCE_NONE, 0); - if (err) - return err; -diff --git a/grub-core/lib/x86_64/efi/relocator.c b/grub-core/lib/x86_64/efi/relocator.c -index 3caef7a40..7d200a125 100644 ---- a/grub-core/lib/x86_64/efi/relocator.c -+++ b/grub-core/lib/x86_64/efi/relocator.c -@@ -50,10 +50,9 @@ grub_relocator64_efi_boot (struct grub_relocator *rel, - * 64-bit relocator code may live above 4 GiB quite well. - * However, I do not want ask for problems. Just in case. - */ -- err = grub_relocator_alloc_chunk_align (rel, &ch, 0, -- 0x100000000 - RELOCATOR_SIZEOF (64_efi), -- RELOCATOR_SIZEOF (64_efi), 16, -- GRUB_RELOCATOR_PREFERENCE_NONE, 1); -+ err = grub_relocator_alloc_chunk_align_safe (rel, &ch, 0, 0x100000000, -+ RELOCATOR_SIZEOF (64_efi), 16, -+ GRUB_RELOCATOR_PREFERENCE_NONE, 1); - if (err) - return err; - -diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c -index 02a73463a..efbb99307 100644 ---- a/grub-core/loader/i386/linux.c -+++ b/grub-core/loader/i386/linux.c -@@ -181,9 +181,8 @@ allocate_pages (grub_size_t prot_size, grub_size_t *align, - for (; err && *align + 1 > min_align; (*align)--) - { - grub_errno = GRUB_ERR_NONE; -- err = grub_relocator_alloc_chunk_align (relocator, &ch, -- 0x1000000, -- 0xffffffff & ~prot_size, -+ err = grub_relocator_alloc_chunk_align (relocator, &ch, 0x1000000, -+ UP_TO_TOP32 (prot_size), - prot_size, 1 << *align, - GRUB_RELOCATOR_PREFERENCE_LOW, - 1); -diff --git a/grub-core/loader/i386/multiboot_mbi.c b/grub-core/loader/i386/multiboot_mbi.c -index ad3cc292f..a67d9d0a8 100644 ---- a/grub-core/loader/i386/multiboot_mbi.c -+++ b/grub-core/loader/i386/multiboot_mbi.c -@@ -466,10 +466,9 @@ grub_multiboot_make_mbi (grub_uint32_t *target) - - bufsize = grub_multiboot_get_mbi_size (); - -- err = grub_relocator_alloc_chunk_align (grub_multiboot_relocator, &ch, -- 0x10000, 0xa0000 - bufsize, -- bufsize, 4, -- GRUB_RELOCATOR_PREFERENCE_NONE, 0); -+ err = grub_relocator_alloc_chunk_align_safe (grub_multiboot_relocator, &ch, -+ 0x10000, 0xa0000, bufsize, 4, -+ GRUB_RELOCATOR_PREFERENCE_NONE, 0); - if (err) - return err; - ptrorig = get_virtual_current_address (ch); -diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c -index 31f09922b..5fed5ffdf 100644 ---- a/grub-core/loader/i386/pc/linux.c -+++ b/grub-core/loader/i386/pc/linux.c -@@ -453,10 +453,8 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), - - { - grub_relocator_chunk_t ch; -- err = grub_relocator_alloc_chunk_align (relocator, &ch, -- addr_min, addr_max - size, -- size, 0x1000, -- GRUB_RELOCATOR_PREFERENCE_HIGH, 0); -+ err = grub_relocator_alloc_chunk_align_safe (relocator, &ch, addr_min, addr_max, size, -+ 0x1000, GRUB_RELOCATOR_PREFERENCE_HIGH, 0); - if (err) - return err; - initrd_chunk = get_virtual_current_address (ch); -diff --git a/grub-core/loader/mips/linux.c b/grub-core/loader/mips/linux.c -index 7b723bf18..e4ed95921 100644 ---- a/grub-core/loader/mips/linux.c -+++ b/grub-core/loader/mips/linux.c -@@ -442,12 +442,9 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), - { - grub_relocator_chunk_t ch; - -- err = grub_relocator_alloc_chunk_align (relocator, &ch, -- (target_addr & 0x1fffffff) -- + linux_size + 0x10000, -- (0x10000000 - size), -- size, 0x10000, -- GRUB_RELOCATOR_PREFERENCE_NONE, 0); -+ err = grub_relocator_alloc_chunk_align_safe (relocator, &ch, (target_addr & 0x1fffffff) + -+ linux_size + 0x10000, 0x10000000, size, -+ 0x10000, GRUB_RELOCATOR_PREFERENCE_NONE, 0); - - if (err) - goto fail; -diff --git a/grub-core/loader/multiboot.c b/grub-core/loader/multiboot.c -index 4a98d7082..facb13f3d 100644 ---- a/grub-core/loader/multiboot.c -+++ b/grub-core/loader/multiboot.c -@@ -403,7 +403,7 @@ grub_cmd_module (grub_command_t cmd __attribute__ ((unused)), - { - grub_relocator_chunk_t ch; - err = grub_relocator_alloc_chunk_align (GRUB_MULTIBOOT (relocator), &ch, -- lowest_addr, (0xffffffff - size) + 1, -+ lowest_addr, UP_TO_TOP32 (size), - size, MULTIBOOT_MOD_ALIGN, - GRUB_RELOCATOR_PREFERENCE_NONE, 1); - if (err) -diff --git a/grub-core/loader/multiboot_elfxx.c b/grub-core/loader/multiboot_elfxx.c -index cc6853692..f2318e0d1 100644 ---- a/grub-core/loader/multiboot_elfxx.c -+++ b/grub-core/loader/multiboot_elfxx.c -@@ -109,10 +109,10 @@ CONCAT(grub_multiboot_load_elf, XX) (mbi_load_data_t *mld) - if (load_size > mld->max_addr || mld->min_addr > mld->max_addr - load_size) - return grub_error (GRUB_ERR_BAD_OS, "invalid min/max address and/or load size"); - -- err = grub_relocator_alloc_chunk_align (GRUB_MULTIBOOT (relocator), &ch, -- mld->min_addr, mld->max_addr - load_size, -- load_size, mld->align ? mld->align : 1, -- mld->preference, mld->avoid_efi_boot_services); -+ err = grub_relocator_alloc_chunk_align_safe (GRUB_MULTIBOOT (relocator), &ch, -+ mld->min_addr, mld->max_addr, -+ load_size, mld->align ? mld->align : 1, -+ mld->preference, mld->avoid_efi_boot_services); - - if (err) - { -@@ -256,7 +256,7 @@ CONCAT(grub_multiboot_load_elf, XX) (mbi_load_data_t *mld) - continue; - - err = grub_relocator_alloc_chunk_align (GRUB_MULTIBOOT (relocator), &ch, 0, -- (0xffffffff - sh->sh_size) + 1, -+ UP_TO_TOP32 (sh->sh_size), - sh->sh_size, sh->sh_addralign, - GRUB_RELOCATOR_PREFERENCE_NONE, - mld->avoid_efi_boot_services); -diff --git a/grub-core/loader/multiboot_mbi2.c b/grub-core/loader/multiboot_mbi2.c -index 0efc66062..03967839c 100644 ---- a/grub-core/loader/multiboot_mbi2.c -+++ b/grub-core/loader/multiboot_mbi2.c -@@ -295,10 +295,10 @@ grub_multiboot2_load (grub_file_t file, const char *filename) - return grub_error (GRUB_ERR_BAD_OS, "invalid min/max address and/or load size"); - } - -- err = grub_relocator_alloc_chunk_align (grub_multiboot2_relocator, &ch, -- mld.min_addr, mld.max_addr - code_size, -- code_size, mld.align ? mld.align : 1, -- mld.preference, keep_bs); -+ err = grub_relocator_alloc_chunk_align_safe (grub_multiboot2_relocator, &ch, -+ mld.min_addr, mld.max_addr, -+ code_size, mld.align ? mld.align : 1, -+ mld.preference, keep_bs); - } - else - err = grub_relocator_alloc_chunk_addr (grub_multiboot2_relocator, -@@ -708,7 +708,7 @@ grub_multiboot2_make_mbi (grub_uint32_t *target) - COMPILE_TIME_ASSERT (MULTIBOOT_TAG_ALIGN % sizeof (grub_properly_aligned_t) == 0); - - err = grub_relocator_alloc_chunk_align (grub_multiboot2_relocator, &ch, -- 0, 0xffffffff - bufsize, -+ 0, UP_TO_TOP32 (bufsize), - bufsize, MULTIBOOT_TAG_ALIGN, - GRUB_RELOCATOR_PREFERENCE_NONE, 1); - if (err) -diff --git a/grub-core/loader/xnu_resume.c b/grub-core/loader/xnu_resume.c -index 8089804d4..d648ef0cd 100644 ---- a/grub-core/loader/xnu_resume.c -+++ b/grub-core/loader/xnu_resume.c -@@ -129,7 +129,7 @@ grub_xnu_resume (char *imagename) - { - grub_relocator_chunk_t ch; - err = grub_relocator_alloc_chunk_align (grub_xnu_relocator, &ch, 0, -- (0xffffffff - hibhead.image_size) + 1, -+ UP_TO_TOP32 (hibhead.image_size), - hibhead.image_size, - GRUB_XNU_PAGESIZE, - GRUB_RELOCATOR_PREFERENCE_NONE, 0); -diff --git a/include/grub/relocator.h b/include/grub/relocator.h -index 24d8672d2..1b3bdd92a 100644 ---- a/include/grub/relocator.h -+++ b/include/grub/relocator.h -@@ -49,6 +49,35 @@ grub_relocator_alloc_chunk_align (struct grub_relocator *rel, - int preference, - int avoid_efi_boot_services); - -+/* -+ * Wrapper for grub_relocator_alloc_chunk_align() with purpose of -+ * protecting against integer underflow. -+ * -+ * Compare to its callee, max_addr has different meaning here. -+ * It covers entire chunk and not just start address of the chunk. -+ */ -+static inline grub_err_t -+grub_relocator_alloc_chunk_align_safe (struct grub_relocator *rel, -+ grub_relocator_chunk_t *out, -+ grub_phys_addr_t min_addr, -+ grub_phys_addr_t max_addr, -+ grub_size_t size, grub_size_t align, -+ int preference, -+ int avoid_efi_boot_services) -+{ -+ /* Sanity check and ensure following equation (max_addr - size) is safe. */ -+ if (max_addr < size || (max_addr - size) < min_addr) -+ return GRUB_ERR_OUT_OF_RANGE; -+ -+ return grub_relocator_alloc_chunk_align (rel, out, min_addr, -+ max_addr - size, -+ size, align, preference, -+ avoid_efi_boot_services); -+} -+ -+/* Top 32-bit address minus s bytes and plus 1 byte. */ -+#define UP_TO_TOP32(s) ((~(s) & 0xffffffff) + 1) -+ - #define GRUB_RELOCATOR_PREFERENCE_NONE 0 - #define GRUB_RELOCATOR_PREFERENCE_LOW 1 - #define GRUB_RELOCATOR_PREFERENCE_HIGH 2 --- -2.26.2 - diff --git a/buildroot/boot/grub2/0018-script-Remove-unused-fields-from-grub_script_functio.patch b/buildroot/boot/grub2/0018-script-Remove-unused-fields-from-grub_script_functio.patch deleted file mode 100644 index 7b0a5e514f..0000000000 --- a/buildroot/boot/grub2/0018-script-Remove-unused-fields-from-grub_script_functio.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 73aa0776457066ee6ebc93486c3cf0e6b755d1b8 Mon Sep 17 00:00:00 2001 -From: Chris Coulson -Date: Fri, 10 Jul 2020 11:21:14 +0100 -Subject: [PATCH] script: Remove unused fields from grub_script_function - struct -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Chris Coulson -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - include/grub/script_sh.h | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h -index 360c2be1f..b382bcf09 100644 ---- a/include/grub/script_sh.h -+++ b/include/grub/script_sh.h -@@ -359,13 +359,8 @@ struct grub_script_function - /* The script function. */ - struct grub_script *func; - -- /* The flags. */ -- unsigned flags; -- - /* The next element. */ - struct grub_script_function *next; -- -- int references; - }; - typedef struct grub_script_function *grub_script_function_t; - --- -2.26.2 - diff --git a/buildroot/boot/grub2/0019-script-Avoid-a-use-after-free-when-redefining-a-func.patch b/buildroot/boot/grub2/0019-script-Avoid-a-use-after-free-when-redefining-a-func.patch deleted file mode 100644 index 0fd60357d9..0000000000 --- a/buildroot/boot/grub2/0019-script-Avoid-a-use-after-free-when-redefining-a-func.patch +++ /dev/null @@ -1,113 +0,0 @@ -From 26349fcf80982b4d0120b73b2836e88bcf16853c Mon Sep 17 00:00:00 2001 -From: Chris Coulson -Date: Fri, 10 Jul 2020 14:41:45 +0100 -Subject: [PATCH] script: Avoid a use-after-free when redefining a - function during execution -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Defining a new function with the same name as a previously defined -function causes the grub_script and associated resources for the -previous function to be freed. If the previous function is currently -executing when a function with the same name is defined, this results -in use-after-frees when processing subsequent commands in the original -function. - -Instead, reject a new function definition if it has the same name as -a previously defined function, and that function is currently being -executed. Although a behavioural change, this should be backwards -compatible with existing configurations because they can't be -dependent on the current behaviour without being broken. - -Fixes: CVE-2020-15706 - -Signed-off-by: Chris Coulson -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/script/execute.c | 2 ++ - grub-core/script/function.c | 16 +++++++++++++--- - grub-core/script/parser.y | 3 ++- - include/grub/script_sh.h | 2 ++ - 4 files changed, 19 insertions(+), 4 deletions(-) - -diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c -index c8d6806fe..7e028e135 100644 ---- a/grub-core/script/execute.c -+++ b/grub-core/script/execute.c -@@ -838,7 +838,9 @@ grub_script_function_call (grub_script_function_t func, int argc, char **args) - old_scope = scope; - scope = &new_scope; - -+ func->executing++; - ret = grub_script_execute (func->func); -+ func->executing--; - - function_return = 0; - active_loops = loops; -diff --git a/grub-core/script/function.c b/grub-core/script/function.c -index d36655e51..3aad04bf9 100644 ---- a/grub-core/script/function.c -+++ b/grub-core/script/function.c -@@ -34,6 +34,7 @@ grub_script_function_create (struct grub_script_arg *functionname_arg, - func = (grub_script_function_t) grub_malloc (sizeof (*func)); - if (! func) - return 0; -+ func->executing = 0; - - func->name = grub_strdup (functionname_arg->str); - if (! func->name) -@@ -60,10 +61,19 @@ grub_script_function_create (struct grub_script_arg *functionname_arg, - grub_script_function_t q; - - q = *p; -- grub_script_free (q->func); -- q->func = cmd; - grub_free (func); -- func = q; -+ if (q->executing > 0) -+ { -+ grub_error (GRUB_ERR_BAD_ARGUMENT, -+ N_("attempt to redefine a function being executed")); -+ func = NULL; -+ } -+ else -+ { -+ grub_script_free (q->func); -+ q->func = cmd; -+ func = q; -+ } - } - else - { -diff --git a/grub-core/script/parser.y b/grub-core/script/parser.y -index 4f0ab8319..f80b86b6f 100644 ---- a/grub-core/script/parser.y -+++ b/grub-core/script/parser.y -@@ -289,7 +289,8 @@ function: "function" "name" - grub_script_mem_free (state->func_mem); - else { - script->children = state->scripts; -- grub_script_function_create ($2, script); -+ if (!grub_script_function_create ($2, script)) -+ grub_script_free (script); - } - - state->scripts = $3; -diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h -index b382bcf09..6c48e0751 100644 ---- a/include/grub/script_sh.h -+++ b/include/grub/script_sh.h -@@ -361,6 +361,8 @@ struct grub_script_function - - /* The next element. */ - struct grub_script_function *next; -+ -+ unsigned executing; - }; - typedef struct grub_script_function *grub_script_function_t; - --- -2.26.2 - diff --git a/buildroot/boot/grub2/0020-relocator-Fix-grub_relocator_alloc_chunk_align-top-m.patch b/buildroot/boot/grub2/0020-relocator-Fix-grub_relocator_alloc_chunk_align-top-m.patch deleted file mode 100644 index fc518c5f3b..0000000000 --- a/buildroot/boot/grub2/0020-relocator-Fix-grub_relocator_alloc_chunk_align-top-m.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 06aa91f79f902752cb7e5d22ac0ea8e13bffd056 Mon Sep 17 00:00:00 2001 -From: Alexey Makhalov -Date: Fri, 17 Jul 2020 05:17:26 +0000 -Subject: [PATCH] relocator: Fix grub_relocator_alloc_chunk_align() top - memory allocation -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Current implementation of grub_relocator_alloc_chunk_align() -does not allow allocation of the top byte. - -Assuming input args are: - max_addr = 0xfffff000; - size = 0x1000; - -And this is valid. But following overflow protection will -unnecessarily move max_addr one byte down (to 0xffffefff): - if (max_addr > ~size) - max_addr = ~size; - -~size + 1 will fix the situation. In addition, check size -for non zero to do not zero max_addr. - -Signed-off-by: Alexey Makhalov -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/lib/relocator.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/grub-core/lib/relocator.c b/grub-core/lib/relocator.c -index 5847aac36..f2c1944c2 100644 ---- a/grub-core/lib/relocator.c -+++ b/grub-core/lib/relocator.c -@@ -1386,8 +1386,8 @@ grub_relocator_alloc_chunk_align (struct grub_relocator *rel, - }; - grub_addr_t min_addr2 = 0, max_addr2; - -- if (max_addr > ~size) -- max_addr = ~size; -+ if (size && (max_addr > ~size)) -+ max_addr = ~size + 1; - - #ifdef GRUB_MACHINE_PCBIOS - if (min_addr < 0x1000) --- -2.26.2 - diff --git a/buildroot/boot/grub2/0021-hfsplus-Fix-two-more-overflows.patch b/buildroot/boot/grub2/0021-hfsplus-Fix-two-more-overflows.patch deleted file mode 100644 index 9ea678021f..0000000000 --- a/buildroot/boot/grub2/0021-hfsplus-Fix-two-more-overflows.patch +++ /dev/null @@ -1,61 +0,0 @@ -From feec993673d8e13fcf22fe2389ac29222b6daebd Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Sun, 19 Jul 2020 14:43:31 -0400 -Subject: [PATCH] hfsplus: Fix two more overflows -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Both node->size and node->namelen come from the supplied filesystem, -which may be user-supplied. We can't trust them for the math unless we -know they don't overflow. Making sure they go through grub_add() or -grub_calloc() first will give us that. - -Signed-off-by: Peter Jones -Reviewed-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/fs/hfsplus.c | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/grub-core/fs/hfsplus.c b/grub-core/fs/hfsplus.c -index dae43becc..9c4e4c88c 100644 ---- a/grub-core/fs/hfsplus.c -+++ b/grub-core/fs/hfsplus.c -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - - GRUB_MOD_LICENSE ("GPLv3+"); - -@@ -475,8 +476,12 @@ grub_hfsplus_read_symlink (grub_fshelp_node_t node) - { - char *symlink; - grub_ssize_t numread; -+ grub_size_t sz = node->size; - -- symlink = grub_malloc (node->size + 1); -+ if (grub_add (sz, 1, &sz)) -+ return NULL; -+ -+ symlink = grub_malloc (sz); - if (!symlink) - return 0; - -@@ -715,8 +720,8 @@ list_nodes (void *record, void *hook_arg) - if (type == GRUB_FSHELP_UNKNOWN) - return 0; - -- filename = grub_malloc (grub_be_to_cpu16 (catkey->namelen) -- * GRUB_MAX_UTF8_PER_UTF16 + 1); -+ filename = grub_calloc (grub_be_to_cpu16 (catkey->namelen), -+ GRUB_MAX_UTF8_PER_UTF16 + 1); - if (! filename) - return 0; - --- -2.26.2 - diff --git a/buildroot/boot/grub2/0022-lvm-Fix-two-more-potential-data-dependent-alloc-over.patch b/buildroot/boot/grub2/0022-lvm-Fix-two-more-potential-data-dependent-alloc-over.patch deleted file mode 100644 index ad97ad0b1d..0000000000 --- a/buildroot/boot/grub2/0022-lvm-Fix-two-more-potential-data-dependent-alloc-over.patch +++ /dev/null @@ -1,116 +0,0 @@ -From a1845e90fc19fb5e904091bad8a378f458798e4a Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Sun, 19 Jul 2020 15:48:20 -0400 -Subject: [PATCH] lvm: Fix two more potential data-dependent alloc - overflows -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -It appears to be possible to make a (possibly invalid) lvm PV with -a metadata size field that overflows our type when adding it to the -address we've allocated. Even if it doesn't, it may be possible to do so -with the math using the outcome of that as an operand. Check them both. - -Signed-off-by: Peter Jones -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/disk/lvm.c | 48 ++++++++++++++++++++++++++++++++++++-------- - 1 file changed, 40 insertions(+), 8 deletions(-) - -diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c -index d1df640b3..139fafd47 100644 ---- a/grub-core/disk/lvm.c -+++ b/grub-core/disk/lvm.c -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - - #ifdef GRUB_UTIL - #include -@@ -102,10 +103,11 @@ grub_lvm_detect (grub_disk_t disk, - { - grub_err_t err; - grub_uint64_t mda_offset, mda_size; -+ grub_size_t ptr; - char buf[GRUB_LVM_LABEL_SIZE]; - char vg_id[GRUB_LVM_ID_STRLEN+1]; - char pv_id[GRUB_LVM_ID_STRLEN+1]; -- char *metadatabuf, *p, *q, *vgname; -+ char *metadatabuf, *p, *q, *mda_end, *vgname; - struct grub_lvm_label_header *lh = (struct grub_lvm_label_header *) buf; - struct grub_lvm_pv_header *pvh; - struct grub_lvm_disk_locn *dlocn; -@@ -205,19 +207,31 @@ grub_lvm_detect (grub_disk_t disk, - grub_le_to_cpu64 (rlocn->size) - - grub_le_to_cpu64 (mdah->size)); - } -- p = q = metadatabuf + grub_le_to_cpu64 (rlocn->offset); - -- while (*q != ' ' && q < metadatabuf + mda_size) -- q++; -- -- if (q == metadatabuf + mda_size) -+ if (grub_add ((grub_size_t)metadatabuf, -+ (grub_size_t)grub_le_to_cpu64 (rlocn->offset), -+ &ptr)) - { -+ error_parsing_metadata: - #ifdef GRUB_UTIL - grub_util_info ("error parsing metadata"); - #endif - goto fail2; - } - -+ p = q = (char *)ptr; -+ -+ if (grub_add ((grub_size_t)metadatabuf, (grub_size_t)mda_size, &ptr)) -+ goto error_parsing_metadata; -+ -+ mda_end = (char *)ptr; -+ -+ while (*q != ' ' && q < mda_end) -+ q++; -+ -+ if (q == mda_end) -+ goto error_parsing_metadata; -+ - vgname_len = q - p; - vgname = grub_malloc (vgname_len + 1); - if (!vgname) -@@ -367,8 +381,26 @@ grub_lvm_detect (grub_disk_t disk, - { - const char *iptr; - char *optr; -- lv->fullname = grub_malloc (sizeof ("lvm/") - 1 + 2 * vgname_len -- + 1 + 2 * s + 1); -+ -+ /* -+ * This is kind of hard to read with our safe (but rather -+ * baroque) math primatives, but it boils down to: -+ * -+ * sz0 = vgname_len * 2 + 1 + -+ * s * 2 + 1 + -+ * sizeof ("lvm/") - 1; -+ */ -+ grub_size_t sz0 = vgname_len, sz1 = s; -+ -+ if (grub_mul (sz0, 2, &sz0) || -+ grub_add (sz0, 1, &sz0) || -+ grub_mul (sz1, 2, &sz1) || -+ grub_add (sz1, 1, &sz1) || -+ grub_add (sz0, sz1, &sz0) || -+ grub_add (sz0, sizeof ("lvm/") - 1, &sz0)) -+ goto lvs_fail; -+ -+ lv->fullname = grub_malloc (sz0); - if (!lv->fullname) - goto lvs_fail; - --- -2.26.2 - diff --git a/buildroot/boot/grub2/0023-emu-Make-grub_free-NULL-safe.patch b/buildroot/boot/grub2/0023-emu-Make-grub_free-NULL-safe.patch deleted file mode 100644 index f30e56a8b2..0000000000 --- a/buildroot/boot/grub2/0023-emu-Make-grub_free-NULL-safe.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 320e86747a32e4d46d24ee4b64493741c161da50 Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Sun, 19 Jul 2020 16:08:08 -0400 -Subject: [PATCH] emu: Make grub_free(NULL) safe -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The grub_free() implementation in grub-core/kern/mm.c safely handles -NULL pointers, and code at many places depends on this. We don't know -that the same is true on all host OSes, so we need to handle the same -behavior in grub-emu's implementation. - -Signed-off-by: Peter Jones -Reviewed-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/kern/emu/mm.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/grub-core/kern/emu/mm.c b/grub-core/kern/emu/mm.c -index 145b01d37..4d1046a21 100644 ---- a/grub-core/kern/emu/mm.c -+++ b/grub-core/kern/emu/mm.c -@@ -60,7 +60,8 @@ grub_zalloc (grub_size_t size) - void - grub_free (void *ptr) - { -- free (ptr); -+ if (ptr) -+ free (ptr); - } - - void * --- -2.26.2 - diff --git a/buildroot/boot/grub2/0024-efi-Fix-some-malformed-device-path-arithmetic-errors.patch b/buildroot/boot/grub2/0024-efi-Fix-some-malformed-device-path-arithmetic-errors.patch deleted file mode 100644 index 48b5b8912b..0000000000 --- a/buildroot/boot/grub2/0024-efi-Fix-some-malformed-device-path-arithmetic-errors.patch +++ /dev/null @@ -1,239 +0,0 @@ -From c330aa099a38bc5c4d3066954fe35767cc06adb1 Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Sun, 19 Jul 2020 16:53:27 -0400 -Subject: [PATCH] efi: Fix some malformed device path arithmetic errors -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Several places we take the length of a device path and subtract 4 from -it, without ever checking that it's >= 4. There are also cases where -this kind of malformation will result in unpredictable iteration, -including treating the length from one dp node as the type in the next -node. These are all errors, no matter where the data comes from. - -This patch adds a checking macro, GRUB_EFI_DEVICE_PATH_VALID(), which -can be used in several places, and makes GRUB_EFI_NEXT_DEVICE_PATH() -return NULL and GRUB_EFI_END_ENTIRE_DEVICE_PATH() evaluate as true when -the length is too small. Additionally, it makes several places in the -code check for and return errors in these cases. - -Signed-off-by: Peter Jones -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/kern/efi/efi.c | 64 +++++++++++++++++++++++++----- - grub-core/loader/efi/chainloader.c | 13 +++++- - grub-core/loader/i386/xnu.c | 9 +++-- - include/grub/efi/api.h | 14 ++++--- - 4 files changed, 79 insertions(+), 21 deletions(-) - -diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c -index dc31caa21..c97969a65 100644 ---- a/grub-core/kern/efi/efi.c -+++ b/grub-core/kern/efi/efi.c -@@ -332,7 +332,7 @@ grub_efi_get_filename (grub_efi_device_path_t *dp0) - - dp = dp0; - -- while (1) -+ while (dp) - { - grub_efi_uint8_t type = GRUB_EFI_DEVICE_PATH_TYPE (dp); - grub_efi_uint8_t subtype = GRUB_EFI_DEVICE_PATH_SUBTYPE (dp); -@@ -342,9 +342,15 @@ grub_efi_get_filename (grub_efi_device_path_t *dp0) - if (type == GRUB_EFI_MEDIA_DEVICE_PATH_TYPE - && subtype == GRUB_EFI_FILE_PATH_DEVICE_PATH_SUBTYPE) - { -- grub_efi_uint16_t len; -- len = ((GRUB_EFI_DEVICE_PATH_LENGTH (dp) - 4) -- / sizeof (grub_efi_char16_t)); -+ grub_efi_uint16_t len = GRUB_EFI_DEVICE_PATH_LENGTH (dp); -+ -+ if (len < 4) -+ { -+ grub_error (GRUB_ERR_OUT_OF_RANGE, -+ "malformed EFI Device Path node has length=%d", len); -+ return NULL; -+ } -+ len = (len - 4) / sizeof (grub_efi_char16_t); - filesize += GRUB_MAX_UTF8_PER_UTF16 * len + 2; - } - -@@ -360,7 +366,7 @@ grub_efi_get_filename (grub_efi_device_path_t *dp0) - if (!name) - return NULL; - -- while (1) -+ while (dp) - { - grub_efi_uint8_t type = GRUB_EFI_DEVICE_PATH_TYPE (dp); - grub_efi_uint8_t subtype = GRUB_EFI_DEVICE_PATH_SUBTYPE (dp); -@@ -376,8 +382,15 @@ grub_efi_get_filename (grub_efi_device_path_t *dp0) - - *p++ = '/'; - -- len = ((GRUB_EFI_DEVICE_PATH_LENGTH (dp) - 4) -- / sizeof (grub_efi_char16_t)); -+ len = GRUB_EFI_DEVICE_PATH_LENGTH (dp); -+ if (len < 4) -+ { -+ grub_error (GRUB_ERR_OUT_OF_RANGE, -+ "malformed EFI Device Path node has length=%d", len); -+ return NULL; -+ } -+ -+ len = (len - 4) / sizeof (grub_efi_char16_t); - fp = (grub_efi_file_path_device_path_t *) dp; - /* According to EFI spec Path Name is NULL terminated */ - while (len > 0 && fp->path_name[len - 1] == 0) -@@ -452,7 +465,26 @@ grub_efi_duplicate_device_path (const grub_efi_device_path_t *dp) - ; - p = GRUB_EFI_NEXT_DEVICE_PATH (p)) - { -- total_size += GRUB_EFI_DEVICE_PATH_LENGTH (p); -+ grub_size_t len = GRUB_EFI_DEVICE_PATH_LENGTH (p); -+ -+ /* -+ * In the event that we find a node that's completely garbage, for -+ * example if we get to 0x7f 0x01 0x02 0x00 ... (EndInstance with a size -+ * of 2), GRUB_EFI_END_ENTIRE_DEVICE_PATH() will be true and -+ * GRUB_EFI_NEXT_DEVICE_PATH() will return NULL, so we won't continue, -+ * and neither should our consumers, but there won't be any error raised -+ * even though the device path is junk. -+ * -+ * This keeps us from passing junk down back to our caller. -+ */ -+ if (len < 4) -+ { -+ grub_error (GRUB_ERR_OUT_OF_RANGE, -+ "malformed EFI Device Path node has length=%d", len); -+ return NULL; -+ } -+ -+ total_size += len; - if (GRUB_EFI_END_ENTIRE_DEVICE_PATH (p)) - break; - } -@@ -497,7 +529,7 @@ dump_vendor_path (const char *type, grub_efi_vendor_device_path_t *vendor) - void - grub_efi_print_device_path (grub_efi_device_path_t *dp) - { -- while (1) -+ while (GRUB_EFI_DEVICE_PATH_VALID (dp)) - { - grub_efi_uint8_t type = GRUB_EFI_DEVICE_PATH_TYPE (dp); - grub_efi_uint8_t subtype = GRUB_EFI_DEVICE_PATH_SUBTYPE (dp); -@@ -909,7 +941,10 @@ grub_efi_compare_device_paths (const grub_efi_device_path_t *dp1, - /* Return non-zero. */ - return 1; - -- while (1) -+ if (dp1 == dp2) -+ return 0; -+ -+ while (GRUB_EFI_DEVICE_PATH_VALID (dp1) && GRUB_EFI_DEVICE_PATH_VALID (dp2)) - { - grub_efi_uint8_t type1, type2; - grub_efi_uint8_t subtype1, subtype2; -@@ -945,5 +980,14 @@ grub_efi_compare_device_paths (const grub_efi_device_path_t *dp1, - dp2 = (grub_efi_device_path_t *) ((char *) dp2 + len2); - } - -+ /* -+ * There's no "right" answer here, but we probably don't want to call a valid -+ * dp and an invalid dp equal, so pick one way or the other. -+ */ -+ if (GRUB_EFI_DEVICE_PATH_VALID (dp1) && !GRUB_EFI_DEVICE_PATH_VALID (dp2)) -+ return 1; -+ else if (!GRUB_EFI_DEVICE_PATH_VALID (dp1) && GRUB_EFI_DEVICE_PATH_VALID (dp2)) -+ return -1; -+ - return 0; - } -diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c -index daf8c6b54..a8d7b9155 100644 ---- a/grub-core/loader/efi/chainloader.c -+++ b/grub-core/loader/efi/chainloader.c -@@ -156,9 +156,18 @@ make_file_path (grub_efi_device_path_t *dp, const char *filename) - - size = 0; - d = dp; -- while (1) -+ while (d) - { -- size += GRUB_EFI_DEVICE_PATH_LENGTH (d); -+ grub_size_t len = GRUB_EFI_DEVICE_PATH_LENGTH (d); -+ -+ if (len < 4) -+ { -+ grub_error (GRUB_ERR_OUT_OF_RANGE, -+ "malformed EFI Device Path node has length=%d", len); -+ return NULL; -+ } -+ -+ size += len; - if ((GRUB_EFI_END_ENTIRE_DEVICE_PATH (d))) - break; - d = GRUB_EFI_NEXT_DEVICE_PATH (d); -diff --git a/grub-core/loader/i386/xnu.c b/grub-core/loader/i386/xnu.c -index e9e119259..a70093607 100644 ---- a/grub-core/loader/i386/xnu.c -+++ b/grub-core/loader/i386/xnu.c -@@ -515,14 +515,15 @@ grub_cmd_devprop_load (grub_command_t cmd __attribute__ ((unused)), - - devhead = buf; - buf = devhead + 1; -- dpstart = buf; -+ dp = dpstart = buf; - -- do -+ while (GRUB_EFI_DEVICE_PATH_VALID (dp) && buf < bufend) - { -- dp = buf; - buf = (char *) buf + GRUB_EFI_DEVICE_PATH_LENGTH (dp); -+ if (GRUB_EFI_END_ENTIRE_DEVICE_PATH (dp)) -+ break; -+ dp = buf; - } -- while (!GRUB_EFI_END_ENTIRE_DEVICE_PATH (dp) && buf < bufend); - - dev = grub_xnu_devprop_add_device (dpstart, (char *) buf - - (char *) dpstart); -diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h -index addcbfa8f..cf1355a8c 100644 ---- a/include/grub/efi/api.h -+++ b/include/grub/efi/api.h -@@ -625,6 +625,7 @@ typedef struct grub_efi_device_path grub_efi_device_path_protocol_t; - #define GRUB_EFI_DEVICE_PATH_TYPE(dp) ((dp)->type & 0x7f) - #define GRUB_EFI_DEVICE_PATH_SUBTYPE(dp) ((dp)->subtype) - #define GRUB_EFI_DEVICE_PATH_LENGTH(dp) ((dp)->length) -+#define GRUB_EFI_DEVICE_PATH_VALID(dp) ((dp) != NULL && GRUB_EFI_DEVICE_PATH_LENGTH (dp) >= 4) - - /* The End of Device Path nodes. */ - #define GRUB_EFI_END_DEVICE_PATH_TYPE (0xff & 0x7f) -@@ -633,13 +634,16 @@ typedef struct grub_efi_device_path grub_efi_device_path_protocol_t; - #define GRUB_EFI_END_THIS_DEVICE_PATH_SUBTYPE 0x01 - - #define GRUB_EFI_END_ENTIRE_DEVICE_PATH(dp) \ -- (GRUB_EFI_DEVICE_PATH_TYPE (dp) == GRUB_EFI_END_DEVICE_PATH_TYPE \ -- && (GRUB_EFI_DEVICE_PATH_SUBTYPE (dp) \ -- == GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE)) -+ (!GRUB_EFI_DEVICE_PATH_VALID (dp) || \ -+ (GRUB_EFI_DEVICE_PATH_TYPE (dp) == GRUB_EFI_END_DEVICE_PATH_TYPE \ -+ && (GRUB_EFI_DEVICE_PATH_SUBTYPE (dp) \ -+ == GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE))) - - #define GRUB_EFI_NEXT_DEVICE_PATH(dp) \ -- ((grub_efi_device_path_t *) ((char *) (dp) \ -- + GRUB_EFI_DEVICE_PATH_LENGTH (dp))) -+ (GRUB_EFI_DEVICE_PATH_VALID (dp) \ -+ ? ((grub_efi_device_path_t *) \ -+ ((char *) (dp) + GRUB_EFI_DEVICE_PATH_LENGTH (dp))) \ -+ : NULL) - - /* Hardware Device Path. */ - #define GRUB_EFI_HARDWARE_DEVICE_PATH_TYPE 1 --- -2.26.2 - diff --git a/buildroot/boot/grub2/0025-efi-chainloader-Propagate-errors-from-copy_file_path.patch b/buildroot/boot/grub2/0025-efi-chainloader-Propagate-errors-from-copy_file_path.patch deleted file mode 100644 index eb3e0f0e20..0000000000 --- a/buildroot/boot/grub2/0025-efi-chainloader-Propagate-errors-from-copy_file_path.patch +++ /dev/null @@ -1,78 +0,0 @@ -From fb55bc37dd510911df4eaf649da939f5fafdc7ce Mon Sep 17 00:00:00 2001 -From: Daniel Kiper -Date: Wed, 29 Jul 2020 13:38:31 +0200 -Subject: [PATCH] efi/chainloader: Propagate errors from copy_file_path() -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Without any error propagated to the caller, make_file_path() -would then try to advance the invalid device path node with -GRUB_EFI_NEXT_DEVICE_PATH(), which would fail, returning a NULL -pointer that would subsequently be dereferenced. Hence, propagate -errors from copy_file_path(). - -Signed-off-by: Chris Coulson -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/loader/efi/chainloader.c | 19 +++++++++++++------ - 1 file changed, 13 insertions(+), 6 deletions(-) - -diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c -index a8d7b9155..7b31c3fb9 100644 ---- a/grub-core/loader/efi/chainloader.c -+++ b/grub-core/loader/efi/chainloader.c -@@ -106,7 +106,7 @@ grub_chainloader_boot (void) - return grub_errno; - } - --static void -+static grub_err_t - copy_file_path (grub_efi_file_path_device_path_t *fp, - const char *str, grub_efi_uint16_t len) - { -@@ -118,7 +118,7 @@ copy_file_path (grub_efi_file_path_device_path_t *fp, - - path_name = grub_calloc (len, GRUB_MAX_UTF16_PER_UTF8 * sizeof (*path_name)); - if (!path_name) -- return; -+ return grub_error (GRUB_ERR_OUT_OF_MEMORY, "failed to allocate path buffer"); - - size = grub_utf8_to_utf16 (path_name, len * GRUB_MAX_UTF16_PER_UTF8, - (const grub_uint8_t *) str, len, 0); -@@ -131,6 +131,7 @@ copy_file_path (grub_efi_file_path_device_path_t *fp, - fp->path_name[size++] = '\0'; - fp->header.length = size * sizeof (grub_efi_char16_t) + sizeof (*fp); - grub_free (path_name); -+ return GRUB_ERR_NONE; - } - - static grub_efi_device_path_t * -@@ -189,13 +190,19 @@ make_file_path (grub_efi_device_path_t *dp, const char *filename) - d = (grub_efi_device_path_t *) ((char *) file_path - + ((char *) d - (char *) dp)); - grub_efi_print_device_path (d); -- copy_file_path ((grub_efi_file_path_device_path_t *) d, -- dir_start, dir_end - dir_start); -+ if (copy_file_path ((grub_efi_file_path_device_path_t *) d, -+ dir_start, dir_end - dir_start) != GRUB_ERR_NONE) -+ { -+ fail: -+ grub_free (file_path); -+ return 0; -+ } - - /* Fill the file path for the file. */ - d = GRUB_EFI_NEXT_DEVICE_PATH (d); -- copy_file_path ((grub_efi_file_path_device_path_t *) d, -- dir_end + 1, grub_strlen (dir_end + 1)); -+ if (copy_file_path ((grub_efi_file_path_device_path_t *) d, -+ dir_end + 1, grub_strlen (dir_end + 1)) != GRUB_ERR_NONE) -+ goto fail; - - /* Fill the end of device path nodes. */ - d = GRUB_EFI_NEXT_DEVICE_PATH (d); --- -2.26.2 - diff --git a/buildroot/boot/grub2/0026-efi-Fix-use-after-free-in-halt-reboot-path.patch b/buildroot/boot/grub2/0026-efi-Fix-use-after-free-in-halt-reboot-path.patch deleted file mode 100644 index 75dd05d48f..0000000000 --- a/buildroot/boot/grub2/0026-efi-Fix-use-after-free-in-halt-reboot-path.patch +++ /dev/null @@ -1,183 +0,0 @@ -From 8a6d6299efcffd14c1130942195e6c0d9b50cacd Mon Sep 17 00:00:00 2001 -From: Alexey Makhalov -Date: Mon, 20 Jul 2020 23:03:05 +0000 -Subject: [PATCH] efi: Fix use-after-free in halt/reboot path -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -commit 92bfc33db984 ("efi: Free malloc regions on exit") -introduced memory freeing in grub_efi_fini(), which is -used not only by exit path but by halt/reboot one as well. -As result of memory freeing, code and data regions used by -modules, such as halt, reboot, acpi (used by halt) also got -freed. After return to module code, CPU executes, filled -by UEFI firmware (tested with edk2), 0xAFAFAFAF pattern as -a code. Which leads to #UD exception later. - -grub> halt -!!!! X64 Exception Type - 06(#UD - Invalid Opcode) CPU Apic ID - 00000000 !!!! -RIP - 0000000003F4EC28, CS - 0000000000000038, RFLAGS - 0000000000200246 -RAX - 0000000000000000, RCX - 00000000061DA188, RDX - 0A74C0854DC35D41 -RBX - 0000000003E10E08, RSP - 0000000007F0F860, RBP - 0000000000000000 -RSI - 00000000064DB768, RDI - 000000000832C5C3 -R8 - 0000000000000002, R9 - 0000000000000000, R10 - 00000000061E2E52 -R11 - 0000000000000020, R12 - 0000000003EE5C1F, R13 - 00000000061E0FF4 -R14 - 0000000003E10D80, R15 - 00000000061E2F60 -DS - 0000000000000030, ES - 0000000000000030, FS - 0000000000000030 -GS - 0000000000000030, SS - 0000000000000030 -CR0 - 0000000080010033, CR2 - 0000000000000000, CR3 - 0000000007C01000 -CR4 - 0000000000000668, CR8 - 0000000000000000 -DR0 - 0000000000000000, DR1 - 0000000000000000, DR2 - 0000000000000000 -DR3 - 0000000000000000, DR6 - 00000000FFFF0FF0, DR7 - 0000000000000400 -GDTR - 00000000079EEA98 0000000000000047, LDTR - 0000000000000000 -IDTR - 0000000007598018 0000000000000FFF, TR - 0000000000000000 -FXSAVE_STATE - 0000000007F0F4C0 - -Proposal here is to continue to free allocated memory for -exit boot services path but keep it for halt/reboot path -as it won't be much security concern here. -Introduced GRUB_LOADER_FLAG_EFI_KEEP_ALLOCATED_MEMORY -loader flag to be used by efi halt/reboot path. - -Signed-off-by: Alexey Makhalov -Reviewed-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/kern/arm/efi/init.c | 3 +++ - grub-core/kern/arm64/efi/init.c | 3 +++ - grub-core/kern/efi/efi.c | 3 ++- - grub-core/kern/efi/init.c | 1 - - grub-core/kern/i386/efi/init.c | 9 +++++++-- - grub-core/kern/ia64/efi/init.c | 9 +++++++-- - grub-core/kern/riscv/efi/init.c | 3 +++ - grub-core/lib/efi/halt.c | 3 ++- - include/grub/loader.h | 1 + - 9 files changed, 28 insertions(+), 7 deletions(-) - -diff --git a/grub-core/kern/arm/efi/init.c b/grub-core/kern/arm/efi/init.c -index 06df60e2f..40c3b467f 100644 ---- a/grub-core/kern/arm/efi/init.c -+++ b/grub-core/kern/arm/efi/init.c -@@ -71,4 +71,7 @@ grub_machine_fini (int flags) - efi_call_1 (b->close_event, tmr_evt); - - grub_efi_fini (); -+ -+ if (!(flags & GRUB_LOADER_FLAG_EFI_KEEP_ALLOCATED_MEMORY)) -+ grub_efi_memory_fini (); - } -diff --git a/grub-core/kern/arm64/efi/init.c b/grub-core/kern/arm64/efi/init.c -index 6224999ec..5010caefd 100644 ---- a/grub-core/kern/arm64/efi/init.c -+++ b/grub-core/kern/arm64/efi/init.c -@@ -57,4 +57,7 @@ grub_machine_fini (int flags) - return; - - grub_efi_fini (); -+ -+ if (!(flags & GRUB_LOADER_FLAG_EFI_KEEP_ALLOCATED_MEMORY)) -+ grub_efi_memory_fini (); - } -diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c -index c97969a65..9cfd88d77 100644 ---- a/grub-core/kern/efi/efi.c -+++ b/grub-core/kern/efi/efi.c -@@ -157,7 +157,8 @@ grub_efi_get_loaded_image (grub_efi_handle_t image_handle) - void - grub_reboot (void) - { -- grub_machine_fini (GRUB_LOADER_FLAG_NORETURN); -+ grub_machine_fini (GRUB_LOADER_FLAG_NORETURN | -+ GRUB_LOADER_FLAG_EFI_KEEP_ALLOCATED_MEMORY); - efi_call_4 (grub_efi_system_table->runtime_services->reset_system, - GRUB_EFI_RESET_COLD, GRUB_EFI_SUCCESS, 0, NULL); - for (;;) ; -diff --git a/grub-core/kern/efi/init.c b/grub-core/kern/efi/init.c -index 3dfdf2d22..2c31847bf 100644 ---- a/grub-core/kern/efi/init.c -+++ b/grub-core/kern/efi/init.c -@@ -80,5 +80,4 @@ grub_efi_fini (void) - { - grub_efidisk_fini (); - grub_console_fini (); -- grub_efi_memory_fini (); - } -diff --git a/grub-core/kern/i386/efi/init.c b/grub-core/kern/i386/efi/init.c -index da499aba0..deb2eacd8 100644 ---- a/grub-core/kern/i386/efi/init.c -+++ b/grub-core/kern/i386/efi/init.c -@@ -39,6 +39,11 @@ grub_machine_init (void) - void - grub_machine_fini (int flags) - { -- if (flags & GRUB_LOADER_FLAG_NORETURN) -- grub_efi_fini (); -+ if (!(flags & GRUB_LOADER_FLAG_NORETURN)) -+ return; -+ -+ grub_efi_fini (); -+ -+ if (!(flags & GRUB_LOADER_FLAG_EFI_KEEP_ALLOCATED_MEMORY)) -+ grub_efi_memory_fini (); - } -diff --git a/grub-core/kern/ia64/efi/init.c b/grub-core/kern/ia64/efi/init.c -index b5ecbd091..f1965571b 100644 ---- a/grub-core/kern/ia64/efi/init.c -+++ b/grub-core/kern/ia64/efi/init.c -@@ -70,6 +70,11 @@ grub_machine_init (void) - void - grub_machine_fini (int flags) - { -- if (flags & GRUB_LOADER_FLAG_NORETURN) -- grub_efi_fini (); -+ if (!(flags & GRUB_LOADER_FLAG_NORETURN)) -+ return; -+ -+ grub_efi_fini (); -+ -+ if (!(flags & GRUB_LOADER_FLAG_EFI_KEEP_ALLOCATED_MEMORY)) -+ grub_efi_memory_fini (); - } -diff --git a/grub-core/kern/riscv/efi/init.c b/grub-core/kern/riscv/efi/init.c -index 7eb1969d0..38795fe67 100644 ---- a/grub-core/kern/riscv/efi/init.c -+++ b/grub-core/kern/riscv/efi/init.c -@@ -73,4 +73,7 @@ grub_machine_fini (int flags) - return; - - grub_efi_fini (); -+ -+ if (!(flags & GRUB_LOADER_FLAG_EFI_KEEP_ALLOCATED_MEMORY)) -+ grub_efi_memory_fini (); - } -diff --git a/grub-core/lib/efi/halt.c b/grub-core/lib/efi/halt.c -index 5859f0498..29d413641 100644 ---- a/grub-core/lib/efi/halt.c -+++ b/grub-core/lib/efi/halt.c -@@ -28,7 +28,8 @@ - void - grub_halt (void) - { -- grub_machine_fini (GRUB_LOADER_FLAG_NORETURN); -+ grub_machine_fini (GRUB_LOADER_FLAG_NORETURN | -+ GRUB_LOADER_FLAG_EFI_KEEP_ALLOCATED_MEMORY); - #if !defined(__ia64__) && !defined(__arm__) && !defined(__aarch64__) && \ - !defined(__riscv) - grub_acpi_halt (); -diff --git a/include/grub/loader.h b/include/grub/loader.h -index 7f82a499f..b20864282 100644 ---- a/include/grub/loader.h -+++ b/include/grub/loader.h -@@ -33,6 +33,7 @@ enum - { - GRUB_LOADER_FLAG_NORETURN = 1, - GRUB_LOADER_FLAG_PXE_NOT_UNLOAD = 2, -+ GRUB_LOADER_FLAG_EFI_KEEP_ALLOCATED_MEMORY = 4, - }; - - void EXPORT_FUNC (grub_loader_set) (grub_err_t (*boot) (void), --- -2.26.2 - diff --git a/buildroot/boot/grub2/0027-loader-linux-Avoid-overflow-on-initrd-size-calculati.patch b/buildroot/boot/grub2/0027-loader-linux-Avoid-overflow-on-initrd-size-calculati.patch deleted file mode 100644 index 823f205568..0000000000 --- a/buildroot/boot/grub2/0027-loader-linux-Avoid-overflow-on-initrd-size-calculati.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a2a7464e9f10a677d6f91e1c4fa527d084c22e7c Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Fri, 24 Jul 2020 13:57:27 -0400 -Subject: [PATCH] loader/linux: Avoid overflow on initrd size calculation -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Peter Jones -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/loader/linux.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/grub-core/loader/linux.c b/grub-core/loader/linux.c -index 471b214d6..4cd8c20c7 100644 ---- a/grub-core/loader/linux.c -+++ b/grub-core/loader/linux.c -@@ -151,8 +151,7 @@ grub_initrd_init (int argc, char *argv[], - initrd_ctx->nfiles = 0; - initrd_ctx->components = 0; - -- initrd_ctx->components = grub_zalloc (argc -- * sizeof (initrd_ctx->components[0])); -+ initrd_ctx->components = grub_calloc (argc, sizeof (initrd_ctx->components[0])); - if (!initrd_ctx->components) - return grub_errno; - --- -2.26.2 - diff --git a/buildroot/boot/grub2/0028-linux-Fix-integer-overflows-in-initrd-size-handling.patch b/buildroot/boot/grub2/0028-linux-Fix-integer-overflows-in-initrd-size-handling.patch deleted file mode 100644 index bf6590d8eb..0000000000 --- a/buildroot/boot/grub2/0028-linux-Fix-integer-overflows-in-initrd-size-handling.patch +++ /dev/null @@ -1,173 +0,0 @@ -From 0367e7d1b9bac3a78608a672bf6e4ace6a28b964 Mon Sep 17 00:00:00 2001 -From: Colin Watson -Date: Sat, 25 Jul 2020 12:15:37 +0100 -Subject: [PATCH] linux: Fix integer overflows in initrd size handling -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -These could be triggered by a crafted filesystem with very large files. - -Fixes: CVE-2020-15707 - -Signed-off-by: Colin Watson -Reviewed-by: Jan Setje-Eilers -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/loader/linux.c | 74 +++++++++++++++++++++++++++++----------- - 1 file changed, 54 insertions(+), 20 deletions(-) - -diff --git a/grub-core/loader/linux.c b/grub-core/loader/linux.c -index 4cd8c20c7..3fe390f17 100644 ---- a/grub-core/loader/linux.c -+++ b/grub-core/loader/linux.c -@@ -4,6 +4,7 @@ - #include - #include - #include -+#include - - struct newc_head - { -@@ -98,13 +99,13 @@ free_dir (struct dir *root) - grub_free (root); - } - --static grub_size_t -+static grub_err_t - insert_dir (const char *name, struct dir **root, -- grub_uint8_t *ptr) -+ grub_uint8_t *ptr, grub_size_t *size) - { - struct dir *cur, **head = root; - const char *cb, *ce = name; -- grub_size_t size = 0; -+ *size = 0; - while (1) - { - for (cb = ce; *cb == '/'; cb++); -@@ -130,14 +131,22 @@ insert_dir (const char *name, struct dir **root, - ptr = make_header (ptr, name, ce - name, - 040777, 0); - } -- size += ALIGN_UP ((ce - (char *) name) -- + sizeof (struct newc_head), 4); -+ if (grub_add (*size, -+ ALIGN_UP ((ce - (char *) name) -+ + sizeof (struct newc_head), 4), -+ size)) -+ { -+ grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is detected")); -+ grub_free (n->name); -+ grub_free (n); -+ return grub_errno; -+ } - *head = n; - cur = n; - } - root = &cur->next; - } -- return size; -+ return GRUB_ERR_NONE; - } - - grub_err_t -@@ -172,26 +181,33 @@ grub_initrd_init (int argc, char *argv[], - eptr = grub_strchr (ptr, ':'); - if (eptr) - { -+ grub_size_t dir_size, name_len; -+ - initrd_ctx->components[i].newc_name = grub_strndup (ptr, eptr - ptr); -- if (!initrd_ctx->components[i].newc_name) -+ if (!initrd_ctx->components[i].newc_name || -+ insert_dir (initrd_ctx->components[i].newc_name, &root, 0, -+ &dir_size)) - { - grub_initrd_close (initrd_ctx); - return grub_errno; - } -- initrd_ctx->size -- += ALIGN_UP (sizeof (struct newc_head) -- + grub_strlen (initrd_ctx->components[i].newc_name), -- 4); -- initrd_ctx->size += insert_dir (initrd_ctx->components[i].newc_name, -- &root, 0); -+ name_len = grub_strlen (initrd_ctx->components[i].newc_name); -+ if (grub_add (initrd_ctx->size, -+ ALIGN_UP (sizeof (struct newc_head) + name_len, 4), -+ &initrd_ctx->size) || -+ grub_add (initrd_ctx->size, dir_size, &initrd_ctx->size)) -+ goto overflow; - newc = 1; - fname = eptr + 1; - } - } - else if (newc) - { -- initrd_ctx->size += ALIGN_UP (sizeof (struct newc_head) -- + sizeof ("TRAILER!!!") - 1, 4); -+ if (grub_add (initrd_ctx->size, -+ ALIGN_UP (sizeof (struct newc_head) -+ + sizeof ("TRAILER!!!") - 1, 4), -+ &initrd_ctx->size)) -+ goto overflow; - free_dir (root); - root = 0; - newc = 0; -@@ -207,19 +223,29 @@ grub_initrd_init (int argc, char *argv[], - initrd_ctx->nfiles++; - initrd_ctx->components[i].size - = grub_file_size (initrd_ctx->components[i].file); -- initrd_ctx->size += initrd_ctx->components[i].size; -+ if (grub_add (initrd_ctx->size, initrd_ctx->components[i].size, -+ &initrd_ctx->size)) -+ goto overflow; - } - - if (newc) - { - initrd_ctx->size = ALIGN_UP (initrd_ctx->size, 4); -- initrd_ctx->size += ALIGN_UP (sizeof (struct newc_head) -- + sizeof ("TRAILER!!!") - 1, 4); -+ if (grub_add (initrd_ctx->size, -+ ALIGN_UP (sizeof (struct newc_head) -+ + sizeof ("TRAILER!!!") - 1, 4), -+ &initrd_ctx->size)) -+ goto overflow; - free_dir (root); - root = 0; - } - - return GRUB_ERR_NONE; -+ -+ overflow: -+ free_dir (root); -+ grub_initrd_close (initrd_ctx); -+ return grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is detected")); - } - - grub_size_t -@@ -260,8 +286,16 @@ grub_initrd_load (struct grub_linux_initrd_context *initrd_ctx, - - if (initrd_ctx->components[i].newc_name) - { -- ptr += insert_dir (initrd_ctx->components[i].newc_name, -- &root, ptr); -+ grub_size_t dir_size; -+ -+ if (insert_dir (initrd_ctx->components[i].newc_name, &root, ptr, -+ &dir_size)) -+ { -+ free_dir (root); -+ grub_initrd_close (initrd_ctx); -+ return grub_errno; -+ } -+ ptr += dir_size; - ptr = make_header (ptr, initrd_ctx->components[i].newc_name, - grub_strlen (initrd_ctx->components[i].newc_name), - 0100777, --- -2.26.2 - diff --git a/buildroot/boot/grub2/0029-efi-Make-shim_lock-GUID-and-protocol-type-public.patch b/buildroot/boot/grub2/0029-efi-Make-shim_lock-GUID-and-protocol-type-public.patch deleted file mode 100644 index ec1f62360a..0000000000 --- a/buildroot/boot/grub2/0029-efi-Make-shim_lock-GUID-and-protocol-type-public.patch +++ /dev/null @@ -1,97 +0,0 @@ -From f76a27996c34900f2c369a8a0d6ac72ae2faa988 Mon Sep 17 00:00:00 2001 -From: Daniel Kiper -Date: Thu, 3 Dec 2020 16:01:45 +0100 -Subject: [PATCH] efi: Make shim_lock GUID and protocol type public - -The GUID will be used to properly detect and report UEFI Secure Boot -status to the x86 Linux kernel. The functionality will be added by -subsequent patches. The shim_lock protocol type is made public for -completeness. - -Additionally, fix formatting of four preceding GUIDs. - -Signed-off-by: Daniel Kiper -Signed-off-by: Marco A Benatto -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/commands/efi/shim_lock.c | 12 ------------ - include/grub/efi/api.h | 19 +++++++++++++++---- - 2 files changed, 15 insertions(+), 16 deletions(-) - -diff --git a/grub-core/commands/efi/shim_lock.c b/grub-core/commands/efi/shim_lock.c -index 764098c..d8f52d7 100644 ---- a/grub-core/commands/efi/shim_lock.c -+++ b/grub-core/commands/efi/shim_lock.c -@@ -27,18 +27,6 @@ - - GRUB_MOD_LICENSE ("GPLv3+"); - --#define GRUB_EFI_SHIM_LOCK_GUID \ -- { 0x605dab50, 0xe046, 0x4300, \ -- { 0xab, 0xb6, 0x3d, 0xd8, 0x10, 0xdd, 0x8b, 0x23 } \ -- } -- --struct grub_efi_shim_lock_protocol --{ -- grub_efi_status_t -- (*verify) (void *buffer, grub_uint32_t size); --}; --typedef struct grub_efi_shim_lock_protocol grub_efi_shim_lock_protocol_t; -- - static grub_efi_guid_t shim_lock_guid = GRUB_EFI_SHIM_LOCK_GUID; - static grub_efi_shim_lock_protocol_t *sl; - -diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h -index cf1355a..13e5715 100644 ---- a/include/grub/efi/api.h -+++ b/include/grub/efi/api.h -@@ -316,22 +316,27 @@ - - #define GRUB_EFI_SAL_TABLE_GUID \ - { 0xeb9d2d32, 0x2d88, 0x11d3, \ -- { 0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \ -+ { 0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \ - } - - #define GRUB_EFI_HCDP_TABLE_GUID \ - { 0xf951938d, 0x620b, 0x42ef, \ -- { 0x82, 0x79, 0xa8, 0x4b, 0x79, 0x61, 0x78, 0x98 } \ -+ { 0x82, 0x79, 0xa8, 0x4b, 0x79, 0x61, 0x78, 0x98 } \ - } - - #define GRUB_EFI_DEVICE_TREE_GUID \ - { 0xb1b621d5, 0xf19c, 0x41a5, \ -- { 0x83, 0x0b, 0xd9, 0x15, 0x2c, 0x69, 0xaa, 0xe0 } \ -+ { 0x83, 0x0b, 0xd9, 0x15, 0x2c, 0x69, 0xaa, 0xe0 } \ - } - - #define GRUB_EFI_VENDOR_APPLE_GUID \ - { 0x2B0585EB, 0xD8B8, 0x49A9, \ -- { 0x8B, 0x8C, 0xE2, 0x1B, 0x01, 0xAE, 0xF2, 0xB7 } \ -+ { 0x8B, 0x8C, 0xE2, 0x1B, 0x01, 0xAE, 0xF2, 0xB7 } \ -+ } -+ -+#define GRUB_EFI_SHIM_LOCK_GUID \ -+ { 0x605dab50, 0xe046, 0x4300, \ -+ { 0xab, 0xb6, 0x3d, 0xd8, 0x10, 0xdd, 0x8b, 0x23 } \ - } - - struct grub_efi_sal_system_table -@@ -1689,6 +1694,12 @@ struct grub_efi_block_io - }; - typedef struct grub_efi_block_io grub_efi_block_io_t; - -+struct grub_efi_shim_lock_protocol -+{ -+ grub_efi_status_t (*verify) (void *buffer, grub_uint32_t size); -+}; -+typedef struct grub_efi_shim_lock_protocol grub_efi_shim_lock_protocol_t; -+ - #if (GRUB_TARGET_SIZEOF_VOID_P == 4) || defined (__ia64__) \ - || defined (__aarch64__) || defined (__MINGW64__) || defined (__CYGWIN__) \ - || defined(__riscv) --- -2.14.2 - diff --git a/buildroot/boot/grub2/0030-efi-Return-grub_efi_status_t-from-grub_efi_get_varia.patch b/buildroot/boot/grub2/0030-efi-Return-grub_efi_status_t-from-grub_efi_get_varia.patch deleted file mode 100644 index 39386a182b..0000000000 --- a/buildroot/boot/grub2/0030-efi-Return-grub_efi_status_t-from-grub_efi_get_varia.patch +++ /dev/null @@ -1,149 +0,0 @@ -From 04ae030d0eea8668d4417702d88bf2cf04713d80 Mon Sep 17 00:00:00 2001 -From: Daniel Kiper -Date: Thu, 3 Dec 2020 16:01:46 +0100 -Subject: [PATCH] efi: Return grub_efi_status_t from grub_efi_get_variable() -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This is needed to properly detect and report UEFI Secure Boot status -to the x86 Linux kernel. The functionality will be added by subsequent -patches. - -Signed-off-by: Daniel Kiper -Signed-off-by: Marco A Benatto -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/commands/efi/efifwsetup.c | 8 ++++---- - grub-core/kern/efi/efi.c | 16 +++++++++------- - grub-core/video/efi_gop.c | 2 +- - include/grub/efi/efi.h | 7 ++++--- - 4 files changed, 18 insertions(+), 15 deletions(-) - -diff --git a/grub-core/commands/efi/efifwsetup.c b/grub-core/commands/efi/efifwsetup.c -index 7a137a72a..eaca03283 100644 ---- a/grub-core/commands/efi/efifwsetup.c -+++ b/grub-core/commands/efi/efifwsetup.c -@@ -38,8 +38,8 @@ grub_cmd_fwsetup (grub_command_t cmd __attribute__ ((unused)), - grub_size_t oi_size; - grub_efi_guid_t global = GRUB_EFI_GLOBAL_VARIABLE_GUID; - -- old_os_indications = grub_efi_get_variable ("OsIndications", &global, -- &oi_size); -+ grub_efi_get_variable ("OsIndications", &global, &oi_size, -+ (void **) &old_os_indications); - - if (old_os_indications != NULL && oi_size == sizeof (os_indications)) - os_indications |= *old_os_indications; -@@ -63,8 +63,8 @@ efifwsetup_is_supported (void) - grub_size_t oi_size = 0; - grub_efi_guid_t global = GRUB_EFI_GLOBAL_VARIABLE_GUID; - -- os_indications_supported = grub_efi_get_variable ("OsIndicationsSupported", -- &global, &oi_size); -+ grub_efi_get_variable ("OsIndicationsSupported", &global, &oi_size, -+ (void **) &os_indications_supported); - - if (!os_indications_supported) - return 0; -diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c -index e0165e74c..9403b12cd 100644 ---- a/grub-core/kern/efi/efi.c -+++ b/grub-core/kern/efi/efi.c -@@ -223,9 +223,9 @@ grub_efi_set_variable(const char *var, const grub_efi_guid_t *guid, - return grub_error (GRUB_ERR_IO, "could not set EFI variable `%s'", var); - } - --void * -+grub_efi_status_t - grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid, -- grub_size_t *datasize_out) -+ grub_size_t *datasize_out, void **data_out) - { - grub_efi_status_t status; - grub_efi_uintn_t datasize = 0; -@@ -234,13 +234,14 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid, - void *data; - grub_size_t len, len16; - -+ *data_out = NULL; - *datasize_out = 0; - - len = grub_strlen (var); - len16 = len * GRUB_MAX_UTF16_PER_UTF8; - var16 = grub_calloc (len16 + 1, sizeof (var16[0])); - if (!var16) -- return NULL; -+ return GRUB_EFI_OUT_OF_RESOURCES; - len16 = grub_utf8_to_utf16 (var16, len16, (grub_uint8_t *) var, len, NULL); - var16[len16] = 0; - -@@ -251,14 +252,14 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid, - if (status != GRUB_EFI_BUFFER_TOO_SMALL || !datasize) - { - grub_free (var16); -- return NULL; -+ return status; - } - - data = grub_malloc (datasize); - if (!data) - { - grub_free (var16); -- return NULL; -+ return GRUB_EFI_OUT_OF_RESOURCES; - } - - status = efi_call_5 (r->get_variable, var16, guid, NULL, &datasize, data); -@@ -266,12 +267,13 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid, - - if (status == GRUB_EFI_SUCCESS) - { -+ *data_out = data; - *datasize_out = datasize; -- return data; -+ return status; - } - - grub_free (data); -- return NULL; -+ return status; - } - - #pragma GCC diagnostic ignored "-Wcast-align" -diff --git a/grub-core/video/efi_gop.c b/grub-core/video/efi_gop.c -index be446f8d2..7fe0cdabf 100644 ---- a/grub-core/video/efi_gop.c -+++ b/grub-core/video/efi_gop.c -@@ -316,7 +316,7 @@ grub_video_gop_get_edid (struct grub_video_edid_info *edid_info) - char edidname[] = "agp-internal-edid"; - grub_size_t datasize; - grub_uint8_t *data; -- data = grub_efi_get_variable (edidname, &efi_var_guid, &datasize); -+ grub_efi_get_variable (edidname, &efi_var_guid, &datasize, (void **) &data); - if (data && datasize > 16) - { - copy_size = datasize - 16; -diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h -index e90e00dc4..8b2a0f1f5 100644 ---- a/include/grub/efi/efi.h -+++ b/include/grub/efi/efi.h -@@ -74,9 +74,10 @@ grub_err_t EXPORT_FUNC (grub_efi_set_virtual_address_map) (grub_efi_uintn_t memo - grub_efi_uintn_t descriptor_size, - grub_efi_uint32_t descriptor_version, - grub_efi_memory_descriptor_t *virtual_map); --void *EXPORT_FUNC (grub_efi_get_variable) (const char *variable, -- const grub_efi_guid_t *guid, -- grub_size_t *datasize_out); -+grub_efi_status_t EXPORT_FUNC (grub_efi_get_variable) (const char *variable, -+ const grub_efi_guid_t *guid, -+ grub_size_t *datasize_out, -+ void **data_out); - grub_err_t - EXPORT_FUNC (grub_efi_set_variable) (const char *var, - const grub_efi_guid_t *guid, --- -2.29.2 - diff --git a/buildroot/boot/grub2/0031-efi-Add-a-function-to-read-EFI-variables-with-attrib.patch b/buildroot/boot/grub2/0031-efi-Add-a-function-to-read-EFI-variables-with-attrib.patch deleted file mode 100644 index d9fb6154b1..0000000000 --- a/buildroot/boot/grub2/0031-efi-Add-a-function-to-read-EFI-variables-with-attrib.patch +++ /dev/null @@ -1,78 +0,0 @@ -From ac5c9367548750e75ed1e7fc4354a3d20186d733 Mon Sep 17 00:00:00 2001 -From: Daniel Kiper -Date: Thu, 3 Dec 2020 16:01:47 +0100 -Subject: [PATCH] efi: Add a function to read EFI variables with attributes - -It will be used to properly detect and report UEFI Secure Boot status to -the x86 Linux kernel. The functionality will be added by subsequent patches. - -Signed-off-by: Ignat Korchagin -Signed-off-by: Daniel Kiper -Signed-off-by: Marco A Benatto -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper ---- - grub-core/kern/efi/efi.c | 16 +++++++++++++--- - include/grub/efi/efi.h | 5 +++++ - 2 files changed, 18 insertions(+), 3 deletions(-) - -diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c -index 9403b12cd..2942b8e35 100644 ---- a/grub-core/kern/efi/efi.c -+++ b/grub-core/kern/efi/efi.c -@@ -224,8 +224,11 @@ grub_efi_set_variable(const char *var, const grub_efi_guid_t *guid, - } - - grub_efi_status_t --grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid, -- grub_size_t *datasize_out, void **data_out) -+grub_efi_get_variable_with_attributes (const char *var, -+ const grub_efi_guid_t *guid, -+ grub_size_t *datasize_out, -+ void **data_out, -+ grub_efi_uint32_t *attributes) - { - grub_efi_status_t status; - grub_efi_uintn_t datasize = 0; -@@ -262,7 +265,7 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid, - return GRUB_EFI_OUT_OF_RESOURCES; - } - -- status = efi_call_5 (r->get_variable, var16, guid, NULL, &datasize, data); -+ status = efi_call_5 (r->get_variable, var16, guid, attributes, &datasize, data); - grub_free (var16); - - if (status == GRUB_EFI_SUCCESS) -@@ -276,6 +279,13 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid, - return status; - } - -+grub_efi_status_t -+grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid, -+ grub_size_t *datasize_out, void **data_out) -+{ -+ return grub_efi_get_variable_with_attributes (var, guid, datasize_out, data_out, NULL); -+} -+ - #pragma GCC diagnostic ignored "-Wcast-align" - - /* Search the mods section from the PE32/PE32+ image. This code uses -diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h -index 8b2a0f1f5..83d958f99 100644 ---- a/include/grub/efi/efi.h -+++ b/include/grub/efi/efi.h -@@ -74,6 +74,11 @@ grub_err_t EXPORT_FUNC (grub_efi_set_virtual_address_map) (grub_efi_uintn_t memo - grub_efi_uintn_t descriptor_size, - grub_efi_uint32_t descriptor_version, - grub_efi_memory_descriptor_t *virtual_map); -+grub_efi_status_t EXPORT_FUNC (grub_efi_get_variable_with_attributes) (const char *variable, -+ const grub_efi_guid_t *guid, -+ grub_size_t *datasize_out, -+ void **data_out, -+ grub_efi_uint32_t *attributes); - grub_efi_status_t EXPORT_FUNC (grub_efi_get_variable) (const char *variable, - const grub_efi_guid_t *guid, - grub_size_t *datasize_out, --- -2.29.2 - diff --git a/buildroot/boot/grub2/0032-efi-Add-secure-boot-detection.patch b/buildroot/boot/grub2/0032-efi-Add-secure-boot-detection.patch deleted file mode 100644 index f09a42b207..0000000000 --- a/buildroot/boot/grub2/0032-efi-Add-secure-boot-detection.patch +++ /dev/null @@ -1,541 +0,0 @@ -From d7e54b2e5feee95d2f83058ed30d883c450d1473 Mon Sep 17 00:00:00 2001 -From: Daniel Kiper -Date: Thu, 3 Dec 2020 16:01:48 +0100 -Subject: [PATCH] efi: Add secure boot detection - -Introduce grub_efi_get_secureboot() function which returns whether -UEFI Secure Boot is enabled or not on UEFI systems. - -Signed-off-by: Ignat Korchagin -Signed-off-by: Daniel Kiper -Signed-off-by: Marco A Benatto -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -[Add changes to generated files] -Signed-off-by: Stefan Sørensen ---- - grub-core/Makefile.am | 1 + - grub-core/Makefile.core.am | 14 +++--- - grub-core/Makefile.core.def | 1 + - grub-core/Makefile.in | 102 ++++++++++++++++++++++++++--------------- - grub-core/kern/efi/sb.c | 109 ++++++++++++++++++++++++++++++++++++++++++++ - include/grub/efi/sb.h | 40 ++++++++++++++++ - po/POTFILES.in | 2 + - 7 files changed, 225 insertions(+), 44 deletions(-) - create mode 100644 grub-core/kern/efi/sb.c - create mode 100644 include/grub/efi/sb.h - -diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am -index 3ea8e7f..c6ba5b2 100644 ---- a/grub-core/Makefile.am -+++ b/grub-core/Makefile.am -@@ -71,6 +71,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/command.h - KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/device.h - KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/disk.h - KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/dl.h -+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/sb.h - KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/env.h - KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/env_private.h - KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/err.h -diff --git a/grub-core/Makefile.core.am b/grub-core/Makefile.core.am -index a217716..f28b753 100644 ---- a/grub-core/Makefile.core.am -+++ b/grub-core/Makefile.core.am -@@ -22421,7 +22421,7 @@ endif - if COND_i386_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/i386/efi/startup.S --kernel_exec_SOURCES += kern/i386/efi/tsc.c kern/i386/tsc_pmtimer.c kern/i386/efi/init.c bus/pci.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/i386/efi/tsc.c kern/i386/tsc_pmtimer.c kern/i386/efi/init.c bus/pci.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22531,7 +22531,7 @@ endif - if COND_x86_64_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/x86_64/efi/startup.S --kernel_exec_SOURCES += kern/i386/efi/tsc.c kern/i386/tsc_pmtimer.c kern/x86_64/efi/callwrap.S kern/i386/efi/init.c bus/pci.c kern/x86_64/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/i386/efi/tsc.c kern/i386/tsc_pmtimer.c kern/x86_64/efi/callwrap.S kern/i386/efi/init.c bus/pci.c kern/x86_64/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22707,7 +22707,7 @@ endif - if COND_ia64_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = --kernel_exec_SOURCES += kern/ia64/efi/startup.S kern/ia64/efi/init.c kern/ia64/dl.c kern/ia64/dl_helper.c kern/ia64/cache.c lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/ia64/efi/startup.S kern/ia64/efi/init.c kern/ia64/dl.c kern/ia64/dl_helper.c kern/ia64/cache.c lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -fno-builtin -fpic -minline-int-divide-max-throughput -@@ -22773,7 +22773,7 @@ endif - if COND_arm_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/arm/efi/startup.S --kernel_exec_SOURCES += kern/arm/efi/init.c kern/efi/fdt.c kern/arm/dl.c kern/arm/dl_helper.c kern/arm/cache_armv6.S kern/arm/cache_armv7.S kern/arm/cache.c kern/arm/compiler-rt.S lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/arm/efi/init.c kern/efi/fdt.c kern/arm/dl.c kern/arm/dl_helper.c kern/arm/cache_armv6.S kern/arm/cache_armv7.S kern/arm/cache.c kern/arm/compiler-rt.S lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22795,7 +22795,7 @@ endif - if COND_arm64_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/arm64/efi/startup.S --kernel_exec_SOURCES += kern/arm64/efi/init.c kern/efi/fdt.c kern/arm64/cache.c kern/arm64/cache_flush.S kern/arm64/dl.c kern/arm64/dl_helper.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/arm64/efi/init.c kern/efi/fdt.c kern/arm64/cache.c kern/arm64/cache_flush.S kern/arm64/dl.c kern/arm64/dl_helper.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22839,7 +22839,7 @@ endif - if COND_riscv32_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/riscv/efi/startup.S --kernel_exec_SOURCES += kern/riscv/efi/init.c kern/efi/fdt.c kern/riscv/cache.c kern/riscv/cache_flush.S kern/riscv/dl.c lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/riscv/efi/init.c kern/efi/fdt.c kern/riscv/cache.c kern/riscv/cache_flush.S kern/riscv/dl.c lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22861,7 +22861,7 @@ endif - if COND_riscv64_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/riscv/efi/startup.S --kernel_exec_SOURCES += kern/riscv/efi/init.c kern/efi/fdt.c kern/riscv/cache.c kern/riscv/cache_flush.S kern/riscv/dl.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/riscv/efi/init.c kern/efi/fdt.c kern/riscv/cache.c kern/riscv/cache_flush.S kern/riscv/dl.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 474a63e..abd26cf 100644 ---- a/grub-core/Makefile.core.def -+++ b/grub-core/Makefile.core.def -@@ -203,6 +203,7 @@ kernel = { - efi = term/efi/console.c; - efi = kern/acpi.c; - efi = kern/efi/acpi.c; -+ efi = kern/efi/sb.c; - i386_coreboot = kern/i386/pc/acpi.c; - i386_multiboot = kern/i386/pc/acpi.c; - i386_coreboot = kern/acpi.c; -diff --git a/grub-core/Makefile.in b/grub-core/Makefile.in -index d287607..8fb81ee 100644 ---- a/grub-core/Makefile.in -+++ b/grub-core/Makefile.in -@@ -10468,32 +10468,33 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - kern/arm64/cache_flush.S kern/arm64/dl.c \ - kern/arm64/dl_helper.c disk/efi/efidisk.c kern/efi/efi.c \ - kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c \ -- kern/efi/acpi.c kern/compiler-rt.c kern/mm.c kern/time.c \ -- kern/generic/millisleep.c kern/command.c kern/corecmd.c \ -- kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c \ -- kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c \ -- kern/parser.c kern/partition.c kern/rescue_parser.c \ -- kern/rescue_reader.c kern/term.c kern/arm/startup.S \ -- kern/arm/coreboot/init.c kern/arm/coreboot/timer.c \ -- kern/arm/coreboot/coreboot.S lib/fdt.c bus/fdt.c term/ps2.c \ -- term/arm/pl050.c term/arm/cros.c term/arm/cros_ec.c \ -- bus/spi/rk3288_spi.c commands/keylayouts.c \ -- kern/arm/coreboot/dma.c kern/arm/coreboot/cbtable.c \ -- video/coreboot/cbfb.c kern/coreboot/mmap.c \ -- kern/coreboot/cbtable.c term/gfxterm.c font/font.c \ -- font/font_cmd.c io/bufio.c video/fb/fbblit.c video/fb/fbfill.c \ -- video/fb/fbutil.c video/fb/video_fb.c video/video.c \ -- kern/arm/dl.c kern/arm/dl_helper.c kern/arm/cache_armv6.S \ -- kern/arm/cache_armv7.S kern/arm/cache.c kern/arm/compiler-rt.S \ -- lib/division.c kern/arm/efi/startup.S kern/arm/efi/init.c \ -- kern/arm/uboot/init.c kern/arm/uboot/uboot.S \ -- disk/uboot/ubootdisk.c kern/uboot/uboot.c kern/uboot/init.c \ -- kern/uboot/hw.c term/uboot/console.c term/terminfo.c \ -- term/tparm.c commands/extcmd.c lib/arg.c disk/host.c \ -- kern/emu/cache_s.S kern/emu/hostdisk.c osdep/unix/hostdisk.c \ -- osdep/exec.c osdep/devmapper/hostdisk.c osdep/hostdisk.c \ -- kern/emu/hostfs.c kern/emu/main.c kern/emu/argp_common.c \ -- kern/emu/misc.c kern/emu/mm.c kern/emu/time.c kern/emu/cache.c \ -+ kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c \ -+ kern/time.c kern/generic/millisleep.c kern/command.c \ -+ kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c \ -+ kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c \ -+ kern/misc.c kern/parser.c kern/partition.c \ -+ kern/rescue_parser.c kern/rescue_reader.c kern/term.c \ -+ kern/arm/startup.S kern/arm/coreboot/init.c \ -+ kern/arm/coreboot/timer.c kern/arm/coreboot/coreboot.S \ -+ lib/fdt.c bus/fdt.c term/ps2.c term/arm/pl050.c \ -+ term/arm/cros.c term/arm/cros_ec.c bus/spi/rk3288_spi.c \ -+ commands/keylayouts.c kern/arm/coreboot/dma.c \ -+ kern/arm/coreboot/cbtable.c video/coreboot/cbfb.c \ -+ kern/coreboot/mmap.c kern/coreboot/cbtable.c term/gfxterm.c \ -+ font/font.c font/font_cmd.c io/bufio.c video/fb/fbblit.c \ -+ video/fb/fbfill.c video/fb/fbutil.c video/fb/video_fb.c \ -+ video/video.c kern/arm/dl.c kern/arm/dl_helper.c \ -+ kern/arm/cache_armv6.S kern/arm/cache_armv7.S kern/arm/cache.c \ -+ kern/arm/compiler-rt.S lib/division.c kern/arm/efi/startup.S \ -+ kern/arm/efi/init.c kern/arm/uboot/init.c \ -+ kern/arm/uboot/uboot.S disk/uboot/ubootdisk.c \ -+ kern/uboot/uboot.c kern/uboot/init.c kern/uboot/hw.c \ -+ term/uboot/console.c term/terminfo.c term/tparm.c \ -+ commands/extcmd.c lib/arg.c disk/host.c kern/emu/cache_s.S \ -+ kern/emu/hostdisk.c osdep/unix/hostdisk.c osdep/exec.c \ -+ osdep/devmapper/hostdisk.c osdep/hostdisk.c kern/emu/hostfs.c \ -+ kern/emu/main.c kern/emu/argp_common.c kern/emu/misc.c \ -+ kern/emu/mm.c kern/emu/time.c kern/emu/cache.c \ - osdep/emuconsole.c osdep/dl.c osdep/sleep.c osdep/init.c \ - osdep/emunet.c osdep/cputime.c kern/i386/coreboot/startup.S \ - kern/i386/coreboot/init.c kern/i386/pc/acpi.c \ -@@ -10580,6 +10581,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ term/efi/kernel_exec-console.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-acpi.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/efi/kernel_exec-acpi.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/efi/kernel_exec-sb.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-compiler-rt.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ -@@ -10651,6 +10653,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ term/efi/kernel_exec-console.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-acpi.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/efi/kernel_exec-acpi.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/efi/kernel_exec-sb.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-compiler-rt.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ -@@ -10686,6 +10689,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ term/efi/kernel_exec-console.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-acpi.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/efi/kernel_exec-acpi.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/efi/kernel_exec-sb.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-compiler-rt.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ -@@ -10881,6 +10885,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ term/efi/kernel_exec-console.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-acpi.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/efi/kernel_exec-acpi.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/efi/kernel_exec-sb.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-compiler-rt.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ -@@ -11109,6 +11114,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ term/efi/kernel_exec-console.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-acpi.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/efi/kernel_exec-acpi.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/efi/kernel_exec-sb.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-compiler-rt.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ -@@ -11271,6 +11277,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ term/efi/kernel_exec-console.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-acpi.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/efi/kernel_exec-acpi.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/efi/kernel_exec-sb.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-compiler-rt.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ -@@ -11360,6 +11367,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_TRUE@ term/efi/kernel_exec-console.$(OBJEXT) \ - @COND_arm64_efi_TRUE@ kern/kernel_exec-acpi.$(OBJEXT) \ - @COND_arm64_efi_TRUE@ kern/efi/kernel_exec-acpi.$(OBJEXT) \ -+@COND_arm64_efi_TRUE@ kern/efi/kernel_exec-sb.$(OBJEXT) \ - @COND_arm64_efi_TRUE@ kern/kernel_exec-compiler-rt.$(OBJEXT) \ - @COND_arm64_efi_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ -@@ -16380,6 +16388,7 @@ KERNEL_HEADER_FILES = $(top_srcdir)/include/grub/cache.h \ - $(top_srcdir)/include/grub/device.h \ - $(top_srcdir)/include/grub/disk.h \ - $(top_srcdir)/include/grub/dl.h \ -+ $(top_srcdir)/include/grub/efi/sb.h \ - $(top_srcdir)/include/grub/env.h \ - $(top_srcdir)/include/grub/env_private.h \ - $(top_srcdir)/include/grub/err.h \ -@@ -25612,7 +25621,7 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_arm64_efi_TRUE@ kern/arm64/dl_helper.c disk/efi/efidisk.c \ - @COND_arm64_efi_TRUE@ kern/efi/efi.c kern/efi/init.c \ - @COND_arm64_efi_TRUE@ kern/efi/mm.c term/efi/console.c \ --@COND_arm64_efi_TRUE@ kern/acpi.c kern/efi/acpi.c \ -+@COND_arm64_efi_TRUE@ kern/acpi.c kern/efi/acpi.c kern/efi/sb.c \ - @COND_arm64_efi_TRUE@ kern/compiler-rt.c kern/mm.c kern/time.c \ - @COND_arm64_efi_TRUE@ kern/generic/millisleep.c kern/command.c \ - @COND_arm64_efi_TRUE@ kern/corecmd.c kern/device.c kern/disk.c \ -@@ -25661,8 +25670,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_arm_efi_TRUE@ disk/efi/efidisk.c kern/efi/efi.c \ - @COND_arm_efi_TRUE@ kern/efi/init.c kern/efi/mm.c \ - @COND_arm_efi_TRUE@ term/efi/console.c kern/acpi.c \ --@COND_arm_efi_TRUE@ kern/efi/acpi.c kern/compiler-rt.c \ --@COND_arm_efi_TRUE@ kern/mm.c kern/time.c \ -+@COND_arm_efi_TRUE@ kern/efi/acpi.c kern/efi/sb.c \ -+@COND_arm_efi_TRUE@ kern/compiler-rt.c kern/mm.c kern/time.c \ - @COND_arm_efi_TRUE@ kern/generic/millisleep.c kern/command.c \ - @COND_arm_efi_TRUE@ kern/corecmd.c kern/device.c kern/disk.c \ - @COND_arm_efi_TRUE@ kern/dl.c kern/env.c kern/err.c kern/file.c \ -@@ -25739,7 +25748,7 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_i386_efi_TRUE@ kern/i386/tsc_pit.c disk/efi/efidisk.c \ - @COND_i386_efi_TRUE@ kern/efi/efi.c kern/efi/init.c \ - @COND_i386_efi_TRUE@ kern/efi/mm.c term/efi/console.c \ --@COND_i386_efi_TRUE@ kern/acpi.c kern/efi/acpi.c \ -+@COND_i386_efi_TRUE@ kern/acpi.c kern/efi/acpi.c kern/efi/sb.c \ - @COND_i386_efi_TRUE@ kern/compiler-rt.c kern/mm.c kern/time.c \ - @COND_i386_efi_TRUE@ kern/generic/millisleep.c kern/command.c \ - @COND_i386_efi_TRUE@ kern/corecmd.c kern/device.c kern/disk.c \ -@@ -25851,7 +25860,7 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_ia64_efi_TRUE@ lib/division.c disk/efi/efidisk.c \ - @COND_ia64_efi_TRUE@ kern/efi/efi.c kern/efi/init.c \ - @COND_ia64_efi_TRUE@ kern/efi/mm.c term/efi/console.c \ --@COND_ia64_efi_TRUE@ kern/acpi.c kern/efi/acpi.c \ -+@COND_ia64_efi_TRUE@ kern/acpi.c kern/efi/acpi.c kern/efi/sb.c \ - @COND_ia64_efi_TRUE@ kern/compiler-rt.c kern/mm.c kern/time.c \ - @COND_ia64_efi_TRUE@ kern/generic/millisleep.c kern/command.c \ - @COND_ia64_efi_TRUE@ kern/corecmd.c kern/device.c kern/disk.c \ -@@ -25959,9 +25968,9 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_riscv32_efi_TRUE@ disk/efi/efidisk.c kern/efi/efi.c \ - @COND_riscv32_efi_TRUE@ kern/efi/init.c kern/efi/mm.c \ - @COND_riscv32_efi_TRUE@ term/efi/console.c kern/acpi.c \ --@COND_riscv32_efi_TRUE@ kern/efi/acpi.c kern/compiler-rt.c \ --@COND_riscv32_efi_TRUE@ kern/mm.c kern/time.c \ --@COND_riscv32_efi_TRUE@ kern/generic/millisleep.c \ -+@COND_riscv32_efi_TRUE@ kern/efi/acpi.c kern/efi/sb.c \ -+@COND_riscv32_efi_TRUE@ kern/compiler-rt.c kern/mm.c \ -+@COND_riscv32_efi_TRUE@ kern/time.c kern/generic/millisleep.c \ - @COND_riscv32_efi_TRUE@ kern/command.c kern/corecmd.c \ - @COND_riscv32_efi_TRUE@ kern/device.c kern/disk.c kern/dl.c \ - @COND_riscv32_efi_TRUE@ kern/env.c kern/err.c kern/file.c \ -@@ -25977,8 +25986,9 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_riscv64_efi_TRUE@ kern/efi/efi.c kern/efi/init.c \ - @COND_riscv64_efi_TRUE@ kern/efi/mm.c term/efi/console.c \ - @COND_riscv64_efi_TRUE@ kern/acpi.c kern/efi/acpi.c \ --@COND_riscv64_efi_TRUE@ kern/compiler-rt.c kern/mm.c \ --@COND_riscv64_efi_TRUE@ kern/time.c kern/generic/millisleep.c \ -+@COND_riscv64_efi_TRUE@ kern/efi/sb.c kern/compiler-rt.c \ -+@COND_riscv64_efi_TRUE@ kern/mm.c kern/time.c \ -+@COND_riscv64_efi_TRUE@ kern/generic/millisleep.c \ - @COND_riscv64_efi_TRUE@ kern/command.c kern/corecmd.c \ - @COND_riscv64_efi_TRUE@ kern/device.c kern/disk.c kern/dl.c \ - @COND_riscv64_efi_TRUE@ kern/env.c kern/err.c kern/file.c \ -@@ -26022,7 +26032,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_x86_64_efi_TRUE@ kern/efi/efi.c kern/efi/init.c \ - @COND_x86_64_efi_TRUE@ kern/efi/mm.c term/efi/console.c \ - @COND_x86_64_efi_TRUE@ kern/acpi.c kern/efi/acpi.c \ --@COND_x86_64_efi_TRUE@ kern/compiler-rt.c kern/mm.c kern/time.c \ -+@COND_x86_64_efi_TRUE@ kern/efi/sb.c kern/compiler-rt.c \ -+@COND_x86_64_efi_TRUE@ kern/mm.c kern/time.c \ - @COND_x86_64_efi_TRUE@ kern/generic/millisleep.c kern/command.c \ - @COND_x86_64_efi_TRUE@ kern/corecmd.c kern/device.c kern/disk.c \ - @COND_x86_64_efi_TRUE@ kern/dl.c kern/env.c kern/err.c \ -@@ -27989,6 +28000,8 @@ kern/kernel_exec-acpi.$(OBJEXT): kern/$(am__dirstamp) \ - kern/$(DEPDIR)/$(am__dirstamp) - kern/efi/kernel_exec-acpi.$(OBJEXT): kern/efi/$(am__dirstamp) \ - kern/efi/$(DEPDIR)/$(am__dirstamp) -+kern/efi/kernel_exec-sb.$(OBJEXT): kern/efi/$(am__dirstamp) \ -+ kern/efi/$(DEPDIR)/$(am__dirstamp) - kern/kernel_exec-compiler-rt.$(OBJEXT): kern/$(am__dirstamp) \ - kern/$(DEPDIR)/$(am__dirstamp) - kern/kernel_exec-mm.$(OBJEXT): kern/$(am__dirstamp) \ -@@ -30994,6 +31007,7 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@kern/efi/$(DEPDIR)/kernel_exec-fdt.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@kern/efi/$(DEPDIR)/kernel_exec-init.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@kern/efi/$(DEPDIR)/kernel_exec-mm.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@kern/efi/$(DEPDIR)/kernel_exec-sb.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@kern/emu/$(DEPDIR)/grub_emu-full.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@kern/emu/$(DEPDIR)/grub_emu_lite-lite.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@kern/emu/$(DEPDIR)/kernel_exec-argp_common.Po@am__quote@ -@@ -35285,6 +35299,20 @@ kern/efi/kernel_exec-acpi.obj: kern/efi/acpi.c - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -c -o kern/efi/kernel_exec-acpi.obj `if test -f 'kern/efi/acpi.c'; then $(CYGPATH_W) 'kern/efi/acpi.c'; else $(CYGPATH_W) '$(srcdir)/kern/efi/acpi.c'; fi` - -+kern/efi/kernel_exec-sb.o: kern/efi/sb.c -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -MT kern/efi/kernel_exec-sb.o -MD -MP -MF kern/efi/$(DEPDIR)/kernel_exec-sb.Tpo -c -o kern/efi/kernel_exec-sb.o `test -f 'kern/efi/sb.c' || echo '$(srcdir)/'`kern/efi/sb.c -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) kern/efi/$(DEPDIR)/kernel_exec-sb.Tpo kern/efi/$(DEPDIR)/kernel_exec-sb.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='kern/efi/sb.c' object='kern/efi/kernel_exec-sb.o' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -c -o kern/efi/kernel_exec-sb.o `test -f 'kern/efi/sb.c' || echo '$(srcdir)/'`kern/efi/sb.c -+ -+kern/efi/kernel_exec-sb.obj: kern/efi/sb.c -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -MT kern/efi/kernel_exec-sb.obj -MD -MP -MF kern/efi/$(DEPDIR)/kernel_exec-sb.Tpo -c -o kern/efi/kernel_exec-sb.obj `if test -f 'kern/efi/sb.c'; then $(CYGPATH_W) 'kern/efi/sb.c'; else $(CYGPATH_W) '$(srcdir)/kern/efi/sb.c'; fi` -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) kern/efi/$(DEPDIR)/kernel_exec-sb.Tpo kern/efi/$(DEPDIR)/kernel_exec-sb.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='kern/efi/sb.c' object='kern/efi/kernel_exec-sb.obj' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -c -o kern/efi/kernel_exec-sb.obj `if test -f 'kern/efi/sb.c'; then $(CYGPATH_W) 'kern/efi/sb.c'; else $(CYGPATH_W) '$(srcdir)/kern/efi/sb.c'; fi` -+ - kern/kernel_exec-compiler-rt.o: kern/compiler-rt.c - @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -MT kern/kernel_exec-compiler-rt.o -MD -MP -MF kern/$(DEPDIR)/kernel_exec-compiler-rt.Tpo -c -o kern/kernel_exec-compiler-rt.o `test -f 'kern/compiler-rt.c' || echo '$(srcdir)/'`kern/compiler-rt.c - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) kern/$(DEPDIR)/kernel_exec-compiler-rt.Tpo kern/$(DEPDIR)/kernel_exec-compiler-rt.Po -diff --git a/grub-core/kern/efi/sb.c b/grub-core/kern/efi/sb.c -new file mode 100644 -index 0000000..19658d9 ---- /dev/null -+++ b/grub-core/kern/efi/sb.c -@@ -0,0 +1,109 @@ -+/* -+ * GRUB -- GRand Unified Bootloader -+ * Copyright (C) 2020 Free Software Foundation, Inc. -+ * -+ * GRUB is free software: you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation, either version 3 of the License, or -+ * (at your option) any later version. -+ * -+ * GRUB is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with GRUB. If not, see . -+ * -+ * UEFI Secure Boot related checkings. -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+/* -+ * Determine whether we're in secure boot mode. -+ * -+ * Please keep the logic in sync with the Linux kernel, -+ * drivers/firmware/efi/libstub/secureboot.c:efi_get_secureboot(). -+ */ -+grub_uint8_t -+grub_efi_get_secureboot (void) -+{ -+ static grub_efi_guid_t efi_variable_guid = GRUB_EFI_GLOBAL_VARIABLE_GUID; -+ static grub_efi_guid_t efi_shim_lock_guid = GRUB_EFI_SHIM_LOCK_GUID; -+ grub_efi_status_t status; -+ grub_efi_uint32_t attr = 0; -+ grub_size_t size = 0; -+ grub_uint8_t *secboot = NULL; -+ grub_uint8_t *setupmode = NULL; -+ grub_uint8_t *moksbstate = NULL; -+ grub_uint8_t secureboot = GRUB_EFI_SECUREBOOT_MODE_UNKNOWN; -+ const char *secureboot_str = "UNKNOWN"; -+ -+ status = grub_efi_get_variable ("SecureBoot", &efi_variable_guid, -+ &size, (void **) &secboot); -+ -+ if (status == GRUB_EFI_NOT_FOUND) -+ { -+ secureboot = GRUB_EFI_SECUREBOOT_MODE_DISABLED; -+ goto out; -+ } -+ -+ if (status != GRUB_EFI_SUCCESS) -+ goto out; -+ -+ status = grub_efi_get_variable ("SetupMode", &efi_variable_guid, -+ &size, (void **) &setupmode); -+ -+ if (status != GRUB_EFI_SUCCESS) -+ goto out; -+ -+ if ((*secboot == 0) || (*setupmode == 1)) -+ { -+ secureboot = GRUB_EFI_SECUREBOOT_MODE_DISABLED; -+ goto out; -+ } -+ -+ /* -+ * See if a user has put the shim into insecure mode. If so, and if the -+ * variable doesn't have the runtime attribute set, we might as well -+ * honor that. -+ */ -+ status = grub_efi_get_variable_with_attributes ("MokSBState", &efi_shim_lock_guid, -+ &size, (void **) &moksbstate, &attr); -+ -+ /* If it fails, we don't care why. Default to secure. */ -+ if (status != GRUB_EFI_SUCCESS) -+ { -+ secureboot = GRUB_EFI_SECUREBOOT_MODE_ENABLED; -+ goto out; -+ } -+ -+ if (!(attr & GRUB_EFI_VARIABLE_RUNTIME_ACCESS) && *moksbstate == 1) -+ { -+ secureboot = GRUB_EFI_SECUREBOOT_MODE_DISABLED; -+ goto out; -+ } -+ -+ secureboot = GRUB_EFI_SECUREBOOT_MODE_ENABLED; -+ -+ out: -+ grub_free (moksbstate); -+ grub_free (setupmode); -+ grub_free (secboot); -+ -+ if (secureboot == GRUB_EFI_SECUREBOOT_MODE_DISABLED) -+ secureboot_str = "Disabled"; -+ else if (secureboot == GRUB_EFI_SECUREBOOT_MODE_ENABLED) -+ secureboot_str = "Enabled"; -+ -+ grub_dprintf ("efi", "UEFI Secure Boot state: %s\n", secureboot_str); -+ -+ return secureboot; -+} -diff --git a/include/grub/efi/sb.h b/include/grub/efi/sb.h -new file mode 100644 -index 0000000..a33d985 ---- /dev/null -+++ b/include/grub/efi/sb.h -@@ -0,0 +1,40 @@ -+/* -+ * GRUB -- GRand Unified Bootloader -+ * Copyright (C) 2020 Free Software Foundation, Inc. -+ * -+ * GRUB is free software: you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation, either version 3 of the License, or -+ * (at your option) any later version. -+ * -+ * GRUB is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with GRUB. If not, see . -+ */ -+ -+#ifndef GRUB_EFI_SB_H -+#define GRUB_EFI_SB_H 1 -+ -+#include -+#include -+ -+#define GRUB_EFI_SECUREBOOT_MODE_UNSET 0 -+#define GRUB_EFI_SECUREBOOT_MODE_UNKNOWN 1 -+#define GRUB_EFI_SECUREBOOT_MODE_DISABLED 2 -+#define GRUB_EFI_SECUREBOOT_MODE_ENABLED 3 -+ -+#ifdef GRUB_MACHINE_EFI -+extern grub_uint8_t -+EXPORT_FUNC (grub_efi_get_secureboot) (void); -+#else -+static inline grub_uint8_t -+grub_efi_get_secureboot (void) -+{ -+ return GRUB_EFI_SECUREBOOT_MODE_UNSET; -+} -+#endif -+#endif /* GRUB_EFI_SB_H */ -diff --git a/po/POTFILES.in b/po/POTFILES.in -index 5574cbe..22543be 100644 ---- a/po/POTFILES.in -+++ b/po/POTFILES.in -@@ -266,6 +266,7 @@ - ./grub-core/kern/efi/fdt.c - ./grub-core/kern/efi/init.c - ./grub-core/kern/efi/mm.c -+./grub-core/kern/efi/sb.c - ./grub-core/kern/elf.c - ./grub-core/kern/elfXX.c - ./grub-core/kern/emu/argp_common.c -@@ -1053,6 +1054,7 @@ - ./include/grub/efi/memory.h - ./include/grub/efi/pci.h - ./include/grub/efi/pe32.h -+./include/grub/efi/sb.h - ./include/grub/efi/tpm.h - ./include/grub/efi/uga_draw.h - ./include/grub/efiemu/efiemu.h --- -2.14.2 - diff --git a/buildroot/boot/grub2/0033-verifiers-Move-verifiers-API-to-kernel-image.patch b/buildroot/boot/grub2/0033-verifiers-Move-verifiers-API-to-kernel-image.patch deleted file mode 100644 index 9ce969c769..0000000000 --- a/buildroot/boot/grub2/0033-verifiers-Move-verifiers-API-to-kernel-image.patch +++ /dev/null @@ -1,1650 +0,0 @@ -From 9e95f45ceeef36fcf93cbfffcf004276883dbc99 Mon Sep 17 00:00:00 2001 -From: Marco A Benatto -Date: Wed, 23 Sep 2020 11:33:33 -0400 -Subject: [PATCH] verifiers: Move verifiers API to kernel image - -Move verifiers API from a module to the kernel image, so it can be -used there as well. There are no functional changes in this patch. - -Signed-off-by: Marco A Benatto -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -[Add changes to generated files] -Signed-off-by: Stefan Sørensen ---- - grub-core/Makefile.am | 1 + - grub-core/Makefile.core.am | 66 +++----- - grub-core/Makefile.core.def | 6 +- - grub-core/Makefile.in | 355 +++++++++++++++++++++-------------------- - grub-core/commands/verifiers.c | 228 -------------------------- - grub-core/kern/main.c | 4 + - grub-core/kern/verifiers.c | 224 ++++++++++++++++++++++++++ - include/grub/verify.h | 9 +- - po/POTFILES.in | 2 +- - 9 files changed, 446 insertions(+), 449 deletions(-) - delete mode 100644 grub-core/commands/verifiers.c - create mode 100644 grub-core/kern/verifiers.c - -diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am -index c6ba5b2..cc6fc7d 100644 ---- a/grub-core/Makefile.am -+++ b/grub-core/Makefile.am -@@ -91,6 +91,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/parser.h - KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/partition.h - KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/term.h - KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/time.h -+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/verify.h - KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/mm_private.h - KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/net.h - KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/memory.h -diff --git a/grub-core/Makefile.core.am b/grub-core/Makefile.core.am -index f28b753..c4d67d4 100644 ---- a/grub-core/Makefile.core.am -+++ b/grub-core/Makefile.core.am -@@ -6953,26 +6953,6 @@ CLEANFILES += pgp.marker - pgp.marker: $(pgp_module_SOURCES) $(nodist_pgp_module_SOURCES) - $(TARGET_CPP) -DGRUB_LST_GENERATOR $(CPPFLAGS_MARKER) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pgp_module_CPPFLAGS) $(CPPFLAGS) $^ > $@.new || (rm -f $@; exit 1) - grep 'MARKER' $@.new > $@; rm -f $@.new --platform_PROGRAMS += verifiers.module --MODULE_FILES += verifiers.module$(EXEEXT) --verifiers_module_SOURCES = commands/verifiers.c ## platform sources --nodist_verifiers_module_SOURCES = ## platform nodist sources --verifiers_module_LDADD = --verifiers_module_CFLAGS = $(AM_CFLAGS) $(CFLAGS_MODULE) --verifiers_module_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_MODULE) --verifiers_module_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_MODULE) --verifiers_module_CCASFLAGS = $(AM_CCASFLAGS) $(CCASFLAGS_MODULE) --verifiers_module_DEPENDENCIES = $(TARGET_OBJ2ELF) --dist_noinst_DATA += --BUILT_SOURCES += $(nodist_verifiers_module_SOURCES) --CLEANFILES += $(nodist_verifiers_module_SOURCES) --MOD_FILES += verifiers.mod --MARKER_FILES += verifiers.marker --CLEANFILES += verifiers.marker -- --verifiers.marker: $(verifiers_module_SOURCES) $(nodist_verifiers_module_SOURCES) -- $(TARGET_CPP) -DGRUB_LST_GENERATOR $(CPPFLAGS_MARKER) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(verifiers_module_CPPFLAGS) $(CPPFLAGS) $^ > $@.new || (rm -f $@; exit 1) -- grep 'MARKER' $@.new > $@; rm -f $@.new - - if COND_x86_64_efi - platform_PROGRAMS += shim_lock.module -@@ -22377,7 +22357,7 @@ gcry_whirlpool.marker: $(gcry_whirlpool_module_SOURCES) $(nodist_gcry_whirlpool_ - if COND_emu - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = --kernel_exec_SOURCES += disk/host.c kern/emu/cache_s.S kern/emu/hostdisk.c osdep/unix/hostdisk.c osdep/exec.c osdep/devmapper/hostdisk.c osdep/hostdisk.c kern/emu/hostfs.c kern/emu/main.c kern/emu/argp_common.c kern/emu/misc.c kern/emu/mm.c kern/emu/time.c kern/emu/cache.c osdep/emuconsole.c osdep/dl.c osdep/sleep.c osdep/init.c osdep/emunet.c osdep/cputime.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += disk/host.c kern/emu/cache_s.S kern/emu/hostdisk.c osdep/unix/hostdisk.c osdep/exec.c osdep/devmapper/hostdisk.c osdep/hostdisk.c kern/emu/hostfs.c kern/emu/main.c kern/emu/argp_common.c kern/emu/misc.c kern/emu/mm.c kern/emu/time.c kern/emu/cache.c osdep/emuconsole.c osdep/dl.c osdep/sleep.c osdep/init.c osdep/emunet.c osdep/cputime.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) $(CFLAGS_GNULIB) -@@ -22399,7 +22379,7 @@ endif - if COND_i386_pc - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/i386/pc/startup.S --kernel_exec_SOURCES += kern/i386/pc/init.c kern/i386/pc/mmap.c term/i386/pc/console.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/i386/pc/init.c kern/i386/pc/mmap.c term/i386/pc/console.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22421,7 +22401,7 @@ endif - if COND_i386_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/i386/efi/startup.S --kernel_exec_SOURCES += kern/i386/efi/tsc.c kern/i386/tsc_pmtimer.c kern/i386/efi/init.c bus/pci.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/i386/efi/tsc.c kern/i386/tsc_pmtimer.c kern/i386/efi/init.c bus/pci.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22443,7 +22423,7 @@ endif - if COND_i386_qemu - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/i386/qemu/startup.S --kernel_exec_SOURCES += kern/i386/qemu/init.c bus/pci.c kern/vga_init.c kern/i386/qemu/mmap.c term/i386/pc/vga_text.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/i386/qemu/init.c bus/pci.c kern/vga_init.c kern/i386/qemu/mmap.c term/i386/pc/vga_text.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22465,7 +22445,7 @@ endif - if COND_i386_coreboot - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/i386/coreboot/startup.S --kernel_exec_SOURCES += kern/i386/coreboot/init.c kern/i386/pc/acpi.c kern/acpi.c kern/i386/tsc_pmtimer.c kern/i386/coreboot/cbtable.c video/coreboot/cbfb.c kern/coreboot/mmap.c kern/coreboot/cbtable.c term/gfxterm.c font/font.c font/font_cmd.c io/bufio.c video/fb/fbblit.c video/fb/fbfill.c video/fb/fbutil.c video/fb/video_fb.c video/video.c term/i386/pc/vga_text.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/i386/coreboot/init.c kern/i386/pc/acpi.c kern/acpi.c kern/i386/tsc_pmtimer.c kern/i386/coreboot/cbtable.c video/coreboot/cbfb.c kern/coreboot/mmap.c kern/coreboot/cbtable.c term/gfxterm.c font/font.c font/font_cmd.c io/bufio.c video/fb/fbblit.c video/fb/fbfill.c video/fb/fbutil.c video/fb/video_fb.c video/video.c term/i386/pc/vga_text.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22487,7 +22467,7 @@ endif - if COND_i386_multiboot - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/i386/coreboot/startup.S --kernel_exec_SOURCES += kern/i386/coreboot/init.c kern/i386/pc/acpi.c kern/acpi.c kern/i386/multiboot_mmap.c term/i386/pc/vga_text.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/i386/coreboot/init.c kern/i386/pc/acpi.c kern/acpi.c kern/i386/multiboot_mmap.c term/i386/pc/vga_text.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22509,7 +22489,7 @@ endif - if COND_i386_ieee1275 - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/i386/ieee1275/startup.S --kernel_exec_SOURCES += disk/ieee1275/ofdisk.c kern/ieee1275/cmain.c kern/ieee1275/ieee1275.c kern/ieee1275/mmap.c kern/ieee1275/openfw.c term/ieee1275/console.c kern/ieee1275/init.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += disk/ieee1275/ofdisk.c kern/ieee1275/cmain.c kern/ieee1275/ieee1275.c kern/ieee1275/mmap.c kern/ieee1275/openfw.c term/ieee1275/console.c kern/ieee1275/init.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22531,7 +22511,7 @@ endif - if COND_x86_64_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/x86_64/efi/startup.S --kernel_exec_SOURCES += kern/i386/efi/tsc.c kern/i386/tsc_pmtimer.c kern/x86_64/efi/callwrap.S kern/i386/efi/init.c bus/pci.c kern/x86_64/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/i386/efi/tsc.c kern/i386/tsc_pmtimer.c kern/x86_64/efi/callwrap.S kern/i386/efi/init.c bus/pci.c kern/x86_64/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22553,7 +22533,7 @@ endif - if COND_i386_xen - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/i386/xen/startup.S --kernel_exec_SOURCES += kern/i386/dl.c kern/i386/xen/hypercall.S kern/i386/tsc.c kern/i386/xen/tsc.c kern/xen/init.c term/xen/console.c disk/xen/xendisk.c commands/boot.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/i386/dl.c kern/i386/xen/hypercall.S kern/i386/tsc.c kern/i386/xen/tsc.c kern/xen/init.c term/xen/console.c disk/xen/xendisk.c commands/boot.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22575,7 +22555,7 @@ endif - if COND_x86_64_xen - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/x86_64/xen/startup.S --kernel_exec_SOURCES += kern/x86_64/dl.c kern/x86_64/xen/hypercall.S kern/i386/tsc.c kern/i386/xen/tsc.c kern/xen/init.c term/xen/console.c disk/xen/xendisk.c commands/boot.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/x86_64/dl.c kern/x86_64/xen/hypercall.S kern/i386/tsc.c kern/i386/xen/tsc.c kern/xen/init.c term/xen/console.c disk/xen/xendisk.c commands/boot.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22597,7 +22577,7 @@ endif - if COND_i386_xen_pvh - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/i386/xen/startup_pvh.S --kernel_exec_SOURCES += kern/i386/dl.c commands/boot.c disk/xen/xendisk.c kern/i386/tsc.c kern/i386/xen/tsc.c kern/i386/xen/pvh.c kern/xen/init.c term/xen/console.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/i386/dl.c commands/boot.c disk/xen/xendisk.c kern/i386/tsc.c kern/i386/xen/tsc.c kern/i386/xen/pvh.c kern/xen/init.c term/xen/console.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22619,7 +22599,7 @@ endif - if COND_mips_loongson - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/mips/startup.S --kernel_exec_SOURCES += term/ns8250.c bus/bonito.c bus/cs5536.c bus/pci.c kern/mips/loongson/init.c term/at_keyboard.c term/ps2.c commands/boot.c term/serial.c video/sm712.c video/sis315pro.c video/radeon_fuloong2e.c video/radeon_yeeloong3a.c commands/keylayouts.c term/gfxterm.c font/font.c font/font_cmd.c io/bufio.c video/fb/fbblit.c video/fb/fbfill.c video/fb/fbutil.c video/fb/video_fb.c video/video.c kern/generic/rtc_get_time_ms.c kern/mips/cache.S kern/mips/dl.c kern/mips/init.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += term/ns8250.c bus/bonito.c bus/cs5536.c bus/pci.c kern/mips/loongson/init.c term/at_keyboard.c term/ps2.c commands/boot.c term/serial.c video/sm712.c video/sis315pro.c video/radeon_fuloong2e.c video/radeon_yeeloong3a.c commands/keylayouts.c term/gfxterm.c font/font.c font/font_cmd.c io/bufio.c video/fb/fbblit.c video/fb/fbfill.c video/fb/fbutil.c video/fb/video_fb.c video/video.c kern/generic/rtc_get_time_ms.c kern/mips/cache.S kern/mips/dl.c kern/mips/init.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22641,7 +22621,7 @@ endif - if COND_sparc64_ieee1275 - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/sparc64/ieee1275/crt0.S --kernel_exec_SOURCES += kern/sparc64/cache.S kern/sparc64/dl.c kern/sparc64/ieee1275/ieee1275.c disk/ieee1275/obdisk.c disk/ieee1275/ofdisk.c kern/ieee1275/cmain.c kern/ieee1275/ieee1275.c kern/ieee1275/mmap.c kern/ieee1275/openfw.c term/ieee1275/console.c kern/ieee1275/init.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/sparc64/cache.S kern/sparc64/dl.c kern/sparc64/ieee1275/ieee1275.c disk/ieee1275/obdisk.c disk/ieee1275/ofdisk.c kern/ieee1275/cmain.c kern/ieee1275/ieee1275.c kern/ieee1275/mmap.c kern/ieee1275/openfw.c term/ieee1275/console.c kern/ieee1275/init.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22663,7 +22643,7 @@ endif - if COND_powerpc_ieee1275 - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/powerpc/ieee1275/startup.S --kernel_exec_SOURCES += kern/powerpc/cache.S kern/powerpc/dl.c kern/powerpc/compiler-rt.S disk/ieee1275/ofdisk.c kern/ieee1275/cmain.c kern/ieee1275/ieee1275.c kern/ieee1275/mmap.c kern/ieee1275/openfw.c term/ieee1275/console.c kern/ieee1275/init.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/powerpc/cache.S kern/powerpc/dl.c kern/powerpc/compiler-rt.S disk/ieee1275/ofdisk.c kern/ieee1275/cmain.c kern/ieee1275/ieee1275.c kern/ieee1275/mmap.c kern/ieee1275/openfw.c term/ieee1275/console.c kern/ieee1275/init.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22685,7 +22665,7 @@ endif - if COND_mips_arc - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/mips/startup.S --kernel_exec_SOURCES += kern/mips/arc/init.c term/arc/console.c disk/arc/arcdisk.c kern/generic/rtc_get_time_ms.c kern/mips/cache.S kern/mips/dl.c kern/mips/init.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/mips/arc/init.c term/arc/console.c disk/arc/arcdisk.c kern/generic/rtc_get_time_ms.c kern/mips/cache.S kern/mips/dl.c kern/mips/init.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22707,7 +22687,7 @@ endif - if COND_ia64_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = --kernel_exec_SOURCES += kern/ia64/efi/startup.S kern/ia64/efi/init.c kern/ia64/dl.c kern/ia64/dl_helper.c kern/ia64/cache.c lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/ia64/efi/startup.S kern/ia64/efi/init.c kern/ia64/dl.c kern/ia64/dl_helper.c kern/ia64/cache.c lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -fno-builtin -fpic -minline-int-divide-max-throughput -@@ -22729,7 +22709,7 @@ endif - if COND_mips_qemu_mips - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/mips/startup.S --kernel_exec_SOURCES += kern/mips/qemu_mips/init.c term/ns8250.c term/serial.c term/at_keyboard.c term/ps2.c commands/boot.c commands/keylayouts.c term/i386/pc/vga_text.c kern/vga_init.c kern/generic/rtc_get_time_ms.c kern/mips/cache.S kern/mips/dl.c kern/mips/init.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/mips/qemu_mips/init.c term/ns8250.c term/serial.c term/at_keyboard.c term/ps2.c commands/boot.c commands/keylayouts.c term/i386/pc/vga_text.c kern/vga_init.c kern/generic/rtc_get_time_ms.c kern/mips/cache.S kern/mips/dl.c kern/mips/init.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22751,7 +22731,7 @@ endif - if COND_arm_uboot - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/arm/startup.S --kernel_exec_SOURCES += kern/arm/uboot/init.c kern/arm/uboot/uboot.S disk/uboot/ubootdisk.c kern/uboot/uboot.c kern/uboot/init.c kern/uboot/hw.c term/uboot/console.c kern/arm/dl.c kern/arm/dl_helper.c kern/arm/cache_armv6.S kern/arm/cache_armv7.S kern/arm/cache.c kern/arm/compiler-rt.S lib/division.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/arm/uboot/init.c kern/arm/uboot/uboot.S disk/uboot/ubootdisk.c kern/uboot/uboot.c kern/uboot/init.c kern/uboot/hw.c term/uboot/console.c kern/arm/dl.c kern/arm/dl_helper.c kern/arm/cache_armv6.S kern/arm/cache_armv7.S kern/arm/cache.c kern/arm/compiler-rt.S lib/division.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22773,7 +22753,7 @@ endif - if COND_arm_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/arm/efi/startup.S --kernel_exec_SOURCES += kern/arm/efi/init.c kern/efi/fdt.c kern/arm/dl.c kern/arm/dl_helper.c kern/arm/cache_armv6.S kern/arm/cache_armv7.S kern/arm/cache.c kern/arm/compiler-rt.S lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/arm/efi/init.c kern/efi/fdt.c kern/arm/dl.c kern/arm/dl_helper.c kern/arm/cache_armv6.S kern/arm/cache_armv7.S kern/arm/cache.c kern/arm/compiler-rt.S lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22795,7 +22775,7 @@ endif - if COND_arm64_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/arm64/efi/startup.S --kernel_exec_SOURCES += kern/arm64/efi/init.c kern/efi/fdt.c kern/arm64/cache.c kern/arm64/cache_flush.S kern/arm64/dl.c kern/arm64/dl_helper.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/arm64/efi/init.c kern/efi/fdt.c kern/arm64/cache.c kern/arm64/cache_flush.S kern/arm64/dl.c kern/arm64/dl_helper.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22817,7 +22797,7 @@ endif - if COND_arm_coreboot - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/arm/startup.S --kernel_exec_SOURCES += kern/arm/coreboot/init.c kern/arm/coreboot/timer.c kern/arm/coreboot/coreboot.S lib/fdt.c bus/fdt.c term/ps2.c term/arm/pl050.c term/arm/cros.c term/arm/cros_ec.c bus/spi/rk3288_spi.c commands/keylayouts.c kern/arm/coreboot/dma.c kern/arm/coreboot/cbtable.c video/coreboot/cbfb.c kern/coreboot/mmap.c kern/coreboot/cbtable.c term/gfxterm.c font/font.c font/font_cmd.c io/bufio.c video/fb/fbblit.c video/fb/fbfill.c video/fb/fbutil.c video/fb/video_fb.c video/video.c kern/arm/dl.c kern/arm/dl_helper.c kern/arm/cache_armv6.S kern/arm/cache_armv7.S kern/arm/cache.c kern/arm/compiler-rt.S lib/division.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/arm/coreboot/init.c kern/arm/coreboot/timer.c kern/arm/coreboot/coreboot.S lib/fdt.c bus/fdt.c term/ps2.c term/arm/pl050.c term/arm/cros.c term/arm/cros_ec.c bus/spi/rk3288_spi.c commands/keylayouts.c kern/arm/coreboot/dma.c kern/arm/coreboot/cbtable.c video/coreboot/cbfb.c kern/coreboot/mmap.c kern/coreboot/cbtable.c term/gfxterm.c font/font.c font/font_cmd.c io/bufio.c video/fb/fbblit.c video/fb/fbfill.c video/fb/fbutil.c video/fb/video_fb.c video/video.c kern/arm/dl.c kern/arm/dl_helper.c kern/arm/cache_armv6.S kern/arm/cache_armv7.S kern/arm/cache.c kern/arm/compiler-rt.S lib/division.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22839,7 +22819,7 @@ endif - if COND_riscv32_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/riscv/efi/startup.S --kernel_exec_SOURCES += kern/riscv/efi/init.c kern/efi/fdt.c kern/riscv/cache.c kern/riscv/cache_flush.S kern/riscv/dl.c lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/riscv/efi/init.c kern/efi/fdt.c kern/riscv/cache.c kern/riscv/cache_flush.S kern/riscv/dl.c lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22861,7 +22841,7 @@ endif - if COND_riscv64_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/riscv/efi/startup.S --kernel_exec_SOURCES += kern/riscv/efi/init.c kern/efi/fdt.c kern/riscv/cache.c kern/riscv/cache_flush.S kern/riscv/dl.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/riscv/efi/init.c kern/efi/fdt.c kern/riscv/cache.c kern/riscv/cache_flush.S kern/riscv/dl.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index abd26cf..f6c0348 100644 ---- a/grub-core/Makefile.core.def -+++ b/grub-core/Makefile.core.def -@@ -140,6 +140,7 @@ kernel = { - common = kern/rescue_parser.c; - common = kern/rescue_reader.c; - common = kern/term.c; -+ common = kern/verifiers.c; - - noemu = kern/compiler-rt.c; - noemu = kern/mm.c; -@@ -943,11 +944,6 @@ module = { - cppflags = '-I$(srcdir)/lib/posix_wrap'; - }; - --module = { -- name = verifiers; -- common = commands/verifiers.c; --}; -- - module = { - name = shim_lock; - common = commands/efi/shim_lock.c; -diff --git a/grub-core/Makefile.in b/grub-core/Makefile.in -index 8fb81ee..8930714 100644 ---- a/grub-core/Makefile.in -+++ b/grub-core/Makefile.in -@@ -202,39 +202,39 @@ platform_PROGRAMS = disk.module$(EXEEXT) trig.module$(EXEEXT) \ - $(am__EXEEXT_286) $(am__EXEEXT_287) $(am__EXEEXT_288) \ - $(am__EXEEXT_289) $(am__EXEEXT_290) $(am__EXEEXT_291) \ - $(am__EXEEXT_292) hashsum.module$(EXEEXT) pgp.module$(EXEEXT) \ -- verifiers.module$(EXEEXT) $(am__EXEEXT_293) $(am__EXEEXT_294) \ -- $(am__EXEEXT_295) $(am__EXEEXT_296) $(am__EXEEXT_297) \ -- $(am__EXEEXT_298) $(am__EXEEXT_299) $(am__EXEEXT_300) \ -- $(am__EXEEXT_301) $(am__EXEEXT_302) help.module$(EXEEXT) \ -- hexdump.module$(EXEEXT) keystatus.module$(EXEEXT) \ -- $(am__EXEEXT_303) $(am__EXEEXT_304) loadenv.module$(EXEEXT) \ -- ls.module$(EXEEXT) lsmmap.module$(EXEEXT) $(am__EXEEXT_305) \ -- $(am__EXEEXT_306) $(am__EXEEXT_307) $(am__EXEEXT_308) \ -- $(am__EXEEXT_309) $(am__EXEEXT_310) $(am__EXEEXT_311) \ -- $(am__EXEEXT_312) memrw.module$(EXEEXT) \ -- minicmd.module$(EXEEXT) parttool.module$(EXEEXT) \ -- password.module$(EXEEXT) password_pbkdf2.module$(EXEEXT) \ -- $(am__EXEEXT_313) $(am__EXEEXT_314) $(am__EXEEXT_315) \ -- $(am__EXEEXT_316) $(am__EXEEXT_317) $(am__EXEEXT_318) \ -- $(am__EXEEXT_319) $(am__EXEEXT_320) $(am__EXEEXT_321) \ -- $(am__EXEEXT_322) $(am__EXEEXT_323) $(am__EXEEXT_324) \ -- $(am__EXEEXT_325) $(am__EXEEXT_326) $(am__EXEEXT_327) \ -- $(am__EXEEXT_328) $(am__EXEEXT_329) $(am__EXEEXT_330) \ -- $(am__EXEEXT_331) $(am__EXEEXT_332) $(am__EXEEXT_333) \ -- probe.module$(EXEEXT) read.module$(EXEEXT) \ -- search.module$(EXEEXT) search_fs_file.module$(EXEEXT) \ -- search_fs_uuid.module$(EXEEXT) search_label.module$(EXEEXT) \ -- $(am__EXEEXT_334) $(am__EXEEXT_335) $(am__EXEEXT_336) \ -- $(am__EXEEXT_337) $(am__EXEEXT_338) $(am__EXEEXT_339) \ -- $(am__EXEEXT_340) $(am__EXEEXT_341) $(am__EXEEXT_342) \ -- $(am__EXEEXT_343) $(am__EXEEXT_344) $(am__EXEEXT_345) \ -- $(am__EXEEXT_346) $(am__EXEEXT_347) $(am__EXEEXT_348) \ -- $(am__EXEEXT_349) sleep.module$(EXEEXT) $(am__EXEEXT_350) \ -- $(am__EXEEXT_351) terminal.module$(EXEEXT) \ -- test.module$(EXEEXT) true.module$(EXEEXT) $(am__EXEEXT_352) \ -- $(am__EXEEXT_353) $(am__EXEEXT_354) $(am__EXEEXT_355) \ -- $(am__EXEEXT_356) $(am__EXEEXT_357) $(am__EXEEXT_358) \ -- $(am__EXEEXT_359) $(am__EXEEXT_360) videoinfo.module$(EXEEXT) \ -+ $(am__EXEEXT_293) $(am__EXEEXT_294) $(am__EXEEXT_295) \ -+ $(am__EXEEXT_296) $(am__EXEEXT_297) $(am__EXEEXT_298) \ -+ $(am__EXEEXT_299) $(am__EXEEXT_300) $(am__EXEEXT_301) \ -+ $(am__EXEEXT_302) help.module$(EXEEXT) hexdump.module$(EXEEXT) \ -+ keystatus.module$(EXEEXT) $(am__EXEEXT_303) $(am__EXEEXT_304) \ -+ loadenv.module$(EXEEXT) ls.module$(EXEEXT) \ -+ lsmmap.module$(EXEEXT) $(am__EXEEXT_305) $(am__EXEEXT_306) \ -+ $(am__EXEEXT_307) $(am__EXEEXT_308) $(am__EXEEXT_309) \ -+ $(am__EXEEXT_310) $(am__EXEEXT_311) $(am__EXEEXT_312) \ -+ memrw.module$(EXEEXT) minicmd.module$(EXEEXT) \ -+ parttool.module$(EXEEXT) password.module$(EXEEXT) \ -+ password_pbkdf2.module$(EXEEXT) $(am__EXEEXT_313) \ -+ $(am__EXEEXT_314) $(am__EXEEXT_315) $(am__EXEEXT_316) \ -+ $(am__EXEEXT_317) $(am__EXEEXT_318) $(am__EXEEXT_319) \ -+ $(am__EXEEXT_320) $(am__EXEEXT_321) $(am__EXEEXT_322) \ -+ $(am__EXEEXT_323) $(am__EXEEXT_324) $(am__EXEEXT_325) \ -+ $(am__EXEEXT_326) $(am__EXEEXT_327) $(am__EXEEXT_328) \ -+ $(am__EXEEXT_329) $(am__EXEEXT_330) $(am__EXEEXT_331) \ -+ $(am__EXEEXT_332) $(am__EXEEXT_333) probe.module$(EXEEXT) \ -+ read.module$(EXEEXT) search.module$(EXEEXT) \ -+ search_fs_file.module$(EXEEXT) search_fs_uuid.module$(EXEEXT) \ -+ search_label.module$(EXEEXT) $(am__EXEEXT_334) \ -+ $(am__EXEEXT_335) $(am__EXEEXT_336) $(am__EXEEXT_337) \ -+ $(am__EXEEXT_338) $(am__EXEEXT_339) $(am__EXEEXT_340) \ -+ $(am__EXEEXT_341) $(am__EXEEXT_342) $(am__EXEEXT_343) \ -+ $(am__EXEEXT_344) $(am__EXEEXT_345) $(am__EXEEXT_346) \ -+ $(am__EXEEXT_347) $(am__EXEEXT_348) $(am__EXEEXT_349) \ -+ sleep.module$(EXEEXT) $(am__EXEEXT_350) $(am__EXEEXT_351) \ -+ terminal.module$(EXEEXT) test.module$(EXEEXT) \ -+ true.module$(EXEEXT) $(am__EXEEXT_352) $(am__EXEEXT_353) \ -+ $(am__EXEEXT_354) $(am__EXEEXT_355) $(am__EXEEXT_356) \ -+ $(am__EXEEXT_357) $(am__EXEEXT_358) $(am__EXEEXT_359) \ -+ $(am__EXEEXT_360) videoinfo.module$(EXEEXT) \ - videotest.module$(EXEEXT) xnu_uuid.module$(EXEEXT) \ - dm_nv.module$(EXEEXT) loopback.module$(EXEEXT) \ - cryptodisk.module$(EXEEXT) luks.module$(EXEEXT) \ -@@ -10474,7 +10474,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c \ - kern/misc.c kern/parser.c kern/partition.c \ - kern/rescue_parser.c kern/rescue_reader.c kern/term.c \ -- kern/arm/startup.S kern/arm/coreboot/init.c \ -+ kern/verifiers.c kern/arm/startup.S kern/arm/coreboot/init.c \ - kern/arm/coreboot/timer.c kern/arm/coreboot/coreboot.S \ - lib/fdt.c bus/fdt.c term/ps2.c term/arm/pl050.c \ - term/arm/cros.c term/arm/cros_ec.c bus/spi/rk3288_spi.c \ -@@ -10564,7 +10564,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEXT) \ --@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_TRUE@ kern/kernel_exec-term.$(OBJEXT) -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_TRUE@ kern/kernel_exec-term.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@am_kernel_exec_OBJECTS = kern/x86_64/efi/kernel_exec-startup.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/i386/efi/kernel_exec-tsc.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/i386/kernel_exec-tsc_pmtimer.$(OBJEXT) \ -@@ -10602,7 +10603,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEXT) \ --@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-term.$(OBJEXT) -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-term.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_TRUE@am_kernel_exec_OBJECTS = kern/sparc64/ieee1275/kernel_exec-crt0.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_TRUE@ kern/sparc64/kernel_exec-cache.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_TRUE@ kern/sparc64/kernel_exec-dl.$(OBJEXT) \ -@@ -10639,7 +10641,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEXT) \ --@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_TRUE@ kern/kernel_exec-term.$(OBJEXT) -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_TRUE@ kern/kernel_exec-term.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@am_kernel_exec_OBJECTS = kern/riscv/efi/kernel_exec-startup.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/riscv/efi/kernel_exec-init.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/efi/kernel_exec-fdt.$(OBJEXT) \ -@@ -10674,7 +10677,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEXT) \ --@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-term.$(OBJEXT) -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-term.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@am_kernel_exec_OBJECTS = kern/riscv/efi/kernel_exec-startup.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/riscv/efi/kernel_exec-init.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/efi/kernel_exec-fdt.$(OBJEXT) \ -@@ -10710,7 +10714,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEXT) \ --@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-term.$(OBJEXT) -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-term.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_TRUE@am_kernel_exec_OBJECTS = kern/powerpc/ieee1275/kernel_exec-startup.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_TRUE@ kern/powerpc/kernel_exec-cache.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_TRUE@ kern/powerpc/kernel_exec-dl.$(OBJEXT) \ -@@ -10746,7 +10751,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEXT) \ --@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_TRUE@ kern/kernel_exec-term.$(OBJEXT) -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_TRUE@ kern/kernel_exec-term.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_TRUE@am_kernel_exec_OBJECTS = kern/mips/kernel_exec-startup.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_TRUE@ kern/mips/qemu_mips/kernel_exec-init.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_TRUE@ term/kernel_exec-ns8250.$(OBJEXT) \ -@@ -10785,7 +10791,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEXT) \ --@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_TRUE@ kern/kernel_exec-term.$(OBJEXT) -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_TRUE@ kern/kernel_exec-term.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_TRUE@am_kernel_exec_OBJECTS = kern/mips/kernel_exec-startup.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_TRUE@ term/kernel_exec-ns8250.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_TRUE@ bus/kernel_exec-bonito.$(OBJEXT) \ -@@ -10838,7 +10845,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEXT) \ --@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_TRUE@ kern/kernel_exec-term.$(OBJEXT) -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_TRUE@ kern/kernel_exec-term.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_TRUE@am_kernel_exec_OBJECTS = kern/mips/kernel_exec-startup.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_TRUE@ kern/mips/arc/kernel_exec-init.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_TRUE@ term/arc/kernel_exec-console.$(OBJEXT) \ -@@ -10871,7 +10879,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEXT) \ --@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_TRUE@ kern/kernel_exec-term.$(OBJEXT) -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_TRUE@ kern/kernel_exec-term.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@am_kernel_exec_OBJECTS = kern/ia64/efi/kernel_exec-startup.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/ia64/efi/kernel_exec-init.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/ia64/kernel_exec-dl.$(OBJEXT) \ -@@ -10906,7 +10915,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEXT) \ --@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-term.$(OBJEXT) -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-term.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_TRUE@am_kernel_exec_OBJECTS = kern/i386/xen/kernel_exec-startup_pvh.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_TRUE@ kern/i386/kernel_exec-dl.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_TRUE@ commands/kernel_exec-boot.$(OBJEXT) \ -@@ -10940,7 +10950,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEXT) \ --@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_TRUE@ kern/kernel_exec-term.$(OBJEXT) -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_TRUE@ kern/kernel_exec-term.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_TRUE@am_kernel_exec_OBJECTS = kern/i386/xen/kernel_exec-startup.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_TRUE@ kern/i386/kernel_exec-dl.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_TRUE@ kern/i386/xen/kernel_exec-hypercall.$(OBJEXT) \ -@@ -10974,7 +10985,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEXT) \ --@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_TRUE@ kern/kernel_exec-term.$(OBJEXT) -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_TRUE@ kern/kernel_exec-term.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_TRUE@am_kernel_exec_OBJECTS = kern/i386/qemu/kernel_exec-startup.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_TRUE@ kern/i386/qemu/kernel_exec-init.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_TRUE@ bus/kernel_exec-pci.$(OBJEXT) \ -@@ -11004,7 +11016,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEXT) \ --@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_TRUE@ kern/kernel_exec-term.$(OBJEXT) -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_TRUE@ kern/kernel_exec-term.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_TRUE@am_kernel_exec_OBJECTS = kern/i386/pc/kernel_exec-startup.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_TRUE@ kern/i386/pc/kernel_exec-init.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_TRUE@ kern/i386/pc/kernel_exec-mmap.$(OBJEXT) \ -@@ -11032,7 +11045,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEXT) \ --@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_TRUE@ kern/kernel_exec-term.$(OBJEXT) -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_TRUE@ kern/kernel_exec-term.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_TRUE@am_kernel_exec_OBJECTS = kern/i386/coreboot/kernel_exec-startup.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_TRUE@ kern/i386/coreboot/kernel_exec-init.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_TRUE@ kern/i386/pc/kernel_exec-acpi.$(OBJEXT) \ -@@ -11062,7 +11076,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEXT) \ --@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_TRUE@ kern/kernel_exec-term.$(OBJEXT) -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_TRUE@ kern/kernel_exec-term.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_TRUE@am_kernel_exec_OBJECTS = kern/i386/ieee1275/kernel_exec-startup.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_TRUE@ disk/ieee1275/kernel_exec-ofdisk.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_TRUE@ kern/ieee1275/kernel_exec-cmain.$(OBJEXT) \ -@@ -11098,7 +11113,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEXT) \ --@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_TRUE@ kern/kernel_exec-term.$(OBJEXT) -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_TRUE@ kern/kernel_exec-term.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@am_kernel_exec_OBJECTS = kern/i386/efi/kernel_exec-startup.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/i386/efi/kernel_exec-tsc.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/i386/kernel_exec-tsc_pmtimer.$(OBJEXT) \ -@@ -11135,7 +11151,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEXT) \ --@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-term.$(OBJEXT) -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-term.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_TRUE@am_kernel_exec_OBJECTS = kern/i386/coreboot/kernel_exec-startup.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_TRUE@ kern/i386/coreboot/kernel_exec-init.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_TRUE@ kern/i386/pc/kernel_exec-acpi.$(OBJEXT) \ -@@ -11178,7 +11195,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEXT) \ --@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_TRUE@ kern/kernel_exec-term.$(OBJEXT) -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_TRUE@ kern/kernel_exec-term.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_TRUE@am_kernel_exec_OBJECTS = disk/kernel_exec-host.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_TRUE@ kern/emu/kernel_exec-cache_s.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_TRUE@ kern/emu/kernel_exec-hostdisk.$(OBJEXT) \ -@@ -11219,7 +11237,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEXT) \ --@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_TRUE@ kern/kernel_exec-term.$(OBJEXT) -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_TRUE@ kern/kernel_exec-term.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_TRUE@am_kernel_exec_OBJECTS = kern/arm/kernel_exec-startup.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_TRUE@ kern/arm/uboot/kernel_exec-init.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_TRUE@ kern/arm/uboot/kernel_exec-uboot.$(OBJEXT) \ -@@ -11259,7 +11278,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEXT) \ --@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_TRUE@ kern/kernel_exec-term.$(OBJEXT) -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_TRUE@ kern/kernel_exec-term.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@am_kernel_exec_OBJECTS = kern/arm/efi/kernel_exec-startup.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/arm/efi/kernel_exec-init.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/efi/kernel_exec-fdt.$(OBJEXT) \ -@@ -11298,7 +11318,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEXT) \ --@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-term.$(OBJEXT) -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-term.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_TRUE@am_kernel_exec_OBJECTS = kern/arm/kernel_exec-startup.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_TRUE@ kern/arm/coreboot/kernel_exec-init.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_TRUE@ kern/arm/coreboot/kernel_exec-timer.$(OBJEXT) \ -@@ -11352,7 +11373,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEXT) \ --@COND_arm64_efi_FALSE@@COND_arm_coreboot_TRUE@ kern/kernel_exec-term.$(OBJEXT) -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_TRUE@ kern/kernel_exec-term.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT) - @COND_arm64_efi_TRUE@am_kernel_exec_OBJECTS = kern/arm64/efi/kernel_exec-startup.$(OBJEXT) \ - @COND_arm64_efi_TRUE@ kern/arm64/efi/kernel_exec-init.$(OBJEXT) \ - @COND_arm64_efi_TRUE@ kern/efi/kernel_exec-fdt.$(OBJEXT) \ -@@ -11388,7 +11410,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \ - @COND_arm64_efi_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEXT) \ - @COND_arm64_efi_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEXT) \ --@COND_arm64_efi_TRUE@ kern/kernel_exec-term.$(OBJEXT) -+@COND_arm64_efi_TRUE@ kern/kernel_exec-term.$(OBJEXT) \ -+@COND_arm64_efi_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_TRUE@nodist_kernel_exec_OBJECTS = kernel_exec-symlist.$(OBJEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@nodist_kernel_exec_OBJECTS = kernel_exec-symlist.$(OBJEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_TRUE@nodist_kernel_exec_OBJECTS = kernel_exec-symlist.$(OBJEXT) -@@ -13146,13 +13169,6 @@ vbe_module_OBJECTS = $(am_vbe_module_OBJECTS) \ - $(nodist_vbe_module_OBJECTS) - vbe_module_LINK = $(CCLD) $(vbe_module_CFLAGS) $(CFLAGS) \ - $(vbe_module_LDFLAGS) $(LDFLAGS) -o $@ --am_verifiers_module_OBJECTS = \ -- commands/verifiers_module-verifiers.$(OBJEXT) --nodist_verifiers_module_OBJECTS = --verifiers_module_OBJECTS = $(am_verifiers_module_OBJECTS) \ -- $(nodist_verifiers_module_OBJECTS) --verifiers_module_LINK = $(CCLD) $(verifiers_module_CFLAGS) $(CFLAGS) \ -- $(verifiers_module_LDFLAGS) $(LDFLAGS) -o $@ - am__vga_module_SOURCES_DIST = video/i386/pc/vga.c - @COND_i386_pc_TRUE@am_vga_module_OBJECTS = \ - @COND_i386_pc_TRUE@ video/i386/pc/vga_module-vga.$(OBJEXT) -@@ -13879,7 +13895,6 @@ SOURCES = $(acpi_module_SOURCES) $(nodist_acpi_module_SOURCES) \ - $(nodist_usbserial_usbdebug_module_SOURCES) \ - $(usbtest_module_SOURCES) $(nodist_usbtest_module_SOURCES) \ - $(vbe_module_SOURCES) $(nodist_vbe_module_SOURCES) \ -- $(verifiers_module_SOURCES) $(nodist_verifiers_module_SOURCES) \ - $(vga_module_SOURCES) $(nodist_vga_module_SOURCES) \ - $(vga_text_module_SOURCES) $(nodist_vga_text_module_SOURCES) \ - $(video_module_SOURCES) $(nodist_video_module_SOURCES) \ -@@ -14089,8 +14104,7 @@ DIST_SOURCES = $(am__acpi_module_SOURCES_DIST) \ - $(am__usbserial_pl2303_module_SOURCES_DIST) \ - $(am__usbserial_usbdebug_module_SOURCES_DIST) \ - $(am__usbtest_module_SOURCES_DIST) \ -- $(am__vbe_module_SOURCES_DIST) $(verifiers_module_SOURCES) \ -- $(am__vga_module_SOURCES_DIST) \ -+ $(am__vbe_module_SOURCES_DIST) $(am__vga_module_SOURCES_DIST) \ - $(am__vga_text_module_SOURCES_DIST) \ - $(am__video_module_SOURCES_DIST) \ - $(am__video_bochs_module_SOURCES_DIST) \ -@@ -15497,38 +15511,38 @@ MOD_FILES = disk.mod trig.mod $(am__append_8) $(am__append_15) \ - $(am__append_1989) $(am__append_1996) $(am__append_2003) \ - $(am__append_2010) $(am__append_2017) $(am__append_2024) \ - $(am__append_2031) $(am__append_2038) hashsum.mod pgp.mod \ -- verifiers.mod $(am__append_2045) $(am__append_2052) \ -- $(am__append_2059) $(am__append_2066) $(am__append_2073) \ -- $(am__append_2080) $(am__append_2087) $(am__append_2094) \ -- $(am__append_2101) $(am__append_2108) help.mod hexdump.mod \ -- keystatus.mod $(am__append_2115) $(am__append_2122) \ -- loadenv.mod ls.mod lsmmap.mod $(am__append_2129) \ -- $(am__append_2136) $(am__append_2143) $(am__append_2150) \ -- $(am__append_2157) $(am__append_2164) $(am__append_2171) \ -- $(am__append_2178) memrw.mod minicmd.mod parttool.mod \ -- password.mod password_pbkdf2.mod $(am__append_2185) \ -- $(am__append_2192) $(am__append_2199) $(am__append_2206) \ -- $(am__append_2213) $(am__append_2220) $(am__append_2227) \ -- $(am__append_2234) $(am__append_2241) $(am__append_2248) \ -- $(am__append_2255) $(am__append_2262) $(am__append_2269) \ -- $(am__append_2276) $(am__append_2283) $(am__append_2290) \ -- $(am__append_2297) $(am__append_2304) $(am__append_2311) \ -- $(am__append_2318) $(am__append_2325) probe.mod read.mod \ -- search.mod search_fs_file.mod search_fs_uuid.mod \ -- search_label.mod $(am__append_2332) $(am__append_2339) \ -- $(am__append_2346) $(am__append_2353) $(am__append_2360) \ -- $(am__append_2367) $(am__append_2374) $(am__append_2381) \ -- $(am__append_2388) $(am__append_2395) $(am__append_2402) \ -- $(am__append_2409) $(am__append_2416) $(am__append_2423) \ -- $(am__append_2430) $(am__append_2437) sleep.mod \ -- $(am__append_2444) $(am__append_2451) terminal.mod test.mod \ -- true.mod $(am__append_2458) $(am__append_2465) \ -- $(am__append_2472) $(am__append_2479) $(am__append_2486) \ -- $(am__append_2493) $(am__append_2500) $(am__append_2507) \ -- $(am__append_2514) videoinfo.mod videotest.mod xnu_uuid.mod \ -- dm_nv.mod loopback.mod cryptodisk.mod luks.mod geli.mod \ -- lvm.mod ldm.mod mdraid09.mod mdraid09_be.mod mdraid1x.mod \ -- diskfilter.mod raid5rec.mod raid6rec.mod scsi.mod memdisk.mod \ -+ $(am__append_2045) $(am__append_2052) $(am__append_2059) \ -+ $(am__append_2066) $(am__append_2073) $(am__append_2080) \ -+ $(am__append_2087) $(am__append_2094) $(am__append_2101) \ -+ $(am__append_2108) help.mod hexdump.mod keystatus.mod \ -+ $(am__append_2115) $(am__append_2122) loadenv.mod ls.mod \ -+ lsmmap.mod $(am__append_2129) $(am__append_2136) \ -+ $(am__append_2143) $(am__append_2150) $(am__append_2157) \ -+ $(am__append_2164) $(am__append_2171) $(am__append_2178) \ -+ memrw.mod minicmd.mod parttool.mod password.mod \ -+ password_pbkdf2.mod $(am__append_2185) $(am__append_2192) \ -+ $(am__append_2199) $(am__append_2206) $(am__append_2213) \ -+ $(am__append_2220) $(am__append_2227) $(am__append_2234) \ -+ $(am__append_2241) $(am__append_2248) $(am__append_2255) \ -+ $(am__append_2262) $(am__append_2269) $(am__append_2276) \ -+ $(am__append_2283) $(am__append_2290) $(am__append_2297) \ -+ $(am__append_2304) $(am__append_2311) $(am__append_2318) \ -+ $(am__append_2325) probe.mod read.mod search.mod \ -+ search_fs_file.mod search_fs_uuid.mod search_label.mod \ -+ $(am__append_2332) $(am__append_2339) $(am__append_2346) \ -+ $(am__append_2353) $(am__append_2360) $(am__append_2367) \ -+ $(am__append_2374) $(am__append_2381) $(am__append_2388) \ -+ $(am__append_2395) $(am__append_2402) $(am__append_2409) \ -+ $(am__append_2416) $(am__append_2423) $(am__append_2430) \ -+ $(am__append_2437) sleep.mod $(am__append_2444) \ -+ $(am__append_2451) terminal.mod test.mod true.mod \ -+ $(am__append_2458) $(am__append_2465) $(am__append_2472) \ -+ $(am__append_2479) $(am__append_2486) $(am__append_2493) \ -+ $(am__append_2500) $(am__append_2507) $(am__append_2514) \ -+ videoinfo.mod videotest.mod xnu_uuid.mod dm_nv.mod \ -+ loopback.mod cryptodisk.mod luks.mod geli.mod lvm.mod ldm.mod \ -+ mdraid09.mod mdraid09_be.mod mdraid1x.mod diskfilter.mod \ -+ raid5rec.mod raid6rec.mod scsi.mod memdisk.mod \ - $(am__append_2521) $(am__append_2528) $(am__append_2535) \ - $(am__append_2542) $(am__append_2549) $(am__append_2556) \ - $(am__append_2563) $(am__append_2570) $(am__append_2577) \ -@@ -15809,8 +15823,7 @@ MODULE_FILES = disk.module$(EXEEXT) trig.module$(EXEEXT) \ - $(am__append_1978) $(am__append_1985) $(am__append_1992) \ - $(am__append_1999) $(am__append_2006) $(am__append_2013) \ - $(am__append_2020) $(am__append_2027) $(am__append_2034) \ -- hashsum.module$(EXEEXT) pgp.module$(EXEEXT) \ -- verifiers.module$(EXEEXT) $(am__append_2041) \ -+ hashsum.module$(EXEEXT) pgp.module$(EXEEXT) $(am__append_2041) \ - $(am__append_2048) $(am__append_2055) $(am__append_2062) \ - $(am__append_2069) $(am__append_2076) $(am__append_2083) \ - $(am__append_2090) $(am__append_2097) $(am__append_2104) \ -@@ -16164,7 +16177,7 @@ MARKER_FILES = disk.marker trig.marker $(am__append_9) \ - $(am__append_1983) $(am__append_1990) $(am__append_1997) \ - $(am__append_2004) $(am__append_2011) $(am__append_2018) \ - $(am__append_2025) $(am__append_2032) $(am__append_2039) \ -- hashsum.marker pgp.marker verifiers.marker $(am__append_2046) \ -+ hashsum.marker pgp.marker $(am__append_2046) \ - $(am__append_2053) $(am__append_2060) $(am__append_2067) \ - $(am__append_2074) $(am__append_2081) $(am__append_2088) \ - $(am__append_2095) $(am__append_2102) $(am__append_2109) \ -@@ -16403,6 +16416,7 @@ KERNEL_HEADER_FILES = $(top_srcdir)/include/grub/cache.h \ - $(top_srcdir)/include/grub/partition.h \ - $(top_srcdir)/include/grub/term.h \ - $(top_srcdir)/include/grub/time.h \ -+ $(top_srcdir)/include/grub/verify.h \ - $(top_srcdir)/include/grub/mm_private.h \ - $(top_srcdir)/include/grub/net.h \ - $(top_srcdir)/include/grub/memory.h $(am__append_5803) \ -@@ -16845,12 +16859,11 @@ CLEANFILES = build-grub-pep2elf$(BUILD_EXEEXT) \ - $(am__append_2009) $(am__append_2016) $(am__append_2023) \ - $(am__append_2030) $(am__append_2037) \ - $(nodist_hashsum_module_SOURCES) hashsum.marker \ -- $(nodist_pgp_module_SOURCES) pgp.marker \ -- $(nodist_verifiers_module_SOURCES) verifiers.marker \ -- $(am__append_2044) $(am__append_2051) $(am__append_2058) \ -- $(am__append_2065) $(am__append_2072) $(am__append_2079) \ -- $(am__append_2086) $(am__append_2093) $(am__append_2100) \ -- $(am__append_2107) $(nodist_help_module_SOURCES) help.marker \ -+ $(nodist_pgp_module_SOURCES) pgp.marker $(am__append_2044) \ -+ $(am__append_2051) $(am__append_2058) $(am__append_2065) \ -+ $(am__append_2072) $(am__append_2079) $(am__append_2086) \ -+ $(am__append_2093) $(am__append_2100) $(am__append_2107) \ -+ $(nodist_help_module_SOURCES) help.marker \ - $(nodist_hexdump_module_SOURCES) hexdump.marker \ - $(nodist_keystatus_module_SOURCES) keystatus.marker \ - $(am__append_2114) $(am__append_2121) \ -@@ -17313,11 +17326,11 @@ BUILT_SOURCES = $(nodist_disk_module_SOURCES) \ - $(am__append_2001) $(am__append_2008) $(am__append_2015) \ - $(am__append_2022) $(am__append_2029) $(am__append_2036) \ - $(nodist_hashsum_module_SOURCES) $(nodist_pgp_module_SOURCES) \ -- $(nodist_verifiers_module_SOURCES) $(am__append_2043) \ -- $(am__append_2050) $(am__append_2057) $(am__append_2064) \ -- $(am__append_2071) $(am__append_2078) $(am__append_2085) \ -- $(am__append_2092) $(am__append_2099) $(am__append_2106) \ -- $(nodist_help_module_SOURCES) $(nodist_hexdump_module_SOURCES) \ -+ $(am__append_2043) $(am__append_2050) $(am__append_2057) \ -+ $(am__append_2064) $(am__append_2071) $(am__append_2078) \ -+ $(am__append_2085) $(am__append_2092) $(am__append_2099) \ -+ $(am__append_2106) $(nodist_help_module_SOURCES) \ -+ $(nodist_hexdump_module_SOURCES) \ - $(nodist_keystatus_module_SOURCES) $(am__append_2113) \ - $(am__append_2120) $(nodist_loadenv_module_SOURCES) \ - $(nodist_ls_module_SOURCES) $(nodist_lsmmap_module_SOURCES) \ -@@ -20070,14 +20083,6 @@ pgp_module_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_MODULE) - pgp_module_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_MODULE) -I$(srcdir)/lib/posix_wrap - pgp_module_CCASFLAGS = $(AM_CCASFLAGS) $(CCASFLAGS_MODULE) - pgp_module_DEPENDENCIES = $(TARGET_OBJ2ELF) --verifiers_module_SOURCES = commands/verifiers.c ## platform sources --nodist_verifiers_module_SOURCES = ## platform nodist sources --verifiers_module_LDADD = --verifiers_module_CFLAGS = $(AM_CFLAGS) $(CFLAGS_MODULE) --verifiers_module_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_MODULE) --verifiers_module_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_MODULE) --verifiers_module_CCASFLAGS = $(AM_CCASFLAGS) $(CCASFLAGS_MODULE) --verifiers_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_x86_64_efi_TRUE@shim_lock_module_SOURCES = commands/efi/shim_lock.c ## platform sources - @COND_x86_64_efi_TRUE@nodist_shim_lock_module_SOURCES = ## platform nodist sources - @COND_x86_64_efi_TRUE@shim_lock_module_LDADD = -@@ -25629,7 +25634,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_arm64_efi_TRUE@ kern/file.c kern/fs.c kern/list.c \ - @COND_arm64_efi_TRUE@ kern/main.c kern/misc.c kern/parser.c \ - @COND_arm64_efi_TRUE@ kern/partition.c kern/rescue_parser.c \ --@COND_arm64_efi_TRUE@ kern/rescue_reader.c kern/term.c -+@COND_arm64_efi_TRUE@ kern/rescue_reader.c kern/term.c \ -+@COND_arm64_efi_TRUE@ kern/verifiers.c - @COND_arm_coreboot_TRUE@kernel_exec_SOURCES = kern/arm/startup.S \ - @COND_arm_coreboot_TRUE@ kern/arm/coreboot/init.c \ - @COND_arm_coreboot_TRUE@ kern/arm/coreboot/timer.c \ -@@ -25660,7 +25666,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_arm_coreboot_TRUE@ kern/fs.c kern/list.c kern/main.c \ - @COND_arm_coreboot_TRUE@ kern/misc.c kern/parser.c \ - @COND_arm_coreboot_TRUE@ kern/partition.c kern/rescue_parser.c \ --@COND_arm_coreboot_TRUE@ kern/rescue_reader.c kern/term.c -+@COND_arm_coreboot_TRUE@ kern/rescue_reader.c kern/term.c \ -+@COND_arm_coreboot_TRUE@ kern/verifiers.c - @COND_arm_efi_TRUE@kernel_exec_SOURCES = kern/arm/efi/startup.S \ - @COND_arm_efi_TRUE@ kern/arm/efi/init.c kern/efi/fdt.c \ - @COND_arm_efi_TRUE@ kern/arm/dl.c kern/arm/dl_helper.c \ -@@ -25678,7 +25685,7 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_arm_efi_TRUE@ kern/fs.c kern/list.c kern/main.c \ - @COND_arm_efi_TRUE@ kern/misc.c kern/parser.c kern/partition.c \ - @COND_arm_efi_TRUE@ kern/rescue_parser.c kern/rescue_reader.c \ --@COND_arm_efi_TRUE@ kern/term.c -+@COND_arm_efi_TRUE@ kern/term.c kern/verifiers.c - @COND_arm_uboot_TRUE@kernel_exec_SOURCES = kern/arm/startup.S \ - @COND_arm_uboot_TRUE@ kern/arm/uboot/init.c \ - @COND_arm_uboot_TRUE@ kern/arm/uboot/uboot.S \ -@@ -25698,7 +25705,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_arm_uboot_TRUE@ kern/file.c kern/fs.c kern/list.c \ - @COND_arm_uboot_TRUE@ kern/main.c kern/misc.c kern/parser.c \ - @COND_arm_uboot_TRUE@ kern/partition.c kern/rescue_parser.c \ --@COND_arm_uboot_TRUE@ kern/rescue_reader.c kern/term.c -+@COND_arm_uboot_TRUE@ kern/rescue_reader.c kern/term.c \ -+@COND_arm_uboot_TRUE@ kern/verifiers.c - @COND_emu_TRUE@kernel_exec_SOURCES = disk/host.c kern/emu/cache_s.S \ - @COND_emu_TRUE@ kern/emu/hostdisk.c osdep/unix/hostdisk.c \ - @COND_emu_TRUE@ osdep/exec.c osdep/devmapper/hostdisk.c \ -@@ -25714,7 +25722,7 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_emu_TRUE@ kern/fs.c kern/list.c kern/main.c kern/misc.c \ - @COND_emu_TRUE@ kern/parser.c kern/partition.c \ - @COND_emu_TRUE@ kern/rescue_parser.c kern/rescue_reader.c \ --@COND_emu_TRUE@ kern/term.c -+@COND_emu_TRUE@ kern/term.c kern/verifiers.c - @COND_i386_coreboot_TRUE@kernel_exec_SOURCES = \ - @COND_i386_coreboot_TRUE@ kern/i386/coreboot/startup.S \ - @COND_i386_coreboot_TRUE@ kern/i386/coreboot/init.c \ -@@ -25739,7 +25747,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_i386_coreboot_TRUE@ kern/fs.c kern/list.c kern/main.c \ - @COND_i386_coreboot_TRUE@ kern/misc.c kern/parser.c \ - @COND_i386_coreboot_TRUE@ kern/partition.c kern/rescue_parser.c \ --@COND_i386_coreboot_TRUE@ kern/rescue_reader.c kern/term.c -+@COND_i386_coreboot_TRUE@ kern/rescue_reader.c kern/term.c \ -+@COND_i386_coreboot_TRUE@ kern/verifiers.c - @COND_i386_efi_TRUE@kernel_exec_SOURCES = kern/i386/efi/startup.S \ - @COND_i386_efi_TRUE@ kern/i386/efi/tsc.c \ - @COND_i386_efi_TRUE@ kern/i386/tsc_pmtimer.c \ -@@ -25756,7 +25765,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_i386_efi_TRUE@ kern/file.c kern/fs.c kern/list.c \ - @COND_i386_efi_TRUE@ kern/main.c kern/misc.c kern/parser.c \ - @COND_i386_efi_TRUE@ kern/partition.c kern/rescue_parser.c \ --@COND_i386_efi_TRUE@ kern/rescue_reader.c kern/term.c -+@COND_i386_efi_TRUE@ kern/rescue_reader.c kern/term.c \ -+@COND_i386_efi_TRUE@ kern/verifiers.c - @COND_i386_ieee1275_TRUE@kernel_exec_SOURCES = \ - @COND_i386_ieee1275_TRUE@ kern/i386/ieee1275/startup.S \ - @COND_i386_ieee1275_TRUE@ disk/ieee1275/ofdisk.c \ -@@ -25777,7 +25787,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_i386_ieee1275_TRUE@ kern/fs.c kern/list.c kern/main.c \ - @COND_i386_ieee1275_TRUE@ kern/misc.c kern/parser.c \ - @COND_i386_ieee1275_TRUE@ kern/partition.c kern/rescue_parser.c \ --@COND_i386_ieee1275_TRUE@ kern/rescue_reader.c kern/term.c -+@COND_i386_ieee1275_TRUE@ kern/rescue_reader.c kern/term.c \ -+@COND_i386_ieee1275_TRUE@ kern/verifiers.c - @COND_i386_multiboot_TRUE@kernel_exec_SOURCES = \ - @COND_i386_multiboot_TRUE@ kern/i386/coreboot/startup.S \ - @COND_i386_multiboot_TRUE@ kern/i386/coreboot/init.c \ -@@ -25796,7 +25807,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_i386_multiboot_TRUE@ kern/misc.c kern/parser.c \ - @COND_i386_multiboot_TRUE@ kern/partition.c \ - @COND_i386_multiboot_TRUE@ kern/rescue_parser.c \ --@COND_i386_multiboot_TRUE@ kern/rescue_reader.c kern/term.c -+@COND_i386_multiboot_TRUE@ kern/rescue_reader.c kern/term.c \ -+@COND_i386_multiboot_TRUE@ kern/verifiers.c - @COND_i386_pc_TRUE@kernel_exec_SOURCES = kern/i386/pc/startup.S \ - @COND_i386_pc_TRUE@ kern/i386/pc/init.c kern/i386/pc/mmap.c \ - @COND_i386_pc_TRUE@ term/i386/pc/console.c kern/i386/dl.c \ -@@ -25808,7 +25820,7 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_i386_pc_TRUE@ kern/fs.c kern/list.c kern/main.c \ - @COND_i386_pc_TRUE@ kern/misc.c kern/parser.c kern/partition.c \ - @COND_i386_pc_TRUE@ kern/rescue_parser.c kern/rescue_reader.c \ --@COND_i386_pc_TRUE@ kern/term.c -+@COND_i386_pc_TRUE@ kern/term.c kern/verifiers.c - @COND_i386_qemu_TRUE@kernel_exec_SOURCES = kern/i386/qemu/startup.S \ - @COND_i386_qemu_TRUE@ kern/i386/qemu/init.c bus/pci.c \ - @COND_i386_qemu_TRUE@ kern/vga_init.c kern/i386/qemu/mmap.c \ -@@ -25821,7 +25833,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_i386_qemu_TRUE@ kern/file.c kern/fs.c kern/list.c \ - @COND_i386_qemu_TRUE@ kern/main.c kern/misc.c kern/parser.c \ - @COND_i386_qemu_TRUE@ kern/partition.c kern/rescue_parser.c \ --@COND_i386_qemu_TRUE@ kern/rescue_reader.c kern/term.c -+@COND_i386_qemu_TRUE@ kern/rescue_reader.c kern/term.c \ -+@COND_i386_qemu_TRUE@ kern/verifiers.c - @COND_i386_xen_TRUE@kernel_exec_SOURCES = kern/i386/xen/startup.S \ - @COND_i386_xen_TRUE@ kern/i386/dl.c kern/i386/xen/hypercall.S \ - @COND_i386_xen_TRUE@ kern/i386/tsc.c kern/i386/xen/tsc.c \ -@@ -25836,7 +25849,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_i386_xen_TRUE@ kern/file.c kern/fs.c kern/list.c \ - @COND_i386_xen_TRUE@ kern/main.c kern/misc.c kern/parser.c \ - @COND_i386_xen_TRUE@ kern/partition.c kern/rescue_parser.c \ --@COND_i386_xen_TRUE@ kern/rescue_reader.c kern/term.c -+@COND_i386_xen_TRUE@ kern/rescue_reader.c kern/term.c \ -+@COND_i386_xen_TRUE@ kern/verifiers.c - @COND_i386_xen_pvh_TRUE@kernel_exec_SOURCES = \ - @COND_i386_xen_pvh_TRUE@ kern/i386/xen/startup_pvh.S \ - @COND_i386_xen_pvh_TRUE@ kern/i386/dl.c commands/boot.c \ -@@ -25853,7 +25867,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_i386_xen_pvh_TRUE@ kern/fs.c kern/list.c kern/main.c \ - @COND_i386_xen_pvh_TRUE@ kern/misc.c kern/parser.c \ - @COND_i386_xen_pvh_TRUE@ kern/partition.c kern/rescue_parser.c \ --@COND_i386_xen_pvh_TRUE@ kern/rescue_reader.c kern/term.c -+@COND_i386_xen_pvh_TRUE@ kern/rescue_reader.c kern/term.c \ -+@COND_i386_xen_pvh_TRUE@ kern/verifiers.c - @COND_ia64_efi_TRUE@kernel_exec_SOURCES = kern/ia64/efi/startup.S \ - @COND_ia64_efi_TRUE@ kern/ia64/efi/init.c kern/ia64/dl.c \ - @COND_ia64_efi_TRUE@ kern/ia64/dl_helper.c kern/ia64/cache.c \ -@@ -25868,7 +25883,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_ia64_efi_TRUE@ kern/file.c kern/fs.c kern/list.c \ - @COND_ia64_efi_TRUE@ kern/main.c kern/misc.c kern/parser.c \ - @COND_ia64_efi_TRUE@ kern/partition.c kern/rescue_parser.c \ --@COND_ia64_efi_TRUE@ kern/rescue_reader.c kern/term.c -+@COND_ia64_efi_TRUE@ kern/rescue_reader.c kern/term.c \ -+@COND_ia64_efi_TRUE@ kern/verifiers.c - @COND_mips_arc_TRUE@kernel_exec_SOURCES = kern/mips/startup.S \ - @COND_mips_arc_TRUE@ kern/mips/arc/init.c term/arc/console.c \ - @COND_mips_arc_TRUE@ disk/arc/arcdisk.c \ -@@ -25883,7 +25899,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_mips_arc_TRUE@ kern/file.c kern/fs.c kern/list.c \ - @COND_mips_arc_TRUE@ kern/main.c kern/misc.c kern/parser.c \ - @COND_mips_arc_TRUE@ kern/partition.c kern/rescue_parser.c \ --@COND_mips_arc_TRUE@ kern/rescue_reader.c kern/term.c -+@COND_mips_arc_TRUE@ kern/rescue_reader.c kern/term.c \ -+@COND_mips_arc_TRUE@ kern/verifiers.c - @COND_mips_loongson_TRUE@kernel_exec_SOURCES = kern/mips/startup.S \ - @COND_mips_loongson_TRUE@ term/ns8250.c bus/bonito.c \ - @COND_mips_loongson_TRUE@ bus/cs5536.c bus/pci.c \ -@@ -25911,7 +25928,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_mips_loongson_TRUE@ kern/fs.c kern/list.c kern/main.c \ - @COND_mips_loongson_TRUE@ kern/misc.c kern/parser.c \ - @COND_mips_loongson_TRUE@ kern/partition.c kern/rescue_parser.c \ --@COND_mips_loongson_TRUE@ kern/rescue_reader.c kern/term.c -+@COND_mips_loongson_TRUE@ kern/rescue_reader.c kern/term.c \ -+@COND_mips_loongson_TRUE@ kern/verifiers.c - @COND_mips_qemu_mips_TRUE@kernel_exec_SOURCES = kern/mips/startup.S \ - @COND_mips_qemu_mips_TRUE@ kern/mips/qemu_mips/init.c \ - @COND_mips_qemu_mips_TRUE@ term/ns8250.c term/serial.c \ -@@ -25934,7 +25952,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_mips_qemu_mips_TRUE@ kern/misc.c kern/parser.c \ - @COND_mips_qemu_mips_TRUE@ kern/partition.c \ - @COND_mips_qemu_mips_TRUE@ kern/rescue_parser.c \ --@COND_mips_qemu_mips_TRUE@ kern/rescue_reader.c kern/term.c -+@COND_mips_qemu_mips_TRUE@ kern/rescue_reader.c kern/term.c \ -+@COND_mips_qemu_mips_TRUE@ kern/verifiers.c - @COND_powerpc_ieee1275_TRUE@kernel_exec_SOURCES = \ - @COND_powerpc_ieee1275_TRUE@ kern/powerpc/ieee1275/startup.S \ - @COND_powerpc_ieee1275_TRUE@ kern/powerpc/cache.S \ -@@ -25959,7 +25978,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_powerpc_ieee1275_TRUE@ kern/main.c kern/misc.c \ - @COND_powerpc_ieee1275_TRUE@ kern/parser.c kern/partition.c \ - @COND_powerpc_ieee1275_TRUE@ kern/rescue_parser.c \ --@COND_powerpc_ieee1275_TRUE@ kern/rescue_reader.c kern/term.c -+@COND_powerpc_ieee1275_TRUE@ kern/rescue_reader.c kern/term.c \ -+@COND_powerpc_ieee1275_TRUE@ kern/verifiers.c - @COND_riscv32_efi_TRUE@kernel_exec_SOURCES = kern/riscv/efi/startup.S \ - @COND_riscv32_efi_TRUE@ kern/riscv/efi/init.c kern/efi/fdt.c \ - @COND_riscv32_efi_TRUE@ kern/riscv/cache.c \ -@@ -25977,7 +25997,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_riscv32_efi_TRUE@ kern/fs.c kern/list.c kern/main.c \ - @COND_riscv32_efi_TRUE@ kern/misc.c kern/parser.c \ - @COND_riscv32_efi_TRUE@ kern/partition.c kern/rescue_parser.c \ --@COND_riscv32_efi_TRUE@ kern/rescue_reader.c kern/term.c -+@COND_riscv32_efi_TRUE@ kern/rescue_reader.c kern/term.c \ -+@COND_riscv32_efi_TRUE@ kern/verifiers.c - @COND_riscv64_efi_TRUE@kernel_exec_SOURCES = kern/riscv/efi/startup.S \ - @COND_riscv64_efi_TRUE@ kern/riscv/efi/init.c kern/efi/fdt.c \ - @COND_riscv64_efi_TRUE@ kern/riscv/cache.c \ -@@ -25995,7 +26016,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_riscv64_efi_TRUE@ kern/fs.c kern/list.c kern/main.c \ - @COND_riscv64_efi_TRUE@ kern/misc.c kern/parser.c \ - @COND_riscv64_efi_TRUE@ kern/partition.c kern/rescue_parser.c \ --@COND_riscv64_efi_TRUE@ kern/rescue_reader.c kern/term.c -+@COND_riscv64_efi_TRUE@ kern/rescue_reader.c kern/term.c \ -+@COND_riscv64_efi_TRUE@ kern/verifiers.c - @COND_sparc64_ieee1275_TRUE@kernel_exec_SOURCES = \ - @COND_sparc64_ieee1275_TRUE@ kern/sparc64/ieee1275/crt0.S \ - @COND_sparc64_ieee1275_TRUE@ kern/sparc64/cache.S \ -@@ -26021,7 +26043,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_sparc64_ieee1275_TRUE@ kern/main.c kern/misc.c \ - @COND_sparc64_ieee1275_TRUE@ kern/parser.c kern/partition.c \ - @COND_sparc64_ieee1275_TRUE@ kern/rescue_parser.c \ --@COND_sparc64_ieee1275_TRUE@ kern/rescue_reader.c kern/term.c -+@COND_sparc64_ieee1275_TRUE@ kern/rescue_reader.c kern/term.c \ -+@COND_sparc64_ieee1275_TRUE@ kern/verifiers.c - @COND_x86_64_efi_TRUE@kernel_exec_SOURCES = kern/x86_64/efi/startup.S \ - @COND_x86_64_efi_TRUE@ kern/i386/efi/tsc.c \ - @COND_x86_64_efi_TRUE@ kern/i386/tsc_pmtimer.c \ -@@ -26040,7 +26063,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_x86_64_efi_TRUE@ kern/file.c kern/fs.c kern/list.c \ - @COND_x86_64_efi_TRUE@ kern/main.c kern/misc.c kern/parser.c \ - @COND_x86_64_efi_TRUE@ kern/partition.c kern/rescue_parser.c \ --@COND_x86_64_efi_TRUE@ kern/rescue_reader.c kern/term.c -+@COND_x86_64_efi_TRUE@ kern/rescue_reader.c kern/term.c \ -+@COND_x86_64_efi_TRUE@ kern/verifiers.c - @COND_x86_64_xen_TRUE@kernel_exec_SOURCES = kern/x86_64/xen/startup.S \ - @COND_x86_64_xen_TRUE@ kern/x86_64/dl.c \ - @COND_x86_64_xen_TRUE@ kern/x86_64/xen/hypercall.S \ -@@ -26056,7 +26080,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_x86_64_xen_TRUE@ kern/file.c kern/fs.c kern/list.c \ - @COND_x86_64_xen_TRUE@ kern/main.c kern/misc.c kern/parser.c \ - @COND_x86_64_xen_TRUE@ kern/partition.c kern/rescue_parser.c \ --@COND_x86_64_xen_TRUE@ kern/rescue_reader.c kern/term.c -+@COND_x86_64_xen_TRUE@ kern/rescue_reader.c kern/term.c \ -+@COND_x86_64_xen_TRUE@ kern/verifiers.c - @COND_arm64_efi_TRUE@nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - @COND_arm_coreboot_TRUE@nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - @COND_arm_efi_TRUE@nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources -@@ -28051,6 +28076,8 @@ kern/kernel_exec-rescue_reader.$(OBJEXT): kern/$(am__dirstamp) \ - kern/$(DEPDIR)/$(am__dirstamp) - kern/kernel_exec-term.$(OBJEXT): kern/$(am__dirstamp) \ - kern/$(DEPDIR)/$(am__dirstamp) -+kern/kernel_exec-verifiers.$(OBJEXT): kern/$(am__dirstamp) \ -+ kern/$(DEPDIR)/$(am__dirstamp) - kern/arm/$(am__dirstamp): - @$(MKDIR_P) kern/arm - @: > kern/arm/$(am__dirstamp) -@@ -30171,12 +30198,6 @@ video/i386/pc/vbe_module-vbe.$(OBJEXT): video/i386/pc/$(am__dirstamp) \ - vbe.module$(EXEEXT): $(vbe_module_OBJECTS) $(vbe_module_DEPENDENCIES) $(EXTRA_vbe_module_DEPENDENCIES) - @rm -f vbe.module$(EXEEXT) - $(AM_V_CCLD)$(vbe_module_LINK) $(vbe_module_OBJECTS) $(vbe_module_LDADD) $(LIBS) --commands/verifiers_module-verifiers.$(OBJEXT): \ -- commands/$(am__dirstamp) commands/$(DEPDIR)/$(am__dirstamp) -- --verifiers.module$(EXEEXT): $(verifiers_module_OBJECTS) $(verifiers_module_DEPENDENCIES) $(EXTRA_verifiers_module_DEPENDENCIES) -- @rm -f verifiers.module$(EXEEXT) -- $(AM_V_CCLD)$(verifiers_module_LINK) $(verifiers_module_OBJECTS) $(verifiers_module_LDADD) $(LIBS) - video/i386/pc/vga_module-vga.$(OBJEXT): video/i386/pc/$(am__dirstamp) \ - video/i386/pc/$(DEPDIR)/$(am__dirstamp) - -@@ -30799,7 +30820,6 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@commands/$(DEPDIR)/tr_module-tr.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@commands/$(DEPDIR)/true_module-true.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@commands/$(DEPDIR)/usbtest_module-usbtest.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@commands/$(DEPDIR)/verifiers_module-verifiers.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@commands/$(DEPDIR)/videoinfo_module-videoinfo.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@commands/$(DEPDIR)/videotest_module-videotest.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@commands/$(DEPDIR)/xnu_uuid_module-xnu_uuid.Po@am__quote@ -@@ -30975,6 +30995,7 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/kernel_exec-rescue_reader.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/kernel_exec-term.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/kernel_exec-time.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/kernel_exec-verifiers.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/kernel_exec-vga_init.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/xz_decompress_image-compiler-rt.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@kern/arm/$(DEPDIR)/kernel_exec-cache.Po@am__quote@ -@@ -35607,6 +35628,20 @@ kern/kernel_exec-term.obj: kern/term.c - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -c -o kern/kernel_exec-term.obj `if test -f 'kern/term.c'; then $(CYGPATH_W) 'kern/term.c'; else $(CYGPATH_W) '$(srcdir)/kern/term.c'; fi` - -+kern/kernel_exec-verifiers.o: kern/verifiers.c -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -MT kern/kernel_exec-verifiers.o -MD -MP -MF kern/$(DEPDIR)/kernel_exec-verifiers.Tpo -c -o kern/kernel_exec-verifiers.o `test -f 'kern/verifiers.c' || echo '$(srcdir)/'`kern/verifiers.c -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) kern/$(DEPDIR)/kernel_exec-verifiers.Tpo kern/$(DEPDIR)/kernel_exec-verifiers.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='kern/verifiers.c' object='kern/kernel_exec-verifiers.o' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -c -o kern/kernel_exec-verifiers.o `test -f 'kern/verifiers.c' || echo '$(srcdir)/'`kern/verifiers.c -+ -+kern/kernel_exec-verifiers.obj: kern/verifiers.c -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -MT kern/kernel_exec-verifiers.obj -MD -MP -MF kern/$(DEPDIR)/kernel_exec-verifiers.Tpo -c -o kern/kernel_exec-verifiers.obj `if test -f 'kern/verifiers.c'; then $(CYGPATH_W) 'kern/verifiers.c'; else $(CYGPATH_W) '$(srcdir)/kern/verifiers.c'; fi` -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) kern/$(DEPDIR)/kernel_exec-verifiers.Tpo kern/$(DEPDIR)/kernel_exec-verifiers.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='kern/verifiers.c' object='kern/kernel_exec-verifiers.obj' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -c -o kern/kernel_exec-verifiers.obj `if test -f 'kern/verifiers.c'; then $(CYGPATH_W) 'kern/verifiers.c'; else $(CYGPATH_W) '$(srcdir)/kern/verifiers.c'; fi` -+ - kern/arm/coreboot/kernel_exec-init.o: kern/arm/coreboot/init.c - @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -MT kern/arm/coreboot/kernel_exec-init.o -MD -MP -MF kern/arm/coreboot/$(DEPDIR)/kernel_exec-init.Tpo -c -o kern/arm/coreboot/kernel_exec-init.o `test -f 'kern/arm/coreboot/init.c' || echo '$(srcdir)/'`kern/arm/coreboot/init.c - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) kern/arm/coreboot/$(DEPDIR)/kernel_exec-init.Tpo kern/arm/coreboot/$(DEPDIR)/kernel_exec-init.Po -@@ -40983,20 +41018,6 @@ video/i386/pc/vbe_module-vbe.obj: video/i386/pc/vbe.c - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(vbe_module_CPPFLAGS) $(CPPFLAGS) $(vbe_module_CFLAGS) $(CFLAGS) -c -o video/i386/pc/vbe_module-vbe.obj `if test -f 'video/i386/pc/vbe.c'; then $(CYGPATH_W) 'video/i386/pc/vbe.c'; else $(CYGPATH_W) '$(srcdir)/video/i386/pc/vbe.c'; fi` - --commands/verifiers_module-verifiers.o: commands/verifiers.c --@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(verifiers_module_CPPFLAGS) $(CPPFLAGS) $(verifiers_module_CFLAGS) $(CFLAGS) -MT commands/verifiers_module-verifiers.o -MD -MP -MF commands/$(DEPDIR)/verifiers_module-verifiers.Tpo -c -o commands/verifiers_module-verifiers.o `test -f 'commands/verifiers.c' || echo '$(srcdir)/'`commands/verifiers.c --@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) commands/$(DEPDIR)/verifiers_module-verifiers.Tpo commands/$(DEPDIR)/verifiers_module-verifiers.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='commands/verifiers.c' object='commands/verifiers_module-verifiers.o' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(verifiers_module_CPPFLAGS) $(CPPFLAGS) $(verifiers_module_CFLAGS) $(CFLAGS) -c -o commands/verifiers_module-verifiers.o `test -f 'commands/verifiers.c' || echo '$(srcdir)/'`commands/verifiers.c -- --commands/verifiers_module-verifiers.obj: commands/verifiers.c --@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(verifiers_module_CPPFLAGS) $(CPPFLAGS) $(verifiers_module_CFLAGS) $(CFLAGS) -MT commands/verifiers_module-verifiers.obj -MD -MP -MF commands/$(DEPDIR)/verifiers_module-verifiers.Tpo -c -o commands/verifiers_module-verifiers.obj `if test -f 'commands/verifiers.c'; then $(CYGPATH_W) 'commands/verifiers.c'; else $(CYGPATH_W) '$(srcdir)/commands/verifiers.c'; fi` --@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) commands/$(DEPDIR)/verifiers_module-verifiers.Tpo commands/$(DEPDIR)/verifiers_module-verifiers.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='commands/verifiers.c' object='commands/verifiers_module-verifiers.obj' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(verifiers_module_CPPFLAGS) $(CPPFLAGS) $(verifiers_module_CFLAGS) $(CFLAGS) -c -o commands/verifiers_module-verifiers.obj `if test -f 'commands/verifiers.c'; then $(CYGPATH_W) 'commands/verifiers.c'; else $(CYGPATH_W) '$(srcdir)/commands/verifiers.c'; fi` -- - video/i386/pc/vga_module-vga.o: video/i386/pc/vga.c - @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(vga_module_CPPFLAGS) $(CPPFLAGS) $(vga_module_CFLAGS) $(CFLAGS) -MT video/i386/pc/vga_module-vga.o -MD -MP -MF video/i386/pc/$(DEPDIR)/vga_module-vga.Tpo -c -o video/i386/pc/vga_module-vga.o `test -f 'video/i386/pc/vga.c' || echo '$(srcdir)/'`video/i386/pc/vga.c - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) video/i386/pc/$(DEPDIR)/vga_module-vga.Tpo video/i386/pc/$(DEPDIR)/vga_module-vga.Po -@@ -43717,10 +43738,6 @@ pgp.marker: $(pgp_module_SOURCES) $(nodist_pgp_module_SOURCES) - $(TARGET_CPP) -DGRUB_LST_GENERATOR $(CPPFLAGS_MARKER) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pgp_module_CPPFLAGS) $(CPPFLAGS) $^ > $@.new || (rm -f $@; exit 1) - grep 'MARKER' $@.new > $@; rm -f $@.new - --verifiers.marker: $(verifiers_module_SOURCES) $(nodist_verifiers_module_SOURCES) -- $(TARGET_CPP) -DGRUB_LST_GENERATOR $(CPPFLAGS_MARKER) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(verifiers_module_CPPFLAGS) $(CPPFLAGS) $^ > $@.new || (rm -f $@; exit 1) -- grep 'MARKER' $@.new > $@; rm -f $@.new -- - @COND_x86_64_efi_TRUE@shim_lock.marker: $(shim_lock_module_SOURCES) $(nodist_shim_lock_module_SOURCES) - @COND_x86_64_efi_TRUE@ $(TARGET_CPP) -DGRUB_LST_GENERATOR $(CPPFLAGS_MARKER) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shim_lock_module_CPPFLAGS) $(CPPFLAGS) $^ > $@.new || (rm -f $@; exit 1) - @COND_x86_64_efi_TRUE@ grep 'MARKER' $@.new > $@; rm -f $@.new -diff --git a/grub-core/commands/verifiers.c b/grub-core/commands/verifiers.c -deleted file mode 100644 -index 0dde481..0000000 ---- a/grub-core/commands/verifiers.c -+++ /dev/null -@@ -1,228 +0,0 @@ --/* -- * GRUB -- GRand Unified Bootloader -- * Copyright (C) 2017 Free Software Foundation, Inc. -- * -- * GRUB is free software: you can redistribute it and/or modify -- * it under the terms of the GNU General Public License as published by -- * the Free Software Foundation, either version 3 of the License, or -- * (at your option) any later version. -- * -- * GRUB is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- * GNU General Public License for more details. -- * -- * You should have received a copy of the GNU General Public License -- * along with GRUB. If not, see . -- * -- * Verifiers helper. -- */ -- --#include --#include --#include -- --GRUB_MOD_LICENSE ("GPLv3+"); -- --struct grub_file_verifier *grub_file_verifiers; -- --struct grub_verified --{ -- grub_file_t file; -- void *buf; --}; --typedef struct grub_verified *grub_verified_t; -- --static void --verified_free (grub_verified_t verified) --{ -- if (verified) -- { -- grub_free (verified->buf); -- grub_free (verified); -- } --} -- --static grub_ssize_t --verified_read (struct grub_file *file, char *buf, grub_size_t len) --{ -- grub_verified_t verified = file->data; -- -- grub_memcpy (buf, (char *) verified->buf + file->offset, len); -- return len; --} -- --static grub_err_t --verified_close (struct grub_file *file) --{ -- grub_verified_t verified = file->data; -- -- grub_file_close (verified->file); -- verified_free (verified); -- file->data = 0; -- -- /* Device and name are freed by parent. */ -- file->device = 0; -- file->name = 0; -- -- return grub_errno; --} -- --struct grub_fs verified_fs = --{ -- .name = "verified_read", -- .fs_read = verified_read, -- .fs_close = verified_close --}; -- --static grub_file_t --grub_verifiers_open (grub_file_t io, enum grub_file_type type) --{ -- grub_verified_t verified = NULL; -- struct grub_file_verifier *ver; -- void *context; -- grub_file_t ret = 0; -- grub_err_t err; -- int defer = 0; -- -- grub_dprintf ("verify", "file: %s type: %d\n", io->name, type); -- -- if ((type & GRUB_FILE_TYPE_MASK) == GRUB_FILE_TYPE_SIGNATURE -- || (type & GRUB_FILE_TYPE_MASK) == GRUB_FILE_TYPE_VERIFY_SIGNATURE -- || (type & GRUB_FILE_TYPE_SKIP_SIGNATURE)) -- return io; -- -- if (io->device->disk && -- (io->device->disk->dev->id == GRUB_DISK_DEVICE_MEMDISK_ID -- || io->device->disk->dev->id == GRUB_DISK_DEVICE_PROCFS_ID)) -- return io; -- -- FOR_LIST_ELEMENTS(ver, grub_file_verifiers) -- { -- enum grub_verify_flags flags = 0; -- err = ver->init (io, type, &context, &flags); -- if (err) -- goto fail_noclose; -- if (flags & GRUB_VERIFY_FLAGS_DEFER_AUTH) -- { -- defer = 1; -- continue; -- } -- if (!(flags & GRUB_VERIFY_FLAGS_SKIP_VERIFICATION)) -- break; -- } -- -- if (!ver) -- { -- if (defer) -- { -- grub_error (GRUB_ERR_ACCESS_DENIED, -- N_("verification requested but nobody cares: %s"), io->name); -- goto fail_noclose; -- } -- -- /* No verifiers wanted to verify. Just return underlying file. */ -- return io; -- } -- -- ret = grub_malloc (sizeof (*ret)); -- if (!ret) -- { -- goto fail; -- } -- *ret = *io; -- -- ret->fs = &verified_fs; -- ret->not_easily_seekable = 0; -- if (ret->size >> (sizeof (grub_size_t) * GRUB_CHAR_BIT - 1)) -- { -- grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, -- N_("big file signature isn't implemented yet")); -- goto fail; -- } -- verified = grub_malloc (sizeof (*verified)); -- if (!verified) -- { -- goto fail; -- } -- verified->buf = grub_malloc (ret->size); -- if (!verified->buf) -- { -- goto fail; -- } -- if (grub_file_read (io, verified->buf, ret->size) != (grub_ssize_t) ret->size) -- { -- if (!grub_errno) -- grub_error (GRUB_ERR_FILE_READ_ERROR, N_("premature end of file %s"), -- io->name); -- goto fail; -- } -- -- err = ver->write (context, verified->buf, ret->size); -- if (err) -- goto fail; -- -- err = ver->fini ? ver->fini (context) : GRUB_ERR_NONE; -- if (err) -- goto fail; -- -- if (ver->close) -- ver->close (context); -- -- FOR_LIST_ELEMENTS_NEXT(ver, grub_file_verifiers) -- { -- enum grub_verify_flags flags = 0; -- err = ver->init (io, type, &context, &flags); -- if (err) -- goto fail_noclose; -- if (flags & GRUB_VERIFY_FLAGS_SKIP_VERIFICATION || -- /* Verification done earlier. So, we are happy here. */ -- flags & GRUB_VERIFY_FLAGS_DEFER_AUTH) -- continue; -- err = ver->write (context, verified->buf, ret->size); -- if (err) -- goto fail; -- -- err = ver->fini ? ver->fini (context) : GRUB_ERR_NONE; -- if (err) -- goto fail; -- -- if (ver->close) -- ver->close (context); -- } -- -- verified->file = io; -- ret->data = verified; -- return ret; -- -- fail: -- ver->close (context); -- fail_noclose: -- verified_free (verified); -- grub_free (ret); -- return NULL; --} -- --grub_err_t --grub_verify_string (char *str, enum grub_verify_string_type type) --{ -- struct grub_file_verifier *ver; -- FOR_LIST_ELEMENTS(ver, grub_file_verifiers) -- { -- grub_err_t err; -- err = ver->verify_string ? ver->verify_string (str, type) : GRUB_ERR_NONE; -- if (err) -- return err; -- } -- return GRUB_ERR_NONE; --} -- --GRUB_MOD_INIT(verifiers) --{ -- grub_file_filter_register (GRUB_FILE_FILTER_VERIFY, grub_verifiers_open); --} -- --GRUB_MOD_FINI(verifiers) --{ -- grub_file_filter_unregister (GRUB_FILE_FILTER_VERIFY); --} -diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c -index 9cad0c4..73967e2 100644 ---- a/grub-core/kern/main.c -+++ b/grub-core/kern/main.c -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - - #ifdef GRUB_MACHINE_PCBIOS - #include -@@ -274,6 +275,9 @@ grub_main (void) - grub_printf ("Welcome to GRUB!\n\n"); - grub_setcolorstate (GRUB_TERM_COLOR_STANDARD); - -+ /* Init verifiers API. */ -+ grub_verifiers_init (); -+ - grub_load_config (); - - grub_boot_time ("Before loading embedded modules."); -diff --git a/grub-core/kern/verifiers.c b/grub-core/kern/verifiers.c -new file mode 100644 -index 0000000..aa3dc7c ---- /dev/null -+++ b/grub-core/kern/verifiers.c -@@ -0,0 +1,224 @@ -+/* -+ * GRUB -- GRand Unified Bootloader -+ * Copyright (C) 2017 Free Software Foundation, Inc. -+ * -+ * GRUB is free software: you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation, either version 3 of the License, or -+ * (at your option) any later version. -+ * -+ * GRUB is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with GRUB. If not, see . -+ * -+ * Verifiers helper. -+ */ -+ -+#include -+#include -+#include -+ -+GRUB_MOD_LICENSE ("GPLv3+"); -+ -+struct grub_file_verifier *grub_file_verifiers; -+ -+struct grub_verified -+{ -+ grub_file_t file; -+ void *buf; -+}; -+typedef struct grub_verified *grub_verified_t; -+ -+static void -+verified_free (grub_verified_t verified) -+{ -+ if (verified) -+ { -+ grub_free (verified->buf); -+ grub_free (verified); -+ } -+} -+ -+static grub_ssize_t -+verified_read (struct grub_file *file, char *buf, grub_size_t len) -+{ -+ grub_verified_t verified = file->data; -+ -+ grub_memcpy (buf, (char *) verified->buf + file->offset, len); -+ return len; -+} -+ -+static grub_err_t -+verified_close (struct grub_file *file) -+{ -+ grub_verified_t verified = file->data; -+ -+ grub_file_close (verified->file); -+ verified_free (verified); -+ file->data = 0; -+ -+ /* Device and name are freed by parent. */ -+ file->device = 0; -+ file->name = 0; -+ -+ return grub_errno; -+} -+ -+struct grub_fs verified_fs = -+{ -+ .name = "verified_read", -+ .fs_read = verified_read, -+ .fs_close = verified_close -+}; -+ -+static grub_file_t -+grub_verifiers_open (grub_file_t io, enum grub_file_type type) -+{ -+ grub_verified_t verified = NULL; -+ struct grub_file_verifier *ver; -+ void *context; -+ grub_file_t ret = 0; -+ grub_err_t err; -+ int defer = 0; -+ -+ grub_dprintf ("verify", "file: %s type: %d\n", io->name, type); -+ -+ if ((type & GRUB_FILE_TYPE_MASK) == GRUB_FILE_TYPE_SIGNATURE -+ || (type & GRUB_FILE_TYPE_MASK) == GRUB_FILE_TYPE_VERIFY_SIGNATURE -+ || (type & GRUB_FILE_TYPE_SKIP_SIGNATURE)) -+ return io; -+ -+ if (io->device->disk && -+ (io->device->disk->dev->id == GRUB_DISK_DEVICE_MEMDISK_ID -+ || io->device->disk->dev->id == GRUB_DISK_DEVICE_PROCFS_ID)) -+ return io; -+ -+ FOR_LIST_ELEMENTS(ver, grub_file_verifiers) -+ { -+ enum grub_verify_flags flags = 0; -+ err = ver->init (io, type, &context, &flags); -+ if (err) -+ goto fail_noclose; -+ if (flags & GRUB_VERIFY_FLAGS_DEFER_AUTH) -+ { -+ defer = 1; -+ continue; -+ } -+ if (!(flags & GRUB_VERIFY_FLAGS_SKIP_VERIFICATION)) -+ break; -+ } -+ -+ if (!ver) -+ { -+ if (defer) -+ { -+ grub_error (GRUB_ERR_ACCESS_DENIED, -+ N_("verification requested but nobody cares: %s"), io->name); -+ goto fail_noclose; -+ } -+ -+ /* No verifiers wanted to verify. Just return underlying file. */ -+ return io; -+ } -+ -+ ret = grub_malloc (sizeof (*ret)); -+ if (!ret) -+ { -+ goto fail; -+ } -+ *ret = *io; -+ -+ ret->fs = &verified_fs; -+ ret->not_easily_seekable = 0; -+ if (ret->size >> (sizeof (grub_size_t) * GRUB_CHAR_BIT - 1)) -+ { -+ grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, -+ N_("big file signature isn't implemented yet")); -+ goto fail; -+ } -+ verified = grub_malloc (sizeof (*verified)); -+ if (!verified) -+ { -+ goto fail; -+ } -+ verified->buf = grub_malloc (ret->size); -+ if (!verified->buf) -+ { -+ goto fail; -+ } -+ if (grub_file_read (io, verified->buf, ret->size) != (grub_ssize_t) ret->size) -+ { -+ if (!grub_errno) -+ grub_error (GRUB_ERR_FILE_READ_ERROR, N_("premature end of file %s"), -+ io->name); -+ goto fail; -+ } -+ -+ err = ver->write (context, verified->buf, ret->size); -+ if (err) -+ goto fail; -+ -+ err = ver->fini ? ver->fini (context) : GRUB_ERR_NONE; -+ if (err) -+ goto fail; -+ -+ if (ver->close) -+ ver->close (context); -+ -+ FOR_LIST_ELEMENTS_NEXT(ver, grub_file_verifiers) -+ { -+ enum grub_verify_flags flags = 0; -+ err = ver->init (io, type, &context, &flags); -+ if (err) -+ goto fail_noclose; -+ if (flags & GRUB_VERIFY_FLAGS_SKIP_VERIFICATION || -+ /* Verification done earlier. So, we are happy here. */ -+ flags & GRUB_VERIFY_FLAGS_DEFER_AUTH) -+ continue; -+ err = ver->write (context, verified->buf, ret->size); -+ if (err) -+ goto fail; -+ -+ err = ver->fini ? ver->fini (context) : GRUB_ERR_NONE; -+ if (err) -+ goto fail; -+ -+ if (ver->close) -+ ver->close (context); -+ } -+ -+ verified->file = io; -+ ret->data = verified; -+ return ret; -+ -+ fail: -+ ver->close (context); -+ fail_noclose: -+ verified_free (verified); -+ grub_free (ret); -+ return NULL; -+} -+ -+grub_err_t -+grub_verify_string (char *str, enum grub_verify_string_type type) -+{ -+ struct grub_file_verifier *ver; -+ FOR_LIST_ELEMENTS(ver, grub_file_verifiers) -+ { -+ grub_err_t err; -+ err = ver->verify_string ? ver->verify_string (str, type) : GRUB_ERR_NONE; -+ if (err) -+ return err; -+ } -+ return GRUB_ERR_NONE; -+} -+ -+void -+grub_verifiers_init (void) -+{ -+ grub_file_filter_register (GRUB_FILE_FILTER_VERIFY, grub_verifiers_open); -+} -diff --git a/include/grub/verify.h b/include/grub/verify.h -index ea04914..cd129c3 100644 ---- a/include/grub/verify.h -+++ b/include/grub/verify.h -@@ -64,7 +64,10 @@ struct grub_file_verifier - grub_err_t (*verify_string) (char *str, enum grub_verify_string_type type); - }; - --extern struct grub_file_verifier *grub_file_verifiers; -+extern struct grub_file_verifier *EXPORT_VAR (grub_file_verifiers); -+ -+extern void -+grub_verifiers_init (void); - - static inline void - grub_verifier_register (struct grub_file_verifier *ver) -@@ -78,7 +81,7 @@ grub_verifier_unregister (struct grub_file_verifier *ver) - grub_list_remove (GRUB_AS_LIST (ver)); - } - --grub_err_t --grub_verify_string (char *str, enum grub_verify_string_type type); -+extern grub_err_t -+EXPORT_FUNC (grub_verify_string) (char *str, enum grub_verify_string_type type); - - #endif /* ! GRUB_VERIFY_HEADER */ -diff --git a/po/POTFILES.in b/po/POTFILES.in -index 22543be..11c799f 100644 ---- a/po/POTFILES.in -+++ b/po/POTFILES.in -@@ -107,7 +107,6 @@ - ./grub-core/commands/tr.c - ./grub-core/commands/true.c - ./grub-core/commands/usbtest.c --./grub-core/commands/verifiers.c - ./grub-core/commands/videoinfo.c - ./grub-core/commands/videotest.c - ./grub-core/commands/wildcard.c -@@ -334,6 +333,7 @@ - ./grub-core/kern/uboot/hw.c - ./grub-core/kern/uboot/init.c - ./grub-core/kern/uboot/uboot.c -+./grub-core/kern/verifiers.c - ./grub-core/kern/vga_init.c - ./grub-core/kern/x86_64/dl.c - ./grub-core/kern/xen/init.c --- -2.14.2 - diff --git a/buildroot/boot/grub2/0034-efi-Move-the-shim_lock-verifier-to-the-GRUB-core.patch b/buildroot/boot/grub2/0034-efi-Move-the-shim_lock-verifier-to-the-GRUB-core.patch deleted file mode 100644 index 1b606f4c6a..0000000000 --- a/buildroot/boot/grub2/0034-efi-Move-the-shim_lock-verifier-to-the-GRUB-core.patch +++ /dev/null @@ -1,13225 +0,0 @@ -From 5e280caa6530ed160dcf2920c94f1605fb1f1f7c Mon Sep 17 00:00:00 2001 -From: Marco A Benatto -Date: Wed, 23 Sep 2020 14:21:14 -0400 -Subject: [PATCH] efi: Move the shim_lock verifier to the GRUB core - -Move the shim_lock verifier from its own module into the core image. The -Secure Boot lockdown mechanism has the intent to prevent the load of any -unsigned code or binary when Secure Boot is enabled. - -The reason is that GRUB must be able to prevent executing untrusted code -if UEFI Secure Boot is enabled, without depending on external modules. - -Signed-off-by: Marco A Benatto -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -[Add changes to generated files] -Signed-off-by: Stefan Sørensen ---- - docs/grub.texi | 9 +- - grub-core/Makefile.core.am | 23 - - grub-core/Makefile.core.def | 6 - - grub-core/Makefile.in | 11139 +++++++++++++++++------------------ - grub-core/commands/efi/shim_lock.c | 130 - - grub-core/kern/efi/init.c | 4 + - grub-core/kern/efi/sb.c | 105 + - include/grub/efi/sb.h | 3 + - po/POTFILES.in | 1 - - 9 files changed, 5657 insertions(+), 5763 deletions(-) - delete mode 100644 grub-core/commands/efi/shim_lock.c - -diff --git a/docs/grub.texi b/docs/grub.texi -index 8779507..aefe032 100644 ---- a/docs/grub.texi -+++ b/docs/grub.texi -@@ -5747,15 +5747,16 @@ secure boot chain. - @section UEFI secure boot and shim support - - The GRUB, except the @command{chainloader} command, works with the UEFI secure --boot and the shim. This functionality is provided by the shim_lock module. It --is recommend to build in this and other required modules into the @file{core.img}. -+boot and the shim. This functionality is provided by the shim_lock verifier. It -+is built into the @file{core.img} and is registered if the UEFI secure boot is -+enabled. -+ - All modules not stored in the @file{core.img} and the ACPI tables for the - @command{acpi} command have to be signed, e.g. using PGP. Additionally, the - @command{iorw}, the @command{memrw} and the @command{wrmsr} commands are - prohibited if the UEFI secure boot is enabled. This is done due to - security reasons. All above mentioned requirements are enforced by the --shim_lock module. And itself it is a persistent module which means that --it cannot be unloaded if it was loaded into the memory. -+shim_lock verifier logic. - - @node Measured Boot - @section Measuring boot components -diff --git a/grub-core/Makefile.core.am b/grub-core/Makefile.core.am -index c4d67d4..5623a5e 100644 ---- a/grub-core/Makefile.core.am -+++ b/grub-core/Makefile.core.am -@@ -6954,29 +6954,6 @@ pgp.marker: $(pgp_module_SOURCES) $(nodist_pgp_module_SOURCES) - $(TARGET_CPP) -DGRUB_LST_GENERATOR $(CPPFLAGS_MARKER) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pgp_module_CPPFLAGS) $(CPPFLAGS) $^ > $@.new || (rm -f $@; exit 1) - grep 'MARKER' $@.new > $@; rm -f $@.new - --if COND_x86_64_efi --platform_PROGRAMS += shim_lock.module --MODULE_FILES += shim_lock.module$(EXEEXT) --shim_lock_module_SOURCES = commands/efi/shim_lock.c ## platform sources --nodist_shim_lock_module_SOURCES = ## platform nodist sources --shim_lock_module_LDADD = --shim_lock_module_CFLAGS = $(AM_CFLAGS) $(CFLAGS_MODULE) --shim_lock_module_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_MODULE) --shim_lock_module_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_MODULE) --shim_lock_module_CCASFLAGS = $(AM_CCASFLAGS) $(CCASFLAGS_MODULE) --shim_lock_module_DEPENDENCIES = $(TARGET_OBJ2ELF) --dist_noinst_DATA += --BUILT_SOURCES += $(nodist_shim_lock_module_SOURCES) --CLEANFILES += $(nodist_shim_lock_module_SOURCES) --MOD_FILES += shim_lock.mod --MARKER_FILES += shim_lock.marker --CLEANFILES += shim_lock.marker -- --shim_lock.marker: $(shim_lock_module_SOURCES) $(nodist_shim_lock_module_SOURCES) -- $(TARGET_CPP) -DGRUB_LST_GENERATOR $(CPPFLAGS_MARKER) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shim_lock_module_CPPFLAGS) $(CPPFLAGS) $^ > $@.new || (rm -f $@; exit 1) -- grep 'MARKER' $@.new > $@; rm -f $@.new --endif -- - if COND_i386_pc - platform_PROGRAMS += hdparm.module - MODULE_FILES += hdparm.module$(EXEEXT) -diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index f6c0348..4d380ed 100644 ---- a/grub-core/Makefile.core.def -+++ b/grub-core/Makefile.core.def -@@ -944,12 +944,6 @@ module = { - cppflags = '-I$(srcdir)/lib/posix_wrap'; - }; - --module = { -- name = shim_lock; -- common = commands/efi/shim_lock.c; -- enable = x86_64_efi; --}; -- - module = { - name = hdparm; - common = commands/hdparm.c; -diff --git a/grub-core/Makefile.in b/grub-core/Makefile.in -index 8930714..09dc802 100644 ---- a/grub-core/Makefile.in -+++ b/grub-core/Makefile.in -@@ -205,36 +205,36 @@ platform_PROGRAMS = disk.module$(EXEEXT) trig.module$(EXEEXT) \ - $(am__EXEEXT_293) $(am__EXEEXT_294) $(am__EXEEXT_295) \ - $(am__EXEEXT_296) $(am__EXEEXT_297) $(am__EXEEXT_298) \ - $(am__EXEEXT_299) $(am__EXEEXT_300) $(am__EXEEXT_301) \ -- $(am__EXEEXT_302) help.module$(EXEEXT) hexdump.module$(EXEEXT) \ -- keystatus.module$(EXEEXT) $(am__EXEEXT_303) $(am__EXEEXT_304) \ -+ help.module$(EXEEXT) hexdump.module$(EXEEXT) \ -+ keystatus.module$(EXEEXT) $(am__EXEEXT_302) $(am__EXEEXT_303) \ - loadenv.module$(EXEEXT) ls.module$(EXEEXT) \ -- lsmmap.module$(EXEEXT) $(am__EXEEXT_305) $(am__EXEEXT_306) \ -- $(am__EXEEXT_307) $(am__EXEEXT_308) $(am__EXEEXT_309) \ -- $(am__EXEEXT_310) $(am__EXEEXT_311) $(am__EXEEXT_312) \ -+ lsmmap.module$(EXEEXT) $(am__EXEEXT_304) $(am__EXEEXT_305) \ -+ $(am__EXEEXT_306) $(am__EXEEXT_307) $(am__EXEEXT_308) \ -+ $(am__EXEEXT_309) $(am__EXEEXT_310) $(am__EXEEXT_311) \ - memrw.module$(EXEEXT) minicmd.module$(EXEEXT) \ - parttool.module$(EXEEXT) password.module$(EXEEXT) \ -- password_pbkdf2.module$(EXEEXT) $(am__EXEEXT_313) \ -- $(am__EXEEXT_314) $(am__EXEEXT_315) $(am__EXEEXT_316) \ -- $(am__EXEEXT_317) $(am__EXEEXT_318) $(am__EXEEXT_319) \ -- $(am__EXEEXT_320) $(am__EXEEXT_321) $(am__EXEEXT_322) \ -- $(am__EXEEXT_323) $(am__EXEEXT_324) $(am__EXEEXT_325) \ -- $(am__EXEEXT_326) $(am__EXEEXT_327) $(am__EXEEXT_328) \ -- $(am__EXEEXT_329) $(am__EXEEXT_330) $(am__EXEEXT_331) \ -- $(am__EXEEXT_332) $(am__EXEEXT_333) probe.module$(EXEEXT) \ -+ password_pbkdf2.module$(EXEEXT) $(am__EXEEXT_312) \ -+ $(am__EXEEXT_313) $(am__EXEEXT_314) $(am__EXEEXT_315) \ -+ $(am__EXEEXT_316) $(am__EXEEXT_317) $(am__EXEEXT_318) \ -+ $(am__EXEEXT_319) $(am__EXEEXT_320) $(am__EXEEXT_321) \ -+ $(am__EXEEXT_322) $(am__EXEEXT_323) $(am__EXEEXT_324) \ -+ $(am__EXEEXT_325) $(am__EXEEXT_326) $(am__EXEEXT_327) \ -+ $(am__EXEEXT_328) $(am__EXEEXT_329) $(am__EXEEXT_330) \ -+ $(am__EXEEXT_331) $(am__EXEEXT_332) probe.module$(EXEEXT) \ - read.module$(EXEEXT) search.module$(EXEEXT) \ - search_fs_file.module$(EXEEXT) search_fs_uuid.module$(EXEEXT) \ -- search_label.module$(EXEEXT) $(am__EXEEXT_334) \ -- $(am__EXEEXT_335) $(am__EXEEXT_336) $(am__EXEEXT_337) \ -- $(am__EXEEXT_338) $(am__EXEEXT_339) $(am__EXEEXT_340) \ -- $(am__EXEEXT_341) $(am__EXEEXT_342) $(am__EXEEXT_343) \ -- $(am__EXEEXT_344) $(am__EXEEXT_345) $(am__EXEEXT_346) \ -- $(am__EXEEXT_347) $(am__EXEEXT_348) $(am__EXEEXT_349) \ -- sleep.module$(EXEEXT) $(am__EXEEXT_350) $(am__EXEEXT_351) \ -+ search_label.module$(EXEEXT) $(am__EXEEXT_333) \ -+ $(am__EXEEXT_334) $(am__EXEEXT_335) $(am__EXEEXT_336) \ -+ $(am__EXEEXT_337) $(am__EXEEXT_338) $(am__EXEEXT_339) \ -+ $(am__EXEEXT_340) $(am__EXEEXT_341) $(am__EXEEXT_342) \ -+ $(am__EXEEXT_343) $(am__EXEEXT_344) $(am__EXEEXT_345) \ -+ $(am__EXEEXT_346) $(am__EXEEXT_347) $(am__EXEEXT_348) \ -+ sleep.module$(EXEEXT) $(am__EXEEXT_349) $(am__EXEEXT_350) \ - terminal.module$(EXEEXT) test.module$(EXEEXT) \ -- true.module$(EXEEXT) $(am__EXEEXT_352) $(am__EXEEXT_353) \ -- $(am__EXEEXT_354) $(am__EXEEXT_355) $(am__EXEEXT_356) \ -- $(am__EXEEXT_357) $(am__EXEEXT_358) $(am__EXEEXT_359) \ -- $(am__EXEEXT_360) videoinfo.module$(EXEEXT) \ -+ true.module$(EXEEXT) $(am__EXEEXT_351) $(am__EXEEXT_352) \ -+ $(am__EXEEXT_353) $(am__EXEEXT_354) $(am__EXEEXT_355) \ -+ $(am__EXEEXT_356) $(am__EXEEXT_357) $(am__EXEEXT_358) \ -+ $(am__EXEEXT_359) videoinfo.module$(EXEEXT) \ - videotest.module$(EXEEXT) xnu_uuid.module$(EXEEXT) \ - dm_nv.module$(EXEEXT) loopback.module$(EXEEXT) \ - cryptodisk.module$(EXEEXT) luks.module$(EXEEXT) \ -@@ -242,27 +242,27 @@ platform_PROGRAMS = disk.module$(EXEEXT) trig.module$(EXEEXT) \ - mdraid09.module$(EXEEXT) mdraid09_be.module$(EXEEXT) \ - mdraid1x.module$(EXEEXT) diskfilter.module$(EXEEXT) \ - raid5rec.module$(EXEEXT) raid6rec.module$(EXEEXT) \ -- scsi.module$(EXEEXT) memdisk.module$(EXEEXT) $(am__EXEEXT_361) \ -- $(am__EXEEXT_362) $(am__EXEEXT_363) $(am__EXEEXT_364) \ -- $(am__EXEEXT_365) $(am__EXEEXT_366) $(am__EXEEXT_367) \ -- $(am__EXEEXT_368) $(am__EXEEXT_369) $(am__EXEEXT_370) \ -- $(am__EXEEXT_371) $(am__EXEEXT_372) $(am__EXEEXT_373) \ -- $(am__EXEEXT_374) $(am__EXEEXT_375) $(am__EXEEXT_376) \ -- $(am__EXEEXT_377) $(am__EXEEXT_378) $(am__EXEEXT_379) \ -- $(am__EXEEXT_380) $(am__EXEEXT_381) $(am__EXEEXT_382) \ -- $(am__EXEEXT_383) $(am__EXEEXT_384) $(am__EXEEXT_385) \ -- $(am__EXEEXT_386) $(am__EXEEXT_387) $(am__EXEEXT_388) \ -- $(am__EXEEXT_389) $(am__EXEEXT_390) $(am__EXEEXT_391) \ -- $(am__EXEEXT_392) $(am__EXEEXT_393) $(am__EXEEXT_394) \ -- $(am__EXEEXT_395) $(am__EXEEXT_396) $(am__EXEEXT_397) \ -- $(am__EXEEXT_398) $(am__EXEEXT_399) $(am__EXEEXT_400) \ -- $(am__EXEEXT_401) $(am__EXEEXT_402) $(am__EXEEXT_403) \ -- $(am__EXEEXT_404) $(am__EXEEXT_405) $(am__EXEEXT_406) \ -- $(am__EXEEXT_407) $(am__EXEEXT_408) $(am__EXEEXT_409) \ -- $(am__EXEEXT_410) $(am__EXEEXT_411) $(am__EXEEXT_412) \ -- $(am__EXEEXT_413) $(am__EXEEXT_414) $(am__EXEEXT_415) \ -- $(am__EXEEXT_416) $(am__EXEEXT_417) $(am__EXEEXT_418) \ -- $(am__EXEEXT_419) $(am__EXEEXT_420) $(am__EXEEXT_421) \ -+ scsi.module$(EXEEXT) memdisk.module$(EXEEXT) $(am__EXEEXT_360) \ -+ $(am__EXEEXT_361) $(am__EXEEXT_362) $(am__EXEEXT_363) \ -+ $(am__EXEEXT_364) $(am__EXEEXT_365) $(am__EXEEXT_366) \ -+ $(am__EXEEXT_367) $(am__EXEEXT_368) $(am__EXEEXT_369) \ -+ $(am__EXEEXT_370) $(am__EXEEXT_371) $(am__EXEEXT_372) \ -+ $(am__EXEEXT_373) $(am__EXEEXT_374) $(am__EXEEXT_375) \ -+ $(am__EXEEXT_376) $(am__EXEEXT_377) $(am__EXEEXT_378) \ -+ $(am__EXEEXT_379) $(am__EXEEXT_380) $(am__EXEEXT_381) \ -+ $(am__EXEEXT_382) $(am__EXEEXT_383) $(am__EXEEXT_384) \ -+ $(am__EXEEXT_385) $(am__EXEEXT_386) $(am__EXEEXT_387) \ -+ $(am__EXEEXT_388) $(am__EXEEXT_389) $(am__EXEEXT_390) \ -+ $(am__EXEEXT_391) $(am__EXEEXT_392) $(am__EXEEXT_393) \ -+ $(am__EXEEXT_394) $(am__EXEEXT_395) $(am__EXEEXT_396) \ -+ $(am__EXEEXT_397) $(am__EXEEXT_398) $(am__EXEEXT_399) \ -+ $(am__EXEEXT_400) $(am__EXEEXT_401) $(am__EXEEXT_402) \ -+ $(am__EXEEXT_403) $(am__EXEEXT_404) $(am__EXEEXT_405) \ -+ $(am__EXEEXT_406) $(am__EXEEXT_407) $(am__EXEEXT_408) \ -+ $(am__EXEEXT_409) $(am__EXEEXT_410) $(am__EXEEXT_411) \ -+ $(am__EXEEXT_412) $(am__EXEEXT_413) $(am__EXEEXT_414) \ -+ $(am__EXEEXT_415) $(am__EXEEXT_416) $(am__EXEEXT_417) \ -+ $(am__EXEEXT_418) $(am__EXEEXT_419) $(am__EXEEXT_420) \ - procfs.module$(EXEEXT) affs.module$(EXEEXT) \ - afs.module$(EXEEXT) bfs.module$(EXEEXT) zstd.module$(EXEEXT) \ - btrfs.module$(EXEEXT) archelp.module$(EXEEXT) \ -@@ -284,165 +284,165 @@ platform_PROGRAMS = disk.module$(EXEEXT) trig.module$(EXEEXT) \ - ufs1_be.module$(EXEEXT) ufs2.module$(EXEEXT) \ - xfs.module$(EXEEXT) zfs.module$(EXEEXT) \ - zfscrypt.module$(EXEEXT) zfsinfo.module$(EXEEXT) \ -- macbless.module$(EXEEXT) $(am__EXEEXT_422) \ -+ macbless.module$(EXEEXT) $(am__EXEEXT_421) \ - gettext.module$(EXEEXT) gfxmenu.module$(EXEEXT) \ - hello.module$(EXEEXT) gzio.module$(EXEEXT) \ -- offsetio.module$(EXEEXT) $(am__EXEEXT_423) $(am__EXEEXT_424) \ -- $(am__EXEEXT_425) $(am__EXEEXT_426) $(am__EXEEXT_427) \ -- $(am__EXEEXT_428) $(am__EXEEXT_429) $(am__EXEEXT_430) \ -- $(am__EXEEXT_431) $(am__EXEEXT_432) $(am__EXEEXT_433) \ -- $(am__EXEEXT_434) $(am__EXEEXT_435) $(am__EXEEXT_436) \ -- $(am__EXEEXT_437) $(am__EXEEXT_438) $(am__EXEEXT_439) \ -- $(am__EXEEXT_440) $(am__EXEEXT_441) $(am__EXEEXT_442) \ -+ offsetio.module$(EXEEXT) $(am__EXEEXT_422) $(am__EXEEXT_423) \ -+ $(am__EXEEXT_424) $(am__EXEEXT_425) $(am__EXEEXT_426) \ -+ $(am__EXEEXT_427) $(am__EXEEXT_428) $(am__EXEEXT_429) \ -+ $(am__EXEEXT_430) $(am__EXEEXT_431) $(am__EXEEXT_432) \ -+ $(am__EXEEXT_433) $(am__EXEEXT_434) $(am__EXEEXT_435) \ -+ $(am__EXEEXT_436) $(am__EXEEXT_437) $(am__EXEEXT_438) \ -+ $(am__EXEEXT_439) $(am__EXEEXT_440) $(am__EXEEXT_441) \ - elf.module$(EXEEXT) crypto.module$(EXEEXT) \ -- pbkdf2.module$(EXEEXT) $(am__EXEEXT_443) $(am__EXEEXT_444) \ -- $(am__EXEEXT_445) $(am__EXEEXT_446) $(am__EXEEXT_447) \ -- $(am__EXEEXT_448) $(am__EXEEXT_449) $(am__EXEEXT_450) \ -- $(am__EXEEXT_451) $(am__EXEEXT_452) $(am__EXEEXT_453) \ -- $(am__EXEEXT_454) $(am__EXEEXT_455) $(am__EXEEXT_456) \ -- $(am__EXEEXT_457) $(am__EXEEXT_458) $(am__EXEEXT_459) \ -- $(am__EXEEXT_460) $(am__EXEEXT_461) $(am__EXEEXT_462) \ -- $(am__EXEEXT_463) $(am__EXEEXT_464) $(am__EXEEXT_465) \ -- $(am__EXEEXT_466) $(am__EXEEXT_467) $(am__EXEEXT_468) \ -- $(am__EXEEXT_469) $(am__EXEEXT_470) $(am__EXEEXT_471) \ -- $(am__EXEEXT_472) $(am__EXEEXT_473) $(am__EXEEXT_474) \ -- $(am__EXEEXT_475) $(am__EXEEXT_476) $(am__EXEEXT_477) \ -- $(am__EXEEXT_478) setjmp.module$(EXEEXT) $(am__EXEEXT_479) \ -- $(am__EXEEXT_480) $(am__EXEEXT_481) $(am__EXEEXT_482) \ -- $(am__EXEEXT_483) $(am__EXEEXT_484) $(am__EXEEXT_485) \ -- $(am__EXEEXT_486) $(am__EXEEXT_487) $(am__EXEEXT_488) \ -- $(am__EXEEXT_489) $(am__EXEEXT_490) $(am__EXEEXT_491) \ -- $(am__EXEEXT_492) $(am__EXEEXT_493) $(am__EXEEXT_494) \ -- $(am__EXEEXT_495) $(am__EXEEXT_496) $(am__EXEEXT_497) \ -- $(am__EXEEXT_498) $(am__EXEEXT_499) $(am__EXEEXT_500) \ -- $(am__EXEEXT_501) $(am__EXEEXT_502) $(am__EXEEXT_503) \ -- $(am__EXEEXT_504) $(am__EXEEXT_505) $(am__EXEEXT_506) \ -- $(am__EXEEXT_507) $(am__EXEEXT_508) $(am__EXEEXT_509) \ -- $(am__EXEEXT_510) $(am__EXEEXT_511) $(am__EXEEXT_512) \ -- $(am__EXEEXT_513) $(am__EXEEXT_514) $(am__EXEEXT_515) \ -- $(am__EXEEXT_516) $(am__EXEEXT_517) $(am__EXEEXT_518) \ -- $(am__EXEEXT_519) $(am__EXEEXT_520) $(am__EXEEXT_521) \ -- $(am__EXEEXT_522) $(am__EXEEXT_523) $(am__EXEEXT_524) \ -- $(am__EXEEXT_525) $(am__EXEEXT_526) $(am__EXEEXT_527) \ -- $(am__EXEEXT_528) $(am__EXEEXT_529) $(am__EXEEXT_530) \ -- $(am__EXEEXT_531) $(am__EXEEXT_532) $(am__EXEEXT_533) \ -- $(am__EXEEXT_534) $(am__EXEEXT_535) $(am__EXEEXT_536) \ -- $(am__EXEEXT_537) $(am__EXEEXT_538) $(am__EXEEXT_539) \ -- $(am__EXEEXT_540) $(am__EXEEXT_541) $(am__EXEEXT_542) \ -- $(am__EXEEXT_543) $(am__EXEEXT_544) $(am__EXEEXT_545) \ -- $(am__EXEEXT_546) $(am__EXEEXT_547) $(am__EXEEXT_548) \ -- $(am__EXEEXT_549) $(am__EXEEXT_550) $(am__EXEEXT_551) \ -- $(am__EXEEXT_552) $(am__EXEEXT_553) $(am__EXEEXT_554) \ -- $(am__EXEEXT_555) $(am__EXEEXT_556) macho.module$(EXEEXT) \ -- $(am__EXEEXT_557) $(am__EXEEXT_558) $(am__EXEEXT_559) \ -- $(am__EXEEXT_560) $(am__EXEEXT_561) $(am__EXEEXT_562) \ -- $(am__EXEEXT_563) $(am__EXEEXT_564) $(am__EXEEXT_565) \ -- $(am__EXEEXT_566) $(am__EXEEXT_567) $(am__EXEEXT_568) \ -- $(am__EXEEXT_569) $(am__EXEEXT_570) $(am__EXEEXT_571) \ -- $(am__EXEEXT_572) $(am__EXEEXT_573) $(am__EXEEXT_574) \ -- $(am__EXEEXT_575) $(am__EXEEXT_576) $(am__EXEEXT_577) \ -- $(am__EXEEXT_578) $(am__EXEEXT_579) $(am__EXEEXT_580) \ -- $(am__EXEEXT_581) $(am__EXEEXT_582) $(am__EXEEXT_583) \ -+ pbkdf2.module$(EXEEXT) $(am__EXEEXT_442) $(am__EXEEXT_443) \ -+ $(am__EXEEXT_444) $(am__EXEEXT_445) $(am__EXEEXT_446) \ -+ $(am__EXEEXT_447) $(am__EXEEXT_448) $(am__EXEEXT_449) \ -+ $(am__EXEEXT_450) $(am__EXEEXT_451) $(am__EXEEXT_452) \ -+ $(am__EXEEXT_453) $(am__EXEEXT_454) $(am__EXEEXT_455) \ -+ $(am__EXEEXT_456) $(am__EXEEXT_457) $(am__EXEEXT_458) \ -+ $(am__EXEEXT_459) $(am__EXEEXT_460) $(am__EXEEXT_461) \ -+ $(am__EXEEXT_462) $(am__EXEEXT_463) $(am__EXEEXT_464) \ -+ $(am__EXEEXT_465) $(am__EXEEXT_466) $(am__EXEEXT_467) \ -+ $(am__EXEEXT_468) $(am__EXEEXT_469) $(am__EXEEXT_470) \ -+ $(am__EXEEXT_471) $(am__EXEEXT_472) $(am__EXEEXT_473) \ -+ $(am__EXEEXT_474) $(am__EXEEXT_475) $(am__EXEEXT_476) \ -+ $(am__EXEEXT_477) setjmp.module$(EXEEXT) $(am__EXEEXT_478) \ -+ $(am__EXEEXT_479) $(am__EXEEXT_480) $(am__EXEEXT_481) \ -+ $(am__EXEEXT_482) $(am__EXEEXT_483) $(am__EXEEXT_484) \ -+ $(am__EXEEXT_485) $(am__EXEEXT_486) $(am__EXEEXT_487) \ -+ $(am__EXEEXT_488) $(am__EXEEXT_489) $(am__EXEEXT_490) \ -+ $(am__EXEEXT_491) $(am__EXEEXT_492) $(am__EXEEXT_493) \ -+ $(am__EXEEXT_494) $(am__EXEEXT_495) $(am__EXEEXT_496) \ -+ $(am__EXEEXT_497) $(am__EXEEXT_498) $(am__EXEEXT_499) \ -+ $(am__EXEEXT_500) $(am__EXEEXT_501) $(am__EXEEXT_502) \ -+ $(am__EXEEXT_503) $(am__EXEEXT_504) $(am__EXEEXT_505) \ -+ $(am__EXEEXT_506) $(am__EXEEXT_507) $(am__EXEEXT_508) \ -+ $(am__EXEEXT_509) $(am__EXEEXT_510) $(am__EXEEXT_511) \ -+ $(am__EXEEXT_512) $(am__EXEEXT_513) $(am__EXEEXT_514) \ -+ $(am__EXEEXT_515) $(am__EXEEXT_516) $(am__EXEEXT_517) \ -+ $(am__EXEEXT_518) $(am__EXEEXT_519) $(am__EXEEXT_520) \ -+ $(am__EXEEXT_521) $(am__EXEEXT_522) $(am__EXEEXT_523) \ -+ $(am__EXEEXT_524) $(am__EXEEXT_525) $(am__EXEEXT_526) \ -+ $(am__EXEEXT_527) $(am__EXEEXT_528) $(am__EXEEXT_529) \ -+ $(am__EXEEXT_530) $(am__EXEEXT_531) $(am__EXEEXT_532) \ -+ $(am__EXEEXT_533) $(am__EXEEXT_534) $(am__EXEEXT_535) \ -+ $(am__EXEEXT_536) $(am__EXEEXT_537) $(am__EXEEXT_538) \ -+ $(am__EXEEXT_539) $(am__EXEEXT_540) $(am__EXEEXT_541) \ -+ $(am__EXEEXT_542) $(am__EXEEXT_543) $(am__EXEEXT_544) \ -+ $(am__EXEEXT_545) $(am__EXEEXT_546) $(am__EXEEXT_547) \ -+ $(am__EXEEXT_548) $(am__EXEEXT_549) $(am__EXEEXT_550) \ -+ $(am__EXEEXT_551) $(am__EXEEXT_552) $(am__EXEEXT_553) \ -+ $(am__EXEEXT_554) $(am__EXEEXT_555) macho.module$(EXEEXT) \ -+ $(am__EXEEXT_556) $(am__EXEEXT_557) $(am__EXEEXT_558) \ -+ $(am__EXEEXT_559) $(am__EXEEXT_560) $(am__EXEEXT_561) \ -+ $(am__EXEEXT_562) $(am__EXEEXT_563) $(am__EXEEXT_564) \ -+ $(am__EXEEXT_565) $(am__EXEEXT_566) $(am__EXEEXT_567) \ -+ $(am__EXEEXT_568) $(am__EXEEXT_569) $(am__EXEEXT_570) \ -+ $(am__EXEEXT_571) $(am__EXEEXT_572) $(am__EXEEXT_573) \ -+ $(am__EXEEXT_574) $(am__EXEEXT_575) $(am__EXEEXT_576) \ -+ $(am__EXEEXT_577) $(am__EXEEXT_578) $(am__EXEEXT_579) \ -+ $(am__EXEEXT_580) $(am__EXEEXT_581) $(am__EXEEXT_582) \ - normal.module$(EXEEXT) part_acorn.module$(EXEEXT) \ - part_amiga.module$(EXEEXT) part_apple.module$(EXEEXT) \ - part_gpt.module$(EXEEXT) part_msdos.module$(EXEEXT) \ - part_sun.module$(EXEEXT) part_plan.module$(EXEEXT) \ - part_dvh.module$(EXEEXT) part_bsd.module$(EXEEXT) \ - part_sunpc.module$(EXEEXT) part_dfly.module$(EXEEXT) \ -- msdospart.module$(EXEEXT) $(am__EXEEXT_584) $(am__EXEEXT_585) \ -- $(am__EXEEXT_586) $(am__EXEEXT_587) $(am__EXEEXT_588) \ -- $(am__EXEEXT_589) $(am__EXEEXT_590) $(am__EXEEXT_591) \ -- $(am__EXEEXT_592) $(am__EXEEXT_593) $(am__EXEEXT_594) \ -- $(am__EXEEXT_595) $(am__EXEEXT_596) $(am__EXEEXT_597) \ -- $(am__EXEEXT_598) $(am__EXEEXT_599) $(am__EXEEXT_600) \ -- $(am__EXEEXT_601) $(am__EXEEXT_602) $(am__EXEEXT_603) \ -- $(am__EXEEXT_604) $(am__EXEEXT_605) $(am__EXEEXT_606) \ -- $(am__EXEEXT_607) $(am__EXEEXT_608) $(am__EXEEXT_609) \ -- $(am__EXEEXT_610) gfxterm_background.module$(EXEEXT) \ -- $(am__EXEEXT_611) $(am__EXEEXT_612) $(am__EXEEXT_613) \ -- $(am__EXEEXT_614) $(am__EXEEXT_615) $(am__EXEEXT_616) \ -- $(am__EXEEXT_617) $(am__EXEEXT_618) $(am__EXEEXT_619) \ -- $(am__EXEEXT_620) $(am__EXEEXT_621) $(am__EXEEXT_622) \ -- $(am__EXEEXT_623) $(am__EXEEXT_624) $(am__EXEEXT_625) \ -- $(am__EXEEXT_626) $(am__EXEEXT_627) $(am__EXEEXT_628) \ -- $(am__EXEEXT_629) $(am__EXEEXT_630) $(am__EXEEXT_631) \ -- $(am__EXEEXT_632) $(am__EXEEXT_633) $(am__EXEEXT_634) \ -- $(am__EXEEXT_635) $(am__EXEEXT_636) $(am__EXEEXT_637) \ -- $(am__EXEEXT_638) $(am__EXEEXT_639) $(am__EXEEXT_640) \ -- $(am__EXEEXT_641) $(am__EXEEXT_642) $(am__EXEEXT_643) \ -- $(am__EXEEXT_644) $(am__EXEEXT_645) $(am__EXEEXT_646) \ -- $(am__EXEEXT_647) $(am__EXEEXT_648) $(am__EXEEXT_649) \ -- $(am__EXEEXT_650) $(am__EXEEXT_651) $(am__EXEEXT_652) \ -- $(am__EXEEXT_653) $(am__EXEEXT_654) $(am__EXEEXT_655) \ -- $(am__EXEEXT_656) $(am__EXEEXT_657) $(am__EXEEXT_658) \ -- $(am__EXEEXT_659) $(am__EXEEXT_660) $(am__EXEEXT_661) \ -- $(am__EXEEXT_662) $(am__EXEEXT_663) $(am__EXEEXT_664) \ -- $(am__EXEEXT_665) functional_test.module$(EXEEXT) \ -+ msdospart.module$(EXEEXT) $(am__EXEEXT_583) $(am__EXEEXT_584) \ -+ $(am__EXEEXT_585) $(am__EXEEXT_586) $(am__EXEEXT_587) \ -+ $(am__EXEEXT_588) $(am__EXEEXT_589) $(am__EXEEXT_590) \ -+ $(am__EXEEXT_591) $(am__EXEEXT_592) $(am__EXEEXT_593) \ -+ $(am__EXEEXT_594) $(am__EXEEXT_595) $(am__EXEEXT_596) \ -+ $(am__EXEEXT_597) $(am__EXEEXT_598) $(am__EXEEXT_599) \ -+ $(am__EXEEXT_600) $(am__EXEEXT_601) $(am__EXEEXT_602) \ -+ $(am__EXEEXT_603) $(am__EXEEXT_604) $(am__EXEEXT_605) \ -+ $(am__EXEEXT_606) $(am__EXEEXT_607) $(am__EXEEXT_608) \ -+ $(am__EXEEXT_609) gfxterm_background.module$(EXEEXT) \ -+ $(am__EXEEXT_610) $(am__EXEEXT_611) $(am__EXEEXT_612) \ -+ $(am__EXEEXT_613) $(am__EXEEXT_614) $(am__EXEEXT_615) \ -+ $(am__EXEEXT_616) $(am__EXEEXT_617) $(am__EXEEXT_618) \ -+ $(am__EXEEXT_619) $(am__EXEEXT_620) $(am__EXEEXT_621) \ -+ $(am__EXEEXT_622) $(am__EXEEXT_623) $(am__EXEEXT_624) \ -+ $(am__EXEEXT_625) $(am__EXEEXT_626) $(am__EXEEXT_627) \ -+ $(am__EXEEXT_628) $(am__EXEEXT_629) $(am__EXEEXT_630) \ -+ $(am__EXEEXT_631) $(am__EXEEXT_632) $(am__EXEEXT_633) \ -+ $(am__EXEEXT_634) $(am__EXEEXT_635) $(am__EXEEXT_636) \ -+ $(am__EXEEXT_637) $(am__EXEEXT_638) $(am__EXEEXT_639) \ -+ $(am__EXEEXT_640) $(am__EXEEXT_641) $(am__EXEEXT_642) \ -+ $(am__EXEEXT_643) $(am__EXEEXT_644) $(am__EXEEXT_645) \ -+ $(am__EXEEXT_646) $(am__EXEEXT_647) $(am__EXEEXT_648) \ -+ $(am__EXEEXT_649) $(am__EXEEXT_650) $(am__EXEEXT_651) \ -+ $(am__EXEEXT_652) $(am__EXEEXT_653) $(am__EXEEXT_654) \ -+ $(am__EXEEXT_655) $(am__EXEEXT_656) $(am__EXEEXT_657) \ -+ $(am__EXEEXT_658) $(am__EXEEXT_659) $(am__EXEEXT_660) \ -+ $(am__EXEEXT_661) $(am__EXEEXT_662) $(am__EXEEXT_663) \ -+ $(am__EXEEXT_664) functional_test.module$(EXEEXT) \ - exfctest.module$(EXEEXT) strtoull_test.module$(EXEEXT) \ - setjmp_test.module$(EXEEXT) signature_test.module$(EXEEXT) \ - sleep_test.module$(EXEEXT) xnu_uuid_test.module$(EXEEXT) \ -- pbkdf2_test.module$(EXEEXT) $(am__EXEEXT_666) \ -- $(am__EXEEXT_667) $(am__EXEEXT_668) $(am__EXEEXT_669) \ -- $(am__EXEEXT_670) $(am__EXEEXT_671) $(am__EXEEXT_672) \ -- $(am__EXEEXT_673) $(am__EXEEXT_674) $(am__EXEEXT_675) \ -- $(am__EXEEXT_676) $(am__EXEEXT_677) $(am__EXEEXT_678) \ -- $(am__EXEEXT_679) $(am__EXEEXT_680) $(am__EXEEXT_681) \ -- $(am__EXEEXT_682) $(am__EXEEXT_683) $(am__EXEEXT_684) \ -- $(am__EXEEXT_685) $(am__EXEEXT_686) $(am__EXEEXT_687) \ -- $(am__EXEEXT_688) $(am__EXEEXT_689) $(am__EXEEXT_690) \ -+ pbkdf2_test.module$(EXEEXT) $(am__EXEEXT_665) \ -+ $(am__EXEEXT_666) $(am__EXEEXT_667) $(am__EXEEXT_668) \ -+ $(am__EXEEXT_669) $(am__EXEEXT_670) $(am__EXEEXT_671) \ -+ $(am__EXEEXT_672) $(am__EXEEXT_673) $(am__EXEEXT_674) \ -+ $(am__EXEEXT_675) $(am__EXEEXT_676) $(am__EXEEXT_677) \ -+ $(am__EXEEXT_678) $(am__EXEEXT_679) $(am__EXEEXT_680) \ -+ $(am__EXEEXT_681) $(am__EXEEXT_682) $(am__EXEEXT_683) \ -+ $(am__EXEEXT_684) $(am__EXEEXT_685) $(am__EXEEXT_686) \ -+ $(am__EXEEXT_687) $(am__EXEEXT_688) $(am__EXEEXT_689) \ - div_test.module$(EXEEXT) mul_test.module$(EXEEXT) \ - shift_test.module$(EXEEXT) cmp_test.module$(EXEEXT) \ - ctz_test.module$(EXEEXT) bswap_test.module$(EXEEXT) \ - videotest_checksum.module$(EXEEXT) \ - gfxterm_menu.module$(EXEEXT) cmdline_cat_test.module$(EXEEXT) \ - bitmap.module$(EXEEXT) bitmap_scale.module$(EXEEXT) \ -- $(am__EXEEXT_691) $(am__EXEEXT_692) $(am__EXEEXT_693) \ -- $(am__EXEEXT_694) $(am__EXEEXT_695) $(am__EXEEXT_696) \ -- $(am__EXEEXT_697) $(am__EXEEXT_698) $(am__EXEEXT_699) \ -+ $(am__EXEEXT_690) $(am__EXEEXT_691) $(am__EXEEXT_692) \ -+ $(am__EXEEXT_693) $(am__EXEEXT_694) $(am__EXEEXT_695) \ -+ $(am__EXEEXT_696) $(am__EXEEXT_697) $(am__EXEEXT_698) \ - jpeg.module$(EXEEXT) png.module$(EXEEXT) tga.module$(EXEEXT) \ -- $(am__EXEEXT_700) $(am__EXEEXT_701) $(am__EXEEXT_702) \ -- $(am__EXEEXT_703) $(am__EXEEXT_704) $(am__EXEEXT_705) \ -- $(am__EXEEXT_706) $(am__EXEEXT_707) $(am__EXEEXT_708) \ -- $(am__EXEEXT_709) $(am__EXEEXT_710) $(am__EXEEXT_711) \ -- $(am__EXEEXT_712) $(am__EXEEXT_713) $(am__EXEEXT_714) \ -- $(am__EXEEXT_715) $(am__EXEEXT_716) $(am__EXEEXT_717) \ -- $(am__EXEEXT_718) $(am__EXEEXT_719) $(am__EXEEXT_720) \ -- $(am__EXEEXT_721) $(am__EXEEXT_722) $(am__EXEEXT_723) \ -- $(am__EXEEXT_724) $(am__EXEEXT_725) $(am__EXEEXT_726) \ -- $(am__EXEEXT_727) $(am__EXEEXT_728) $(am__EXEEXT_729) \ -- $(am__EXEEXT_730) $(am__EXEEXT_731) $(am__EXEEXT_732) \ -- $(am__EXEEXT_733) $(am__EXEEXT_734) $(am__EXEEXT_735) \ -- $(am__EXEEXT_736) $(am__EXEEXT_737) $(am__EXEEXT_738) \ -- $(am__EXEEXT_739) $(am__EXEEXT_740) \ -- video_colors.module$(EXEEXT) $(am__EXEEXT_741) \ -- $(am__EXEEXT_742) datehook.module$(EXEEXT) net.module$(EXEEXT) \ -- tftp.module$(EXEEXT) http.module$(EXEEXT) $(am__EXEEXT_743) \ -- $(am__EXEEXT_744) $(am__EXEEXT_745) $(am__EXEEXT_746) \ -- $(am__EXEEXT_747) $(am__EXEEXT_748) $(am__EXEEXT_749) \ -- $(am__EXEEXT_750) $(am__EXEEXT_751) $(am__EXEEXT_752) \ -- $(am__EXEEXT_753) $(am__EXEEXT_754) $(am__EXEEXT_755) \ -- $(am__EXEEXT_756) $(am__EXEEXT_757) $(am__EXEEXT_758) \ -- $(am__EXEEXT_759) $(am__EXEEXT_760) \ -+ $(am__EXEEXT_699) $(am__EXEEXT_700) $(am__EXEEXT_701) \ -+ $(am__EXEEXT_702) $(am__EXEEXT_703) $(am__EXEEXT_704) \ -+ $(am__EXEEXT_705) $(am__EXEEXT_706) $(am__EXEEXT_707) \ -+ $(am__EXEEXT_708) $(am__EXEEXT_709) $(am__EXEEXT_710) \ -+ $(am__EXEEXT_711) $(am__EXEEXT_712) $(am__EXEEXT_713) \ -+ $(am__EXEEXT_714) $(am__EXEEXT_715) $(am__EXEEXT_716) \ -+ $(am__EXEEXT_717) $(am__EXEEXT_718) $(am__EXEEXT_719) \ -+ $(am__EXEEXT_720) $(am__EXEEXT_721) $(am__EXEEXT_722) \ -+ $(am__EXEEXT_723) $(am__EXEEXT_724) $(am__EXEEXT_725) \ -+ $(am__EXEEXT_726) $(am__EXEEXT_727) $(am__EXEEXT_728) \ -+ $(am__EXEEXT_729) $(am__EXEEXT_730) $(am__EXEEXT_731) \ -+ $(am__EXEEXT_732) $(am__EXEEXT_733) $(am__EXEEXT_734) \ -+ $(am__EXEEXT_735) $(am__EXEEXT_736) $(am__EXEEXT_737) \ -+ $(am__EXEEXT_738) $(am__EXEEXT_739) \ -+ video_colors.module$(EXEEXT) $(am__EXEEXT_740) \ -+ $(am__EXEEXT_741) datehook.module$(EXEEXT) net.module$(EXEEXT) \ -+ tftp.module$(EXEEXT) http.module$(EXEEXT) $(am__EXEEXT_742) \ -+ $(am__EXEEXT_743) $(am__EXEEXT_744) $(am__EXEEXT_745) \ -+ $(am__EXEEXT_746) $(am__EXEEXT_747) $(am__EXEEXT_748) \ -+ $(am__EXEEXT_749) $(am__EXEEXT_750) $(am__EXEEXT_751) \ -+ $(am__EXEEXT_752) $(am__EXEEXT_753) $(am__EXEEXT_754) \ -+ $(am__EXEEXT_755) $(am__EXEEXT_756) $(am__EXEEXT_757) \ -+ $(am__EXEEXT_758) $(am__EXEEXT_759) \ - syslinuxcfg.module$(EXEEXT) test_blockarg.module$(EXEEXT) \ - xzio.module$(EXEEXT) lzopio.module$(EXEEXT) \ -- testload.module$(EXEEXT) $(am__EXEEXT_761) $(am__EXEEXT_762) \ -- $(am__EXEEXT_763) $(am__EXEEXT_764) $(am__EXEEXT_765) \ -- $(am__EXEEXT_766) $(am__EXEEXT_767) $(am__EXEEXT_768) \ -- $(am__EXEEXT_769) $(am__EXEEXT_770) $(am__EXEEXT_771) \ -- $(am__EXEEXT_772) $(am__EXEEXT_773) $(am__EXEEXT_774) \ -- $(am__EXEEXT_775) $(am__EXEEXT_776) $(am__EXEEXT_777) \ -+ testload.module$(EXEEXT) $(am__EXEEXT_760) $(am__EXEEXT_761) \ -+ $(am__EXEEXT_762) $(am__EXEEXT_763) $(am__EXEEXT_764) \ -+ $(am__EXEEXT_765) $(am__EXEEXT_766) $(am__EXEEXT_767) \ -+ $(am__EXEEXT_768) $(am__EXEEXT_769) $(am__EXEEXT_770) \ -+ $(am__EXEEXT_771) $(am__EXEEXT_772) $(am__EXEEXT_773) \ -+ $(am__EXEEXT_774) $(am__EXEEXT_775) $(am__EXEEXT_776) \ - priority_queue.module$(EXEEXT) time.module$(EXEEXT) \ -- $(am__EXEEXT_778) $(am__EXEEXT_779) adler32.module$(EXEEXT) \ -+ $(am__EXEEXT_777) $(am__EXEEXT_778) adler32.module$(EXEEXT) \ - crc64.module$(EXEEXT) mpi.module$(EXEEXT) \ -- all_video.module$(EXEEXT) $(am__EXEEXT_780) $(am__EXEEXT_781) \ -- $(am__EXEEXT_782) $(am__EXEEXT_783) $(am__EXEEXT_784) \ -- $(am__EXEEXT_785) testspeed.module$(EXEEXT) $(am__EXEEXT_786) \ -+ all_video.module$(EXEEXT) $(am__EXEEXT_779) $(am__EXEEXT_780) \ -+ $(am__EXEEXT_781) $(am__EXEEXT_782) $(am__EXEEXT_783) \ -+ $(am__EXEEXT_784) testspeed.module$(EXEEXT) $(am__EXEEXT_785) \ - tr.module$(EXEEXT) progress.module$(EXEEXT) \ -- file.module$(EXEEXT) $(am__EXEEXT_787) $(am__EXEEXT_788) \ -- $(am__EXEEXT_789) $(am__EXEEXT_790) $(am__EXEEXT_791) \ -- $(am__EXEEXT_792) $(am__EXEEXT_793) $(am__EXEEXT_794) \ -- $(am__EXEEXT_795) $(am__EXEEXT_796) $(am__EXEEXT_797) \ -- $(am__EXEEXT_798) $(am__EXEEXT_799) $(am__EXEEXT_800) \ -+ file.module$(EXEEXT) $(am__EXEEXT_786) $(am__EXEEXT_787) \ -+ $(am__EXEEXT_788) $(am__EXEEXT_789) $(am__EXEEXT_790) \ -+ $(am__EXEEXT_791) $(am__EXEEXT_792) $(am__EXEEXT_793) \ -+ $(am__EXEEXT_794) $(am__EXEEXT_795) $(am__EXEEXT_796) \ -+ $(am__EXEEXT_797) $(am__EXEEXT_798) $(am__EXEEXT_799) \ - gcry_arcfour.module$(EXEEXT) gcry_blowfish.module$(EXEEXT) \ - gcry_camellia.module$(EXEEXT) gcry_cast5.module$(EXEEXT) \ - gcry_crc.module$(EXEEXT) gcry_des.module$(EXEEXT) \ -@@ -454,19 +454,19 @@ platform_PROGRAMS = disk.module$(EXEEXT) trig.module$(EXEEXT) \ - gcry_sha1.module$(EXEEXT) gcry_sha256.module$(EXEEXT) \ - gcry_sha512.module$(EXEEXT) gcry_tiger.module$(EXEEXT) \ - gcry_twofish.module$(EXEEXT) gcry_whirlpool.module$(EXEEXT) \ -- $(am__EXEEXT_801) $(am__EXEEXT_802) $(am__EXEEXT_803) \ -- $(am__EXEEXT_804) $(am__EXEEXT_805) $(am__EXEEXT_806) \ -- $(am__EXEEXT_807) $(am__EXEEXT_808) $(am__EXEEXT_809) \ -- $(am__EXEEXT_810) $(am__EXEEXT_811) $(am__EXEEXT_812) \ -- $(am__EXEEXT_813) $(am__EXEEXT_814) $(am__EXEEXT_815) \ -- $(am__EXEEXT_816) $(am__EXEEXT_817) $(am__EXEEXT_818) \ -- $(am__EXEEXT_819) $(am__EXEEXT_820) $(am__EXEEXT_821) \ -- $(am__EXEEXT_822) $(am__EXEEXT_823) $(am__EXEEXT_824) \ -- $(am__EXEEXT_825) $(am__EXEEXT_826) $(am__EXEEXT_827) \ -- $(am__EXEEXT_828) $(am__EXEEXT_829) $(am__EXEEXT_830) \ -- $(am__EXEEXT_831) $(am__EXEEXT_832) $(am__EXEEXT_833) \ -- $(am__EXEEXT_834) $(am__EXEEXT_835) $(am__EXEEXT_836) \ -- $(am__EXEEXT_837) $(am__EXEEXT_838) $(am__EXEEXT_839) -+ $(am__EXEEXT_800) $(am__EXEEXT_801) $(am__EXEEXT_802) \ -+ $(am__EXEEXT_803) $(am__EXEEXT_804) $(am__EXEEXT_805) \ -+ $(am__EXEEXT_806) $(am__EXEEXT_807) $(am__EXEEXT_808) \ -+ $(am__EXEEXT_809) $(am__EXEEXT_810) $(am__EXEEXT_811) \ -+ $(am__EXEEXT_812) $(am__EXEEXT_813) $(am__EXEEXT_814) \ -+ $(am__EXEEXT_815) $(am__EXEEXT_816) $(am__EXEEXT_817) \ -+ $(am__EXEEXT_818) $(am__EXEEXT_819) $(am__EXEEXT_820) \ -+ $(am__EXEEXT_821) $(am__EXEEXT_822) $(am__EXEEXT_823) \ -+ $(am__EXEEXT_824) $(am__EXEEXT_825) $(am__EXEEXT_826) \ -+ $(am__EXEEXT_827) $(am__EXEEXT_828) $(am__EXEEXT_829) \ -+ $(am__EXEEXT_830) $(am__EXEEXT_831) $(am__EXEEXT_832) \ -+ $(am__EXEEXT_833) $(am__EXEEXT_834) $(am__EXEEXT_835) \ -+ $(am__EXEEXT_836) $(am__EXEEXT_837) $(am__EXEEXT_838) - TESTS = - @COND_i386_pc_TRUE@am__append_3 = cs5536.module - @COND_i386_pc_TRUE@am__append_4 = cs5536.module$(EXEEXT) -@@ -2996,1864 +2996,1854 @@ TESTS = - @COND_riscv64_efi_TRUE@ reboot.marker - @COND_riscv64_efi_TRUE@am__append_2038 = reboot.mod - @COND_riscv64_efi_TRUE@am__append_2039 = reboot.marker --@COND_x86_64_efi_TRUE@am__append_2040 = shim_lock.module --@COND_x86_64_efi_TRUE@am__append_2041 = shim_lock.module$(EXEEXT) --@COND_x86_64_efi_FALSE@shim_lock_module_DEPENDENCIES = --@COND_x86_64_efi_TRUE@am__append_2042 = --@COND_x86_64_efi_TRUE@am__append_2043 = $(nodist_shim_lock_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_2044 = \ --@COND_x86_64_efi_TRUE@ $(nodist_shim_lock_module_SOURCES) \ --@COND_x86_64_efi_TRUE@ shim_lock.marker --@COND_x86_64_efi_TRUE@am__append_2045 = shim_lock.mod --@COND_x86_64_efi_TRUE@am__append_2046 = shim_lock.marker --@COND_i386_pc_TRUE@am__append_2047 = hdparm.module --@COND_i386_pc_TRUE@am__append_2048 = hdparm.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__append_2040 = hdparm.module -+@COND_i386_pc_TRUE@am__append_2041 = hdparm.module$(EXEEXT) - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_x86_64_efi_FALSE@hdparm_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_2049 = --@COND_i386_pc_TRUE@am__append_2050 = $(nodist_hdparm_module_SOURCES) --@COND_i386_pc_TRUE@am__append_2051 = $(nodist_hdparm_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_2042 = -+@COND_i386_pc_TRUE@am__append_2043 = $(nodist_hdparm_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_2044 = $(nodist_hdparm_module_SOURCES) \ - @COND_i386_pc_TRUE@ hdparm.marker --@COND_i386_pc_TRUE@am__append_2052 = hdparm.mod --@COND_i386_pc_TRUE@am__append_2053 = hdparm.marker --@COND_i386_efi_TRUE@am__append_2054 = hdparm.module --@COND_i386_efi_TRUE@am__append_2055 = hdparm.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_2056 = --@COND_i386_efi_TRUE@am__append_2057 = $(nodist_hdparm_module_SOURCES) --@COND_i386_efi_TRUE@am__append_2058 = $(nodist_hdparm_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_2045 = hdparm.mod -+@COND_i386_pc_TRUE@am__append_2046 = hdparm.marker -+@COND_i386_efi_TRUE@am__append_2047 = hdparm.module -+@COND_i386_efi_TRUE@am__append_2048 = hdparm.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_2049 = -+@COND_i386_efi_TRUE@am__append_2050 = $(nodist_hdparm_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_2051 = $(nodist_hdparm_module_SOURCES) \ - @COND_i386_efi_TRUE@ hdparm.marker --@COND_i386_efi_TRUE@am__append_2059 = hdparm.mod --@COND_i386_efi_TRUE@am__append_2060 = hdparm.marker --@COND_i386_qemu_TRUE@am__append_2061 = hdparm.module --@COND_i386_qemu_TRUE@am__append_2062 = hdparm.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_2063 = --@COND_i386_qemu_TRUE@am__append_2064 = $(nodist_hdparm_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_2065 = \ -+@COND_i386_efi_TRUE@am__append_2052 = hdparm.mod -+@COND_i386_efi_TRUE@am__append_2053 = hdparm.marker -+@COND_i386_qemu_TRUE@am__append_2054 = hdparm.module -+@COND_i386_qemu_TRUE@am__append_2055 = hdparm.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_2056 = -+@COND_i386_qemu_TRUE@am__append_2057 = $(nodist_hdparm_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_2058 = \ - @COND_i386_qemu_TRUE@ $(nodist_hdparm_module_SOURCES) \ - @COND_i386_qemu_TRUE@ hdparm.marker --@COND_i386_qemu_TRUE@am__append_2066 = hdparm.mod --@COND_i386_qemu_TRUE@am__append_2067 = hdparm.marker --@COND_i386_coreboot_TRUE@am__append_2068 = hdparm.module --@COND_i386_coreboot_TRUE@am__append_2069 = hdparm.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_2070 = --@COND_i386_coreboot_TRUE@am__append_2071 = $(nodist_hdparm_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_2072 = \ -+@COND_i386_qemu_TRUE@am__append_2059 = hdparm.mod -+@COND_i386_qemu_TRUE@am__append_2060 = hdparm.marker -+@COND_i386_coreboot_TRUE@am__append_2061 = hdparm.module -+@COND_i386_coreboot_TRUE@am__append_2062 = hdparm.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_2063 = -+@COND_i386_coreboot_TRUE@am__append_2064 = $(nodist_hdparm_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_2065 = \ - @COND_i386_coreboot_TRUE@ $(nodist_hdparm_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ hdparm.marker --@COND_i386_coreboot_TRUE@am__append_2073 = hdparm.mod --@COND_i386_coreboot_TRUE@am__append_2074 = hdparm.marker --@COND_i386_multiboot_TRUE@am__append_2075 = hdparm.module --@COND_i386_multiboot_TRUE@am__append_2076 = hdparm.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_2077 = --@COND_i386_multiboot_TRUE@am__append_2078 = $(nodist_hdparm_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_2079 = \ -+@COND_i386_coreboot_TRUE@am__append_2066 = hdparm.mod -+@COND_i386_coreboot_TRUE@am__append_2067 = hdparm.marker -+@COND_i386_multiboot_TRUE@am__append_2068 = hdparm.module -+@COND_i386_multiboot_TRUE@am__append_2069 = hdparm.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_2070 = -+@COND_i386_multiboot_TRUE@am__append_2071 = $(nodist_hdparm_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_2072 = \ - @COND_i386_multiboot_TRUE@ $(nodist_hdparm_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ hdparm.marker --@COND_i386_multiboot_TRUE@am__append_2080 = hdparm.mod --@COND_i386_multiboot_TRUE@am__append_2081 = hdparm.marker --@COND_i386_ieee1275_TRUE@am__append_2082 = hdparm.module --@COND_i386_ieee1275_TRUE@am__append_2083 = hdparm.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_2084 = --@COND_i386_ieee1275_TRUE@am__append_2085 = $(nodist_hdparm_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_2086 = \ -+@COND_i386_multiboot_TRUE@am__append_2073 = hdparm.mod -+@COND_i386_multiboot_TRUE@am__append_2074 = hdparm.marker -+@COND_i386_ieee1275_TRUE@am__append_2075 = hdparm.module -+@COND_i386_ieee1275_TRUE@am__append_2076 = hdparm.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_2077 = -+@COND_i386_ieee1275_TRUE@am__append_2078 = $(nodist_hdparm_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_2079 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_hdparm_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ hdparm.marker --@COND_i386_ieee1275_TRUE@am__append_2087 = hdparm.mod --@COND_i386_ieee1275_TRUE@am__append_2088 = hdparm.marker --@COND_x86_64_efi_TRUE@am__append_2089 = hdparm.module --@COND_x86_64_efi_TRUE@am__append_2090 = hdparm.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_2091 = --@COND_x86_64_efi_TRUE@am__append_2092 = $(nodist_hdparm_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_2093 = \ -+@COND_i386_ieee1275_TRUE@am__append_2080 = hdparm.mod -+@COND_i386_ieee1275_TRUE@am__append_2081 = hdparm.marker -+@COND_x86_64_efi_TRUE@am__append_2082 = hdparm.module -+@COND_x86_64_efi_TRUE@am__append_2083 = hdparm.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_2084 = -+@COND_x86_64_efi_TRUE@am__append_2085 = $(nodist_hdparm_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_2086 = \ - @COND_x86_64_efi_TRUE@ $(nodist_hdparm_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ hdparm.marker --@COND_x86_64_efi_TRUE@am__append_2094 = hdparm.mod --@COND_x86_64_efi_TRUE@am__append_2095 = hdparm.marker --@COND_mips_loongson_TRUE@am__append_2096 = hdparm.module --@COND_mips_loongson_TRUE@am__append_2097 = hdparm.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__append_2098 = --@COND_mips_loongson_TRUE@am__append_2099 = $(nodist_hdparm_module_SOURCES) --@COND_mips_loongson_TRUE@am__append_2100 = \ -+@COND_x86_64_efi_TRUE@am__append_2087 = hdparm.mod -+@COND_x86_64_efi_TRUE@am__append_2088 = hdparm.marker -+@COND_mips_loongson_TRUE@am__append_2089 = hdparm.module -+@COND_mips_loongson_TRUE@am__append_2090 = hdparm.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__append_2091 = -+@COND_mips_loongson_TRUE@am__append_2092 = $(nodist_hdparm_module_SOURCES) -+@COND_mips_loongson_TRUE@am__append_2093 = \ - @COND_mips_loongson_TRUE@ $(nodist_hdparm_module_SOURCES) \ - @COND_mips_loongson_TRUE@ hdparm.marker --@COND_mips_loongson_TRUE@am__append_2101 = hdparm.mod --@COND_mips_loongson_TRUE@am__append_2102 = hdparm.marker --@COND_mips_qemu_mips_TRUE@am__append_2103 = hdparm.module --@COND_mips_qemu_mips_TRUE@am__append_2104 = hdparm.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__append_2105 = --@COND_mips_qemu_mips_TRUE@am__append_2106 = $(nodist_hdparm_module_SOURCES) --@COND_mips_qemu_mips_TRUE@am__append_2107 = \ -+@COND_mips_loongson_TRUE@am__append_2094 = hdparm.mod -+@COND_mips_loongson_TRUE@am__append_2095 = hdparm.marker -+@COND_mips_qemu_mips_TRUE@am__append_2096 = hdparm.module -+@COND_mips_qemu_mips_TRUE@am__append_2097 = hdparm.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__append_2098 = -+@COND_mips_qemu_mips_TRUE@am__append_2099 = $(nodist_hdparm_module_SOURCES) -+@COND_mips_qemu_mips_TRUE@am__append_2100 = \ - @COND_mips_qemu_mips_TRUE@ $(nodist_hdparm_module_SOURCES) \ - @COND_mips_qemu_mips_TRUE@ hdparm.marker --@COND_mips_qemu_mips_TRUE@am__append_2108 = hdparm.mod --@COND_mips_qemu_mips_TRUE@am__append_2109 = hdparm.marker --@COND_i386_efi_TRUE@am__append_2110 = loadbios.module --@COND_i386_efi_TRUE@am__append_2111 = loadbios.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__append_2101 = hdparm.mod -+@COND_mips_qemu_mips_TRUE@am__append_2102 = hdparm.marker -+@COND_i386_efi_TRUE@am__append_2103 = loadbios.module -+@COND_i386_efi_TRUE@am__append_2104 = loadbios.module$(EXEEXT) - @COND_i386_efi_FALSE@@COND_x86_64_efi_FALSE@loadbios_module_DEPENDENCIES = --@COND_i386_efi_TRUE@am__append_2112 = --@COND_i386_efi_TRUE@am__append_2113 = $(nodist_loadbios_module_SOURCES) --@COND_i386_efi_TRUE@am__append_2114 = \ -+@COND_i386_efi_TRUE@am__append_2105 = -+@COND_i386_efi_TRUE@am__append_2106 = $(nodist_loadbios_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_2107 = \ - @COND_i386_efi_TRUE@ $(nodist_loadbios_module_SOURCES) \ - @COND_i386_efi_TRUE@ loadbios.marker --@COND_i386_efi_TRUE@am__append_2115 = loadbios.mod --@COND_i386_efi_TRUE@am__append_2116 = loadbios.marker --@COND_x86_64_efi_TRUE@am__append_2117 = loadbios.module --@COND_x86_64_efi_TRUE@am__append_2118 = loadbios.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_2119 = --@COND_x86_64_efi_TRUE@am__append_2120 = $(nodist_loadbios_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_2121 = \ -+@COND_i386_efi_TRUE@am__append_2108 = loadbios.mod -+@COND_i386_efi_TRUE@am__append_2109 = loadbios.marker -+@COND_x86_64_efi_TRUE@am__append_2110 = loadbios.module -+@COND_x86_64_efi_TRUE@am__append_2111 = loadbios.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_2112 = -+@COND_x86_64_efi_TRUE@am__append_2113 = $(nodist_loadbios_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_2114 = \ - @COND_x86_64_efi_TRUE@ $(nodist_loadbios_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ loadbios.marker --@COND_x86_64_efi_TRUE@am__append_2122 = loadbios.mod --@COND_x86_64_efi_TRUE@am__append_2123 = loadbios.marker --@COND_i386_pc_TRUE@am__append_2124 = lspci.module --@COND_i386_pc_TRUE@am__append_2125 = lspci.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_2115 = loadbios.mod -+@COND_x86_64_efi_TRUE@am__append_2116 = loadbios.marker -+@COND_i386_pc_TRUE@am__append_2117 = lspci.module -+@COND_i386_pc_TRUE@am__append_2118 = lspci.module$(EXEEXT) - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_mips_loongson_FALSE@@COND_x86_64_efi_FALSE@lspci_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_2126 = --@COND_i386_pc_TRUE@am__append_2127 = $(nodist_lspci_module_SOURCES) --@COND_i386_pc_TRUE@am__append_2128 = $(nodist_lspci_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_2119 = -+@COND_i386_pc_TRUE@am__append_2120 = $(nodist_lspci_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_2121 = $(nodist_lspci_module_SOURCES) \ - @COND_i386_pc_TRUE@ lspci.marker --@COND_i386_pc_TRUE@am__append_2129 = lspci.mod --@COND_i386_pc_TRUE@am__append_2130 = lspci.marker --@COND_i386_efi_TRUE@am__append_2131 = lspci.module --@COND_i386_efi_TRUE@am__append_2132 = lspci.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_2133 = --@COND_i386_efi_TRUE@am__append_2134 = $(nodist_lspci_module_SOURCES) --@COND_i386_efi_TRUE@am__append_2135 = $(nodist_lspci_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_2122 = lspci.mod -+@COND_i386_pc_TRUE@am__append_2123 = lspci.marker -+@COND_i386_efi_TRUE@am__append_2124 = lspci.module -+@COND_i386_efi_TRUE@am__append_2125 = lspci.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_2126 = -+@COND_i386_efi_TRUE@am__append_2127 = $(nodist_lspci_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_2128 = $(nodist_lspci_module_SOURCES) \ - @COND_i386_efi_TRUE@ lspci.marker --@COND_i386_efi_TRUE@am__append_2136 = lspci.mod --@COND_i386_efi_TRUE@am__append_2137 = lspci.marker --@COND_i386_qemu_TRUE@am__append_2138 = lspci.module --@COND_i386_qemu_TRUE@am__append_2139 = lspci.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_2140 = --@COND_i386_qemu_TRUE@am__append_2141 = $(nodist_lspci_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_2142 = $(nodist_lspci_module_SOURCES) \ -+@COND_i386_efi_TRUE@am__append_2129 = lspci.mod -+@COND_i386_efi_TRUE@am__append_2130 = lspci.marker -+@COND_i386_qemu_TRUE@am__append_2131 = lspci.module -+@COND_i386_qemu_TRUE@am__append_2132 = lspci.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_2133 = -+@COND_i386_qemu_TRUE@am__append_2134 = $(nodist_lspci_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_2135 = $(nodist_lspci_module_SOURCES) \ - @COND_i386_qemu_TRUE@ lspci.marker --@COND_i386_qemu_TRUE@am__append_2143 = lspci.mod --@COND_i386_qemu_TRUE@am__append_2144 = lspci.marker --@COND_i386_coreboot_TRUE@am__append_2145 = lspci.module --@COND_i386_coreboot_TRUE@am__append_2146 = lspci.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_2147 = --@COND_i386_coreboot_TRUE@am__append_2148 = $(nodist_lspci_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_2149 = \ -+@COND_i386_qemu_TRUE@am__append_2136 = lspci.mod -+@COND_i386_qemu_TRUE@am__append_2137 = lspci.marker -+@COND_i386_coreboot_TRUE@am__append_2138 = lspci.module -+@COND_i386_coreboot_TRUE@am__append_2139 = lspci.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_2140 = -+@COND_i386_coreboot_TRUE@am__append_2141 = $(nodist_lspci_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_2142 = \ - @COND_i386_coreboot_TRUE@ $(nodist_lspci_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ lspci.marker --@COND_i386_coreboot_TRUE@am__append_2150 = lspci.mod --@COND_i386_coreboot_TRUE@am__append_2151 = lspci.marker --@COND_i386_multiboot_TRUE@am__append_2152 = lspci.module --@COND_i386_multiboot_TRUE@am__append_2153 = lspci.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_2154 = --@COND_i386_multiboot_TRUE@am__append_2155 = $(nodist_lspci_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_2156 = \ -+@COND_i386_coreboot_TRUE@am__append_2143 = lspci.mod -+@COND_i386_coreboot_TRUE@am__append_2144 = lspci.marker -+@COND_i386_multiboot_TRUE@am__append_2145 = lspci.module -+@COND_i386_multiboot_TRUE@am__append_2146 = lspci.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_2147 = -+@COND_i386_multiboot_TRUE@am__append_2148 = $(nodist_lspci_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_2149 = \ - @COND_i386_multiboot_TRUE@ $(nodist_lspci_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ lspci.marker --@COND_i386_multiboot_TRUE@am__append_2157 = lspci.mod --@COND_i386_multiboot_TRUE@am__append_2158 = lspci.marker --@COND_i386_ieee1275_TRUE@am__append_2159 = lspci.module --@COND_i386_ieee1275_TRUE@am__append_2160 = lspci.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_2161 = --@COND_i386_ieee1275_TRUE@am__append_2162 = $(nodist_lspci_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_2163 = \ -+@COND_i386_multiboot_TRUE@am__append_2150 = lspci.mod -+@COND_i386_multiboot_TRUE@am__append_2151 = lspci.marker -+@COND_i386_ieee1275_TRUE@am__append_2152 = lspci.module -+@COND_i386_ieee1275_TRUE@am__append_2153 = lspci.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_2154 = -+@COND_i386_ieee1275_TRUE@am__append_2155 = $(nodist_lspci_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_2156 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_lspci_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ lspci.marker --@COND_i386_ieee1275_TRUE@am__append_2164 = lspci.mod --@COND_i386_ieee1275_TRUE@am__append_2165 = lspci.marker --@COND_x86_64_efi_TRUE@am__append_2166 = lspci.module --@COND_x86_64_efi_TRUE@am__append_2167 = lspci.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_2168 = --@COND_x86_64_efi_TRUE@am__append_2169 = $(nodist_lspci_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_2170 = \ -+@COND_i386_ieee1275_TRUE@am__append_2157 = lspci.mod -+@COND_i386_ieee1275_TRUE@am__append_2158 = lspci.marker -+@COND_x86_64_efi_TRUE@am__append_2159 = lspci.module -+@COND_x86_64_efi_TRUE@am__append_2160 = lspci.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_2161 = -+@COND_x86_64_efi_TRUE@am__append_2162 = $(nodist_lspci_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_2163 = \ - @COND_x86_64_efi_TRUE@ $(nodist_lspci_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ lspci.marker --@COND_x86_64_efi_TRUE@am__append_2171 = lspci.mod --@COND_x86_64_efi_TRUE@am__append_2172 = lspci.marker --@COND_mips_loongson_TRUE@am__append_2173 = lspci.module --@COND_mips_loongson_TRUE@am__append_2174 = lspci.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__append_2175 = --@COND_mips_loongson_TRUE@am__append_2176 = $(nodist_lspci_module_SOURCES) --@COND_mips_loongson_TRUE@am__append_2177 = \ -+@COND_x86_64_efi_TRUE@am__append_2164 = lspci.mod -+@COND_x86_64_efi_TRUE@am__append_2165 = lspci.marker -+@COND_mips_loongson_TRUE@am__append_2166 = lspci.module -+@COND_mips_loongson_TRUE@am__append_2167 = lspci.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__append_2168 = -+@COND_mips_loongson_TRUE@am__append_2169 = $(nodist_lspci_module_SOURCES) -+@COND_mips_loongson_TRUE@am__append_2170 = \ - @COND_mips_loongson_TRUE@ $(nodist_lspci_module_SOURCES) \ - @COND_mips_loongson_TRUE@ lspci.marker --@COND_mips_loongson_TRUE@am__append_2178 = lspci.mod --@COND_mips_loongson_TRUE@am__append_2179 = lspci.marker --@COND_i386_pc_TRUE@am__append_2180 = play.module --@COND_i386_pc_TRUE@am__append_2181 = play.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__append_2171 = lspci.mod -+@COND_mips_loongson_TRUE@am__append_2172 = lspci.marker -+@COND_i386_pc_TRUE@am__append_2173 = play.module -+@COND_i386_pc_TRUE@am__append_2174 = play.module$(EXEEXT) - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_x86_64_efi_FALSE@play_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_2182 = --@COND_i386_pc_TRUE@am__append_2183 = $(nodist_play_module_SOURCES) --@COND_i386_pc_TRUE@am__append_2184 = $(nodist_play_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_2175 = -+@COND_i386_pc_TRUE@am__append_2176 = $(nodist_play_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_2177 = $(nodist_play_module_SOURCES) \ - @COND_i386_pc_TRUE@ play.marker --@COND_i386_pc_TRUE@am__append_2185 = play.mod --@COND_i386_pc_TRUE@am__append_2186 = play.marker --@COND_i386_efi_TRUE@am__append_2187 = play.module --@COND_i386_efi_TRUE@am__append_2188 = play.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_2189 = --@COND_i386_efi_TRUE@am__append_2190 = $(nodist_play_module_SOURCES) --@COND_i386_efi_TRUE@am__append_2191 = $(nodist_play_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_2178 = play.mod -+@COND_i386_pc_TRUE@am__append_2179 = play.marker -+@COND_i386_efi_TRUE@am__append_2180 = play.module -+@COND_i386_efi_TRUE@am__append_2181 = play.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_2182 = -+@COND_i386_efi_TRUE@am__append_2183 = $(nodist_play_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_2184 = $(nodist_play_module_SOURCES) \ - @COND_i386_efi_TRUE@ play.marker --@COND_i386_efi_TRUE@am__append_2192 = play.mod --@COND_i386_efi_TRUE@am__append_2193 = play.marker --@COND_i386_qemu_TRUE@am__append_2194 = play.module --@COND_i386_qemu_TRUE@am__append_2195 = play.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_2196 = --@COND_i386_qemu_TRUE@am__append_2197 = $(nodist_play_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_2198 = $(nodist_play_module_SOURCES) \ -+@COND_i386_efi_TRUE@am__append_2185 = play.mod -+@COND_i386_efi_TRUE@am__append_2186 = play.marker -+@COND_i386_qemu_TRUE@am__append_2187 = play.module -+@COND_i386_qemu_TRUE@am__append_2188 = play.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_2189 = -+@COND_i386_qemu_TRUE@am__append_2190 = $(nodist_play_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_2191 = $(nodist_play_module_SOURCES) \ - @COND_i386_qemu_TRUE@ play.marker --@COND_i386_qemu_TRUE@am__append_2199 = play.mod --@COND_i386_qemu_TRUE@am__append_2200 = play.marker --@COND_i386_coreboot_TRUE@am__append_2201 = play.module --@COND_i386_coreboot_TRUE@am__append_2202 = play.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_2203 = --@COND_i386_coreboot_TRUE@am__append_2204 = $(nodist_play_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_2205 = \ -+@COND_i386_qemu_TRUE@am__append_2192 = play.mod -+@COND_i386_qemu_TRUE@am__append_2193 = play.marker -+@COND_i386_coreboot_TRUE@am__append_2194 = play.module -+@COND_i386_coreboot_TRUE@am__append_2195 = play.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_2196 = -+@COND_i386_coreboot_TRUE@am__append_2197 = $(nodist_play_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_2198 = \ - @COND_i386_coreboot_TRUE@ $(nodist_play_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ play.marker --@COND_i386_coreboot_TRUE@am__append_2206 = play.mod --@COND_i386_coreboot_TRUE@am__append_2207 = play.marker --@COND_i386_multiboot_TRUE@am__append_2208 = play.module --@COND_i386_multiboot_TRUE@am__append_2209 = play.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_2210 = --@COND_i386_multiboot_TRUE@am__append_2211 = $(nodist_play_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_2212 = \ -+@COND_i386_coreboot_TRUE@am__append_2199 = play.mod -+@COND_i386_coreboot_TRUE@am__append_2200 = play.marker -+@COND_i386_multiboot_TRUE@am__append_2201 = play.module -+@COND_i386_multiboot_TRUE@am__append_2202 = play.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_2203 = -+@COND_i386_multiboot_TRUE@am__append_2204 = $(nodist_play_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_2205 = \ - @COND_i386_multiboot_TRUE@ $(nodist_play_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ play.marker --@COND_i386_multiboot_TRUE@am__append_2213 = play.mod --@COND_i386_multiboot_TRUE@am__append_2214 = play.marker --@COND_i386_ieee1275_TRUE@am__append_2215 = play.module --@COND_i386_ieee1275_TRUE@am__append_2216 = play.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_2217 = --@COND_i386_ieee1275_TRUE@am__append_2218 = $(nodist_play_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_2219 = \ -+@COND_i386_multiboot_TRUE@am__append_2206 = play.mod -+@COND_i386_multiboot_TRUE@am__append_2207 = play.marker -+@COND_i386_ieee1275_TRUE@am__append_2208 = play.module -+@COND_i386_ieee1275_TRUE@am__append_2209 = play.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_2210 = -+@COND_i386_ieee1275_TRUE@am__append_2211 = $(nodist_play_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_2212 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_play_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ play.marker --@COND_i386_ieee1275_TRUE@am__append_2220 = play.mod --@COND_i386_ieee1275_TRUE@am__append_2221 = play.marker --@COND_x86_64_efi_TRUE@am__append_2222 = play.module --@COND_x86_64_efi_TRUE@am__append_2223 = play.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_2224 = --@COND_x86_64_efi_TRUE@am__append_2225 = $(nodist_play_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_2226 = $(nodist_play_module_SOURCES) \ -+@COND_i386_ieee1275_TRUE@am__append_2213 = play.mod -+@COND_i386_ieee1275_TRUE@am__append_2214 = play.marker -+@COND_x86_64_efi_TRUE@am__append_2215 = play.module -+@COND_x86_64_efi_TRUE@am__append_2216 = play.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_2217 = -+@COND_x86_64_efi_TRUE@am__append_2218 = $(nodist_play_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_2219 = $(nodist_play_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ play.marker --@COND_x86_64_efi_TRUE@am__append_2227 = play.mod --@COND_x86_64_efi_TRUE@am__append_2228 = play.marker --@COND_i386_pc_TRUE@am__append_2229 = spkmodem.module --@COND_i386_pc_TRUE@am__append_2230 = spkmodem.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_2220 = play.mod -+@COND_x86_64_efi_TRUE@am__append_2221 = play.marker -+@COND_i386_pc_TRUE@am__append_2222 = spkmodem.module -+@COND_i386_pc_TRUE@am__append_2223 = spkmodem.module$(EXEEXT) - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_x86_64_efi_FALSE@spkmodem_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_2231 = --@COND_i386_pc_TRUE@am__append_2232 = $(nodist_spkmodem_module_SOURCES) --@COND_i386_pc_TRUE@am__append_2233 = \ -+@COND_i386_pc_TRUE@am__append_2224 = -+@COND_i386_pc_TRUE@am__append_2225 = $(nodist_spkmodem_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_2226 = \ - @COND_i386_pc_TRUE@ $(nodist_spkmodem_module_SOURCES) \ - @COND_i386_pc_TRUE@ spkmodem.marker --@COND_i386_pc_TRUE@am__append_2234 = spkmodem.mod --@COND_i386_pc_TRUE@am__append_2235 = spkmodem.marker --@COND_i386_efi_TRUE@am__append_2236 = spkmodem.module --@COND_i386_efi_TRUE@am__append_2237 = spkmodem.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_2238 = --@COND_i386_efi_TRUE@am__append_2239 = $(nodist_spkmodem_module_SOURCES) --@COND_i386_efi_TRUE@am__append_2240 = \ -+@COND_i386_pc_TRUE@am__append_2227 = spkmodem.mod -+@COND_i386_pc_TRUE@am__append_2228 = spkmodem.marker -+@COND_i386_efi_TRUE@am__append_2229 = spkmodem.module -+@COND_i386_efi_TRUE@am__append_2230 = spkmodem.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_2231 = -+@COND_i386_efi_TRUE@am__append_2232 = $(nodist_spkmodem_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_2233 = \ - @COND_i386_efi_TRUE@ $(nodist_spkmodem_module_SOURCES) \ - @COND_i386_efi_TRUE@ spkmodem.marker --@COND_i386_efi_TRUE@am__append_2241 = spkmodem.mod --@COND_i386_efi_TRUE@am__append_2242 = spkmodem.marker --@COND_i386_qemu_TRUE@am__append_2243 = spkmodem.module --@COND_i386_qemu_TRUE@am__append_2244 = spkmodem.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_2245 = --@COND_i386_qemu_TRUE@am__append_2246 = $(nodist_spkmodem_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_2247 = \ -+@COND_i386_efi_TRUE@am__append_2234 = spkmodem.mod -+@COND_i386_efi_TRUE@am__append_2235 = spkmodem.marker -+@COND_i386_qemu_TRUE@am__append_2236 = spkmodem.module -+@COND_i386_qemu_TRUE@am__append_2237 = spkmodem.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_2238 = -+@COND_i386_qemu_TRUE@am__append_2239 = $(nodist_spkmodem_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_2240 = \ - @COND_i386_qemu_TRUE@ $(nodist_spkmodem_module_SOURCES) \ - @COND_i386_qemu_TRUE@ spkmodem.marker --@COND_i386_qemu_TRUE@am__append_2248 = spkmodem.mod --@COND_i386_qemu_TRUE@am__append_2249 = spkmodem.marker --@COND_i386_coreboot_TRUE@am__append_2250 = spkmodem.module --@COND_i386_coreboot_TRUE@am__append_2251 = spkmodem.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_2252 = --@COND_i386_coreboot_TRUE@am__append_2253 = $(nodist_spkmodem_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_2254 = \ -+@COND_i386_qemu_TRUE@am__append_2241 = spkmodem.mod -+@COND_i386_qemu_TRUE@am__append_2242 = spkmodem.marker -+@COND_i386_coreboot_TRUE@am__append_2243 = spkmodem.module -+@COND_i386_coreboot_TRUE@am__append_2244 = spkmodem.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_2245 = -+@COND_i386_coreboot_TRUE@am__append_2246 = $(nodist_spkmodem_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_2247 = \ - @COND_i386_coreboot_TRUE@ $(nodist_spkmodem_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ spkmodem.marker --@COND_i386_coreboot_TRUE@am__append_2255 = spkmodem.mod --@COND_i386_coreboot_TRUE@am__append_2256 = spkmodem.marker --@COND_i386_multiboot_TRUE@am__append_2257 = spkmodem.module --@COND_i386_multiboot_TRUE@am__append_2258 = spkmodem.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_2259 = --@COND_i386_multiboot_TRUE@am__append_2260 = $(nodist_spkmodem_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_2261 = \ -+@COND_i386_coreboot_TRUE@am__append_2248 = spkmodem.mod -+@COND_i386_coreboot_TRUE@am__append_2249 = spkmodem.marker -+@COND_i386_multiboot_TRUE@am__append_2250 = spkmodem.module -+@COND_i386_multiboot_TRUE@am__append_2251 = spkmodem.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_2252 = -+@COND_i386_multiboot_TRUE@am__append_2253 = $(nodist_spkmodem_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_2254 = \ - @COND_i386_multiboot_TRUE@ $(nodist_spkmodem_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ spkmodem.marker --@COND_i386_multiboot_TRUE@am__append_2262 = spkmodem.mod --@COND_i386_multiboot_TRUE@am__append_2263 = spkmodem.marker --@COND_i386_ieee1275_TRUE@am__append_2264 = spkmodem.module --@COND_i386_ieee1275_TRUE@am__append_2265 = spkmodem.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_2266 = --@COND_i386_ieee1275_TRUE@am__append_2267 = $(nodist_spkmodem_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_2268 = \ -+@COND_i386_multiboot_TRUE@am__append_2255 = spkmodem.mod -+@COND_i386_multiboot_TRUE@am__append_2256 = spkmodem.marker -+@COND_i386_ieee1275_TRUE@am__append_2257 = spkmodem.module -+@COND_i386_ieee1275_TRUE@am__append_2258 = spkmodem.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_2259 = -+@COND_i386_ieee1275_TRUE@am__append_2260 = $(nodist_spkmodem_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_2261 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_spkmodem_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ spkmodem.marker --@COND_i386_ieee1275_TRUE@am__append_2269 = spkmodem.mod --@COND_i386_ieee1275_TRUE@am__append_2270 = spkmodem.marker --@COND_x86_64_efi_TRUE@am__append_2271 = spkmodem.module --@COND_x86_64_efi_TRUE@am__append_2272 = spkmodem.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_2273 = --@COND_x86_64_efi_TRUE@am__append_2274 = $(nodist_spkmodem_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_2275 = \ -+@COND_i386_ieee1275_TRUE@am__append_2262 = spkmodem.mod -+@COND_i386_ieee1275_TRUE@am__append_2263 = spkmodem.marker -+@COND_x86_64_efi_TRUE@am__append_2264 = spkmodem.module -+@COND_x86_64_efi_TRUE@am__append_2265 = spkmodem.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_2266 = -+@COND_x86_64_efi_TRUE@am__append_2267 = $(nodist_spkmodem_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_2268 = \ - @COND_x86_64_efi_TRUE@ $(nodist_spkmodem_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ spkmodem.marker --@COND_x86_64_efi_TRUE@am__append_2276 = spkmodem.mod --@COND_x86_64_efi_TRUE@am__append_2277 = spkmodem.marker --@COND_i386_pc_TRUE@am__append_2278 = morse.module --@COND_i386_pc_TRUE@am__append_2279 = morse.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_2269 = spkmodem.mod -+@COND_x86_64_efi_TRUE@am__append_2270 = spkmodem.marker -+@COND_i386_pc_TRUE@am__append_2271 = morse.module -+@COND_i386_pc_TRUE@am__append_2272 = morse.module$(EXEEXT) - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_x86_64_efi_FALSE@morse_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_2280 = --@COND_i386_pc_TRUE@am__append_2281 = $(nodist_morse_module_SOURCES) --@COND_i386_pc_TRUE@am__append_2282 = $(nodist_morse_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_2273 = -+@COND_i386_pc_TRUE@am__append_2274 = $(nodist_morse_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_2275 = $(nodist_morse_module_SOURCES) \ - @COND_i386_pc_TRUE@ morse.marker --@COND_i386_pc_TRUE@am__append_2283 = morse.mod --@COND_i386_pc_TRUE@am__append_2284 = morse.marker --@COND_i386_efi_TRUE@am__append_2285 = morse.module --@COND_i386_efi_TRUE@am__append_2286 = morse.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_2287 = --@COND_i386_efi_TRUE@am__append_2288 = $(nodist_morse_module_SOURCES) --@COND_i386_efi_TRUE@am__append_2289 = $(nodist_morse_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_2276 = morse.mod -+@COND_i386_pc_TRUE@am__append_2277 = morse.marker -+@COND_i386_efi_TRUE@am__append_2278 = morse.module -+@COND_i386_efi_TRUE@am__append_2279 = morse.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_2280 = -+@COND_i386_efi_TRUE@am__append_2281 = $(nodist_morse_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_2282 = $(nodist_morse_module_SOURCES) \ - @COND_i386_efi_TRUE@ morse.marker --@COND_i386_efi_TRUE@am__append_2290 = morse.mod --@COND_i386_efi_TRUE@am__append_2291 = morse.marker --@COND_i386_qemu_TRUE@am__append_2292 = morse.module --@COND_i386_qemu_TRUE@am__append_2293 = morse.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_2294 = --@COND_i386_qemu_TRUE@am__append_2295 = $(nodist_morse_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_2296 = $(nodist_morse_module_SOURCES) \ -+@COND_i386_efi_TRUE@am__append_2283 = morse.mod -+@COND_i386_efi_TRUE@am__append_2284 = morse.marker -+@COND_i386_qemu_TRUE@am__append_2285 = morse.module -+@COND_i386_qemu_TRUE@am__append_2286 = morse.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_2287 = -+@COND_i386_qemu_TRUE@am__append_2288 = $(nodist_morse_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_2289 = $(nodist_morse_module_SOURCES) \ - @COND_i386_qemu_TRUE@ morse.marker --@COND_i386_qemu_TRUE@am__append_2297 = morse.mod --@COND_i386_qemu_TRUE@am__append_2298 = morse.marker --@COND_i386_coreboot_TRUE@am__append_2299 = morse.module --@COND_i386_coreboot_TRUE@am__append_2300 = morse.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_2301 = --@COND_i386_coreboot_TRUE@am__append_2302 = $(nodist_morse_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_2303 = \ -+@COND_i386_qemu_TRUE@am__append_2290 = morse.mod -+@COND_i386_qemu_TRUE@am__append_2291 = morse.marker -+@COND_i386_coreboot_TRUE@am__append_2292 = morse.module -+@COND_i386_coreboot_TRUE@am__append_2293 = morse.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_2294 = -+@COND_i386_coreboot_TRUE@am__append_2295 = $(nodist_morse_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_2296 = \ - @COND_i386_coreboot_TRUE@ $(nodist_morse_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ morse.marker --@COND_i386_coreboot_TRUE@am__append_2304 = morse.mod --@COND_i386_coreboot_TRUE@am__append_2305 = morse.marker --@COND_i386_multiboot_TRUE@am__append_2306 = morse.module --@COND_i386_multiboot_TRUE@am__append_2307 = morse.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_2308 = --@COND_i386_multiboot_TRUE@am__append_2309 = $(nodist_morse_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_2310 = \ -+@COND_i386_coreboot_TRUE@am__append_2297 = morse.mod -+@COND_i386_coreboot_TRUE@am__append_2298 = morse.marker -+@COND_i386_multiboot_TRUE@am__append_2299 = morse.module -+@COND_i386_multiboot_TRUE@am__append_2300 = morse.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_2301 = -+@COND_i386_multiboot_TRUE@am__append_2302 = $(nodist_morse_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_2303 = \ - @COND_i386_multiboot_TRUE@ $(nodist_morse_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ morse.marker --@COND_i386_multiboot_TRUE@am__append_2311 = morse.mod --@COND_i386_multiboot_TRUE@am__append_2312 = morse.marker --@COND_i386_ieee1275_TRUE@am__append_2313 = morse.module --@COND_i386_ieee1275_TRUE@am__append_2314 = morse.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_2315 = --@COND_i386_ieee1275_TRUE@am__append_2316 = $(nodist_morse_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_2317 = \ -+@COND_i386_multiboot_TRUE@am__append_2304 = morse.mod -+@COND_i386_multiboot_TRUE@am__append_2305 = morse.marker -+@COND_i386_ieee1275_TRUE@am__append_2306 = morse.module -+@COND_i386_ieee1275_TRUE@am__append_2307 = morse.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_2308 = -+@COND_i386_ieee1275_TRUE@am__append_2309 = $(nodist_morse_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_2310 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_morse_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ morse.marker --@COND_i386_ieee1275_TRUE@am__append_2318 = morse.mod --@COND_i386_ieee1275_TRUE@am__append_2319 = morse.marker --@COND_x86_64_efi_TRUE@am__append_2320 = morse.module --@COND_x86_64_efi_TRUE@am__append_2321 = morse.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_2322 = --@COND_x86_64_efi_TRUE@am__append_2323 = $(nodist_morse_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_2324 = \ -+@COND_i386_ieee1275_TRUE@am__append_2311 = morse.mod -+@COND_i386_ieee1275_TRUE@am__append_2312 = morse.marker -+@COND_x86_64_efi_TRUE@am__append_2313 = morse.module -+@COND_x86_64_efi_TRUE@am__append_2314 = morse.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_2315 = -+@COND_x86_64_efi_TRUE@am__append_2316 = $(nodist_morse_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_2317 = \ - @COND_x86_64_efi_TRUE@ $(nodist_morse_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ morse.marker --@COND_x86_64_efi_TRUE@am__append_2325 = morse.mod --@COND_x86_64_efi_TRUE@am__append_2326 = morse.marker --@COND_i386_pc_TRUE@am__append_2327 = setpci.module --@COND_i386_pc_TRUE@am__append_2328 = setpci.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_2318 = morse.mod -+@COND_x86_64_efi_TRUE@am__append_2319 = morse.marker -+@COND_i386_pc_TRUE@am__append_2320 = setpci.module -+@COND_i386_pc_TRUE@am__append_2321 = setpci.module$(EXEEXT) - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_mips_loongson_FALSE@@COND_x86_64_efi_FALSE@setpci_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_2329 = --@COND_i386_pc_TRUE@am__append_2330 = $(nodist_setpci_module_SOURCES) --@COND_i386_pc_TRUE@am__append_2331 = $(nodist_setpci_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_2322 = -+@COND_i386_pc_TRUE@am__append_2323 = $(nodist_setpci_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_2324 = $(nodist_setpci_module_SOURCES) \ - @COND_i386_pc_TRUE@ setpci.marker --@COND_i386_pc_TRUE@am__append_2332 = setpci.mod --@COND_i386_pc_TRUE@am__append_2333 = setpci.marker --@COND_i386_efi_TRUE@am__append_2334 = setpci.module --@COND_i386_efi_TRUE@am__append_2335 = setpci.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_2336 = --@COND_i386_efi_TRUE@am__append_2337 = $(nodist_setpci_module_SOURCES) --@COND_i386_efi_TRUE@am__append_2338 = $(nodist_setpci_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_2325 = setpci.mod -+@COND_i386_pc_TRUE@am__append_2326 = setpci.marker -+@COND_i386_efi_TRUE@am__append_2327 = setpci.module -+@COND_i386_efi_TRUE@am__append_2328 = setpci.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_2329 = -+@COND_i386_efi_TRUE@am__append_2330 = $(nodist_setpci_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_2331 = $(nodist_setpci_module_SOURCES) \ - @COND_i386_efi_TRUE@ setpci.marker --@COND_i386_efi_TRUE@am__append_2339 = setpci.mod --@COND_i386_efi_TRUE@am__append_2340 = setpci.marker --@COND_i386_qemu_TRUE@am__append_2341 = setpci.module --@COND_i386_qemu_TRUE@am__append_2342 = setpci.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_2343 = --@COND_i386_qemu_TRUE@am__append_2344 = $(nodist_setpci_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_2345 = \ -+@COND_i386_efi_TRUE@am__append_2332 = setpci.mod -+@COND_i386_efi_TRUE@am__append_2333 = setpci.marker -+@COND_i386_qemu_TRUE@am__append_2334 = setpci.module -+@COND_i386_qemu_TRUE@am__append_2335 = setpci.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_2336 = -+@COND_i386_qemu_TRUE@am__append_2337 = $(nodist_setpci_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_2338 = \ - @COND_i386_qemu_TRUE@ $(nodist_setpci_module_SOURCES) \ - @COND_i386_qemu_TRUE@ setpci.marker --@COND_i386_qemu_TRUE@am__append_2346 = setpci.mod --@COND_i386_qemu_TRUE@am__append_2347 = setpci.marker --@COND_i386_coreboot_TRUE@am__append_2348 = setpci.module --@COND_i386_coreboot_TRUE@am__append_2349 = setpci.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_2350 = --@COND_i386_coreboot_TRUE@am__append_2351 = $(nodist_setpci_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_2352 = \ -+@COND_i386_qemu_TRUE@am__append_2339 = setpci.mod -+@COND_i386_qemu_TRUE@am__append_2340 = setpci.marker -+@COND_i386_coreboot_TRUE@am__append_2341 = setpci.module -+@COND_i386_coreboot_TRUE@am__append_2342 = setpci.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_2343 = -+@COND_i386_coreboot_TRUE@am__append_2344 = $(nodist_setpci_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_2345 = \ - @COND_i386_coreboot_TRUE@ $(nodist_setpci_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ setpci.marker --@COND_i386_coreboot_TRUE@am__append_2353 = setpci.mod --@COND_i386_coreboot_TRUE@am__append_2354 = setpci.marker --@COND_i386_multiboot_TRUE@am__append_2355 = setpci.module --@COND_i386_multiboot_TRUE@am__append_2356 = setpci.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_2357 = --@COND_i386_multiboot_TRUE@am__append_2358 = $(nodist_setpci_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_2359 = \ -+@COND_i386_coreboot_TRUE@am__append_2346 = setpci.mod -+@COND_i386_coreboot_TRUE@am__append_2347 = setpci.marker -+@COND_i386_multiboot_TRUE@am__append_2348 = setpci.module -+@COND_i386_multiboot_TRUE@am__append_2349 = setpci.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_2350 = -+@COND_i386_multiboot_TRUE@am__append_2351 = $(nodist_setpci_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_2352 = \ - @COND_i386_multiboot_TRUE@ $(nodist_setpci_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ setpci.marker --@COND_i386_multiboot_TRUE@am__append_2360 = setpci.mod --@COND_i386_multiboot_TRUE@am__append_2361 = setpci.marker --@COND_i386_ieee1275_TRUE@am__append_2362 = setpci.module --@COND_i386_ieee1275_TRUE@am__append_2363 = setpci.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_2364 = --@COND_i386_ieee1275_TRUE@am__append_2365 = $(nodist_setpci_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_2366 = \ -+@COND_i386_multiboot_TRUE@am__append_2353 = setpci.mod -+@COND_i386_multiboot_TRUE@am__append_2354 = setpci.marker -+@COND_i386_ieee1275_TRUE@am__append_2355 = setpci.module -+@COND_i386_ieee1275_TRUE@am__append_2356 = setpci.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_2357 = -+@COND_i386_ieee1275_TRUE@am__append_2358 = $(nodist_setpci_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_2359 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_setpci_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ setpci.marker --@COND_i386_ieee1275_TRUE@am__append_2367 = setpci.mod --@COND_i386_ieee1275_TRUE@am__append_2368 = setpci.marker --@COND_x86_64_efi_TRUE@am__append_2369 = setpci.module --@COND_x86_64_efi_TRUE@am__append_2370 = setpci.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_2371 = --@COND_x86_64_efi_TRUE@am__append_2372 = $(nodist_setpci_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_2373 = \ -+@COND_i386_ieee1275_TRUE@am__append_2360 = setpci.mod -+@COND_i386_ieee1275_TRUE@am__append_2361 = setpci.marker -+@COND_x86_64_efi_TRUE@am__append_2362 = setpci.module -+@COND_x86_64_efi_TRUE@am__append_2363 = setpci.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_2364 = -+@COND_x86_64_efi_TRUE@am__append_2365 = $(nodist_setpci_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_2366 = \ - @COND_x86_64_efi_TRUE@ $(nodist_setpci_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ setpci.marker --@COND_x86_64_efi_TRUE@am__append_2374 = setpci.mod --@COND_x86_64_efi_TRUE@am__append_2375 = setpci.marker --@COND_mips_loongson_TRUE@am__append_2376 = setpci.module --@COND_mips_loongson_TRUE@am__append_2377 = setpci.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__append_2378 = --@COND_mips_loongson_TRUE@am__append_2379 = $(nodist_setpci_module_SOURCES) --@COND_mips_loongson_TRUE@am__append_2380 = \ -+@COND_x86_64_efi_TRUE@am__append_2367 = setpci.mod -+@COND_x86_64_efi_TRUE@am__append_2368 = setpci.marker -+@COND_mips_loongson_TRUE@am__append_2369 = setpci.module -+@COND_mips_loongson_TRUE@am__append_2370 = setpci.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__append_2371 = -+@COND_mips_loongson_TRUE@am__append_2372 = $(nodist_setpci_module_SOURCES) -+@COND_mips_loongson_TRUE@am__append_2373 = \ - @COND_mips_loongson_TRUE@ $(nodist_setpci_module_SOURCES) \ - @COND_mips_loongson_TRUE@ setpci.marker --@COND_mips_loongson_TRUE@am__append_2381 = setpci.mod --@COND_mips_loongson_TRUE@am__append_2382 = setpci.marker --@COND_i386_pc_TRUE@am__append_2383 = pcidump.module --@COND_i386_pc_TRUE@am__append_2384 = pcidump.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__append_2374 = setpci.mod -+@COND_mips_loongson_TRUE@am__append_2375 = setpci.marker -+@COND_i386_pc_TRUE@am__append_2376 = pcidump.module -+@COND_i386_pc_TRUE@am__append_2377 = pcidump.module$(EXEEXT) - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_mips_loongson_FALSE@@COND_x86_64_efi_FALSE@pcidump_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_2385 = --@COND_i386_pc_TRUE@am__append_2386 = $(nodist_pcidump_module_SOURCES) --@COND_i386_pc_TRUE@am__append_2387 = $(nodist_pcidump_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_2378 = -+@COND_i386_pc_TRUE@am__append_2379 = $(nodist_pcidump_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_2380 = $(nodist_pcidump_module_SOURCES) \ - @COND_i386_pc_TRUE@ pcidump.marker --@COND_i386_pc_TRUE@am__append_2388 = pcidump.mod --@COND_i386_pc_TRUE@am__append_2389 = pcidump.marker --@COND_i386_efi_TRUE@am__append_2390 = pcidump.module --@COND_i386_efi_TRUE@am__append_2391 = pcidump.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_2392 = --@COND_i386_efi_TRUE@am__append_2393 = $(nodist_pcidump_module_SOURCES) --@COND_i386_efi_TRUE@am__append_2394 = \ -+@COND_i386_pc_TRUE@am__append_2381 = pcidump.mod -+@COND_i386_pc_TRUE@am__append_2382 = pcidump.marker -+@COND_i386_efi_TRUE@am__append_2383 = pcidump.module -+@COND_i386_efi_TRUE@am__append_2384 = pcidump.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_2385 = -+@COND_i386_efi_TRUE@am__append_2386 = $(nodist_pcidump_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_2387 = \ - @COND_i386_efi_TRUE@ $(nodist_pcidump_module_SOURCES) \ - @COND_i386_efi_TRUE@ pcidump.marker --@COND_i386_efi_TRUE@am__append_2395 = pcidump.mod --@COND_i386_efi_TRUE@am__append_2396 = pcidump.marker --@COND_i386_qemu_TRUE@am__append_2397 = pcidump.module --@COND_i386_qemu_TRUE@am__append_2398 = pcidump.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_2399 = --@COND_i386_qemu_TRUE@am__append_2400 = $(nodist_pcidump_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_2401 = \ -+@COND_i386_efi_TRUE@am__append_2388 = pcidump.mod -+@COND_i386_efi_TRUE@am__append_2389 = pcidump.marker -+@COND_i386_qemu_TRUE@am__append_2390 = pcidump.module -+@COND_i386_qemu_TRUE@am__append_2391 = pcidump.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_2392 = -+@COND_i386_qemu_TRUE@am__append_2393 = $(nodist_pcidump_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_2394 = \ - @COND_i386_qemu_TRUE@ $(nodist_pcidump_module_SOURCES) \ - @COND_i386_qemu_TRUE@ pcidump.marker --@COND_i386_qemu_TRUE@am__append_2402 = pcidump.mod --@COND_i386_qemu_TRUE@am__append_2403 = pcidump.marker --@COND_i386_coreboot_TRUE@am__append_2404 = pcidump.module --@COND_i386_coreboot_TRUE@am__append_2405 = pcidump.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_2406 = --@COND_i386_coreboot_TRUE@am__append_2407 = $(nodist_pcidump_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_2408 = \ -+@COND_i386_qemu_TRUE@am__append_2395 = pcidump.mod -+@COND_i386_qemu_TRUE@am__append_2396 = pcidump.marker -+@COND_i386_coreboot_TRUE@am__append_2397 = pcidump.module -+@COND_i386_coreboot_TRUE@am__append_2398 = pcidump.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_2399 = -+@COND_i386_coreboot_TRUE@am__append_2400 = $(nodist_pcidump_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_2401 = \ - @COND_i386_coreboot_TRUE@ $(nodist_pcidump_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ pcidump.marker --@COND_i386_coreboot_TRUE@am__append_2409 = pcidump.mod --@COND_i386_coreboot_TRUE@am__append_2410 = pcidump.marker --@COND_i386_multiboot_TRUE@am__append_2411 = pcidump.module --@COND_i386_multiboot_TRUE@am__append_2412 = pcidump.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_2413 = --@COND_i386_multiboot_TRUE@am__append_2414 = $(nodist_pcidump_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_2415 = \ -+@COND_i386_coreboot_TRUE@am__append_2402 = pcidump.mod -+@COND_i386_coreboot_TRUE@am__append_2403 = pcidump.marker -+@COND_i386_multiboot_TRUE@am__append_2404 = pcidump.module -+@COND_i386_multiboot_TRUE@am__append_2405 = pcidump.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_2406 = -+@COND_i386_multiboot_TRUE@am__append_2407 = $(nodist_pcidump_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_2408 = \ - @COND_i386_multiboot_TRUE@ $(nodist_pcidump_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ pcidump.marker --@COND_i386_multiboot_TRUE@am__append_2416 = pcidump.mod --@COND_i386_multiboot_TRUE@am__append_2417 = pcidump.marker --@COND_i386_ieee1275_TRUE@am__append_2418 = pcidump.module --@COND_i386_ieee1275_TRUE@am__append_2419 = pcidump.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_2420 = --@COND_i386_ieee1275_TRUE@am__append_2421 = $(nodist_pcidump_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_2422 = \ -+@COND_i386_multiboot_TRUE@am__append_2409 = pcidump.mod -+@COND_i386_multiboot_TRUE@am__append_2410 = pcidump.marker -+@COND_i386_ieee1275_TRUE@am__append_2411 = pcidump.module -+@COND_i386_ieee1275_TRUE@am__append_2412 = pcidump.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_2413 = -+@COND_i386_ieee1275_TRUE@am__append_2414 = $(nodist_pcidump_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_2415 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_pcidump_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ pcidump.marker --@COND_i386_ieee1275_TRUE@am__append_2423 = pcidump.mod --@COND_i386_ieee1275_TRUE@am__append_2424 = pcidump.marker --@COND_x86_64_efi_TRUE@am__append_2425 = pcidump.module --@COND_x86_64_efi_TRUE@am__append_2426 = pcidump.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_2427 = --@COND_x86_64_efi_TRUE@am__append_2428 = $(nodist_pcidump_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_2429 = \ -+@COND_i386_ieee1275_TRUE@am__append_2416 = pcidump.mod -+@COND_i386_ieee1275_TRUE@am__append_2417 = pcidump.marker -+@COND_x86_64_efi_TRUE@am__append_2418 = pcidump.module -+@COND_x86_64_efi_TRUE@am__append_2419 = pcidump.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_2420 = -+@COND_x86_64_efi_TRUE@am__append_2421 = $(nodist_pcidump_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_2422 = \ - @COND_x86_64_efi_TRUE@ $(nodist_pcidump_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ pcidump.marker --@COND_x86_64_efi_TRUE@am__append_2430 = pcidump.mod --@COND_x86_64_efi_TRUE@am__append_2431 = pcidump.marker --@COND_mips_loongson_TRUE@am__append_2432 = pcidump.module --@COND_mips_loongson_TRUE@am__append_2433 = pcidump.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__append_2434 = --@COND_mips_loongson_TRUE@am__append_2435 = $(nodist_pcidump_module_SOURCES) --@COND_mips_loongson_TRUE@am__append_2436 = \ -+@COND_x86_64_efi_TRUE@am__append_2423 = pcidump.mod -+@COND_x86_64_efi_TRUE@am__append_2424 = pcidump.marker -+@COND_mips_loongson_TRUE@am__append_2425 = pcidump.module -+@COND_mips_loongson_TRUE@am__append_2426 = pcidump.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__append_2427 = -+@COND_mips_loongson_TRUE@am__append_2428 = $(nodist_pcidump_module_SOURCES) -+@COND_mips_loongson_TRUE@am__append_2429 = \ - @COND_mips_loongson_TRUE@ $(nodist_pcidump_module_SOURCES) \ - @COND_mips_loongson_TRUE@ pcidump.marker --@COND_mips_loongson_TRUE@am__append_2437 = pcidump.mod --@COND_mips_loongson_TRUE@am__append_2438 = pcidump.marker --@COND_i386_ieee1275_TRUE@am__append_2439 = suspend.module --@COND_i386_ieee1275_TRUE@am__append_2440 = suspend.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__append_2430 = pcidump.mod -+@COND_mips_loongson_TRUE@am__append_2431 = pcidump.marker -+@COND_i386_ieee1275_TRUE@am__append_2432 = suspend.module -+@COND_i386_ieee1275_TRUE@am__append_2433 = suspend.module$(EXEEXT) - @COND_i386_ieee1275_FALSE@@COND_powerpc_ieee1275_FALSE@suspend_module_DEPENDENCIES = --@COND_i386_ieee1275_TRUE@am__append_2441 = --@COND_i386_ieee1275_TRUE@am__append_2442 = $(nodist_suspend_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_2443 = \ -+@COND_i386_ieee1275_TRUE@am__append_2434 = -+@COND_i386_ieee1275_TRUE@am__append_2435 = $(nodist_suspend_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_2436 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_suspend_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ suspend.marker --@COND_i386_ieee1275_TRUE@am__append_2444 = suspend.mod --@COND_i386_ieee1275_TRUE@am__append_2445 = suspend.marker --@COND_powerpc_ieee1275_TRUE@am__append_2446 = suspend.module \ -+@COND_i386_ieee1275_TRUE@am__append_2437 = suspend.mod -+@COND_i386_ieee1275_TRUE@am__append_2438 = suspend.marker -+@COND_powerpc_ieee1275_TRUE@am__append_2439 = suspend.module \ - @COND_powerpc_ieee1275_TRUE@ escc.module --@COND_powerpc_ieee1275_TRUE@am__append_2447 = suspend.module$(EXEEXT) \ -+@COND_powerpc_ieee1275_TRUE@am__append_2440 = suspend.module$(EXEEXT) \ - @COND_powerpc_ieee1275_TRUE@ escc.module$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__append_2448 = --@COND_powerpc_ieee1275_TRUE@am__append_2449 = \ -+@COND_powerpc_ieee1275_TRUE@am__append_2441 = -+@COND_powerpc_ieee1275_TRUE@am__append_2442 = \ - @COND_powerpc_ieee1275_TRUE@ $(nodist_suspend_module_SOURCES) \ - @COND_powerpc_ieee1275_TRUE@ $(nodist_escc_module_SOURCES) --@COND_powerpc_ieee1275_TRUE@am__append_2450 = \ -+@COND_powerpc_ieee1275_TRUE@am__append_2443 = \ - @COND_powerpc_ieee1275_TRUE@ $(nodist_suspend_module_SOURCES) \ - @COND_powerpc_ieee1275_TRUE@ suspend.marker \ - @COND_powerpc_ieee1275_TRUE@ $(nodist_escc_module_SOURCES) \ - @COND_powerpc_ieee1275_TRUE@ escc.marker --@COND_powerpc_ieee1275_TRUE@am__append_2451 = suspend.mod escc.mod --@COND_powerpc_ieee1275_TRUE@am__append_2452 = suspend.marker \ -+@COND_powerpc_ieee1275_TRUE@am__append_2444 = suspend.mod escc.mod -+@COND_powerpc_ieee1275_TRUE@am__append_2445 = suspend.marker \ - @COND_powerpc_ieee1275_TRUE@ escc.marker - @COND_powerpc_ieee1275_FALSE@escc_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_2453 = usbtest.module --@COND_i386_pc_TRUE@am__append_2454 = usbtest.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__append_2446 = usbtest.module -+@COND_i386_pc_TRUE@am__append_2447 = usbtest.module$(EXEEXT) - @COND_arm_coreboot_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_mips_loongson_FALSE@@COND_x86_64_efi_FALSE@usbtest_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_2455 = --@COND_i386_pc_TRUE@am__append_2456 = $(nodist_usbtest_module_SOURCES) --@COND_i386_pc_TRUE@am__append_2457 = $(nodist_usbtest_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_2448 = -+@COND_i386_pc_TRUE@am__append_2449 = $(nodist_usbtest_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_2450 = $(nodist_usbtest_module_SOURCES) \ - @COND_i386_pc_TRUE@ usbtest.marker --@COND_i386_pc_TRUE@am__append_2458 = usbtest.mod --@COND_i386_pc_TRUE@am__append_2459 = usbtest.marker --@COND_i386_efi_TRUE@am__append_2460 = usbtest.module --@COND_i386_efi_TRUE@am__append_2461 = usbtest.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_2462 = --@COND_i386_efi_TRUE@am__append_2463 = $(nodist_usbtest_module_SOURCES) --@COND_i386_efi_TRUE@am__append_2464 = \ -+@COND_i386_pc_TRUE@am__append_2451 = usbtest.mod -+@COND_i386_pc_TRUE@am__append_2452 = usbtest.marker -+@COND_i386_efi_TRUE@am__append_2453 = usbtest.module -+@COND_i386_efi_TRUE@am__append_2454 = usbtest.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_2455 = -+@COND_i386_efi_TRUE@am__append_2456 = $(nodist_usbtest_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_2457 = \ - @COND_i386_efi_TRUE@ $(nodist_usbtest_module_SOURCES) \ - @COND_i386_efi_TRUE@ usbtest.marker --@COND_i386_efi_TRUE@am__append_2465 = usbtest.mod --@COND_i386_efi_TRUE@am__append_2466 = usbtest.marker --@COND_i386_qemu_TRUE@am__append_2467 = usbtest.module --@COND_i386_qemu_TRUE@am__append_2468 = usbtest.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_2469 = --@COND_i386_qemu_TRUE@am__append_2470 = $(nodist_usbtest_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_2471 = \ -+@COND_i386_efi_TRUE@am__append_2458 = usbtest.mod -+@COND_i386_efi_TRUE@am__append_2459 = usbtest.marker -+@COND_i386_qemu_TRUE@am__append_2460 = usbtest.module -+@COND_i386_qemu_TRUE@am__append_2461 = usbtest.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_2462 = -+@COND_i386_qemu_TRUE@am__append_2463 = $(nodist_usbtest_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_2464 = \ - @COND_i386_qemu_TRUE@ $(nodist_usbtest_module_SOURCES) \ - @COND_i386_qemu_TRUE@ usbtest.marker --@COND_i386_qemu_TRUE@am__append_2472 = usbtest.mod --@COND_i386_qemu_TRUE@am__append_2473 = usbtest.marker --@COND_i386_coreboot_TRUE@am__append_2474 = usbtest.module --@COND_i386_coreboot_TRUE@am__append_2475 = usbtest.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_2476 = --@COND_i386_coreboot_TRUE@am__append_2477 = $(nodist_usbtest_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_2478 = \ -+@COND_i386_qemu_TRUE@am__append_2465 = usbtest.mod -+@COND_i386_qemu_TRUE@am__append_2466 = usbtest.marker -+@COND_i386_coreboot_TRUE@am__append_2467 = usbtest.module -+@COND_i386_coreboot_TRUE@am__append_2468 = usbtest.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_2469 = -+@COND_i386_coreboot_TRUE@am__append_2470 = $(nodist_usbtest_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_2471 = \ - @COND_i386_coreboot_TRUE@ $(nodist_usbtest_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ usbtest.marker --@COND_i386_coreboot_TRUE@am__append_2479 = usbtest.mod --@COND_i386_coreboot_TRUE@am__append_2480 = usbtest.marker --@COND_i386_multiboot_TRUE@am__append_2481 = usbtest.module --@COND_i386_multiboot_TRUE@am__append_2482 = usbtest.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_2483 = --@COND_i386_multiboot_TRUE@am__append_2484 = $(nodist_usbtest_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_2485 = \ -+@COND_i386_coreboot_TRUE@am__append_2472 = usbtest.mod -+@COND_i386_coreboot_TRUE@am__append_2473 = usbtest.marker -+@COND_i386_multiboot_TRUE@am__append_2474 = usbtest.module -+@COND_i386_multiboot_TRUE@am__append_2475 = usbtest.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_2476 = -+@COND_i386_multiboot_TRUE@am__append_2477 = $(nodist_usbtest_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_2478 = \ - @COND_i386_multiboot_TRUE@ $(nodist_usbtest_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ usbtest.marker --@COND_i386_multiboot_TRUE@am__append_2486 = usbtest.mod --@COND_i386_multiboot_TRUE@am__append_2487 = usbtest.marker --@COND_i386_ieee1275_TRUE@am__append_2488 = usbtest.module --@COND_i386_ieee1275_TRUE@am__append_2489 = usbtest.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_2490 = --@COND_i386_ieee1275_TRUE@am__append_2491 = $(nodist_usbtest_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_2492 = \ -+@COND_i386_multiboot_TRUE@am__append_2479 = usbtest.mod -+@COND_i386_multiboot_TRUE@am__append_2480 = usbtest.marker -+@COND_i386_ieee1275_TRUE@am__append_2481 = usbtest.module -+@COND_i386_ieee1275_TRUE@am__append_2482 = usbtest.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_2483 = -+@COND_i386_ieee1275_TRUE@am__append_2484 = $(nodist_usbtest_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_2485 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_usbtest_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ usbtest.marker --@COND_i386_ieee1275_TRUE@am__append_2493 = usbtest.mod --@COND_i386_ieee1275_TRUE@am__append_2494 = usbtest.marker --@COND_x86_64_efi_TRUE@am__append_2495 = usbtest.module --@COND_x86_64_efi_TRUE@am__append_2496 = usbtest.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_2497 = --@COND_x86_64_efi_TRUE@am__append_2498 = $(nodist_usbtest_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_2499 = \ -+@COND_i386_ieee1275_TRUE@am__append_2486 = usbtest.mod -+@COND_i386_ieee1275_TRUE@am__append_2487 = usbtest.marker -+@COND_x86_64_efi_TRUE@am__append_2488 = usbtest.module -+@COND_x86_64_efi_TRUE@am__append_2489 = usbtest.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_2490 = -+@COND_x86_64_efi_TRUE@am__append_2491 = $(nodist_usbtest_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_2492 = \ - @COND_x86_64_efi_TRUE@ $(nodist_usbtest_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ usbtest.marker --@COND_x86_64_efi_TRUE@am__append_2500 = usbtest.mod --@COND_x86_64_efi_TRUE@am__append_2501 = usbtest.marker --@COND_mips_loongson_TRUE@am__append_2502 = usbtest.module --@COND_mips_loongson_TRUE@am__append_2503 = usbtest.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__append_2504 = --@COND_mips_loongson_TRUE@am__append_2505 = $(nodist_usbtest_module_SOURCES) --@COND_mips_loongson_TRUE@am__append_2506 = \ -+@COND_x86_64_efi_TRUE@am__append_2493 = usbtest.mod -+@COND_x86_64_efi_TRUE@am__append_2494 = usbtest.marker -+@COND_mips_loongson_TRUE@am__append_2495 = usbtest.module -+@COND_mips_loongson_TRUE@am__append_2496 = usbtest.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__append_2497 = -+@COND_mips_loongson_TRUE@am__append_2498 = $(nodist_usbtest_module_SOURCES) -+@COND_mips_loongson_TRUE@am__append_2499 = \ - @COND_mips_loongson_TRUE@ $(nodist_usbtest_module_SOURCES) \ - @COND_mips_loongson_TRUE@ usbtest.marker --@COND_mips_loongson_TRUE@am__append_2507 = usbtest.mod --@COND_mips_loongson_TRUE@am__append_2508 = usbtest.marker --@COND_arm_coreboot_TRUE@am__append_2509 = usbtest.module --@COND_arm_coreboot_TRUE@am__append_2510 = usbtest.module$(EXEEXT) --@COND_arm_coreboot_TRUE@am__append_2511 = --@COND_arm_coreboot_TRUE@am__append_2512 = $(nodist_usbtest_module_SOURCES) --@COND_arm_coreboot_TRUE@am__append_2513 = \ -+@COND_mips_loongson_TRUE@am__append_2500 = usbtest.mod -+@COND_mips_loongson_TRUE@am__append_2501 = usbtest.marker -+@COND_arm_coreboot_TRUE@am__append_2502 = usbtest.module -+@COND_arm_coreboot_TRUE@am__append_2503 = usbtest.module$(EXEEXT) -+@COND_arm_coreboot_TRUE@am__append_2504 = -+@COND_arm_coreboot_TRUE@am__append_2505 = $(nodist_usbtest_module_SOURCES) -+@COND_arm_coreboot_TRUE@am__append_2506 = \ - @COND_arm_coreboot_TRUE@ $(nodist_usbtest_module_SOURCES) \ - @COND_arm_coreboot_TRUE@ usbtest.marker --@COND_arm_coreboot_TRUE@am__append_2514 = usbtest.mod --@COND_arm_coreboot_TRUE@am__append_2515 = usbtest.marker --@COND_i386_pc_TRUE@am__append_2516 = ata.module --@COND_i386_pc_TRUE@am__append_2517 = ata.module$(EXEEXT) -+@COND_arm_coreboot_TRUE@am__append_2507 = usbtest.mod -+@COND_arm_coreboot_TRUE@am__append_2508 = usbtest.marker -+@COND_i386_pc_TRUE@am__append_2509 = ata.module -+@COND_i386_pc_TRUE@am__append_2510 = ata.module$(EXEEXT) - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_x86_64_efi_FALSE@ata_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_2518 = --@COND_i386_pc_TRUE@am__append_2519 = $(nodist_ata_module_SOURCES) --@COND_i386_pc_TRUE@am__append_2520 = $(nodist_ata_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_2511 = -+@COND_i386_pc_TRUE@am__append_2512 = $(nodist_ata_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_2513 = $(nodist_ata_module_SOURCES) \ - @COND_i386_pc_TRUE@ ata.marker --@COND_i386_pc_TRUE@am__append_2521 = ata.mod --@COND_i386_pc_TRUE@am__append_2522 = ata.marker --@COND_i386_efi_TRUE@am__append_2523 = ata.module --@COND_i386_efi_TRUE@am__append_2524 = ata.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_2525 = --@COND_i386_efi_TRUE@am__append_2526 = $(nodist_ata_module_SOURCES) --@COND_i386_efi_TRUE@am__append_2527 = $(nodist_ata_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_2514 = ata.mod -+@COND_i386_pc_TRUE@am__append_2515 = ata.marker -+@COND_i386_efi_TRUE@am__append_2516 = ata.module -+@COND_i386_efi_TRUE@am__append_2517 = ata.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_2518 = -+@COND_i386_efi_TRUE@am__append_2519 = $(nodist_ata_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_2520 = $(nodist_ata_module_SOURCES) \ - @COND_i386_efi_TRUE@ ata.marker --@COND_i386_efi_TRUE@am__append_2528 = ata.mod --@COND_i386_efi_TRUE@am__append_2529 = ata.marker --@COND_i386_qemu_TRUE@am__append_2530 = ata.module --@COND_i386_qemu_TRUE@am__append_2531 = ata.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_2532 = --@COND_i386_qemu_TRUE@am__append_2533 = $(nodist_ata_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_2534 = $(nodist_ata_module_SOURCES) \ -+@COND_i386_efi_TRUE@am__append_2521 = ata.mod -+@COND_i386_efi_TRUE@am__append_2522 = ata.marker -+@COND_i386_qemu_TRUE@am__append_2523 = ata.module -+@COND_i386_qemu_TRUE@am__append_2524 = ata.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_2525 = -+@COND_i386_qemu_TRUE@am__append_2526 = $(nodist_ata_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_2527 = $(nodist_ata_module_SOURCES) \ - @COND_i386_qemu_TRUE@ ata.marker --@COND_i386_qemu_TRUE@am__append_2535 = ata.mod --@COND_i386_qemu_TRUE@am__append_2536 = ata.marker --@COND_i386_coreboot_TRUE@am__append_2537 = ata.module --@COND_i386_coreboot_TRUE@am__append_2538 = ata.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_2539 = --@COND_i386_coreboot_TRUE@am__append_2540 = $(nodist_ata_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_2541 = \ -+@COND_i386_qemu_TRUE@am__append_2528 = ata.mod -+@COND_i386_qemu_TRUE@am__append_2529 = ata.marker -+@COND_i386_coreboot_TRUE@am__append_2530 = ata.module -+@COND_i386_coreboot_TRUE@am__append_2531 = ata.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_2532 = -+@COND_i386_coreboot_TRUE@am__append_2533 = $(nodist_ata_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_2534 = \ - @COND_i386_coreboot_TRUE@ $(nodist_ata_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ ata.marker --@COND_i386_coreboot_TRUE@am__append_2542 = ata.mod --@COND_i386_coreboot_TRUE@am__append_2543 = ata.marker --@COND_i386_multiboot_TRUE@am__append_2544 = ata.module --@COND_i386_multiboot_TRUE@am__append_2545 = ata.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_2546 = --@COND_i386_multiboot_TRUE@am__append_2547 = $(nodist_ata_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_2548 = \ -+@COND_i386_coreboot_TRUE@am__append_2535 = ata.mod -+@COND_i386_coreboot_TRUE@am__append_2536 = ata.marker -+@COND_i386_multiboot_TRUE@am__append_2537 = ata.module -+@COND_i386_multiboot_TRUE@am__append_2538 = ata.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_2539 = -+@COND_i386_multiboot_TRUE@am__append_2540 = $(nodist_ata_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_2541 = \ - @COND_i386_multiboot_TRUE@ $(nodist_ata_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ ata.marker --@COND_i386_multiboot_TRUE@am__append_2549 = ata.mod --@COND_i386_multiboot_TRUE@am__append_2550 = ata.marker --@COND_i386_ieee1275_TRUE@am__append_2551 = ata.module --@COND_i386_ieee1275_TRUE@am__append_2552 = ata.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_2553 = --@COND_i386_ieee1275_TRUE@am__append_2554 = $(nodist_ata_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_2555 = \ -+@COND_i386_multiboot_TRUE@am__append_2542 = ata.mod -+@COND_i386_multiboot_TRUE@am__append_2543 = ata.marker -+@COND_i386_ieee1275_TRUE@am__append_2544 = ata.module -+@COND_i386_ieee1275_TRUE@am__append_2545 = ata.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_2546 = -+@COND_i386_ieee1275_TRUE@am__append_2547 = $(nodist_ata_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_2548 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_ata_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ ata.marker --@COND_i386_ieee1275_TRUE@am__append_2556 = ata.mod --@COND_i386_ieee1275_TRUE@am__append_2557 = ata.marker --@COND_x86_64_efi_TRUE@am__append_2558 = ata.module --@COND_x86_64_efi_TRUE@am__append_2559 = ata.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_2560 = --@COND_x86_64_efi_TRUE@am__append_2561 = $(nodist_ata_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_2562 = $(nodist_ata_module_SOURCES) \ -+@COND_i386_ieee1275_TRUE@am__append_2549 = ata.mod -+@COND_i386_ieee1275_TRUE@am__append_2550 = ata.marker -+@COND_x86_64_efi_TRUE@am__append_2551 = ata.module -+@COND_x86_64_efi_TRUE@am__append_2552 = ata.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_2553 = -+@COND_x86_64_efi_TRUE@am__append_2554 = $(nodist_ata_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_2555 = $(nodist_ata_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ ata.marker --@COND_x86_64_efi_TRUE@am__append_2563 = ata.mod --@COND_x86_64_efi_TRUE@am__append_2564 = ata.marker --@COND_mips_loongson_TRUE@am__append_2565 = ata.module --@COND_mips_loongson_TRUE@am__append_2566 = ata.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__append_2567 = --@COND_mips_loongson_TRUE@am__append_2568 = $(nodist_ata_module_SOURCES) --@COND_mips_loongson_TRUE@am__append_2569 = \ -+@COND_x86_64_efi_TRUE@am__append_2556 = ata.mod -+@COND_x86_64_efi_TRUE@am__append_2557 = ata.marker -+@COND_mips_loongson_TRUE@am__append_2558 = ata.module -+@COND_mips_loongson_TRUE@am__append_2559 = ata.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__append_2560 = -+@COND_mips_loongson_TRUE@am__append_2561 = $(nodist_ata_module_SOURCES) -+@COND_mips_loongson_TRUE@am__append_2562 = \ - @COND_mips_loongson_TRUE@ $(nodist_ata_module_SOURCES) \ - @COND_mips_loongson_TRUE@ ata.marker --@COND_mips_loongson_TRUE@am__append_2570 = ata.mod --@COND_mips_loongson_TRUE@am__append_2571 = ata.marker --@COND_mips_qemu_mips_TRUE@am__append_2572 = ata.module --@COND_mips_qemu_mips_TRUE@am__append_2573 = ata.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__append_2574 = --@COND_mips_qemu_mips_TRUE@am__append_2575 = $(nodist_ata_module_SOURCES) --@COND_mips_qemu_mips_TRUE@am__append_2576 = \ -+@COND_mips_loongson_TRUE@am__append_2563 = ata.mod -+@COND_mips_loongson_TRUE@am__append_2564 = ata.marker -+@COND_mips_qemu_mips_TRUE@am__append_2565 = ata.module -+@COND_mips_qemu_mips_TRUE@am__append_2566 = ata.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__append_2567 = -+@COND_mips_qemu_mips_TRUE@am__append_2568 = $(nodist_ata_module_SOURCES) -+@COND_mips_qemu_mips_TRUE@am__append_2569 = \ - @COND_mips_qemu_mips_TRUE@ $(nodist_ata_module_SOURCES) \ - @COND_mips_qemu_mips_TRUE@ ata.marker --@COND_mips_qemu_mips_TRUE@am__append_2577 = ata.mod --@COND_mips_qemu_mips_TRUE@am__append_2578 = ata.marker --@COND_i386_pc_TRUE@am__append_2579 = ahci.module --@COND_i386_pc_TRUE@am__append_2580 = ahci.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__append_2570 = ata.mod -+@COND_mips_qemu_mips_TRUE@am__append_2571 = ata.marker -+@COND_i386_pc_TRUE@am__append_2572 = ahci.module -+@COND_i386_pc_TRUE@am__append_2573 = ahci.module$(EXEEXT) - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_mips_loongson_FALSE@@COND_x86_64_efi_FALSE@ahci_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_2581 = --@COND_i386_pc_TRUE@am__append_2582 = $(nodist_ahci_module_SOURCES) --@COND_i386_pc_TRUE@am__append_2583 = $(nodist_ahci_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_2574 = -+@COND_i386_pc_TRUE@am__append_2575 = $(nodist_ahci_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_2576 = $(nodist_ahci_module_SOURCES) \ - @COND_i386_pc_TRUE@ ahci.marker --@COND_i386_pc_TRUE@am__append_2584 = ahci.mod --@COND_i386_pc_TRUE@am__append_2585 = ahci.marker --@COND_i386_efi_TRUE@am__append_2586 = ahci.module --@COND_i386_efi_TRUE@am__append_2587 = ahci.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_2588 = --@COND_i386_efi_TRUE@am__append_2589 = $(nodist_ahci_module_SOURCES) --@COND_i386_efi_TRUE@am__append_2590 = $(nodist_ahci_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_2577 = ahci.mod -+@COND_i386_pc_TRUE@am__append_2578 = ahci.marker -+@COND_i386_efi_TRUE@am__append_2579 = ahci.module -+@COND_i386_efi_TRUE@am__append_2580 = ahci.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_2581 = -+@COND_i386_efi_TRUE@am__append_2582 = $(nodist_ahci_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_2583 = $(nodist_ahci_module_SOURCES) \ - @COND_i386_efi_TRUE@ ahci.marker --@COND_i386_efi_TRUE@am__append_2591 = ahci.mod --@COND_i386_efi_TRUE@am__append_2592 = ahci.marker --@COND_i386_qemu_TRUE@am__append_2593 = ahci.module --@COND_i386_qemu_TRUE@am__append_2594 = ahci.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_2595 = --@COND_i386_qemu_TRUE@am__append_2596 = $(nodist_ahci_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_2597 = $(nodist_ahci_module_SOURCES) \ -+@COND_i386_efi_TRUE@am__append_2584 = ahci.mod -+@COND_i386_efi_TRUE@am__append_2585 = ahci.marker -+@COND_i386_qemu_TRUE@am__append_2586 = ahci.module -+@COND_i386_qemu_TRUE@am__append_2587 = ahci.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_2588 = -+@COND_i386_qemu_TRUE@am__append_2589 = $(nodist_ahci_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_2590 = $(nodist_ahci_module_SOURCES) \ - @COND_i386_qemu_TRUE@ ahci.marker --@COND_i386_qemu_TRUE@am__append_2598 = ahci.mod --@COND_i386_qemu_TRUE@am__append_2599 = ahci.marker --@COND_i386_coreboot_TRUE@am__append_2600 = ahci.module --@COND_i386_coreboot_TRUE@am__append_2601 = ahci.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_2602 = --@COND_i386_coreboot_TRUE@am__append_2603 = $(nodist_ahci_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_2604 = \ -+@COND_i386_qemu_TRUE@am__append_2591 = ahci.mod -+@COND_i386_qemu_TRUE@am__append_2592 = ahci.marker -+@COND_i386_coreboot_TRUE@am__append_2593 = ahci.module -+@COND_i386_coreboot_TRUE@am__append_2594 = ahci.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_2595 = -+@COND_i386_coreboot_TRUE@am__append_2596 = $(nodist_ahci_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_2597 = \ - @COND_i386_coreboot_TRUE@ $(nodist_ahci_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ ahci.marker --@COND_i386_coreboot_TRUE@am__append_2605 = ahci.mod --@COND_i386_coreboot_TRUE@am__append_2606 = ahci.marker --@COND_i386_multiboot_TRUE@am__append_2607 = ahci.module --@COND_i386_multiboot_TRUE@am__append_2608 = ahci.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_2609 = --@COND_i386_multiboot_TRUE@am__append_2610 = $(nodist_ahci_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_2611 = \ -+@COND_i386_coreboot_TRUE@am__append_2598 = ahci.mod -+@COND_i386_coreboot_TRUE@am__append_2599 = ahci.marker -+@COND_i386_multiboot_TRUE@am__append_2600 = ahci.module -+@COND_i386_multiboot_TRUE@am__append_2601 = ahci.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_2602 = -+@COND_i386_multiboot_TRUE@am__append_2603 = $(nodist_ahci_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_2604 = \ - @COND_i386_multiboot_TRUE@ $(nodist_ahci_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ ahci.marker --@COND_i386_multiboot_TRUE@am__append_2612 = ahci.mod --@COND_i386_multiboot_TRUE@am__append_2613 = ahci.marker --@COND_i386_ieee1275_TRUE@am__append_2614 = ahci.module --@COND_i386_ieee1275_TRUE@am__append_2615 = ahci.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_2616 = --@COND_i386_ieee1275_TRUE@am__append_2617 = $(nodist_ahci_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_2618 = \ -+@COND_i386_multiboot_TRUE@am__append_2605 = ahci.mod -+@COND_i386_multiboot_TRUE@am__append_2606 = ahci.marker -+@COND_i386_ieee1275_TRUE@am__append_2607 = ahci.module -+@COND_i386_ieee1275_TRUE@am__append_2608 = ahci.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_2609 = -+@COND_i386_ieee1275_TRUE@am__append_2610 = $(nodist_ahci_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_2611 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_ahci_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ ahci.marker --@COND_i386_ieee1275_TRUE@am__append_2619 = ahci.mod --@COND_i386_ieee1275_TRUE@am__append_2620 = ahci.marker --@COND_x86_64_efi_TRUE@am__append_2621 = ahci.module --@COND_x86_64_efi_TRUE@am__append_2622 = ahci.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_2623 = --@COND_x86_64_efi_TRUE@am__append_2624 = $(nodist_ahci_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_2625 = $(nodist_ahci_module_SOURCES) \ -+@COND_i386_ieee1275_TRUE@am__append_2612 = ahci.mod -+@COND_i386_ieee1275_TRUE@am__append_2613 = ahci.marker -+@COND_x86_64_efi_TRUE@am__append_2614 = ahci.module -+@COND_x86_64_efi_TRUE@am__append_2615 = ahci.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_2616 = -+@COND_x86_64_efi_TRUE@am__append_2617 = $(nodist_ahci_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_2618 = $(nodist_ahci_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ ahci.marker --@COND_x86_64_efi_TRUE@am__append_2626 = ahci.mod --@COND_x86_64_efi_TRUE@am__append_2627 = ahci.marker --@COND_mips_loongson_TRUE@am__append_2628 = ahci.module --@COND_mips_loongson_TRUE@am__append_2629 = ahci.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__append_2630 = --@COND_mips_loongson_TRUE@am__append_2631 = $(nodist_ahci_module_SOURCES) --@COND_mips_loongson_TRUE@am__append_2632 = \ -+@COND_x86_64_efi_TRUE@am__append_2619 = ahci.mod -+@COND_x86_64_efi_TRUE@am__append_2620 = ahci.marker -+@COND_mips_loongson_TRUE@am__append_2621 = ahci.module -+@COND_mips_loongson_TRUE@am__append_2622 = ahci.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__append_2623 = -+@COND_mips_loongson_TRUE@am__append_2624 = $(nodist_ahci_module_SOURCES) -+@COND_mips_loongson_TRUE@am__append_2625 = \ - @COND_mips_loongson_TRUE@ $(nodist_ahci_module_SOURCES) \ - @COND_mips_loongson_TRUE@ ahci.marker --@COND_mips_loongson_TRUE@am__append_2633 = ahci.mod --@COND_mips_loongson_TRUE@am__append_2634 = ahci.marker --@COND_i386_pc_TRUE@am__append_2635 = pata.module --@COND_i386_pc_TRUE@am__append_2636 = pata.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__append_2626 = ahci.mod -+@COND_mips_loongson_TRUE@am__append_2627 = ahci.marker -+@COND_i386_pc_TRUE@am__append_2628 = pata.module -+@COND_i386_pc_TRUE@am__append_2629 = pata.module$(EXEEXT) - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_x86_64_efi_FALSE@pata_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_2637 = --@COND_i386_pc_TRUE@am__append_2638 = $(nodist_pata_module_SOURCES) --@COND_i386_pc_TRUE@am__append_2639 = $(nodist_pata_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_2630 = -+@COND_i386_pc_TRUE@am__append_2631 = $(nodist_pata_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_2632 = $(nodist_pata_module_SOURCES) \ - @COND_i386_pc_TRUE@ pata.marker --@COND_i386_pc_TRUE@am__append_2640 = pata.mod --@COND_i386_pc_TRUE@am__append_2641 = pata.marker --@COND_i386_efi_TRUE@am__append_2642 = pata.module --@COND_i386_efi_TRUE@am__append_2643 = pata.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_2644 = --@COND_i386_efi_TRUE@am__append_2645 = $(nodist_pata_module_SOURCES) --@COND_i386_efi_TRUE@am__append_2646 = $(nodist_pata_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_2633 = pata.mod -+@COND_i386_pc_TRUE@am__append_2634 = pata.marker -+@COND_i386_efi_TRUE@am__append_2635 = pata.module -+@COND_i386_efi_TRUE@am__append_2636 = pata.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_2637 = -+@COND_i386_efi_TRUE@am__append_2638 = $(nodist_pata_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_2639 = $(nodist_pata_module_SOURCES) \ - @COND_i386_efi_TRUE@ pata.marker --@COND_i386_efi_TRUE@am__append_2647 = pata.mod --@COND_i386_efi_TRUE@am__append_2648 = pata.marker --@COND_i386_qemu_TRUE@am__append_2649 = pata.module --@COND_i386_qemu_TRUE@am__append_2650 = pata.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_2651 = --@COND_i386_qemu_TRUE@am__append_2652 = $(nodist_pata_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_2653 = $(nodist_pata_module_SOURCES) \ -+@COND_i386_efi_TRUE@am__append_2640 = pata.mod -+@COND_i386_efi_TRUE@am__append_2641 = pata.marker -+@COND_i386_qemu_TRUE@am__append_2642 = pata.module -+@COND_i386_qemu_TRUE@am__append_2643 = pata.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_2644 = -+@COND_i386_qemu_TRUE@am__append_2645 = $(nodist_pata_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_2646 = $(nodist_pata_module_SOURCES) \ - @COND_i386_qemu_TRUE@ pata.marker --@COND_i386_qemu_TRUE@am__append_2654 = pata.mod --@COND_i386_qemu_TRUE@am__append_2655 = pata.marker --@COND_i386_coreboot_TRUE@am__append_2656 = pata.module --@COND_i386_coreboot_TRUE@am__append_2657 = pata.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_2658 = --@COND_i386_coreboot_TRUE@am__append_2659 = $(nodist_pata_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_2660 = \ -+@COND_i386_qemu_TRUE@am__append_2647 = pata.mod -+@COND_i386_qemu_TRUE@am__append_2648 = pata.marker -+@COND_i386_coreboot_TRUE@am__append_2649 = pata.module -+@COND_i386_coreboot_TRUE@am__append_2650 = pata.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_2651 = -+@COND_i386_coreboot_TRUE@am__append_2652 = $(nodist_pata_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_2653 = \ - @COND_i386_coreboot_TRUE@ $(nodist_pata_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ pata.marker --@COND_i386_coreboot_TRUE@am__append_2661 = pata.mod --@COND_i386_coreboot_TRUE@am__append_2662 = pata.marker --@COND_i386_multiboot_TRUE@am__append_2663 = pata.module --@COND_i386_multiboot_TRUE@am__append_2664 = pata.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_2665 = --@COND_i386_multiboot_TRUE@am__append_2666 = $(nodist_pata_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_2667 = \ -+@COND_i386_coreboot_TRUE@am__append_2654 = pata.mod -+@COND_i386_coreboot_TRUE@am__append_2655 = pata.marker -+@COND_i386_multiboot_TRUE@am__append_2656 = pata.module -+@COND_i386_multiboot_TRUE@am__append_2657 = pata.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_2658 = -+@COND_i386_multiboot_TRUE@am__append_2659 = $(nodist_pata_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_2660 = \ - @COND_i386_multiboot_TRUE@ $(nodist_pata_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ pata.marker --@COND_i386_multiboot_TRUE@am__append_2668 = pata.mod --@COND_i386_multiboot_TRUE@am__append_2669 = pata.marker --@COND_i386_ieee1275_TRUE@am__append_2670 = pata.module --@COND_i386_ieee1275_TRUE@am__append_2671 = pata.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_2672 = --@COND_i386_ieee1275_TRUE@am__append_2673 = $(nodist_pata_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_2674 = \ -+@COND_i386_multiboot_TRUE@am__append_2661 = pata.mod -+@COND_i386_multiboot_TRUE@am__append_2662 = pata.marker -+@COND_i386_ieee1275_TRUE@am__append_2663 = pata.module -+@COND_i386_ieee1275_TRUE@am__append_2664 = pata.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_2665 = -+@COND_i386_ieee1275_TRUE@am__append_2666 = $(nodist_pata_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_2667 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_pata_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ pata.marker --@COND_i386_ieee1275_TRUE@am__append_2675 = pata.mod --@COND_i386_ieee1275_TRUE@am__append_2676 = pata.marker --@COND_x86_64_efi_TRUE@am__append_2677 = pata.module --@COND_x86_64_efi_TRUE@am__append_2678 = pata.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_2679 = --@COND_x86_64_efi_TRUE@am__append_2680 = $(nodist_pata_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_2681 = $(nodist_pata_module_SOURCES) \ -+@COND_i386_ieee1275_TRUE@am__append_2668 = pata.mod -+@COND_i386_ieee1275_TRUE@am__append_2669 = pata.marker -+@COND_x86_64_efi_TRUE@am__append_2670 = pata.module -+@COND_x86_64_efi_TRUE@am__append_2671 = pata.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_2672 = -+@COND_x86_64_efi_TRUE@am__append_2673 = $(nodist_pata_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_2674 = $(nodist_pata_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ pata.marker --@COND_x86_64_efi_TRUE@am__append_2682 = pata.mod --@COND_x86_64_efi_TRUE@am__append_2683 = pata.marker --@COND_mips_loongson_TRUE@am__append_2684 = pata.module --@COND_mips_loongson_TRUE@am__append_2685 = pata.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__append_2686 = --@COND_mips_loongson_TRUE@am__append_2687 = $(nodist_pata_module_SOURCES) --@COND_mips_loongson_TRUE@am__append_2688 = \ -+@COND_x86_64_efi_TRUE@am__append_2675 = pata.mod -+@COND_x86_64_efi_TRUE@am__append_2676 = pata.marker -+@COND_mips_loongson_TRUE@am__append_2677 = pata.module -+@COND_mips_loongson_TRUE@am__append_2678 = pata.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__append_2679 = -+@COND_mips_loongson_TRUE@am__append_2680 = $(nodist_pata_module_SOURCES) -+@COND_mips_loongson_TRUE@am__append_2681 = \ - @COND_mips_loongson_TRUE@ $(nodist_pata_module_SOURCES) \ - @COND_mips_loongson_TRUE@ pata.marker --@COND_mips_loongson_TRUE@am__append_2689 = pata.mod --@COND_mips_loongson_TRUE@am__append_2690 = pata.marker --@COND_mips_qemu_mips_TRUE@am__append_2691 = pata.module --@COND_mips_qemu_mips_TRUE@am__append_2692 = pata.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__append_2693 = --@COND_mips_qemu_mips_TRUE@am__append_2694 = $(nodist_pata_module_SOURCES) --@COND_mips_qemu_mips_TRUE@am__append_2695 = \ -+@COND_mips_loongson_TRUE@am__append_2682 = pata.mod -+@COND_mips_loongson_TRUE@am__append_2683 = pata.marker -+@COND_mips_qemu_mips_TRUE@am__append_2684 = pata.module -+@COND_mips_qemu_mips_TRUE@am__append_2685 = pata.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__append_2686 = -+@COND_mips_qemu_mips_TRUE@am__append_2687 = $(nodist_pata_module_SOURCES) -+@COND_mips_qemu_mips_TRUE@am__append_2688 = \ - @COND_mips_qemu_mips_TRUE@ $(nodist_pata_module_SOURCES) \ - @COND_mips_qemu_mips_TRUE@ pata.marker --@COND_mips_qemu_mips_TRUE@am__append_2696 = pata.mod --@COND_mips_qemu_mips_TRUE@am__append_2697 = pata.marker --@COND_i386_pc_TRUE@am__append_2698 = biosdisk.module usbms.module --@COND_i386_pc_TRUE@am__append_2699 = biosdisk.module$(EXEEXT) \ -+@COND_mips_qemu_mips_TRUE@am__append_2689 = pata.mod -+@COND_mips_qemu_mips_TRUE@am__append_2690 = pata.marker -+@COND_i386_pc_TRUE@am__append_2691 = biosdisk.module usbms.module -+@COND_i386_pc_TRUE@am__append_2692 = biosdisk.module$(EXEEXT) \ - @COND_i386_pc_TRUE@ usbms.module$(EXEEXT) - @COND_i386_pc_FALSE@biosdisk_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_2700 = --@COND_i386_pc_TRUE@am__append_2701 = \ -+@COND_i386_pc_TRUE@am__append_2693 = -+@COND_i386_pc_TRUE@am__append_2694 = \ - @COND_i386_pc_TRUE@ $(nodist_biosdisk_module_SOURCES) \ - @COND_i386_pc_TRUE@ $(nodist_usbms_module_SOURCES) --@COND_i386_pc_TRUE@am__append_2702 = \ -+@COND_i386_pc_TRUE@am__append_2695 = \ - @COND_i386_pc_TRUE@ $(nodist_biosdisk_module_SOURCES) \ - @COND_i386_pc_TRUE@ biosdisk.marker \ - @COND_i386_pc_TRUE@ $(nodist_usbms_module_SOURCES) usbms.marker --@COND_i386_pc_TRUE@am__append_2703 = biosdisk.mod usbms.mod --@COND_i386_pc_TRUE@am__append_2704 = biosdisk.marker usbms.marker -+@COND_i386_pc_TRUE@am__append_2696 = biosdisk.mod usbms.mod -+@COND_i386_pc_TRUE@am__append_2697 = biosdisk.marker usbms.marker - @COND_arm_coreboot_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_mips_loongson_FALSE@@COND_x86_64_efi_FALSE@usbms_module_DEPENDENCIES = --@COND_i386_efi_TRUE@am__append_2705 = usbms.module --@COND_i386_efi_TRUE@am__append_2706 = usbms.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_2707 = --@COND_i386_efi_TRUE@am__append_2708 = $(nodist_usbms_module_SOURCES) --@COND_i386_efi_TRUE@am__append_2709 = $(nodist_usbms_module_SOURCES) \ -+@COND_i386_efi_TRUE@am__append_2698 = usbms.module -+@COND_i386_efi_TRUE@am__append_2699 = usbms.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_2700 = -+@COND_i386_efi_TRUE@am__append_2701 = $(nodist_usbms_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_2702 = $(nodist_usbms_module_SOURCES) \ - @COND_i386_efi_TRUE@ usbms.marker --@COND_i386_efi_TRUE@am__append_2710 = usbms.mod --@COND_i386_efi_TRUE@am__append_2711 = usbms.marker --@COND_i386_qemu_TRUE@am__append_2712 = usbms.module --@COND_i386_qemu_TRUE@am__append_2713 = usbms.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_2714 = --@COND_i386_qemu_TRUE@am__append_2715 = $(nodist_usbms_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_2716 = $(nodist_usbms_module_SOURCES) \ -+@COND_i386_efi_TRUE@am__append_2703 = usbms.mod -+@COND_i386_efi_TRUE@am__append_2704 = usbms.marker -+@COND_i386_qemu_TRUE@am__append_2705 = usbms.module -+@COND_i386_qemu_TRUE@am__append_2706 = usbms.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_2707 = -+@COND_i386_qemu_TRUE@am__append_2708 = $(nodist_usbms_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_2709 = $(nodist_usbms_module_SOURCES) \ - @COND_i386_qemu_TRUE@ usbms.marker --@COND_i386_qemu_TRUE@am__append_2717 = usbms.mod --@COND_i386_qemu_TRUE@am__append_2718 = usbms.marker --@COND_i386_coreboot_TRUE@am__append_2719 = usbms.module --@COND_i386_coreboot_TRUE@am__append_2720 = usbms.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_2721 = --@COND_i386_coreboot_TRUE@am__append_2722 = $(nodist_usbms_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_2723 = \ -+@COND_i386_qemu_TRUE@am__append_2710 = usbms.mod -+@COND_i386_qemu_TRUE@am__append_2711 = usbms.marker -+@COND_i386_coreboot_TRUE@am__append_2712 = usbms.module -+@COND_i386_coreboot_TRUE@am__append_2713 = usbms.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_2714 = -+@COND_i386_coreboot_TRUE@am__append_2715 = $(nodist_usbms_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_2716 = \ - @COND_i386_coreboot_TRUE@ $(nodist_usbms_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ usbms.marker --@COND_i386_coreboot_TRUE@am__append_2724 = usbms.mod --@COND_i386_coreboot_TRUE@am__append_2725 = usbms.marker --@COND_i386_multiboot_TRUE@am__append_2726 = usbms.module --@COND_i386_multiboot_TRUE@am__append_2727 = usbms.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_2728 = --@COND_i386_multiboot_TRUE@am__append_2729 = $(nodist_usbms_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_2730 = \ -+@COND_i386_coreboot_TRUE@am__append_2717 = usbms.mod -+@COND_i386_coreboot_TRUE@am__append_2718 = usbms.marker -+@COND_i386_multiboot_TRUE@am__append_2719 = usbms.module -+@COND_i386_multiboot_TRUE@am__append_2720 = usbms.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_2721 = -+@COND_i386_multiboot_TRUE@am__append_2722 = $(nodist_usbms_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_2723 = \ - @COND_i386_multiboot_TRUE@ $(nodist_usbms_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ usbms.marker --@COND_i386_multiboot_TRUE@am__append_2731 = usbms.mod --@COND_i386_multiboot_TRUE@am__append_2732 = usbms.marker --@COND_i386_ieee1275_TRUE@am__append_2733 = usbms.module --@COND_i386_ieee1275_TRUE@am__append_2734 = usbms.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_2735 = --@COND_i386_ieee1275_TRUE@am__append_2736 = $(nodist_usbms_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_2737 = \ -+@COND_i386_multiboot_TRUE@am__append_2724 = usbms.mod -+@COND_i386_multiboot_TRUE@am__append_2725 = usbms.marker -+@COND_i386_ieee1275_TRUE@am__append_2726 = usbms.module -+@COND_i386_ieee1275_TRUE@am__append_2727 = usbms.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_2728 = -+@COND_i386_ieee1275_TRUE@am__append_2729 = $(nodist_usbms_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_2730 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_usbms_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ usbms.marker --@COND_i386_ieee1275_TRUE@am__append_2738 = usbms.mod --@COND_i386_ieee1275_TRUE@am__append_2739 = usbms.marker --@COND_x86_64_efi_TRUE@am__append_2740 = usbms.module --@COND_x86_64_efi_TRUE@am__append_2741 = usbms.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_2742 = --@COND_x86_64_efi_TRUE@am__append_2743 = $(nodist_usbms_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_2744 = \ -+@COND_i386_ieee1275_TRUE@am__append_2731 = usbms.mod -+@COND_i386_ieee1275_TRUE@am__append_2732 = usbms.marker -+@COND_x86_64_efi_TRUE@am__append_2733 = usbms.module -+@COND_x86_64_efi_TRUE@am__append_2734 = usbms.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_2735 = -+@COND_x86_64_efi_TRUE@am__append_2736 = $(nodist_usbms_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_2737 = \ - @COND_x86_64_efi_TRUE@ $(nodist_usbms_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ usbms.marker --@COND_x86_64_efi_TRUE@am__append_2745 = usbms.mod --@COND_x86_64_efi_TRUE@am__append_2746 = usbms.marker --@COND_mips_loongson_TRUE@am__append_2747 = usbms.module --@COND_mips_loongson_TRUE@am__append_2748 = usbms.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__append_2749 = --@COND_mips_loongson_TRUE@am__append_2750 = $(nodist_usbms_module_SOURCES) --@COND_mips_loongson_TRUE@am__append_2751 = \ -+@COND_x86_64_efi_TRUE@am__append_2738 = usbms.mod -+@COND_x86_64_efi_TRUE@am__append_2739 = usbms.marker -+@COND_mips_loongson_TRUE@am__append_2740 = usbms.module -+@COND_mips_loongson_TRUE@am__append_2741 = usbms.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__append_2742 = -+@COND_mips_loongson_TRUE@am__append_2743 = $(nodist_usbms_module_SOURCES) -+@COND_mips_loongson_TRUE@am__append_2744 = \ - @COND_mips_loongson_TRUE@ $(nodist_usbms_module_SOURCES) \ - @COND_mips_loongson_TRUE@ usbms.marker --@COND_mips_loongson_TRUE@am__append_2752 = usbms.mod --@COND_mips_loongson_TRUE@am__append_2753 = usbms.marker --@COND_arm_coreboot_TRUE@am__append_2754 = usbms.module --@COND_arm_coreboot_TRUE@am__append_2755 = usbms.module$(EXEEXT) --@COND_arm_coreboot_TRUE@am__append_2756 = --@COND_arm_coreboot_TRUE@am__append_2757 = $(nodist_usbms_module_SOURCES) --@COND_arm_coreboot_TRUE@am__append_2758 = \ -+@COND_mips_loongson_TRUE@am__append_2745 = usbms.mod -+@COND_mips_loongson_TRUE@am__append_2746 = usbms.marker -+@COND_arm_coreboot_TRUE@am__append_2747 = usbms.module -+@COND_arm_coreboot_TRUE@am__append_2748 = usbms.module$(EXEEXT) -+@COND_arm_coreboot_TRUE@am__append_2749 = -+@COND_arm_coreboot_TRUE@am__append_2750 = $(nodist_usbms_module_SOURCES) -+@COND_arm_coreboot_TRUE@am__append_2751 = \ - @COND_arm_coreboot_TRUE@ $(nodist_usbms_module_SOURCES) \ - @COND_arm_coreboot_TRUE@ usbms.marker --@COND_arm_coreboot_TRUE@am__append_2759 = usbms.mod --@COND_arm_coreboot_TRUE@am__append_2760 = usbms.marker --@COND_i386_ieee1275_TRUE@am__append_2761 = nand.module --@COND_i386_ieee1275_TRUE@am__append_2762 = nand.module$(EXEEXT) -+@COND_arm_coreboot_TRUE@am__append_2752 = usbms.mod -+@COND_arm_coreboot_TRUE@am__append_2753 = usbms.marker -+@COND_i386_ieee1275_TRUE@am__append_2754 = nand.module -+@COND_i386_ieee1275_TRUE@am__append_2755 = nand.module$(EXEEXT) - @COND_i386_ieee1275_FALSE@nand_module_DEPENDENCIES = --@COND_i386_ieee1275_TRUE@am__append_2763 = --@COND_i386_ieee1275_TRUE@am__append_2764 = $(nodist_nand_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_2765 = \ -+@COND_i386_ieee1275_TRUE@am__append_2756 = -+@COND_i386_ieee1275_TRUE@am__append_2757 = $(nodist_nand_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_2758 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_nand_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ nand.marker --@COND_i386_ieee1275_TRUE@am__append_2766 = nand.mod --@COND_i386_ieee1275_TRUE@am__append_2767 = nand.marker --@COND_i386_pc_TRUE@am__append_2768 = efiemu.module --@COND_i386_pc_TRUE@am__append_2769 = efiemu.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_2759 = nand.mod -+@COND_i386_ieee1275_TRUE@am__append_2760 = nand.marker -+@COND_i386_pc_TRUE@am__append_2761 = efiemu.module -+@COND_i386_pc_TRUE@am__append_2762 = efiemu.module$(EXEEXT) - @COND_i386_coreboot_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@efiemu_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_2770 = efiemu/prepare.c efiemu/loadcore.c efiemu/runtime/efiemu.S efiemu/runtime/efiemu.c --@COND_i386_pc_TRUE@am__append_2771 = $(nodist_efiemu_module_SOURCES) --@COND_i386_pc_TRUE@am__append_2772 = $(nodist_efiemu_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_2763 = efiemu/prepare.c efiemu/loadcore.c efiemu/runtime/efiemu.S efiemu/runtime/efiemu.c -+@COND_i386_pc_TRUE@am__append_2764 = $(nodist_efiemu_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_2765 = $(nodist_efiemu_module_SOURCES) \ - @COND_i386_pc_TRUE@ efiemu.marker --@COND_i386_pc_TRUE@am__append_2773 = efiemu.mod --@COND_i386_pc_TRUE@am__append_2774 = efiemu.marker --@COND_i386_qemu_TRUE@am__append_2775 = efiemu.module --@COND_i386_qemu_TRUE@am__append_2776 = efiemu.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_2777 = efiemu/prepare.c efiemu/loadcore.c efiemu/runtime/efiemu.S efiemu/runtime/efiemu.c --@COND_i386_qemu_TRUE@am__append_2778 = $(nodist_efiemu_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_2779 = \ -+@COND_i386_pc_TRUE@am__append_2766 = efiemu.mod -+@COND_i386_pc_TRUE@am__append_2767 = efiemu.marker -+@COND_i386_qemu_TRUE@am__append_2768 = efiemu.module -+@COND_i386_qemu_TRUE@am__append_2769 = efiemu.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_2770 = efiemu/prepare.c efiemu/loadcore.c efiemu/runtime/efiemu.S efiemu/runtime/efiemu.c -+@COND_i386_qemu_TRUE@am__append_2771 = $(nodist_efiemu_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_2772 = \ - @COND_i386_qemu_TRUE@ $(nodist_efiemu_module_SOURCES) \ - @COND_i386_qemu_TRUE@ efiemu.marker --@COND_i386_qemu_TRUE@am__append_2780 = efiemu.mod --@COND_i386_qemu_TRUE@am__append_2781 = efiemu.marker --@COND_i386_coreboot_TRUE@am__append_2782 = efiemu.module --@COND_i386_coreboot_TRUE@am__append_2783 = efiemu.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_2784 = efiemu/prepare.c efiemu/loadcore.c efiemu/runtime/efiemu.S efiemu/runtime/efiemu.c --@COND_i386_coreboot_TRUE@am__append_2785 = $(nodist_efiemu_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_2786 = \ -+@COND_i386_qemu_TRUE@am__append_2773 = efiemu.mod -+@COND_i386_qemu_TRUE@am__append_2774 = efiemu.marker -+@COND_i386_coreboot_TRUE@am__append_2775 = efiemu.module -+@COND_i386_coreboot_TRUE@am__append_2776 = efiemu.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_2777 = efiemu/prepare.c efiemu/loadcore.c efiemu/runtime/efiemu.S efiemu/runtime/efiemu.c -+@COND_i386_coreboot_TRUE@am__append_2778 = $(nodist_efiemu_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_2779 = \ - @COND_i386_coreboot_TRUE@ $(nodist_efiemu_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ efiemu.marker --@COND_i386_coreboot_TRUE@am__append_2787 = efiemu.mod --@COND_i386_coreboot_TRUE@am__append_2788 = efiemu.marker --@COND_i386_multiboot_TRUE@am__append_2789 = efiemu.module --@COND_i386_multiboot_TRUE@am__append_2790 = efiemu.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_2791 = efiemu/prepare.c efiemu/loadcore.c efiemu/runtime/efiemu.S efiemu/runtime/efiemu.c --@COND_i386_multiboot_TRUE@am__append_2792 = $(nodist_efiemu_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_2793 = \ -+@COND_i386_coreboot_TRUE@am__append_2780 = efiemu.mod -+@COND_i386_coreboot_TRUE@am__append_2781 = efiemu.marker -+@COND_i386_multiboot_TRUE@am__append_2782 = efiemu.module -+@COND_i386_multiboot_TRUE@am__append_2783 = efiemu.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_2784 = efiemu/prepare.c efiemu/loadcore.c efiemu/runtime/efiemu.S efiemu/runtime/efiemu.c -+@COND_i386_multiboot_TRUE@am__append_2785 = $(nodist_efiemu_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_2786 = \ - @COND_i386_multiboot_TRUE@ $(nodist_efiemu_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ efiemu.marker --@COND_i386_multiboot_TRUE@am__append_2794 = efiemu.mod --@COND_i386_multiboot_TRUE@am__append_2795 = efiemu.marker --@COND_i386_ieee1275_TRUE@am__append_2796 = efiemu.module --@COND_i386_ieee1275_TRUE@am__append_2797 = efiemu.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_2798 = efiemu/prepare.c efiemu/loadcore.c efiemu/runtime/efiemu.S efiemu/runtime/efiemu.c --@COND_i386_ieee1275_TRUE@am__append_2799 = $(nodist_efiemu_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_2800 = \ -+@COND_i386_multiboot_TRUE@am__append_2787 = efiemu.mod -+@COND_i386_multiboot_TRUE@am__append_2788 = efiemu.marker -+@COND_i386_ieee1275_TRUE@am__append_2789 = efiemu.module -+@COND_i386_ieee1275_TRUE@am__append_2790 = efiemu.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_2791 = efiemu/prepare.c efiemu/loadcore.c efiemu/runtime/efiemu.S efiemu/runtime/efiemu.c -+@COND_i386_ieee1275_TRUE@am__append_2792 = $(nodist_efiemu_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_2793 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_efiemu_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ efiemu.marker --@COND_i386_ieee1275_TRUE@am__append_2801 = efiemu.mod --@COND_i386_ieee1275_TRUE@am__append_2802 = efiemu.marker --@COND_emu_TRUE@am__append_2803 = font.module --@COND_emu_TRUE@am__append_2804 = font.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_2794 = efiemu.mod -+@COND_i386_ieee1275_TRUE@am__append_2795 = efiemu.marker -+@COND_emu_TRUE@am__append_2796 = font.module -+@COND_emu_TRUE@am__append_2797 = font.module$(EXEEXT) - @COND_arm64_efi_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_FALSE@font_module_DEPENDENCIES = --@COND_emu_TRUE@am__append_2805 = --@COND_emu_TRUE@am__append_2806 = $(nodist_font_module_SOURCES) --@COND_emu_TRUE@am__append_2807 = $(nodist_font_module_SOURCES) \ -+@COND_emu_TRUE@am__append_2798 = -+@COND_emu_TRUE@am__append_2799 = $(nodist_font_module_SOURCES) -+@COND_emu_TRUE@am__append_2800 = $(nodist_font_module_SOURCES) \ - @COND_emu_TRUE@ font.marker --@COND_emu_TRUE@am__append_2808 = font.mod --@COND_emu_TRUE@am__append_2809 = font.marker --@COND_i386_pc_TRUE@am__append_2810 = font.module --@COND_i386_pc_TRUE@am__append_2811 = font.module$(EXEEXT) --@COND_i386_pc_TRUE@am__append_2812 = --@COND_i386_pc_TRUE@am__append_2813 = $(nodist_font_module_SOURCES) --@COND_i386_pc_TRUE@am__append_2814 = $(nodist_font_module_SOURCES) \ -+@COND_emu_TRUE@am__append_2801 = font.mod -+@COND_emu_TRUE@am__append_2802 = font.marker -+@COND_i386_pc_TRUE@am__append_2803 = font.module -+@COND_i386_pc_TRUE@am__append_2804 = font.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__append_2805 = -+@COND_i386_pc_TRUE@am__append_2806 = $(nodist_font_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_2807 = $(nodist_font_module_SOURCES) \ - @COND_i386_pc_TRUE@ font.marker --@COND_i386_pc_TRUE@am__append_2815 = font.mod --@COND_i386_pc_TRUE@am__append_2816 = font.marker --@COND_i386_efi_TRUE@am__append_2817 = font.module --@COND_i386_efi_TRUE@am__append_2818 = font.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_2819 = --@COND_i386_efi_TRUE@am__append_2820 = $(nodist_font_module_SOURCES) --@COND_i386_efi_TRUE@am__append_2821 = $(nodist_font_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_2808 = font.mod -+@COND_i386_pc_TRUE@am__append_2809 = font.marker -+@COND_i386_efi_TRUE@am__append_2810 = font.module -+@COND_i386_efi_TRUE@am__append_2811 = font.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_2812 = -+@COND_i386_efi_TRUE@am__append_2813 = $(nodist_font_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_2814 = $(nodist_font_module_SOURCES) \ - @COND_i386_efi_TRUE@ font.marker --@COND_i386_efi_TRUE@am__append_2822 = font.mod --@COND_i386_efi_TRUE@am__append_2823 = font.marker --@COND_i386_qemu_TRUE@am__append_2824 = font.module --@COND_i386_qemu_TRUE@am__append_2825 = font.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_2826 = --@COND_i386_qemu_TRUE@am__append_2827 = $(nodist_font_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_2828 = $(nodist_font_module_SOURCES) \ -+@COND_i386_efi_TRUE@am__append_2815 = font.mod -+@COND_i386_efi_TRUE@am__append_2816 = font.marker -+@COND_i386_qemu_TRUE@am__append_2817 = font.module -+@COND_i386_qemu_TRUE@am__append_2818 = font.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_2819 = -+@COND_i386_qemu_TRUE@am__append_2820 = $(nodist_font_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_2821 = $(nodist_font_module_SOURCES) \ - @COND_i386_qemu_TRUE@ font.marker --@COND_i386_qemu_TRUE@am__append_2829 = font.mod --@COND_i386_qemu_TRUE@am__append_2830 = font.marker --@COND_i386_multiboot_TRUE@am__append_2831 = font.module --@COND_i386_multiboot_TRUE@am__append_2832 = font.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_2833 = --@COND_i386_multiboot_TRUE@am__append_2834 = $(nodist_font_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_2835 = \ -+@COND_i386_qemu_TRUE@am__append_2822 = font.mod -+@COND_i386_qemu_TRUE@am__append_2823 = font.marker -+@COND_i386_multiboot_TRUE@am__append_2824 = font.module -+@COND_i386_multiboot_TRUE@am__append_2825 = font.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_2826 = -+@COND_i386_multiboot_TRUE@am__append_2827 = $(nodist_font_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_2828 = \ - @COND_i386_multiboot_TRUE@ $(nodist_font_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ font.marker --@COND_i386_multiboot_TRUE@am__append_2836 = font.mod --@COND_i386_multiboot_TRUE@am__append_2837 = font.marker --@COND_i386_ieee1275_TRUE@am__append_2838 = font.module --@COND_i386_ieee1275_TRUE@am__append_2839 = font.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_2840 = --@COND_i386_ieee1275_TRUE@am__append_2841 = $(nodist_font_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_2842 = \ -+@COND_i386_multiboot_TRUE@am__append_2829 = font.mod -+@COND_i386_multiboot_TRUE@am__append_2830 = font.marker -+@COND_i386_ieee1275_TRUE@am__append_2831 = font.module -+@COND_i386_ieee1275_TRUE@am__append_2832 = font.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_2833 = -+@COND_i386_ieee1275_TRUE@am__append_2834 = $(nodist_font_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_2835 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_font_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ font.marker --@COND_i386_ieee1275_TRUE@am__append_2843 = font.mod --@COND_i386_ieee1275_TRUE@am__append_2844 = font.marker --@COND_x86_64_efi_TRUE@am__append_2845 = font.module --@COND_x86_64_efi_TRUE@am__append_2846 = font.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_2847 = --@COND_x86_64_efi_TRUE@am__append_2848 = $(nodist_font_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_2849 = $(nodist_font_module_SOURCES) \ -+@COND_i386_ieee1275_TRUE@am__append_2836 = font.mod -+@COND_i386_ieee1275_TRUE@am__append_2837 = font.marker -+@COND_x86_64_efi_TRUE@am__append_2838 = font.module -+@COND_x86_64_efi_TRUE@am__append_2839 = font.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_2840 = -+@COND_x86_64_efi_TRUE@am__append_2841 = $(nodist_font_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_2842 = $(nodist_font_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ font.marker --@COND_x86_64_efi_TRUE@am__append_2850 = font.mod --@COND_x86_64_efi_TRUE@am__append_2851 = font.marker --@COND_i386_xen_TRUE@am__append_2852 = font.module --@COND_i386_xen_TRUE@am__append_2853 = font.module$(EXEEXT) --@COND_i386_xen_TRUE@am__append_2854 = --@COND_i386_xen_TRUE@am__append_2855 = $(nodist_font_module_SOURCES) --@COND_i386_xen_TRUE@am__append_2856 = $(nodist_font_module_SOURCES) \ -+@COND_x86_64_efi_TRUE@am__append_2843 = font.mod -+@COND_x86_64_efi_TRUE@am__append_2844 = font.marker -+@COND_i386_xen_TRUE@am__append_2845 = font.module -+@COND_i386_xen_TRUE@am__append_2846 = font.module$(EXEEXT) -+@COND_i386_xen_TRUE@am__append_2847 = -+@COND_i386_xen_TRUE@am__append_2848 = $(nodist_font_module_SOURCES) -+@COND_i386_xen_TRUE@am__append_2849 = $(nodist_font_module_SOURCES) \ - @COND_i386_xen_TRUE@ font.marker --@COND_i386_xen_TRUE@am__append_2857 = font.mod --@COND_i386_xen_TRUE@am__append_2858 = font.marker --@COND_x86_64_xen_TRUE@am__append_2859 = font.module --@COND_x86_64_xen_TRUE@am__append_2860 = font.module$(EXEEXT) --@COND_x86_64_xen_TRUE@am__append_2861 = --@COND_x86_64_xen_TRUE@am__append_2862 = $(nodist_font_module_SOURCES) --@COND_x86_64_xen_TRUE@am__append_2863 = $(nodist_font_module_SOURCES) \ -+@COND_i386_xen_TRUE@am__append_2850 = font.mod -+@COND_i386_xen_TRUE@am__append_2851 = font.marker -+@COND_x86_64_xen_TRUE@am__append_2852 = font.module -+@COND_x86_64_xen_TRUE@am__append_2853 = font.module$(EXEEXT) -+@COND_x86_64_xen_TRUE@am__append_2854 = -+@COND_x86_64_xen_TRUE@am__append_2855 = $(nodist_font_module_SOURCES) -+@COND_x86_64_xen_TRUE@am__append_2856 = $(nodist_font_module_SOURCES) \ - @COND_x86_64_xen_TRUE@ font.marker --@COND_x86_64_xen_TRUE@am__append_2864 = font.mod --@COND_x86_64_xen_TRUE@am__append_2865 = font.marker --@COND_i386_xen_pvh_TRUE@am__append_2866 = font.module --@COND_i386_xen_pvh_TRUE@am__append_2867 = font.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__append_2868 = --@COND_i386_xen_pvh_TRUE@am__append_2869 = $(nodist_font_module_SOURCES) --@COND_i386_xen_pvh_TRUE@am__append_2870 = \ -+@COND_x86_64_xen_TRUE@am__append_2857 = font.mod -+@COND_x86_64_xen_TRUE@am__append_2858 = font.marker -+@COND_i386_xen_pvh_TRUE@am__append_2859 = font.module -+@COND_i386_xen_pvh_TRUE@am__append_2860 = font.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__append_2861 = -+@COND_i386_xen_pvh_TRUE@am__append_2862 = $(nodist_font_module_SOURCES) -+@COND_i386_xen_pvh_TRUE@am__append_2863 = \ - @COND_i386_xen_pvh_TRUE@ $(nodist_font_module_SOURCES) \ - @COND_i386_xen_pvh_TRUE@ font.marker --@COND_i386_xen_pvh_TRUE@am__append_2871 = font.mod --@COND_i386_xen_pvh_TRUE@am__append_2872 = font.marker --@COND_sparc64_ieee1275_TRUE@am__append_2873 = font.module --@COND_sparc64_ieee1275_TRUE@am__append_2874 = font.module$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@am__append_2875 = --@COND_sparc64_ieee1275_TRUE@am__append_2876 = $(nodist_font_module_SOURCES) --@COND_sparc64_ieee1275_TRUE@am__append_2877 = \ -+@COND_i386_xen_pvh_TRUE@am__append_2864 = font.mod -+@COND_i386_xen_pvh_TRUE@am__append_2865 = font.marker -+@COND_sparc64_ieee1275_TRUE@am__append_2866 = font.module -+@COND_sparc64_ieee1275_TRUE@am__append_2867 = font.module$(EXEEXT) -+@COND_sparc64_ieee1275_TRUE@am__append_2868 = -+@COND_sparc64_ieee1275_TRUE@am__append_2869 = $(nodist_font_module_SOURCES) -+@COND_sparc64_ieee1275_TRUE@am__append_2870 = \ - @COND_sparc64_ieee1275_TRUE@ $(nodist_font_module_SOURCES) \ - @COND_sparc64_ieee1275_TRUE@ font.marker --@COND_sparc64_ieee1275_TRUE@am__append_2878 = font.mod --@COND_sparc64_ieee1275_TRUE@am__append_2879 = font.marker --@COND_powerpc_ieee1275_TRUE@am__append_2880 = font.module --@COND_powerpc_ieee1275_TRUE@am__append_2881 = font.module$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__append_2882 = --@COND_powerpc_ieee1275_TRUE@am__append_2883 = $(nodist_font_module_SOURCES) --@COND_powerpc_ieee1275_TRUE@am__append_2884 = \ -+@COND_sparc64_ieee1275_TRUE@am__append_2871 = font.mod -+@COND_sparc64_ieee1275_TRUE@am__append_2872 = font.marker -+@COND_powerpc_ieee1275_TRUE@am__append_2873 = font.module -+@COND_powerpc_ieee1275_TRUE@am__append_2874 = font.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__append_2875 = -+@COND_powerpc_ieee1275_TRUE@am__append_2876 = $(nodist_font_module_SOURCES) -+@COND_powerpc_ieee1275_TRUE@am__append_2877 = \ - @COND_powerpc_ieee1275_TRUE@ $(nodist_font_module_SOURCES) \ - @COND_powerpc_ieee1275_TRUE@ font.marker --@COND_powerpc_ieee1275_TRUE@am__append_2885 = font.mod --@COND_powerpc_ieee1275_TRUE@am__append_2886 = font.marker --@COND_mips_arc_TRUE@am__append_2887 = font.module --@COND_mips_arc_TRUE@am__append_2888 = font.module$(EXEEXT) --@COND_mips_arc_TRUE@am__append_2889 = --@COND_mips_arc_TRUE@am__append_2890 = $(nodist_font_module_SOURCES) --@COND_mips_arc_TRUE@am__append_2891 = $(nodist_font_module_SOURCES) \ -+@COND_powerpc_ieee1275_TRUE@am__append_2878 = font.mod -+@COND_powerpc_ieee1275_TRUE@am__append_2879 = font.marker -+@COND_mips_arc_TRUE@am__append_2880 = font.module -+@COND_mips_arc_TRUE@am__append_2881 = font.module$(EXEEXT) -+@COND_mips_arc_TRUE@am__append_2882 = -+@COND_mips_arc_TRUE@am__append_2883 = $(nodist_font_module_SOURCES) -+@COND_mips_arc_TRUE@am__append_2884 = $(nodist_font_module_SOURCES) \ - @COND_mips_arc_TRUE@ font.marker --@COND_mips_arc_TRUE@am__append_2892 = font.mod --@COND_mips_arc_TRUE@am__append_2893 = font.marker --@COND_ia64_efi_TRUE@am__append_2894 = font.module --@COND_ia64_efi_TRUE@am__append_2895 = font.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__append_2896 = --@COND_ia64_efi_TRUE@am__append_2897 = $(nodist_font_module_SOURCES) --@COND_ia64_efi_TRUE@am__append_2898 = $(nodist_font_module_SOURCES) \ -+@COND_mips_arc_TRUE@am__append_2885 = font.mod -+@COND_mips_arc_TRUE@am__append_2886 = font.marker -+@COND_ia64_efi_TRUE@am__append_2887 = font.module -+@COND_ia64_efi_TRUE@am__append_2888 = font.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__append_2889 = -+@COND_ia64_efi_TRUE@am__append_2890 = $(nodist_font_module_SOURCES) -+@COND_ia64_efi_TRUE@am__append_2891 = $(nodist_font_module_SOURCES) \ - @COND_ia64_efi_TRUE@ font.marker --@COND_ia64_efi_TRUE@am__append_2899 = font.mod --@COND_ia64_efi_TRUE@am__append_2900 = font.marker --@COND_mips_qemu_mips_TRUE@am__append_2901 = font.module --@COND_mips_qemu_mips_TRUE@am__append_2902 = font.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__append_2903 = --@COND_mips_qemu_mips_TRUE@am__append_2904 = $(nodist_font_module_SOURCES) --@COND_mips_qemu_mips_TRUE@am__append_2905 = \ -+@COND_ia64_efi_TRUE@am__append_2892 = font.mod -+@COND_ia64_efi_TRUE@am__append_2893 = font.marker -+@COND_mips_qemu_mips_TRUE@am__append_2894 = font.module -+@COND_mips_qemu_mips_TRUE@am__append_2895 = font.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__append_2896 = -+@COND_mips_qemu_mips_TRUE@am__append_2897 = $(nodist_font_module_SOURCES) -+@COND_mips_qemu_mips_TRUE@am__append_2898 = \ - @COND_mips_qemu_mips_TRUE@ $(nodist_font_module_SOURCES) \ - @COND_mips_qemu_mips_TRUE@ font.marker --@COND_mips_qemu_mips_TRUE@am__append_2906 = font.mod --@COND_mips_qemu_mips_TRUE@am__append_2907 = font.marker --@COND_arm_uboot_TRUE@am__append_2908 = font.module --@COND_arm_uboot_TRUE@am__append_2909 = font.module$(EXEEXT) --@COND_arm_uboot_TRUE@am__append_2910 = --@COND_arm_uboot_TRUE@am__append_2911 = $(nodist_font_module_SOURCES) --@COND_arm_uboot_TRUE@am__append_2912 = $(nodist_font_module_SOURCES) \ -+@COND_mips_qemu_mips_TRUE@am__append_2899 = font.mod -+@COND_mips_qemu_mips_TRUE@am__append_2900 = font.marker -+@COND_arm_uboot_TRUE@am__append_2901 = font.module -+@COND_arm_uboot_TRUE@am__append_2902 = font.module$(EXEEXT) -+@COND_arm_uboot_TRUE@am__append_2903 = -+@COND_arm_uboot_TRUE@am__append_2904 = $(nodist_font_module_SOURCES) -+@COND_arm_uboot_TRUE@am__append_2905 = $(nodist_font_module_SOURCES) \ - @COND_arm_uboot_TRUE@ font.marker --@COND_arm_uboot_TRUE@am__append_2913 = font.mod --@COND_arm_uboot_TRUE@am__append_2914 = font.marker --@COND_arm_efi_TRUE@am__append_2915 = font.module --@COND_arm_efi_TRUE@am__append_2916 = font.module$(EXEEXT) --@COND_arm_efi_TRUE@am__append_2917 = --@COND_arm_efi_TRUE@am__append_2918 = $(nodist_font_module_SOURCES) --@COND_arm_efi_TRUE@am__append_2919 = $(nodist_font_module_SOURCES) \ -+@COND_arm_uboot_TRUE@am__append_2906 = font.mod -+@COND_arm_uboot_TRUE@am__append_2907 = font.marker -+@COND_arm_efi_TRUE@am__append_2908 = font.module -+@COND_arm_efi_TRUE@am__append_2909 = font.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__append_2910 = -+@COND_arm_efi_TRUE@am__append_2911 = $(nodist_font_module_SOURCES) -+@COND_arm_efi_TRUE@am__append_2912 = $(nodist_font_module_SOURCES) \ - @COND_arm_efi_TRUE@ font.marker --@COND_arm_efi_TRUE@am__append_2920 = font.mod --@COND_arm_efi_TRUE@am__append_2921 = font.marker --@COND_arm64_efi_TRUE@am__append_2922 = font.module --@COND_arm64_efi_TRUE@am__append_2923 = font.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__append_2924 = --@COND_arm64_efi_TRUE@am__append_2925 = $(nodist_font_module_SOURCES) --@COND_arm64_efi_TRUE@am__append_2926 = $(nodist_font_module_SOURCES) \ -+@COND_arm_efi_TRUE@am__append_2913 = font.mod -+@COND_arm_efi_TRUE@am__append_2914 = font.marker -+@COND_arm64_efi_TRUE@am__append_2915 = font.module -+@COND_arm64_efi_TRUE@am__append_2916 = font.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__append_2917 = -+@COND_arm64_efi_TRUE@am__append_2918 = $(nodist_font_module_SOURCES) -+@COND_arm64_efi_TRUE@am__append_2919 = $(nodist_font_module_SOURCES) \ - @COND_arm64_efi_TRUE@ font.marker --@COND_arm64_efi_TRUE@am__append_2927 = font.mod --@COND_arm64_efi_TRUE@am__append_2928 = font.marker --@COND_riscv32_efi_TRUE@am__append_2929 = font.module --@COND_riscv32_efi_TRUE@am__append_2930 = font.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__append_2931 = --@COND_riscv32_efi_TRUE@am__append_2932 = $(nodist_font_module_SOURCES) --@COND_riscv32_efi_TRUE@am__append_2933 = \ -+@COND_arm64_efi_TRUE@am__append_2920 = font.mod -+@COND_arm64_efi_TRUE@am__append_2921 = font.marker -+@COND_riscv32_efi_TRUE@am__append_2922 = font.module -+@COND_riscv32_efi_TRUE@am__append_2923 = font.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__append_2924 = -+@COND_riscv32_efi_TRUE@am__append_2925 = $(nodist_font_module_SOURCES) -+@COND_riscv32_efi_TRUE@am__append_2926 = \ - @COND_riscv32_efi_TRUE@ $(nodist_font_module_SOURCES) \ - @COND_riscv32_efi_TRUE@ font.marker --@COND_riscv32_efi_TRUE@am__append_2934 = font.mod --@COND_riscv32_efi_TRUE@am__append_2935 = font.marker --@COND_riscv64_efi_TRUE@am__append_2936 = font.module --@COND_riscv64_efi_TRUE@am__append_2937 = font.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__append_2938 = --@COND_riscv64_efi_TRUE@am__append_2939 = $(nodist_font_module_SOURCES) --@COND_riscv64_efi_TRUE@am__append_2940 = \ -+@COND_riscv32_efi_TRUE@am__append_2927 = font.mod -+@COND_riscv32_efi_TRUE@am__append_2928 = font.marker -+@COND_riscv64_efi_TRUE@am__append_2929 = font.module -+@COND_riscv64_efi_TRUE@am__append_2930 = font.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_2931 = -+@COND_riscv64_efi_TRUE@am__append_2932 = $(nodist_font_module_SOURCES) -+@COND_riscv64_efi_TRUE@am__append_2933 = \ - @COND_riscv64_efi_TRUE@ $(nodist_font_module_SOURCES) \ - @COND_riscv64_efi_TRUE@ font.marker --@COND_riscv64_efi_TRUE@am__append_2941 = font.mod --@COND_riscv64_efi_TRUE@am__append_2942 = font.marker --@COND_i386_pc_TRUE@am__append_2943 = pxe.module --@COND_i386_pc_TRUE@am__append_2944 = pxe.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_2934 = font.mod -+@COND_riscv64_efi_TRUE@am__append_2935 = font.marker -+@COND_i386_pc_TRUE@am__append_2936 = pxe.module -+@COND_i386_pc_TRUE@am__append_2937 = pxe.module$(EXEEXT) - @COND_i386_pc_FALSE@pxe_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_2945 = --@COND_i386_pc_TRUE@am__append_2946 = $(nodist_pxe_module_SOURCES) --@COND_i386_pc_TRUE@am__append_2947 = $(nodist_pxe_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_2938 = -+@COND_i386_pc_TRUE@am__append_2939 = $(nodist_pxe_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_2940 = $(nodist_pxe_module_SOURCES) \ - @COND_i386_pc_TRUE@ pxe.marker --@COND_i386_pc_TRUE@am__append_2948 = pxe.mod --@COND_i386_pc_TRUE@am__append_2949 = pxe.marker --@COND_emu_TRUE@am__append_2950 = bufio.module --@COND_emu_TRUE@am__append_2951 = bufio.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__append_2941 = pxe.mod -+@COND_i386_pc_TRUE@am__append_2942 = pxe.marker -+@COND_emu_TRUE@am__append_2943 = bufio.module -+@COND_emu_TRUE@am__append_2944 = bufio.module$(EXEEXT) - @COND_arm64_efi_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_FALSE@bufio_module_DEPENDENCIES = --@COND_emu_TRUE@am__append_2952 = --@COND_emu_TRUE@am__append_2953 = $(nodist_bufio_module_SOURCES) --@COND_emu_TRUE@am__append_2954 = $(nodist_bufio_module_SOURCES) \ -+@COND_emu_TRUE@am__append_2945 = -+@COND_emu_TRUE@am__append_2946 = $(nodist_bufio_module_SOURCES) -+@COND_emu_TRUE@am__append_2947 = $(nodist_bufio_module_SOURCES) \ - @COND_emu_TRUE@ bufio.marker --@COND_emu_TRUE@am__append_2955 = bufio.mod --@COND_emu_TRUE@am__append_2956 = bufio.marker --@COND_i386_pc_TRUE@am__append_2957 = bufio.module --@COND_i386_pc_TRUE@am__append_2958 = bufio.module$(EXEEXT) --@COND_i386_pc_TRUE@am__append_2959 = --@COND_i386_pc_TRUE@am__append_2960 = $(nodist_bufio_module_SOURCES) --@COND_i386_pc_TRUE@am__append_2961 = $(nodist_bufio_module_SOURCES) \ -+@COND_emu_TRUE@am__append_2948 = bufio.mod -+@COND_emu_TRUE@am__append_2949 = bufio.marker -+@COND_i386_pc_TRUE@am__append_2950 = bufio.module -+@COND_i386_pc_TRUE@am__append_2951 = bufio.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__append_2952 = -+@COND_i386_pc_TRUE@am__append_2953 = $(nodist_bufio_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_2954 = $(nodist_bufio_module_SOURCES) \ - @COND_i386_pc_TRUE@ bufio.marker --@COND_i386_pc_TRUE@am__append_2962 = bufio.mod --@COND_i386_pc_TRUE@am__append_2963 = bufio.marker --@COND_i386_efi_TRUE@am__append_2964 = bufio.module --@COND_i386_efi_TRUE@am__append_2965 = bufio.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_2966 = --@COND_i386_efi_TRUE@am__append_2967 = $(nodist_bufio_module_SOURCES) --@COND_i386_efi_TRUE@am__append_2968 = $(nodist_bufio_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_2955 = bufio.mod -+@COND_i386_pc_TRUE@am__append_2956 = bufio.marker -+@COND_i386_efi_TRUE@am__append_2957 = bufio.module -+@COND_i386_efi_TRUE@am__append_2958 = bufio.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_2959 = -+@COND_i386_efi_TRUE@am__append_2960 = $(nodist_bufio_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_2961 = $(nodist_bufio_module_SOURCES) \ - @COND_i386_efi_TRUE@ bufio.marker --@COND_i386_efi_TRUE@am__append_2969 = bufio.mod --@COND_i386_efi_TRUE@am__append_2970 = bufio.marker --@COND_i386_qemu_TRUE@am__append_2971 = bufio.module --@COND_i386_qemu_TRUE@am__append_2972 = bufio.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_2973 = --@COND_i386_qemu_TRUE@am__append_2974 = $(nodist_bufio_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_2975 = $(nodist_bufio_module_SOURCES) \ -+@COND_i386_efi_TRUE@am__append_2962 = bufio.mod -+@COND_i386_efi_TRUE@am__append_2963 = bufio.marker -+@COND_i386_qemu_TRUE@am__append_2964 = bufio.module -+@COND_i386_qemu_TRUE@am__append_2965 = bufio.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_2966 = -+@COND_i386_qemu_TRUE@am__append_2967 = $(nodist_bufio_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_2968 = $(nodist_bufio_module_SOURCES) \ - @COND_i386_qemu_TRUE@ bufio.marker --@COND_i386_qemu_TRUE@am__append_2976 = bufio.mod --@COND_i386_qemu_TRUE@am__append_2977 = bufio.marker --@COND_i386_multiboot_TRUE@am__append_2978 = bufio.module --@COND_i386_multiboot_TRUE@am__append_2979 = bufio.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_2980 = --@COND_i386_multiboot_TRUE@am__append_2981 = $(nodist_bufio_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_2982 = \ -+@COND_i386_qemu_TRUE@am__append_2969 = bufio.mod -+@COND_i386_qemu_TRUE@am__append_2970 = bufio.marker -+@COND_i386_multiboot_TRUE@am__append_2971 = bufio.module -+@COND_i386_multiboot_TRUE@am__append_2972 = bufio.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_2973 = -+@COND_i386_multiboot_TRUE@am__append_2974 = $(nodist_bufio_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_2975 = \ - @COND_i386_multiboot_TRUE@ $(nodist_bufio_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ bufio.marker --@COND_i386_multiboot_TRUE@am__append_2983 = bufio.mod --@COND_i386_multiboot_TRUE@am__append_2984 = bufio.marker --@COND_i386_ieee1275_TRUE@am__append_2985 = bufio.module --@COND_i386_ieee1275_TRUE@am__append_2986 = bufio.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_2987 = --@COND_i386_ieee1275_TRUE@am__append_2988 = $(nodist_bufio_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_2989 = \ -+@COND_i386_multiboot_TRUE@am__append_2976 = bufio.mod -+@COND_i386_multiboot_TRUE@am__append_2977 = bufio.marker -+@COND_i386_ieee1275_TRUE@am__append_2978 = bufio.module -+@COND_i386_ieee1275_TRUE@am__append_2979 = bufio.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_2980 = -+@COND_i386_ieee1275_TRUE@am__append_2981 = $(nodist_bufio_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_2982 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_bufio_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ bufio.marker --@COND_i386_ieee1275_TRUE@am__append_2990 = bufio.mod --@COND_i386_ieee1275_TRUE@am__append_2991 = bufio.marker --@COND_x86_64_efi_TRUE@am__append_2992 = bufio.module --@COND_x86_64_efi_TRUE@am__append_2993 = bufio.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_2994 = --@COND_x86_64_efi_TRUE@am__append_2995 = $(nodist_bufio_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_2996 = \ -+@COND_i386_ieee1275_TRUE@am__append_2983 = bufio.mod -+@COND_i386_ieee1275_TRUE@am__append_2984 = bufio.marker -+@COND_x86_64_efi_TRUE@am__append_2985 = bufio.module -+@COND_x86_64_efi_TRUE@am__append_2986 = bufio.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_2987 = -+@COND_x86_64_efi_TRUE@am__append_2988 = $(nodist_bufio_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_2989 = \ - @COND_x86_64_efi_TRUE@ $(nodist_bufio_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ bufio.marker --@COND_x86_64_efi_TRUE@am__append_2997 = bufio.mod --@COND_x86_64_efi_TRUE@am__append_2998 = bufio.marker --@COND_i386_xen_TRUE@am__append_2999 = bufio.module --@COND_i386_xen_TRUE@am__append_3000 = bufio.module$(EXEEXT) --@COND_i386_xen_TRUE@am__append_3001 = --@COND_i386_xen_TRUE@am__append_3002 = $(nodist_bufio_module_SOURCES) --@COND_i386_xen_TRUE@am__append_3003 = $(nodist_bufio_module_SOURCES) \ -+@COND_x86_64_efi_TRUE@am__append_2990 = bufio.mod -+@COND_x86_64_efi_TRUE@am__append_2991 = bufio.marker -+@COND_i386_xen_TRUE@am__append_2992 = bufio.module -+@COND_i386_xen_TRUE@am__append_2993 = bufio.module$(EXEEXT) -+@COND_i386_xen_TRUE@am__append_2994 = -+@COND_i386_xen_TRUE@am__append_2995 = $(nodist_bufio_module_SOURCES) -+@COND_i386_xen_TRUE@am__append_2996 = $(nodist_bufio_module_SOURCES) \ - @COND_i386_xen_TRUE@ bufio.marker --@COND_i386_xen_TRUE@am__append_3004 = bufio.mod --@COND_i386_xen_TRUE@am__append_3005 = bufio.marker --@COND_x86_64_xen_TRUE@am__append_3006 = bufio.module --@COND_x86_64_xen_TRUE@am__append_3007 = bufio.module$(EXEEXT) --@COND_x86_64_xen_TRUE@am__append_3008 = --@COND_x86_64_xen_TRUE@am__append_3009 = $(nodist_bufio_module_SOURCES) --@COND_x86_64_xen_TRUE@am__append_3010 = \ -+@COND_i386_xen_TRUE@am__append_2997 = bufio.mod -+@COND_i386_xen_TRUE@am__append_2998 = bufio.marker -+@COND_x86_64_xen_TRUE@am__append_2999 = bufio.module -+@COND_x86_64_xen_TRUE@am__append_3000 = bufio.module$(EXEEXT) -+@COND_x86_64_xen_TRUE@am__append_3001 = -+@COND_x86_64_xen_TRUE@am__append_3002 = $(nodist_bufio_module_SOURCES) -+@COND_x86_64_xen_TRUE@am__append_3003 = \ - @COND_x86_64_xen_TRUE@ $(nodist_bufio_module_SOURCES) \ - @COND_x86_64_xen_TRUE@ bufio.marker --@COND_x86_64_xen_TRUE@am__append_3011 = bufio.mod --@COND_x86_64_xen_TRUE@am__append_3012 = bufio.marker --@COND_i386_xen_pvh_TRUE@am__append_3013 = bufio.module --@COND_i386_xen_pvh_TRUE@am__append_3014 = bufio.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__append_3015 = --@COND_i386_xen_pvh_TRUE@am__append_3016 = $(nodist_bufio_module_SOURCES) --@COND_i386_xen_pvh_TRUE@am__append_3017 = \ -+@COND_x86_64_xen_TRUE@am__append_3004 = bufio.mod -+@COND_x86_64_xen_TRUE@am__append_3005 = bufio.marker -+@COND_i386_xen_pvh_TRUE@am__append_3006 = bufio.module -+@COND_i386_xen_pvh_TRUE@am__append_3007 = bufio.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__append_3008 = -+@COND_i386_xen_pvh_TRUE@am__append_3009 = $(nodist_bufio_module_SOURCES) -+@COND_i386_xen_pvh_TRUE@am__append_3010 = \ - @COND_i386_xen_pvh_TRUE@ $(nodist_bufio_module_SOURCES) \ - @COND_i386_xen_pvh_TRUE@ bufio.marker --@COND_i386_xen_pvh_TRUE@am__append_3018 = bufio.mod --@COND_i386_xen_pvh_TRUE@am__append_3019 = bufio.marker --@COND_sparc64_ieee1275_TRUE@am__append_3020 = bufio.module --@COND_sparc64_ieee1275_TRUE@am__append_3021 = bufio.module$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@am__append_3022 = --@COND_sparc64_ieee1275_TRUE@am__append_3023 = $(nodist_bufio_module_SOURCES) --@COND_sparc64_ieee1275_TRUE@am__append_3024 = \ -+@COND_i386_xen_pvh_TRUE@am__append_3011 = bufio.mod -+@COND_i386_xen_pvh_TRUE@am__append_3012 = bufio.marker -+@COND_sparc64_ieee1275_TRUE@am__append_3013 = bufio.module -+@COND_sparc64_ieee1275_TRUE@am__append_3014 = bufio.module$(EXEEXT) -+@COND_sparc64_ieee1275_TRUE@am__append_3015 = -+@COND_sparc64_ieee1275_TRUE@am__append_3016 = $(nodist_bufio_module_SOURCES) -+@COND_sparc64_ieee1275_TRUE@am__append_3017 = \ - @COND_sparc64_ieee1275_TRUE@ $(nodist_bufio_module_SOURCES) \ - @COND_sparc64_ieee1275_TRUE@ bufio.marker --@COND_sparc64_ieee1275_TRUE@am__append_3025 = bufio.mod --@COND_sparc64_ieee1275_TRUE@am__append_3026 = bufio.marker --@COND_powerpc_ieee1275_TRUE@am__append_3027 = bufio.module --@COND_powerpc_ieee1275_TRUE@am__append_3028 = bufio.module$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__append_3029 = --@COND_powerpc_ieee1275_TRUE@am__append_3030 = $(nodist_bufio_module_SOURCES) --@COND_powerpc_ieee1275_TRUE@am__append_3031 = \ -+@COND_sparc64_ieee1275_TRUE@am__append_3018 = bufio.mod -+@COND_sparc64_ieee1275_TRUE@am__append_3019 = bufio.marker -+@COND_powerpc_ieee1275_TRUE@am__append_3020 = bufio.module -+@COND_powerpc_ieee1275_TRUE@am__append_3021 = bufio.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__append_3022 = -+@COND_powerpc_ieee1275_TRUE@am__append_3023 = $(nodist_bufio_module_SOURCES) -+@COND_powerpc_ieee1275_TRUE@am__append_3024 = \ - @COND_powerpc_ieee1275_TRUE@ $(nodist_bufio_module_SOURCES) \ - @COND_powerpc_ieee1275_TRUE@ bufio.marker --@COND_powerpc_ieee1275_TRUE@am__append_3032 = bufio.mod --@COND_powerpc_ieee1275_TRUE@am__append_3033 = bufio.marker --@COND_mips_arc_TRUE@am__append_3034 = bufio.module --@COND_mips_arc_TRUE@am__append_3035 = bufio.module$(EXEEXT) --@COND_mips_arc_TRUE@am__append_3036 = --@COND_mips_arc_TRUE@am__append_3037 = $(nodist_bufio_module_SOURCES) --@COND_mips_arc_TRUE@am__append_3038 = $(nodist_bufio_module_SOURCES) \ -+@COND_powerpc_ieee1275_TRUE@am__append_3025 = bufio.mod -+@COND_powerpc_ieee1275_TRUE@am__append_3026 = bufio.marker -+@COND_mips_arc_TRUE@am__append_3027 = bufio.module -+@COND_mips_arc_TRUE@am__append_3028 = bufio.module$(EXEEXT) -+@COND_mips_arc_TRUE@am__append_3029 = -+@COND_mips_arc_TRUE@am__append_3030 = $(nodist_bufio_module_SOURCES) -+@COND_mips_arc_TRUE@am__append_3031 = $(nodist_bufio_module_SOURCES) \ - @COND_mips_arc_TRUE@ bufio.marker --@COND_mips_arc_TRUE@am__append_3039 = bufio.mod --@COND_mips_arc_TRUE@am__append_3040 = bufio.marker --@COND_ia64_efi_TRUE@am__append_3041 = bufio.module --@COND_ia64_efi_TRUE@am__append_3042 = bufio.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__append_3043 = --@COND_ia64_efi_TRUE@am__append_3044 = $(nodist_bufio_module_SOURCES) --@COND_ia64_efi_TRUE@am__append_3045 = $(nodist_bufio_module_SOURCES) \ -+@COND_mips_arc_TRUE@am__append_3032 = bufio.mod -+@COND_mips_arc_TRUE@am__append_3033 = bufio.marker -+@COND_ia64_efi_TRUE@am__append_3034 = bufio.module -+@COND_ia64_efi_TRUE@am__append_3035 = bufio.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__append_3036 = -+@COND_ia64_efi_TRUE@am__append_3037 = $(nodist_bufio_module_SOURCES) -+@COND_ia64_efi_TRUE@am__append_3038 = $(nodist_bufio_module_SOURCES) \ - @COND_ia64_efi_TRUE@ bufio.marker --@COND_ia64_efi_TRUE@am__append_3046 = bufio.mod --@COND_ia64_efi_TRUE@am__append_3047 = bufio.marker --@COND_mips_qemu_mips_TRUE@am__append_3048 = bufio.module --@COND_mips_qemu_mips_TRUE@am__append_3049 = bufio.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__append_3050 = --@COND_mips_qemu_mips_TRUE@am__append_3051 = $(nodist_bufio_module_SOURCES) --@COND_mips_qemu_mips_TRUE@am__append_3052 = \ -+@COND_ia64_efi_TRUE@am__append_3039 = bufio.mod -+@COND_ia64_efi_TRUE@am__append_3040 = bufio.marker -+@COND_mips_qemu_mips_TRUE@am__append_3041 = bufio.module -+@COND_mips_qemu_mips_TRUE@am__append_3042 = bufio.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__append_3043 = -+@COND_mips_qemu_mips_TRUE@am__append_3044 = $(nodist_bufio_module_SOURCES) -+@COND_mips_qemu_mips_TRUE@am__append_3045 = \ - @COND_mips_qemu_mips_TRUE@ $(nodist_bufio_module_SOURCES) \ - @COND_mips_qemu_mips_TRUE@ bufio.marker --@COND_mips_qemu_mips_TRUE@am__append_3053 = bufio.mod --@COND_mips_qemu_mips_TRUE@am__append_3054 = bufio.marker --@COND_arm_uboot_TRUE@am__append_3055 = bufio.module --@COND_arm_uboot_TRUE@am__append_3056 = bufio.module$(EXEEXT) --@COND_arm_uboot_TRUE@am__append_3057 = --@COND_arm_uboot_TRUE@am__append_3058 = $(nodist_bufio_module_SOURCES) --@COND_arm_uboot_TRUE@am__append_3059 = $(nodist_bufio_module_SOURCES) \ -+@COND_mips_qemu_mips_TRUE@am__append_3046 = bufio.mod -+@COND_mips_qemu_mips_TRUE@am__append_3047 = bufio.marker -+@COND_arm_uboot_TRUE@am__append_3048 = bufio.module -+@COND_arm_uboot_TRUE@am__append_3049 = bufio.module$(EXEEXT) -+@COND_arm_uboot_TRUE@am__append_3050 = -+@COND_arm_uboot_TRUE@am__append_3051 = $(nodist_bufio_module_SOURCES) -+@COND_arm_uboot_TRUE@am__append_3052 = $(nodist_bufio_module_SOURCES) \ - @COND_arm_uboot_TRUE@ bufio.marker --@COND_arm_uboot_TRUE@am__append_3060 = bufio.mod --@COND_arm_uboot_TRUE@am__append_3061 = bufio.marker --@COND_arm_efi_TRUE@am__append_3062 = bufio.module --@COND_arm_efi_TRUE@am__append_3063 = bufio.module$(EXEEXT) --@COND_arm_efi_TRUE@am__append_3064 = --@COND_arm_efi_TRUE@am__append_3065 = $(nodist_bufio_module_SOURCES) --@COND_arm_efi_TRUE@am__append_3066 = $(nodist_bufio_module_SOURCES) \ -+@COND_arm_uboot_TRUE@am__append_3053 = bufio.mod -+@COND_arm_uboot_TRUE@am__append_3054 = bufio.marker -+@COND_arm_efi_TRUE@am__append_3055 = bufio.module -+@COND_arm_efi_TRUE@am__append_3056 = bufio.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__append_3057 = -+@COND_arm_efi_TRUE@am__append_3058 = $(nodist_bufio_module_SOURCES) -+@COND_arm_efi_TRUE@am__append_3059 = $(nodist_bufio_module_SOURCES) \ - @COND_arm_efi_TRUE@ bufio.marker --@COND_arm_efi_TRUE@am__append_3067 = bufio.mod --@COND_arm_efi_TRUE@am__append_3068 = bufio.marker --@COND_arm64_efi_TRUE@am__append_3069 = bufio.module --@COND_arm64_efi_TRUE@am__append_3070 = bufio.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__append_3071 = --@COND_arm64_efi_TRUE@am__append_3072 = $(nodist_bufio_module_SOURCES) --@COND_arm64_efi_TRUE@am__append_3073 = $(nodist_bufio_module_SOURCES) \ -+@COND_arm_efi_TRUE@am__append_3060 = bufio.mod -+@COND_arm_efi_TRUE@am__append_3061 = bufio.marker -+@COND_arm64_efi_TRUE@am__append_3062 = bufio.module -+@COND_arm64_efi_TRUE@am__append_3063 = bufio.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__append_3064 = -+@COND_arm64_efi_TRUE@am__append_3065 = $(nodist_bufio_module_SOURCES) -+@COND_arm64_efi_TRUE@am__append_3066 = $(nodist_bufio_module_SOURCES) \ - @COND_arm64_efi_TRUE@ bufio.marker --@COND_arm64_efi_TRUE@am__append_3074 = bufio.mod --@COND_arm64_efi_TRUE@am__append_3075 = bufio.marker --@COND_riscv32_efi_TRUE@am__append_3076 = bufio.module --@COND_riscv32_efi_TRUE@am__append_3077 = bufio.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__append_3078 = --@COND_riscv32_efi_TRUE@am__append_3079 = $(nodist_bufio_module_SOURCES) --@COND_riscv32_efi_TRUE@am__append_3080 = \ -+@COND_arm64_efi_TRUE@am__append_3067 = bufio.mod -+@COND_arm64_efi_TRUE@am__append_3068 = bufio.marker -+@COND_riscv32_efi_TRUE@am__append_3069 = bufio.module -+@COND_riscv32_efi_TRUE@am__append_3070 = bufio.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__append_3071 = -+@COND_riscv32_efi_TRUE@am__append_3072 = $(nodist_bufio_module_SOURCES) -+@COND_riscv32_efi_TRUE@am__append_3073 = \ - @COND_riscv32_efi_TRUE@ $(nodist_bufio_module_SOURCES) \ - @COND_riscv32_efi_TRUE@ bufio.marker --@COND_riscv32_efi_TRUE@am__append_3081 = bufio.mod --@COND_riscv32_efi_TRUE@am__append_3082 = bufio.marker --@COND_riscv64_efi_TRUE@am__append_3083 = bufio.module --@COND_riscv64_efi_TRUE@am__append_3084 = bufio.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__append_3085 = --@COND_riscv64_efi_TRUE@am__append_3086 = $(nodist_bufio_module_SOURCES) --@COND_riscv64_efi_TRUE@am__append_3087 = \ -+@COND_riscv32_efi_TRUE@am__append_3074 = bufio.mod -+@COND_riscv32_efi_TRUE@am__append_3075 = bufio.marker -+@COND_riscv64_efi_TRUE@am__append_3076 = bufio.module -+@COND_riscv64_efi_TRUE@am__append_3077 = bufio.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_3078 = -+@COND_riscv64_efi_TRUE@am__append_3079 = $(nodist_bufio_module_SOURCES) -+@COND_riscv64_efi_TRUE@am__append_3080 = \ - @COND_riscv64_efi_TRUE@ $(nodist_bufio_module_SOURCES) \ - @COND_riscv64_efi_TRUE@ bufio.marker --@COND_riscv64_efi_TRUE@am__append_3088 = bufio.mod --@COND_riscv64_efi_TRUE@am__append_3089 = bufio.marker --@COND_i386_pc_TRUE@am__append_3090 = relocator.module --@COND_i386_pc_TRUE@am__append_3091 = relocator.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_3081 = bufio.mod -+@COND_riscv64_efi_TRUE@am__append_3082 = bufio.marker -+@COND_i386_pc_TRUE@am__append_3083 = relocator.module -+@COND_i386_pc_TRUE@am__append_3084 = relocator.module$(EXEEXT) - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_FALSE@relocator_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_3092 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S --@COND_i386_pc_TRUE@am__append_3093 = $(nodist_relocator_module_SOURCES) --@COND_i386_pc_TRUE@am__append_3094 = \ -+@COND_i386_pc_TRUE@am__append_3085 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S -+@COND_i386_pc_TRUE@am__append_3086 = $(nodist_relocator_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_3087 = \ - @COND_i386_pc_TRUE@ $(nodist_relocator_module_SOURCES) \ - @COND_i386_pc_TRUE@ relocator.marker --@COND_i386_pc_TRUE@am__append_3095 = relocator.mod --@COND_i386_pc_TRUE@am__append_3096 = relocator.marker --@COND_i386_efi_TRUE@am__append_3097 = relocator.module --@COND_i386_efi_TRUE@am__append_3098 = relocator.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_3099 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S --@COND_i386_efi_TRUE@am__append_3100 = $(nodist_relocator_module_SOURCES) --@COND_i386_efi_TRUE@am__append_3101 = \ -+@COND_i386_pc_TRUE@am__append_3088 = relocator.mod -+@COND_i386_pc_TRUE@am__append_3089 = relocator.marker -+@COND_i386_efi_TRUE@am__append_3090 = relocator.module -+@COND_i386_efi_TRUE@am__append_3091 = relocator.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_3092 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S -+@COND_i386_efi_TRUE@am__append_3093 = $(nodist_relocator_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_3094 = \ - @COND_i386_efi_TRUE@ $(nodist_relocator_module_SOURCES) \ - @COND_i386_efi_TRUE@ relocator.marker --@COND_i386_efi_TRUE@am__append_3102 = relocator.mod --@COND_i386_efi_TRUE@am__append_3103 = relocator.marker --@COND_i386_qemu_TRUE@am__append_3104 = relocator.module --@COND_i386_qemu_TRUE@am__append_3105 = relocator.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_3106 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S --@COND_i386_qemu_TRUE@am__append_3107 = $(nodist_relocator_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_3108 = \ -+@COND_i386_efi_TRUE@am__append_3095 = relocator.mod -+@COND_i386_efi_TRUE@am__append_3096 = relocator.marker -+@COND_i386_qemu_TRUE@am__append_3097 = relocator.module -+@COND_i386_qemu_TRUE@am__append_3098 = relocator.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_3099 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S -+@COND_i386_qemu_TRUE@am__append_3100 = $(nodist_relocator_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_3101 = \ - @COND_i386_qemu_TRUE@ $(nodist_relocator_module_SOURCES) \ - @COND_i386_qemu_TRUE@ relocator.marker --@COND_i386_qemu_TRUE@am__append_3109 = relocator.mod --@COND_i386_qemu_TRUE@am__append_3110 = relocator.marker --@COND_i386_coreboot_TRUE@am__append_3111 = relocator.module --@COND_i386_coreboot_TRUE@am__append_3112 = relocator.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_3113 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S --@COND_i386_coreboot_TRUE@am__append_3114 = $(nodist_relocator_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_3115 = \ -+@COND_i386_qemu_TRUE@am__append_3102 = relocator.mod -+@COND_i386_qemu_TRUE@am__append_3103 = relocator.marker -+@COND_i386_coreboot_TRUE@am__append_3104 = relocator.module -+@COND_i386_coreboot_TRUE@am__append_3105 = relocator.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_3106 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S -+@COND_i386_coreboot_TRUE@am__append_3107 = $(nodist_relocator_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_3108 = \ - @COND_i386_coreboot_TRUE@ $(nodist_relocator_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ relocator.marker --@COND_i386_coreboot_TRUE@am__append_3116 = relocator.mod --@COND_i386_coreboot_TRUE@am__append_3117 = relocator.marker --@COND_i386_multiboot_TRUE@am__append_3118 = relocator.module --@COND_i386_multiboot_TRUE@am__append_3119 = relocator.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_3120 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S --@COND_i386_multiboot_TRUE@am__append_3121 = $(nodist_relocator_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_3122 = \ -+@COND_i386_coreboot_TRUE@am__append_3109 = relocator.mod -+@COND_i386_coreboot_TRUE@am__append_3110 = relocator.marker -+@COND_i386_multiboot_TRUE@am__append_3111 = relocator.module -+@COND_i386_multiboot_TRUE@am__append_3112 = relocator.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_3113 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S -+@COND_i386_multiboot_TRUE@am__append_3114 = $(nodist_relocator_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_3115 = \ - @COND_i386_multiboot_TRUE@ $(nodist_relocator_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ relocator.marker --@COND_i386_multiboot_TRUE@am__append_3123 = relocator.mod --@COND_i386_multiboot_TRUE@am__append_3124 = relocator.marker --@COND_i386_ieee1275_TRUE@am__append_3125 = relocator.module --@COND_i386_ieee1275_TRUE@am__append_3126 = relocator.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_3127 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S --@COND_i386_ieee1275_TRUE@am__append_3128 = $(nodist_relocator_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_3129 = \ -+@COND_i386_multiboot_TRUE@am__append_3116 = relocator.mod -+@COND_i386_multiboot_TRUE@am__append_3117 = relocator.marker -+@COND_i386_ieee1275_TRUE@am__append_3118 = relocator.module -+@COND_i386_ieee1275_TRUE@am__append_3119 = relocator.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_3120 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S -+@COND_i386_ieee1275_TRUE@am__append_3121 = $(nodist_relocator_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_3122 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_relocator_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ relocator.marker --@COND_i386_ieee1275_TRUE@am__append_3130 = relocator.mod --@COND_i386_ieee1275_TRUE@am__append_3131 = relocator.marker --@COND_x86_64_efi_TRUE@am__append_3132 = relocator.module --@COND_x86_64_efi_TRUE@am__append_3133 = relocator.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_3134 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S --@COND_x86_64_efi_TRUE@am__append_3135 = $(nodist_relocator_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_3136 = \ -+@COND_i386_ieee1275_TRUE@am__append_3123 = relocator.mod -+@COND_i386_ieee1275_TRUE@am__append_3124 = relocator.marker -+@COND_x86_64_efi_TRUE@am__append_3125 = relocator.module -+@COND_x86_64_efi_TRUE@am__append_3126 = relocator.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_3127 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S -+@COND_x86_64_efi_TRUE@am__append_3128 = $(nodist_relocator_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_3129 = \ - @COND_x86_64_efi_TRUE@ $(nodist_relocator_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ relocator.marker --@COND_x86_64_efi_TRUE@am__append_3137 = relocator.mod --@COND_x86_64_efi_TRUE@am__append_3138 = relocator.marker --@COND_i386_xen_TRUE@am__append_3139 = relocator.module --@COND_i386_xen_TRUE@am__append_3140 = relocator.module$(EXEEXT) --@COND_i386_xen_TRUE@am__append_3141 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S --@COND_i386_xen_TRUE@am__append_3142 = $(nodist_relocator_module_SOURCES) --@COND_i386_xen_TRUE@am__append_3143 = \ -+@COND_x86_64_efi_TRUE@am__append_3130 = relocator.mod -+@COND_x86_64_efi_TRUE@am__append_3131 = relocator.marker -+@COND_i386_xen_TRUE@am__append_3132 = relocator.module -+@COND_i386_xen_TRUE@am__append_3133 = relocator.module$(EXEEXT) -+@COND_i386_xen_TRUE@am__append_3134 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S -+@COND_i386_xen_TRUE@am__append_3135 = $(nodist_relocator_module_SOURCES) -+@COND_i386_xen_TRUE@am__append_3136 = \ - @COND_i386_xen_TRUE@ $(nodist_relocator_module_SOURCES) \ - @COND_i386_xen_TRUE@ relocator.marker --@COND_i386_xen_TRUE@am__append_3144 = relocator.mod --@COND_i386_xen_TRUE@am__append_3145 = relocator.marker --@COND_x86_64_xen_TRUE@am__append_3146 = relocator.module --@COND_x86_64_xen_TRUE@am__append_3147 = relocator.module$(EXEEXT) --@COND_x86_64_xen_TRUE@am__append_3148 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S --@COND_x86_64_xen_TRUE@am__append_3149 = $(nodist_relocator_module_SOURCES) --@COND_x86_64_xen_TRUE@am__append_3150 = \ -+@COND_i386_xen_TRUE@am__append_3137 = relocator.mod -+@COND_i386_xen_TRUE@am__append_3138 = relocator.marker -+@COND_x86_64_xen_TRUE@am__append_3139 = relocator.module -+@COND_x86_64_xen_TRUE@am__append_3140 = relocator.module$(EXEEXT) -+@COND_x86_64_xen_TRUE@am__append_3141 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S -+@COND_x86_64_xen_TRUE@am__append_3142 = $(nodist_relocator_module_SOURCES) -+@COND_x86_64_xen_TRUE@am__append_3143 = \ - @COND_x86_64_xen_TRUE@ $(nodist_relocator_module_SOURCES) \ - @COND_x86_64_xen_TRUE@ relocator.marker --@COND_x86_64_xen_TRUE@am__append_3151 = relocator.mod --@COND_x86_64_xen_TRUE@am__append_3152 = relocator.marker --@COND_i386_xen_pvh_TRUE@am__append_3153 = relocator.module --@COND_i386_xen_pvh_TRUE@am__append_3154 = relocator.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__append_3155 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S --@COND_i386_xen_pvh_TRUE@am__append_3156 = $(nodist_relocator_module_SOURCES) --@COND_i386_xen_pvh_TRUE@am__append_3157 = \ -+@COND_x86_64_xen_TRUE@am__append_3144 = relocator.mod -+@COND_x86_64_xen_TRUE@am__append_3145 = relocator.marker -+@COND_i386_xen_pvh_TRUE@am__append_3146 = relocator.module -+@COND_i386_xen_pvh_TRUE@am__append_3147 = relocator.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__append_3148 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S -+@COND_i386_xen_pvh_TRUE@am__append_3149 = $(nodist_relocator_module_SOURCES) -+@COND_i386_xen_pvh_TRUE@am__append_3150 = \ - @COND_i386_xen_pvh_TRUE@ $(nodist_relocator_module_SOURCES) \ - @COND_i386_xen_pvh_TRUE@ relocator.marker --@COND_i386_xen_pvh_TRUE@am__append_3158 = relocator.mod --@COND_i386_xen_pvh_TRUE@am__append_3159 = relocator.marker --@COND_mips_loongson_TRUE@am__append_3160 = relocator.module --@COND_mips_loongson_TRUE@am__append_3161 = relocator.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__append_3162 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S --@COND_mips_loongson_TRUE@am__append_3163 = $(nodist_relocator_module_SOURCES) --@COND_mips_loongson_TRUE@am__append_3164 = \ -+@COND_i386_xen_pvh_TRUE@am__append_3151 = relocator.mod -+@COND_i386_xen_pvh_TRUE@am__append_3152 = relocator.marker -+@COND_mips_loongson_TRUE@am__append_3153 = relocator.module -+@COND_mips_loongson_TRUE@am__append_3154 = relocator.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__append_3155 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S -+@COND_mips_loongson_TRUE@am__append_3156 = $(nodist_relocator_module_SOURCES) -+@COND_mips_loongson_TRUE@am__append_3157 = \ - @COND_mips_loongson_TRUE@ $(nodist_relocator_module_SOURCES) \ - @COND_mips_loongson_TRUE@ relocator.marker --@COND_mips_loongson_TRUE@am__append_3165 = relocator.mod --@COND_mips_loongson_TRUE@am__append_3166 = relocator.marker --@COND_powerpc_ieee1275_TRUE@am__append_3167 = relocator.module --@COND_powerpc_ieee1275_TRUE@am__append_3168 = relocator.module$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__append_3169 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S --@COND_powerpc_ieee1275_TRUE@am__append_3170 = $(nodist_relocator_module_SOURCES) --@COND_powerpc_ieee1275_TRUE@am__append_3171 = $(nodist_relocator_module_SOURCES) \ -+@COND_mips_loongson_TRUE@am__append_3158 = relocator.mod -+@COND_mips_loongson_TRUE@am__append_3159 = relocator.marker -+@COND_powerpc_ieee1275_TRUE@am__append_3160 = relocator.module -+@COND_powerpc_ieee1275_TRUE@am__append_3161 = relocator.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__append_3162 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S -+@COND_powerpc_ieee1275_TRUE@am__append_3163 = $(nodist_relocator_module_SOURCES) -+@COND_powerpc_ieee1275_TRUE@am__append_3164 = $(nodist_relocator_module_SOURCES) \ - @COND_powerpc_ieee1275_TRUE@ relocator.marker --@COND_powerpc_ieee1275_TRUE@am__append_3172 = relocator.mod --@COND_powerpc_ieee1275_TRUE@am__append_3173 = relocator.marker --@COND_mips_arc_TRUE@am__append_3174 = relocator.module --@COND_mips_arc_TRUE@am__append_3175 = relocator.module$(EXEEXT) --@COND_mips_arc_TRUE@am__append_3176 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S --@COND_mips_arc_TRUE@am__append_3177 = $(nodist_relocator_module_SOURCES) --@COND_mips_arc_TRUE@am__append_3178 = \ -+@COND_powerpc_ieee1275_TRUE@am__append_3165 = relocator.mod -+@COND_powerpc_ieee1275_TRUE@am__append_3166 = relocator.marker -+@COND_mips_arc_TRUE@am__append_3167 = relocator.module -+@COND_mips_arc_TRUE@am__append_3168 = relocator.module$(EXEEXT) -+@COND_mips_arc_TRUE@am__append_3169 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S -+@COND_mips_arc_TRUE@am__append_3170 = $(nodist_relocator_module_SOURCES) -+@COND_mips_arc_TRUE@am__append_3171 = \ - @COND_mips_arc_TRUE@ $(nodist_relocator_module_SOURCES) \ - @COND_mips_arc_TRUE@ relocator.marker --@COND_mips_arc_TRUE@am__append_3179 = relocator.mod --@COND_mips_arc_TRUE@am__append_3180 = relocator.marker --@COND_mips_qemu_mips_TRUE@am__append_3181 = relocator.module --@COND_mips_qemu_mips_TRUE@am__append_3182 = relocator.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__append_3183 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S --@COND_mips_qemu_mips_TRUE@am__append_3184 = $(nodist_relocator_module_SOURCES) --@COND_mips_qemu_mips_TRUE@am__append_3185 = \ -+@COND_mips_arc_TRUE@am__append_3172 = relocator.mod -+@COND_mips_arc_TRUE@am__append_3173 = relocator.marker -+@COND_mips_qemu_mips_TRUE@am__append_3174 = relocator.module -+@COND_mips_qemu_mips_TRUE@am__append_3175 = relocator.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__append_3176 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S -+@COND_mips_qemu_mips_TRUE@am__append_3177 = $(nodist_relocator_module_SOURCES) -+@COND_mips_qemu_mips_TRUE@am__append_3178 = \ - @COND_mips_qemu_mips_TRUE@ $(nodist_relocator_module_SOURCES) \ - @COND_mips_qemu_mips_TRUE@ relocator.marker --@COND_mips_qemu_mips_TRUE@am__append_3186 = relocator.mod --@COND_mips_qemu_mips_TRUE@am__append_3187 = relocator.marker --@COND_i386_pc_TRUE@am__append_3188 = datetime.module --@COND_i386_pc_TRUE@am__append_3189 = datetime.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__append_3179 = relocator.mod -+@COND_mips_qemu_mips_TRUE@am__append_3180 = relocator.marker -+@COND_i386_pc_TRUE@am__append_3181 = datetime.module -+@COND_i386_pc_TRUE@am__append_3182 = datetime.module$(EXEEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_FALSE@datetime_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_3190 = --@COND_i386_pc_TRUE@am__append_3191 = $(nodist_datetime_module_SOURCES) --@COND_i386_pc_TRUE@am__append_3192 = \ -+@COND_i386_pc_TRUE@am__append_3183 = -+@COND_i386_pc_TRUE@am__append_3184 = $(nodist_datetime_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_3185 = \ - @COND_i386_pc_TRUE@ $(nodist_datetime_module_SOURCES) \ - @COND_i386_pc_TRUE@ datetime.marker --@COND_i386_pc_TRUE@am__append_3193 = datetime.mod --@COND_i386_pc_TRUE@am__append_3194 = datetime.marker --@COND_i386_efi_TRUE@am__append_3195 = datetime.module --@COND_i386_efi_TRUE@am__append_3196 = datetime.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_3197 = --@COND_i386_efi_TRUE@am__append_3198 = $(nodist_datetime_module_SOURCES) --@COND_i386_efi_TRUE@am__append_3199 = \ -+@COND_i386_pc_TRUE@am__append_3186 = datetime.mod -+@COND_i386_pc_TRUE@am__append_3187 = datetime.marker -+@COND_i386_efi_TRUE@am__append_3188 = datetime.module -+@COND_i386_efi_TRUE@am__append_3189 = datetime.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_3190 = -+@COND_i386_efi_TRUE@am__append_3191 = $(nodist_datetime_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_3192 = \ - @COND_i386_efi_TRUE@ $(nodist_datetime_module_SOURCES) \ - @COND_i386_efi_TRUE@ datetime.marker --@COND_i386_efi_TRUE@am__append_3200 = datetime.mod --@COND_i386_efi_TRUE@am__append_3201 = datetime.marker --@COND_i386_qemu_TRUE@am__append_3202 = datetime.module --@COND_i386_qemu_TRUE@am__append_3203 = datetime.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_3204 = --@COND_i386_qemu_TRUE@am__append_3205 = $(nodist_datetime_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_3206 = \ -+@COND_i386_efi_TRUE@am__append_3193 = datetime.mod -+@COND_i386_efi_TRUE@am__append_3194 = datetime.marker -+@COND_i386_qemu_TRUE@am__append_3195 = datetime.module -+@COND_i386_qemu_TRUE@am__append_3196 = datetime.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_3197 = -+@COND_i386_qemu_TRUE@am__append_3198 = $(nodist_datetime_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_3199 = \ - @COND_i386_qemu_TRUE@ $(nodist_datetime_module_SOURCES) \ - @COND_i386_qemu_TRUE@ datetime.marker --@COND_i386_qemu_TRUE@am__append_3207 = datetime.mod --@COND_i386_qemu_TRUE@am__append_3208 = datetime.marker --@COND_i386_coreboot_TRUE@am__append_3209 = datetime.module --@COND_i386_coreboot_TRUE@am__append_3210 = datetime.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_3211 = --@COND_i386_coreboot_TRUE@am__append_3212 = $(nodist_datetime_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_3213 = \ -+@COND_i386_qemu_TRUE@am__append_3200 = datetime.mod -+@COND_i386_qemu_TRUE@am__append_3201 = datetime.marker -+@COND_i386_coreboot_TRUE@am__append_3202 = datetime.module -+@COND_i386_coreboot_TRUE@am__append_3203 = datetime.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_3204 = -+@COND_i386_coreboot_TRUE@am__append_3205 = $(nodist_datetime_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_3206 = \ - @COND_i386_coreboot_TRUE@ $(nodist_datetime_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ datetime.marker --@COND_i386_coreboot_TRUE@am__append_3214 = datetime.mod --@COND_i386_coreboot_TRUE@am__append_3215 = datetime.marker --@COND_i386_multiboot_TRUE@am__append_3216 = datetime.module --@COND_i386_multiboot_TRUE@am__append_3217 = datetime.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_3218 = --@COND_i386_multiboot_TRUE@am__append_3219 = $(nodist_datetime_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_3220 = \ -+@COND_i386_coreboot_TRUE@am__append_3207 = datetime.mod -+@COND_i386_coreboot_TRUE@am__append_3208 = datetime.marker -+@COND_i386_multiboot_TRUE@am__append_3209 = datetime.module -+@COND_i386_multiboot_TRUE@am__append_3210 = datetime.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_3211 = -+@COND_i386_multiboot_TRUE@am__append_3212 = $(nodist_datetime_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_3213 = \ - @COND_i386_multiboot_TRUE@ $(nodist_datetime_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ datetime.marker --@COND_i386_multiboot_TRUE@am__append_3221 = datetime.mod --@COND_i386_multiboot_TRUE@am__append_3222 = datetime.marker --@COND_i386_ieee1275_TRUE@am__append_3223 = datetime.module --@COND_i386_ieee1275_TRUE@am__append_3224 = datetime.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_3225 = --@COND_i386_ieee1275_TRUE@am__append_3226 = $(nodist_datetime_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_3227 = \ -+@COND_i386_multiboot_TRUE@am__append_3214 = datetime.mod -+@COND_i386_multiboot_TRUE@am__append_3215 = datetime.marker -+@COND_i386_ieee1275_TRUE@am__append_3216 = datetime.module -+@COND_i386_ieee1275_TRUE@am__append_3217 = datetime.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_3218 = -+@COND_i386_ieee1275_TRUE@am__append_3219 = $(nodist_datetime_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_3220 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_datetime_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ datetime.marker --@COND_i386_ieee1275_TRUE@am__append_3228 = datetime.mod --@COND_i386_ieee1275_TRUE@am__append_3229 = datetime.marker --@COND_x86_64_efi_TRUE@am__append_3230 = datetime.module --@COND_x86_64_efi_TRUE@am__append_3231 = datetime.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_3232 = --@COND_x86_64_efi_TRUE@am__append_3233 = $(nodist_datetime_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_3234 = \ -+@COND_i386_ieee1275_TRUE@am__append_3221 = datetime.mod -+@COND_i386_ieee1275_TRUE@am__append_3222 = datetime.marker -+@COND_x86_64_efi_TRUE@am__append_3223 = datetime.module -+@COND_x86_64_efi_TRUE@am__append_3224 = datetime.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_3225 = -+@COND_x86_64_efi_TRUE@am__append_3226 = $(nodist_datetime_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_3227 = \ - @COND_x86_64_efi_TRUE@ $(nodist_datetime_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ datetime.marker --@COND_x86_64_efi_TRUE@am__append_3235 = datetime.mod --@COND_x86_64_efi_TRUE@am__append_3236 = datetime.marker --@COND_i386_xen_TRUE@am__append_3237 = datetime.module --@COND_i386_xen_TRUE@am__append_3238 = datetime.module$(EXEEXT) --@COND_i386_xen_TRUE@am__append_3239 = --@COND_i386_xen_TRUE@am__append_3240 = $(nodist_datetime_module_SOURCES) --@COND_i386_xen_TRUE@am__append_3241 = \ -+@COND_x86_64_efi_TRUE@am__append_3228 = datetime.mod -+@COND_x86_64_efi_TRUE@am__append_3229 = datetime.marker -+@COND_i386_xen_TRUE@am__append_3230 = datetime.module -+@COND_i386_xen_TRUE@am__append_3231 = datetime.module$(EXEEXT) -+@COND_i386_xen_TRUE@am__append_3232 = -+@COND_i386_xen_TRUE@am__append_3233 = $(nodist_datetime_module_SOURCES) -+@COND_i386_xen_TRUE@am__append_3234 = \ - @COND_i386_xen_TRUE@ $(nodist_datetime_module_SOURCES) \ - @COND_i386_xen_TRUE@ datetime.marker --@COND_i386_xen_TRUE@am__append_3242 = datetime.mod --@COND_i386_xen_TRUE@am__append_3243 = datetime.marker --@COND_x86_64_xen_TRUE@am__append_3244 = datetime.module --@COND_x86_64_xen_TRUE@am__append_3245 = datetime.module$(EXEEXT) --@COND_x86_64_xen_TRUE@am__append_3246 = --@COND_x86_64_xen_TRUE@am__append_3247 = $(nodist_datetime_module_SOURCES) --@COND_x86_64_xen_TRUE@am__append_3248 = \ -+@COND_i386_xen_TRUE@am__append_3235 = datetime.mod -+@COND_i386_xen_TRUE@am__append_3236 = datetime.marker -+@COND_x86_64_xen_TRUE@am__append_3237 = datetime.module -+@COND_x86_64_xen_TRUE@am__append_3238 = datetime.module$(EXEEXT) -+@COND_x86_64_xen_TRUE@am__append_3239 = -+@COND_x86_64_xen_TRUE@am__append_3240 = $(nodist_datetime_module_SOURCES) -+@COND_x86_64_xen_TRUE@am__append_3241 = \ - @COND_x86_64_xen_TRUE@ $(nodist_datetime_module_SOURCES) \ - @COND_x86_64_xen_TRUE@ datetime.marker --@COND_x86_64_xen_TRUE@am__append_3249 = datetime.mod --@COND_x86_64_xen_TRUE@am__append_3250 = datetime.marker --@COND_i386_xen_pvh_TRUE@am__append_3251 = datetime.module --@COND_i386_xen_pvh_TRUE@am__append_3252 = datetime.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__append_3253 = --@COND_i386_xen_pvh_TRUE@am__append_3254 = $(nodist_datetime_module_SOURCES) --@COND_i386_xen_pvh_TRUE@am__append_3255 = \ -+@COND_x86_64_xen_TRUE@am__append_3242 = datetime.mod -+@COND_x86_64_xen_TRUE@am__append_3243 = datetime.marker -+@COND_i386_xen_pvh_TRUE@am__append_3244 = datetime.module -+@COND_i386_xen_pvh_TRUE@am__append_3245 = datetime.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__append_3246 = -+@COND_i386_xen_pvh_TRUE@am__append_3247 = $(nodist_datetime_module_SOURCES) -+@COND_i386_xen_pvh_TRUE@am__append_3248 = \ - @COND_i386_xen_pvh_TRUE@ $(nodist_datetime_module_SOURCES) \ - @COND_i386_xen_pvh_TRUE@ datetime.marker --@COND_i386_xen_pvh_TRUE@am__append_3256 = datetime.mod --@COND_i386_xen_pvh_TRUE@am__append_3257 = datetime.marker --@COND_mips_loongson_TRUE@am__append_3258 = datetime.module --@COND_mips_loongson_TRUE@am__append_3259 = datetime.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__append_3260 = --@COND_mips_loongson_TRUE@am__append_3261 = $(nodist_datetime_module_SOURCES) --@COND_mips_loongson_TRUE@am__append_3262 = \ -+@COND_i386_xen_pvh_TRUE@am__append_3249 = datetime.mod -+@COND_i386_xen_pvh_TRUE@am__append_3250 = datetime.marker -+@COND_mips_loongson_TRUE@am__append_3251 = datetime.module -+@COND_mips_loongson_TRUE@am__append_3252 = datetime.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__append_3253 = -+@COND_mips_loongson_TRUE@am__append_3254 = $(nodist_datetime_module_SOURCES) -+@COND_mips_loongson_TRUE@am__append_3255 = \ - @COND_mips_loongson_TRUE@ $(nodist_datetime_module_SOURCES) \ - @COND_mips_loongson_TRUE@ datetime.marker --@COND_mips_loongson_TRUE@am__append_3263 = datetime.mod --@COND_mips_loongson_TRUE@am__append_3264 = datetime.marker --@COND_sparc64_ieee1275_TRUE@am__append_3265 = datetime.module --@COND_sparc64_ieee1275_TRUE@am__append_3266 = datetime.module$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@am__append_3267 = --@COND_sparc64_ieee1275_TRUE@am__append_3268 = $(nodist_datetime_module_SOURCES) --@COND_sparc64_ieee1275_TRUE@am__append_3269 = \ -+@COND_mips_loongson_TRUE@am__append_3256 = datetime.mod -+@COND_mips_loongson_TRUE@am__append_3257 = datetime.marker -+@COND_sparc64_ieee1275_TRUE@am__append_3258 = datetime.module -+@COND_sparc64_ieee1275_TRUE@am__append_3259 = datetime.module$(EXEEXT) -+@COND_sparc64_ieee1275_TRUE@am__append_3260 = -+@COND_sparc64_ieee1275_TRUE@am__append_3261 = $(nodist_datetime_module_SOURCES) -+@COND_sparc64_ieee1275_TRUE@am__append_3262 = \ - @COND_sparc64_ieee1275_TRUE@ $(nodist_datetime_module_SOURCES) \ - @COND_sparc64_ieee1275_TRUE@ datetime.marker --@COND_sparc64_ieee1275_TRUE@am__append_3270 = datetime.mod --@COND_sparc64_ieee1275_TRUE@am__append_3271 = datetime.marker --@COND_powerpc_ieee1275_TRUE@am__append_3272 = datetime.module --@COND_powerpc_ieee1275_TRUE@am__append_3273 = datetime.module$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__append_3274 = --@COND_powerpc_ieee1275_TRUE@am__append_3275 = $(nodist_datetime_module_SOURCES) --@COND_powerpc_ieee1275_TRUE@am__append_3276 = \ -+@COND_sparc64_ieee1275_TRUE@am__append_3263 = datetime.mod -+@COND_sparc64_ieee1275_TRUE@am__append_3264 = datetime.marker -+@COND_powerpc_ieee1275_TRUE@am__append_3265 = datetime.module -+@COND_powerpc_ieee1275_TRUE@am__append_3266 = datetime.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__append_3267 = -+@COND_powerpc_ieee1275_TRUE@am__append_3268 = $(nodist_datetime_module_SOURCES) -+@COND_powerpc_ieee1275_TRUE@am__append_3269 = \ - @COND_powerpc_ieee1275_TRUE@ $(nodist_datetime_module_SOURCES) \ - @COND_powerpc_ieee1275_TRUE@ datetime.marker --@COND_powerpc_ieee1275_TRUE@am__append_3277 = datetime.mod --@COND_powerpc_ieee1275_TRUE@am__append_3278 = datetime.marker --@COND_mips_arc_TRUE@am__append_3279 = datetime.module --@COND_mips_arc_TRUE@am__append_3280 = datetime.module$(EXEEXT) --@COND_mips_arc_TRUE@am__append_3281 = --@COND_mips_arc_TRUE@am__append_3282 = $(nodist_datetime_module_SOURCES) --@COND_mips_arc_TRUE@am__append_3283 = \ -+@COND_powerpc_ieee1275_TRUE@am__append_3270 = datetime.mod -+@COND_powerpc_ieee1275_TRUE@am__append_3271 = datetime.marker -+@COND_mips_arc_TRUE@am__append_3272 = datetime.module -+@COND_mips_arc_TRUE@am__append_3273 = datetime.module$(EXEEXT) -+@COND_mips_arc_TRUE@am__append_3274 = -+@COND_mips_arc_TRUE@am__append_3275 = $(nodist_datetime_module_SOURCES) -+@COND_mips_arc_TRUE@am__append_3276 = \ - @COND_mips_arc_TRUE@ $(nodist_datetime_module_SOURCES) \ - @COND_mips_arc_TRUE@ datetime.marker --@COND_mips_arc_TRUE@am__append_3284 = datetime.mod --@COND_mips_arc_TRUE@am__append_3285 = datetime.marker --@COND_ia64_efi_TRUE@am__append_3286 = datetime.module --@COND_ia64_efi_TRUE@am__append_3287 = datetime.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__append_3288 = --@COND_ia64_efi_TRUE@am__append_3289 = $(nodist_datetime_module_SOURCES) --@COND_ia64_efi_TRUE@am__append_3290 = \ -+@COND_mips_arc_TRUE@am__append_3277 = datetime.mod -+@COND_mips_arc_TRUE@am__append_3278 = datetime.marker -+@COND_ia64_efi_TRUE@am__append_3279 = datetime.module -+@COND_ia64_efi_TRUE@am__append_3280 = datetime.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__append_3281 = -+@COND_ia64_efi_TRUE@am__append_3282 = $(nodist_datetime_module_SOURCES) -+@COND_ia64_efi_TRUE@am__append_3283 = \ - @COND_ia64_efi_TRUE@ $(nodist_datetime_module_SOURCES) \ - @COND_ia64_efi_TRUE@ datetime.marker --@COND_ia64_efi_TRUE@am__append_3291 = datetime.mod --@COND_ia64_efi_TRUE@am__append_3292 = datetime.marker --@COND_mips_qemu_mips_TRUE@am__append_3293 = datetime.module --@COND_mips_qemu_mips_TRUE@am__append_3294 = datetime.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__append_3295 = --@COND_mips_qemu_mips_TRUE@am__append_3296 = $(nodist_datetime_module_SOURCES) --@COND_mips_qemu_mips_TRUE@am__append_3297 = \ -+@COND_ia64_efi_TRUE@am__append_3284 = datetime.mod -+@COND_ia64_efi_TRUE@am__append_3285 = datetime.marker -+@COND_mips_qemu_mips_TRUE@am__append_3286 = datetime.module -+@COND_mips_qemu_mips_TRUE@am__append_3287 = datetime.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__append_3288 = -+@COND_mips_qemu_mips_TRUE@am__append_3289 = $(nodist_datetime_module_SOURCES) -+@COND_mips_qemu_mips_TRUE@am__append_3290 = \ - @COND_mips_qemu_mips_TRUE@ $(nodist_datetime_module_SOURCES) \ - @COND_mips_qemu_mips_TRUE@ datetime.marker --@COND_mips_qemu_mips_TRUE@am__append_3298 = datetime.mod --@COND_mips_qemu_mips_TRUE@am__append_3299 = datetime.marker --@COND_arm_uboot_TRUE@am__append_3300 = datetime.module --@COND_arm_uboot_TRUE@am__append_3301 = datetime.module$(EXEEXT) --@COND_arm_uboot_TRUE@am__append_3302 = --@COND_arm_uboot_TRUE@am__append_3303 = $(nodist_datetime_module_SOURCES) --@COND_arm_uboot_TRUE@am__append_3304 = \ -+@COND_mips_qemu_mips_TRUE@am__append_3291 = datetime.mod -+@COND_mips_qemu_mips_TRUE@am__append_3292 = datetime.marker -+@COND_arm_uboot_TRUE@am__append_3293 = datetime.module -+@COND_arm_uboot_TRUE@am__append_3294 = datetime.module$(EXEEXT) -+@COND_arm_uboot_TRUE@am__append_3295 = -+@COND_arm_uboot_TRUE@am__append_3296 = $(nodist_datetime_module_SOURCES) -+@COND_arm_uboot_TRUE@am__append_3297 = \ - @COND_arm_uboot_TRUE@ $(nodist_datetime_module_SOURCES) \ - @COND_arm_uboot_TRUE@ datetime.marker --@COND_arm_uboot_TRUE@am__append_3305 = datetime.mod --@COND_arm_uboot_TRUE@am__append_3306 = datetime.marker --@COND_arm_efi_TRUE@am__append_3307 = datetime.module --@COND_arm_efi_TRUE@am__append_3308 = datetime.module$(EXEEXT) --@COND_arm_efi_TRUE@am__append_3309 = --@COND_arm_efi_TRUE@am__append_3310 = $(nodist_datetime_module_SOURCES) --@COND_arm_efi_TRUE@am__append_3311 = \ -+@COND_arm_uboot_TRUE@am__append_3298 = datetime.mod -+@COND_arm_uboot_TRUE@am__append_3299 = datetime.marker -+@COND_arm_efi_TRUE@am__append_3300 = datetime.module -+@COND_arm_efi_TRUE@am__append_3301 = datetime.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__append_3302 = -+@COND_arm_efi_TRUE@am__append_3303 = $(nodist_datetime_module_SOURCES) -+@COND_arm_efi_TRUE@am__append_3304 = \ - @COND_arm_efi_TRUE@ $(nodist_datetime_module_SOURCES) \ - @COND_arm_efi_TRUE@ datetime.marker --@COND_arm_efi_TRUE@am__append_3312 = datetime.mod --@COND_arm_efi_TRUE@am__append_3313 = datetime.marker --@COND_arm64_efi_TRUE@am__append_3314 = datetime.module --@COND_arm64_efi_TRUE@am__append_3315 = datetime.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__append_3316 = --@COND_arm64_efi_TRUE@am__append_3317 = $(nodist_datetime_module_SOURCES) --@COND_arm64_efi_TRUE@am__append_3318 = \ -+@COND_arm_efi_TRUE@am__append_3305 = datetime.mod -+@COND_arm_efi_TRUE@am__append_3306 = datetime.marker -+@COND_arm64_efi_TRUE@am__append_3307 = datetime.module -+@COND_arm64_efi_TRUE@am__append_3308 = datetime.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__append_3309 = -+@COND_arm64_efi_TRUE@am__append_3310 = $(nodist_datetime_module_SOURCES) -+@COND_arm64_efi_TRUE@am__append_3311 = \ - @COND_arm64_efi_TRUE@ $(nodist_datetime_module_SOURCES) \ - @COND_arm64_efi_TRUE@ datetime.marker --@COND_arm64_efi_TRUE@am__append_3319 = datetime.mod --@COND_arm64_efi_TRUE@am__append_3320 = datetime.marker --@COND_arm_coreboot_TRUE@am__append_3321 = datetime.module --@COND_arm_coreboot_TRUE@am__append_3322 = datetime.module$(EXEEXT) --@COND_arm_coreboot_TRUE@am__append_3323 = --@COND_arm_coreboot_TRUE@am__append_3324 = $(nodist_datetime_module_SOURCES) --@COND_arm_coreboot_TRUE@am__append_3325 = \ -+@COND_arm64_efi_TRUE@am__append_3312 = datetime.mod -+@COND_arm64_efi_TRUE@am__append_3313 = datetime.marker -+@COND_arm_coreboot_TRUE@am__append_3314 = datetime.module -+@COND_arm_coreboot_TRUE@am__append_3315 = datetime.module$(EXEEXT) -+@COND_arm_coreboot_TRUE@am__append_3316 = -+@COND_arm_coreboot_TRUE@am__append_3317 = $(nodist_datetime_module_SOURCES) -+@COND_arm_coreboot_TRUE@am__append_3318 = \ - @COND_arm_coreboot_TRUE@ $(nodist_datetime_module_SOURCES) \ - @COND_arm_coreboot_TRUE@ datetime.marker --@COND_arm_coreboot_TRUE@am__append_3326 = datetime.mod --@COND_arm_coreboot_TRUE@am__append_3327 = datetime.marker --@COND_riscv32_efi_TRUE@am__append_3328 = datetime.module --@COND_riscv32_efi_TRUE@am__append_3329 = datetime.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__append_3330 = --@COND_riscv32_efi_TRUE@am__append_3331 = $(nodist_datetime_module_SOURCES) --@COND_riscv32_efi_TRUE@am__append_3332 = \ -+@COND_arm_coreboot_TRUE@am__append_3319 = datetime.mod -+@COND_arm_coreboot_TRUE@am__append_3320 = datetime.marker -+@COND_riscv32_efi_TRUE@am__append_3321 = datetime.module -+@COND_riscv32_efi_TRUE@am__append_3322 = datetime.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__append_3323 = -+@COND_riscv32_efi_TRUE@am__append_3324 = $(nodist_datetime_module_SOURCES) -+@COND_riscv32_efi_TRUE@am__append_3325 = \ - @COND_riscv32_efi_TRUE@ $(nodist_datetime_module_SOURCES) \ - @COND_riscv32_efi_TRUE@ datetime.marker --@COND_riscv32_efi_TRUE@am__append_3333 = datetime.mod --@COND_riscv32_efi_TRUE@am__append_3334 = datetime.marker --@COND_riscv64_efi_TRUE@am__append_3335 = datetime.module --@COND_riscv64_efi_TRUE@am__append_3336 = datetime.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__append_3337 = --@COND_riscv64_efi_TRUE@am__append_3338 = $(nodist_datetime_module_SOURCES) --@COND_riscv64_efi_TRUE@am__append_3339 = \ -+@COND_riscv32_efi_TRUE@am__append_3326 = datetime.mod -+@COND_riscv32_efi_TRUE@am__append_3327 = datetime.marker -+@COND_riscv64_efi_TRUE@am__append_3328 = datetime.module -+@COND_riscv64_efi_TRUE@am__append_3329 = datetime.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_3330 = -+@COND_riscv64_efi_TRUE@am__append_3331 = $(nodist_datetime_module_SOURCES) -+@COND_riscv64_efi_TRUE@am__append_3332 = \ - @COND_riscv64_efi_TRUE@ $(nodist_datetime_module_SOURCES) \ - @COND_riscv64_efi_TRUE@ datetime.marker --@COND_riscv64_efi_TRUE@am__append_3340 = datetime.mod --@COND_riscv64_efi_TRUE@am__append_3341 = datetime.marker --@COND_i386_pc_TRUE@am__append_3342 = aout.module --@COND_i386_pc_TRUE@am__append_3343 = aout.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_3333 = datetime.mod -+@COND_riscv64_efi_TRUE@am__append_3334 = datetime.marker -+@COND_i386_pc_TRUE@am__append_3335 = aout.module -+@COND_i386_pc_TRUE@am__append_3336 = aout.module$(EXEEXT) - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_x86_64_efi_FALSE@aout_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_3344 = --@COND_i386_pc_TRUE@am__append_3345 = $(nodist_aout_module_SOURCES) --@COND_i386_pc_TRUE@am__append_3346 = $(nodist_aout_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_3337 = -+@COND_i386_pc_TRUE@am__append_3338 = $(nodist_aout_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_3339 = $(nodist_aout_module_SOURCES) \ - @COND_i386_pc_TRUE@ aout.marker --@COND_i386_pc_TRUE@am__append_3347 = aout.mod --@COND_i386_pc_TRUE@am__append_3348 = aout.marker --@COND_i386_efi_TRUE@am__append_3349 = aout.module --@COND_i386_efi_TRUE@am__append_3350 = aout.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_3351 = --@COND_i386_efi_TRUE@am__append_3352 = $(nodist_aout_module_SOURCES) --@COND_i386_efi_TRUE@am__append_3353 = $(nodist_aout_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_3340 = aout.mod -+@COND_i386_pc_TRUE@am__append_3341 = aout.marker -+@COND_i386_efi_TRUE@am__append_3342 = aout.module -+@COND_i386_efi_TRUE@am__append_3343 = aout.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_3344 = -+@COND_i386_efi_TRUE@am__append_3345 = $(nodist_aout_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_3346 = $(nodist_aout_module_SOURCES) \ - @COND_i386_efi_TRUE@ aout.marker --@COND_i386_efi_TRUE@am__append_3354 = aout.mod --@COND_i386_efi_TRUE@am__append_3355 = aout.marker --@COND_i386_qemu_TRUE@am__append_3356 = aout.module --@COND_i386_qemu_TRUE@am__append_3357 = aout.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_3358 = --@COND_i386_qemu_TRUE@am__append_3359 = $(nodist_aout_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_3360 = $(nodist_aout_module_SOURCES) \ -+@COND_i386_efi_TRUE@am__append_3347 = aout.mod -+@COND_i386_efi_TRUE@am__append_3348 = aout.marker -+@COND_i386_qemu_TRUE@am__append_3349 = aout.module -+@COND_i386_qemu_TRUE@am__append_3350 = aout.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_3351 = -+@COND_i386_qemu_TRUE@am__append_3352 = $(nodist_aout_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_3353 = $(nodist_aout_module_SOURCES) \ - @COND_i386_qemu_TRUE@ aout.marker --@COND_i386_qemu_TRUE@am__append_3361 = aout.mod --@COND_i386_qemu_TRUE@am__append_3362 = aout.marker --@COND_i386_coreboot_TRUE@am__append_3363 = aout.module --@COND_i386_coreboot_TRUE@am__append_3364 = aout.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_3365 = --@COND_i386_coreboot_TRUE@am__append_3366 = $(nodist_aout_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_3367 = \ -+@COND_i386_qemu_TRUE@am__append_3354 = aout.mod -+@COND_i386_qemu_TRUE@am__append_3355 = aout.marker -+@COND_i386_coreboot_TRUE@am__append_3356 = aout.module -+@COND_i386_coreboot_TRUE@am__append_3357 = aout.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_3358 = -+@COND_i386_coreboot_TRUE@am__append_3359 = $(nodist_aout_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_3360 = \ - @COND_i386_coreboot_TRUE@ $(nodist_aout_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ aout.marker --@COND_i386_coreboot_TRUE@am__append_3368 = aout.mod --@COND_i386_coreboot_TRUE@am__append_3369 = aout.marker --@COND_i386_multiboot_TRUE@am__append_3370 = aout.module --@COND_i386_multiboot_TRUE@am__append_3371 = aout.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_3372 = --@COND_i386_multiboot_TRUE@am__append_3373 = $(nodist_aout_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_3374 = \ -+@COND_i386_coreboot_TRUE@am__append_3361 = aout.mod -+@COND_i386_coreboot_TRUE@am__append_3362 = aout.marker -+@COND_i386_multiboot_TRUE@am__append_3363 = aout.module -+@COND_i386_multiboot_TRUE@am__append_3364 = aout.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_3365 = -+@COND_i386_multiboot_TRUE@am__append_3366 = $(nodist_aout_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_3367 = \ - @COND_i386_multiboot_TRUE@ $(nodist_aout_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ aout.marker --@COND_i386_multiboot_TRUE@am__append_3375 = aout.mod --@COND_i386_multiboot_TRUE@am__append_3376 = aout.marker --@COND_i386_ieee1275_TRUE@am__append_3377 = aout.module --@COND_i386_ieee1275_TRUE@am__append_3378 = aout.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_3379 = --@COND_i386_ieee1275_TRUE@am__append_3380 = $(nodist_aout_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_3381 = \ -+@COND_i386_multiboot_TRUE@am__append_3368 = aout.mod -+@COND_i386_multiboot_TRUE@am__append_3369 = aout.marker -+@COND_i386_ieee1275_TRUE@am__append_3370 = aout.module -+@COND_i386_ieee1275_TRUE@am__append_3371 = aout.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_3372 = -+@COND_i386_ieee1275_TRUE@am__append_3373 = $(nodist_aout_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_3374 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_aout_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ aout.marker --@COND_i386_ieee1275_TRUE@am__append_3382 = aout.mod --@COND_i386_ieee1275_TRUE@am__append_3383 = aout.marker --@COND_x86_64_efi_TRUE@am__append_3384 = aout.module --@COND_x86_64_efi_TRUE@am__append_3385 = aout.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_3386 = --@COND_x86_64_efi_TRUE@am__append_3387 = $(nodist_aout_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_3388 = $(nodist_aout_module_SOURCES) \ -+@COND_i386_ieee1275_TRUE@am__append_3375 = aout.mod -+@COND_i386_ieee1275_TRUE@am__append_3376 = aout.marker -+@COND_x86_64_efi_TRUE@am__append_3377 = aout.module -+@COND_x86_64_efi_TRUE@am__append_3378 = aout.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_3379 = -+@COND_x86_64_efi_TRUE@am__append_3380 = $(nodist_aout_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_3381 = $(nodist_aout_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ aout.marker --@COND_x86_64_efi_TRUE@am__append_3389 = aout.mod --@COND_x86_64_efi_TRUE@am__append_3390 = aout.marker --@COND_i386_pc_TRUE@am__append_3391 = bsd.module --@COND_i386_pc_TRUE@am__append_3392 = bsd.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_3382 = aout.mod -+@COND_x86_64_efi_TRUE@am__append_3383 = aout.marker -+@COND_i386_pc_TRUE@am__append_3384 = bsd.module -+@COND_i386_pc_TRUE@am__append_3385 = bsd.module$(EXEEXT) - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_x86_64_efi_FALSE@bsd_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_3393 = loader/i386/bsdXX.c loader/i386/bsd_pagetable.c --@COND_i386_pc_TRUE@am__append_3394 = $(nodist_bsd_module_SOURCES) --@COND_i386_pc_TRUE@am__append_3395 = $(nodist_bsd_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_3386 = loader/i386/bsdXX.c loader/i386/bsd_pagetable.c -+@COND_i386_pc_TRUE@am__append_3387 = $(nodist_bsd_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_3388 = $(nodist_bsd_module_SOURCES) \ - @COND_i386_pc_TRUE@ bsd.marker --@COND_i386_pc_TRUE@am__append_3396 = bsd.mod --@COND_i386_pc_TRUE@am__append_3397 = bsd.marker --@COND_i386_efi_TRUE@am__append_3398 = bsd.module --@COND_i386_efi_TRUE@am__append_3399 = bsd.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_3400 = loader/i386/bsdXX.c loader/i386/bsd_pagetable.c --@COND_i386_efi_TRUE@am__append_3401 = $(nodist_bsd_module_SOURCES) --@COND_i386_efi_TRUE@am__append_3402 = $(nodist_bsd_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_3389 = bsd.mod -+@COND_i386_pc_TRUE@am__append_3390 = bsd.marker -+@COND_i386_efi_TRUE@am__append_3391 = bsd.module -+@COND_i386_efi_TRUE@am__append_3392 = bsd.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_3393 = loader/i386/bsdXX.c loader/i386/bsd_pagetable.c -+@COND_i386_efi_TRUE@am__append_3394 = $(nodist_bsd_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_3395 = $(nodist_bsd_module_SOURCES) \ - @COND_i386_efi_TRUE@ bsd.marker --@COND_i386_efi_TRUE@am__append_3403 = bsd.mod --@COND_i386_efi_TRUE@am__append_3404 = bsd.marker --@COND_i386_qemu_TRUE@am__append_3405 = bsd.module --@COND_i386_qemu_TRUE@am__append_3406 = bsd.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_3407 = loader/i386/bsdXX.c loader/i386/bsd_pagetable.c --@COND_i386_qemu_TRUE@am__append_3408 = $(nodist_bsd_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_3409 = $(nodist_bsd_module_SOURCES) \ -+@COND_i386_efi_TRUE@am__append_3396 = bsd.mod -+@COND_i386_efi_TRUE@am__append_3397 = bsd.marker -+@COND_i386_qemu_TRUE@am__append_3398 = bsd.module -+@COND_i386_qemu_TRUE@am__append_3399 = bsd.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_3400 = loader/i386/bsdXX.c loader/i386/bsd_pagetable.c -+@COND_i386_qemu_TRUE@am__append_3401 = $(nodist_bsd_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_3402 = $(nodist_bsd_module_SOURCES) \ - @COND_i386_qemu_TRUE@ bsd.marker --@COND_i386_qemu_TRUE@am__append_3410 = bsd.mod --@COND_i386_qemu_TRUE@am__append_3411 = bsd.marker --@COND_i386_coreboot_TRUE@am__append_3412 = bsd.module --@COND_i386_coreboot_TRUE@am__append_3413 = bsd.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_3414 = loader/i386/bsdXX.c loader/i386/bsd_pagetable.c --@COND_i386_coreboot_TRUE@am__append_3415 = $(nodist_bsd_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_3416 = \ -+@COND_i386_qemu_TRUE@am__append_3403 = bsd.mod -+@COND_i386_qemu_TRUE@am__append_3404 = bsd.marker -+@COND_i386_coreboot_TRUE@am__append_3405 = bsd.module -+@COND_i386_coreboot_TRUE@am__append_3406 = bsd.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_3407 = loader/i386/bsdXX.c loader/i386/bsd_pagetable.c -+@COND_i386_coreboot_TRUE@am__append_3408 = $(nodist_bsd_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_3409 = \ - @COND_i386_coreboot_TRUE@ $(nodist_bsd_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ bsd.marker --@COND_i386_coreboot_TRUE@am__append_3417 = bsd.mod --@COND_i386_coreboot_TRUE@am__append_3418 = bsd.marker --@COND_i386_multiboot_TRUE@am__append_3419 = bsd.module --@COND_i386_multiboot_TRUE@am__append_3420 = bsd.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_3421 = loader/i386/bsdXX.c loader/i386/bsd_pagetable.c --@COND_i386_multiboot_TRUE@am__append_3422 = $(nodist_bsd_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_3423 = \ -+@COND_i386_coreboot_TRUE@am__append_3410 = bsd.mod -+@COND_i386_coreboot_TRUE@am__append_3411 = bsd.marker -+@COND_i386_multiboot_TRUE@am__append_3412 = bsd.module -+@COND_i386_multiboot_TRUE@am__append_3413 = bsd.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_3414 = loader/i386/bsdXX.c loader/i386/bsd_pagetable.c -+@COND_i386_multiboot_TRUE@am__append_3415 = $(nodist_bsd_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_3416 = \ - @COND_i386_multiboot_TRUE@ $(nodist_bsd_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ bsd.marker --@COND_i386_multiboot_TRUE@am__append_3424 = bsd.mod --@COND_i386_multiboot_TRUE@am__append_3425 = bsd.marker --@COND_i386_ieee1275_TRUE@am__append_3426 = bsd.module --@COND_i386_ieee1275_TRUE@am__append_3427 = bsd.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_3428 = loader/i386/bsdXX.c loader/i386/bsd_pagetable.c --@COND_i386_ieee1275_TRUE@am__append_3429 = $(nodist_bsd_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_3430 = \ -+@COND_i386_multiboot_TRUE@am__append_3417 = bsd.mod -+@COND_i386_multiboot_TRUE@am__append_3418 = bsd.marker -+@COND_i386_ieee1275_TRUE@am__append_3419 = bsd.module -+@COND_i386_ieee1275_TRUE@am__append_3420 = bsd.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_3421 = loader/i386/bsdXX.c loader/i386/bsd_pagetable.c -+@COND_i386_ieee1275_TRUE@am__append_3422 = $(nodist_bsd_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_3423 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_bsd_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ bsd.marker --@COND_i386_ieee1275_TRUE@am__append_3431 = bsd.mod --@COND_i386_ieee1275_TRUE@am__append_3432 = bsd.marker --@COND_x86_64_efi_TRUE@am__append_3433 = bsd.module --@COND_x86_64_efi_TRUE@am__append_3434 = bsd.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_3435 = loader/i386/bsdXX.c loader/i386/bsd_pagetable.c --@COND_x86_64_efi_TRUE@am__append_3436 = $(nodist_bsd_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_3437 = $(nodist_bsd_module_SOURCES) \ -+@COND_i386_ieee1275_TRUE@am__append_3424 = bsd.mod -+@COND_i386_ieee1275_TRUE@am__append_3425 = bsd.marker -+@COND_x86_64_efi_TRUE@am__append_3426 = bsd.module -+@COND_x86_64_efi_TRUE@am__append_3427 = bsd.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_3428 = loader/i386/bsdXX.c loader/i386/bsd_pagetable.c -+@COND_x86_64_efi_TRUE@am__append_3429 = $(nodist_bsd_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_3430 = $(nodist_bsd_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ bsd.marker --@COND_x86_64_efi_TRUE@am__append_3438 = bsd.mod --@COND_x86_64_efi_TRUE@am__append_3439 = bsd.marker --@COND_i386_pc_TRUE@am__append_3440 = plan9.module linux16.module --@COND_i386_pc_TRUE@am__append_3441 = plan9.module$(EXEEXT) \ -+@COND_x86_64_efi_TRUE@am__append_3431 = bsd.mod -+@COND_x86_64_efi_TRUE@am__append_3432 = bsd.marker -+@COND_i386_pc_TRUE@am__append_3433 = plan9.module linux16.module -+@COND_i386_pc_TRUE@am__append_3434 = plan9.module$(EXEEXT) \ - @COND_i386_pc_TRUE@ linux16.module$(EXEEXT) - @COND_i386_pc_FALSE@plan9_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_3442 = --@COND_i386_pc_TRUE@am__append_3443 = $(nodist_plan9_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_3435 = -+@COND_i386_pc_TRUE@am__append_3436 = $(nodist_plan9_module_SOURCES) \ - @COND_i386_pc_TRUE@ $(nodist_linux16_module_SOURCES) --@COND_i386_pc_TRUE@am__append_3444 = $(nodist_plan9_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_3437 = $(nodist_plan9_module_SOURCES) \ - @COND_i386_pc_TRUE@ plan9.marker \ - @COND_i386_pc_TRUE@ $(nodist_linux16_module_SOURCES) \ - @COND_i386_pc_TRUE@ linux16.marker --@COND_i386_pc_TRUE@am__append_3445 = plan9.mod linux16.mod --@COND_i386_pc_TRUE@am__append_3446 = plan9.marker linux16.marker -+@COND_i386_pc_TRUE@am__append_3438 = plan9.mod linux16.mod -+@COND_i386_pc_TRUE@am__append_3439 = plan9.marker linux16.marker - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_x86_64_efi_FALSE@linux16_module_DEPENDENCIES = --@COND_i386_efi_TRUE@am__append_3447 = linux16.module --@COND_i386_efi_TRUE@am__append_3448 = linux16.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_3449 = --@COND_i386_efi_TRUE@am__append_3450 = $(nodist_linux16_module_SOURCES) --@COND_i386_efi_TRUE@am__append_3451 = \ -+@COND_i386_efi_TRUE@am__append_3440 = linux16.module -+@COND_i386_efi_TRUE@am__append_3441 = linux16.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_3442 = -+@COND_i386_efi_TRUE@am__append_3443 = $(nodist_linux16_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_3444 = \ - @COND_i386_efi_TRUE@ $(nodist_linux16_module_SOURCES) \ - @COND_i386_efi_TRUE@ linux16.marker --@COND_i386_efi_TRUE@am__append_3452 = linux16.mod --@COND_i386_efi_TRUE@am__append_3453 = linux16.marker --@COND_i386_qemu_TRUE@am__append_3454 = linux16.module --@COND_i386_qemu_TRUE@am__append_3455 = linux16.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_3456 = --@COND_i386_qemu_TRUE@am__append_3457 = $(nodist_linux16_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_3458 = \ -+@COND_i386_efi_TRUE@am__append_3445 = linux16.mod -+@COND_i386_efi_TRUE@am__append_3446 = linux16.marker -+@COND_i386_qemu_TRUE@am__append_3447 = linux16.module -+@COND_i386_qemu_TRUE@am__append_3448 = linux16.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_3449 = -+@COND_i386_qemu_TRUE@am__append_3450 = $(nodist_linux16_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_3451 = \ - @COND_i386_qemu_TRUE@ $(nodist_linux16_module_SOURCES) \ - @COND_i386_qemu_TRUE@ linux16.marker --@COND_i386_qemu_TRUE@am__append_3459 = linux16.mod --@COND_i386_qemu_TRUE@am__append_3460 = linux16.marker --@COND_i386_coreboot_TRUE@am__append_3461 = linux16.module --@COND_i386_coreboot_TRUE@am__append_3462 = linux16.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_3463 = --@COND_i386_coreboot_TRUE@am__append_3464 = $(nodist_linux16_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_3465 = \ -+@COND_i386_qemu_TRUE@am__append_3452 = linux16.mod -+@COND_i386_qemu_TRUE@am__append_3453 = linux16.marker -+@COND_i386_coreboot_TRUE@am__append_3454 = linux16.module -+@COND_i386_coreboot_TRUE@am__append_3455 = linux16.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_3456 = -+@COND_i386_coreboot_TRUE@am__append_3457 = $(nodist_linux16_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_3458 = \ - @COND_i386_coreboot_TRUE@ $(nodist_linux16_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ linux16.marker --@COND_i386_coreboot_TRUE@am__append_3466 = linux16.mod --@COND_i386_coreboot_TRUE@am__append_3467 = linux16.marker --@COND_i386_multiboot_TRUE@am__append_3468 = linux16.module --@COND_i386_multiboot_TRUE@am__append_3469 = linux16.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_3470 = --@COND_i386_multiboot_TRUE@am__append_3471 = $(nodist_linux16_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_3472 = \ -+@COND_i386_coreboot_TRUE@am__append_3459 = linux16.mod -+@COND_i386_coreboot_TRUE@am__append_3460 = linux16.marker -+@COND_i386_multiboot_TRUE@am__append_3461 = linux16.module -+@COND_i386_multiboot_TRUE@am__append_3462 = linux16.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_3463 = -+@COND_i386_multiboot_TRUE@am__append_3464 = $(nodist_linux16_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_3465 = \ - @COND_i386_multiboot_TRUE@ $(nodist_linux16_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ linux16.marker --@COND_i386_multiboot_TRUE@am__append_3473 = linux16.mod --@COND_i386_multiboot_TRUE@am__append_3474 = linux16.marker --@COND_i386_ieee1275_TRUE@am__append_3475 = linux16.module --@COND_i386_ieee1275_TRUE@am__append_3476 = linux16.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_3477 = --@COND_i386_ieee1275_TRUE@am__append_3478 = $(nodist_linux16_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_3479 = \ -+@COND_i386_multiboot_TRUE@am__append_3466 = linux16.mod -+@COND_i386_multiboot_TRUE@am__append_3467 = linux16.marker -+@COND_i386_ieee1275_TRUE@am__append_3468 = linux16.module -+@COND_i386_ieee1275_TRUE@am__append_3469 = linux16.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_3470 = -+@COND_i386_ieee1275_TRUE@am__append_3471 = $(nodist_linux16_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_3472 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_linux16_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ linux16.marker --@COND_i386_ieee1275_TRUE@am__append_3480 = linux16.mod --@COND_i386_ieee1275_TRUE@am__append_3481 = linux16.marker --@COND_x86_64_efi_TRUE@am__append_3482 = linux16.module --@COND_x86_64_efi_TRUE@am__append_3483 = linux16.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_3484 = --@COND_x86_64_efi_TRUE@am__append_3485 = $(nodist_linux16_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_3486 = \ -+@COND_i386_ieee1275_TRUE@am__append_3473 = linux16.mod -+@COND_i386_ieee1275_TRUE@am__append_3474 = linux16.marker -+@COND_x86_64_efi_TRUE@am__append_3475 = linux16.module -+@COND_x86_64_efi_TRUE@am__append_3476 = linux16.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_3477 = -+@COND_x86_64_efi_TRUE@am__append_3478 = $(nodist_linux16_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_3479 = \ - @COND_x86_64_efi_TRUE@ $(nodist_linux16_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ linux16.marker --@COND_x86_64_efi_TRUE@am__append_3487 = linux16.mod --@COND_x86_64_efi_TRUE@am__append_3488 = linux16.marker --@COND_i386_pc_TRUE@am__append_3489 = ntldr.module truecrypt.module \ -+@COND_x86_64_efi_TRUE@am__append_3480 = linux16.mod -+@COND_x86_64_efi_TRUE@am__append_3481 = linux16.marker -+@COND_i386_pc_TRUE@am__append_3482 = ntldr.module truecrypt.module \ - @COND_i386_pc_TRUE@ freedos.module pxechain.module \ - @COND_i386_pc_TRUE@ multiboot2.module --@COND_i386_pc_TRUE@am__append_3490 = ntldr.module$(EXEEXT) \ -+@COND_i386_pc_TRUE@am__append_3483 = ntldr.module$(EXEEXT) \ - @COND_i386_pc_TRUE@ truecrypt.module$(EXEEXT) \ - @COND_i386_pc_TRUE@ freedos.module$(EXEEXT) \ - @COND_i386_pc_TRUE@ pxechain.module$(EXEEXT) \ - @COND_i386_pc_TRUE@ multiboot2.module$(EXEEXT) - @COND_i386_pc_FALSE@ntldr_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_3491 = --@COND_i386_pc_TRUE@am__append_3492 = $(nodist_ntldr_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_3484 = -+@COND_i386_pc_TRUE@am__append_3485 = $(nodist_ntldr_module_SOURCES) \ - @COND_i386_pc_TRUE@ $(nodist_truecrypt_module_SOURCES) \ - @COND_i386_pc_TRUE@ $(nodist_freedos_module_SOURCES) \ - @COND_i386_pc_TRUE@ $(nodist_pxechain_module_SOURCES) \ - @COND_i386_pc_TRUE@ $(nodist_multiboot2_module_SOURCES) --@COND_i386_pc_TRUE@am__append_3493 = $(nodist_ntldr_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_3486 = $(nodist_ntldr_module_SOURCES) \ - @COND_i386_pc_TRUE@ ntldr.marker \ - @COND_i386_pc_TRUE@ $(nodist_truecrypt_module_SOURCES) \ - @COND_i386_pc_TRUE@ truecrypt.marker \ -@@ -4863,2969 +4853,2969 @@ TESTS = - @COND_i386_pc_TRUE@ pxechain.marker \ - @COND_i386_pc_TRUE@ $(nodist_multiboot2_module_SOURCES) \ - @COND_i386_pc_TRUE@ multiboot2.marker --@COND_i386_pc_TRUE@am__append_3494 = ntldr.mod truecrypt.mod \ -+@COND_i386_pc_TRUE@am__append_3487 = ntldr.mod truecrypt.mod \ - @COND_i386_pc_TRUE@ freedos.mod pxechain.mod multiboot2.mod --@COND_i386_pc_TRUE@am__append_3495 = ntldr.marker truecrypt.marker \ -+@COND_i386_pc_TRUE@am__append_3488 = ntldr.marker truecrypt.marker \ - @COND_i386_pc_TRUE@ freedos.marker pxechain.marker \ - @COND_i386_pc_TRUE@ multiboot2.marker - @COND_i386_pc_FALSE@truecrypt_module_DEPENDENCIES = - @COND_i386_pc_FALSE@freedos_module_DEPENDENCIES = - @COND_i386_pc_FALSE@pxechain_module_DEPENDENCIES = - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_pvh_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_x86_64_efi_FALSE@multiboot2_module_DEPENDENCIES = --@COND_i386_efi_TRUE@am__append_3496 = multiboot2.module --@COND_i386_efi_TRUE@am__append_3497 = multiboot2.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_3498 = --@COND_i386_efi_TRUE@am__append_3499 = $(nodist_multiboot2_module_SOURCES) --@COND_i386_efi_TRUE@am__append_3500 = \ -+@COND_i386_efi_TRUE@am__append_3489 = multiboot2.module -+@COND_i386_efi_TRUE@am__append_3490 = multiboot2.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_3491 = -+@COND_i386_efi_TRUE@am__append_3492 = $(nodist_multiboot2_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_3493 = \ - @COND_i386_efi_TRUE@ $(nodist_multiboot2_module_SOURCES) \ - @COND_i386_efi_TRUE@ multiboot2.marker --@COND_i386_efi_TRUE@am__append_3501 = multiboot2.mod --@COND_i386_efi_TRUE@am__append_3502 = multiboot2.marker --@COND_i386_qemu_TRUE@am__append_3503 = multiboot2.module --@COND_i386_qemu_TRUE@am__append_3504 = multiboot2.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_3505 = --@COND_i386_qemu_TRUE@am__append_3506 = $(nodist_multiboot2_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_3507 = \ -+@COND_i386_efi_TRUE@am__append_3494 = multiboot2.mod -+@COND_i386_efi_TRUE@am__append_3495 = multiboot2.marker -+@COND_i386_qemu_TRUE@am__append_3496 = multiboot2.module -+@COND_i386_qemu_TRUE@am__append_3497 = multiboot2.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_3498 = -+@COND_i386_qemu_TRUE@am__append_3499 = $(nodist_multiboot2_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_3500 = \ - @COND_i386_qemu_TRUE@ $(nodist_multiboot2_module_SOURCES) \ - @COND_i386_qemu_TRUE@ multiboot2.marker --@COND_i386_qemu_TRUE@am__append_3508 = multiboot2.mod --@COND_i386_qemu_TRUE@am__append_3509 = multiboot2.marker --@COND_i386_coreboot_TRUE@am__append_3510 = multiboot2.module --@COND_i386_coreboot_TRUE@am__append_3511 = multiboot2.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_3512 = --@COND_i386_coreboot_TRUE@am__append_3513 = $(nodist_multiboot2_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_3514 = \ -+@COND_i386_qemu_TRUE@am__append_3501 = multiboot2.mod -+@COND_i386_qemu_TRUE@am__append_3502 = multiboot2.marker -+@COND_i386_coreboot_TRUE@am__append_3503 = multiboot2.module -+@COND_i386_coreboot_TRUE@am__append_3504 = multiboot2.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_3505 = -+@COND_i386_coreboot_TRUE@am__append_3506 = $(nodist_multiboot2_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_3507 = \ - @COND_i386_coreboot_TRUE@ $(nodist_multiboot2_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ multiboot2.marker --@COND_i386_coreboot_TRUE@am__append_3515 = multiboot2.mod --@COND_i386_coreboot_TRUE@am__append_3516 = multiboot2.marker --@COND_i386_multiboot_TRUE@am__append_3517 = multiboot2.module --@COND_i386_multiboot_TRUE@am__append_3518 = multiboot2.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_3519 = --@COND_i386_multiboot_TRUE@am__append_3520 = $(nodist_multiboot2_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_3521 = \ -+@COND_i386_coreboot_TRUE@am__append_3508 = multiboot2.mod -+@COND_i386_coreboot_TRUE@am__append_3509 = multiboot2.marker -+@COND_i386_multiboot_TRUE@am__append_3510 = multiboot2.module -+@COND_i386_multiboot_TRUE@am__append_3511 = multiboot2.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_3512 = -+@COND_i386_multiboot_TRUE@am__append_3513 = $(nodist_multiboot2_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_3514 = \ - @COND_i386_multiboot_TRUE@ $(nodist_multiboot2_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ multiboot2.marker --@COND_i386_multiboot_TRUE@am__append_3522 = multiboot2.mod --@COND_i386_multiboot_TRUE@am__append_3523 = multiboot2.marker --@COND_i386_ieee1275_TRUE@am__append_3524 = multiboot2.module --@COND_i386_ieee1275_TRUE@am__append_3525 = multiboot2.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_3526 = --@COND_i386_ieee1275_TRUE@am__append_3527 = $(nodist_multiboot2_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_3528 = \ -+@COND_i386_multiboot_TRUE@am__append_3515 = multiboot2.mod -+@COND_i386_multiboot_TRUE@am__append_3516 = multiboot2.marker -+@COND_i386_ieee1275_TRUE@am__append_3517 = multiboot2.module -+@COND_i386_ieee1275_TRUE@am__append_3518 = multiboot2.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_3519 = -+@COND_i386_ieee1275_TRUE@am__append_3520 = $(nodist_multiboot2_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_3521 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_multiboot2_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ multiboot2.marker --@COND_i386_ieee1275_TRUE@am__append_3529 = multiboot2.mod --@COND_i386_ieee1275_TRUE@am__append_3530 = multiboot2.marker --@COND_x86_64_efi_TRUE@am__append_3531 = multiboot2.module --@COND_x86_64_efi_TRUE@am__append_3532 = multiboot2.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_3533 = --@COND_x86_64_efi_TRUE@am__append_3534 = $(nodist_multiboot2_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_3535 = \ -+@COND_i386_ieee1275_TRUE@am__append_3522 = multiboot2.mod -+@COND_i386_ieee1275_TRUE@am__append_3523 = multiboot2.marker -+@COND_x86_64_efi_TRUE@am__append_3524 = multiboot2.module -+@COND_x86_64_efi_TRUE@am__append_3525 = multiboot2.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_3526 = -+@COND_x86_64_efi_TRUE@am__append_3527 = $(nodist_multiboot2_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_3528 = \ - @COND_x86_64_efi_TRUE@ $(nodist_multiboot2_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ multiboot2.marker --@COND_x86_64_efi_TRUE@am__append_3536 = multiboot2.mod --@COND_x86_64_efi_TRUE@am__append_3537 = multiboot2.marker --@COND_i386_xen_pvh_TRUE@am__append_3538 = multiboot2.module --@COND_i386_xen_pvh_TRUE@am__append_3539 = multiboot2.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__append_3540 = --@COND_i386_xen_pvh_TRUE@am__append_3541 = $(nodist_multiboot2_module_SOURCES) --@COND_i386_xen_pvh_TRUE@am__append_3542 = \ -+@COND_x86_64_efi_TRUE@am__append_3529 = multiboot2.mod -+@COND_x86_64_efi_TRUE@am__append_3530 = multiboot2.marker -+@COND_i386_xen_pvh_TRUE@am__append_3531 = multiboot2.module -+@COND_i386_xen_pvh_TRUE@am__append_3532 = multiboot2.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__append_3533 = -+@COND_i386_xen_pvh_TRUE@am__append_3534 = $(nodist_multiboot2_module_SOURCES) -+@COND_i386_xen_pvh_TRUE@am__append_3535 = \ - @COND_i386_xen_pvh_TRUE@ $(nodist_multiboot2_module_SOURCES) \ - @COND_i386_xen_pvh_TRUE@ multiboot2.marker --@COND_i386_xen_pvh_TRUE@am__append_3543 = multiboot2.mod --@COND_i386_xen_pvh_TRUE@am__append_3544 = multiboot2.marker --@COND_mips_loongson_TRUE@am__append_3545 = multiboot2.module --@COND_mips_loongson_TRUE@am__append_3546 = multiboot2.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__append_3547 = --@COND_mips_loongson_TRUE@am__append_3548 = $(nodist_multiboot2_module_SOURCES) --@COND_mips_loongson_TRUE@am__append_3549 = \ -+@COND_i386_xen_pvh_TRUE@am__append_3536 = multiboot2.mod -+@COND_i386_xen_pvh_TRUE@am__append_3537 = multiboot2.marker -+@COND_mips_loongson_TRUE@am__append_3538 = multiboot2.module -+@COND_mips_loongson_TRUE@am__append_3539 = multiboot2.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__append_3540 = -+@COND_mips_loongson_TRUE@am__append_3541 = $(nodist_multiboot2_module_SOURCES) -+@COND_mips_loongson_TRUE@am__append_3542 = \ - @COND_mips_loongson_TRUE@ $(nodist_multiboot2_module_SOURCES) \ - @COND_mips_loongson_TRUE@ multiboot2.marker --@COND_mips_loongson_TRUE@am__append_3550 = multiboot2.mod --@COND_mips_loongson_TRUE@am__append_3551 = multiboot2.marker --@COND_mips_arc_TRUE@am__append_3552 = multiboot2.module --@COND_mips_arc_TRUE@am__append_3553 = multiboot2.module$(EXEEXT) --@COND_mips_arc_TRUE@am__append_3554 = --@COND_mips_arc_TRUE@am__append_3555 = $(nodist_multiboot2_module_SOURCES) --@COND_mips_arc_TRUE@am__append_3556 = \ -+@COND_mips_loongson_TRUE@am__append_3543 = multiboot2.mod -+@COND_mips_loongson_TRUE@am__append_3544 = multiboot2.marker -+@COND_mips_arc_TRUE@am__append_3545 = multiboot2.module -+@COND_mips_arc_TRUE@am__append_3546 = multiboot2.module$(EXEEXT) -+@COND_mips_arc_TRUE@am__append_3547 = -+@COND_mips_arc_TRUE@am__append_3548 = $(nodist_multiboot2_module_SOURCES) -+@COND_mips_arc_TRUE@am__append_3549 = \ - @COND_mips_arc_TRUE@ $(nodist_multiboot2_module_SOURCES) \ - @COND_mips_arc_TRUE@ multiboot2.marker --@COND_mips_arc_TRUE@am__append_3557 = multiboot2.mod --@COND_mips_arc_TRUE@am__append_3558 = multiboot2.marker --@COND_mips_qemu_mips_TRUE@am__append_3559 = multiboot2.module --@COND_mips_qemu_mips_TRUE@am__append_3560 = multiboot2.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__append_3561 = --@COND_mips_qemu_mips_TRUE@am__append_3562 = $(nodist_multiboot2_module_SOURCES) --@COND_mips_qemu_mips_TRUE@am__append_3563 = \ -+@COND_mips_arc_TRUE@am__append_3550 = multiboot2.mod -+@COND_mips_arc_TRUE@am__append_3551 = multiboot2.marker -+@COND_mips_qemu_mips_TRUE@am__append_3552 = multiboot2.module -+@COND_mips_qemu_mips_TRUE@am__append_3553 = multiboot2.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__append_3554 = -+@COND_mips_qemu_mips_TRUE@am__append_3555 = $(nodist_multiboot2_module_SOURCES) -+@COND_mips_qemu_mips_TRUE@am__append_3556 = \ - @COND_mips_qemu_mips_TRUE@ $(nodist_multiboot2_module_SOURCES) \ - @COND_mips_qemu_mips_TRUE@ multiboot2.marker --@COND_mips_qemu_mips_TRUE@am__append_3564 = multiboot2.mod --@COND_mips_qemu_mips_TRUE@am__append_3565 = multiboot2.marker --@COND_i386_pc_TRUE@am__append_3566 = multiboot.module --@COND_i386_pc_TRUE@am__append_3567 = multiboot.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__append_3557 = multiboot2.mod -+@COND_mips_qemu_mips_TRUE@am__append_3558 = multiboot2.marker -+@COND_i386_pc_TRUE@am__append_3559 = multiboot.module -+@COND_i386_pc_TRUE@am__append_3560 = multiboot.module$(EXEEXT) - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_pvh_FALSE@@COND_x86_64_efi_FALSE@multiboot_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_3568 = loader/multiboot_elfxx.c --@COND_i386_pc_TRUE@am__append_3569 = $(nodist_multiboot_module_SOURCES) --@COND_i386_pc_TRUE@am__append_3570 = \ -+@COND_i386_pc_TRUE@am__append_3561 = loader/multiboot_elfxx.c -+@COND_i386_pc_TRUE@am__append_3562 = $(nodist_multiboot_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_3563 = \ - @COND_i386_pc_TRUE@ $(nodist_multiboot_module_SOURCES) \ - @COND_i386_pc_TRUE@ multiboot.marker --@COND_i386_pc_TRUE@am__append_3571 = multiboot.mod --@COND_i386_pc_TRUE@am__append_3572 = multiboot.marker --@COND_i386_efi_TRUE@am__append_3573 = multiboot.module --@COND_i386_efi_TRUE@am__append_3574 = multiboot.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_3575 = loader/multiboot_elfxx.c --@COND_i386_efi_TRUE@am__append_3576 = $(nodist_multiboot_module_SOURCES) --@COND_i386_efi_TRUE@am__append_3577 = \ -+@COND_i386_pc_TRUE@am__append_3564 = multiboot.mod -+@COND_i386_pc_TRUE@am__append_3565 = multiboot.marker -+@COND_i386_efi_TRUE@am__append_3566 = multiboot.module -+@COND_i386_efi_TRUE@am__append_3567 = multiboot.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_3568 = loader/multiboot_elfxx.c -+@COND_i386_efi_TRUE@am__append_3569 = $(nodist_multiboot_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_3570 = \ - @COND_i386_efi_TRUE@ $(nodist_multiboot_module_SOURCES) \ - @COND_i386_efi_TRUE@ multiboot.marker --@COND_i386_efi_TRUE@am__append_3578 = multiboot.mod --@COND_i386_efi_TRUE@am__append_3579 = multiboot.marker --@COND_i386_qemu_TRUE@am__append_3580 = multiboot.module --@COND_i386_qemu_TRUE@am__append_3581 = multiboot.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_3582 = loader/multiboot_elfxx.c --@COND_i386_qemu_TRUE@am__append_3583 = $(nodist_multiboot_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_3584 = \ -+@COND_i386_efi_TRUE@am__append_3571 = multiboot.mod -+@COND_i386_efi_TRUE@am__append_3572 = multiboot.marker -+@COND_i386_qemu_TRUE@am__append_3573 = multiboot.module -+@COND_i386_qemu_TRUE@am__append_3574 = multiboot.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_3575 = loader/multiboot_elfxx.c -+@COND_i386_qemu_TRUE@am__append_3576 = $(nodist_multiboot_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_3577 = \ - @COND_i386_qemu_TRUE@ $(nodist_multiboot_module_SOURCES) \ - @COND_i386_qemu_TRUE@ multiboot.marker --@COND_i386_qemu_TRUE@am__append_3585 = multiboot.mod --@COND_i386_qemu_TRUE@am__append_3586 = multiboot.marker --@COND_i386_coreboot_TRUE@am__append_3587 = multiboot.module --@COND_i386_coreboot_TRUE@am__append_3588 = multiboot.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_3589 = loader/multiboot_elfxx.c --@COND_i386_coreboot_TRUE@am__append_3590 = $(nodist_multiboot_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_3591 = \ -+@COND_i386_qemu_TRUE@am__append_3578 = multiboot.mod -+@COND_i386_qemu_TRUE@am__append_3579 = multiboot.marker -+@COND_i386_coreboot_TRUE@am__append_3580 = multiboot.module -+@COND_i386_coreboot_TRUE@am__append_3581 = multiboot.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_3582 = loader/multiboot_elfxx.c -+@COND_i386_coreboot_TRUE@am__append_3583 = $(nodist_multiboot_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_3584 = \ - @COND_i386_coreboot_TRUE@ $(nodist_multiboot_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ multiboot.marker --@COND_i386_coreboot_TRUE@am__append_3592 = multiboot.mod --@COND_i386_coreboot_TRUE@am__append_3593 = multiboot.marker --@COND_i386_multiboot_TRUE@am__append_3594 = multiboot.module --@COND_i386_multiboot_TRUE@am__append_3595 = multiboot.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_3596 = loader/multiboot_elfxx.c --@COND_i386_multiboot_TRUE@am__append_3597 = $(nodist_multiboot_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_3598 = \ -+@COND_i386_coreboot_TRUE@am__append_3585 = multiboot.mod -+@COND_i386_coreboot_TRUE@am__append_3586 = multiboot.marker -+@COND_i386_multiboot_TRUE@am__append_3587 = multiboot.module -+@COND_i386_multiboot_TRUE@am__append_3588 = multiboot.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_3589 = loader/multiboot_elfxx.c -+@COND_i386_multiboot_TRUE@am__append_3590 = $(nodist_multiboot_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_3591 = \ - @COND_i386_multiboot_TRUE@ $(nodist_multiboot_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ multiboot.marker --@COND_i386_multiboot_TRUE@am__append_3599 = multiboot.mod --@COND_i386_multiboot_TRUE@am__append_3600 = multiboot.marker --@COND_i386_ieee1275_TRUE@am__append_3601 = multiboot.module --@COND_i386_ieee1275_TRUE@am__append_3602 = multiboot.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_3603 = loader/multiboot_elfxx.c --@COND_i386_ieee1275_TRUE@am__append_3604 = $(nodist_multiboot_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_3605 = \ -+@COND_i386_multiboot_TRUE@am__append_3592 = multiboot.mod -+@COND_i386_multiboot_TRUE@am__append_3593 = multiboot.marker -+@COND_i386_ieee1275_TRUE@am__append_3594 = multiboot.module -+@COND_i386_ieee1275_TRUE@am__append_3595 = multiboot.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_3596 = loader/multiboot_elfxx.c -+@COND_i386_ieee1275_TRUE@am__append_3597 = $(nodist_multiboot_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_3598 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_multiboot_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ multiboot.marker --@COND_i386_ieee1275_TRUE@am__append_3606 = multiboot.mod --@COND_i386_ieee1275_TRUE@am__append_3607 = multiboot.marker --@COND_x86_64_efi_TRUE@am__append_3608 = multiboot.module --@COND_x86_64_efi_TRUE@am__append_3609 = multiboot.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_3610 = loader/multiboot_elfxx.c --@COND_x86_64_efi_TRUE@am__append_3611 = $(nodist_multiboot_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_3612 = \ -+@COND_i386_ieee1275_TRUE@am__append_3599 = multiboot.mod -+@COND_i386_ieee1275_TRUE@am__append_3600 = multiboot.marker -+@COND_x86_64_efi_TRUE@am__append_3601 = multiboot.module -+@COND_x86_64_efi_TRUE@am__append_3602 = multiboot.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_3603 = loader/multiboot_elfxx.c -+@COND_x86_64_efi_TRUE@am__append_3604 = $(nodist_multiboot_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_3605 = \ - @COND_x86_64_efi_TRUE@ $(nodist_multiboot_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ multiboot.marker --@COND_x86_64_efi_TRUE@am__append_3613 = multiboot.mod --@COND_x86_64_efi_TRUE@am__append_3614 = multiboot.marker --@COND_i386_xen_pvh_TRUE@am__append_3615 = multiboot.module --@COND_i386_xen_pvh_TRUE@am__append_3616 = multiboot.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__append_3617 = loader/multiboot_elfxx.c --@COND_i386_xen_pvh_TRUE@am__append_3618 = $(nodist_multiboot_module_SOURCES) --@COND_i386_xen_pvh_TRUE@am__append_3619 = \ -+@COND_x86_64_efi_TRUE@am__append_3606 = multiboot.mod -+@COND_x86_64_efi_TRUE@am__append_3607 = multiboot.marker -+@COND_i386_xen_pvh_TRUE@am__append_3608 = multiboot.module -+@COND_i386_xen_pvh_TRUE@am__append_3609 = multiboot.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__append_3610 = loader/multiboot_elfxx.c -+@COND_i386_xen_pvh_TRUE@am__append_3611 = $(nodist_multiboot_module_SOURCES) -+@COND_i386_xen_pvh_TRUE@am__append_3612 = \ - @COND_i386_xen_pvh_TRUE@ $(nodist_multiboot_module_SOURCES) \ - @COND_i386_xen_pvh_TRUE@ multiboot.marker --@COND_i386_xen_pvh_TRUE@am__append_3620 = multiboot.mod --@COND_i386_xen_pvh_TRUE@am__append_3621 = multiboot.marker --@COND_arm64_efi_TRUE@am__append_3622 = xen_boot.module --@COND_arm64_efi_TRUE@am__append_3623 = xen_boot.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__append_3613 = multiboot.mod -+@COND_i386_xen_pvh_TRUE@am__append_3614 = multiboot.marker -+@COND_arm64_efi_TRUE@am__append_3615 = xen_boot.module -+@COND_arm64_efi_TRUE@am__append_3616 = xen_boot.module$(EXEEXT) - @COND_arm64_efi_FALSE@xen_boot_module_DEPENDENCIES = --@COND_arm64_efi_TRUE@am__append_3624 = --@COND_arm64_efi_TRUE@am__append_3625 = $(nodist_xen_boot_module_SOURCES) --@COND_arm64_efi_TRUE@am__append_3626 = \ -+@COND_arm64_efi_TRUE@am__append_3617 = -+@COND_arm64_efi_TRUE@am__append_3618 = $(nodist_xen_boot_module_SOURCES) -+@COND_arm64_efi_TRUE@am__append_3619 = \ - @COND_arm64_efi_TRUE@ $(nodist_xen_boot_module_SOURCES) \ - @COND_arm64_efi_TRUE@ xen_boot.marker --@COND_arm64_efi_TRUE@am__append_3627 = xen_boot.mod --@COND_arm64_efi_TRUE@am__append_3628 = xen_boot.marker --@COND_i386_pc_TRUE@am__append_3629 = linux.module --@COND_i386_pc_TRUE@am__append_3630 = linux.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__append_3620 = xen_boot.mod -+@COND_arm64_efi_TRUE@am__append_3621 = xen_boot.marker -+@COND_i386_pc_TRUE@am__append_3622 = linux.module -+@COND_i386_pc_TRUE@am__append_3623 = linux.module$(EXEEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_FALSE@linux_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_3631 = --@COND_i386_pc_TRUE@am__append_3632 = $(nodist_linux_module_SOURCES) --@COND_i386_pc_TRUE@am__append_3633 = $(nodist_linux_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_3624 = -+@COND_i386_pc_TRUE@am__append_3625 = $(nodist_linux_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_3626 = $(nodist_linux_module_SOURCES) \ - @COND_i386_pc_TRUE@ linux.marker --@COND_i386_pc_TRUE@am__append_3634 = linux.mod --@COND_i386_pc_TRUE@am__append_3635 = linux.marker --@COND_i386_efi_TRUE@am__append_3636 = linux.module --@COND_i386_efi_TRUE@am__append_3637 = linux.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_3638 = --@COND_i386_efi_TRUE@am__append_3639 = $(nodist_linux_module_SOURCES) --@COND_i386_efi_TRUE@am__append_3640 = $(nodist_linux_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_3627 = linux.mod -+@COND_i386_pc_TRUE@am__append_3628 = linux.marker -+@COND_i386_efi_TRUE@am__append_3629 = linux.module -+@COND_i386_efi_TRUE@am__append_3630 = linux.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_3631 = -+@COND_i386_efi_TRUE@am__append_3632 = $(nodist_linux_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_3633 = $(nodist_linux_module_SOURCES) \ - @COND_i386_efi_TRUE@ linux.marker --@COND_i386_efi_TRUE@am__append_3641 = linux.mod --@COND_i386_efi_TRUE@am__append_3642 = linux.marker --@COND_i386_qemu_TRUE@am__append_3643 = linux.module --@COND_i386_qemu_TRUE@am__append_3644 = linux.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_3645 = --@COND_i386_qemu_TRUE@am__append_3646 = $(nodist_linux_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_3647 = $(nodist_linux_module_SOURCES) \ -+@COND_i386_efi_TRUE@am__append_3634 = linux.mod -+@COND_i386_efi_TRUE@am__append_3635 = linux.marker -+@COND_i386_qemu_TRUE@am__append_3636 = linux.module -+@COND_i386_qemu_TRUE@am__append_3637 = linux.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_3638 = -+@COND_i386_qemu_TRUE@am__append_3639 = $(nodist_linux_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_3640 = $(nodist_linux_module_SOURCES) \ - @COND_i386_qemu_TRUE@ linux.marker --@COND_i386_qemu_TRUE@am__append_3648 = linux.mod --@COND_i386_qemu_TRUE@am__append_3649 = linux.marker --@COND_i386_coreboot_TRUE@am__append_3650 = linux.module --@COND_i386_coreboot_TRUE@am__append_3651 = linux.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_3652 = --@COND_i386_coreboot_TRUE@am__append_3653 = $(nodist_linux_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_3654 = \ -+@COND_i386_qemu_TRUE@am__append_3641 = linux.mod -+@COND_i386_qemu_TRUE@am__append_3642 = linux.marker -+@COND_i386_coreboot_TRUE@am__append_3643 = linux.module -+@COND_i386_coreboot_TRUE@am__append_3644 = linux.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_3645 = -+@COND_i386_coreboot_TRUE@am__append_3646 = $(nodist_linux_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_3647 = \ - @COND_i386_coreboot_TRUE@ $(nodist_linux_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ linux.marker --@COND_i386_coreboot_TRUE@am__append_3655 = linux.mod --@COND_i386_coreboot_TRUE@am__append_3656 = linux.marker --@COND_i386_multiboot_TRUE@am__append_3657 = linux.module --@COND_i386_multiboot_TRUE@am__append_3658 = linux.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_3659 = --@COND_i386_multiboot_TRUE@am__append_3660 = $(nodist_linux_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_3661 = \ -+@COND_i386_coreboot_TRUE@am__append_3648 = linux.mod -+@COND_i386_coreboot_TRUE@am__append_3649 = linux.marker -+@COND_i386_multiboot_TRUE@am__append_3650 = linux.module -+@COND_i386_multiboot_TRUE@am__append_3651 = linux.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_3652 = -+@COND_i386_multiboot_TRUE@am__append_3653 = $(nodist_linux_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_3654 = \ - @COND_i386_multiboot_TRUE@ $(nodist_linux_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ linux.marker --@COND_i386_multiboot_TRUE@am__append_3662 = linux.mod --@COND_i386_multiboot_TRUE@am__append_3663 = linux.marker --@COND_i386_ieee1275_TRUE@am__append_3664 = linux.module --@COND_i386_ieee1275_TRUE@am__append_3665 = linux.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_3666 = --@COND_i386_ieee1275_TRUE@am__append_3667 = $(nodist_linux_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_3668 = \ -+@COND_i386_multiboot_TRUE@am__append_3655 = linux.mod -+@COND_i386_multiboot_TRUE@am__append_3656 = linux.marker -+@COND_i386_ieee1275_TRUE@am__append_3657 = linux.module -+@COND_i386_ieee1275_TRUE@am__append_3658 = linux.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_3659 = -+@COND_i386_ieee1275_TRUE@am__append_3660 = $(nodist_linux_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_3661 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_linux_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ linux.marker --@COND_i386_ieee1275_TRUE@am__append_3669 = linux.mod --@COND_i386_ieee1275_TRUE@am__append_3670 = linux.marker --@COND_x86_64_efi_TRUE@am__append_3671 = linux.module --@COND_x86_64_efi_TRUE@am__append_3672 = linux.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_3673 = --@COND_x86_64_efi_TRUE@am__append_3674 = $(nodist_linux_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_3675 = \ -+@COND_i386_ieee1275_TRUE@am__append_3662 = linux.mod -+@COND_i386_ieee1275_TRUE@am__append_3663 = linux.marker -+@COND_x86_64_efi_TRUE@am__append_3664 = linux.module -+@COND_x86_64_efi_TRUE@am__append_3665 = linux.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_3666 = -+@COND_x86_64_efi_TRUE@am__append_3667 = $(nodist_linux_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_3668 = \ - @COND_x86_64_efi_TRUE@ $(nodist_linux_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ linux.marker --@COND_x86_64_efi_TRUE@am__append_3676 = linux.mod --@COND_x86_64_efi_TRUE@am__append_3677 = linux.marker --@COND_i386_xen_TRUE@am__append_3678 = linux.module --@COND_i386_xen_TRUE@am__append_3679 = linux.module$(EXEEXT) --@COND_i386_xen_TRUE@am__append_3680 = --@COND_i386_xen_TRUE@am__append_3681 = $(nodist_linux_module_SOURCES) --@COND_i386_xen_TRUE@am__append_3682 = $(nodist_linux_module_SOURCES) \ -+@COND_x86_64_efi_TRUE@am__append_3669 = linux.mod -+@COND_x86_64_efi_TRUE@am__append_3670 = linux.marker -+@COND_i386_xen_TRUE@am__append_3671 = linux.module -+@COND_i386_xen_TRUE@am__append_3672 = linux.module$(EXEEXT) -+@COND_i386_xen_TRUE@am__append_3673 = -+@COND_i386_xen_TRUE@am__append_3674 = $(nodist_linux_module_SOURCES) -+@COND_i386_xen_TRUE@am__append_3675 = $(nodist_linux_module_SOURCES) \ - @COND_i386_xen_TRUE@ linux.marker --@COND_i386_xen_TRUE@am__append_3683 = linux.mod --@COND_i386_xen_TRUE@am__append_3684 = linux.marker --@COND_x86_64_xen_TRUE@am__append_3685 = linux.module --@COND_x86_64_xen_TRUE@am__append_3686 = linux.module$(EXEEXT) --@COND_x86_64_xen_TRUE@am__append_3687 = --@COND_x86_64_xen_TRUE@am__append_3688 = $(nodist_linux_module_SOURCES) --@COND_x86_64_xen_TRUE@am__append_3689 = \ -+@COND_i386_xen_TRUE@am__append_3676 = linux.mod -+@COND_i386_xen_TRUE@am__append_3677 = linux.marker -+@COND_x86_64_xen_TRUE@am__append_3678 = linux.module -+@COND_x86_64_xen_TRUE@am__append_3679 = linux.module$(EXEEXT) -+@COND_x86_64_xen_TRUE@am__append_3680 = -+@COND_x86_64_xen_TRUE@am__append_3681 = $(nodist_linux_module_SOURCES) -+@COND_x86_64_xen_TRUE@am__append_3682 = \ - @COND_x86_64_xen_TRUE@ $(nodist_linux_module_SOURCES) \ - @COND_x86_64_xen_TRUE@ linux.marker --@COND_x86_64_xen_TRUE@am__append_3690 = linux.mod --@COND_x86_64_xen_TRUE@am__append_3691 = linux.marker --@COND_i386_xen_pvh_TRUE@am__append_3692 = linux.module --@COND_i386_xen_pvh_TRUE@am__append_3693 = linux.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__append_3694 = --@COND_i386_xen_pvh_TRUE@am__append_3695 = $(nodist_linux_module_SOURCES) --@COND_i386_xen_pvh_TRUE@am__append_3696 = \ -+@COND_x86_64_xen_TRUE@am__append_3683 = linux.mod -+@COND_x86_64_xen_TRUE@am__append_3684 = linux.marker -+@COND_i386_xen_pvh_TRUE@am__append_3685 = linux.module -+@COND_i386_xen_pvh_TRUE@am__append_3686 = linux.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__append_3687 = -+@COND_i386_xen_pvh_TRUE@am__append_3688 = $(nodist_linux_module_SOURCES) -+@COND_i386_xen_pvh_TRUE@am__append_3689 = \ - @COND_i386_xen_pvh_TRUE@ $(nodist_linux_module_SOURCES) \ - @COND_i386_xen_pvh_TRUE@ linux.marker --@COND_i386_xen_pvh_TRUE@am__append_3697 = linux.mod --@COND_i386_xen_pvh_TRUE@am__append_3698 = linux.marker --@COND_mips_loongson_TRUE@am__append_3699 = linux.module --@COND_mips_loongson_TRUE@am__append_3700 = linux.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__append_3701 = --@COND_mips_loongson_TRUE@am__append_3702 = $(nodist_linux_module_SOURCES) --@COND_mips_loongson_TRUE@am__append_3703 = \ -+@COND_i386_xen_pvh_TRUE@am__append_3690 = linux.mod -+@COND_i386_xen_pvh_TRUE@am__append_3691 = linux.marker -+@COND_mips_loongson_TRUE@am__append_3692 = linux.module -+@COND_mips_loongson_TRUE@am__append_3693 = linux.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__append_3694 = -+@COND_mips_loongson_TRUE@am__append_3695 = $(nodist_linux_module_SOURCES) -+@COND_mips_loongson_TRUE@am__append_3696 = \ - @COND_mips_loongson_TRUE@ $(nodist_linux_module_SOURCES) \ - @COND_mips_loongson_TRUE@ linux.marker --@COND_mips_loongson_TRUE@am__append_3704 = linux.mod --@COND_mips_loongson_TRUE@am__append_3705 = linux.marker --@COND_sparc64_ieee1275_TRUE@am__append_3706 = linux.module --@COND_sparc64_ieee1275_TRUE@am__append_3707 = linux.module$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@am__append_3708 = --@COND_sparc64_ieee1275_TRUE@am__append_3709 = $(nodist_linux_module_SOURCES) --@COND_sparc64_ieee1275_TRUE@am__append_3710 = \ -+@COND_mips_loongson_TRUE@am__append_3697 = linux.mod -+@COND_mips_loongson_TRUE@am__append_3698 = linux.marker -+@COND_sparc64_ieee1275_TRUE@am__append_3699 = linux.module -+@COND_sparc64_ieee1275_TRUE@am__append_3700 = linux.module$(EXEEXT) -+@COND_sparc64_ieee1275_TRUE@am__append_3701 = -+@COND_sparc64_ieee1275_TRUE@am__append_3702 = $(nodist_linux_module_SOURCES) -+@COND_sparc64_ieee1275_TRUE@am__append_3703 = \ - @COND_sparc64_ieee1275_TRUE@ $(nodist_linux_module_SOURCES) \ - @COND_sparc64_ieee1275_TRUE@ linux.marker --@COND_sparc64_ieee1275_TRUE@am__append_3711 = linux.mod --@COND_sparc64_ieee1275_TRUE@am__append_3712 = linux.marker --@COND_powerpc_ieee1275_TRUE@am__append_3713 = linux.module --@COND_powerpc_ieee1275_TRUE@am__append_3714 = linux.module$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__append_3715 = --@COND_powerpc_ieee1275_TRUE@am__append_3716 = $(nodist_linux_module_SOURCES) --@COND_powerpc_ieee1275_TRUE@am__append_3717 = \ -+@COND_sparc64_ieee1275_TRUE@am__append_3704 = linux.mod -+@COND_sparc64_ieee1275_TRUE@am__append_3705 = linux.marker -+@COND_powerpc_ieee1275_TRUE@am__append_3706 = linux.module -+@COND_powerpc_ieee1275_TRUE@am__append_3707 = linux.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__append_3708 = -+@COND_powerpc_ieee1275_TRUE@am__append_3709 = $(nodist_linux_module_SOURCES) -+@COND_powerpc_ieee1275_TRUE@am__append_3710 = \ - @COND_powerpc_ieee1275_TRUE@ $(nodist_linux_module_SOURCES) \ - @COND_powerpc_ieee1275_TRUE@ linux.marker --@COND_powerpc_ieee1275_TRUE@am__append_3718 = linux.mod --@COND_powerpc_ieee1275_TRUE@am__append_3719 = linux.marker --@COND_mips_arc_TRUE@am__append_3720 = linux.module --@COND_mips_arc_TRUE@am__append_3721 = linux.module$(EXEEXT) --@COND_mips_arc_TRUE@am__append_3722 = --@COND_mips_arc_TRUE@am__append_3723 = $(nodist_linux_module_SOURCES) --@COND_mips_arc_TRUE@am__append_3724 = $(nodist_linux_module_SOURCES) \ -+@COND_powerpc_ieee1275_TRUE@am__append_3711 = linux.mod -+@COND_powerpc_ieee1275_TRUE@am__append_3712 = linux.marker -+@COND_mips_arc_TRUE@am__append_3713 = linux.module -+@COND_mips_arc_TRUE@am__append_3714 = linux.module$(EXEEXT) -+@COND_mips_arc_TRUE@am__append_3715 = -+@COND_mips_arc_TRUE@am__append_3716 = $(nodist_linux_module_SOURCES) -+@COND_mips_arc_TRUE@am__append_3717 = $(nodist_linux_module_SOURCES) \ - @COND_mips_arc_TRUE@ linux.marker --@COND_mips_arc_TRUE@am__append_3725 = linux.mod --@COND_mips_arc_TRUE@am__append_3726 = linux.marker --@COND_ia64_efi_TRUE@am__append_3727 = linux.module --@COND_ia64_efi_TRUE@am__append_3728 = linux.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__append_3729 = --@COND_ia64_efi_TRUE@am__append_3730 = $(nodist_linux_module_SOURCES) --@COND_ia64_efi_TRUE@am__append_3731 = $(nodist_linux_module_SOURCES) \ -+@COND_mips_arc_TRUE@am__append_3718 = linux.mod -+@COND_mips_arc_TRUE@am__append_3719 = linux.marker -+@COND_ia64_efi_TRUE@am__append_3720 = linux.module -+@COND_ia64_efi_TRUE@am__append_3721 = linux.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__append_3722 = -+@COND_ia64_efi_TRUE@am__append_3723 = $(nodist_linux_module_SOURCES) -+@COND_ia64_efi_TRUE@am__append_3724 = $(nodist_linux_module_SOURCES) \ - @COND_ia64_efi_TRUE@ linux.marker --@COND_ia64_efi_TRUE@am__append_3732 = linux.mod --@COND_ia64_efi_TRUE@am__append_3733 = linux.marker --@COND_mips_qemu_mips_TRUE@am__append_3734 = linux.module --@COND_mips_qemu_mips_TRUE@am__append_3735 = linux.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__append_3736 = --@COND_mips_qemu_mips_TRUE@am__append_3737 = $(nodist_linux_module_SOURCES) --@COND_mips_qemu_mips_TRUE@am__append_3738 = \ -+@COND_ia64_efi_TRUE@am__append_3725 = linux.mod -+@COND_ia64_efi_TRUE@am__append_3726 = linux.marker -+@COND_mips_qemu_mips_TRUE@am__append_3727 = linux.module -+@COND_mips_qemu_mips_TRUE@am__append_3728 = linux.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__append_3729 = -+@COND_mips_qemu_mips_TRUE@am__append_3730 = $(nodist_linux_module_SOURCES) -+@COND_mips_qemu_mips_TRUE@am__append_3731 = \ - @COND_mips_qemu_mips_TRUE@ $(nodist_linux_module_SOURCES) \ - @COND_mips_qemu_mips_TRUE@ linux.marker --@COND_mips_qemu_mips_TRUE@am__append_3739 = linux.mod --@COND_mips_qemu_mips_TRUE@am__append_3740 = linux.marker --@COND_arm_uboot_TRUE@am__append_3741 = linux.module --@COND_arm_uboot_TRUE@am__append_3742 = linux.module$(EXEEXT) --@COND_arm_uboot_TRUE@am__append_3743 = --@COND_arm_uboot_TRUE@am__append_3744 = $(nodist_linux_module_SOURCES) --@COND_arm_uboot_TRUE@am__append_3745 = $(nodist_linux_module_SOURCES) \ -+@COND_mips_qemu_mips_TRUE@am__append_3732 = linux.mod -+@COND_mips_qemu_mips_TRUE@am__append_3733 = linux.marker -+@COND_arm_uboot_TRUE@am__append_3734 = linux.module -+@COND_arm_uboot_TRUE@am__append_3735 = linux.module$(EXEEXT) -+@COND_arm_uboot_TRUE@am__append_3736 = -+@COND_arm_uboot_TRUE@am__append_3737 = $(nodist_linux_module_SOURCES) -+@COND_arm_uboot_TRUE@am__append_3738 = $(nodist_linux_module_SOURCES) \ - @COND_arm_uboot_TRUE@ linux.marker --@COND_arm_uboot_TRUE@am__append_3746 = linux.mod --@COND_arm_uboot_TRUE@am__append_3747 = linux.marker --@COND_arm_efi_TRUE@am__append_3748 = linux.module --@COND_arm_efi_TRUE@am__append_3749 = linux.module$(EXEEXT) --@COND_arm_efi_TRUE@am__append_3750 = --@COND_arm_efi_TRUE@am__append_3751 = $(nodist_linux_module_SOURCES) --@COND_arm_efi_TRUE@am__append_3752 = $(nodist_linux_module_SOURCES) \ -+@COND_arm_uboot_TRUE@am__append_3739 = linux.mod -+@COND_arm_uboot_TRUE@am__append_3740 = linux.marker -+@COND_arm_efi_TRUE@am__append_3741 = linux.module -+@COND_arm_efi_TRUE@am__append_3742 = linux.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__append_3743 = -+@COND_arm_efi_TRUE@am__append_3744 = $(nodist_linux_module_SOURCES) -+@COND_arm_efi_TRUE@am__append_3745 = $(nodist_linux_module_SOURCES) \ - @COND_arm_efi_TRUE@ linux.marker --@COND_arm_efi_TRUE@am__append_3753 = linux.mod --@COND_arm_efi_TRUE@am__append_3754 = linux.marker --@COND_arm64_efi_TRUE@am__append_3755 = linux.module --@COND_arm64_efi_TRUE@am__append_3756 = linux.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__append_3757 = --@COND_arm64_efi_TRUE@am__append_3758 = $(nodist_linux_module_SOURCES) --@COND_arm64_efi_TRUE@am__append_3759 = $(nodist_linux_module_SOURCES) \ -+@COND_arm_efi_TRUE@am__append_3746 = linux.mod -+@COND_arm_efi_TRUE@am__append_3747 = linux.marker -+@COND_arm64_efi_TRUE@am__append_3748 = linux.module -+@COND_arm64_efi_TRUE@am__append_3749 = linux.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__append_3750 = -+@COND_arm64_efi_TRUE@am__append_3751 = $(nodist_linux_module_SOURCES) -+@COND_arm64_efi_TRUE@am__append_3752 = $(nodist_linux_module_SOURCES) \ - @COND_arm64_efi_TRUE@ linux.marker --@COND_arm64_efi_TRUE@am__append_3760 = linux.mod --@COND_arm64_efi_TRUE@am__append_3761 = linux.marker --@COND_arm_coreboot_TRUE@am__append_3762 = linux.module --@COND_arm_coreboot_TRUE@am__append_3763 = linux.module$(EXEEXT) --@COND_arm_coreboot_TRUE@am__append_3764 = --@COND_arm_coreboot_TRUE@am__append_3765 = $(nodist_linux_module_SOURCES) --@COND_arm_coreboot_TRUE@am__append_3766 = \ -+@COND_arm64_efi_TRUE@am__append_3753 = linux.mod -+@COND_arm64_efi_TRUE@am__append_3754 = linux.marker -+@COND_arm_coreboot_TRUE@am__append_3755 = linux.module -+@COND_arm_coreboot_TRUE@am__append_3756 = linux.module$(EXEEXT) -+@COND_arm_coreboot_TRUE@am__append_3757 = -+@COND_arm_coreboot_TRUE@am__append_3758 = $(nodist_linux_module_SOURCES) -+@COND_arm_coreboot_TRUE@am__append_3759 = \ - @COND_arm_coreboot_TRUE@ $(nodist_linux_module_SOURCES) \ - @COND_arm_coreboot_TRUE@ linux.marker --@COND_arm_coreboot_TRUE@am__append_3767 = linux.mod --@COND_arm_coreboot_TRUE@am__append_3768 = linux.marker --@COND_riscv32_efi_TRUE@am__append_3769 = linux.module --@COND_riscv32_efi_TRUE@am__append_3770 = linux.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__append_3771 = --@COND_riscv32_efi_TRUE@am__append_3772 = $(nodist_linux_module_SOURCES) --@COND_riscv32_efi_TRUE@am__append_3773 = \ -+@COND_arm_coreboot_TRUE@am__append_3760 = linux.mod -+@COND_arm_coreboot_TRUE@am__append_3761 = linux.marker -+@COND_riscv32_efi_TRUE@am__append_3762 = linux.module -+@COND_riscv32_efi_TRUE@am__append_3763 = linux.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__append_3764 = -+@COND_riscv32_efi_TRUE@am__append_3765 = $(nodist_linux_module_SOURCES) -+@COND_riscv32_efi_TRUE@am__append_3766 = \ - @COND_riscv32_efi_TRUE@ $(nodist_linux_module_SOURCES) \ - @COND_riscv32_efi_TRUE@ linux.marker --@COND_riscv32_efi_TRUE@am__append_3774 = linux.mod --@COND_riscv32_efi_TRUE@am__append_3775 = linux.marker --@COND_riscv64_efi_TRUE@am__append_3776 = linux.module --@COND_riscv64_efi_TRUE@am__append_3777 = linux.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__append_3778 = --@COND_riscv64_efi_TRUE@am__append_3779 = $(nodist_linux_module_SOURCES) --@COND_riscv64_efi_TRUE@am__append_3780 = \ -+@COND_riscv32_efi_TRUE@am__append_3767 = linux.mod -+@COND_riscv32_efi_TRUE@am__append_3768 = linux.marker -+@COND_riscv64_efi_TRUE@am__append_3769 = linux.module -+@COND_riscv64_efi_TRUE@am__append_3770 = linux.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_3771 = -+@COND_riscv64_efi_TRUE@am__append_3772 = $(nodist_linux_module_SOURCES) -+@COND_riscv64_efi_TRUE@am__append_3773 = \ - @COND_riscv64_efi_TRUE@ $(nodist_linux_module_SOURCES) \ - @COND_riscv64_efi_TRUE@ linux.marker --@COND_riscv64_efi_TRUE@am__append_3781 = linux.mod --@COND_riscv64_efi_TRUE@am__append_3782 = linux.marker --@COND_arm_uboot_TRUE@am__append_3783 = fdt.module --@COND_arm_uboot_TRUE@am__append_3784 = fdt.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_3774 = linux.mod -+@COND_riscv64_efi_TRUE@am__append_3775 = linux.marker -+@COND_arm_uboot_TRUE@am__append_3776 = fdt.module -+@COND_arm_uboot_TRUE@am__append_3777 = fdt.module$(EXEEXT) - @COND_arm64_efi_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@fdt_module_DEPENDENCIES = --@COND_arm_uboot_TRUE@am__append_3785 = --@COND_arm_uboot_TRUE@am__append_3786 = $(nodist_fdt_module_SOURCES) --@COND_arm_uboot_TRUE@am__append_3787 = $(nodist_fdt_module_SOURCES) \ -+@COND_arm_uboot_TRUE@am__append_3778 = -+@COND_arm_uboot_TRUE@am__append_3779 = $(nodist_fdt_module_SOURCES) -+@COND_arm_uboot_TRUE@am__append_3780 = $(nodist_fdt_module_SOURCES) \ - @COND_arm_uboot_TRUE@ fdt.marker --@COND_arm_uboot_TRUE@am__append_3788 = fdt.mod --@COND_arm_uboot_TRUE@am__append_3789 = fdt.marker --@COND_arm_efi_TRUE@am__append_3790 = fdt.module --@COND_arm_efi_TRUE@am__append_3791 = fdt.module$(EXEEXT) --@COND_arm_efi_TRUE@am__append_3792 = --@COND_arm_efi_TRUE@am__append_3793 = $(nodist_fdt_module_SOURCES) --@COND_arm_efi_TRUE@am__append_3794 = $(nodist_fdt_module_SOURCES) \ -+@COND_arm_uboot_TRUE@am__append_3781 = fdt.mod -+@COND_arm_uboot_TRUE@am__append_3782 = fdt.marker -+@COND_arm_efi_TRUE@am__append_3783 = fdt.module -+@COND_arm_efi_TRUE@am__append_3784 = fdt.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__append_3785 = -+@COND_arm_efi_TRUE@am__append_3786 = $(nodist_fdt_module_SOURCES) -+@COND_arm_efi_TRUE@am__append_3787 = $(nodist_fdt_module_SOURCES) \ - @COND_arm_efi_TRUE@ fdt.marker --@COND_arm_efi_TRUE@am__append_3795 = fdt.mod --@COND_arm_efi_TRUE@am__append_3796 = fdt.marker --@COND_arm64_efi_TRUE@am__append_3797 = fdt.module --@COND_arm64_efi_TRUE@am__append_3798 = fdt.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__append_3799 = --@COND_arm64_efi_TRUE@am__append_3800 = $(nodist_fdt_module_SOURCES) --@COND_arm64_efi_TRUE@am__append_3801 = $(nodist_fdt_module_SOURCES) \ -+@COND_arm_efi_TRUE@am__append_3788 = fdt.mod -+@COND_arm_efi_TRUE@am__append_3789 = fdt.marker -+@COND_arm64_efi_TRUE@am__append_3790 = fdt.module -+@COND_arm64_efi_TRUE@am__append_3791 = fdt.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__append_3792 = -+@COND_arm64_efi_TRUE@am__append_3793 = $(nodist_fdt_module_SOURCES) -+@COND_arm64_efi_TRUE@am__append_3794 = $(nodist_fdt_module_SOURCES) \ - @COND_arm64_efi_TRUE@ fdt.marker --@COND_arm64_efi_TRUE@am__append_3802 = fdt.mod --@COND_arm64_efi_TRUE@am__append_3803 = fdt.marker --@COND_riscv32_efi_TRUE@am__append_3804 = fdt.module --@COND_riscv32_efi_TRUE@am__append_3805 = fdt.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__append_3806 = --@COND_riscv32_efi_TRUE@am__append_3807 = $(nodist_fdt_module_SOURCES) --@COND_riscv32_efi_TRUE@am__append_3808 = $(nodist_fdt_module_SOURCES) \ -+@COND_arm64_efi_TRUE@am__append_3795 = fdt.mod -+@COND_arm64_efi_TRUE@am__append_3796 = fdt.marker -+@COND_riscv32_efi_TRUE@am__append_3797 = fdt.module -+@COND_riscv32_efi_TRUE@am__append_3798 = fdt.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__append_3799 = -+@COND_riscv32_efi_TRUE@am__append_3800 = $(nodist_fdt_module_SOURCES) -+@COND_riscv32_efi_TRUE@am__append_3801 = $(nodist_fdt_module_SOURCES) \ - @COND_riscv32_efi_TRUE@ fdt.marker --@COND_riscv32_efi_TRUE@am__append_3809 = fdt.mod --@COND_riscv32_efi_TRUE@am__append_3810 = fdt.marker --@COND_riscv64_efi_TRUE@am__append_3811 = fdt.module --@COND_riscv64_efi_TRUE@am__append_3812 = fdt.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__append_3813 = --@COND_riscv64_efi_TRUE@am__append_3814 = $(nodist_fdt_module_SOURCES) --@COND_riscv64_efi_TRUE@am__append_3815 = $(nodist_fdt_module_SOURCES) \ -+@COND_riscv32_efi_TRUE@am__append_3802 = fdt.mod -+@COND_riscv32_efi_TRUE@am__append_3803 = fdt.marker -+@COND_riscv64_efi_TRUE@am__append_3804 = fdt.module -+@COND_riscv64_efi_TRUE@am__append_3805 = fdt.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_3806 = -+@COND_riscv64_efi_TRUE@am__append_3807 = $(nodist_fdt_module_SOURCES) -+@COND_riscv64_efi_TRUE@am__append_3808 = $(nodist_fdt_module_SOURCES) \ - @COND_riscv64_efi_TRUE@ fdt.marker --@COND_riscv64_efi_TRUE@am__append_3816 = fdt.mod --@COND_riscv64_efi_TRUE@am__append_3817 = fdt.marker --@COND_i386_pc_TRUE@am__append_3818 = xnu.module --@COND_i386_pc_TRUE@am__append_3819 = xnu.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_3809 = fdt.mod -+@COND_riscv64_efi_TRUE@am__append_3810 = fdt.marker -+@COND_i386_pc_TRUE@am__append_3811 = xnu.module -+@COND_i386_pc_TRUE@am__append_3812 = xnu.module$(EXEEXT) - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_x86_64_efi_FALSE@xnu_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_3820 = --@COND_i386_pc_TRUE@am__append_3821 = $(nodist_xnu_module_SOURCES) --@COND_i386_pc_TRUE@am__append_3822 = $(nodist_xnu_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_3813 = -+@COND_i386_pc_TRUE@am__append_3814 = $(nodist_xnu_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_3815 = $(nodist_xnu_module_SOURCES) \ - @COND_i386_pc_TRUE@ xnu.marker --@COND_i386_pc_TRUE@am__append_3823 = xnu.mod --@COND_i386_pc_TRUE@am__append_3824 = xnu.marker --@COND_i386_efi_TRUE@am__append_3825 = xnu.module --@COND_i386_efi_TRUE@am__append_3826 = xnu.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_3827 = --@COND_i386_efi_TRUE@am__append_3828 = $(nodist_xnu_module_SOURCES) --@COND_i386_efi_TRUE@am__append_3829 = $(nodist_xnu_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_3816 = xnu.mod -+@COND_i386_pc_TRUE@am__append_3817 = xnu.marker -+@COND_i386_efi_TRUE@am__append_3818 = xnu.module -+@COND_i386_efi_TRUE@am__append_3819 = xnu.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_3820 = -+@COND_i386_efi_TRUE@am__append_3821 = $(nodist_xnu_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_3822 = $(nodist_xnu_module_SOURCES) \ - @COND_i386_efi_TRUE@ xnu.marker --@COND_i386_efi_TRUE@am__append_3830 = xnu.mod --@COND_i386_efi_TRUE@am__append_3831 = xnu.marker --@COND_i386_coreboot_TRUE@am__append_3832 = xnu.module --@COND_i386_coreboot_TRUE@am__append_3833 = xnu.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_3834 = --@COND_i386_coreboot_TRUE@am__append_3835 = $(nodist_xnu_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_3836 = \ -+@COND_i386_efi_TRUE@am__append_3823 = xnu.mod -+@COND_i386_efi_TRUE@am__append_3824 = xnu.marker -+@COND_i386_coreboot_TRUE@am__append_3825 = xnu.module -+@COND_i386_coreboot_TRUE@am__append_3826 = xnu.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_3827 = -+@COND_i386_coreboot_TRUE@am__append_3828 = $(nodist_xnu_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_3829 = \ - @COND_i386_coreboot_TRUE@ $(nodist_xnu_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ xnu.marker --@COND_i386_coreboot_TRUE@am__append_3837 = xnu.mod --@COND_i386_coreboot_TRUE@am__append_3838 = xnu.marker --@COND_i386_multiboot_TRUE@am__append_3839 = xnu.module --@COND_i386_multiboot_TRUE@am__append_3840 = xnu.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_3841 = --@COND_i386_multiboot_TRUE@am__append_3842 = $(nodist_xnu_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_3843 = \ -+@COND_i386_coreboot_TRUE@am__append_3830 = xnu.mod -+@COND_i386_coreboot_TRUE@am__append_3831 = xnu.marker -+@COND_i386_multiboot_TRUE@am__append_3832 = xnu.module -+@COND_i386_multiboot_TRUE@am__append_3833 = xnu.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_3834 = -+@COND_i386_multiboot_TRUE@am__append_3835 = $(nodist_xnu_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_3836 = \ - @COND_i386_multiboot_TRUE@ $(nodist_xnu_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ xnu.marker --@COND_i386_multiboot_TRUE@am__append_3844 = xnu.mod --@COND_i386_multiboot_TRUE@am__append_3845 = xnu.marker --@COND_x86_64_efi_TRUE@am__append_3846 = xnu.module --@COND_x86_64_efi_TRUE@am__append_3847 = xnu.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_3848 = --@COND_x86_64_efi_TRUE@am__append_3849 = $(nodist_xnu_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_3850 = $(nodist_xnu_module_SOURCES) \ -+@COND_i386_multiboot_TRUE@am__append_3837 = xnu.mod -+@COND_i386_multiboot_TRUE@am__append_3838 = xnu.marker -+@COND_x86_64_efi_TRUE@am__append_3839 = xnu.module -+@COND_x86_64_efi_TRUE@am__append_3840 = xnu.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_3841 = -+@COND_x86_64_efi_TRUE@am__append_3842 = $(nodist_xnu_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_3843 = $(nodist_xnu_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ xnu.marker --@COND_x86_64_efi_TRUE@am__append_3851 = xnu.mod --@COND_x86_64_efi_TRUE@am__append_3852 = xnu.marker --@COND_i386_pc_TRUE@am__append_3853 = random.module --@COND_i386_pc_TRUE@am__append_3854 = random.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_3844 = xnu.mod -+@COND_x86_64_efi_TRUE@am__append_3845 = xnu.marker -+@COND_i386_pc_TRUE@am__append_3846 = random.module -+@COND_i386_pc_TRUE@am__append_3847 = random.module$(EXEEXT) - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_x86_64_efi_FALSE@random_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_3855 = --@COND_i386_pc_TRUE@am__append_3856 = $(nodist_random_module_SOURCES) --@COND_i386_pc_TRUE@am__append_3857 = $(nodist_random_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_3848 = -+@COND_i386_pc_TRUE@am__append_3849 = $(nodist_random_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_3850 = $(nodist_random_module_SOURCES) \ - @COND_i386_pc_TRUE@ random.marker --@COND_i386_pc_TRUE@am__append_3858 = random.mod --@COND_i386_pc_TRUE@am__append_3859 = random.marker --@COND_i386_efi_TRUE@am__append_3860 = random.module --@COND_i386_efi_TRUE@am__append_3861 = random.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_3862 = --@COND_i386_efi_TRUE@am__append_3863 = $(nodist_random_module_SOURCES) --@COND_i386_efi_TRUE@am__append_3864 = $(nodist_random_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_3851 = random.mod -+@COND_i386_pc_TRUE@am__append_3852 = random.marker -+@COND_i386_efi_TRUE@am__append_3853 = random.module -+@COND_i386_efi_TRUE@am__append_3854 = random.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_3855 = -+@COND_i386_efi_TRUE@am__append_3856 = $(nodist_random_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_3857 = $(nodist_random_module_SOURCES) \ - @COND_i386_efi_TRUE@ random.marker --@COND_i386_efi_TRUE@am__append_3865 = random.mod --@COND_i386_efi_TRUE@am__append_3866 = random.marker --@COND_i386_coreboot_TRUE@am__append_3867 = random.module --@COND_i386_coreboot_TRUE@am__append_3868 = random.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_3869 = --@COND_i386_coreboot_TRUE@am__append_3870 = $(nodist_random_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_3871 = \ -+@COND_i386_efi_TRUE@am__append_3858 = random.mod -+@COND_i386_efi_TRUE@am__append_3859 = random.marker -+@COND_i386_coreboot_TRUE@am__append_3860 = random.module -+@COND_i386_coreboot_TRUE@am__append_3861 = random.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_3862 = -+@COND_i386_coreboot_TRUE@am__append_3863 = $(nodist_random_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_3864 = \ - @COND_i386_coreboot_TRUE@ $(nodist_random_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ random.marker --@COND_i386_coreboot_TRUE@am__append_3872 = random.mod --@COND_i386_coreboot_TRUE@am__append_3873 = random.marker --@COND_i386_multiboot_TRUE@am__append_3874 = random.module --@COND_i386_multiboot_TRUE@am__append_3875 = random.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_3876 = --@COND_i386_multiboot_TRUE@am__append_3877 = $(nodist_random_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_3878 = \ -+@COND_i386_coreboot_TRUE@am__append_3865 = random.mod -+@COND_i386_coreboot_TRUE@am__append_3866 = random.marker -+@COND_i386_multiboot_TRUE@am__append_3867 = random.module -+@COND_i386_multiboot_TRUE@am__append_3868 = random.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_3869 = -+@COND_i386_multiboot_TRUE@am__append_3870 = $(nodist_random_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_3871 = \ - @COND_i386_multiboot_TRUE@ $(nodist_random_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ random.marker --@COND_i386_multiboot_TRUE@am__append_3879 = random.mod --@COND_i386_multiboot_TRUE@am__append_3880 = random.marker --@COND_x86_64_efi_TRUE@am__append_3881 = random.module --@COND_x86_64_efi_TRUE@am__append_3882 = random.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_3883 = --@COND_x86_64_efi_TRUE@am__append_3884 = $(nodist_random_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_3885 = \ -+@COND_i386_multiboot_TRUE@am__append_3872 = random.mod -+@COND_i386_multiboot_TRUE@am__append_3873 = random.marker -+@COND_x86_64_efi_TRUE@am__append_3874 = random.module -+@COND_x86_64_efi_TRUE@am__append_3875 = random.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_3876 = -+@COND_x86_64_efi_TRUE@am__append_3877 = $(nodist_random_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_3878 = \ - @COND_x86_64_efi_TRUE@ $(nodist_random_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ random.marker --@COND_x86_64_efi_TRUE@am__append_3886 = random.mod --@COND_x86_64_efi_TRUE@am__append_3887 = random.marker --@COND_i386_efi_TRUE@am__append_3888 = appleldr.module --@COND_i386_efi_TRUE@am__append_3889 = appleldr.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_3879 = random.mod -+@COND_x86_64_efi_TRUE@am__append_3880 = random.marker -+@COND_i386_efi_TRUE@am__append_3881 = appleldr.module -+@COND_i386_efi_TRUE@am__append_3882 = appleldr.module$(EXEEXT) - @COND_i386_efi_FALSE@@COND_x86_64_efi_FALSE@appleldr_module_DEPENDENCIES = --@COND_i386_efi_TRUE@am__append_3890 = --@COND_i386_efi_TRUE@am__append_3891 = $(nodist_appleldr_module_SOURCES) --@COND_i386_efi_TRUE@am__append_3892 = \ -+@COND_i386_efi_TRUE@am__append_3883 = -+@COND_i386_efi_TRUE@am__append_3884 = $(nodist_appleldr_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_3885 = \ - @COND_i386_efi_TRUE@ $(nodist_appleldr_module_SOURCES) \ - @COND_i386_efi_TRUE@ appleldr.marker --@COND_i386_efi_TRUE@am__append_3893 = appleldr.mod --@COND_i386_efi_TRUE@am__append_3894 = appleldr.marker --@COND_x86_64_efi_TRUE@am__append_3895 = appleldr.module --@COND_x86_64_efi_TRUE@am__append_3896 = appleldr.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_3897 = --@COND_x86_64_efi_TRUE@am__append_3898 = $(nodist_appleldr_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_3899 = \ -+@COND_i386_efi_TRUE@am__append_3886 = appleldr.mod -+@COND_i386_efi_TRUE@am__append_3887 = appleldr.marker -+@COND_x86_64_efi_TRUE@am__append_3888 = appleldr.module -+@COND_x86_64_efi_TRUE@am__append_3889 = appleldr.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_3890 = -+@COND_x86_64_efi_TRUE@am__append_3891 = $(nodist_appleldr_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_3892 = \ - @COND_x86_64_efi_TRUE@ $(nodist_appleldr_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ appleldr.marker --@COND_x86_64_efi_TRUE@am__append_3900 = appleldr.mod --@COND_x86_64_efi_TRUE@am__append_3901 = appleldr.marker --@COND_i386_pc_TRUE@am__append_3902 = chain.module --@COND_i386_pc_TRUE@am__append_3903 = chain.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_3893 = appleldr.mod -+@COND_x86_64_efi_TRUE@am__append_3894 = appleldr.marker -+@COND_i386_pc_TRUE@am__append_3895 = chain.module -+@COND_i386_pc_TRUE@am__append_3896 = chain.module$(EXEEXT) - @COND_arm64_efi_FALSE@@COND_arm_efi_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_pc_FALSE@@COND_ia64_efi_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_x86_64_efi_FALSE@chain_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_3904 = --@COND_i386_pc_TRUE@am__append_3905 = $(nodist_chain_module_SOURCES) --@COND_i386_pc_TRUE@am__append_3906 = $(nodist_chain_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_3897 = -+@COND_i386_pc_TRUE@am__append_3898 = $(nodist_chain_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_3899 = $(nodist_chain_module_SOURCES) \ - @COND_i386_pc_TRUE@ chain.marker --@COND_i386_pc_TRUE@am__append_3907 = chain.mod --@COND_i386_pc_TRUE@am__append_3908 = chain.marker --@COND_i386_efi_TRUE@am__append_3909 = chain.module --@COND_i386_efi_TRUE@am__append_3910 = chain.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_3911 = --@COND_i386_efi_TRUE@am__append_3912 = $(nodist_chain_module_SOURCES) --@COND_i386_efi_TRUE@am__append_3913 = $(nodist_chain_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_3900 = chain.mod -+@COND_i386_pc_TRUE@am__append_3901 = chain.marker -+@COND_i386_efi_TRUE@am__append_3902 = chain.module -+@COND_i386_efi_TRUE@am__append_3903 = chain.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_3904 = -+@COND_i386_efi_TRUE@am__append_3905 = $(nodist_chain_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_3906 = $(nodist_chain_module_SOURCES) \ - @COND_i386_efi_TRUE@ chain.marker --@COND_i386_efi_TRUE@am__append_3914 = chain.mod --@COND_i386_efi_TRUE@am__append_3915 = chain.marker --@COND_i386_coreboot_TRUE@am__append_3916 = chain.module --@COND_i386_coreboot_TRUE@am__append_3917 = chain.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_3918 = --@COND_i386_coreboot_TRUE@am__append_3919 = $(nodist_chain_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_3920 = \ -+@COND_i386_efi_TRUE@am__append_3907 = chain.mod -+@COND_i386_efi_TRUE@am__append_3908 = chain.marker -+@COND_i386_coreboot_TRUE@am__append_3909 = chain.module -+@COND_i386_coreboot_TRUE@am__append_3910 = chain.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_3911 = -+@COND_i386_coreboot_TRUE@am__append_3912 = $(nodist_chain_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_3913 = \ - @COND_i386_coreboot_TRUE@ $(nodist_chain_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ chain.marker --@COND_i386_coreboot_TRUE@am__append_3921 = chain.mod --@COND_i386_coreboot_TRUE@am__append_3922 = chain.marker --@COND_x86_64_efi_TRUE@am__append_3923 = chain.module --@COND_x86_64_efi_TRUE@am__append_3924 = chain.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_3925 = --@COND_x86_64_efi_TRUE@am__append_3926 = $(nodist_chain_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_3927 = \ -+@COND_i386_coreboot_TRUE@am__append_3914 = chain.mod -+@COND_i386_coreboot_TRUE@am__append_3915 = chain.marker -+@COND_x86_64_efi_TRUE@am__append_3916 = chain.module -+@COND_x86_64_efi_TRUE@am__append_3917 = chain.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_3918 = -+@COND_x86_64_efi_TRUE@am__append_3919 = $(nodist_chain_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_3920 = \ - @COND_x86_64_efi_TRUE@ $(nodist_chain_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ chain.marker --@COND_x86_64_efi_TRUE@am__append_3928 = chain.mod --@COND_x86_64_efi_TRUE@am__append_3929 = chain.marker --@COND_ia64_efi_TRUE@am__append_3930 = chain.module --@COND_ia64_efi_TRUE@am__append_3931 = chain.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__append_3932 = --@COND_ia64_efi_TRUE@am__append_3933 = $(nodist_chain_module_SOURCES) --@COND_ia64_efi_TRUE@am__append_3934 = $(nodist_chain_module_SOURCES) \ -+@COND_x86_64_efi_TRUE@am__append_3921 = chain.mod -+@COND_x86_64_efi_TRUE@am__append_3922 = chain.marker -+@COND_ia64_efi_TRUE@am__append_3923 = chain.module -+@COND_ia64_efi_TRUE@am__append_3924 = chain.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__append_3925 = -+@COND_ia64_efi_TRUE@am__append_3926 = $(nodist_chain_module_SOURCES) -+@COND_ia64_efi_TRUE@am__append_3927 = $(nodist_chain_module_SOURCES) \ - @COND_ia64_efi_TRUE@ chain.marker --@COND_ia64_efi_TRUE@am__append_3935 = chain.mod --@COND_ia64_efi_TRUE@am__append_3936 = chain.marker --@COND_arm_efi_TRUE@am__append_3937 = chain.module --@COND_arm_efi_TRUE@am__append_3938 = chain.module$(EXEEXT) --@COND_arm_efi_TRUE@am__append_3939 = --@COND_arm_efi_TRUE@am__append_3940 = $(nodist_chain_module_SOURCES) --@COND_arm_efi_TRUE@am__append_3941 = $(nodist_chain_module_SOURCES) \ -+@COND_ia64_efi_TRUE@am__append_3928 = chain.mod -+@COND_ia64_efi_TRUE@am__append_3929 = chain.marker -+@COND_arm_efi_TRUE@am__append_3930 = chain.module -+@COND_arm_efi_TRUE@am__append_3931 = chain.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__append_3932 = -+@COND_arm_efi_TRUE@am__append_3933 = $(nodist_chain_module_SOURCES) -+@COND_arm_efi_TRUE@am__append_3934 = $(nodist_chain_module_SOURCES) \ - @COND_arm_efi_TRUE@ chain.marker --@COND_arm_efi_TRUE@am__append_3942 = chain.mod --@COND_arm_efi_TRUE@am__append_3943 = chain.marker --@COND_arm64_efi_TRUE@am__append_3944 = chain.module --@COND_arm64_efi_TRUE@am__append_3945 = chain.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__append_3946 = --@COND_arm64_efi_TRUE@am__append_3947 = $(nodist_chain_module_SOURCES) --@COND_arm64_efi_TRUE@am__append_3948 = $(nodist_chain_module_SOURCES) \ -+@COND_arm_efi_TRUE@am__append_3935 = chain.mod -+@COND_arm_efi_TRUE@am__append_3936 = chain.marker -+@COND_arm64_efi_TRUE@am__append_3937 = chain.module -+@COND_arm64_efi_TRUE@am__append_3938 = chain.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__append_3939 = -+@COND_arm64_efi_TRUE@am__append_3940 = $(nodist_chain_module_SOURCES) -+@COND_arm64_efi_TRUE@am__append_3941 = $(nodist_chain_module_SOURCES) \ - @COND_arm64_efi_TRUE@ chain.marker --@COND_arm64_efi_TRUE@am__append_3949 = chain.mod --@COND_arm64_efi_TRUE@am__append_3950 = chain.marker --@COND_riscv32_efi_TRUE@am__append_3951 = chain.module --@COND_riscv32_efi_TRUE@am__append_3952 = chain.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__append_3953 = --@COND_riscv32_efi_TRUE@am__append_3954 = $(nodist_chain_module_SOURCES) --@COND_riscv32_efi_TRUE@am__append_3955 = \ -+@COND_arm64_efi_TRUE@am__append_3942 = chain.mod -+@COND_arm64_efi_TRUE@am__append_3943 = chain.marker -+@COND_riscv32_efi_TRUE@am__append_3944 = chain.module -+@COND_riscv32_efi_TRUE@am__append_3945 = chain.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__append_3946 = -+@COND_riscv32_efi_TRUE@am__append_3947 = $(nodist_chain_module_SOURCES) -+@COND_riscv32_efi_TRUE@am__append_3948 = \ - @COND_riscv32_efi_TRUE@ $(nodist_chain_module_SOURCES) \ - @COND_riscv32_efi_TRUE@ chain.marker --@COND_riscv32_efi_TRUE@am__append_3956 = chain.mod --@COND_riscv32_efi_TRUE@am__append_3957 = chain.marker --@COND_riscv64_efi_TRUE@am__append_3958 = chain.module --@COND_riscv64_efi_TRUE@am__append_3959 = chain.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__append_3960 = --@COND_riscv64_efi_TRUE@am__append_3961 = $(nodist_chain_module_SOURCES) --@COND_riscv64_efi_TRUE@am__append_3962 = \ -+@COND_riscv32_efi_TRUE@am__append_3949 = chain.mod -+@COND_riscv32_efi_TRUE@am__append_3950 = chain.marker -+@COND_riscv64_efi_TRUE@am__append_3951 = chain.module -+@COND_riscv64_efi_TRUE@am__append_3952 = chain.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_3953 = -+@COND_riscv64_efi_TRUE@am__append_3954 = $(nodist_chain_module_SOURCES) -+@COND_riscv64_efi_TRUE@am__append_3955 = \ - @COND_riscv64_efi_TRUE@ $(nodist_chain_module_SOURCES) \ - @COND_riscv64_efi_TRUE@ chain.marker --@COND_riscv64_efi_TRUE@am__append_3963 = chain.mod --@COND_riscv64_efi_TRUE@am__append_3964 = chain.marker --@COND_i386_pc_TRUE@am__append_3965 = mmap.module --@COND_i386_pc_TRUE@am__append_3966 = mmap.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_3956 = chain.mod -+@COND_riscv64_efi_TRUE@am__append_3957 = chain.marker -+@COND_i386_pc_TRUE@am__append_3958 = mmap.module -+@COND_i386_pc_TRUE@am__append_3959 = mmap.module$(EXEEXT) - @COND_arm64_efi_FALSE@@COND_arm_efi_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_x86_64_efi_FALSE@mmap_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_3967 = --@COND_i386_pc_TRUE@am__append_3968 = $(nodist_mmap_module_SOURCES) --@COND_i386_pc_TRUE@am__append_3969 = $(nodist_mmap_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_3960 = -+@COND_i386_pc_TRUE@am__append_3961 = $(nodist_mmap_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_3962 = $(nodist_mmap_module_SOURCES) \ - @COND_i386_pc_TRUE@ mmap.marker --@COND_i386_pc_TRUE@am__append_3970 = mmap.mod --@COND_i386_pc_TRUE@am__append_3971 = mmap.marker --@COND_i386_efi_TRUE@am__append_3972 = mmap.module --@COND_i386_efi_TRUE@am__append_3973 = mmap.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_3974 = --@COND_i386_efi_TRUE@am__append_3975 = $(nodist_mmap_module_SOURCES) --@COND_i386_efi_TRUE@am__append_3976 = $(nodist_mmap_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_3963 = mmap.mod -+@COND_i386_pc_TRUE@am__append_3964 = mmap.marker -+@COND_i386_efi_TRUE@am__append_3965 = mmap.module -+@COND_i386_efi_TRUE@am__append_3966 = mmap.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_3967 = -+@COND_i386_efi_TRUE@am__append_3968 = $(nodist_mmap_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_3969 = $(nodist_mmap_module_SOURCES) \ - @COND_i386_efi_TRUE@ mmap.marker --@COND_i386_efi_TRUE@am__append_3977 = mmap.mod --@COND_i386_efi_TRUE@am__append_3978 = mmap.marker --@COND_i386_qemu_TRUE@am__append_3979 = mmap.module --@COND_i386_qemu_TRUE@am__append_3980 = mmap.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_3981 = --@COND_i386_qemu_TRUE@am__append_3982 = $(nodist_mmap_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_3983 = $(nodist_mmap_module_SOURCES) \ -+@COND_i386_efi_TRUE@am__append_3970 = mmap.mod -+@COND_i386_efi_TRUE@am__append_3971 = mmap.marker -+@COND_i386_qemu_TRUE@am__append_3972 = mmap.module -+@COND_i386_qemu_TRUE@am__append_3973 = mmap.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_3974 = -+@COND_i386_qemu_TRUE@am__append_3975 = $(nodist_mmap_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_3976 = $(nodist_mmap_module_SOURCES) \ - @COND_i386_qemu_TRUE@ mmap.marker --@COND_i386_qemu_TRUE@am__append_3984 = mmap.mod --@COND_i386_qemu_TRUE@am__append_3985 = mmap.marker --@COND_i386_coreboot_TRUE@am__append_3986 = mmap.module --@COND_i386_coreboot_TRUE@am__append_3987 = mmap.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_3988 = --@COND_i386_coreboot_TRUE@am__append_3989 = $(nodist_mmap_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_3990 = \ -+@COND_i386_qemu_TRUE@am__append_3977 = mmap.mod -+@COND_i386_qemu_TRUE@am__append_3978 = mmap.marker -+@COND_i386_coreboot_TRUE@am__append_3979 = mmap.module -+@COND_i386_coreboot_TRUE@am__append_3980 = mmap.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_3981 = -+@COND_i386_coreboot_TRUE@am__append_3982 = $(nodist_mmap_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_3983 = \ - @COND_i386_coreboot_TRUE@ $(nodist_mmap_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ mmap.marker --@COND_i386_coreboot_TRUE@am__append_3991 = mmap.mod --@COND_i386_coreboot_TRUE@am__append_3992 = mmap.marker --@COND_i386_multiboot_TRUE@am__append_3993 = mmap.module --@COND_i386_multiboot_TRUE@am__append_3994 = mmap.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_3995 = --@COND_i386_multiboot_TRUE@am__append_3996 = $(nodist_mmap_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_3997 = \ -+@COND_i386_coreboot_TRUE@am__append_3984 = mmap.mod -+@COND_i386_coreboot_TRUE@am__append_3985 = mmap.marker -+@COND_i386_multiboot_TRUE@am__append_3986 = mmap.module -+@COND_i386_multiboot_TRUE@am__append_3987 = mmap.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_3988 = -+@COND_i386_multiboot_TRUE@am__append_3989 = $(nodist_mmap_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_3990 = \ - @COND_i386_multiboot_TRUE@ $(nodist_mmap_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ mmap.marker --@COND_i386_multiboot_TRUE@am__append_3998 = mmap.mod --@COND_i386_multiboot_TRUE@am__append_3999 = mmap.marker --@COND_i386_ieee1275_TRUE@am__append_4000 = mmap.module --@COND_i386_ieee1275_TRUE@am__append_4001 = mmap.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_4002 = --@COND_i386_ieee1275_TRUE@am__append_4003 = $(nodist_mmap_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_4004 = \ -+@COND_i386_multiboot_TRUE@am__append_3991 = mmap.mod -+@COND_i386_multiboot_TRUE@am__append_3992 = mmap.marker -+@COND_i386_ieee1275_TRUE@am__append_3993 = mmap.module -+@COND_i386_ieee1275_TRUE@am__append_3994 = mmap.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_3995 = -+@COND_i386_ieee1275_TRUE@am__append_3996 = $(nodist_mmap_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_3997 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_mmap_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ mmap.marker --@COND_i386_ieee1275_TRUE@am__append_4005 = mmap.mod --@COND_i386_ieee1275_TRUE@am__append_4006 = mmap.marker --@COND_x86_64_efi_TRUE@am__append_4007 = mmap.module --@COND_x86_64_efi_TRUE@am__append_4008 = mmap.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_4009 = --@COND_x86_64_efi_TRUE@am__append_4010 = $(nodist_mmap_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_4011 = $(nodist_mmap_module_SOURCES) \ -+@COND_i386_ieee1275_TRUE@am__append_3998 = mmap.mod -+@COND_i386_ieee1275_TRUE@am__append_3999 = mmap.marker -+@COND_x86_64_efi_TRUE@am__append_4000 = mmap.module -+@COND_x86_64_efi_TRUE@am__append_4001 = mmap.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_4002 = -+@COND_x86_64_efi_TRUE@am__append_4003 = $(nodist_mmap_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_4004 = $(nodist_mmap_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ mmap.marker --@COND_x86_64_efi_TRUE@am__append_4012 = mmap.mod --@COND_x86_64_efi_TRUE@am__append_4013 = mmap.marker --@COND_i386_xen_pvh_TRUE@am__append_4014 = mmap.module --@COND_i386_xen_pvh_TRUE@am__append_4015 = mmap.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__append_4016 = --@COND_i386_xen_pvh_TRUE@am__append_4017 = $(nodist_mmap_module_SOURCES) --@COND_i386_xen_pvh_TRUE@am__append_4018 = \ -+@COND_x86_64_efi_TRUE@am__append_4005 = mmap.mod -+@COND_x86_64_efi_TRUE@am__append_4006 = mmap.marker -+@COND_i386_xen_pvh_TRUE@am__append_4007 = mmap.module -+@COND_i386_xen_pvh_TRUE@am__append_4008 = mmap.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__append_4009 = -+@COND_i386_xen_pvh_TRUE@am__append_4010 = $(nodist_mmap_module_SOURCES) -+@COND_i386_xen_pvh_TRUE@am__append_4011 = \ - @COND_i386_xen_pvh_TRUE@ $(nodist_mmap_module_SOURCES) \ - @COND_i386_xen_pvh_TRUE@ mmap.marker --@COND_i386_xen_pvh_TRUE@am__append_4019 = mmap.mod --@COND_i386_xen_pvh_TRUE@am__append_4020 = mmap.marker --@COND_mips_loongson_TRUE@am__append_4021 = mmap.module --@COND_mips_loongson_TRUE@am__append_4022 = mmap.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__append_4023 = --@COND_mips_loongson_TRUE@am__append_4024 = $(nodist_mmap_module_SOURCES) --@COND_mips_loongson_TRUE@am__append_4025 = \ -+@COND_i386_xen_pvh_TRUE@am__append_4012 = mmap.mod -+@COND_i386_xen_pvh_TRUE@am__append_4013 = mmap.marker -+@COND_mips_loongson_TRUE@am__append_4014 = mmap.module -+@COND_mips_loongson_TRUE@am__append_4015 = mmap.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__append_4016 = -+@COND_mips_loongson_TRUE@am__append_4017 = $(nodist_mmap_module_SOURCES) -+@COND_mips_loongson_TRUE@am__append_4018 = \ - @COND_mips_loongson_TRUE@ $(nodist_mmap_module_SOURCES) \ - @COND_mips_loongson_TRUE@ mmap.marker --@COND_mips_loongson_TRUE@am__append_4026 = mmap.mod --@COND_mips_loongson_TRUE@am__append_4027 = mmap.marker --@COND_mips_arc_TRUE@am__append_4028 = mmap.module --@COND_mips_arc_TRUE@am__append_4029 = mmap.module$(EXEEXT) --@COND_mips_arc_TRUE@am__append_4030 = --@COND_mips_arc_TRUE@am__append_4031 = $(nodist_mmap_module_SOURCES) --@COND_mips_arc_TRUE@am__append_4032 = $(nodist_mmap_module_SOURCES) \ -+@COND_mips_loongson_TRUE@am__append_4019 = mmap.mod -+@COND_mips_loongson_TRUE@am__append_4020 = mmap.marker -+@COND_mips_arc_TRUE@am__append_4021 = mmap.module -+@COND_mips_arc_TRUE@am__append_4022 = mmap.module$(EXEEXT) -+@COND_mips_arc_TRUE@am__append_4023 = -+@COND_mips_arc_TRUE@am__append_4024 = $(nodist_mmap_module_SOURCES) -+@COND_mips_arc_TRUE@am__append_4025 = $(nodist_mmap_module_SOURCES) \ - @COND_mips_arc_TRUE@ mmap.marker --@COND_mips_arc_TRUE@am__append_4033 = mmap.mod --@COND_mips_arc_TRUE@am__append_4034 = mmap.marker --@COND_ia64_efi_TRUE@am__append_4035 = mmap.module --@COND_ia64_efi_TRUE@am__append_4036 = mmap.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__append_4037 = --@COND_ia64_efi_TRUE@am__append_4038 = $(nodist_mmap_module_SOURCES) --@COND_ia64_efi_TRUE@am__append_4039 = $(nodist_mmap_module_SOURCES) \ -+@COND_mips_arc_TRUE@am__append_4026 = mmap.mod -+@COND_mips_arc_TRUE@am__append_4027 = mmap.marker -+@COND_ia64_efi_TRUE@am__append_4028 = mmap.module -+@COND_ia64_efi_TRUE@am__append_4029 = mmap.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__append_4030 = -+@COND_ia64_efi_TRUE@am__append_4031 = $(nodist_mmap_module_SOURCES) -+@COND_ia64_efi_TRUE@am__append_4032 = $(nodist_mmap_module_SOURCES) \ - @COND_ia64_efi_TRUE@ mmap.marker --@COND_ia64_efi_TRUE@am__append_4040 = mmap.mod --@COND_ia64_efi_TRUE@am__append_4041 = mmap.marker --@COND_mips_qemu_mips_TRUE@am__append_4042 = mmap.module --@COND_mips_qemu_mips_TRUE@am__append_4043 = mmap.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__append_4044 = --@COND_mips_qemu_mips_TRUE@am__append_4045 = $(nodist_mmap_module_SOURCES) --@COND_mips_qemu_mips_TRUE@am__append_4046 = \ -+@COND_ia64_efi_TRUE@am__append_4033 = mmap.mod -+@COND_ia64_efi_TRUE@am__append_4034 = mmap.marker -+@COND_mips_qemu_mips_TRUE@am__append_4035 = mmap.module -+@COND_mips_qemu_mips_TRUE@am__append_4036 = mmap.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__append_4037 = -+@COND_mips_qemu_mips_TRUE@am__append_4038 = $(nodist_mmap_module_SOURCES) -+@COND_mips_qemu_mips_TRUE@am__append_4039 = \ - @COND_mips_qemu_mips_TRUE@ $(nodist_mmap_module_SOURCES) \ - @COND_mips_qemu_mips_TRUE@ mmap.marker --@COND_mips_qemu_mips_TRUE@am__append_4047 = mmap.mod --@COND_mips_qemu_mips_TRUE@am__append_4048 = mmap.marker --@COND_arm_efi_TRUE@am__append_4049 = mmap.module --@COND_arm_efi_TRUE@am__append_4050 = mmap.module$(EXEEXT) --@COND_arm_efi_TRUE@am__append_4051 = --@COND_arm_efi_TRUE@am__append_4052 = $(nodist_mmap_module_SOURCES) --@COND_arm_efi_TRUE@am__append_4053 = $(nodist_mmap_module_SOURCES) \ -+@COND_mips_qemu_mips_TRUE@am__append_4040 = mmap.mod -+@COND_mips_qemu_mips_TRUE@am__append_4041 = mmap.marker -+@COND_arm_efi_TRUE@am__append_4042 = mmap.module -+@COND_arm_efi_TRUE@am__append_4043 = mmap.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__append_4044 = -+@COND_arm_efi_TRUE@am__append_4045 = $(nodist_mmap_module_SOURCES) -+@COND_arm_efi_TRUE@am__append_4046 = $(nodist_mmap_module_SOURCES) \ - @COND_arm_efi_TRUE@ mmap.marker --@COND_arm_efi_TRUE@am__append_4054 = mmap.mod --@COND_arm_efi_TRUE@am__append_4055 = mmap.marker --@COND_arm64_efi_TRUE@am__append_4056 = mmap.module --@COND_arm64_efi_TRUE@am__append_4057 = mmap.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__append_4058 = --@COND_arm64_efi_TRUE@am__append_4059 = $(nodist_mmap_module_SOURCES) --@COND_arm64_efi_TRUE@am__append_4060 = $(nodist_mmap_module_SOURCES) \ -+@COND_arm_efi_TRUE@am__append_4047 = mmap.mod -+@COND_arm_efi_TRUE@am__append_4048 = mmap.marker -+@COND_arm64_efi_TRUE@am__append_4049 = mmap.module -+@COND_arm64_efi_TRUE@am__append_4050 = mmap.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__append_4051 = -+@COND_arm64_efi_TRUE@am__append_4052 = $(nodist_mmap_module_SOURCES) -+@COND_arm64_efi_TRUE@am__append_4053 = $(nodist_mmap_module_SOURCES) \ - @COND_arm64_efi_TRUE@ mmap.marker --@COND_arm64_efi_TRUE@am__append_4061 = mmap.mod --@COND_arm64_efi_TRUE@am__append_4062 = mmap.marker --@COND_riscv32_efi_TRUE@am__append_4063 = mmap.module --@COND_riscv32_efi_TRUE@am__append_4064 = mmap.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__append_4065 = --@COND_riscv32_efi_TRUE@am__append_4066 = $(nodist_mmap_module_SOURCES) --@COND_riscv32_efi_TRUE@am__append_4067 = \ -+@COND_arm64_efi_TRUE@am__append_4054 = mmap.mod -+@COND_arm64_efi_TRUE@am__append_4055 = mmap.marker -+@COND_riscv32_efi_TRUE@am__append_4056 = mmap.module -+@COND_riscv32_efi_TRUE@am__append_4057 = mmap.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__append_4058 = -+@COND_riscv32_efi_TRUE@am__append_4059 = $(nodist_mmap_module_SOURCES) -+@COND_riscv32_efi_TRUE@am__append_4060 = \ - @COND_riscv32_efi_TRUE@ $(nodist_mmap_module_SOURCES) \ - @COND_riscv32_efi_TRUE@ mmap.marker --@COND_riscv32_efi_TRUE@am__append_4068 = mmap.mod --@COND_riscv32_efi_TRUE@am__append_4069 = mmap.marker --@COND_riscv64_efi_TRUE@am__append_4070 = mmap.module --@COND_riscv64_efi_TRUE@am__append_4071 = mmap.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__append_4072 = --@COND_riscv64_efi_TRUE@am__append_4073 = $(nodist_mmap_module_SOURCES) --@COND_riscv64_efi_TRUE@am__append_4074 = \ -+@COND_riscv32_efi_TRUE@am__append_4061 = mmap.mod -+@COND_riscv32_efi_TRUE@am__append_4062 = mmap.marker -+@COND_riscv64_efi_TRUE@am__append_4063 = mmap.module -+@COND_riscv64_efi_TRUE@am__append_4064 = mmap.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_4065 = -+@COND_riscv64_efi_TRUE@am__append_4066 = $(nodist_mmap_module_SOURCES) -+@COND_riscv64_efi_TRUE@am__append_4067 = \ - @COND_riscv64_efi_TRUE@ $(nodist_mmap_module_SOURCES) \ - @COND_riscv64_efi_TRUE@ mmap.marker --@COND_riscv64_efi_TRUE@am__append_4075 = mmap.mod --@COND_riscv64_efi_TRUE@am__append_4076 = mmap.marker --@COND_i386_pc_TRUE@am__append_4077 = at_keyboard.module --@COND_i386_pc_TRUE@am__append_4078 = at_keyboard.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_4068 = mmap.mod -+@COND_riscv64_efi_TRUE@am__append_4069 = mmap.marker -+@COND_i386_pc_TRUE@am__append_4070 = at_keyboard.module -+@COND_i386_pc_TRUE@am__append_4071 = at_keyboard.module$(EXEEXT) - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_x86_64_efi_FALSE@at_keyboard_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_4079 = --@COND_i386_pc_TRUE@am__append_4080 = $(nodist_at_keyboard_module_SOURCES) --@COND_i386_pc_TRUE@am__append_4081 = \ -+@COND_i386_pc_TRUE@am__append_4072 = -+@COND_i386_pc_TRUE@am__append_4073 = $(nodist_at_keyboard_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_4074 = \ - @COND_i386_pc_TRUE@ $(nodist_at_keyboard_module_SOURCES) \ - @COND_i386_pc_TRUE@ at_keyboard.marker --@COND_i386_pc_TRUE@am__append_4082 = at_keyboard.mod --@COND_i386_pc_TRUE@am__append_4083 = at_keyboard.marker --@COND_i386_efi_TRUE@am__append_4084 = at_keyboard.module --@COND_i386_efi_TRUE@am__append_4085 = at_keyboard.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_4086 = --@COND_i386_efi_TRUE@am__append_4087 = $(nodist_at_keyboard_module_SOURCES) --@COND_i386_efi_TRUE@am__append_4088 = \ -+@COND_i386_pc_TRUE@am__append_4075 = at_keyboard.mod -+@COND_i386_pc_TRUE@am__append_4076 = at_keyboard.marker -+@COND_i386_efi_TRUE@am__append_4077 = at_keyboard.module -+@COND_i386_efi_TRUE@am__append_4078 = at_keyboard.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_4079 = -+@COND_i386_efi_TRUE@am__append_4080 = $(nodist_at_keyboard_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_4081 = \ - @COND_i386_efi_TRUE@ $(nodist_at_keyboard_module_SOURCES) \ - @COND_i386_efi_TRUE@ at_keyboard.marker --@COND_i386_efi_TRUE@am__append_4089 = at_keyboard.mod --@COND_i386_efi_TRUE@am__append_4090 = at_keyboard.marker --@COND_i386_qemu_TRUE@am__append_4091 = at_keyboard.module --@COND_i386_qemu_TRUE@am__append_4092 = at_keyboard.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_4093 = --@COND_i386_qemu_TRUE@am__append_4094 = $(nodist_at_keyboard_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_4095 = \ -+@COND_i386_efi_TRUE@am__append_4082 = at_keyboard.mod -+@COND_i386_efi_TRUE@am__append_4083 = at_keyboard.marker -+@COND_i386_qemu_TRUE@am__append_4084 = at_keyboard.module -+@COND_i386_qemu_TRUE@am__append_4085 = at_keyboard.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_4086 = -+@COND_i386_qemu_TRUE@am__append_4087 = $(nodist_at_keyboard_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_4088 = \ - @COND_i386_qemu_TRUE@ $(nodist_at_keyboard_module_SOURCES) \ - @COND_i386_qemu_TRUE@ at_keyboard.marker --@COND_i386_qemu_TRUE@am__append_4096 = at_keyboard.mod --@COND_i386_qemu_TRUE@am__append_4097 = at_keyboard.marker --@COND_i386_coreboot_TRUE@am__append_4098 = at_keyboard.module --@COND_i386_coreboot_TRUE@am__append_4099 = at_keyboard.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_4100 = --@COND_i386_coreboot_TRUE@am__append_4101 = $(nodist_at_keyboard_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_4102 = \ -+@COND_i386_qemu_TRUE@am__append_4089 = at_keyboard.mod -+@COND_i386_qemu_TRUE@am__append_4090 = at_keyboard.marker -+@COND_i386_coreboot_TRUE@am__append_4091 = at_keyboard.module -+@COND_i386_coreboot_TRUE@am__append_4092 = at_keyboard.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_4093 = -+@COND_i386_coreboot_TRUE@am__append_4094 = $(nodist_at_keyboard_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_4095 = \ - @COND_i386_coreboot_TRUE@ $(nodist_at_keyboard_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ at_keyboard.marker --@COND_i386_coreboot_TRUE@am__append_4103 = at_keyboard.mod --@COND_i386_coreboot_TRUE@am__append_4104 = at_keyboard.marker --@COND_i386_multiboot_TRUE@am__append_4105 = at_keyboard.module --@COND_i386_multiboot_TRUE@am__append_4106 = at_keyboard.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_4107 = --@COND_i386_multiboot_TRUE@am__append_4108 = $(nodist_at_keyboard_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_4109 = $(nodist_at_keyboard_module_SOURCES) \ -+@COND_i386_coreboot_TRUE@am__append_4096 = at_keyboard.mod -+@COND_i386_coreboot_TRUE@am__append_4097 = at_keyboard.marker -+@COND_i386_multiboot_TRUE@am__append_4098 = at_keyboard.module -+@COND_i386_multiboot_TRUE@am__append_4099 = at_keyboard.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_4100 = -+@COND_i386_multiboot_TRUE@am__append_4101 = $(nodist_at_keyboard_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_4102 = $(nodist_at_keyboard_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ at_keyboard.marker --@COND_i386_multiboot_TRUE@am__append_4110 = at_keyboard.mod --@COND_i386_multiboot_TRUE@am__append_4111 = at_keyboard.marker --@COND_i386_ieee1275_TRUE@am__append_4112 = at_keyboard.module --@COND_i386_ieee1275_TRUE@am__append_4113 = at_keyboard.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_4114 = --@COND_i386_ieee1275_TRUE@am__append_4115 = $(nodist_at_keyboard_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_4116 = \ -+@COND_i386_multiboot_TRUE@am__append_4103 = at_keyboard.mod -+@COND_i386_multiboot_TRUE@am__append_4104 = at_keyboard.marker -+@COND_i386_ieee1275_TRUE@am__append_4105 = at_keyboard.module -+@COND_i386_ieee1275_TRUE@am__append_4106 = at_keyboard.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_4107 = -+@COND_i386_ieee1275_TRUE@am__append_4108 = $(nodist_at_keyboard_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_4109 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_at_keyboard_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ at_keyboard.marker --@COND_i386_ieee1275_TRUE@am__append_4117 = at_keyboard.mod --@COND_i386_ieee1275_TRUE@am__append_4118 = at_keyboard.marker --@COND_x86_64_efi_TRUE@am__append_4119 = at_keyboard.module --@COND_x86_64_efi_TRUE@am__append_4120 = at_keyboard.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_4121 = --@COND_x86_64_efi_TRUE@am__append_4122 = $(nodist_at_keyboard_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_4123 = \ -+@COND_i386_ieee1275_TRUE@am__append_4110 = at_keyboard.mod -+@COND_i386_ieee1275_TRUE@am__append_4111 = at_keyboard.marker -+@COND_x86_64_efi_TRUE@am__append_4112 = at_keyboard.module -+@COND_x86_64_efi_TRUE@am__append_4113 = at_keyboard.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_4114 = -+@COND_x86_64_efi_TRUE@am__append_4115 = $(nodist_at_keyboard_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_4116 = \ - @COND_x86_64_efi_TRUE@ $(nodist_at_keyboard_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ at_keyboard.marker --@COND_x86_64_efi_TRUE@am__append_4124 = at_keyboard.mod --@COND_x86_64_efi_TRUE@am__append_4125 = at_keyboard.marker --@COND_emu_TRUE@am__append_4126 = gfxterm.module --@COND_emu_TRUE@am__append_4127 = gfxterm.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_4117 = at_keyboard.mod -+@COND_x86_64_efi_TRUE@am__append_4118 = at_keyboard.marker -+@COND_emu_TRUE@am__append_4119 = gfxterm.module -+@COND_emu_TRUE@am__append_4120 = gfxterm.module$(EXEEXT) - @COND_arm64_efi_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_FALSE@gfxterm_module_DEPENDENCIES = --@COND_emu_TRUE@am__append_4128 = --@COND_emu_TRUE@am__append_4129 = $(nodist_gfxterm_module_SOURCES) --@COND_emu_TRUE@am__append_4130 = $(nodist_gfxterm_module_SOURCES) \ -+@COND_emu_TRUE@am__append_4121 = -+@COND_emu_TRUE@am__append_4122 = $(nodist_gfxterm_module_SOURCES) -+@COND_emu_TRUE@am__append_4123 = $(nodist_gfxterm_module_SOURCES) \ - @COND_emu_TRUE@ gfxterm.marker --@COND_emu_TRUE@am__append_4131 = gfxterm.mod --@COND_emu_TRUE@am__append_4132 = gfxterm.marker --@COND_i386_pc_TRUE@am__append_4133 = gfxterm.module --@COND_i386_pc_TRUE@am__append_4134 = gfxterm.module$(EXEEXT) --@COND_i386_pc_TRUE@am__append_4135 = --@COND_i386_pc_TRUE@am__append_4136 = $(nodist_gfxterm_module_SOURCES) --@COND_i386_pc_TRUE@am__append_4137 = $(nodist_gfxterm_module_SOURCES) \ -+@COND_emu_TRUE@am__append_4124 = gfxterm.mod -+@COND_emu_TRUE@am__append_4125 = gfxterm.marker -+@COND_i386_pc_TRUE@am__append_4126 = gfxterm.module -+@COND_i386_pc_TRUE@am__append_4127 = gfxterm.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__append_4128 = -+@COND_i386_pc_TRUE@am__append_4129 = $(nodist_gfxterm_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_4130 = $(nodist_gfxterm_module_SOURCES) \ - @COND_i386_pc_TRUE@ gfxterm.marker --@COND_i386_pc_TRUE@am__append_4138 = gfxterm.mod --@COND_i386_pc_TRUE@am__append_4139 = gfxterm.marker --@COND_i386_efi_TRUE@am__append_4140 = gfxterm.module --@COND_i386_efi_TRUE@am__append_4141 = gfxterm.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_4142 = --@COND_i386_efi_TRUE@am__append_4143 = $(nodist_gfxterm_module_SOURCES) --@COND_i386_efi_TRUE@am__append_4144 = \ -+@COND_i386_pc_TRUE@am__append_4131 = gfxterm.mod -+@COND_i386_pc_TRUE@am__append_4132 = gfxterm.marker -+@COND_i386_efi_TRUE@am__append_4133 = gfxterm.module -+@COND_i386_efi_TRUE@am__append_4134 = gfxterm.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_4135 = -+@COND_i386_efi_TRUE@am__append_4136 = $(nodist_gfxterm_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_4137 = \ - @COND_i386_efi_TRUE@ $(nodist_gfxterm_module_SOURCES) \ - @COND_i386_efi_TRUE@ gfxterm.marker --@COND_i386_efi_TRUE@am__append_4145 = gfxterm.mod --@COND_i386_efi_TRUE@am__append_4146 = gfxterm.marker --@COND_i386_qemu_TRUE@am__append_4147 = gfxterm.module --@COND_i386_qemu_TRUE@am__append_4148 = gfxterm.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_4149 = --@COND_i386_qemu_TRUE@am__append_4150 = $(nodist_gfxterm_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_4151 = \ -+@COND_i386_efi_TRUE@am__append_4138 = gfxterm.mod -+@COND_i386_efi_TRUE@am__append_4139 = gfxterm.marker -+@COND_i386_qemu_TRUE@am__append_4140 = gfxterm.module -+@COND_i386_qemu_TRUE@am__append_4141 = gfxterm.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_4142 = -+@COND_i386_qemu_TRUE@am__append_4143 = $(nodist_gfxterm_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_4144 = \ - @COND_i386_qemu_TRUE@ $(nodist_gfxterm_module_SOURCES) \ - @COND_i386_qemu_TRUE@ gfxterm.marker --@COND_i386_qemu_TRUE@am__append_4152 = gfxterm.mod --@COND_i386_qemu_TRUE@am__append_4153 = gfxterm.marker --@COND_i386_multiboot_TRUE@am__append_4154 = gfxterm.module --@COND_i386_multiboot_TRUE@am__append_4155 = gfxterm.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_4156 = --@COND_i386_multiboot_TRUE@am__append_4157 = $(nodist_gfxterm_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_4158 = \ -+@COND_i386_qemu_TRUE@am__append_4145 = gfxterm.mod -+@COND_i386_qemu_TRUE@am__append_4146 = gfxterm.marker -+@COND_i386_multiboot_TRUE@am__append_4147 = gfxterm.module -+@COND_i386_multiboot_TRUE@am__append_4148 = gfxterm.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_4149 = -+@COND_i386_multiboot_TRUE@am__append_4150 = $(nodist_gfxterm_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_4151 = \ - @COND_i386_multiboot_TRUE@ $(nodist_gfxterm_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ gfxterm.marker --@COND_i386_multiboot_TRUE@am__append_4159 = gfxterm.mod --@COND_i386_multiboot_TRUE@am__append_4160 = gfxterm.marker --@COND_i386_ieee1275_TRUE@am__append_4161 = gfxterm.module --@COND_i386_ieee1275_TRUE@am__append_4162 = gfxterm.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_4163 = --@COND_i386_ieee1275_TRUE@am__append_4164 = $(nodist_gfxterm_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_4165 = \ -+@COND_i386_multiboot_TRUE@am__append_4152 = gfxterm.mod -+@COND_i386_multiboot_TRUE@am__append_4153 = gfxterm.marker -+@COND_i386_ieee1275_TRUE@am__append_4154 = gfxterm.module -+@COND_i386_ieee1275_TRUE@am__append_4155 = gfxterm.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_4156 = -+@COND_i386_ieee1275_TRUE@am__append_4157 = $(nodist_gfxterm_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_4158 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_gfxterm_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ gfxterm.marker --@COND_i386_ieee1275_TRUE@am__append_4166 = gfxterm.mod --@COND_i386_ieee1275_TRUE@am__append_4167 = gfxterm.marker --@COND_x86_64_efi_TRUE@am__append_4168 = gfxterm.module --@COND_x86_64_efi_TRUE@am__append_4169 = gfxterm.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_4170 = --@COND_x86_64_efi_TRUE@am__append_4171 = $(nodist_gfxterm_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_4172 = \ -+@COND_i386_ieee1275_TRUE@am__append_4159 = gfxterm.mod -+@COND_i386_ieee1275_TRUE@am__append_4160 = gfxterm.marker -+@COND_x86_64_efi_TRUE@am__append_4161 = gfxterm.module -+@COND_x86_64_efi_TRUE@am__append_4162 = gfxterm.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_4163 = -+@COND_x86_64_efi_TRUE@am__append_4164 = $(nodist_gfxterm_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_4165 = \ - @COND_x86_64_efi_TRUE@ $(nodist_gfxterm_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ gfxterm.marker --@COND_x86_64_efi_TRUE@am__append_4173 = gfxterm.mod --@COND_x86_64_efi_TRUE@am__append_4174 = gfxterm.marker --@COND_i386_xen_TRUE@am__append_4175 = gfxterm.module --@COND_i386_xen_TRUE@am__append_4176 = gfxterm.module$(EXEEXT) --@COND_i386_xen_TRUE@am__append_4177 = --@COND_i386_xen_TRUE@am__append_4178 = $(nodist_gfxterm_module_SOURCES) --@COND_i386_xen_TRUE@am__append_4179 = \ -+@COND_x86_64_efi_TRUE@am__append_4166 = gfxterm.mod -+@COND_x86_64_efi_TRUE@am__append_4167 = gfxterm.marker -+@COND_i386_xen_TRUE@am__append_4168 = gfxterm.module -+@COND_i386_xen_TRUE@am__append_4169 = gfxterm.module$(EXEEXT) -+@COND_i386_xen_TRUE@am__append_4170 = -+@COND_i386_xen_TRUE@am__append_4171 = $(nodist_gfxterm_module_SOURCES) -+@COND_i386_xen_TRUE@am__append_4172 = \ - @COND_i386_xen_TRUE@ $(nodist_gfxterm_module_SOURCES) \ - @COND_i386_xen_TRUE@ gfxterm.marker --@COND_i386_xen_TRUE@am__append_4180 = gfxterm.mod --@COND_i386_xen_TRUE@am__append_4181 = gfxterm.marker --@COND_x86_64_xen_TRUE@am__append_4182 = gfxterm.module --@COND_x86_64_xen_TRUE@am__append_4183 = gfxterm.module$(EXEEXT) --@COND_x86_64_xen_TRUE@am__append_4184 = --@COND_x86_64_xen_TRUE@am__append_4185 = $(nodist_gfxterm_module_SOURCES) --@COND_x86_64_xen_TRUE@am__append_4186 = \ -+@COND_i386_xen_TRUE@am__append_4173 = gfxterm.mod -+@COND_i386_xen_TRUE@am__append_4174 = gfxterm.marker -+@COND_x86_64_xen_TRUE@am__append_4175 = gfxterm.module -+@COND_x86_64_xen_TRUE@am__append_4176 = gfxterm.module$(EXEEXT) -+@COND_x86_64_xen_TRUE@am__append_4177 = -+@COND_x86_64_xen_TRUE@am__append_4178 = $(nodist_gfxterm_module_SOURCES) -+@COND_x86_64_xen_TRUE@am__append_4179 = \ - @COND_x86_64_xen_TRUE@ $(nodist_gfxterm_module_SOURCES) \ - @COND_x86_64_xen_TRUE@ gfxterm.marker --@COND_x86_64_xen_TRUE@am__append_4187 = gfxterm.mod --@COND_x86_64_xen_TRUE@am__append_4188 = gfxterm.marker --@COND_i386_xen_pvh_TRUE@am__append_4189 = gfxterm.module --@COND_i386_xen_pvh_TRUE@am__append_4190 = gfxterm.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__append_4191 = --@COND_i386_xen_pvh_TRUE@am__append_4192 = $(nodist_gfxterm_module_SOURCES) --@COND_i386_xen_pvh_TRUE@am__append_4193 = \ -+@COND_x86_64_xen_TRUE@am__append_4180 = gfxterm.mod -+@COND_x86_64_xen_TRUE@am__append_4181 = gfxterm.marker -+@COND_i386_xen_pvh_TRUE@am__append_4182 = gfxterm.module -+@COND_i386_xen_pvh_TRUE@am__append_4183 = gfxterm.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__append_4184 = -+@COND_i386_xen_pvh_TRUE@am__append_4185 = $(nodist_gfxterm_module_SOURCES) -+@COND_i386_xen_pvh_TRUE@am__append_4186 = \ - @COND_i386_xen_pvh_TRUE@ $(nodist_gfxterm_module_SOURCES) \ - @COND_i386_xen_pvh_TRUE@ gfxterm.marker --@COND_i386_xen_pvh_TRUE@am__append_4194 = gfxterm.mod --@COND_i386_xen_pvh_TRUE@am__append_4195 = gfxterm.marker --@COND_sparc64_ieee1275_TRUE@am__append_4196 = gfxterm.module --@COND_sparc64_ieee1275_TRUE@am__append_4197 = gfxterm.module$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@am__append_4198 = --@COND_sparc64_ieee1275_TRUE@am__append_4199 = $(nodist_gfxterm_module_SOURCES) --@COND_sparc64_ieee1275_TRUE@am__append_4200 = \ -+@COND_i386_xen_pvh_TRUE@am__append_4187 = gfxterm.mod -+@COND_i386_xen_pvh_TRUE@am__append_4188 = gfxterm.marker -+@COND_sparc64_ieee1275_TRUE@am__append_4189 = gfxterm.module -+@COND_sparc64_ieee1275_TRUE@am__append_4190 = gfxterm.module$(EXEEXT) -+@COND_sparc64_ieee1275_TRUE@am__append_4191 = -+@COND_sparc64_ieee1275_TRUE@am__append_4192 = $(nodist_gfxterm_module_SOURCES) -+@COND_sparc64_ieee1275_TRUE@am__append_4193 = \ - @COND_sparc64_ieee1275_TRUE@ $(nodist_gfxterm_module_SOURCES) \ - @COND_sparc64_ieee1275_TRUE@ gfxterm.marker --@COND_sparc64_ieee1275_TRUE@am__append_4201 = gfxterm.mod --@COND_sparc64_ieee1275_TRUE@am__append_4202 = gfxterm.marker --@COND_powerpc_ieee1275_TRUE@am__append_4203 = gfxterm.module --@COND_powerpc_ieee1275_TRUE@am__append_4204 = gfxterm.module$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__append_4205 = --@COND_powerpc_ieee1275_TRUE@am__append_4206 = $(nodist_gfxterm_module_SOURCES) --@COND_powerpc_ieee1275_TRUE@am__append_4207 = \ -+@COND_sparc64_ieee1275_TRUE@am__append_4194 = gfxterm.mod -+@COND_sparc64_ieee1275_TRUE@am__append_4195 = gfxterm.marker -+@COND_powerpc_ieee1275_TRUE@am__append_4196 = gfxterm.module -+@COND_powerpc_ieee1275_TRUE@am__append_4197 = gfxterm.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__append_4198 = -+@COND_powerpc_ieee1275_TRUE@am__append_4199 = $(nodist_gfxterm_module_SOURCES) -+@COND_powerpc_ieee1275_TRUE@am__append_4200 = \ - @COND_powerpc_ieee1275_TRUE@ $(nodist_gfxterm_module_SOURCES) \ - @COND_powerpc_ieee1275_TRUE@ gfxterm.marker --@COND_powerpc_ieee1275_TRUE@am__append_4208 = gfxterm.mod --@COND_powerpc_ieee1275_TRUE@am__append_4209 = gfxterm.marker --@COND_mips_arc_TRUE@am__append_4210 = gfxterm.module --@COND_mips_arc_TRUE@am__append_4211 = gfxterm.module$(EXEEXT) --@COND_mips_arc_TRUE@am__append_4212 = --@COND_mips_arc_TRUE@am__append_4213 = $(nodist_gfxterm_module_SOURCES) --@COND_mips_arc_TRUE@am__append_4214 = \ -+@COND_powerpc_ieee1275_TRUE@am__append_4201 = gfxterm.mod -+@COND_powerpc_ieee1275_TRUE@am__append_4202 = gfxterm.marker -+@COND_mips_arc_TRUE@am__append_4203 = gfxterm.module -+@COND_mips_arc_TRUE@am__append_4204 = gfxterm.module$(EXEEXT) -+@COND_mips_arc_TRUE@am__append_4205 = -+@COND_mips_arc_TRUE@am__append_4206 = $(nodist_gfxterm_module_SOURCES) -+@COND_mips_arc_TRUE@am__append_4207 = \ - @COND_mips_arc_TRUE@ $(nodist_gfxterm_module_SOURCES) \ - @COND_mips_arc_TRUE@ gfxterm.marker --@COND_mips_arc_TRUE@am__append_4215 = gfxterm.mod --@COND_mips_arc_TRUE@am__append_4216 = gfxterm.marker --@COND_ia64_efi_TRUE@am__append_4217 = gfxterm.module --@COND_ia64_efi_TRUE@am__append_4218 = gfxterm.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__append_4219 = --@COND_ia64_efi_TRUE@am__append_4220 = $(nodist_gfxterm_module_SOURCES) --@COND_ia64_efi_TRUE@am__append_4221 = \ -+@COND_mips_arc_TRUE@am__append_4208 = gfxterm.mod -+@COND_mips_arc_TRUE@am__append_4209 = gfxterm.marker -+@COND_ia64_efi_TRUE@am__append_4210 = gfxterm.module -+@COND_ia64_efi_TRUE@am__append_4211 = gfxterm.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__append_4212 = -+@COND_ia64_efi_TRUE@am__append_4213 = $(nodist_gfxterm_module_SOURCES) -+@COND_ia64_efi_TRUE@am__append_4214 = \ - @COND_ia64_efi_TRUE@ $(nodist_gfxterm_module_SOURCES) \ - @COND_ia64_efi_TRUE@ gfxterm.marker --@COND_ia64_efi_TRUE@am__append_4222 = gfxterm.mod --@COND_ia64_efi_TRUE@am__append_4223 = gfxterm.marker --@COND_mips_qemu_mips_TRUE@am__append_4224 = gfxterm.module --@COND_mips_qemu_mips_TRUE@am__append_4225 = gfxterm.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__append_4226 = --@COND_mips_qemu_mips_TRUE@am__append_4227 = $(nodist_gfxterm_module_SOURCES) --@COND_mips_qemu_mips_TRUE@am__append_4228 = \ -+@COND_ia64_efi_TRUE@am__append_4215 = gfxterm.mod -+@COND_ia64_efi_TRUE@am__append_4216 = gfxterm.marker -+@COND_mips_qemu_mips_TRUE@am__append_4217 = gfxterm.module -+@COND_mips_qemu_mips_TRUE@am__append_4218 = gfxterm.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__append_4219 = -+@COND_mips_qemu_mips_TRUE@am__append_4220 = $(nodist_gfxterm_module_SOURCES) -+@COND_mips_qemu_mips_TRUE@am__append_4221 = \ - @COND_mips_qemu_mips_TRUE@ $(nodist_gfxterm_module_SOURCES) \ - @COND_mips_qemu_mips_TRUE@ gfxterm.marker --@COND_mips_qemu_mips_TRUE@am__append_4229 = gfxterm.mod --@COND_mips_qemu_mips_TRUE@am__append_4230 = gfxterm.marker --@COND_arm_uboot_TRUE@am__append_4231 = gfxterm.module --@COND_arm_uboot_TRUE@am__append_4232 = gfxterm.module$(EXEEXT) --@COND_arm_uboot_TRUE@am__append_4233 = --@COND_arm_uboot_TRUE@am__append_4234 = $(nodist_gfxterm_module_SOURCES) --@COND_arm_uboot_TRUE@am__append_4235 = \ -+@COND_mips_qemu_mips_TRUE@am__append_4222 = gfxterm.mod -+@COND_mips_qemu_mips_TRUE@am__append_4223 = gfxterm.marker -+@COND_arm_uboot_TRUE@am__append_4224 = gfxterm.module -+@COND_arm_uboot_TRUE@am__append_4225 = gfxterm.module$(EXEEXT) -+@COND_arm_uboot_TRUE@am__append_4226 = -+@COND_arm_uboot_TRUE@am__append_4227 = $(nodist_gfxterm_module_SOURCES) -+@COND_arm_uboot_TRUE@am__append_4228 = \ - @COND_arm_uboot_TRUE@ $(nodist_gfxterm_module_SOURCES) \ - @COND_arm_uboot_TRUE@ gfxterm.marker --@COND_arm_uboot_TRUE@am__append_4236 = gfxterm.mod --@COND_arm_uboot_TRUE@am__append_4237 = gfxterm.marker --@COND_arm_efi_TRUE@am__append_4238 = gfxterm.module --@COND_arm_efi_TRUE@am__append_4239 = gfxterm.module$(EXEEXT) --@COND_arm_efi_TRUE@am__append_4240 = --@COND_arm_efi_TRUE@am__append_4241 = $(nodist_gfxterm_module_SOURCES) --@COND_arm_efi_TRUE@am__append_4242 = $(nodist_gfxterm_module_SOURCES) \ -+@COND_arm_uboot_TRUE@am__append_4229 = gfxterm.mod -+@COND_arm_uboot_TRUE@am__append_4230 = gfxterm.marker -+@COND_arm_efi_TRUE@am__append_4231 = gfxterm.module -+@COND_arm_efi_TRUE@am__append_4232 = gfxterm.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__append_4233 = -+@COND_arm_efi_TRUE@am__append_4234 = $(nodist_gfxterm_module_SOURCES) -+@COND_arm_efi_TRUE@am__append_4235 = $(nodist_gfxterm_module_SOURCES) \ - @COND_arm_efi_TRUE@ gfxterm.marker --@COND_arm_efi_TRUE@am__append_4243 = gfxterm.mod --@COND_arm_efi_TRUE@am__append_4244 = gfxterm.marker --@COND_arm64_efi_TRUE@am__append_4245 = gfxterm.module --@COND_arm64_efi_TRUE@am__append_4246 = gfxterm.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__append_4247 = --@COND_arm64_efi_TRUE@am__append_4248 = $(nodist_gfxterm_module_SOURCES) --@COND_arm64_efi_TRUE@am__append_4249 = \ -+@COND_arm_efi_TRUE@am__append_4236 = gfxterm.mod -+@COND_arm_efi_TRUE@am__append_4237 = gfxterm.marker -+@COND_arm64_efi_TRUE@am__append_4238 = gfxterm.module -+@COND_arm64_efi_TRUE@am__append_4239 = gfxterm.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__append_4240 = -+@COND_arm64_efi_TRUE@am__append_4241 = $(nodist_gfxterm_module_SOURCES) -+@COND_arm64_efi_TRUE@am__append_4242 = \ - @COND_arm64_efi_TRUE@ $(nodist_gfxterm_module_SOURCES) \ - @COND_arm64_efi_TRUE@ gfxterm.marker --@COND_arm64_efi_TRUE@am__append_4250 = gfxterm.mod --@COND_arm64_efi_TRUE@am__append_4251 = gfxterm.marker --@COND_riscv32_efi_TRUE@am__append_4252 = gfxterm.module --@COND_riscv32_efi_TRUE@am__append_4253 = gfxterm.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__append_4254 = --@COND_riscv32_efi_TRUE@am__append_4255 = $(nodist_gfxterm_module_SOURCES) --@COND_riscv32_efi_TRUE@am__append_4256 = \ -+@COND_arm64_efi_TRUE@am__append_4243 = gfxterm.mod -+@COND_arm64_efi_TRUE@am__append_4244 = gfxterm.marker -+@COND_riscv32_efi_TRUE@am__append_4245 = gfxterm.module -+@COND_riscv32_efi_TRUE@am__append_4246 = gfxterm.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__append_4247 = -+@COND_riscv32_efi_TRUE@am__append_4248 = $(nodist_gfxterm_module_SOURCES) -+@COND_riscv32_efi_TRUE@am__append_4249 = \ - @COND_riscv32_efi_TRUE@ $(nodist_gfxterm_module_SOURCES) \ - @COND_riscv32_efi_TRUE@ gfxterm.marker --@COND_riscv32_efi_TRUE@am__append_4257 = gfxterm.mod --@COND_riscv32_efi_TRUE@am__append_4258 = gfxterm.marker --@COND_riscv64_efi_TRUE@am__append_4259 = gfxterm.module --@COND_riscv64_efi_TRUE@am__append_4260 = gfxterm.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__append_4261 = --@COND_riscv64_efi_TRUE@am__append_4262 = $(nodist_gfxterm_module_SOURCES) --@COND_riscv64_efi_TRUE@am__append_4263 = \ -+@COND_riscv32_efi_TRUE@am__append_4250 = gfxterm.mod -+@COND_riscv32_efi_TRUE@am__append_4251 = gfxterm.marker -+@COND_riscv64_efi_TRUE@am__append_4252 = gfxterm.module -+@COND_riscv64_efi_TRUE@am__append_4253 = gfxterm.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_4254 = -+@COND_riscv64_efi_TRUE@am__append_4255 = $(nodist_gfxterm_module_SOURCES) -+@COND_riscv64_efi_TRUE@am__append_4256 = \ - @COND_riscv64_efi_TRUE@ $(nodist_gfxterm_module_SOURCES) \ - @COND_riscv64_efi_TRUE@ gfxterm.marker --@COND_riscv64_efi_TRUE@am__append_4264 = gfxterm.mod --@COND_riscv64_efi_TRUE@am__append_4265 = gfxterm.marker --@COND_i386_pc_TRUE@am__append_4266 = serial.module --@COND_i386_pc_TRUE@am__append_4267 = serial.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_4257 = gfxterm.mod -+@COND_riscv64_efi_TRUE@am__append_4258 = gfxterm.marker -+@COND_i386_pc_TRUE@am__append_4259 = serial.module -+@COND_i386_pc_TRUE@am__append_4260 = serial.module$(EXEEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@serial_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_4268 = --@COND_i386_pc_TRUE@am__append_4269 = $(nodist_serial_module_SOURCES) --@COND_i386_pc_TRUE@am__append_4270 = $(nodist_serial_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_4261 = -+@COND_i386_pc_TRUE@am__append_4262 = $(nodist_serial_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_4263 = $(nodist_serial_module_SOURCES) \ - @COND_i386_pc_TRUE@ serial.marker --@COND_i386_pc_TRUE@am__append_4271 = serial.mod --@COND_i386_pc_TRUE@am__append_4272 = serial.marker --@COND_i386_efi_TRUE@am__append_4273 = serial.module --@COND_i386_efi_TRUE@am__append_4274 = serial.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_4275 = --@COND_i386_efi_TRUE@am__append_4276 = $(nodist_serial_module_SOURCES) --@COND_i386_efi_TRUE@am__append_4277 = $(nodist_serial_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_4264 = serial.mod -+@COND_i386_pc_TRUE@am__append_4265 = serial.marker -+@COND_i386_efi_TRUE@am__append_4266 = serial.module -+@COND_i386_efi_TRUE@am__append_4267 = serial.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_4268 = -+@COND_i386_efi_TRUE@am__append_4269 = $(nodist_serial_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_4270 = $(nodist_serial_module_SOURCES) \ - @COND_i386_efi_TRUE@ serial.marker --@COND_i386_efi_TRUE@am__append_4278 = serial.mod --@COND_i386_efi_TRUE@am__append_4279 = serial.marker --@COND_i386_qemu_TRUE@am__append_4280 = serial.module --@COND_i386_qemu_TRUE@am__append_4281 = serial.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_4282 = --@COND_i386_qemu_TRUE@am__append_4283 = $(nodist_serial_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_4284 = \ -+@COND_i386_efi_TRUE@am__append_4271 = serial.mod -+@COND_i386_efi_TRUE@am__append_4272 = serial.marker -+@COND_i386_qemu_TRUE@am__append_4273 = serial.module -+@COND_i386_qemu_TRUE@am__append_4274 = serial.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_4275 = -+@COND_i386_qemu_TRUE@am__append_4276 = $(nodist_serial_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_4277 = \ - @COND_i386_qemu_TRUE@ $(nodist_serial_module_SOURCES) \ - @COND_i386_qemu_TRUE@ serial.marker --@COND_i386_qemu_TRUE@am__append_4285 = serial.mod --@COND_i386_qemu_TRUE@am__append_4286 = serial.marker --@COND_i386_coreboot_TRUE@am__append_4287 = serial.module --@COND_i386_coreboot_TRUE@am__append_4288 = serial.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_4289 = --@COND_i386_coreboot_TRUE@am__append_4290 = $(nodist_serial_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_4291 = \ -+@COND_i386_qemu_TRUE@am__append_4278 = serial.mod -+@COND_i386_qemu_TRUE@am__append_4279 = serial.marker -+@COND_i386_coreboot_TRUE@am__append_4280 = serial.module -+@COND_i386_coreboot_TRUE@am__append_4281 = serial.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_4282 = -+@COND_i386_coreboot_TRUE@am__append_4283 = $(nodist_serial_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_4284 = \ - @COND_i386_coreboot_TRUE@ $(nodist_serial_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ serial.marker --@COND_i386_coreboot_TRUE@am__append_4292 = serial.mod --@COND_i386_coreboot_TRUE@am__append_4293 = serial.marker --@COND_i386_multiboot_TRUE@am__append_4294 = serial.module --@COND_i386_multiboot_TRUE@am__append_4295 = serial.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_4296 = --@COND_i386_multiboot_TRUE@am__append_4297 = $(nodist_serial_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_4298 = \ -+@COND_i386_coreboot_TRUE@am__append_4285 = serial.mod -+@COND_i386_coreboot_TRUE@am__append_4286 = serial.marker -+@COND_i386_multiboot_TRUE@am__append_4287 = serial.module -+@COND_i386_multiboot_TRUE@am__append_4288 = serial.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_4289 = -+@COND_i386_multiboot_TRUE@am__append_4290 = $(nodist_serial_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_4291 = \ - @COND_i386_multiboot_TRUE@ $(nodist_serial_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ serial.marker --@COND_i386_multiboot_TRUE@am__append_4299 = serial.mod --@COND_i386_multiboot_TRUE@am__append_4300 = serial.marker --@COND_i386_ieee1275_TRUE@am__append_4301 = serial.module --@COND_i386_ieee1275_TRUE@am__append_4302 = serial.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_4303 = --@COND_i386_ieee1275_TRUE@am__append_4304 = $(nodist_serial_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_4305 = \ -+@COND_i386_multiboot_TRUE@am__append_4292 = serial.mod -+@COND_i386_multiboot_TRUE@am__append_4293 = serial.marker -+@COND_i386_ieee1275_TRUE@am__append_4294 = serial.module -+@COND_i386_ieee1275_TRUE@am__append_4295 = serial.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_4296 = -+@COND_i386_ieee1275_TRUE@am__append_4297 = $(nodist_serial_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_4298 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_serial_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ serial.marker --@COND_i386_ieee1275_TRUE@am__append_4306 = serial.mod --@COND_i386_ieee1275_TRUE@am__append_4307 = serial.marker --@COND_x86_64_efi_TRUE@am__append_4308 = serial.module --@COND_x86_64_efi_TRUE@am__append_4309 = serial.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_4310 = --@COND_x86_64_efi_TRUE@am__append_4311 = $(nodist_serial_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_4312 = \ -+@COND_i386_ieee1275_TRUE@am__append_4299 = serial.mod -+@COND_i386_ieee1275_TRUE@am__append_4300 = serial.marker -+@COND_x86_64_efi_TRUE@am__append_4301 = serial.module -+@COND_x86_64_efi_TRUE@am__append_4302 = serial.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_4303 = -+@COND_x86_64_efi_TRUE@am__append_4304 = $(nodist_serial_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_4305 = \ - @COND_x86_64_efi_TRUE@ $(nodist_serial_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ serial.marker --@COND_x86_64_efi_TRUE@am__append_4313 = serial.mod --@COND_x86_64_efi_TRUE@am__append_4314 = serial.marker --@COND_sparc64_ieee1275_TRUE@am__append_4315 = serial.module --@COND_sparc64_ieee1275_TRUE@am__append_4316 = serial.module$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@am__append_4317 = --@COND_sparc64_ieee1275_TRUE@am__append_4318 = $(nodist_serial_module_SOURCES) --@COND_sparc64_ieee1275_TRUE@am__append_4319 = \ -+@COND_x86_64_efi_TRUE@am__append_4306 = serial.mod -+@COND_x86_64_efi_TRUE@am__append_4307 = serial.marker -+@COND_sparc64_ieee1275_TRUE@am__append_4308 = serial.module -+@COND_sparc64_ieee1275_TRUE@am__append_4309 = serial.module$(EXEEXT) -+@COND_sparc64_ieee1275_TRUE@am__append_4310 = -+@COND_sparc64_ieee1275_TRUE@am__append_4311 = $(nodist_serial_module_SOURCES) -+@COND_sparc64_ieee1275_TRUE@am__append_4312 = \ - @COND_sparc64_ieee1275_TRUE@ $(nodist_serial_module_SOURCES) \ - @COND_sparc64_ieee1275_TRUE@ serial.marker --@COND_sparc64_ieee1275_TRUE@am__append_4320 = serial.mod --@COND_sparc64_ieee1275_TRUE@am__append_4321 = serial.marker --@COND_powerpc_ieee1275_TRUE@am__append_4322 = serial.module --@COND_powerpc_ieee1275_TRUE@am__append_4323 = serial.module$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__append_4324 = --@COND_powerpc_ieee1275_TRUE@am__append_4325 = $(nodist_serial_module_SOURCES) --@COND_powerpc_ieee1275_TRUE@am__append_4326 = \ -+@COND_sparc64_ieee1275_TRUE@am__append_4313 = serial.mod -+@COND_sparc64_ieee1275_TRUE@am__append_4314 = serial.marker -+@COND_powerpc_ieee1275_TRUE@am__append_4315 = serial.module -+@COND_powerpc_ieee1275_TRUE@am__append_4316 = serial.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__append_4317 = -+@COND_powerpc_ieee1275_TRUE@am__append_4318 = $(nodist_serial_module_SOURCES) -+@COND_powerpc_ieee1275_TRUE@am__append_4319 = \ - @COND_powerpc_ieee1275_TRUE@ $(nodist_serial_module_SOURCES) \ - @COND_powerpc_ieee1275_TRUE@ serial.marker --@COND_powerpc_ieee1275_TRUE@am__append_4327 = serial.mod --@COND_powerpc_ieee1275_TRUE@am__append_4328 = serial.marker --@COND_mips_arc_TRUE@am__append_4329 = serial.module --@COND_mips_arc_TRUE@am__append_4330 = serial.module$(EXEEXT) --@COND_mips_arc_TRUE@am__append_4331 = --@COND_mips_arc_TRUE@am__append_4332 = $(nodist_serial_module_SOURCES) --@COND_mips_arc_TRUE@am__append_4333 = $(nodist_serial_module_SOURCES) \ -+@COND_powerpc_ieee1275_TRUE@am__append_4320 = serial.mod -+@COND_powerpc_ieee1275_TRUE@am__append_4321 = serial.marker -+@COND_mips_arc_TRUE@am__append_4322 = serial.module -+@COND_mips_arc_TRUE@am__append_4323 = serial.module$(EXEEXT) -+@COND_mips_arc_TRUE@am__append_4324 = -+@COND_mips_arc_TRUE@am__append_4325 = $(nodist_serial_module_SOURCES) -+@COND_mips_arc_TRUE@am__append_4326 = $(nodist_serial_module_SOURCES) \ - @COND_mips_arc_TRUE@ serial.marker --@COND_mips_arc_TRUE@am__append_4334 = serial.mod --@COND_mips_arc_TRUE@am__append_4335 = serial.marker --@COND_ia64_efi_TRUE@am__append_4336 = serial.module --@COND_ia64_efi_TRUE@am__append_4337 = serial.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__append_4338 = --@COND_ia64_efi_TRUE@am__append_4339 = $(nodist_serial_module_SOURCES) --@COND_ia64_efi_TRUE@am__append_4340 = $(nodist_serial_module_SOURCES) \ -+@COND_mips_arc_TRUE@am__append_4327 = serial.mod -+@COND_mips_arc_TRUE@am__append_4328 = serial.marker -+@COND_ia64_efi_TRUE@am__append_4329 = serial.module -+@COND_ia64_efi_TRUE@am__append_4330 = serial.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__append_4331 = -+@COND_ia64_efi_TRUE@am__append_4332 = $(nodist_serial_module_SOURCES) -+@COND_ia64_efi_TRUE@am__append_4333 = $(nodist_serial_module_SOURCES) \ - @COND_ia64_efi_TRUE@ serial.marker --@COND_ia64_efi_TRUE@am__append_4341 = serial.mod --@COND_ia64_efi_TRUE@am__append_4342 = serial.marker --@COND_arm_efi_TRUE@am__append_4343 = serial.module --@COND_arm_efi_TRUE@am__append_4344 = serial.module$(EXEEXT) --@COND_arm_efi_TRUE@am__append_4345 = --@COND_arm_efi_TRUE@am__append_4346 = $(nodist_serial_module_SOURCES) --@COND_arm_efi_TRUE@am__append_4347 = $(nodist_serial_module_SOURCES) \ -+@COND_ia64_efi_TRUE@am__append_4334 = serial.mod -+@COND_ia64_efi_TRUE@am__append_4335 = serial.marker -+@COND_arm_efi_TRUE@am__append_4336 = serial.module -+@COND_arm_efi_TRUE@am__append_4337 = serial.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__append_4338 = -+@COND_arm_efi_TRUE@am__append_4339 = $(nodist_serial_module_SOURCES) -+@COND_arm_efi_TRUE@am__append_4340 = $(nodist_serial_module_SOURCES) \ - @COND_arm_efi_TRUE@ serial.marker --@COND_arm_efi_TRUE@am__append_4348 = serial.mod --@COND_arm_efi_TRUE@am__append_4349 = serial.marker --@COND_arm64_efi_TRUE@am__append_4350 = serial.module --@COND_arm64_efi_TRUE@am__append_4351 = serial.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__append_4352 = --@COND_arm64_efi_TRUE@am__append_4353 = $(nodist_serial_module_SOURCES) --@COND_arm64_efi_TRUE@am__append_4354 = \ -+@COND_arm_efi_TRUE@am__append_4341 = serial.mod -+@COND_arm_efi_TRUE@am__append_4342 = serial.marker -+@COND_arm64_efi_TRUE@am__append_4343 = serial.module -+@COND_arm64_efi_TRUE@am__append_4344 = serial.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__append_4345 = -+@COND_arm64_efi_TRUE@am__append_4346 = $(nodist_serial_module_SOURCES) -+@COND_arm64_efi_TRUE@am__append_4347 = \ - @COND_arm64_efi_TRUE@ $(nodist_serial_module_SOURCES) \ - @COND_arm64_efi_TRUE@ serial.marker --@COND_arm64_efi_TRUE@am__append_4355 = serial.mod --@COND_arm64_efi_TRUE@am__append_4356 = serial.marker --@COND_arm_coreboot_TRUE@am__append_4357 = serial.module --@COND_arm_coreboot_TRUE@am__append_4358 = serial.module$(EXEEXT) --@COND_arm_coreboot_TRUE@am__append_4359 = --@COND_arm_coreboot_TRUE@am__append_4360 = $(nodist_serial_module_SOURCES) --@COND_arm_coreboot_TRUE@am__append_4361 = \ -+@COND_arm64_efi_TRUE@am__append_4348 = serial.mod -+@COND_arm64_efi_TRUE@am__append_4349 = serial.marker -+@COND_arm_coreboot_TRUE@am__append_4350 = serial.module -+@COND_arm_coreboot_TRUE@am__append_4351 = serial.module$(EXEEXT) -+@COND_arm_coreboot_TRUE@am__append_4352 = -+@COND_arm_coreboot_TRUE@am__append_4353 = $(nodist_serial_module_SOURCES) -+@COND_arm_coreboot_TRUE@am__append_4354 = \ - @COND_arm_coreboot_TRUE@ $(nodist_serial_module_SOURCES) \ - @COND_arm_coreboot_TRUE@ serial.marker --@COND_arm_coreboot_TRUE@am__append_4362 = serial.mod --@COND_arm_coreboot_TRUE@am__append_4363 = serial.marker --@COND_riscv32_efi_TRUE@am__append_4364 = serial.module --@COND_riscv32_efi_TRUE@am__append_4365 = serial.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__append_4366 = --@COND_riscv32_efi_TRUE@am__append_4367 = $(nodist_serial_module_SOURCES) --@COND_riscv32_efi_TRUE@am__append_4368 = \ -+@COND_arm_coreboot_TRUE@am__append_4355 = serial.mod -+@COND_arm_coreboot_TRUE@am__append_4356 = serial.marker -+@COND_riscv32_efi_TRUE@am__append_4357 = serial.module -+@COND_riscv32_efi_TRUE@am__append_4358 = serial.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__append_4359 = -+@COND_riscv32_efi_TRUE@am__append_4360 = $(nodist_serial_module_SOURCES) -+@COND_riscv32_efi_TRUE@am__append_4361 = \ - @COND_riscv32_efi_TRUE@ $(nodist_serial_module_SOURCES) \ - @COND_riscv32_efi_TRUE@ serial.marker --@COND_riscv32_efi_TRUE@am__append_4369 = serial.mod --@COND_riscv32_efi_TRUE@am__append_4370 = serial.marker --@COND_riscv64_efi_TRUE@am__append_4371 = serial.module --@COND_riscv64_efi_TRUE@am__append_4372 = serial.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__append_4373 = --@COND_riscv64_efi_TRUE@am__append_4374 = $(nodist_serial_module_SOURCES) --@COND_riscv64_efi_TRUE@am__append_4375 = \ -+@COND_riscv32_efi_TRUE@am__append_4362 = serial.mod -+@COND_riscv32_efi_TRUE@am__append_4363 = serial.marker -+@COND_riscv64_efi_TRUE@am__append_4364 = serial.module -+@COND_riscv64_efi_TRUE@am__append_4365 = serial.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_4366 = -+@COND_riscv64_efi_TRUE@am__append_4367 = $(nodist_serial_module_SOURCES) -+@COND_riscv64_efi_TRUE@am__append_4368 = \ - @COND_riscv64_efi_TRUE@ $(nodist_serial_module_SOURCES) \ - @COND_riscv64_efi_TRUE@ serial.marker --@COND_riscv64_efi_TRUE@am__append_4376 = serial.mod --@COND_riscv64_efi_TRUE@am__append_4377 = serial.marker --@COND_i386_pc_TRUE@am__append_4378 = sendkey.module terminfo.module --@COND_i386_pc_TRUE@am__append_4379 = sendkey.module$(EXEEXT) \ -+@COND_riscv64_efi_TRUE@am__append_4369 = serial.mod -+@COND_riscv64_efi_TRUE@am__append_4370 = serial.marker -+@COND_i386_pc_TRUE@am__append_4371 = sendkey.module terminfo.module -+@COND_i386_pc_TRUE@am__append_4372 = sendkey.module$(EXEEXT) \ - @COND_i386_pc_TRUE@ terminfo.module$(EXEEXT) - @COND_i386_pc_FALSE@sendkey_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_4380 = --@COND_i386_pc_TRUE@am__append_4381 = $(nodist_sendkey_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_4373 = -+@COND_i386_pc_TRUE@am__append_4374 = $(nodist_sendkey_module_SOURCES) \ - @COND_i386_pc_TRUE@ $(nodist_terminfo_module_SOURCES) --@COND_i386_pc_TRUE@am__append_4382 = $(nodist_sendkey_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_4375 = $(nodist_sendkey_module_SOURCES) \ - @COND_i386_pc_TRUE@ sendkey.marker \ - @COND_i386_pc_TRUE@ $(nodist_terminfo_module_SOURCES) \ - @COND_i386_pc_TRUE@ terminfo.marker --@COND_i386_pc_TRUE@am__append_4383 = sendkey.mod terminfo.mod --@COND_i386_pc_TRUE@am__append_4384 = sendkey.marker terminfo.marker -+@COND_i386_pc_TRUE@am__append_4376 = sendkey.mod terminfo.mod -+@COND_i386_pc_TRUE@am__append_4377 = sendkey.marker terminfo.marker - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_ia64_efi_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_x86_64_efi_FALSE@terminfo_module_DEPENDENCIES = --@COND_i386_efi_TRUE@am__append_4385 = terminfo.module --@COND_i386_efi_TRUE@am__append_4386 = terminfo.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_4387 = --@COND_i386_efi_TRUE@am__append_4388 = $(nodist_terminfo_module_SOURCES) --@COND_i386_efi_TRUE@am__append_4389 = \ -+@COND_i386_efi_TRUE@am__append_4378 = terminfo.module -+@COND_i386_efi_TRUE@am__append_4379 = terminfo.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_4380 = -+@COND_i386_efi_TRUE@am__append_4381 = $(nodist_terminfo_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_4382 = \ - @COND_i386_efi_TRUE@ $(nodist_terminfo_module_SOURCES) \ - @COND_i386_efi_TRUE@ terminfo.marker --@COND_i386_efi_TRUE@am__append_4390 = terminfo.mod --@COND_i386_efi_TRUE@am__append_4391 = terminfo.marker --@COND_i386_qemu_TRUE@am__append_4392 = terminfo.module --@COND_i386_qemu_TRUE@am__append_4393 = terminfo.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_4394 = --@COND_i386_qemu_TRUE@am__append_4395 = $(nodist_terminfo_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_4396 = \ -+@COND_i386_efi_TRUE@am__append_4383 = terminfo.mod -+@COND_i386_efi_TRUE@am__append_4384 = terminfo.marker -+@COND_i386_qemu_TRUE@am__append_4385 = terminfo.module -+@COND_i386_qemu_TRUE@am__append_4386 = terminfo.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_4387 = -+@COND_i386_qemu_TRUE@am__append_4388 = $(nodist_terminfo_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_4389 = \ - @COND_i386_qemu_TRUE@ $(nodist_terminfo_module_SOURCES) \ - @COND_i386_qemu_TRUE@ terminfo.marker --@COND_i386_qemu_TRUE@am__append_4397 = terminfo.mod --@COND_i386_qemu_TRUE@am__append_4398 = terminfo.marker --@COND_i386_coreboot_TRUE@am__append_4399 = terminfo.module --@COND_i386_coreboot_TRUE@am__append_4400 = terminfo.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_4401 = --@COND_i386_coreboot_TRUE@am__append_4402 = $(nodist_terminfo_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_4403 = \ -+@COND_i386_qemu_TRUE@am__append_4390 = terminfo.mod -+@COND_i386_qemu_TRUE@am__append_4391 = terminfo.marker -+@COND_i386_coreboot_TRUE@am__append_4392 = terminfo.module -+@COND_i386_coreboot_TRUE@am__append_4393 = terminfo.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_4394 = -+@COND_i386_coreboot_TRUE@am__append_4395 = $(nodist_terminfo_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_4396 = \ - @COND_i386_coreboot_TRUE@ $(nodist_terminfo_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ terminfo.marker --@COND_i386_coreboot_TRUE@am__append_4404 = terminfo.mod --@COND_i386_coreboot_TRUE@am__append_4405 = terminfo.marker --@COND_i386_multiboot_TRUE@am__append_4406 = terminfo.module --@COND_i386_multiboot_TRUE@am__append_4407 = terminfo.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_4408 = --@COND_i386_multiboot_TRUE@am__append_4409 = $(nodist_terminfo_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_4410 = \ -+@COND_i386_coreboot_TRUE@am__append_4397 = terminfo.mod -+@COND_i386_coreboot_TRUE@am__append_4398 = terminfo.marker -+@COND_i386_multiboot_TRUE@am__append_4399 = terminfo.module -+@COND_i386_multiboot_TRUE@am__append_4400 = terminfo.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_4401 = -+@COND_i386_multiboot_TRUE@am__append_4402 = $(nodist_terminfo_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_4403 = \ - @COND_i386_multiboot_TRUE@ $(nodist_terminfo_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ terminfo.marker --@COND_i386_multiboot_TRUE@am__append_4411 = terminfo.mod --@COND_i386_multiboot_TRUE@am__append_4412 = terminfo.marker --@COND_x86_64_efi_TRUE@am__append_4413 = terminfo.module --@COND_x86_64_efi_TRUE@am__append_4414 = terminfo.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_4415 = --@COND_x86_64_efi_TRUE@am__append_4416 = $(nodist_terminfo_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_4417 = \ -+@COND_i386_multiboot_TRUE@am__append_4404 = terminfo.mod -+@COND_i386_multiboot_TRUE@am__append_4405 = terminfo.marker -+@COND_x86_64_efi_TRUE@am__append_4406 = terminfo.module -+@COND_x86_64_efi_TRUE@am__append_4407 = terminfo.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_4408 = -+@COND_x86_64_efi_TRUE@am__append_4409 = $(nodist_terminfo_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_4410 = \ - @COND_x86_64_efi_TRUE@ $(nodist_terminfo_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ terminfo.marker --@COND_x86_64_efi_TRUE@am__append_4418 = terminfo.mod --@COND_x86_64_efi_TRUE@am__append_4419 = terminfo.marker --@COND_ia64_efi_TRUE@am__append_4420 = terminfo.module --@COND_ia64_efi_TRUE@am__append_4421 = terminfo.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__append_4422 = --@COND_ia64_efi_TRUE@am__append_4423 = $(nodist_terminfo_module_SOURCES) --@COND_ia64_efi_TRUE@am__append_4424 = \ -+@COND_x86_64_efi_TRUE@am__append_4411 = terminfo.mod -+@COND_x86_64_efi_TRUE@am__append_4412 = terminfo.marker -+@COND_ia64_efi_TRUE@am__append_4413 = terminfo.module -+@COND_ia64_efi_TRUE@am__append_4414 = terminfo.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__append_4415 = -+@COND_ia64_efi_TRUE@am__append_4416 = $(nodist_terminfo_module_SOURCES) -+@COND_ia64_efi_TRUE@am__append_4417 = \ - @COND_ia64_efi_TRUE@ $(nodist_terminfo_module_SOURCES) \ - @COND_ia64_efi_TRUE@ terminfo.marker --@COND_ia64_efi_TRUE@am__append_4425 = terminfo.mod --@COND_ia64_efi_TRUE@am__append_4426 = terminfo.marker --@COND_arm_efi_TRUE@am__append_4427 = terminfo.module --@COND_arm_efi_TRUE@am__append_4428 = terminfo.module$(EXEEXT) --@COND_arm_efi_TRUE@am__append_4429 = --@COND_arm_efi_TRUE@am__append_4430 = $(nodist_terminfo_module_SOURCES) --@COND_arm_efi_TRUE@am__append_4431 = \ -+@COND_ia64_efi_TRUE@am__append_4418 = terminfo.mod -+@COND_ia64_efi_TRUE@am__append_4419 = terminfo.marker -+@COND_arm_efi_TRUE@am__append_4420 = terminfo.module -+@COND_arm_efi_TRUE@am__append_4421 = terminfo.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__append_4422 = -+@COND_arm_efi_TRUE@am__append_4423 = $(nodist_terminfo_module_SOURCES) -+@COND_arm_efi_TRUE@am__append_4424 = \ - @COND_arm_efi_TRUE@ $(nodist_terminfo_module_SOURCES) \ - @COND_arm_efi_TRUE@ terminfo.marker --@COND_arm_efi_TRUE@am__append_4432 = terminfo.mod --@COND_arm_efi_TRUE@am__append_4433 = terminfo.marker --@COND_arm64_efi_TRUE@am__append_4434 = terminfo.module --@COND_arm64_efi_TRUE@am__append_4435 = terminfo.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__append_4436 = --@COND_arm64_efi_TRUE@am__append_4437 = $(nodist_terminfo_module_SOURCES) --@COND_arm64_efi_TRUE@am__append_4438 = \ -+@COND_arm_efi_TRUE@am__append_4425 = terminfo.mod -+@COND_arm_efi_TRUE@am__append_4426 = terminfo.marker -+@COND_arm64_efi_TRUE@am__append_4427 = terminfo.module -+@COND_arm64_efi_TRUE@am__append_4428 = terminfo.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__append_4429 = -+@COND_arm64_efi_TRUE@am__append_4430 = $(nodist_terminfo_module_SOURCES) -+@COND_arm64_efi_TRUE@am__append_4431 = \ - @COND_arm64_efi_TRUE@ $(nodist_terminfo_module_SOURCES) \ - @COND_arm64_efi_TRUE@ terminfo.marker --@COND_arm64_efi_TRUE@am__append_4439 = terminfo.mod --@COND_arm64_efi_TRUE@am__append_4440 = terminfo.marker --@COND_arm_coreboot_TRUE@am__append_4441 = terminfo.module --@COND_arm_coreboot_TRUE@am__append_4442 = terminfo.module$(EXEEXT) --@COND_arm_coreboot_TRUE@am__append_4443 = --@COND_arm_coreboot_TRUE@am__append_4444 = $(nodist_terminfo_module_SOURCES) --@COND_arm_coreboot_TRUE@am__append_4445 = \ -+@COND_arm64_efi_TRUE@am__append_4432 = terminfo.mod -+@COND_arm64_efi_TRUE@am__append_4433 = terminfo.marker -+@COND_arm_coreboot_TRUE@am__append_4434 = terminfo.module -+@COND_arm_coreboot_TRUE@am__append_4435 = terminfo.module$(EXEEXT) -+@COND_arm_coreboot_TRUE@am__append_4436 = -+@COND_arm_coreboot_TRUE@am__append_4437 = $(nodist_terminfo_module_SOURCES) -+@COND_arm_coreboot_TRUE@am__append_4438 = \ - @COND_arm_coreboot_TRUE@ $(nodist_terminfo_module_SOURCES) \ - @COND_arm_coreboot_TRUE@ terminfo.marker --@COND_arm_coreboot_TRUE@am__append_4446 = terminfo.mod --@COND_arm_coreboot_TRUE@am__append_4447 = terminfo.marker --@COND_riscv32_efi_TRUE@am__append_4448 = terminfo.module --@COND_riscv32_efi_TRUE@am__append_4449 = terminfo.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__append_4450 = --@COND_riscv32_efi_TRUE@am__append_4451 = $(nodist_terminfo_module_SOURCES) --@COND_riscv32_efi_TRUE@am__append_4452 = \ -+@COND_arm_coreboot_TRUE@am__append_4439 = terminfo.mod -+@COND_arm_coreboot_TRUE@am__append_4440 = terminfo.marker -+@COND_riscv32_efi_TRUE@am__append_4441 = terminfo.module -+@COND_riscv32_efi_TRUE@am__append_4442 = terminfo.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__append_4443 = -+@COND_riscv32_efi_TRUE@am__append_4444 = $(nodist_terminfo_module_SOURCES) -+@COND_riscv32_efi_TRUE@am__append_4445 = \ - @COND_riscv32_efi_TRUE@ $(nodist_terminfo_module_SOURCES) \ - @COND_riscv32_efi_TRUE@ terminfo.marker --@COND_riscv32_efi_TRUE@am__append_4453 = terminfo.mod --@COND_riscv32_efi_TRUE@am__append_4454 = terminfo.marker --@COND_riscv64_efi_TRUE@am__append_4455 = terminfo.module --@COND_riscv64_efi_TRUE@am__append_4456 = terminfo.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__append_4457 = --@COND_riscv64_efi_TRUE@am__append_4458 = $(nodist_terminfo_module_SOURCES) --@COND_riscv64_efi_TRUE@am__append_4459 = \ -+@COND_riscv32_efi_TRUE@am__append_4446 = terminfo.mod -+@COND_riscv32_efi_TRUE@am__append_4447 = terminfo.marker -+@COND_riscv64_efi_TRUE@am__append_4448 = terminfo.module -+@COND_riscv64_efi_TRUE@am__append_4449 = terminfo.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_4450 = -+@COND_riscv64_efi_TRUE@am__append_4451 = $(nodist_terminfo_module_SOURCES) -+@COND_riscv64_efi_TRUE@am__append_4452 = \ - @COND_riscv64_efi_TRUE@ $(nodist_terminfo_module_SOURCES) \ - @COND_riscv64_efi_TRUE@ terminfo.marker --@COND_riscv64_efi_TRUE@am__append_4460 = terminfo.mod --@COND_riscv64_efi_TRUE@am__append_4461 = terminfo.marker --@COND_i386_pc_TRUE@am__append_4462 = usb_keyboard.module --@COND_i386_pc_TRUE@am__append_4463 = usb_keyboard.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_4453 = terminfo.mod -+@COND_riscv64_efi_TRUE@am__append_4454 = terminfo.marker -+@COND_i386_pc_TRUE@am__append_4455 = usb_keyboard.module -+@COND_i386_pc_TRUE@am__append_4456 = usb_keyboard.module$(EXEEXT) - @COND_arm_coreboot_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_mips_loongson_FALSE@@COND_x86_64_efi_FALSE@usb_keyboard_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_4464 = --@COND_i386_pc_TRUE@am__append_4465 = $(nodist_usb_keyboard_module_SOURCES) --@COND_i386_pc_TRUE@am__append_4466 = \ -+@COND_i386_pc_TRUE@am__append_4457 = -+@COND_i386_pc_TRUE@am__append_4458 = $(nodist_usb_keyboard_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_4459 = \ - @COND_i386_pc_TRUE@ $(nodist_usb_keyboard_module_SOURCES) \ - @COND_i386_pc_TRUE@ usb_keyboard.marker --@COND_i386_pc_TRUE@am__append_4467 = usb_keyboard.mod --@COND_i386_pc_TRUE@am__append_4468 = usb_keyboard.marker --@COND_i386_efi_TRUE@am__append_4469 = usb_keyboard.module --@COND_i386_efi_TRUE@am__append_4470 = usb_keyboard.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_4471 = --@COND_i386_efi_TRUE@am__append_4472 = $(nodist_usb_keyboard_module_SOURCES) --@COND_i386_efi_TRUE@am__append_4473 = \ -+@COND_i386_pc_TRUE@am__append_4460 = usb_keyboard.mod -+@COND_i386_pc_TRUE@am__append_4461 = usb_keyboard.marker -+@COND_i386_efi_TRUE@am__append_4462 = usb_keyboard.module -+@COND_i386_efi_TRUE@am__append_4463 = usb_keyboard.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_4464 = -+@COND_i386_efi_TRUE@am__append_4465 = $(nodist_usb_keyboard_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_4466 = \ - @COND_i386_efi_TRUE@ $(nodist_usb_keyboard_module_SOURCES) \ - @COND_i386_efi_TRUE@ usb_keyboard.marker --@COND_i386_efi_TRUE@am__append_4474 = usb_keyboard.mod --@COND_i386_efi_TRUE@am__append_4475 = usb_keyboard.marker --@COND_i386_qemu_TRUE@am__append_4476 = usb_keyboard.module --@COND_i386_qemu_TRUE@am__append_4477 = usb_keyboard.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_4478 = --@COND_i386_qemu_TRUE@am__append_4479 = $(nodist_usb_keyboard_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_4480 = \ -+@COND_i386_efi_TRUE@am__append_4467 = usb_keyboard.mod -+@COND_i386_efi_TRUE@am__append_4468 = usb_keyboard.marker -+@COND_i386_qemu_TRUE@am__append_4469 = usb_keyboard.module -+@COND_i386_qemu_TRUE@am__append_4470 = usb_keyboard.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_4471 = -+@COND_i386_qemu_TRUE@am__append_4472 = $(nodist_usb_keyboard_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_4473 = \ - @COND_i386_qemu_TRUE@ $(nodist_usb_keyboard_module_SOURCES) \ - @COND_i386_qemu_TRUE@ usb_keyboard.marker --@COND_i386_qemu_TRUE@am__append_4481 = usb_keyboard.mod --@COND_i386_qemu_TRUE@am__append_4482 = usb_keyboard.marker --@COND_i386_coreboot_TRUE@am__append_4483 = usb_keyboard.module --@COND_i386_coreboot_TRUE@am__append_4484 = usb_keyboard.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_4485 = --@COND_i386_coreboot_TRUE@am__append_4486 = $(nodist_usb_keyboard_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_4487 = $(nodist_usb_keyboard_module_SOURCES) \ -+@COND_i386_qemu_TRUE@am__append_4474 = usb_keyboard.mod -+@COND_i386_qemu_TRUE@am__append_4475 = usb_keyboard.marker -+@COND_i386_coreboot_TRUE@am__append_4476 = usb_keyboard.module -+@COND_i386_coreboot_TRUE@am__append_4477 = usb_keyboard.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_4478 = -+@COND_i386_coreboot_TRUE@am__append_4479 = $(nodist_usb_keyboard_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_4480 = $(nodist_usb_keyboard_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ usb_keyboard.marker --@COND_i386_coreboot_TRUE@am__append_4488 = usb_keyboard.mod --@COND_i386_coreboot_TRUE@am__append_4489 = usb_keyboard.marker --@COND_i386_multiboot_TRUE@am__append_4490 = usb_keyboard.module --@COND_i386_multiboot_TRUE@am__append_4491 = usb_keyboard.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_4492 = --@COND_i386_multiboot_TRUE@am__append_4493 = $(nodist_usb_keyboard_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_4494 = $(nodist_usb_keyboard_module_SOURCES) \ -+@COND_i386_coreboot_TRUE@am__append_4481 = usb_keyboard.mod -+@COND_i386_coreboot_TRUE@am__append_4482 = usb_keyboard.marker -+@COND_i386_multiboot_TRUE@am__append_4483 = usb_keyboard.module -+@COND_i386_multiboot_TRUE@am__append_4484 = usb_keyboard.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_4485 = -+@COND_i386_multiboot_TRUE@am__append_4486 = $(nodist_usb_keyboard_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_4487 = $(nodist_usb_keyboard_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ usb_keyboard.marker --@COND_i386_multiboot_TRUE@am__append_4495 = usb_keyboard.mod --@COND_i386_multiboot_TRUE@am__append_4496 = usb_keyboard.marker --@COND_i386_ieee1275_TRUE@am__append_4497 = usb_keyboard.module --@COND_i386_ieee1275_TRUE@am__append_4498 = usb_keyboard.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_4499 = --@COND_i386_ieee1275_TRUE@am__append_4500 = $(nodist_usb_keyboard_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_4501 = $(nodist_usb_keyboard_module_SOURCES) \ -+@COND_i386_multiboot_TRUE@am__append_4488 = usb_keyboard.mod -+@COND_i386_multiboot_TRUE@am__append_4489 = usb_keyboard.marker -+@COND_i386_ieee1275_TRUE@am__append_4490 = usb_keyboard.module -+@COND_i386_ieee1275_TRUE@am__append_4491 = usb_keyboard.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_4492 = -+@COND_i386_ieee1275_TRUE@am__append_4493 = $(nodist_usb_keyboard_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_4494 = $(nodist_usb_keyboard_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ usb_keyboard.marker --@COND_i386_ieee1275_TRUE@am__append_4502 = usb_keyboard.mod --@COND_i386_ieee1275_TRUE@am__append_4503 = usb_keyboard.marker --@COND_x86_64_efi_TRUE@am__append_4504 = usb_keyboard.module --@COND_x86_64_efi_TRUE@am__append_4505 = usb_keyboard.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_4506 = --@COND_x86_64_efi_TRUE@am__append_4507 = $(nodist_usb_keyboard_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_4508 = \ -+@COND_i386_ieee1275_TRUE@am__append_4495 = usb_keyboard.mod -+@COND_i386_ieee1275_TRUE@am__append_4496 = usb_keyboard.marker -+@COND_x86_64_efi_TRUE@am__append_4497 = usb_keyboard.module -+@COND_x86_64_efi_TRUE@am__append_4498 = usb_keyboard.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_4499 = -+@COND_x86_64_efi_TRUE@am__append_4500 = $(nodist_usb_keyboard_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_4501 = \ - @COND_x86_64_efi_TRUE@ $(nodist_usb_keyboard_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ usb_keyboard.marker --@COND_x86_64_efi_TRUE@am__append_4509 = usb_keyboard.mod --@COND_x86_64_efi_TRUE@am__append_4510 = usb_keyboard.marker --@COND_mips_loongson_TRUE@am__append_4511 = usb_keyboard.module --@COND_mips_loongson_TRUE@am__append_4512 = usb_keyboard.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__append_4513 = --@COND_mips_loongson_TRUE@am__append_4514 = $(nodist_usb_keyboard_module_SOURCES) --@COND_mips_loongson_TRUE@am__append_4515 = $(nodist_usb_keyboard_module_SOURCES) \ -+@COND_x86_64_efi_TRUE@am__append_4502 = usb_keyboard.mod -+@COND_x86_64_efi_TRUE@am__append_4503 = usb_keyboard.marker -+@COND_mips_loongson_TRUE@am__append_4504 = usb_keyboard.module -+@COND_mips_loongson_TRUE@am__append_4505 = usb_keyboard.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__append_4506 = -+@COND_mips_loongson_TRUE@am__append_4507 = $(nodist_usb_keyboard_module_SOURCES) -+@COND_mips_loongson_TRUE@am__append_4508 = $(nodist_usb_keyboard_module_SOURCES) \ - @COND_mips_loongson_TRUE@ usb_keyboard.marker --@COND_mips_loongson_TRUE@am__append_4516 = usb_keyboard.mod --@COND_mips_loongson_TRUE@am__append_4517 = usb_keyboard.marker --@COND_arm_coreboot_TRUE@am__append_4518 = usb_keyboard.module --@COND_arm_coreboot_TRUE@am__append_4519 = usb_keyboard.module$(EXEEXT) --@COND_arm_coreboot_TRUE@am__append_4520 = --@COND_arm_coreboot_TRUE@am__append_4521 = $(nodist_usb_keyboard_module_SOURCES) --@COND_arm_coreboot_TRUE@am__append_4522 = \ -+@COND_mips_loongson_TRUE@am__append_4509 = usb_keyboard.mod -+@COND_mips_loongson_TRUE@am__append_4510 = usb_keyboard.marker -+@COND_arm_coreboot_TRUE@am__append_4511 = usb_keyboard.module -+@COND_arm_coreboot_TRUE@am__append_4512 = usb_keyboard.module$(EXEEXT) -+@COND_arm_coreboot_TRUE@am__append_4513 = -+@COND_arm_coreboot_TRUE@am__append_4514 = $(nodist_usb_keyboard_module_SOURCES) -+@COND_arm_coreboot_TRUE@am__append_4515 = \ - @COND_arm_coreboot_TRUE@ $(nodist_usb_keyboard_module_SOURCES) \ - @COND_arm_coreboot_TRUE@ usb_keyboard.marker --@COND_arm_coreboot_TRUE@am__append_4523 = usb_keyboard.mod --@COND_arm_coreboot_TRUE@am__append_4524 = usb_keyboard.marker --@COND_i386_pc_TRUE@am__append_4525 = vga.module vga_text.module \ -+@COND_arm_coreboot_TRUE@am__append_4516 = usb_keyboard.mod -+@COND_arm_coreboot_TRUE@am__append_4517 = usb_keyboard.marker -+@COND_i386_pc_TRUE@am__append_4518 = vga.module vga_text.module \ - @COND_i386_pc_TRUE@ mda_text.module --@COND_i386_pc_TRUE@am__append_4526 = vga.module$(EXEEXT) \ -+@COND_i386_pc_TRUE@am__append_4519 = vga.module$(EXEEXT) \ - @COND_i386_pc_TRUE@ vga_text.module$(EXEEXT) \ - @COND_i386_pc_TRUE@ mda_text.module$(EXEEXT) - @COND_i386_pc_FALSE@vga_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_4527 = --@COND_i386_pc_TRUE@am__append_4528 = $(nodist_vga_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_4520 = -+@COND_i386_pc_TRUE@am__append_4521 = $(nodist_vga_module_SOURCES) \ - @COND_i386_pc_TRUE@ $(nodist_vga_text_module_SOURCES) \ - @COND_i386_pc_TRUE@ $(nodist_mda_text_module_SOURCES) --@COND_i386_pc_TRUE@am__append_4529 = $(nodist_vga_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_4522 = $(nodist_vga_module_SOURCES) \ - @COND_i386_pc_TRUE@ vga.marker \ - @COND_i386_pc_TRUE@ $(nodist_vga_text_module_SOURCES) \ - @COND_i386_pc_TRUE@ vga_text.marker \ - @COND_i386_pc_TRUE@ $(nodist_mda_text_module_SOURCES) \ - @COND_i386_pc_TRUE@ mda_text.marker --@COND_i386_pc_TRUE@am__append_4530 = vga.mod vga_text.mod mda_text.mod --@COND_i386_pc_TRUE@am__append_4531 = vga.marker vga_text.marker \ -+@COND_i386_pc_TRUE@am__append_4523 = vga.mod vga_text.mod mda_text.mod -+@COND_i386_pc_TRUE@am__append_4524 = vga.marker vga_text.marker \ - @COND_i386_pc_TRUE@ mda_text.marker - @COND_i386_pc_FALSE@vga_text_module_DEPENDENCIES = - @COND_i386_coreboot_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@mda_text_module_DEPENDENCIES = --@COND_i386_qemu_TRUE@am__append_4532 = mda_text.module --@COND_i386_qemu_TRUE@am__append_4533 = mda_text.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_4534 = --@COND_i386_qemu_TRUE@am__append_4535 = $(nodist_mda_text_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_4536 = \ -+@COND_i386_qemu_TRUE@am__append_4525 = mda_text.module -+@COND_i386_qemu_TRUE@am__append_4526 = mda_text.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_4527 = -+@COND_i386_qemu_TRUE@am__append_4528 = $(nodist_mda_text_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_4529 = \ - @COND_i386_qemu_TRUE@ $(nodist_mda_text_module_SOURCES) \ - @COND_i386_qemu_TRUE@ mda_text.marker --@COND_i386_qemu_TRUE@am__append_4537 = mda_text.mod --@COND_i386_qemu_TRUE@am__append_4538 = mda_text.marker --@COND_i386_coreboot_TRUE@am__append_4539 = mda_text.module --@COND_i386_coreboot_TRUE@am__append_4540 = mda_text.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_4541 = --@COND_i386_coreboot_TRUE@am__append_4542 = $(nodist_mda_text_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_4543 = \ -+@COND_i386_qemu_TRUE@am__append_4530 = mda_text.mod -+@COND_i386_qemu_TRUE@am__append_4531 = mda_text.marker -+@COND_i386_coreboot_TRUE@am__append_4532 = mda_text.module -+@COND_i386_coreboot_TRUE@am__append_4533 = mda_text.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_4534 = -+@COND_i386_coreboot_TRUE@am__append_4535 = $(nodist_mda_text_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_4536 = \ - @COND_i386_coreboot_TRUE@ $(nodist_mda_text_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ mda_text.marker --@COND_i386_coreboot_TRUE@am__append_4544 = mda_text.mod --@COND_i386_coreboot_TRUE@am__append_4545 = mda_text.marker --@COND_i386_multiboot_TRUE@am__append_4546 = mda_text.module --@COND_i386_multiboot_TRUE@am__append_4547 = mda_text.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_4548 = --@COND_i386_multiboot_TRUE@am__append_4549 = $(nodist_mda_text_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_4550 = \ -+@COND_i386_coreboot_TRUE@am__append_4537 = mda_text.mod -+@COND_i386_coreboot_TRUE@am__append_4538 = mda_text.marker -+@COND_i386_multiboot_TRUE@am__append_4539 = mda_text.module -+@COND_i386_multiboot_TRUE@am__append_4540 = mda_text.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_4541 = -+@COND_i386_multiboot_TRUE@am__append_4542 = $(nodist_mda_text_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_4543 = \ - @COND_i386_multiboot_TRUE@ $(nodist_mda_text_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ mda_text.marker --@COND_i386_multiboot_TRUE@am__append_4551 = mda_text.mod --@COND_i386_multiboot_TRUE@am__append_4552 = mda_text.marker --@COND_i386_pc_TRUE@am__append_4553 = video_cirrus.module --@COND_i386_pc_TRUE@am__append_4554 = video_cirrus.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_4544 = mda_text.mod -+@COND_i386_multiboot_TRUE@am__append_4545 = mda_text.marker -+@COND_i386_pc_TRUE@am__append_4546 = video_cirrus.module -+@COND_i386_pc_TRUE@am__append_4547 = video_cirrus.module$(EXEEXT) - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_x86_64_efi_FALSE@video_cirrus_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_4555 = --@COND_i386_pc_TRUE@am__append_4556 = $(nodist_video_cirrus_module_SOURCES) --@COND_i386_pc_TRUE@am__append_4557 = \ -+@COND_i386_pc_TRUE@am__append_4548 = -+@COND_i386_pc_TRUE@am__append_4549 = $(nodist_video_cirrus_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_4550 = \ - @COND_i386_pc_TRUE@ $(nodist_video_cirrus_module_SOURCES) \ - @COND_i386_pc_TRUE@ video_cirrus.marker --@COND_i386_pc_TRUE@am__append_4558 = video_cirrus.mod --@COND_i386_pc_TRUE@am__append_4559 = video_cirrus.marker --@COND_i386_efi_TRUE@am__append_4560 = video_cirrus.module --@COND_i386_efi_TRUE@am__append_4561 = video_cirrus.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_4562 = --@COND_i386_efi_TRUE@am__append_4563 = $(nodist_video_cirrus_module_SOURCES) --@COND_i386_efi_TRUE@am__append_4564 = \ -+@COND_i386_pc_TRUE@am__append_4551 = video_cirrus.mod -+@COND_i386_pc_TRUE@am__append_4552 = video_cirrus.marker -+@COND_i386_efi_TRUE@am__append_4553 = video_cirrus.module -+@COND_i386_efi_TRUE@am__append_4554 = video_cirrus.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_4555 = -+@COND_i386_efi_TRUE@am__append_4556 = $(nodist_video_cirrus_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_4557 = \ - @COND_i386_efi_TRUE@ $(nodist_video_cirrus_module_SOURCES) \ - @COND_i386_efi_TRUE@ video_cirrus.marker --@COND_i386_efi_TRUE@am__append_4565 = video_cirrus.mod --@COND_i386_efi_TRUE@am__append_4566 = video_cirrus.marker --@COND_i386_qemu_TRUE@am__append_4567 = video_cirrus.module --@COND_i386_qemu_TRUE@am__append_4568 = video_cirrus.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_4569 = --@COND_i386_qemu_TRUE@am__append_4570 = $(nodist_video_cirrus_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_4571 = \ -+@COND_i386_efi_TRUE@am__append_4558 = video_cirrus.mod -+@COND_i386_efi_TRUE@am__append_4559 = video_cirrus.marker -+@COND_i386_qemu_TRUE@am__append_4560 = video_cirrus.module -+@COND_i386_qemu_TRUE@am__append_4561 = video_cirrus.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_4562 = -+@COND_i386_qemu_TRUE@am__append_4563 = $(nodist_video_cirrus_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_4564 = \ - @COND_i386_qemu_TRUE@ $(nodist_video_cirrus_module_SOURCES) \ - @COND_i386_qemu_TRUE@ video_cirrus.marker --@COND_i386_qemu_TRUE@am__append_4572 = video_cirrus.mod --@COND_i386_qemu_TRUE@am__append_4573 = video_cirrus.marker --@COND_i386_coreboot_TRUE@am__append_4574 = video_cirrus.module --@COND_i386_coreboot_TRUE@am__append_4575 = video_cirrus.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_4576 = --@COND_i386_coreboot_TRUE@am__append_4577 = $(nodist_video_cirrus_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_4578 = $(nodist_video_cirrus_module_SOURCES) \ -+@COND_i386_qemu_TRUE@am__append_4565 = video_cirrus.mod -+@COND_i386_qemu_TRUE@am__append_4566 = video_cirrus.marker -+@COND_i386_coreboot_TRUE@am__append_4567 = video_cirrus.module -+@COND_i386_coreboot_TRUE@am__append_4568 = video_cirrus.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_4569 = -+@COND_i386_coreboot_TRUE@am__append_4570 = $(nodist_video_cirrus_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_4571 = $(nodist_video_cirrus_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ video_cirrus.marker --@COND_i386_coreboot_TRUE@am__append_4579 = video_cirrus.mod --@COND_i386_coreboot_TRUE@am__append_4580 = video_cirrus.marker --@COND_i386_multiboot_TRUE@am__append_4581 = video_cirrus.module --@COND_i386_multiboot_TRUE@am__append_4582 = video_cirrus.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_4583 = --@COND_i386_multiboot_TRUE@am__append_4584 = $(nodist_video_cirrus_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_4585 = $(nodist_video_cirrus_module_SOURCES) \ -+@COND_i386_coreboot_TRUE@am__append_4572 = video_cirrus.mod -+@COND_i386_coreboot_TRUE@am__append_4573 = video_cirrus.marker -+@COND_i386_multiboot_TRUE@am__append_4574 = video_cirrus.module -+@COND_i386_multiboot_TRUE@am__append_4575 = video_cirrus.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_4576 = -+@COND_i386_multiboot_TRUE@am__append_4577 = $(nodist_video_cirrus_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_4578 = $(nodist_video_cirrus_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ video_cirrus.marker --@COND_i386_multiboot_TRUE@am__append_4586 = video_cirrus.mod --@COND_i386_multiboot_TRUE@am__append_4587 = video_cirrus.marker --@COND_i386_ieee1275_TRUE@am__append_4588 = video_cirrus.module --@COND_i386_ieee1275_TRUE@am__append_4589 = video_cirrus.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_4590 = --@COND_i386_ieee1275_TRUE@am__append_4591 = $(nodist_video_cirrus_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_4592 = $(nodist_video_cirrus_module_SOURCES) \ -+@COND_i386_multiboot_TRUE@am__append_4579 = video_cirrus.mod -+@COND_i386_multiboot_TRUE@am__append_4580 = video_cirrus.marker -+@COND_i386_ieee1275_TRUE@am__append_4581 = video_cirrus.module -+@COND_i386_ieee1275_TRUE@am__append_4582 = video_cirrus.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_4583 = -+@COND_i386_ieee1275_TRUE@am__append_4584 = $(nodist_video_cirrus_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_4585 = $(nodist_video_cirrus_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ video_cirrus.marker --@COND_i386_ieee1275_TRUE@am__append_4593 = video_cirrus.mod --@COND_i386_ieee1275_TRUE@am__append_4594 = video_cirrus.marker --@COND_x86_64_efi_TRUE@am__append_4595 = video_cirrus.module --@COND_x86_64_efi_TRUE@am__append_4596 = video_cirrus.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_4597 = --@COND_x86_64_efi_TRUE@am__append_4598 = $(nodist_video_cirrus_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_4599 = \ -+@COND_i386_ieee1275_TRUE@am__append_4586 = video_cirrus.mod -+@COND_i386_ieee1275_TRUE@am__append_4587 = video_cirrus.marker -+@COND_x86_64_efi_TRUE@am__append_4588 = video_cirrus.module -+@COND_x86_64_efi_TRUE@am__append_4589 = video_cirrus.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_4590 = -+@COND_x86_64_efi_TRUE@am__append_4591 = $(nodist_video_cirrus_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_4592 = \ - @COND_x86_64_efi_TRUE@ $(nodist_video_cirrus_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ video_cirrus.marker --@COND_x86_64_efi_TRUE@am__append_4600 = video_cirrus.mod --@COND_x86_64_efi_TRUE@am__append_4601 = video_cirrus.marker --@COND_i386_pc_TRUE@am__append_4602 = video_bochs.module --@COND_i386_pc_TRUE@am__append_4603 = video_bochs.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_4593 = video_cirrus.mod -+@COND_x86_64_efi_TRUE@am__append_4594 = video_cirrus.marker -+@COND_i386_pc_TRUE@am__append_4595 = video_bochs.module -+@COND_i386_pc_TRUE@am__append_4596 = video_bochs.module$(EXEEXT) - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_x86_64_efi_FALSE@video_bochs_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_4604 = --@COND_i386_pc_TRUE@am__append_4605 = $(nodist_video_bochs_module_SOURCES) --@COND_i386_pc_TRUE@am__append_4606 = \ -+@COND_i386_pc_TRUE@am__append_4597 = -+@COND_i386_pc_TRUE@am__append_4598 = $(nodist_video_bochs_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_4599 = \ - @COND_i386_pc_TRUE@ $(nodist_video_bochs_module_SOURCES) \ - @COND_i386_pc_TRUE@ video_bochs.marker --@COND_i386_pc_TRUE@am__append_4607 = video_bochs.mod --@COND_i386_pc_TRUE@am__append_4608 = video_bochs.marker --@COND_i386_efi_TRUE@am__append_4609 = video_bochs.module --@COND_i386_efi_TRUE@am__append_4610 = video_bochs.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_4611 = --@COND_i386_efi_TRUE@am__append_4612 = $(nodist_video_bochs_module_SOURCES) --@COND_i386_efi_TRUE@am__append_4613 = \ -+@COND_i386_pc_TRUE@am__append_4600 = video_bochs.mod -+@COND_i386_pc_TRUE@am__append_4601 = video_bochs.marker -+@COND_i386_efi_TRUE@am__append_4602 = video_bochs.module -+@COND_i386_efi_TRUE@am__append_4603 = video_bochs.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_4604 = -+@COND_i386_efi_TRUE@am__append_4605 = $(nodist_video_bochs_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_4606 = \ - @COND_i386_efi_TRUE@ $(nodist_video_bochs_module_SOURCES) \ - @COND_i386_efi_TRUE@ video_bochs.marker --@COND_i386_efi_TRUE@am__append_4614 = video_bochs.mod --@COND_i386_efi_TRUE@am__append_4615 = video_bochs.marker --@COND_i386_qemu_TRUE@am__append_4616 = video_bochs.module --@COND_i386_qemu_TRUE@am__append_4617 = video_bochs.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_4618 = --@COND_i386_qemu_TRUE@am__append_4619 = $(nodist_video_bochs_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_4620 = \ -+@COND_i386_efi_TRUE@am__append_4607 = video_bochs.mod -+@COND_i386_efi_TRUE@am__append_4608 = video_bochs.marker -+@COND_i386_qemu_TRUE@am__append_4609 = video_bochs.module -+@COND_i386_qemu_TRUE@am__append_4610 = video_bochs.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_4611 = -+@COND_i386_qemu_TRUE@am__append_4612 = $(nodist_video_bochs_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_4613 = \ - @COND_i386_qemu_TRUE@ $(nodist_video_bochs_module_SOURCES) \ - @COND_i386_qemu_TRUE@ video_bochs.marker --@COND_i386_qemu_TRUE@am__append_4621 = video_bochs.mod --@COND_i386_qemu_TRUE@am__append_4622 = video_bochs.marker --@COND_i386_coreboot_TRUE@am__append_4623 = video_bochs.module --@COND_i386_coreboot_TRUE@am__append_4624 = video_bochs.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_4625 = --@COND_i386_coreboot_TRUE@am__append_4626 = $(nodist_video_bochs_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_4627 = \ -+@COND_i386_qemu_TRUE@am__append_4614 = video_bochs.mod -+@COND_i386_qemu_TRUE@am__append_4615 = video_bochs.marker -+@COND_i386_coreboot_TRUE@am__append_4616 = video_bochs.module -+@COND_i386_coreboot_TRUE@am__append_4617 = video_bochs.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_4618 = -+@COND_i386_coreboot_TRUE@am__append_4619 = $(nodist_video_bochs_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_4620 = \ - @COND_i386_coreboot_TRUE@ $(nodist_video_bochs_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ video_bochs.marker --@COND_i386_coreboot_TRUE@am__append_4628 = video_bochs.mod --@COND_i386_coreboot_TRUE@am__append_4629 = video_bochs.marker --@COND_i386_multiboot_TRUE@am__append_4630 = video_bochs.module --@COND_i386_multiboot_TRUE@am__append_4631 = video_bochs.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_4632 = --@COND_i386_multiboot_TRUE@am__append_4633 = $(nodist_video_bochs_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_4634 = $(nodist_video_bochs_module_SOURCES) \ -+@COND_i386_coreboot_TRUE@am__append_4621 = video_bochs.mod -+@COND_i386_coreboot_TRUE@am__append_4622 = video_bochs.marker -+@COND_i386_multiboot_TRUE@am__append_4623 = video_bochs.module -+@COND_i386_multiboot_TRUE@am__append_4624 = video_bochs.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_4625 = -+@COND_i386_multiboot_TRUE@am__append_4626 = $(nodist_video_bochs_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_4627 = $(nodist_video_bochs_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ video_bochs.marker --@COND_i386_multiboot_TRUE@am__append_4635 = video_bochs.mod --@COND_i386_multiboot_TRUE@am__append_4636 = video_bochs.marker --@COND_i386_ieee1275_TRUE@am__append_4637 = video_bochs.module --@COND_i386_ieee1275_TRUE@am__append_4638 = video_bochs.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_4639 = --@COND_i386_ieee1275_TRUE@am__append_4640 = $(nodist_video_bochs_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_4641 = \ -+@COND_i386_multiboot_TRUE@am__append_4628 = video_bochs.mod -+@COND_i386_multiboot_TRUE@am__append_4629 = video_bochs.marker -+@COND_i386_ieee1275_TRUE@am__append_4630 = video_bochs.module -+@COND_i386_ieee1275_TRUE@am__append_4631 = video_bochs.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_4632 = -+@COND_i386_ieee1275_TRUE@am__append_4633 = $(nodist_video_bochs_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_4634 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_video_bochs_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ video_bochs.marker --@COND_i386_ieee1275_TRUE@am__append_4642 = video_bochs.mod --@COND_i386_ieee1275_TRUE@am__append_4643 = video_bochs.marker --@COND_x86_64_efi_TRUE@am__append_4644 = video_bochs.module --@COND_x86_64_efi_TRUE@am__append_4645 = video_bochs.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_4646 = --@COND_x86_64_efi_TRUE@am__append_4647 = $(nodist_video_bochs_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_4648 = \ -+@COND_i386_ieee1275_TRUE@am__append_4635 = video_bochs.mod -+@COND_i386_ieee1275_TRUE@am__append_4636 = video_bochs.marker -+@COND_x86_64_efi_TRUE@am__append_4637 = video_bochs.module -+@COND_x86_64_efi_TRUE@am__append_4638 = video_bochs.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_4639 = -+@COND_x86_64_efi_TRUE@am__append_4640 = $(nodist_video_bochs_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_4641 = \ - @COND_x86_64_efi_TRUE@ $(nodist_video_bochs_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ video_bochs.marker --@COND_x86_64_efi_TRUE@am__append_4649 = video_bochs.mod --@COND_x86_64_efi_TRUE@am__append_4650 = video_bochs.marker --@COND_emu_TRUE@am__append_4651 = legacy_password_test.module --@COND_emu_TRUE@am__append_4652 = legacy_password_test.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_4642 = video_bochs.mod -+@COND_x86_64_efi_TRUE@am__append_4643 = video_bochs.marker -+@COND_emu_TRUE@am__append_4644 = legacy_password_test.module -+@COND_emu_TRUE@am__append_4645 = legacy_password_test.module$(EXEEXT) - @COND_emu_FALSE@@COND_i386_efi_FALSE@@COND_i386_pc_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_FALSE@legacy_password_test_module_DEPENDENCIES = --@COND_emu_TRUE@am__append_4653 = --@COND_emu_TRUE@am__append_4654 = $(nodist_legacy_password_test_module_SOURCES) --@COND_emu_TRUE@am__append_4655 = \ -+@COND_emu_TRUE@am__append_4646 = -+@COND_emu_TRUE@am__append_4647 = $(nodist_legacy_password_test_module_SOURCES) -+@COND_emu_TRUE@am__append_4648 = \ - @COND_emu_TRUE@ $(nodist_legacy_password_test_module_SOURCES) \ - @COND_emu_TRUE@ legacy_password_test.marker --@COND_emu_TRUE@am__append_4656 = legacy_password_test.mod --@COND_emu_TRUE@am__append_4657 = legacy_password_test.marker --@COND_i386_pc_TRUE@am__append_4658 = legacy_password_test.module --@COND_i386_pc_TRUE@am__append_4659 = legacy_password_test.module$(EXEEXT) --@COND_i386_pc_TRUE@am__append_4660 = --@COND_i386_pc_TRUE@am__append_4661 = $(nodist_legacy_password_test_module_SOURCES) --@COND_i386_pc_TRUE@am__append_4662 = $(nodist_legacy_password_test_module_SOURCES) \ -+@COND_emu_TRUE@am__append_4649 = legacy_password_test.mod -+@COND_emu_TRUE@am__append_4650 = legacy_password_test.marker -+@COND_i386_pc_TRUE@am__append_4651 = legacy_password_test.module -+@COND_i386_pc_TRUE@am__append_4652 = legacy_password_test.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__append_4653 = -+@COND_i386_pc_TRUE@am__append_4654 = $(nodist_legacy_password_test_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_4655 = $(nodist_legacy_password_test_module_SOURCES) \ - @COND_i386_pc_TRUE@ legacy_password_test.marker --@COND_i386_pc_TRUE@am__append_4663 = legacy_password_test.mod --@COND_i386_pc_TRUE@am__append_4664 = legacy_password_test.marker --@COND_i386_efi_TRUE@am__append_4665 = legacy_password_test.module --@COND_i386_efi_TRUE@am__append_4666 = legacy_password_test.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_4667 = --@COND_i386_efi_TRUE@am__append_4668 = $(nodist_legacy_password_test_module_SOURCES) --@COND_i386_efi_TRUE@am__append_4669 = $(nodist_legacy_password_test_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_4656 = legacy_password_test.mod -+@COND_i386_pc_TRUE@am__append_4657 = legacy_password_test.marker -+@COND_i386_efi_TRUE@am__append_4658 = legacy_password_test.module -+@COND_i386_efi_TRUE@am__append_4659 = legacy_password_test.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_4660 = -+@COND_i386_efi_TRUE@am__append_4661 = $(nodist_legacy_password_test_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_4662 = $(nodist_legacy_password_test_module_SOURCES) \ - @COND_i386_efi_TRUE@ legacy_password_test.marker --@COND_i386_efi_TRUE@am__append_4670 = legacy_password_test.mod --@COND_i386_efi_TRUE@am__append_4671 = legacy_password_test.marker --@COND_x86_64_efi_TRUE@am__append_4672 = legacy_password_test.module --@COND_x86_64_efi_TRUE@am__append_4673 = legacy_password_test.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_4674 = --@COND_x86_64_efi_TRUE@am__append_4675 = $(nodist_legacy_password_test_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_4676 = $(nodist_legacy_password_test_module_SOURCES) \ -+@COND_i386_efi_TRUE@am__append_4663 = legacy_password_test.mod -+@COND_i386_efi_TRUE@am__append_4664 = legacy_password_test.marker -+@COND_x86_64_efi_TRUE@am__append_4665 = legacy_password_test.module -+@COND_x86_64_efi_TRUE@am__append_4666 = legacy_password_test.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_4667 = -+@COND_x86_64_efi_TRUE@am__append_4668 = $(nodist_legacy_password_test_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_4669 = $(nodist_legacy_password_test_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ legacy_password_test.marker --@COND_x86_64_efi_TRUE@am__append_4677 = legacy_password_test.mod --@COND_x86_64_efi_TRUE@am__append_4678 = legacy_password_test.marker --@COND_i386_xen_TRUE@am__append_4679 = legacy_password_test.module --@COND_i386_xen_TRUE@am__append_4680 = legacy_password_test.module$(EXEEXT) --@COND_i386_xen_TRUE@am__append_4681 = --@COND_i386_xen_TRUE@am__append_4682 = $(nodist_legacy_password_test_module_SOURCES) --@COND_i386_xen_TRUE@am__append_4683 = $(nodist_legacy_password_test_module_SOURCES) \ -+@COND_x86_64_efi_TRUE@am__append_4670 = legacy_password_test.mod -+@COND_x86_64_efi_TRUE@am__append_4671 = legacy_password_test.marker -+@COND_i386_xen_TRUE@am__append_4672 = legacy_password_test.module -+@COND_i386_xen_TRUE@am__append_4673 = legacy_password_test.module$(EXEEXT) -+@COND_i386_xen_TRUE@am__append_4674 = -+@COND_i386_xen_TRUE@am__append_4675 = $(nodist_legacy_password_test_module_SOURCES) -+@COND_i386_xen_TRUE@am__append_4676 = $(nodist_legacy_password_test_module_SOURCES) \ - @COND_i386_xen_TRUE@ legacy_password_test.marker --@COND_i386_xen_TRUE@am__append_4684 = legacy_password_test.mod --@COND_i386_xen_TRUE@am__append_4685 = legacy_password_test.marker --@COND_x86_64_xen_TRUE@am__append_4686 = legacy_password_test.module --@COND_x86_64_xen_TRUE@am__append_4687 = legacy_password_test.module$(EXEEXT) --@COND_x86_64_xen_TRUE@am__append_4688 = --@COND_x86_64_xen_TRUE@am__append_4689 = $(nodist_legacy_password_test_module_SOURCES) --@COND_x86_64_xen_TRUE@am__append_4690 = $(nodist_legacy_password_test_module_SOURCES) \ -+@COND_i386_xen_TRUE@am__append_4677 = legacy_password_test.mod -+@COND_i386_xen_TRUE@am__append_4678 = legacy_password_test.marker -+@COND_x86_64_xen_TRUE@am__append_4679 = legacy_password_test.module -+@COND_x86_64_xen_TRUE@am__append_4680 = legacy_password_test.module$(EXEEXT) -+@COND_x86_64_xen_TRUE@am__append_4681 = -+@COND_x86_64_xen_TRUE@am__append_4682 = $(nodist_legacy_password_test_module_SOURCES) -+@COND_x86_64_xen_TRUE@am__append_4683 = $(nodist_legacy_password_test_module_SOURCES) \ - @COND_x86_64_xen_TRUE@ legacy_password_test.marker --@COND_x86_64_xen_TRUE@am__append_4691 = legacy_password_test.mod --@COND_x86_64_xen_TRUE@am__append_4692 = legacy_password_test.marker --@COND_i386_xen_pvh_TRUE@am__append_4693 = legacy_password_test.module --@COND_i386_xen_pvh_TRUE@am__append_4694 = legacy_password_test.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__append_4695 = --@COND_i386_xen_pvh_TRUE@am__append_4696 = $(nodist_legacy_password_test_module_SOURCES) --@COND_i386_xen_pvh_TRUE@am__append_4697 = $(nodist_legacy_password_test_module_SOURCES) \ -+@COND_x86_64_xen_TRUE@am__append_4684 = legacy_password_test.mod -+@COND_x86_64_xen_TRUE@am__append_4685 = legacy_password_test.marker -+@COND_i386_xen_pvh_TRUE@am__append_4686 = legacy_password_test.module -+@COND_i386_xen_pvh_TRUE@am__append_4687 = legacy_password_test.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__append_4688 = -+@COND_i386_xen_pvh_TRUE@am__append_4689 = $(nodist_legacy_password_test_module_SOURCES) -+@COND_i386_xen_pvh_TRUE@am__append_4690 = $(nodist_legacy_password_test_module_SOURCES) \ - @COND_i386_xen_pvh_TRUE@ legacy_password_test.marker --@COND_i386_xen_pvh_TRUE@am__append_4698 = legacy_password_test.mod --@COND_i386_xen_pvh_TRUE@am__append_4699 = legacy_password_test.marker --@COND_emu_TRUE@am__append_4700 = div.module --@COND_emu_TRUE@am__append_4701 = div.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__append_4691 = legacy_password_test.mod -+@COND_i386_xen_pvh_TRUE@am__append_4692 = legacy_password_test.marker -+@COND_emu_TRUE@am__append_4693 = div.module -+@COND_emu_TRUE@am__append_4694 = div.module$(EXEEXT) - @COND_arm64_efi_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_FALSE@div_module_DEPENDENCIES = --@COND_emu_TRUE@am__append_4702 = --@COND_emu_TRUE@am__append_4703 = $(nodist_div_module_SOURCES) --@COND_emu_TRUE@am__append_4704 = $(nodist_div_module_SOURCES) \ -+@COND_emu_TRUE@am__append_4695 = -+@COND_emu_TRUE@am__append_4696 = $(nodist_div_module_SOURCES) -+@COND_emu_TRUE@am__append_4697 = $(nodist_div_module_SOURCES) \ - @COND_emu_TRUE@ div.marker --@COND_emu_TRUE@am__append_4705 = div.mod --@COND_emu_TRUE@am__append_4706 = div.marker --@COND_i386_pc_TRUE@am__append_4707 = div.module --@COND_i386_pc_TRUE@am__append_4708 = div.module$(EXEEXT) --@COND_i386_pc_TRUE@am__append_4709 = --@COND_i386_pc_TRUE@am__append_4710 = $(nodist_div_module_SOURCES) --@COND_i386_pc_TRUE@am__append_4711 = $(nodist_div_module_SOURCES) \ -+@COND_emu_TRUE@am__append_4698 = div.mod -+@COND_emu_TRUE@am__append_4699 = div.marker -+@COND_i386_pc_TRUE@am__append_4700 = div.module -+@COND_i386_pc_TRUE@am__append_4701 = div.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__append_4702 = -+@COND_i386_pc_TRUE@am__append_4703 = $(nodist_div_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_4704 = $(nodist_div_module_SOURCES) \ - @COND_i386_pc_TRUE@ div.marker --@COND_i386_pc_TRUE@am__append_4712 = div.mod --@COND_i386_pc_TRUE@am__append_4713 = div.marker --@COND_i386_efi_TRUE@am__append_4714 = div.module --@COND_i386_efi_TRUE@am__append_4715 = div.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_4716 = --@COND_i386_efi_TRUE@am__append_4717 = $(nodist_div_module_SOURCES) --@COND_i386_efi_TRUE@am__append_4718 = $(nodist_div_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_4705 = div.mod -+@COND_i386_pc_TRUE@am__append_4706 = div.marker -+@COND_i386_efi_TRUE@am__append_4707 = div.module -+@COND_i386_efi_TRUE@am__append_4708 = div.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_4709 = -+@COND_i386_efi_TRUE@am__append_4710 = $(nodist_div_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_4711 = $(nodist_div_module_SOURCES) \ - @COND_i386_efi_TRUE@ div.marker --@COND_i386_efi_TRUE@am__append_4719 = div.mod --@COND_i386_efi_TRUE@am__append_4720 = div.marker --@COND_i386_qemu_TRUE@am__append_4721 = div.module --@COND_i386_qemu_TRUE@am__append_4722 = div.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_4723 = --@COND_i386_qemu_TRUE@am__append_4724 = $(nodist_div_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_4725 = $(nodist_div_module_SOURCES) \ -+@COND_i386_efi_TRUE@am__append_4712 = div.mod -+@COND_i386_efi_TRUE@am__append_4713 = div.marker -+@COND_i386_qemu_TRUE@am__append_4714 = div.module -+@COND_i386_qemu_TRUE@am__append_4715 = div.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_4716 = -+@COND_i386_qemu_TRUE@am__append_4717 = $(nodist_div_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_4718 = $(nodist_div_module_SOURCES) \ - @COND_i386_qemu_TRUE@ div.marker --@COND_i386_qemu_TRUE@am__append_4726 = div.mod --@COND_i386_qemu_TRUE@am__append_4727 = div.marker --@COND_i386_coreboot_TRUE@am__append_4728 = div.module --@COND_i386_coreboot_TRUE@am__append_4729 = div.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_4730 = --@COND_i386_coreboot_TRUE@am__append_4731 = $(nodist_div_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_4732 = \ -+@COND_i386_qemu_TRUE@am__append_4719 = div.mod -+@COND_i386_qemu_TRUE@am__append_4720 = div.marker -+@COND_i386_coreboot_TRUE@am__append_4721 = div.module -+@COND_i386_coreboot_TRUE@am__append_4722 = div.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_4723 = -+@COND_i386_coreboot_TRUE@am__append_4724 = $(nodist_div_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_4725 = \ - @COND_i386_coreboot_TRUE@ $(nodist_div_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ div.marker --@COND_i386_coreboot_TRUE@am__append_4733 = div.mod --@COND_i386_coreboot_TRUE@am__append_4734 = div.marker --@COND_i386_multiboot_TRUE@am__append_4735 = div.module --@COND_i386_multiboot_TRUE@am__append_4736 = div.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_4737 = --@COND_i386_multiboot_TRUE@am__append_4738 = $(nodist_div_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_4739 = \ -+@COND_i386_coreboot_TRUE@am__append_4726 = div.mod -+@COND_i386_coreboot_TRUE@am__append_4727 = div.marker -+@COND_i386_multiboot_TRUE@am__append_4728 = div.module -+@COND_i386_multiboot_TRUE@am__append_4729 = div.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_4730 = -+@COND_i386_multiboot_TRUE@am__append_4731 = $(nodist_div_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_4732 = \ - @COND_i386_multiboot_TRUE@ $(nodist_div_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ div.marker --@COND_i386_multiboot_TRUE@am__append_4740 = div.mod --@COND_i386_multiboot_TRUE@am__append_4741 = div.marker --@COND_i386_ieee1275_TRUE@am__append_4742 = div.module --@COND_i386_ieee1275_TRUE@am__append_4743 = div.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_4744 = --@COND_i386_ieee1275_TRUE@am__append_4745 = $(nodist_div_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_4746 = \ -+@COND_i386_multiboot_TRUE@am__append_4733 = div.mod -+@COND_i386_multiboot_TRUE@am__append_4734 = div.marker -+@COND_i386_ieee1275_TRUE@am__append_4735 = div.module -+@COND_i386_ieee1275_TRUE@am__append_4736 = div.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_4737 = -+@COND_i386_ieee1275_TRUE@am__append_4738 = $(nodist_div_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_4739 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_div_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ div.marker --@COND_i386_ieee1275_TRUE@am__append_4747 = div.mod --@COND_i386_ieee1275_TRUE@am__append_4748 = div.marker --@COND_x86_64_efi_TRUE@am__append_4749 = div.module --@COND_x86_64_efi_TRUE@am__append_4750 = div.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_4751 = --@COND_x86_64_efi_TRUE@am__append_4752 = $(nodist_div_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_4753 = $(nodist_div_module_SOURCES) \ -+@COND_i386_ieee1275_TRUE@am__append_4740 = div.mod -+@COND_i386_ieee1275_TRUE@am__append_4741 = div.marker -+@COND_x86_64_efi_TRUE@am__append_4742 = div.module -+@COND_x86_64_efi_TRUE@am__append_4743 = div.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_4744 = -+@COND_x86_64_efi_TRUE@am__append_4745 = $(nodist_div_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_4746 = $(nodist_div_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ div.marker --@COND_x86_64_efi_TRUE@am__append_4754 = div.mod --@COND_x86_64_efi_TRUE@am__append_4755 = div.marker --@COND_i386_xen_TRUE@am__append_4756 = div.module --@COND_i386_xen_TRUE@am__append_4757 = div.module$(EXEEXT) --@COND_i386_xen_TRUE@am__append_4758 = --@COND_i386_xen_TRUE@am__append_4759 = $(nodist_div_module_SOURCES) --@COND_i386_xen_TRUE@am__append_4760 = $(nodist_div_module_SOURCES) \ -+@COND_x86_64_efi_TRUE@am__append_4747 = div.mod -+@COND_x86_64_efi_TRUE@am__append_4748 = div.marker -+@COND_i386_xen_TRUE@am__append_4749 = div.module -+@COND_i386_xen_TRUE@am__append_4750 = div.module$(EXEEXT) -+@COND_i386_xen_TRUE@am__append_4751 = -+@COND_i386_xen_TRUE@am__append_4752 = $(nodist_div_module_SOURCES) -+@COND_i386_xen_TRUE@am__append_4753 = $(nodist_div_module_SOURCES) \ - @COND_i386_xen_TRUE@ div.marker --@COND_i386_xen_TRUE@am__append_4761 = div.mod --@COND_i386_xen_TRUE@am__append_4762 = div.marker --@COND_x86_64_xen_TRUE@am__append_4763 = div.module --@COND_x86_64_xen_TRUE@am__append_4764 = div.module$(EXEEXT) --@COND_x86_64_xen_TRUE@am__append_4765 = --@COND_x86_64_xen_TRUE@am__append_4766 = $(nodist_div_module_SOURCES) --@COND_x86_64_xen_TRUE@am__append_4767 = $(nodist_div_module_SOURCES) \ -+@COND_i386_xen_TRUE@am__append_4754 = div.mod -+@COND_i386_xen_TRUE@am__append_4755 = div.marker -+@COND_x86_64_xen_TRUE@am__append_4756 = div.module -+@COND_x86_64_xen_TRUE@am__append_4757 = div.module$(EXEEXT) -+@COND_x86_64_xen_TRUE@am__append_4758 = -+@COND_x86_64_xen_TRUE@am__append_4759 = $(nodist_div_module_SOURCES) -+@COND_x86_64_xen_TRUE@am__append_4760 = $(nodist_div_module_SOURCES) \ - @COND_x86_64_xen_TRUE@ div.marker --@COND_x86_64_xen_TRUE@am__append_4768 = div.mod --@COND_x86_64_xen_TRUE@am__append_4769 = div.marker --@COND_i386_xen_pvh_TRUE@am__append_4770 = div.module --@COND_i386_xen_pvh_TRUE@am__append_4771 = div.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__append_4772 = --@COND_i386_xen_pvh_TRUE@am__append_4773 = $(nodist_div_module_SOURCES) --@COND_i386_xen_pvh_TRUE@am__append_4774 = \ -+@COND_x86_64_xen_TRUE@am__append_4761 = div.mod -+@COND_x86_64_xen_TRUE@am__append_4762 = div.marker -+@COND_i386_xen_pvh_TRUE@am__append_4763 = div.module -+@COND_i386_xen_pvh_TRUE@am__append_4764 = div.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__append_4765 = -+@COND_i386_xen_pvh_TRUE@am__append_4766 = $(nodist_div_module_SOURCES) -+@COND_i386_xen_pvh_TRUE@am__append_4767 = \ - @COND_i386_xen_pvh_TRUE@ $(nodist_div_module_SOURCES) \ - @COND_i386_xen_pvh_TRUE@ div.marker --@COND_i386_xen_pvh_TRUE@am__append_4775 = div.mod --@COND_i386_xen_pvh_TRUE@am__append_4776 = div.marker --@COND_mips_loongson_TRUE@am__append_4777 = div.module --@COND_mips_loongson_TRUE@am__append_4778 = div.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__append_4779 = --@COND_mips_loongson_TRUE@am__append_4780 = $(nodist_div_module_SOURCES) --@COND_mips_loongson_TRUE@am__append_4781 = \ -+@COND_i386_xen_pvh_TRUE@am__append_4768 = div.mod -+@COND_i386_xen_pvh_TRUE@am__append_4769 = div.marker -+@COND_mips_loongson_TRUE@am__append_4770 = div.module -+@COND_mips_loongson_TRUE@am__append_4771 = div.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__append_4772 = -+@COND_mips_loongson_TRUE@am__append_4773 = $(nodist_div_module_SOURCES) -+@COND_mips_loongson_TRUE@am__append_4774 = \ - @COND_mips_loongson_TRUE@ $(nodist_div_module_SOURCES) \ - @COND_mips_loongson_TRUE@ div.marker --@COND_mips_loongson_TRUE@am__append_4782 = div.mod --@COND_mips_loongson_TRUE@am__append_4783 = div.marker --@COND_sparc64_ieee1275_TRUE@am__append_4784 = div.module --@COND_sparc64_ieee1275_TRUE@am__append_4785 = div.module$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@am__append_4786 = --@COND_sparc64_ieee1275_TRUE@am__append_4787 = $(nodist_div_module_SOURCES) --@COND_sparc64_ieee1275_TRUE@am__append_4788 = \ -+@COND_mips_loongson_TRUE@am__append_4775 = div.mod -+@COND_mips_loongson_TRUE@am__append_4776 = div.marker -+@COND_sparc64_ieee1275_TRUE@am__append_4777 = div.module -+@COND_sparc64_ieee1275_TRUE@am__append_4778 = div.module$(EXEEXT) -+@COND_sparc64_ieee1275_TRUE@am__append_4779 = -+@COND_sparc64_ieee1275_TRUE@am__append_4780 = $(nodist_div_module_SOURCES) -+@COND_sparc64_ieee1275_TRUE@am__append_4781 = \ - @COND_sparc64_ieee1275_TRUE@ $(nodist_div_module_SOURCES) \ - @COND_sparc64_ieee1275_TRUE@ div.marker --@COND_sparc64_ieee1275_TRUE@am__append_4789 = div.mod --@COND_sparc64_ieee1275_TRUE@am__append_4790 = div.marker --@COND_powerpc_ieee1275_TRUE@am__append_4791 = div.module --@COND_powerpc_ieee1275_TRUE@am__append_4792 = div.module$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__append_4793 = --@COND_powerpc_ieee1275_TRUE@am__append_4794 = $(nodist_div_module_SOURCES) --@COND_powerpc_ieee1275_TRUE@am__append_4795 = \ -+@COND_sparc64_ieee1275_TRUE@am__append_4782 = div.mod -+@COND_sparc64_ieee1275_TRUE@am__append_4783 = div.marker -+@COND_powerpc_ieee1275_TRUE@am__append_4784 = div.module -+@COND_powerpc_ieee1275_TRUE@am__append_4785 = div.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__append_4786 = -+@COND_powerpc_ieee1275_TRUE@am__append_4787 = $(nodist_div_module_SOURCES) -+@COND_powerpc_ieee1275_TRUE@am__append_4788 = \ - @COND_powerpc_ieee1275_TRUE@ $(nodist_div_module_SOURCES) \ - @COND_powerpc_ieee1275_TRUE@ div.marker --@COND_powerpc_ieee1275_TRUE@am__append_4796 = div.mod --@COND_powerpc_ieee1275_TRUE@am__append_4797 = div.marker --@COND_mips_arc_TRUE@am__append_4798 = div.module --@COND_mips_arc_TRUE@am__append_4799 = div.module$(EXEEXT) --@COND_mips_arc_TRUE@am__append_4800 = --@COND_mips_arc_TRUE@am__append_4801 = $(nodist_div_module_SOURCES) --@COND_mips_arc_TRUE@am__append_4802 = $(nodist_div_module_SOURCES) \ -+@COND_powerpc_ieee1275_TRUE@am__append_4789 = div.mod -+@COND_powerpc_ieee1275_TRUE@am__append_4790 = div.marker -+@COND_mips_arc_TRUE@am__append_4791 = div.module -+@COND_mips_arc_TRUE@am__append_4792 = div.module$(EXEEXT) -+@COND_mips_arc_TRUE@am__append_4793 = -+@COND_mips_arc_TRUE@am__append_4794 = $(nodist_div_module_SOURCES) -+@COND_mips_arc_TRUE@am__append_4795 = $(nodist_div_module_SOURCES) \ - @COND_mips_arc_TRUE@ div.marker --@COND_mips_arc_TRUE@am__append_4803 = div.mod --@COND_mips_arc_TRUE@am__append_4804 = div.marker --@COND_mips_qemu_mips_TRUE@am__append_4805 = div.module --@COND_mips_qemu_mips_TRUE@am__append_4806 = div.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__append_4807 = --@COND_mips_qemu_mips_TRUE@am__append_4808 = $(nodist_div_module_SOURCES) --@COND_mips_qemu_mips_TRUE@am__append_4809 = \ -+@COND_mips_arc_TRUE@am__append_4796 = div.mod -+@COND_mips_arc_TRUE@am__append_4797 = div.marker -+@COND_mips_qemu_mips_TRUE@am__append_4798 = div.module -+@COND_mips_qemu_mips_TRUE@am__append_4799 = div.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__append_4800 = -+@COND_mips_qemu_mips_TRUE@am__append_4801 = $(nodist_div_module_SOURCES) -+@COND_mips_qemu_mips_TRUE@am__append_4802 = \ - @COND_mips_qemu_mips_TRUE@ $(nodist_div_module_SOURCES) \ - @COND_mips_qemu_mips_TRUE@ div.marker --@COND_mips_qemu_mips_TRUE@am__append_4810 = div.mod --@COND_mips_qemu_mips_TRUE@am__append_4811 = div.marker --@COND_arm64_efi_TRUE@am__append_4812 = div.module --@COND_arm64_efi_TRUE@am__append_4813 = div.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__append_4814 = --@COND_arm64_efi_TRUE@am__append_4815 = $(nodist_div_module_SOURCES) --@COND_arm64_efi_TRUE@am__append_4816 = $(nodist_div_module_SOURCES) \ -+@COND_mips_qemu_mips_TRUE@am__append_4803 = div.mod -+@COND_mips_qemu_mips_TRUE@am__append_4804 = div.marker -+@COND_arm64_efi_TRUE@am__append_4805 = div.module -+@COND_arm64_efi_TRUE@am__append_4806 = div.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__append_4807 = -+@COND_arm64_efi_TRUE@am__append_4808 = $(nodist_div_module_SOURCES) -+@COND_arm64_efi_TRUE@am__append_4809 = $(nodist_div_module_SOURCES) \ - @COND_arm64_efi_TRUE@ div.marker --@COND_arm64_efi_TRUE@am__append_4817 = div.mod --@COND_arm64_efi_TRUE@am__append_4818 = div.marker --@COND_riscv64_efi_TRUE@am__append_4819 = div.module --@COND_riscv64_efi_TRUE@am__append_4820 = div.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__append_4821 = --@COND_riscv64_efi_TRUE@am__append_4822 = $(nodist_div_module_SOURCES) --@COND_riscv64_efi_TRUE@am__append_4823 = $(nodist_div_module_SOURCES) \ -+@COND_arm64_efi_TRUE@am__append_4810 = div.mod -+@COND_arm64_efi_TRUE@am__append_4811 = div.marker -+@COND_riscv64_efi_TRUE@am__append_4812 = div.module -+@COND_riscv64_efi_TRUE@am__append_4813 = div.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_4814 = -+@COND_riscv64_efi_TRUE@am__append_4815 = $(nodist_div_module_SOURCES) -+@COND_riscv64_efi_TRUE@am__append_4816 = $(nodist_div_module_SOURCES) \ - @COND_riscv64_efi_TRUE@ div.marker --@COND_riscv64_efi_TRUE@am__append_4824 = div.mod --@COND_riscv64_efi_TRUE@am__append_4825 = div.marker --@COND_i386_efi_TRUE@am__append_4826 = efi_gop.module --@COND_i386_efi_TRUE@am__append_4827 = efi_gop.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_4817 = div.mod -+@COND_riscv64_efi_TRUE@am__append_4818 = div.marker -+@COND_i386_efi_TRUE@am__append_4819 = efi_gop.module -+@COND_i386_efi_TRUE@am__append_4820 = efi_gop.module$(EXEEXT) - @COND_arm64_efi_FALSE@@COND_arm_efi_FALSE@@COND_i386_efi_FALSE@@COND_ia64_efi_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_x86_64_efi_FALSE@efi_gop_module_DEPENDENCIES = --@COND_i386_efi_TRUE@am__append_4828 = --@COND_i386_efi_TRUE@am__append_4829 = $(nodist_efi_gop_module_SOURCES) --@COND_i386_efi_TRUE@am__append_4830 = \ -+@COND_i386_efi_TRUE@am__append_4821 = -+@COND_i386_efi_TRUE@am__append_4822 = $(nodist_efi_gop_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_4823 = \ - @COND_i386_efi_TRUE@ $(nodist_efi_gop_module_SOURCES) \ - @COND_i386_efi_TRUE@ efi_gop.marker --@COND_i386_efi_TRUE@am__append_4831 = efi_gop.mod --@COND_i386_efi_TRUE@am__append_4832 = efi_gop.marker --@COND_x86_64_efi_TRUE@am__append_4833 = efi_gop.module --@COND_x86_64_efi_TRUE@am__append_4834 = efi_gop.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_4835 = --@COND_x86_64_efi_TRUE@am__append_4836 = $(nodist_efi_gop_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_4837 = \ -+@COND_i386_efi_TRUE@am__append_4824 = efi_gop.mod -+@COND_i386_efi_TRUE@am__append_4825 = efi_gop.marker -+@COND_x86_64_efi_TRUE@am__append_4826 = efi_gop.module -+@COND_x86_64_efi_TRUE@am__append_4827 = efi_gop.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_4828 = -+@COND_x86_64_efi_TRUE@am__append_4829 = $(nodist_efi_gop_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_4830 = \ - @COND_x86_64_efi_TRUE@ $(nodist_efi_gop_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ efi_gop.marker --@COND_x86_64_efi_TRUE@am__append_4838 = efi_gop.mod --@COND_x86_64_efi_TRUE@am__append_4839 = efi_gop.marker --@COND_ia64_efi_TRUE@am__append_4840 = efi_gop.module --@COND_ia64_efi_TRUE@am__append_4841 = efi_gop.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__append_4842 = --@COND_ia64_efi_TRUE@am__append_4843 = $(nodist_efi_gop_module_SOURCES) --@COND_ia64_efi_TRUE@am__append_4844 = \ -+@COND_x86_64_efi_TRUE@am__append_4831 = efi_gop.mod -+@COND_x86_64_efi_TRUE@am__append_4832 = efi_gop.marker -+@COND_ia64_efi_TRUE@am__append_4833 = efi_gop.module -+@COND_ia64_efi_TRUE@am__append_4834 = efi_gop.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__append_4835 = -+@COND_ia64_efi_TRUE@am__append_4836 = $(nodist_efi_gop_module_SOURCES) -+@COND_ia64_efi_TRUE@am__append_4837 = \ - @COND_ia64_efi_TRUE@ $(nodist_efi_gop_module_SOURCES) \ - @COND_ia64_efi_TRUE@ efi_gop.marker --@COND_ia64_efi_TRUE@am__append_4845 = efi_gop.mod --@COND_ia64_efi_TRUE@am__append_4846 = efi_gop.marker --@COND_arm_efi_TRUE@am__append_4847 = efi_gop.module --@COND_arm_efi_TRUE@am__append_4848 = efi_gop.module$(EXEEXT) --@COND_arm_efi_TRUE@am__append_4849 = --@COND_arm_efi_TRUE@am__append_4850 = $(nodist_efi_gop_module_SOURCES) --@COND_arm_efi_TRUE@am__append_4851 = $(nodist_efi_gop_module_SOURCES) \ -+@COND_ia64_efi_TRUE@am__append_4838 = efi_gop.mod -+@COND_ia64_efi_TRUE@am__append_4839 = efi_gop.marker -+@COND_arm_efi_TRUE@am__append_4840 = efi_gop.module -+@COND_arm_efi_TRUE@am__append_4841 = efi_gop.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__append_4842 = -+@COND_arm_efi_TRUE@am__append_4843 = $(nodist_efi_gop_module_SOURCES) -+@COND_arm_efi_TRUE@am__append_4844 = $(nodist_efi_gop_module_SOURCES) \ - @COND_arm_efi_TRUE@ efi_gop.marker --@COND_arm_efi_TRUE@am__append_4852 = efi_gop.mod --@COND_arm_efi_TRUE@am__append_4853 = efi_gop.marker --@COND_arm64_efi_TRUE@am__append_4854 = efi_gop.module --@COND_arm64_efi_TRUE@am__append_4855 = efi_gop.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__append_4856 = --@COND_arm64_efi_TRUE@am__append_4857 = $(nodist_efi_gop_module_SOURCES) --@COND_arm64_efi_TRUE@am__append_4858 = \ -+@COND_arm_efi_TRUE@am__append_4845 = efi_gop.mod -+@COND_arm_efi_TRUE@am__append_4846 = efi_gop.marker -+@COND_arm64_efi_TRUE@am__append_4847 = efi_gop.module -+@COND_arm64_efi_TRUE@am__append_4848 = efi_gop.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__append_4849 = -+@COND_arm64_efi_TRUE@am__append_4850 = $(nodist_efi_gop_module_SOURCES) -+@COND_arm64_efi_TRUE@am__append_4851 = \ - @COND_arm64_efi_TRUE@ $(nodist_efi_gop_module_SOURCES) \ - @COND_arm64_efi_TRUE@ efi_gop.marker --@COND_arm64_efi_TRUE@am__append_4859 = efi_gop.mod --@COND_arm64_efi_TRUE@am__append_4860 = efi_gop.marker --@COND_riscv32_efi_TRUE@am__append_4861 = efi_gop.module --@COND_riscv32_efi_TRUE@am__append_4862 = efi_gop.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__append_4863 = --@COND_riscv32_efi_TRUE@am__append_4864 = $(nodist_efi_gop_module_SOURCES) --@COND_riscv32_efi_TRUE@am__append_4865 = \ -+@COND_arm64_efi_TRUE@am__append_4852 = efi_gop.mod -+@COND_arm64_efi_TRUE@am__append_4853 = efi_gop.marker -+@COND_riscv32_efi_TRUE@am__append_4854 = efi_gop.module -+@COND_riscv32_efi_TRUE@am__append_4855 = efi_gop.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__append_4856 = -+@COND_riscv32_efi_TRUE@am__append_4857 = $(nodist_efi_gop_module_SOURCES) -+@COND_riscv32_efi_TRUE@am__append_4858 = \ - @COND_riscv32_efi_TRUE@ $(nodist_efi_gop_module_SOURCES) \ - @COND_riscv32_efi_TRUE@ efi_gop.marker --@COND_riscv32_efi_TRUE@am__append_4866 = efi_gop.mod --@COND_riscv32_efi_TRUE@am__append_4867 = efi_gop.marker --@COND_riscv64_efi_TRUE@am__append_4868 = efi_gop.module --@COND_riscv64_efi_TRUE@am__append_4869 = efi_gop.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__append_4870 = --@COND_riscv64_efi_TRUE@am__append_4871 = $(nodist_efi_gop_module_SOURCES) --@COND_riscv64_efi_TRUE@am__append_4872 = \ -+@COND_riscv32_efi_TRUE@am__append_4859 = efi_gop.mod -+@COND_riscv32_efi_TRUE@am__append_4860 = efi_gop.marker -+@COND_riscv64_efi_TRUE@am__append_4861 = efi_gop.module -+@COND_riscv64_efi_TRUE@am__append_4862 = efi_gop.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_4863 = -+@COND_riscv64_efi_TRUE@am__append_4864 = $(nodist_efi_gop_module_SOURCES) -+@COND_riscv64_efi_TRUE@am__append_4865 = \ - @COND_riscv64_efi_TRUE@ $(nodist_efi_gop_module_SOURCES) \ - @COND_riscv64_efi_TRUE@ efi_gop.marker --@COND_riscv64_efi_TRUE@am__append_4873 = efi_gop.mod --@COND_riscv64_efi_TRUE@am__append_4874 = efi_gop.marker --@COND_i386_efi_TRUE@am__append_4875 = efi_uga.module --@COND_i386_efi_TRUE@am__append_4876 = efi_uga.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_4866 = efi_gop.mod -+@COND_riscv64_efi_TRUE@am__append_4867 = efi_gop.marker -+@COND_i386_efi_TRUE@am__append_4868 = efi_uga.module -+@COND_i386_efi_TRUE@am__append_4869 = efi_uga.module$(EXEEXT) - @COND_i386_efi_FALSE@@COND_x86_64_efi_FALSE@efi_uga_module_DEPENDENCIES = --@COND_i386_efi_TRUE@am__append_4877 = --@COND_i386_efi_TRUE@am__append_4878 = $(nodist_efi_uga_module_SOURCES) --@COND_i386_efi_TRUE@am__append_4879 = \ -+@COND_i386_efi_TRUE@am__append_4870 = -+@COND_i386_efi_TRUE@am__append_4871 = $(nodist_efi_uga_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_4872 = \ - @COND_i386_efi_TRUE@ $(nodist_efi_uga_module_SOURCES) \ - @COND_i386_efi_TRUE@ efi_uga.marker --@COND_i386_efi_TRUE@am__append_4880 = efi_uga.mod --@COND_i386_efi_TRUE@am__append_4881 = efi_uga.marker --@COND_x86_64_efi_TRUE@am__append_4882 = efi_uga.module --@COND_x86_64_efi_TRUE@am__append_4883 = efi_uga.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_4884 = --@COND_x86_64_efi_TRUE@am__append_4885 = $(nodist_efi_uga_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_4886 = \ -+@COND_i386_efi_TRUE@am__append_4873 = efi_uga.mod -+@COND_i386_efi_TRUE@am__append_4874 = efi_uga.marker -+@COND_x86_64_efi_TRUE@am__append_4875 = efi_uga.module -+@COND_x86_64_efi_TRUE@am__append_4876 = efi_uga.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_4877 = -+@COND_x86_64_efi_TRUE@am__append_4878 = $(nodist_efi_uga_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_4879 = \ - @COND_x86_64_efi_TRUE@ $(nodist_efi_uga_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ efi_uga.marker --@COND_x86_64_efi_TRUE@am__append_4887 = efi_uga.mod --@COND_x86_64_efi_TRUE@am__append_4888 = efi_uga.marker --@COND_i386_pc_TRUE@am__append_4889 = vbe.module --@COND_i386_pc_TRUE@am__append_4890 = vbe.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_4880 = efi_uga.mod -+@COND_x86_64_efi_TRUE@am__append_4881 = efi_uga.marker -+@COND_i386_pc_TRUE@am__append_4882 = vbe.module -+@COND_i386_pc_TRUE@am__append_4883 = vbe.module$(EXEEXT) - @COND_i386_pc_FALSE@vbe_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_4891 = --@COND_i386_pc_TRUE@am__append_4892 = $(nodist_vbe_module_SOURCES) --@COND_i386_pc_TRUE@am__append_4893 = $(nodist_vbe_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_4884 = -+@COND_i386_pc_TRUE@am__append_4885 = $(nodist_vbe_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_4886 = $(nodist_vbe_module_SOURCES) \ - @COND_i386_pc_TRUE@ vbe.marker --@COND_i386_pc_TRUE@am__append_4894 = vbe.mod --@COND_i386_pc_TRUE@am__append_4895 = vbe.marker --@COND_emu_TRUE@am__append_4896 = video_fb.module --@COND_emu_TRUE@am__append_4897 = video_fb.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__append_4887 = vbe.mod -+@COND_i386_pc_TRUE@am__append_4888 = vbe.marker -+@COND_emu_TRUE@am__append_4889 = video_fb.module -+@COND_emu_TRUE@am__append_4890 = video_fb.module$(EXEEXT) - @COND_arm64_efi_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_FALSE@video_fb_module_DEPENDENCIES = --@COND_emu_TRUE@am__append_4898 = --@COND_emu_TRUE@am__append_4899 = $(nodist_video_fb_module_SOURCES) --@COND_emu_TRUE@am__append_4900 = $(nodist_video_fb_module_SOURCES) \ -+@COND_emu_TRUE@am__append_4891 = -+@COND_emu_TRUE@am__append_4892 = $(nodist_video_fb_module_SOURCES) -+@COND_emu_TRUE@am__append_4893 = $(nodist_video_fb_module_SOURCES) \ - @COND_emu_TRUE@ video_fb.marker --@COND_emu_TRUE@am__append_4901 = video_fb.mod --@COND_emu_TRUE@am__append_4902 = video_fb.marker --@COND_i386_pc_TRUE@am__append_4903 = video_fb.module --@COND_i386_pc_TRUE@am__append_4904 = video_fb.module$(EXEEXT) --@COND_i386_pc_TRUE@am__append_4905 = --@COND_i386_pc_TRUE@am__append_4906 = $(nodist_video_fb_module_SOURCES) --@COND_i386_pc_TRUE@am__append_4907 = \ -+@COND_emu_TRUE@am__append_4894 = video_fb.mod -+@COND_emu_TRUE@am__append_4895 = video_fb.marker -+@COND_i386_pc_TRUE@am__append_4896 = video_fb.module -+@COND_i386_pc_TRUE@am__append_4897 = video_fb.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__append_4898 = -+@COND_i386_pc_TRUE@am__append_4899 = $(nodist_video_fb_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_4900 = \ - @COND_i386_pc_TRUE@ $(nodist_video_fb_module_SOURCES) \ - @COND_i386_pc_TRUE@ video_fb.marker --@COND_i386_pc_TRUE@am__append_4908 = video_fb.mod --@COND_i386_pc_TRUE@am__append_4909 = video_fb.marker --@COND_i386_efi_TRUE@am__append_4910 = video_fb.module --@COND_i386_efi_TRUE@am__append_4911 = video_fb.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_4912 = --@COND_i386_efi_TRUE@am__append_4913 = $(nodist_video_fb_module_SOURCES) --@COND_i386_efi_TRUE@am__append_4914 = \ -+@COND_i386_pc_TRUE@am__append_4901 = video_fb.mod -+@COND_i386_pc_TRUE@am__append_4902 = video_fb.marker -+@COND_i386_efi_TRUE@am__append_4903 = video_fb.module -+@COND_i386_efi_TRUE@am__append_4904 = video_fb.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_4905 = -+@COND_i386_efi_TRUE@am__append_4906 = $(nodist_video_fb_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_4907 = \ - @COND_i386_efi_TRUE@ $(nodist_video_fb_module_SOURCES) \ - @COND_i386_efi_TRUE@ video_fb.marker --@COND_i386_efi_TRUE@am__append_4915 = video_fb.mod --@COND_i386_efi_TRUE@am__append_4916 = video_fb.marker --@COND_i386_qemu_TRUE@am__append_4917 = video_fb.module --@COND_i386_qemu_TRUE@am__append_4918 = video_fb.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_4919 = --@COND_i386_qemu_TRUE@am__append_4920 = $(nodist_video_fb_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_4921 = \ -+@COND_i386_efi_TRUE@am__append_4908 = video_fb.mod -+@COND_i386_efi_TRUE@am__append_4909 = video_fb.marker -+@COND_i386_qemu_TRUE@am__append_4910 = video_fb.module -+@COND_i386_qemu_TRUE@am__append_4911 = video_fb.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_4912 = -+@COND_i386_qemu_TRUE@am__append_4913 = $(nodist_video_fb_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_4914 = \ - @COND_i386_qemu_TRUE@ $(nodist_video_fb_module_SOURCES) \ - @COND_i386_qemu_TRUE@ video_fb.marker --@COND_i386_qemu_TRUE@am__append_4922 = video_fb.mod --@COND_i386_qemu_TRUE@am__append_4923 = video_fb.marker --@COND_i386_multiboot_TRUE@am__append_4924 = video_fb.module --@COND_i386_multiboot_TRUE@am__append_4925 = video_fb.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_4926 = --@COND_i386_multiboot_TRUE@am__append_4927 = $(nodist_video_fb_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_4928 = \ -+@COND_i386_qemu_TRUE@am__append_4915 = video_fb.mod -+@COND_i386_qemu_TRUE@am__append_4916 = video_fb.marker -+@COND_i386_multiboot_TRUE@am__append_4917 = video_fb.module -+@COND_i386_multiboot_TRUE@am__append_4918 = video_fb.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_4919 = -+@COND_i386_multiboot_TRUE@am__append_4920 = $(nodist_video_fb_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_4921 = \ - @COND_i386_multiboot_TRUE@ $(nodist_video_fb_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ video_fb.marker --@COND_i386_multiboot_TRUE@am__append_4929 = video_fb.mod --@COND_i386_multiboot_TRUE@am__append_4930 = video_fb.marker --@COND_i386_ieee1275_TRUE@am__append_4931 = video_fb.module --@COND_i386_ieee1275_TRUE@am__append_4932 = video_fb.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_4933 = --@COND_i386_ieee1275_TRUE@am__append_4934 = $(nodist_video_fb_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_4935 = \ -+@COND_i386_multiboot_TRUE@am__append_4922 = video_fb.mod -+@COND_i386_multiboot_TRUE@am__append_4923 = video_fb.marker -+@COND_i386_ieee1275_TRUE@am__append_4924 = video_fb.module -+@COND_i386_ieee1275_TRUE@am__append_4925 = video_fb.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_4926 = -+@COND_i386_ieee1275_TRUE@am__append_4927 = $(nodist_video_fb_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_4928 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_video_fb_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ video_fb.marker --@COND_i386_ieee1275_TRUE@am__append_4936 = video_fb.mod --@COND_i386_ieee1275_TRUE@am__append_4937 = video_fb.marker --@COND_x86_64_efi_TRUE@am__append_4938 = video_fb.module --@COND_x86_64_efi_TRUE@am__append_4939 = video_fb.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_4940 = --@COND_x86_64_efi_TRUE@am__append_4941 = $(nodist_video_fb_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_4942 = \ -+@COND_i386_ieee1275_TRUE@am__append_4929 = video_fb.mod -+@COND_i386_ieee1275_TRUE@am__append_4930 = video_fb.marker -+@COND_x86_64_efi_TRUE@am__append_4931 = video_fb.module -+@COND_x86_64_efi_TRUE@am__append_4932 = video_fb.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_4933 = -+@COND_x86_64_efi_TRUE@am__append_4934 = $(nodist_video_fb_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_4935 = \ - @COND_x86_64_efi_TRUE@ $(nodist_video_fb_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ video_fb.marker --@COND_x86_64_efi_TRUE@am__append_4943 = video_fb.mod --@COND_x86_64_efi_TRUE@am__append_4944 = video_fb.marker --@COND_i386_xen_TRUE@am__append_4945 = video_fb.module --@COND_i386_xen_TRUE@am__append_4946 = video_fb.module$(EXEEXT) --@COND_i386_xen_TRUE@am__append_4947 = --@COND_i386_xen_TRUE@am__append_4948 = $(nodist_video_fb_module_SOURCES) --@COND_i386_xen_TRUE@am__append_4949 = \ -+@COND_x86_64_efi_TRUE@am__append_4936 = video_fb.mod -+@COND_x86_64_efi_TRUE@am__append_4937 = video_fb.marker -+@COND_i386_xen_TRUE@am__append_4938 = video_fb.module -+@COND_i386_xen_TRUE@am__append_4939 = video_fb.module$(EXEEXT) -+@COND_i386_xen_TRUE@am__append_4940 = -+@COND_i386_xen_TRUE@am__append_4941 = $(nodist_video_fb_module_SOURCES) -+@COND_i386_xen_TRUE@am__append_4942 = \ - @COND_i386_xen_TRUE@ $(nodist_video_fb_module_SOURCES) \ - @COND_i386_xen_TRUE@ video_fb.marker --@COND_i386_xen_TRUE@am__append_4950 = video_fb.mod --@COND_i386_xen_TRUE@am__append_4951 = video_fb.marker --@COND_x86_64_xen_TRUE@am__append_4952 = video_fb.module --@COND_x86_64_xen_TRUE@am__append_4953 = video_fb.module$(EXEEXT) --@COND_x86_64_xen_TRUE@am__append_4954 = --@COND_x86_64_xen_TRUE@am__append_4955 = $(nodist_video_fb_module_SOURCES) --@COND_x86_64_xen_TRUE@am__append_4956 = \ -+@COND_i386_xen_TRUE@am__append_4943 = video_fb.mod -+@COND_i386_xen_TRUE@am__append_4944 = video_fb.marker -+@COND_x86_64_xen_TRUE@am__append_4945 = video_fb.module -+@COND_x86_64_xen_TRUE@am__append_4946 = video_fb.module$(EXEEXT) -+@COND_x86_64_xen_TRUE@am__append_4947 = -+@COND_x86_64_xen_TRUE@am__append_4948 = $(nodist_video_fb_module_SOURCES) -+@COND_x86_64_xen_TRUE@am__append_4949 = \ - @COND_x86_64_xen_TRUE@ $(nodist_video_fb_module_SOURCES) \ - @COND_x86_64_xen_TRUE@ video_fb.marker --@COND_x86_64_xen_TRUE@am__append_4957 = video_fb.mod --@COND_x86_64_xen_TRUE@am__append_4958 = video_fb.marker --@COND_i386_xen_pvh_TRUE@am__append_4959 = video_fb.module --@COND_i386_xen_pvh_TRUE@am__append_4960 = video_fb.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__append_4961 = --@COND_i386_xen_pvh_TRUE@am__append_4962 = $(nodist_video_fb_module_SOURCES) --@COND_i386_xen_pvh_TRUE@am__append_4963 = \ -+@COND_x86_64_xen_TRUE@am__append_4950 = video_fb.mod -+@COND_x86_64_xen_TRUE@am__append_4951 = video_fb.marker -+@COND_i386_xen_pvh_TRUE@am__append_4952 = video_fb.module -+@COND_i386_xen_pvh_TRUE@am__append_4953 = video_fb.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__append_4954 = -+@COND_i386_xen_pvh_TRUE@am__append_4955 = $(nodist_video_fb_module_SOURCES) -+@COND_i386_xen_pvh_TRUE@am__append_4956 = \ - @COND_i386_xen_pvh_TRUE@ $(nodist_video_fb_module_SOURCES) \ - @COND_i386_xen_pvh_TRUE@ video_fb.marker --@COND_i386_xen_pvh_TRUE@am__append_4964 = video_fb.mod --@COND_i386_xen_pvh_TRUE@am__append_4965 = video_fb.marker --@COND_sparc64_ieee1275_TRUE@am__append_4966 = video_fb.module --@COND_sparc64_ieee1275_TRUE@am__append_4967 = video_fb.module$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@am__append_4968 = --@COND_sparc64_ieee1275_TRUE@am__append_4969 = $(nodist_video_fb_module_SOURCES) --@COND_sparc64_ieee1275_TRUE@am__append_4970 = \ -+@COND_i386_xen_pvh_TRUE@am__append_4957 = video_fb.mod -+@COND_i386_xen_pvh_TRUE@am__append_4958 = video_fb.marker -+@COND_sparc64_ieee1275_TRUE@am__append_4959 = video_fb.module -+@COND_sparc64_ieee1275_TRUE@am__append_4960 = video_fb.module$(EXEEXT) -+@COND_sparc64_ieee1275_TRUE@am__append_4961 = -+@COND_sparc64_ieee1275_TRUE@am__append_4962 = $(nodist_video_fb_module_SOURCES) -+@COND_sparc64_ieee1275_TRUE@am__append_4963 = \ - @COND_sparc64_ieee1275_TRUE@ $(nodist_video_fb_module_SOURCES) \ - @COND_sparc64_ieee1275_TRUE@ video_fb.marker --@COND_sparc64_ieee1275_TRUE@am__append_4971 = video_fb.mod --@COND_sparc64_ieee1275_TRUE@am__append_4972 = video_fb.marker --@COND_powerpc_ieee1275_TRUE@am__append_4973 = video_fb.module --@COND_powerpc_ieee1275_TRUE@am__append_4974 = video_fb.module$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__append_4975 = --@COND_powerpc_ieee1275_TRUE@am__append_4976 = $(nodist_video_fb_module_SOURCES) --@COND_powerpc_ieee1275_TRUE@am__append_4977 = \ -+@COND_sparc64_ieee1275_TRUE@am__append_4964 = video_fb.mod -+@COND_sparc64_ieee1275_TRUE@am__append_4965 = video_fb.marker -+@COND_powerpc_ieee1275_TRUE@am__append_4966 = video_fb.module -+@COND_powerpc_ieee1275_TRUE@am__append_4967 = video_fb.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__append_4968 = -+@COND_powerpc_ieee1275_TRUE@am__append_4969 = $(nodist_video_fb_module_SOURCES) -+@COND_powerpc_ieee1275_TRUE@am__append_4970 = \ - @COND_powerpc_ieee1275_TRUE@ $(nodist_video_fb_module_SOURCES) \ - @COND_powerpc_ieee1275_TRUE@ video_fb.marker --@COND_powerpc_ieee1275_TRUE@am__append_4978 = video_fb.mod --@COND_powerpc_ieee1275_TRUE@am__append_4979 = video_fb.marker --@COND_mips_arc_TRUE@am__append_4980 = video_fb.module --@COND_mips_arc_TRUE@am__append_4981 = video_fb.module$(EXEEXT) --@COND_mips_arc_TRUE@am__append_4982 = --@COND_mips_arc_TRUE@am__append_4983 = $(nodist_video_fb_module_SOURCES) --@COND_mips_arc_TRUE@am__append_4984 = \ -+@COND_powerpc_ieee1275_TRUE@am__append_4971 = video_fb.mod -+@COND_powerpc_ieee1275_TRUE@am__append_4972 = video_fb.marker -+@COND_mips_arc_TRUE@am__append_4973 = video_fb.module -+@COND_mips_arc_TRUE@am__append_4974 = video_fb.module$(EXEEXT) -+@COND_mips_arc_TRUE@am__append_4975 = -+@COND_mips_arc_TRUE@am__append_4976 = $(nodist_video_fb_module_SOURCES) -+@COND_mips_arc_TRUE@am__append_4977 = \ - @COND_mips_arc_TRUE@ $(nodist_video_fb_module_SOURCES) \ - @COND_mips_arc_TRUE@ video_fb.marker --@COND_mips_arc_TRUE@am__append_4985 = video_fb.mod --@COND_mips_arc_TRUE@am__append_4986 = video_fb.marker --@COND_ia64_efi_TRUE@am__append_4987 = video_fb.module --@COND_ia64_efi_TRUE@am__append_4988 = video_fb.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__append_4989 = --@COND_ia64_efi_TRUE@am__append_4990 = $(nodist_video_fb_module_SOURCES) --@COND_ia64_efi_TRUE@am__append_4991 = \ -+@COND_mips_arc_TRUE@am__append_4978 = video_fb.mod -+@COND_mips_arc_TRUE@am__append_4979 = video_fb.marker -+@COND_ia64_efi_TRUE@am__append_4980 = video_fb.module -+@COND_ia64_efi_TRUE@am__append_4981 = video_fb.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__append_4982 = -+@COND_ia64_efi_TRUE@am__append_4983 = $(nodist_video_fb_module_SOURCES) -+@COND_ia64_efi_TRUE@am__append_4984 = \ - @COND_ia64_efi_TRUE@ $(nodist_video_fb_module_SOURCES) \ - @COND_ia64_efi_TRUE@ video_fb.marker --@COND_ia64_efi_TRUE@am__append_4992 = video_fb.mod --@COND_ia64_efi_TRUE@am__append_4993 = video_fb.marker --@COND_mips_qemu_mips_TRUE@am__append_4994 = video_fb.module --@COND_mips_qemu_mips_TRUE@am__append_4995 = video_fb.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__append_4996 = --@COND_mips_qemu_mips_TRUE@am__append_4997 = $(nodist_video_fb_module_SOURCES) --@COND_mips_qemu_mips_TRUE@am__append_4998 = \ -+@COND_ia64_efi_TRUE@am__append_4985 = video_fb.mod -+@COND_ia64_efi_TRUE@am__append_4986 = video_fb.marker -+@COND_mips_qemu_mips_TRUE@am__append_4987 = video_fb.module -+@COND_mips_qemu_mips_TRUE@am__append_4988 = video_fb.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__append_4989 = -+@COND_mips_qemu_mips_TRUE@am__append_4990 = $(nodist_video_fb_module_SOURCES) -+@COND_mips_qemu_mips_TRUE@am__append_4991 = \ - @COND_mips_qemu_mips_TRUE@ $(nodist_video_fb_module_SOURCES) \ - @COND_mips_qemu_mips_TRUE@ video_fb.marker --@COND_mips_qemu_mips_TRUE@am__append_4999 = video_fb.mod --@COND_mips_qemu_mips_TRUE@am__append_5000 = video_fb.marker --@COND_arm_uboot_TRUE@am__append_5001 = video_fb.module --@COND_arm_uboot_TRUE@am__append_5002 = video_fb.module$(EXEEXT) --@COND_arm_uboot_TRUE@am__append_5003 = --@COND_arm_uboot_TRUE@am__append_5004 = $(nodist_video_fb_module_SOURCES) --@COND_arm_uboot_TRUE@am__append_5005 = \ -+@COND_mips_qemu_mips_TRUE@am__append_4992 = video_fb.mod -+@COND_mips_qemu_mips_TRUE@am__append_4993 = video_fb.marker -+@COND_arm_uboot_TRUE@am__append_4994 = video_fb.module -+@COND_arm_uboot_TRUE@am__append_4995 = video_fb.module$(EXEEXT) -+@COND_arm_uboot_TRUE@am__append_4996 = -+@COND_arm_uboot_TRUE@am__append_4997 = $(nodist_video_fb_module_SOURCES) -+@COND_arm_uboot_TRUE@am__append_4998 = \ - @COND_arm_uboot_TRUE@ $(nodist_video_fb_module_SOURCES) \ - @COND_arm_uboot_TRUE@ video_fb.marker --@COND_arm_uboot_TRUE@am__append_5006 = video_fb.mod --@COND_arm_uboot_TRUE@am__append_5007 = video_fb.marker --@COND_arm_efi_TRUE@am__append_5008 = video_fb.module --@COND_arm_efi_TRUE@am__append_5009 = video_fb.module$(EXEEXT) --@COND_arm_efi_TRUE@am__append_5010 = --@COND_arm_efi_TRUE@am__append_5011 = $(nodist_video_fb_module_SOURCES) --@COND_arm_efi_TRUE@am__append_5012 = \ -+@COND_arm_uboot_TRUE@am__append_4999 = video_fb.mod -+@COND_arm_uboot_TRUE@am__append_5000 = video_fb.marker -+@COND_arm_efi_TRUE@am__append_5001 = video_fb.module -+@COND_arm_efi_TRUE@am__append_5002 = video_fb.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__append_5003 = -+@COND_arm_efi_TRUE@am__append_5004 = $(nodist_video_fb_module_SOURCES) -+@COND_arm_efi_TRUE@am__append_5005 = \ - @COND_arm_efi_TRUE@ $(nodist_video_fb_module_SOURCES) \ - @COND_arm_efi_TRUE@ video_fb.marker --@COND_arm_efi_TRUE@am__append_5013 = video_fb.mod --@COND_arm_efi_TRUE@am__append_5014 = video_fb.marker --@COND_arm64_efi_TRUE@am__append_5015 = video_fb.module --@COND_arm64_efi_TRUE@am__append_5016 = video_fb.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__append_5017 = --@COND_arm64_efi_TRUE@am__append_5018 = $(nodist_video_fb_module_SOURCES) --@COND_arm64_efi_TRUE@am__append_5019 = \ -+@COND_arm_efi_TRUE@am__append_5006 = video_fb.mod -+@COND_arm_efi_TRUE@am__append_5007 = video_fb.marker -+@COND_arm64_efi_TRUE@am__append_5008 = video_fb.module -+@COND_arm64_efi_TRUE@am__append_5009 = video_fb.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__append_5010 = -+@COND_arm64_efi_TRUE@am__append_5011 = $(nodist_video_fb_module_SOURCES) -+@COND_arm64_efi_TRUE@am__append_5012 = \ - @COND_arm64_efi_TRUE@ $(nodist_video_fb_module_SOURCES) \ - @COND_arm64_efi_TRUE@ video_fb.marker --@COND_arm64_efi_TRUE@am__append_5020 = video_fb.mod --@COND_arm64_efi_TRUE@am__append_5021 = video_fb.marker --@COND_riscv32_efi_TRUE@am__append_5022 = video_fb.module --@COND_riscv32_efi_TRUE@am__append_5023 = video_fb.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__append_5024 = --@COND_riscv32_efi_TRUE@am__append_5025 = $(nodist_video_fb_module_SOURCES) --@COND_riscv32_efi_TRUE@am__append_5026 = \ -+@COND_arm64_efi_TRUE@am__append_5013 = video_fb.mod -+@COND_arm64_efi_TRUE@am__append_5014 = video_fb.marker -+@COND_riscv32_efi_TRUE@am__append_5015 = video_fb.module -+@COND_riscv32_efi_TRUE@am__append_5016 = video_fb.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__append_5017 = -+@COND_riscv32_efi_TRUE@am__append_5018 = $(nodist_video_fb_module_SOURCES) -+@COND_riscv32_efi_TRUE@am__append_5019 = \ - @COND_riscv32_efi_TRUE@ $(nodist_video_fb_module_SOURCES) \ - @COND_riscv32_efi_TRUE@ video_fb.marker --@COND_riscv32_efi_TRUE@am__append_5027 = video_fb.mod --@COND_riscv32_efi_TRUE@am__append_5028 = video_fb.marker --@COND_riscv64_efi_TRUE@am__append_5029 = video_fb.module --@COND_riscv64_efi_TRUE@am__append_5030 = video_fb.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__append_5031 = --@COND_riscv64_efi_TRUE@am__append_5032 = $(nodist_video_fb_module_SOURCES) --@COND_riscv64_efi_TRUE@am__append_5033 = \ -+@COND_riscv32_efi_TRUE@am__append_5020 = video_fb.mod -+@COND_riscv32_efi_TRUE@am__append_5021 = video_fb.marker -+@COND_riscv64_efi_TRUE@am__append_5022 = video_fb.module -+@COND_riscv64_efi_TRUE@am__append_5023 = video_fb.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_5024 = -+@COND_riscv64_efi_TRUE@am__append_5025 = $(nodist_video_fb_module_SOURCES) -+@COND_riscv64_efi_TRUE@am__append_5026 = \ - @COND_riscv64_efi_TRUE@ $(nodist_video_fb_module_SOURCES) \ - @COND_riscv64_efi_TRUE@ video_fb.marker --@COND_riscv64_efi_TRUE@am__append_5034 = video_fb.mod --@COND_riscv64_efi_TRUE@am__append_5035 = video_fb.marker --@COND_emu_TRUE@am__append_5036 = video.module --@COND_emu_TRUE@am__append_5037 = video.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_5027 = video_fb.mod -+@COND_riscv64_efi_TRUE@am__append_5028 = video_fb.marker -+@COND_emu_TRUE@am__append_5029 = video.module -+@COND_emu_TRUE@am__append_5030 = video.module$(EXEEXT) - @COND_arm64_efi_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_FALSE@video_module_DEPENDENCIES = --@COND_emu_TRUE@am__append_5038 = --@COND_emu_TRUE@am__append_5039 = $(nodist_video_module_SOURCES) --@COND_emu_TRUE@am__append_5040 = $(nodist_video_module_SOURCES) \ -+@COND_emu_TRUE@am__append_5031 = -+@COND_emu_TRUE@am__append_5032 = $(nodist_video_module_SOURCES) -+@COND_emu_TRUE@am__append_5033 = $(nodist_video_module_SOURCES) \ - @COND_emu_TRUE@ video.marker --@COND_emu_TRUE@am__append_5041 = video.mod --@COND_emu_TRUE@am__append_5042 = video.marker --@COND_i386_pc_TRUE@am__append_5043 = video.module --@COND_i386_pc_TRUE@am__append_5044 = video.module$(EXEEXT) --@COND_i386_pc_TRUE@am__append_5045 = --@COND_i386_pc_TRUE@am__append_5046 = $(nodist_video_module_SOURCES) --@COND_i386_pc_TRUE@am__append_5047 = $(nodist_video_module_SOURCES) \ -+@COND_emu_TRUE@am__append_5034 = video.mod -+@COND_emu_TRUE@am__append_5035 = video.marker -+@COND_i386_pc_TRUE@am__append_5036 = video.module -+@COND_i386_pc_TRUE@am__append_5037 = video.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__append_5038 = -+@COND_i386_pc_TRUE@am__append_5039 = $(nodist_video_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_5040 = $(nodist_video_module_SOURCES) \ - @COND_i386_pc_TRUE@ video.marker --@COND_i386_pc_TRUE@am__append_5048 = video.mod --@COND_i386_pc_TRUE@am__append_5049 = video.marker --@COND_i386_efi_TRUE@am__append_5050 = video.module --@COND_i386_efi_TRUE@am__append_5051 = video.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_5052 = --@COND_i386_efi_TRUE@am__append_5053 = $(nodist_video_module_SOURCES) --@COND_i386_efi_TRUE@am__append_5054 = $(nodist_video_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_5041 = video.mod -+@COND_i386_pc_TRUE@am__append_5042 = video.marker -+@COND_i386_efi_TRUE@am__append_5043 = video.module -+@COND_i386_efi_TRUE@am__append_5044 = video.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_5045 = -+@COND_i386_efi_TRUE@am__append_5046 = $(nodist_video_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_5047 = $(nodist_video_module_SOURCES) \ - @COND_i386_efi_TRUE@ video.marker --@COND_i386_efi_TRUE@am__append_5055 = video.mod --@COND_i386_efi_TRUE@am__append_5056 = video.marker --@COND_i386_qemu_TRUE@am__append_5057 = video.module --@COND_i386_qemu_TRUE@am__append_5058 = video.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_5059 = --@COND_i386_qemu_TRUE@am__append_5060 = $(nodist_video_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_5061 = $(nodist_video_module_SOURCES) \ -+@COND_i386_efi_TRUE@am__append_5048 = video.mod -+@COND_i386_efi_TRUE@am__append_5049 = video.marker -+@COND_i386_qemu_TRUE@am__append_5050 = video.module -+@COND_i386_qemu_TRUE@am__append_5051 = video.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_5052 = -+@COND_i386_qemu_TRUE@am__append_5053 = $(nodist_video_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_5054 = $(nodist_video_module_SOURCES) \ - @COND_i386_qemu_TRUE@ video.marker --@COND_i386_qemu_TRUE@am__append_5062 = video.mod --@COND_i386_qemu_TRUE@am__append_5063 = video.marker --@COND_i386_multiboot_TRUE@am__append_5064 = video.module --@COND_i386_multiboot_TRUE@am__append_5065 = video.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_5066 = --@COND_i386_multiboot_TRUE@am__append_5067 = $(nodist_video_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_5068 = \ -+@COND_i386_qemu_TRUE@am__append_5055 = video.mod -+@COND_i386_qemu_TRUE@am__append_5056 = video.marker -+@COND_i386_multiboot_TRUE@am__append_5057 = video.module -+@COND_i386_multiboot_TRUE@am__append_5058 = video.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_5059 = -+@COND_i386_multiboot_TRUE@am__append_5060 = $(nodist_video_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_5061 = \ - @COND_i386_multiboot_TRUE@ $(nodist_video_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ video.marker --@COND_i386_multiboot_TRUE@am__append_5069 = video.mod --@COND_i386_multiboot_TRUE@am__append_5070 = video.marker --@COND_i386_ieee1275_TRUE@am__append_5071 = video.module --@COND_i386_ieee1275_TRUE@am__append_5072 = video.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_5073 = --@COND_i386_ieee1275_TRUE@am__append_5074 = $(nodist_video_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_5075 = \ -+@COND_i386_multiboot_TRUE@am__append_5062 = video.mod -+@COND_i386_multiboot_TRUE@am__append_5063 = video.marker -+@COND_i386_ieee1275_TRUE@am__append_5064 = video.module -+@COND_i386_ieee1275_TRUE@am__append_5065 = video.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_5066 = -+@COND_i386_ieee1275_TRUE@am__append_5067 = $(nodist_video_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_5068 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_video_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ video.marker --@COND_i386_ieee1275_TRUE@am__append_5076 = video.mod --@COND_i386_ieee1275_TRUE@am__append_5077 = video.marker --@COND_x86_64_efi_TRUE@am__append_5078 = video.module --@COND_x86_64_efi_TRUE@am__append_5079 = video.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_5080 = --@COND_x86_64_efi_TRUE@am__append_5081 = $(nodist_video_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_5082 = \ -+@COND_i386_ieee1275_TRUE@am__append_5069 = video.mod -+@COND_i386_ieee1275_TRUE@am__append_5070 = video.marker -+@COND_x86_64_efi_TRUE@am__append_5071 = video.module -+@COND_x86_64_efi_TRUE@am__append_5072 = video.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_5073 = -+@COND_x86_64_efi_TRUE@am__append_5074 = $(nodist_video_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_5075 = \ - @COND_x86_64_efi_TRUE@ $(nodist_video_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ video.marker --@COND_x86_64_efi_TRUE@am__append_5083 = video.mod --@COND_x86_64_efi_TRUE@am__append_5084 = video.marker --@COND_i386_xen_TRUE@am__append_5085 = video.module --@COND_i386_xen_TRUE@am__append_5086 = video.module$(EXEEXT) --@COND_i386_xen_TRUE@am__append_5087 = --@COND_i386_xen_TRUE@am__append_5088 = $(nodist_video_module_SOURCES) --@COND_i386_xen_TRUE@am__append_5089 = $(nodist_video_module_SOURCES) \ -+@COND_x86_64_efi_TRUE@am__append_5076 = video.mod -+@COND_x86_64_efi_TRUE@am__append_5077 = video.marker -+@COND_i386_xen_TRUE@am__append_5078 = video.module -+@COND_i386_xen_TRUE@am__append_5079 = video.module$(EXEEXT) -+@COND_i386_xen_TRUE@am__append_5080 = -+@COND_i386_xen_TRUE@am__append_5081 = $(nodist_video_module_SOURCES) -+@COND_i386_xen_TRUE@am__append_5082 = $(nodist_video_module_SOURCES) \ - @COND_i386_xen_TRUE@ video.marker --@COND_i386_xen_TRUE@am__append_5090 = video.mod --@COND_i386_xen_TRUE@am__append_5091 = video.marker --@COND_x86_64_xen_TRUE@am__append_5092 = video.module --@COND_x86_64_xen_TRUE@am__append_5093 = video.module$(EXEEXT) --@COND_x86_64_xen_TRUE@am__append_5094 = --@COND_x86_64_xen_TRUE@am__append_5095 = $(nodist_video_module_SOURCES) --@COND_x86_64_xen_TRUE@am__append_5096 = \ -+@COND_i386_xen_TRUE@am__append_5083 = video.mod -+@COND_i386_xen_TRUE@am__append_5084 = video.marker -+@COND_x86_64_xen_TRUE@am__append_5085 = video.module -+@COND_x86_64_xen_TRUE@am__append_5086 = video.module$(EXEEXT) -+@COND_x86_64_xen_TRUE@am__append_5087 = -+@COND_x86_64_xen_TRUE@am__append_5088 = $(nodist_video_module_SOURCES) -+@COND_x86_64_xen_TRUE@am__append_5089 = \ - @COND_x86_64_xen_TRUE@ $(nodist_video_module_SOURCES) \ - @COND_x86_64_xen_TRUE@ video.marker --@COND_x86_64_xen_TRUE@am__append_5097 = video.mod --@COND_x86_64_xen_TRUE@am__append_5098 = video.marker --@COND_i386_xen_pvh_TRUE@am__append_5099 = video.module --@COND_i386_xen_pvh_TRUE@am__append_5100 = video.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__append_5101 = --@COND_i386_xen_pvh_TRUE@am__append_5102 = $(nodist_video_module_SOURCES) --@COND_i386_xen_pvh_TRUE@am__append_5103 = \ -+@COND_x86_64_xen_TRUE@am__append_5090 = video.mod -+@COND_x86_64_xen_TRUE@am__append_5091 = video.marker -+@COND_i386_xen_pvh_TRUE@am__append_5092 = video.module -+@COND_i386_xen_pvh_TRUE@am__append_5093 = video.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__append_5094 = -+@COND_i386_xen_pvh_TRUE@am__append_5095 = $(nodist_video_module_SOURCES) -+@COND_i386_xen_pvh_TRUE@am__append_5096 = \ - @COND_i386_xen_pvh_TRUE@ $(nodist_video_module_SOURCES) \ - @COND_i386_xen_pvh_TRUE@ video.marker --@COND_i386_xen_pvh_TRUE@am__append_5104 = video.mod --@COND_i386_xen_pvh_TRUE@am__append_5105 = video.marker --@COND_sparc64_ieee1275_TRUE@am__append_5106 = video.module --@COND_sparc64_ieee1275_TRUE@am__append_5107 = video.module$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@am__append_5108 = --@COND_sparc64_ieee1275_TRUE@am__append_5109 = $(nodist_video_module_SOURCES) --@COND_sparc64_ieee1275_TRUE@am__append_5110 = \ -+@COND_i386_xen_pvh_TRUE@am__append_5097 = video.mod -+@COND_i386_xen_pvh_TRUE@am__append_5098 = video.marker -+@COND_sparc64_ieee1275_TRUE@am__append_5099 = video.module -+@COND_sparc64_ieee1275_TRUE@am__append_5100 = video.module$(EXEEXT) -+@COND_sparc64_ieee1275_TRUE@am__append_5101 = -+@COND_sparc64_ieee1275_TRUE@am__append_5102 = $(nodist_video_module_SOURCES) -+@COND_sparc64_ieee1275_TRUE@am__append_5103 = \ - @COND_sparc64_ieee1275_TRUE@ $(nodist_video_module_SOURCES) \ - @COND_sparc64_ieee1275_TRUE@ video.marker --@COND_sparc64_ieee1275_TRUE@am__append_5111 = video.mod --@COND_sparc64_ieee1275_TRUE@am__append_5112 = video.marker --@COND_powerpc_ieee1275_TRUE@am__append_5113 = video.module --@COND_powerpc_ieee1275_TRUE@am__append_5114 = video.module$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__append_5115 = --@COND_powerpc_ieee1275_TRUE@am__append_5116 = $(nodist_video_module_SOURCES) --@COND_powerpc_ieee1275_TRUE@am__append_5117 = \ -+@COND_sparc64_ieee1275_TRUE@am__append_5104 = video.mod -+@COND_sparc64_ieee1275_TRUE@am__append_5105 = video.marker -+@COND_powerpc_ieee1275_TRUE@am__append_5106 = video.module -+@COND_powerpc_ieee1275_TRUE@am__append_5107 = video.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__append_5108 = -+@COND_powerpc_ieee1275_TRUE@am__append_5109 = $(nodist_video_module_SOURCES) -+@COND_powerpc_ieee1275_TRUE@am__append_5110 = \ - @COND_powerpc_ieee1275_TRUE@ $(nodist_video_module_SOURCES) \ - @COND_powerpc_ieee1275_TRUE@ video.marker --@COND_powerpc_ieee1275_TRUE@am__append_5118 = video.mod --@COND_powerpc_ieee1275_TRUE@am__append_5119 = video.marker --@COND_mips_arc_TRUE@am__append_5120 = video.module --@COND_mips_arc_TRUE@am__append_5121 = video.module$(EXEEXT) --@COND_mips_arc_TRUE@am__append_5122 = --@COND_mips_arc_TRUE@am__append_5123 = $(nodist_video_module_SOURCES) --@COND_mips_arc_TRUE@am__append_5124 = $(nodist_video_module_SOURCES) \ -+@COND_powerpc_ieee1275_TRUE@am__append_5111 = video.mod -+@COND_powerpc_ieee1275_TRUE@am__append_5112 = video.marker -+@COND_mips_arc_TRUE@am__append_5113 = video.module -+@COND_mips_arc_TRUE@am__append_5114 = video.module$(EXEEXT) -+@COND_mips_arc_TRUE@am__append_5115 = -+@COND_mips_arc_TRUE@am__append_5116 = $(nodist_video_module_SOURCES) -+@COND_mips_arc_TRUE@am__append_5117 = $(nodist_video_module_SOURCES) \ - @COND_mips_arc_TRUE@ video.marker --@COND_mips_arc_TRUE@am__append_5125 = video.mod --@COND_mips_arc_TRUE@am__append_5126 = video.marker --@COND_ia64_efi_TRUE@am__append_5127 = video.module --@COND_ia64_efi_TRUE@am__append_5128 = video.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__append_5129 = --@COND_ia64_efi_TRUE@am__append_5130 = $(nodist_video_module_SOURCES) --@COND_ia64_efi_TRUE@am__append_5131 = $(nodist_video_module_SOURCES) \ -+@COND_mips_arc_TRUE@am__append_5118 = video.mod -+@COND_mips_arc_TRUE@am__append_5119 = video.marker -+@COND_ia64_efi_TRUE@am__append_5120 = video.module -+@COND_ia64_efi_TRUE@am__append_5121 = video.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__append_5122 = -+@COND_ia64_efi_TRUE@am__append_5123 = $(nodist_video_module_SOURCES) -+@COND_ia64_efi_TRUE@am__append_5124 = $(nodist_video_module_SOURCES) \ - @COND_ia64_efi_TRUE@ video.marker --@COND_ia64_efi_TRUE@am__append_5132 = video.mod --@COND_ia64_efi_TRUE@am__append_5133 = video.marker --@COND_mips_qemu_mips_TRUE@am__append_5134 = video.module --@COND_mips_qemu_mips_TRUE@am__append_5135 = video.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__append_5136 = --@COND_mips_qemu_mips_TRUE@am__append_5137 = $(nodist_video_module_SOURCES) --@COND_mips_qemu_mips_TRUE@am__append_5138 = \ -+@COND_ia64_efi_TRUE@am__append_5125 = video.mod -+@COND_ia64_efi_TRUE@am__append_5126 = video.marker -+@COND_mips_qemu_mips_TRUE@am__append_5127 = video.module -+@COND_mips_qemu_mips_TRUE@am__append_5128 = video.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__append_5129 = -+@COND_mips_qemu_mips_TRUE@am__append_5130 = $(nodist_video_module_SOURCES) -+@COND_mips_qemu_mips_TRUE@am__append_5131 = \ - @COND_mips_qemu_mips_TRUE@ $(nodist_video_module_SOURCES) \ - @COND_mips_qemu_mips_TRUE@ video.marker --@COND_mips_qemu_mips_TRUE@am__append_5139 = video.mod --@COND_mips_qemu_mips_TRUE@am__append_5140 = video.marker --@COND_arm_uboot_TRUE@am__append_5141 = video.module --@COND_arm_uboot_TRUE@am__append_5142 = video.module$(EXEEXT) --@COND_arm_uboot_TRUE@am__append_5143 = --@COND_arm_uboot_TRUE@am__append_5144 = $(nodist_video_module_SOURCES) --@COND_arm_uboot_TRUE@am__append_5145 = $(nodist_video_module_SOURCES) \ -+@COND_mips_qemu_mips_TRUE@am__append_5132 = video.mod -+@COND_mips_qemu_mips_TRUE@am__append_5133 = video.marker -+@COND_arm_uboot_TRUE@am__append_5134 = video.module -+@COND_arm_uboot_TRUE@am__append_5135 = video.module$(EXEEXT) -+@COND_arm_uboot_TRUE@am__append_5136 = -+@COND_arm_uboot_TRUE@am__append_5137 = $(nodist_video_module_SOURCES) -+@COND_arm_uboot_TRUE@am__append_5138 = $(nodist_video_module_SOURCES) \ - @COND_arm_uboot_TRUE@ video.marker --@COND_arm_uboot_TRUE@am__append_5146 = video.mod --@COND_arm_uboot_TRUE@am__append_5147 = video.marker --@COND_arm_efi_TRUE@am__append_5148 = video.module --@COND_arm_efi_TRUE@am__append_5149 = video.module$(EXEEXT) --@COND_arm_efi_TRUE@am__append_5150 = --@COND_arm_efi_TRUE@am__append_5151 = $(nodist_video_module_SOURCES) --@COND_arm_efi_TRUE@am__append_5152 = $(nodist_video_module_SOURCES) \ -+@COND_arm_uboot_TRUE@am__append_5139 = video.mod -+@COND_arm_uboot_TRUE@am__append_5140 = video.marker -+@COND_arm_efi_TRUE@am__append_5141 = video.module -+@COND_arm_efi_TRUE@am__append_5142 = video.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__append_5143 = -+@COND_arm_efi_TRUE@am__append_5144 = $(nodist_video_module_SOURCES) -+@COND_arm_efi_TRUE@am__append_5145 = $(nodist_video_module_SOURCES) \ - @COND_arm_efi_TRUE@ video.marker --@COND_arm_efi_TRUE@am__append_5153 = video.mod --@COND_arm_efi_TRUE@am__append_5154 = video.marker --@COND_arm64_efi_TRUE@am__append_5155 = video.module --@COND_arm64_efi_TRUE@am__append_5156 = video.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__append_5157 = --@COND_arm64_efi_TRUE@am__append_5158 = $(nodist_video_module_SOURCES) --@COND_arm64_efi_TRUE@am__append_5159 = $(nodist_video_module_SOURCES) \ -+@COND_arm_efi_TRUE@am__append_5146 = video.mod -+@COND_arm_efi_TRUE@am__append_5147 = video.marker -+@COND_arm64_efi_TRUE@am__append_5148 = video.module -+@COND_arm64_efi_TRUE@am__append_5149 = video.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__append_5150 = -+@COND_arm64_efi_TRUE@am__append_5151 = $(nodist_video_module_SOURCES) -+@COND_arm64_efi_TRUE@am__append_5152 = $(nodist_video_module_SOURCES) \ - @COND_arm64_efi_TRUE@ video.marker --@COND_arm64_efi_TRUE@am__append_5160 = video.mod --@COND_arm64_efi_TRUE@am__append_5161 = video.marker --@COND_riscv32_efi_TRUE@am__append_5162 = video.module --@COND_riscv32_efi_TRUE@am__append_5163 = video.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__append_5164 = --@COND_riscv32_efi_TRUE@am__append_5165 = $(nodist_video_module_SOURCES) --@COND_riscv32_efi_TRUE@am__append_5166 = \ -+@COND_arm64_efi_TRUE@am__append_5153 = video.mod -+@COND_arm64_efi_TRUE@am__append_5154 = video.marker -+@COND_riscv32_efi_TRUE@am__append_5155 = video.module -+@COND_riscv32_efi_TRUE@am__append_5156 = video.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__append_5157 = -+@COND_riscv32_efi_TRUE@am__append_5158 = $(nodist_video_module_SOURCES) -+@COND_riscv32_efi_TRUE@am__append_5159 = \ - @COND_riscv32_efi_TRUE@ $(nodist_video_module_SOURCES) \ - @COND_riscv32_efi_TRUE@ video.marker --@COND_riscv32_efi_TRUE@am__append_5167 = video.mod --@COND_riscv32_efi_TRUE@am__append_5168 = video.marker --@COND_riscv64_efi_TRUE@am__append_5169 = video.module --@COND_riscv64_efi_TRUE@am__append_5170 = video.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__append_5171 = --@COND_riscv64_efi_TRUE@am__append_5172 = $(nodist_video_module_SOURCES) --@COND_riscv64_efi_TRUE@am__append_5173 = \ -+@COND_riscv32_efi_TRUE@am__append_5160 = video.mod -+@COND_riscv32_efi_TRUE@am__append_5161 = video.marker -+@COND_riscv64_efi_TRUE@am__append_5162 = video.module -+@COND_riscv64_efi_TRUE@am__append_5163 = video.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_5164 = -+@COND_riscv64_efi_TRUE@am__append_5165 = $(nodist_video_module_SOURCES) -+@COND_riscv64_efi_TRUE@am__append_5166 = \ - @COND_riscv64_efi_TRUE@ $(nodist_video_module_SOURCES) \ - @COND_riscv64_efi_TRUE@ video.marker --@COND_riscv64_efi_TRUE@am__append_5174 = video.mod --@COND_riscv64_efi_TRUE@am__append_5175 = video.marker --@COND_powerpc_ieee1275_TRUE@am__append_5176 = ieee1275_fb.module --@COND_powerpc_ieee1275_TRUE@am__append_5177 = ieee1275_fb.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_5167 = video.mod -+@COND_riscv64_efi_TRUE@am__append_5168 = video.marker -+@COND_powerpc_ieee1275_TRUE@am__append_5169 = ieee1275_fb.module -+@COND_powerpc_ieee1275_TRUE@am__append_5170 = ieee1275_fb.module$(EXEEXT) - @COND_powerpc_ieee1275_FALSE@ieee1275_fb_module_DEPENDENCIES = --@COND_powerpc_ieee1275_TRUE@am__append_5178 = --@COND_powerpc_ieee1275_TRUE@am__append_5179 = $(nodist_ieee1275_fb_module_SOURCES) --@COND_powerpc_ieee1275_TRUE@am__append_5180 = $(nodist_ieee1275_fb_module_SOURCES) \ -+@COND_powerpc_ieee1275_TRUE@am__append_5171 = -+@COND_powerpc_ieee1275_TRUE@am__append_5172 = $(nodist_ieee1275_fb_module_SOURCES) -+@COND_powerpc_ieee1275_TRUE@am__append_5173 = $(nodist_ieee1275_fb_module_SOURCES) \ - @COND_powerpc_ieee1275_TRUE@ ieee1275_fb.marker --@COND_powerpc_ieee1275_TRUE@am__append_5181 = ieee1275_fb.mod --@COND_powerpc_ieee1275_TRUE@am__append_5182 = ieee1275_fb.marker --@COND_GRUB_EMU_SDL_TRUE@@COND_emu_TRUE@am__append_5183 = sdl.module --@COND_GRUB_EMU_SDL_TRUE@@COND_emu_TRUE@am__append_5184 = sdl.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__append_5174 = ieee1275_fb.mod -+@COND_powerpc_ieee1275_TRUE@am__append_5175 = ieee1275_fb.marker -+@COND_GRUB_EMU_SDL_TRUE@@COND_emu_TRUE@am__append_5176 = sdl.module -+@COND_GRUB_EMU_SDL_TRUE@@COND_emu_TRUE@am__append_5177 = sdl.module$(EXEEXT) - @COND_GRUB_EMU_SDL_FALSE@sdl_module_DEPENDENCIES = - @COND_emu_FALSE@sdl_module_DEPENDENCIES = --@COND_GRUB_EMU_SDL_TRUE@@COND_emu_TRUE@am__append_5185 = --@COND_GRUB_EMU_SDL_TRUE@@COND_emu_TRUE@am__append_5186 = $(nodist_sdl_module_SOURCES) --@COND_GRUB_EMU_SDL_TRUE@@COND_emu_TRUE@am__append_5187 = $(nodist_sdl_module_SOURCES) \ -+@COND_GRUB_EMU_SDL_TRUE@@COND_emu_TRUE@am__append_5178 = -+@COND_GRUB_EMU_SDL_TRUE@@COND_emu_TRUE@am__append_5179 = $(nodist_sdl_module_SOURCES) -+@COND_GRUB_EMU_SDL_TRUE@@COND_emu_TRUE@am__append_5180 = $(nodist_sdl_module_SOURCES) \ - @COND_GRUB_EMU_SDL_TRUE@@COND_emu_TRUE@ sdl.marker --@COND_GRUB_EMU_SDL_TRUE@@COND_emu_TRUE@am__append_5188 = sdl.mod --@COND_GRUB_EMU_SDL_TRUE@@COND_emu_TRUE@am__append_5189 = sdl.marker --@COND_i386_ieee1275_TRUE@am__append_5190 = ofnet.module --@COND_i386_ieee1275_TRUE@am__append_5191 = ofnet.module$(EXEEXT) -+@COND_GRUB_EMU_SDL_TRUE@@COND_emu_TRUE@am__append_5181 = sdl.mod -+@COND_GRUB_EMU_SDL_TRUE@@COND_emu_TRUE@am__append_5182 = sdl.marker -+@COND_i386_ieee1275_TRUE@am__append_5183 = ofnet.module -+@COND_i386_ieee1275_TRUE@am__append_5184 = ofnet.module$(EXEEXT) - @COND_i386_ieee1275_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_sparc64_ieee1275_FALSE@ofnet_module_DEPENDENCIES = --@COND_i386_ieee1275_TRUE@am__append_5192 = --@COND_i386_ieee1275_TRUE@am__append_5193 = $(nodist_ofnet_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_5194 = \ -+@COND_i386_ieee1275_TRUE@am__append_5185 = -+@COND_i386_ieee1275_TRUE@am__append_5186 = $(nodist_ofnet_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_5187 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_ofnet_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ ofnet.marker --@COND_i386_ieee1275_TRUE@am__append_5195 = ofnet.mod --@COND_i386_ieee1275_TRUE@am__append_5196 = ofnet.marker --@COND_sparc64_ieee1275_TRUE@am__append_5197 = ofnet.module --@COND_sparc64_ieee1275_TRUE@am__append_5198 = ofnet.module$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@am__append_5199 = --@COND_sparc64_ieee1275_TRUE@am__append_5200 = $(nodist_ofnet_module_SOURCES) --@COND_sparc64_ieee1275_TRUE@am__append_5201 = \ -+@COND_i386_ieee1275_TRUE@am__append_5188 = ofnet.mod -+@COND_i386_ieee1275_TRUE@am__append_5189 = ofnet.marker -+@COND_sparc64_ieee1275_TRUE@am__append_5190 = ofnet.module -+@COND_sparc64_ieee1275_TRUE@am__append_5191 = ofnet.module$(EXEEXT) -+@COND_sparc64_ieee1275_TRUE@am__append_5192 = -+@COND_sparc64_ieee1275_TRUE@am__append_5193 = $(nodist_ofnet_module_SOURCES) -+@COND_sparc64_ieee1275_TRUE@am__append_5194 = \ - @COND_sparc64_ieee1275_TRUE@ $(nodist_ofnet_module_SOURCES) \ - @COND_sparc64_ieee1275_TRUE@ ofnet.marker --@COND_sparc64_ieee1275_TRUE@am__append_5202 = ofnet.mod --@COND_sparc64_ieee1275_TRUE@am__append_5203 = ofnet.marker --@COND_powerpc_ieee1275_TRUE@am__append_5204 = ofnet.module --@COND_powerpc_ieee1275_TRUE@am__append_5205 = ofnet.module$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__append_5206 = --@COND_powerpc_ieee1275_TRUE@am__append_5207 = $(nodist_ofnet_module_SOURCES) --@COND_powerpc_ieee1275_TRUE@am__append_5208 = \ -+@COND_sparc64_ieee1275_TRUE@am__append_5195 = ofnet.mod -+@COND_sparc64_ieee1275_TRUE@am__append_5196 = ofnet.marker -+@COND_powerpc_ieee1275_TRUE@am__append_5197 = ofnet.module -+@COND_powerpc_ieee1275_TRUE@am__append_5198 = ofnet.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__append_5199 = -+@COND_powerpc_ieee1275_TRUE@am__append_5200 = $(nodist_ofnet_module_SOURCES) -+@COND_powerpc_ieee1275_TRUE@am__append_5201 = \ - @COND_powerpc_ieee1275_TRUE@ $(nodist_ofnet_module_SOURCES) \ - @COND_powerpc_ieee1275_TRUE@ ofnet.marker --@COND_powerpc_ieee1275_TRUE@am__append_5209 = ofnet.mod --@COND_powerpc_ieee1275_TRUE@am__append_5210 = ofnet.marker --@COND_arm_uboot_TRUE@am__append_5211 = ubootnet.module --@COND_arm_uboot_TRUE@am__append_5212 = ubootnet.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__append_5202 = ofnet.mod -+@COND_powerpc_ieee1275_TRUE@am__append_5203 = ofnet.marker -+@COND_arm_uboot_TRUE@am__append_5204 = ubootnet.module -+@COND_arm_uboot_TRUE@am__append_5205 = ubootnet.module$(EXEEXT) - @COND_arm_uboot_FALSE@ubootnet_module_DEPENDENCIES = --@COND_arm_uboot_TRUE@am__append_5213 = --@COND_arm_uboot_TRUE@am__append_5214 = $(nodist_ubootnet_module_SOURCES) --@COND_arm_uboot_TRUE@am__append_5215 = \ -+@COND_arm_uboot_TRUE@am__append_5206 = -+@COND_arm_uboot_TRUE@am__append_5207 = $(nodist_ubootnet_module_SOURCES) -+@COND_arm_uboot_TRUE@am__append_5208 = \ - @COND_arm_uboot_TRUE@ $(nodist_ubootnet_module_SOURCES) \ - @COND_arm_uboot_TRUE@ ubootnet.marker --@COND_arm_uboot_TRUE@am__append_5216 = ubootnet.mod --@COND_arm_uboot_TRUE@am__append_5217 = ubootnet.marker --@COND_i386_efi_TRUE@am__append_5218 = efinet.module --@COND_i386_efi_TRUE@am__append_5219 = efinet.module$(EXEEXT) -+@COND_arm_uboot_TRUE@am__append_5209 = ubootnet.mod -+@COND_arm_uboot_TRUE@am__append_5210 = ubootnet.marker -+@COND_i386_efi_TRUE@am__append_5211 = efinet.module -+@COND_i386_efi_TRUE@am__append_5212 = efinet.module$(EXEEXT) - @COND_arm64_efi_FALSE@@COND_arm_efi_FALSE@@COND_i386_efi_FALSE@@COND_ia64_efi_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_x86_64_efi_FALSE@efinet_module_DEPENDENCIES = --@COND_i386_efi_TRUE@am__append_5220 = --@COND_i386_efi_TRUE@am__append_5221 = $(nodist_efinet_module_SOURCES) --@COND_i386_efi_TRUE@am__append_5222 = $(nodist_efinet_module_SOURCES) \ -+@COND_i386_efi_TRUE@am__append_5213 = -+@COND_i386_efi_TRUE@am__append_5214 = $(nodist_efinet_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_5215 = $(nodist_efinet_module_SOURCES) \ - @COND_i386_efi_TRUE@ efinet.marker --@COND_i386_efi_TRUE@am__append_5223 = efinet.mod --@COND_i386_efi_TRUE@am__append_5224 = efinet.marker --@COND_x86_64_efi_TRUE@am__append_5225 = efinet.module --@COND_x86_64_efi_TRUE@am__append_5226 = efinet.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_5227 = --@COND_x86_64_efi_TRUE@am__append_5228 = $(nodist_efinet_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_5229 = \ -+@COND_i386_efi_TRUE@am__append_5216 = efinet.mod -+@COND_i386_efi_TRUE@am__append_5217 = efinet.marker -+@COND_x86_64_efi_TRUE@am__append_5218 = efinet.module -+@COND_x86_64_efi_TRUE@am__append_5219 = efinet.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_5220 = -+@COND_x86_64_efi_TRUE@am__append_5221 = $(nodist_efinet_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_5222 = \ - @COND_x86_64_efi_TRUE@ $(nodist_efinet_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ efinet.marker --@COND_x86_64_efi_TRUE@am__append_5230 = efinet.mod --@COND_x86_64_efi_TRUE@am__append_5231 = efinet.marker --@COND_ia64_efi_TRUE@am__append_5232 = efinet.module --@COND_ia64_efi_TRUE@am__append_5233 = efinet.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__append_5234 = --@COND_ia64_efi_TRUE@am__append_5235 = $(nodist_efinet_module_SOURCES) --@COND_ia64_efi_TRUE@am__append_5236 = $(nodist_efinet_module_SOURCES) \ -+@COND_x86_64_efi_TRUE@am__append_5223 = efinet.mod -+@COND_x86_64_efi_TRUE@am__append_5224 = efinet.marker -+@COND_ia64_efi_TRUE@am__append_5225 = efinet.module -+@COND_ia64_efi_TRUE@am__append_5226 = efinet.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__append_5227 = -+@COND_ia64_efi_TRUE@am__append_5228 = $(nodist_efinet_module_SOURCES) -+@COND_ia64_efi_TRUE@am__append_5229 = $(nodist_efinet_module_SOURCES) \ - @COND_ia64_efi_TRUE@ efinet.marker --@COND_ia64_efi_TRUE@am__append_5237 = efinet.mod --@COND_ia64_efi_TRUE@am__append_5238 = efinet.marker --@COND_arm_efi_TRUE@am__append_5239 = efinet.module --@COND_arm_efi_TRUE@am__append_5240 = efinet.module$(EXEEXT) --@COND_arm_efi_TRUE@am__append_5241 = --@COND_arm_efi_TRUE@am__append_5242 = $(nodist_efinet_module_SOURCES) --@COND_arm_efi_TRUE@am__append_5243 = $(nodist_efinet_module_SOURCES) \ -+@COND_ia64_efi_TRUE@am__append_5230 = efinet.mod -+@COND_ia64_efi_TRUE@am__append_5231 = efinet.marker -+@COND_arm_efi_TRUE@am__append_5232 = efinet.module -+@COND_arm_efi_TRUE@am__append_5233 = efinet.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__append_5234 = -+@COND_arm_efi_TRUE@am__append_5235 = $(nodist_efinet_module_SOURCES) -+@COND_arm_efi_TRUE@am__append_5236 = $(nodist_efinet_module_SOURCES) \ - @COND_arm_efi_TRUE@ efinet.marker --@COND_arm_efi_TRUE@am__append_5244 = efinet.mod --@COND_arm_efi_TRUE@am__append_5245 = efinet.marker --@COND_arm64_efi_TRUE@am__append_5246 = efinet.module --@COND_arm64_efi_TRUE@am__append_5247 = efinet.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__append_5248 = --@COND_arm64_efi_TRUE@am__append_5249 = $(nodist_efinet_module_SOURCES) --@COND_arm64_efi_TRUE@am__append_5250 = \ -+@COND_arm_efi_TRUE@am__append_5237 = efinet.mod -+@COND_arm_efi_TRUE@am__append_5238 = efinet.marker -+@COND_arm64_efi_TRUE@am__append_5239 = efinet.module -+@COND_arm64_efi_TRUE@am__append_5240 = efinet.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__append_5241 = -+@COND_arm64_efi_TRUE@am__append_5242 = $(nodist_efinet_module_SOURCES) -+@COND_arm64_efi_TRUE@am__append_5243 = \ - @COND_arm64_efi_TRUE@ $(nodist_efinet_module_SOURCES) \ - @COND_arm64_efi_TRUE@ efinet.marker --@COND_arm64_efi_TRUE@am__append_5251 = efinet.mod --@COND_arm64_efi_TRUE@am__append_5252 = efinet.marker --@COND_riscv32_efi_TRUE@am__append_5253 = efinet.module --@COND_riscv32_efi_TRUE@am__append_5254 = efinet.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__append_5255 = --@COND_riscv32_efi_TRUE@am__append_5256 = $(nodist_efinet_module_SOURCES) --@COND_riscv32_efi_TRUE@am__append_5257 = \ -+@COND_arm64_efi_TRUE@am__append_5244 = efinet.mod -+@COND_arm64_efi_TRUE@am__append_5245 = efinet.marker -+@COND_riscv32_efi_TRUE@am__append_5246 = efinet.module -+@COND_riscv32_efi_TRUE@am__append_5247 = efinet.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__append_5248 = -+@COND_riscv32_efi_TRUE@am__append_5249 = $(nodist_efinet_module_SOURCES) -+@COND_riscv32_efi_TRUE@am__append_5250 = \ - @COND_riscv32_efi_TRUE@ $(nodist_efinet_module_SOURCES) \ - @COND_riscv32_efi_TRUE@ efinet.marker --@COND_riscv32_efi_TRUE@am__append_5258 = efinet.mod --@COND_riscv32_efi_TRUE@am__append_5259 = efinet.marker --@COND_riscv64_efi_TRUE@am__append_5260 = efinet.module --@COND_riscv64_efi_TRUE@am__append_5261 = efinet.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__append_5262 = --@COND_riscv64_efi_TRUE@am__append_5263 = $(nodist_efinet_module_SOURCES) --@COND_riscv64_efi_TRUE@am__append_5264 = \ -+@COND_riscv32_efi_TRUE@am__append_5251 = efinet.mod -+@COND_riscv32_efi_TRUE@am__append_5252 = efinet.marker -+@COND_riscv64_efi_TRUE@am__append_5253 = efinet.module -+@COND_riscv64_efi_TRUE@am__append_5254 = efinet.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_5255 = -+@COND_riscv64_efi_TRUE@am__append_5256 = $(nodist_efinet_module_SOURCES) -+@COND_riscv64_efi_TRUE@am__append_5257 = \ - @COND_riscv64_efi_TRUE@ $(nodist_efinet_module_SOURCES) \ - @COND_riscv64_efi_TRUE@ efinet.marker --@COND_riscv64_efi_TRUE@am__append_5265 = efinet.mod --@COND_riscv64_efi_TRUE@am__append_5266 = efinet.marker --@COND_emu_TRUE@am__append_5267 = emunet.module legacycfg.module --@COND_emu_TRUE@am__append_5268 = emunet.module$(EXEEXT) \ -+@COND_riscv64_efi_TRUE@am__append_5258 = efinet.mod -+@COND_riscv64_efi_TRUE@am__append_5259 = efinet.marker -+@COND_emu_TRUE@am__append_5260 = emunet.module legacycfg.module -+@COND_emu_TRUE@am__append_5261 = emunet.module$(EXEEXT) \ - @COND_emu_TRUE@ legacycfg.module$(EXEEXT) - @COND_emu_FALSE@emunet_module_DEPENDENCIES = --@COND_emu_TRUE@am__append_5269 = --@COND_emu_TRUE@am__append_5270 = $(nodist_emunet_module_SOURCES) \ -+@COND_emu_TRUE@am__append_5262 = -+@COND_emu_TRUE@am__append_5263 = $(nodist_emunet_module_SOURCES) \ - @COND_emu_TRUE@ $(nodist_legacycfg_module_SOURCES) --@COND_emu_TRUE@am__append_5271 = $(nodist_emunet_module_SOURCES) \ -+@COND_emu_TRUE@am__append_5264 = $(nodist_emunet_module_SOURCES) \ - @COND_emu_TRUE@ emunet.marker \ - @COND_emu_TRUE@ $(nodist_legacycfg_module_SOURCES) \ - @COND_emu_TRUE@ legacycfg.marker --@COND_emu_TRUE@am__append_5272 = emunet.mod legacycfg.mod --@COND_emu_TRUE@am__append_5273 = emunet.marker legacycfg.marker -+@COND_emu_TRUE@am__append_5265 = emunet.mod legacycfg.mod -+@COND_emu_TRUE@am__append_5266 = emunet.marker legacycfg.marker - @COND_emu_FALSE@@COND_i386_efi_FALSE@@COND_i386_pc_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_FALSE@legacycfg_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_5274 = legacycfg.module --@COND_i386_pc_TRUE@am__append_5275 = legacycfg.module$(EXEEXT) --@COND_i386_pc_TRUE@am__append_5276 = --@COND_i386_pc_TRUE@am__append_5277 = $(nodist_legacycfg_module_SOURCES) --@COND_i386_pc_TRUE@am__append_5278 = \ -+@COND_i386_pc_TRUE@am__append_5267 = legacycfg.module -+@COND_i386_pc_TRUE@am__append_5268 = legacycfg.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__append_5269 = -+@COND_i386_pc_TRUE@am__append_5270 = $(nodist_legacycfg_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_5271 = \ - @COND_i386_pc_TRUE@ $(nodist_legacycfg_module_SOURCES) \ - @COND_i386_pc_TRUE@ legacycfg.marker --@COND_i386_pc_TRUE@am__append_5279 = legacycfg.mod --@COND_i386_pc_TRUE@am__append_5280 = legacycfg.marker --@COND_i386_efi_TRUE@am__append_5281 = legacycfg.module --@COND_i386_efi_TRUE@am__append_5282 = legacycfg.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_5283 = --@COND_i386_efi_TRUE@am__append_5284 = $(nodist_legacycfg_module_SOURCES) --@COND_i386_efi_TRUE@am__append_5285 = \ -+@COND_i386_pc_TRUE@am__append_5272 = legacycfg.mod -+@COND_i386_pc_TRUE@am__append_5273 = legacycfg.marker -+@COND_i386_efi_TRUE@am__append_5274 = legacycfg.module -+@COND_i386_efi_TRUE@am__append_5275 = legacycfg.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_5276 = -+@COND_i386_efi_TRUE@am__append_5277 = $(nodist_legacycfg_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_5278 = \ - @COND_i386_efi_TRUE@ $(nodist_legacycfg_module_SOURCES) \ - @COND_i386_efi_TRUE@ legacycfg.marker --@COND_i386_efi_TRUE@am__append_5286 = legacycfg.mod --@COND_i386_efi_TRUE@am__append_5287 = legacycfg.marker --@COND_x86_64_efi_TRUE@am__append_5288 = legacycfg.module --@COND_x86_64_efi_TRUE@am__append_5289 = legacycfg.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_5290 = --@COND_x86_64_efi_TRUE@am__append_5291 = $(nodist_legacycfg_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_5292 = \ -+@COND_i386_efi_TRUE@am__append_5279 = legacycfg.mod -+@COND_i386_efi_TRUE@am__append_5280 = legacycfg.marker -+@COND_x86_64_efi_TRUE@am__append_5281 = legacycfg.module -+@COND_x86_64_efi_TRUE@am__append_5282 = legacycfg.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_5283 = -+@COND_x86_64_efi_TRUE@am__append_5284 = $(nodist_legacycfg_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_5285 = \ - @COND_x86_64_efi_TRUE@ $(nodist_legacycfg_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ legacycfg.marker --@COND_x86_64_efi_TRUE@am__append_5293 = legacycfg.mod --@COND_x86_64_efi_TRUE@am__append_5294 = legacycfg.marker --@COND_i386_xen_TRUE@am__append_5295 = legacycfg.module --@COND_i386_xen_TRUE@am__append_5296 = legacycfg.module$(EXEEXT) --@COND_i386_xen_TRUE@am__append_5297 = --@COND_i386_xen_TRUE@am__append_5298 = $(nodist_legacycfg_module_SOURCES) --@COND_i386_xen_TRUE@am__append_5299 = \ -+@COND_x86_64_efi_TRUE@am__append_5286 = legacycfg.mod -+@COND_x86_64_efi_TRUE@am__append_5287 = legacycfg.marker -+@COND_i386_xen_TRUE@am__append_5288 = legacycfg.module -+@COND_i386_xen_TRUE@am__append_5289 = legacycfg.module$(EXEEXT) -+@COND_i386_xen_TRUE@am__append_5290 = -+@COND_i386_xen_TRUE@am__append_5291 = $(nodist_legacycfg_module_SOURCES) -+@COND_i386_xen_TRUE@am__append_5292 = \ - @COND_i386_xen_TRUE@ $(nodist_legacycfg_module_SOURCES) \ - @COND_i386_xen_TRUE@ legacycfg.marker --@COND_i386_xen_TRUE@am__append_5300 = legacycfg.mod --@COND_i386_xen_TRUE@am__append_5301 = legacycfg.marker --@COND_x86_64_xen_TRUE@am__append_5302 = legacycfg.module --@COND_x86_64_xen_TRUE@am__append_5303 = legacycfg.module$(EXEEXT) --@COND_x86_64_xen_TRUE@am__append_5304 = --@COND_x86_64_xen_TRUE@am__append_5305 = $(nodist_legacycfg_module_SOURCES) --@COND_x86_64_xen_TRUE@am__append_5306 = \ -+@COND_i386_xen_TRUE@am__append_5293 = legacycfg.mod -+@COND_i386_xen_TRUE@am__append_5294 = legacycfg.marker -+@COND_x86_64_xen_TRUE@am__append_5295 = legacycfg.module -+@COND_x86_64_xen_TRUE@am__append_5296 = legacycfg.module$(EXEEXT) -+@COND_x86_64_xen_TRUE@am__append_5297 = -+@COND_x86_64_xen_TRUE@am__append_5298 = $(nodist_legacycfg_module_SOURCES) -+@COND_x86_64_xen_TRUE@am__append_5299 = \ - @COND_x86_64_xen_TRUE@ $(nodist_legacycfg_module_SOURCES) \ - @COND_x86_64_xen_TRUE@ legacycfg.marker --@COND_x86_64_xen_TRUE@am__append_5307 = legacycfg.mod --@COND_x86_64_xen_TRUE@am__append_5308 = legacycfg.marker --@COND_i386_xen_pvh_TRUE@am__append_5309 = legacycfg.module --@COND_i386_xen_pvh_TRUE@am__append_5310 = legacycfg.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__append_5311 = --@COND_i386_xen_pvh_TRUE@am__append_5312 = $(nodist_legacycfg_module_SOURCES) --@COND_i386_xen_pvh_TRUE@am__append_5313 = \ -+@COND_x86_64_xen_TRUE@am__append_5300 = legacycfg.mod -+@COND_x86_64_xen_TRUE@am__append_5301 = legacycfg.marker -+@COND_i386_xen_pvh_TRUE@am__append_5302 = legacycfg.module -+@COND_i386_xen_pvh_TRUE@am__append_5303 = legacycfg.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__append_5304 = -+@COND_i386_xen_pvh_TRUE@am__append_5305 = $(nodist_legacycfg_module_SOURCES) -+@COND_i386_xen_pvh_TRUE@am__append_5306 = \ - @COND_i386_xen_pvh_TRUE@ $(nodist_legacycfg_module_SOURCES) \ - @COND_i386_xen_pvh_TRUE@ legacycfg.marker --@COND_i386_xen_pvh_TRUE@am__append_5314 = legacycfg.mod --@COND_i386_xen_pvh_TRUE@am__append_5315 = legacycfg.marker --@COND_i386_pc_TRUE@am__append_5316 = backtrace.module --@COND_i386_pc_TRUE@am__append_5317 = backtrace.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__append_5307 = legacycfg.mod -+@COND_i386_xen_pvh_TRUE@am__append_5308 = legacycfg.marker -+@COND_i386_pc_TRUE@am__append_5309 = backtrace.module -+@COND_i386_pc_TRUE@am__append_5310 = backtrace.module$(EXEEXT) - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_FALSE@backtrace_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_5318 = --@COND_i386_pc_TRUE@am__append_5319 = $(nodist_backtrace_module_SOURCES) --@COND_i386_pc_TRUE@am__append_5320 = \ -+@COND_i386_pc_TRUE@am__append_5311 = -+@COND_i386_pc_TRUE@am__append_5312 = $(nodist_backtrace_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_5313 = \ - @COND_i386_pc_TRUE@ $(nodist_backtrace_module_SOURCES) \ - @COND_i386_pc_TRUE@ backtrace.marker --@COND_i386_pc_TRUE@am__append_5321 = backtrace.mod --@COND_i386_pc_TRUE@am__append_5322 = backtrace.marker --@COND_i386_efi_TRUE@am__append_5323 = backtrace.module --@COND_i386_efi_TRUE@am__append_5324 = backtrace.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_5325 = --@COND_i386_efi_TRUE@am__append_5326 = $(nodist_backtrace_module_SOURCES) --@COND_i386_efi_TRUE@am__append_5327 = \ -+@COND_i386_pc_TRUE@am__append_5314 = backtrace.mod -+@COND_i386_pc_TRUE@am__append_5315 = backtrace.marker -+@COND_i386_efi_TRUE@am__append_5316 = backtrace.module -+@COND_i386_efi_TRUE@am__append_5317 = backtrace.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_5318 = -+@COND_i386_efi_TRUE@am__append_5319 = $(nodist_backtrace_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_5320 = \ - @COND_i386_efi_TRUE@ $(nodist_backtrace_module_SOURCES) \ - @COND_i386_efi_TRUE@ backtrace.marker --@COND_i386_efi_TRUE@am__append_5328 = backtrace.mod --@COND_i386_efi_TRUE@am__append_5329 = backtrace.marker --@COND_i386_qemu_TRUE@am__append_5330 = backtrace.module --@COND_i386_qemu_TRUE@am__append_5331 = backtrace.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_5332 = --@COND_i386_qemu_TRUE@am__append_5333 = $(nodist_backtrace_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_5334 = \ -+@COND_i386_efi_TRUE@am__append_5321 = backtrace.mod -+@COND_i386_efi_TRUE@am__append_5322 = backtrace.marker -+@COND_i386_qemu_TRUE@am__append_5323 = backtrace.module -+@COND_i386_qemu_TRUE@am__append_5324 = backtrace.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_5325 = -+@COND_i386_qemu_TRUE@am__append_5326 = $(nodist_backtrace_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_5327 = \ - @COND_i386_qemu_TRUE@ $(nodist_backtrace_module_SOURCES) \ - @COND_i386_qemu_TRUE@ backtrace.marker --@COND_i386_qemu_TRUE@am__append_5335 = backtrace.mod --@COND_i386_qemu_TRUE@am__append_5336 = backtrace.marker --@COND_i386_coreboot_TRUE@am__append_5337 = backtrace.module --@COND_i386_coreboot_TRUE@am__append_5338 = backtrace.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_5339 = --@COND_i386_coreboot_TRUE@am__append_5340 = $(nodist_backtrace_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_5341 = \ -+@COND_i386_qemu_TRUE@am__append_5328 = backtrace.mod -+@COND_i386_qemu_TRUE@am__append_5329 = backtrace.marker -+@COND_i386_coreboot_TRUE@am__append_5330 = backtrace.module -+@COND_i386_coreboot_TRUE@am__append_5331 = backtrace.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_5332 = -+@COND_i386_coreboot_TRUE@am__append_5333 = $(nodist_backtrace_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_5334 = \ - @COND_i386_coreboot_TRUE@ $(nodist_backtrace_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ backtrace.marker --@COND_i386_coreboot_TRUE@am__append_5342 = backtrace.mod --@COND_i386_coreboot_TRUE@am__append_5343 = backtrace.marker --@COND_i386_multiboot_TRUE@am__append_5344 = backtrace.module --@COND_i386_multiboot_TRUE@am__append_5345 = backtrace.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_5346 = --@COND_i386_multiboot_TRUE@am__append_5347 = $(nodist_backtrace_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_5348 = \ -+@COND_i386_coreboot_TRUE@am__append_5335 = backtrace.mod -+@COND_i386_coreboot_TRUE@am__append_5336 = backtrace.marker -+@COND_i386_multiboot_TRUE@am__append_5337 = backtrace.module -+@COND_i386_multiboot_TRUE@am__append_5338 = backtrace.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_5339 = -+@COND_i386_multiboot_TRUE@am__append_5340 = $(nodist_backtrace_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_5341 = \ - @COND_i386_multiboot_TRUE@ $(nodist_backtrace_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ backtrace.marker --@COND_i386_multiboot_TRUE@am__append_5349 = backtrace.mod --@COND_i386_multiboot_TRUE@am__append_5350 = backtrace.marker --@COND_i386_ieee1275_TRUE@am__append_5351 = backtrace.module --@COND_i386_ieee1275_TRUE@am__append_5352 = backtrace.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_5353 = --@COND_i386_ieee1275_TRUE@am__append_5354 = $(nodist_backtrace_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_5355 = \ -+@COND_i386_multiboot_TRUE@am__append_5342 = backtrace.mod -+@COND_i386_multiboot_TRUE@am__append_5343 = backtrace.marker -+@COND_i386_ieee1275_TRUE@am__append_5344 = backtrace.module -+@COND_i386_ieee1275_TRUE@am__append_5345 = backtrace.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_5346 = -+@COND_i386_ieee1275_TRUE@am__append_5347 = $(nodist_backtrace_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_5348 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_backtrace_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ backtrace.marker --@COND_i386_ieee1275_TRUE@am__append_5356 = backtrace.mod --@COND_i386_ieee1275_TRUE@am__append_5357 = backtrace.marker --@COND_x86_64_efi_TRUE@am__append_5358 = backtrace.module --@COND_x86_64_efi_TRUE@am__append_5359 = backtrace.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_5360 = --@COND_x86_64_efi_TRUE@am__append_5361 = $(nodist_backtrace_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_5362 = \ -+@COND_i386_ieee1275_TRUE@am__append_5349 = backtrace.mod -+@COND_i386_ieee1275_TRUE@am__append_5350 = backtrace.marker -+@COND_x86_64_efi_TRUE@am__append_5351 = backtrace.module -+@COND_x86_64_efi_TRUE@am__append_5352 = backtrace.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_5353 = -+@COND_x86_64_efi_TRUE@am__append_5354 = $(nodist_backtrace_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_5355 = \ - @COND_x86_64_efi_TRUE@ $(nodist_backtrace_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ backtrace.marker --@COND_x86_64_efi_TRUE@am__append_5363 = backtrace.mod --@COND_x86_64_efi_TRUE@am__append_5364 = backtrace.marker --@COND_i386_xen_TRUE@am__append_5365 = backtrace.module --@COND_i386_xen_TRUE@am__append_5366 = backtrace.module$(EXEEXT) --@COND_i386_xen_TRUE@am__append_5367 = --@COND_i386_xen_TRUE@am__append_5368 = $(nodist_backtrace_module_SOURCES) --@COND_i386_xen_TRUE@am__append_5369 = \ -+@COND_x86_64_efi_TRUE@am__append_5356 = backtrace.mod -+@COND_x86_64_efi_TRUE@am__append_5357 = backtrace.marker -+@COND_i386_xen_TRUE@am__append_5358 = backtrace.module -+@COND_i386_xen_TRUE@am__append_5359 = backtrace.module$(EXEEXT) -+@COND_i386_xen_TRUE@am__append_5360 = -+@COND_i386_xen_TRUE@am__append_5361 = $(nodist_backtrace_module_SOURCES) -+@COND_i386_xen_TRUE@am__append_5362 = \ - @COND_i386_xen_TRUE@ $(nodist_backtrace_module_SOURCES) \ - @COND_i386_xen_TRUE@ backtrace.marker --@COND_i386_xen_TRUE@am__append_5370 = backtrace.mod --@COND_i386_xen_TRUE@am__append_5371 = backtrace.marker --@COND_x86_64_xen_TRUE@am__append_5372 = backtrace.module --@COND_x86_64_xen_TRUE@am__append_5373 = backtrace.module$(EXEEXT) --@COND_x86_64_xen_TRUE@am__append_5374 = --@COND_x86_64_xen_TRUE@am__append_5375 = $(nodist_backtrace_module_SOURCES) --@COND_x86_64_xen_TRUE@am__append_5376 = \ -+@COND_i386_xen_TRUE@am__append_5363 = backtrace.mod -+@COND_i386_xen_TRUE@am__append_5364 = backtrace.marker -+@COND_x86_64_xen_TRUE@am__append_5365 = backtrace.module -+@COND_x86_64_xen_TRUE@am__append_5366 = backtrace.module$(EXEEXT) -+@COND_x86_64_xen_TRUE@am__append_5367 = -+@COND_x86_64_xen_TRUE@am__append_5368 = $(nodist_backtrace_module_SOURCES) -+@COND_x86_64_xen_TRUE@am__append_5369 = \ - @COND_x86_64_xen_TRUE@ $(nodist_backtrace_module_SOURCES) \ - @COND_x86_64_xen_TRUE@ backtrace.marker --@COND_x86_64_xen_TRUE@am__append_5377 = backtrace.mod --@COND_x86_64_xen_TRUE@am__append_5378 = backtrace.marker --@COND_i386_xen_pvh_TRUE@am__append_5379 = backtrace.module --@COND_i386_xen_pvh_TRUE@am__append_5380 = backtrace.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__append_5381 = --@COND_i386_xen_pvh_TRUE@am__append_5382 = $(nodist_backtrace_module_SOURCES) --@COND_i386_xen_pvh_TRUE@am__append_5383 = \ -+@COND_x86_64_xen_TRUE@am__append_5370 = backtrace.mod -+@COND_x86_64_xen_TRUE@am__append_5371 = backtrace.marker -+@COND_i386_xen_pvh_TRUE@am__append_5372 = backtrace.module -+@COND_i386_xen_pvh_TRUE@am__append_5373 = backtrace.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__append_5374 = -+@COND_i386_xen_pvh_TRUE@am__append_5375 = $(nodist_backtrace_module_SOURCES) -+@COND_i386_xen_pvh_TRUE@am__append_5376 = \ - @COND_i386_xen_pvh_TRUE@ $(nodist_backtrace_module_SOURCES) \ - @COND_i386_xen_pvh_TRUE@ backtrace.marker --@COND_i386_xen_pvh_TRUE@am__append_5384 = backtrace.mod --@COND_i386_xen_pvh_TRUE@am__append_5385 = backtrace.marker --@COND_i386_pc_TRUE@am__append_5386 = lsapm.module keylayouts.module --@COND_i386_pc_TRUE@am__append_5387 = lsapm.module$(EXEEXT) \ -+@COND_i386_xen_pvh_TRUE@am__append_5377 = backtrace.mod -+@COND_i386_xen_pvh_TRUE@am__append_5378 = backtrace.marker -+@COND_i386_pc_TRUE@am__append_5379 = lsapm.module keylayouts.module -+@COND_i386_pc_TRUE@am__append_5380 = lsapm.module$(EXEEXT) \ - @COND_i386_pc_TRUE@ keylayouts.module$(EXEEXT) - @COND_i386_pc_FALSE@lsapm_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_5388 = --@COND_i386_pc_TRUE@am__append_5389 = $(nodist_lsapm_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_5381 = -+@COND_i386_pc_TRUE@am__append_5382 = $(nodist_lsapm_module_SOURCES) \ - @COND_i386_pc_TRUE@ $(nodist_keylayouts_module_SOURCES) --@COND_i386_pc_TRUE@am__append_5390 = $(nodist_lsapm_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_5383 = $(nodist_lsapm_module_SOURCES) \ - @COND_i386_pc_TRUE@ lsapm.marker \ - @COND_i386_pc_TRUE@ $(nodist_keylayouts_module_SOURCES) \ - @COND_i386_pc_TRUE@ keylayouts.marker --@COND_i386_pc_TRUE@am__append_5391 = lsapm.mod keylayouts.mod --@COND_i386_pc_TRUE@am__append_5392 = lsapm.marker keylayouts.marker -+@COND_i386_pc_TRUE@am__append_5384 = lsapm.mod keylayouts.mod -+@COND_i386_pc_TRUE@am__append_5385 = lsapm.marker keylayouts.marker - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_x86_64_efi_FALSE@keylayouts_module_DEPENDENCIES = --@COND_i386_efi_TRUE@am__append_5393 = keylayouts.module --@COND_i386_efi_TRUE@am__append_5394 = keylayouts.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_5395 = --@COND_i386_efi_TRUE@am__append_5396 = $(nodist_keylayouts_module_SOURCES) --@COND_i386_efi_TRUE@am__append_5397 = \ -+@COND_i386_efi_TRUE@am__append_5386 = keylayouts.module -+@COND_i386_efi_TRUE@am__append_5387 = keylayouts.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_5388 = -+@COND_i386_efi_TRUE@am__append_5389 = $(nodist_keylayouts_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_5390 = \ - @COND_i386_efi_TRUE@ $(nodist_keylayouts_module_SOURCES) \ - @COND_i386_efi_TRUE@ keylayouts.marker --@COND_i386_efi_TRUE@am__append_5398 = keylayouts.mod --@COND_i386_efi_TRUE@am__append_5399 = keylayouts.marker --@COND_i386_qemu_TRUE@am__append_5400 = keylayouts.module --@COND_i386_qemu_TRUE@am__append_5401 = keylayouts.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_5402 = --@COND_i386_qemu_TRUE@am__append_5403 = $(nodist_keylayouts_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_5404 = \ -+@COND_i386_efi_TRUE@am__append_5391 = keylayouts.mod -+@COND_i386_efi_TRUE@am__append_5392 = keylayouts.marker -+@COND_i386_qemu_TRUE@am__append_5393 = keylayouts.module -+@COND_i386_qemu_TRUE@am__append_5394 = keylayouts.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_5395 = -+@COND_i386_qemu_TRUE@am__append_5396 = $(nodist_keylayouts_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_5397 = \ - @COND_i386_qemu_TRUE@ $(nodist_keylayouts_module_SOURCES) \ - @COND_i386_qemu_TRUE@ keylayouts.marker --@COND_i386_qemu_TRUE@am__append_5405 = keylayouts.mod --@COND_i386_qemu_TRUE@am__append_5406 = keylayouts.marker --@COND_i386_coreboot_TRUE@am__append_5407 = keylayouts.module --@COND_i386_coreboot_TRUE@am__append_5408 = keylayouts.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_5409 = --@COND_i386_coreboot_TRUE@am__append_5410 = $(nodist_keylayouts_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_5411 = \ -+@COND_i386_qemu_TRUE@am__append_5398 = keylayouts.mod -+@COND_i386_qemu_TRUE@am__append_5399 = keylayouts.marker -+@COND_i386_coreboot_TRUE@am__append_5400 = keylayouts.module -+@COND_i386_coreboot_TRUE@am__append_5401 = keylayouts.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_5402 = -+@COND_i386_coreboot_TRUE@am__append_5403 = $(nodist_keylayouts_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_5404 = \ - @COND_i386_coreboot_TRUE@ $(nodist_keylayouts_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ keylayouts.marker --@COND_i386_coreboot_TRUE@am__append_5412 = keylayouts.mod --@COND_i386_coreboot_TRUE@am__append_5413 = keylayouts.marker --@COND_i386_multiboot_TRUE@am__append_5414 = keylayouts.module --@COND_i386_multiboot_TRUE@am__append_5415 = keylayouts.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_5416 = --@COND_i386_multiboot_TRUE@am__append_5417 = $(nodist_keylayouts_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_5418 = \ -+@COND_i386_coreboot_TRUE@am__append_5405 = keylayouts.mod -+@COND_i386_coreboot_TRUE@am__append_5406 = keylayouts.marker -+@COND_i386_multiboot_TRUE@am__append_5407 = keylayouts.module -+@COND_i386_multiboot_TRUE@am__append_5408 = keylayouts.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_5409 = -+@COND_i386_multiboot_TRUE@am__append_5410 = $(nodist_keylayouts_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_5411 = \ - @COND_i386_multiboot_TRUE@ $(nodist_keylayouts_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ keylayouts.marker --@COND_i386_multiboot_TRUE@am__append_5419 = keylayouts.mod --@COND_i386_multiboot_TRUE@am__append_5420 = keylayouts.marker --@COND_i386_ieee1275_TRUE@am__append_5421 = keylayouts.module --@COND_i386_ieee1275_TRUE@am__append_5422 = keylayouts.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_5423 = --@COND_i386_ieee1275_TRUE@am__append_5424 = $(nodist_keylayouts_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_5425 = \ -+@COND_i386_multiboot_TRUE@am__append_5412 = keylayouts.mod -+@COND_i386_multiboot_TRUE@am__append_5413 = keylayouts.marker -+@COND_i386_ieee1275_TRUE@am__append_5414 = keylayouts.module -+@COND_i386_ieee1275_TRUE@am__append_5415 = keylayouts.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_5416 = -+@COND_i386_ieee1275_TRUE@am__append_5417 = $(nodist_keylayouts_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_5418 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_keylayouts_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ keylayouts.marker --@COND_i386_ieee1275_TRUE@am__append_5426 = keylayouts.mod --@COND_i386_ieee1275_TRUE@am__append_5427 = keylayouts.marker --@COND_x86_64_efi_TRUE@am__append_5428 = keylayouts.module --@COND_x86_64_efi_TRUE@am__append_5429 = keylayouts.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_5430 = --@COND_x86_64_efi_TRUE@am__append_5431 = $(nodist_keylayouts_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_5432 = \ -+@COND_i386_ieee1275_TRUE@am__append_5419 = keylayouts.mod -+@COND_i386_ieee1275_TRUE@am__append_5420 = keylayouts.marker -+@COND_x86_64_efi_TRUE@am__append_5421 = keylayouts.module -+@COND_x86_64_efi_TRUE@am__append_5422 = keylayouts.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_5423 = -+@COND_x86_64_efi_TRUE@am__append_5424 = $(nodist_keylayouts_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_5425 = \ - @COND_x86_64_efi_TRUE@ $(nodist_keylayouts_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ keylayouts.marker --@COND_x86_64_efi_TRUE@am__append_5433 = keylayouts.mod --@COND_x86_64_efi_TRUE@am__append_5434 = keylayouts.marker --@COND_ENABLE_CACHE_STATS_TRUE@am__append_5435 = cacheinfo.module --@COND_ENABLE_CACHE_STATS_TRUE@am__append_5436 = cacheinfo.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_5426 = keylayouts.mod -+@COND_x86_64_efi_TRUE@am__append_5427 = keylayouts.marker -+@COND_ENABLE_CACHE_STATS_TRUE@am__append_5428 = cacheinfo.module -+@COND_ENABLE_CACHE_STATS_TRUE@am__append_5429 = cacheinfo.module$(EXEEXT) - @COND_ENABLE_CACHE_STATS_FALSE@cacheinfo_module_DEPENDENCIES = --@COND_ENABLE_CACHE_STATS_TRUE@am__append_5437 = --@COND_ENABLE_CACHE_STATS_TRUE@am__append_5438 = $(nodist_cacheinfo_module_SOURCES) --@COND_ENABLE_CACHE_STATS_TRUE@am__append_5439 = $(nodist_cacheinfo_module_SOURCES) \ -+@COND_ENABLE_CACHE_STATS_TRUE@am__append_5430 = -+@COND_ENABLE_CACHE_STATS_TRUE@am__append_5431 = $(nodist_cacheinfo_module_SOURCES) -+@COND_ENABLE_CACHE_STATS_TRUE@am__append_5432 = $(nodist_cacheinfo_module_SOURCES) \ - @COND_ENABLE_CACHE_STATS_TRUE@ cacheinfo.marker --@COND_ENABLE_CACHE_STATS_TRUE@am__append_5440 = cacheinfo.mod --@COND_ENABLE_CACHE_STATS_TRUE@am__append_5441 = cacheinfo.marker --@COND_ENABLE_BOOT_TIME_STATS_TRUE@am__append_5442 = boottime.module --@COND_ENABLE_BOOT_TIME_STATS_TRUE@am__append_5443 = boottime.module$(EXEEXT) -+@COND_ENABLE_CACHE_STATS_TRUE@am__append_5433 = cacheinfo.mod -+@COND_ENABLE_CACHE_STATS_TRUE@am__append_5434 = cacheinfo.marker -+@COND_ENABLE_BOOT_TIME_STATS_TRUE@am__append_5435 = boottime.module -+@COND_ENABLE_BOOT_TIME_STATS_TRUE@am__append_5436 = boottime.module$(EXEEXT) - @COND_ENABLE_BOOT_TIME_STATS_FALSE@boottime_module_DEPENDENCIES = --@COND_ENABLE_BOOT_TIME_STATS_TRUE@am__append_5444 = --@COND_ENABLE_BOOT_TIME_STATS_TRUE@am__append_5445 = $(nodist_boottime_module_SOURCES) --@COND_ENABLE_BOOT_TIME_STATS_TRUE@am__append_5446 = $(nodist_boottime_module_SOURCES) \ -+@COND_ENABLE_BOOT_TIME_STATS_TRUE@am__append_5437 = -+@COND_ENABLE_BOOT_TIME_STATS_TRUE@am__append_5438 = $(nodist_boottime_module_SOURCES) -+@COND_ENABLE_BOOT_TIME_STATS_TRUE@am__append_5439 = $(nodist_boottime_module_SOURCES) \ - @COND_ENABLE_BOOT_TIME_STATS_TRUE@ boottime.marker --@COND_ENABLE_BOOT_TIME_STATS_TRUE@am__append_5447 = boottime.mod --@COND_ENABLE_BOOT_TIME_STATS_TRUE@am__append_5448 = boottime.marker --@COND_i386_pc_TRUE@am__append_5449 = gdb.module --@COND_i386_pc_TRUE@am__append_5450 = gdb.module$(EXEEXT) -+@COND_ENABLE_BOOT_TIME_STATS_TRUE@am__append_5440 = boottime.mod -+@COND_ENABLE_BOOT_TIME_STATS_TRUE@am__append_5441 = boottime.marker -+@COND_i386_pc_TRUE@am__append_5442 = gdb.module -+@COND_i386_pc_TRUE@am__append_5443 = gdb.module$(EXEEXT) - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@gdb_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_5451 = --@COND_i386_pc_TRUE@am__append_5452 = $(nodist_gdb_module_SOURCES) --@COND_i386_pc_TRUE@am__append_5453 = $(nodist_gdb_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_5444 = -+@COND_i386_pc_TRUE@am__append_5445 = $(nodist_gdb_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_5446 = $(nodist_gdb_module_SOURCES) \ - @COND_i386_pc_TRUE@ gdb.marker --@COND_i386_pc_TRUE@am__append_5454 = gdb.mod --@COND_i386_pc_TRUE@am__append_5455 = gdb.marker --@COND_i386_efi_TRUE@am__append_5456 = gdb.module --@COND_i386_efi_TRUE@am__append_5457 = gdb.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_5458 = --@COND_i386_efi_TRUE@am__append_5459 = $(nodist_gdb_module_SOURCES) --@COND_i386_efi_TRUE@am__append_5460 = $(nodist_gdb_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_5447 = gdb.mod -+@COND_i386_pc_TRUE@am__append_5448 = gdb.marker -+@COND_i386_efi_TRUE@am__append_5449 = gdb.module -+@COND_i386_efi_TRUE@am__append_5450 = gdb.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_5451 = -+@COND_i386_efi_TRUE@am__append_5452 = $(nodist_gdb_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_5453 = $(nodist_gdb_module_SOURCES) \ - @COND_i386_efi_TRUE@ gdb.marker --@COND_i386_efi_TRUE@am__append_5461 = gdb.mod --@COND_i386_efi_TRUE@am__append_5462 = gdb.marker --@COND_i386_qemu_TRUE@am__append_5463 = gdb.module --@COND_i386_qemu_TRUE@am__append_5464 = gdb.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_5465 = --@COND_i386_qemu_TRUE@am__append_5466 = $(nodist_gdb_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_5467 = $(nodist_gdb_module_SOURCES) \ -+@COND_i386_efi_TRUE@am__append_5454 = gdb.mod -+@COND_i386_efi_TRUE@am__append_5455 = gdb.marker -+@COND_i386_qemu_TRUE@am__append_5456 = gdb.module -+@COND_i386_qemu_TRUE@am__append_5457 = gdb.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_5458 = -+@COND_i386_qemu_TRUE@am__append_5459 = $(nodist_gdb_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_5460 = $(nodist_gdb_module_SOURCES) \ - @COND_i386_qemu_TRUE@ gdb.marker --@COND_i386_qemu_TRUE@am__append_5468 = gdb.mod --@COND_i386_qemu_TRUE@am__append_5469 = gdb.marker --@COND_i386_coreboot_TRUE@am__append_5470 = gdb.module --@COND_i386_coreboot_TRUE@am__append_5471 = gdb.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_5472 = --@COND_i386_coreboot_TRUE@am__append_5473 = $(nodist_gdb_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_5474 = \ -+@COND_i386_qemu_TRUE@am__append_5461 = gdb.mod -+@COND_i386_qemu_TRUE@am__append_5462 = gdb.marker -+@COND_i386_coreboot_TRUE@am__append_5463 = gdb.module -+@COND_i386_coreboot_TRUE@am__append_5464 = gdb.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_5465 = -+@COND_i386_coreboot_TRUE@am__append_5466 = $(nodist_gdb_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_5467 = \ - @COND_i386_coreboot_TRUE@ $(nodist_gdb_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ gdb.marker --@COND_i386_coreboot_TRUE@am__append_5475 = gdb.mod --@COND_i386_coreboot_TRUE@am__append_5476 = gdb.marker --@COND_i386_multiboot_TRUE@am__append_5477 = gdb.module --@COND_i386_multiboot_TRUE@am__append_5478 = gdb.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_5479 = --@COND_i386_multiboot_TRUE@am__append_5480 = $(nodist_gdb_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_5481 = \ -+@COND_i386_coreboot_TRUE@am__append_5468 = gdb.mod -+@COND_i386_coreboot_TRUE@am__append_5469 = gdb.marker -+@COND_i386_multiboot_TRUE@am__append_5470 = gdb.module -+@COND_i386_multiboot_TRUE@am__append_5471 = gdb.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_5472 = -+@COND_i386_multiboot_TRUE@am__append_5473 = $(nodist_gdb_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_5474 = \ - @COND_i386_multiboot_TRUE@ $(nodist_gdb_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ gdb.marker --@COND_i386_multiboot_TRUE@am__append_5482 = gdb.mod --@COND_i386_multiboot_TRUE@am__append_5483 = gdb.marker --@COND_i386_ieee1275_TRUE@am__append_5484 = gdb.module --@COND_i386_ieee1275_TRUE@am__append_5485 = gdb.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_5486 = --@COND_i386_ieee1275_TRUE@am__append_5487 = $(nodist_gdb_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_5488 = \ -+@COND_i386_multiboot_TRUE@am__append_5475 = gdb.mod -+@COND_i386_multiboot_TRUE@am__append_5476 = gdb.marker -+@COND_i386_ieee1275_TRUE@am__append_5477 = gdb.module -+@COND_i386_ieee1275_TRUE@am__append_5478 = gdb.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_5479 = -+@COND_i386_ieee1275_TRUE@am__append_5480 = $(nodist_gdb_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_5481 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_gdb_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ gdb.marker --@COND_i386_ieee1275_TRUE@am__append_5489 = gdb.mod --@COND_i386_ieee1275_TRUE@am__append_5490 = gdb.marker --@COND_x86_64_efi_TRUE@am__append_5491 = tpm.module --@COND_x86_64_efi_TRUE@am__append_5492 = tpm.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_5482 = gdb.mod -+@COND_i386_ieee1275_TRUE@am__append_5483 = gdb.marker -+@COND_x86_64_efi_TRUE@am__append_5484 = tpm.module -+@COND_x86_64_efi_TRUE@am__append_5485 = tpm.module$(EXEEXT) - @COND_x86_64_efi_FALSE@tpm_module_DEPENDENCIES = --@COND_x86_64_efi_TRUE@am__append_5493 = --@COND_x86_64_efi_TRUE@am__append_5494 = $(nodist_tpm_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_5495 = $(nodist_tpm_module_SOURCES) \ -+@COND_x86_64_efi_TRUE@am__append_5486 = -+@COND_x86_64_efi_TRUE@am__append_5487 = $(nodist_tpm_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_5488 = $(nodist_tpm_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ tpm.marker --@COND_x86_64_efi_TRUE@am__append_5496 = tpm.mod --@COND_x86_64_efi_TRUE@am__append_5497 = tpm.marker --@COND_i386_pc_TRUE@am__append_5498 = rdmsr.module --@COND_i386_pc_TRUE@am__append_5499 = rdmsr.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_5489 = tpm.mod -+@COND_x86_64_efi_TRUE@am__append_5490 = tpm.marker -+@COND_i386_pc_TRUE@am__append_5491 = rdmsr.module -+@COND_i386_pc_TRUE@am__append_5492 = rdmsr.module$(EXEEXT) - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_x86_64_efi_FALSE@rdmsr_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_5500 = --@COND_i386_pc_TRUE@am__append_5501 = $(nodist_rdmsr_module_SOURCES) --@COND_i386_pc_TRUE@am__append_5502 = $(nodist_rdmsr_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_5493 = -+@COND_i386_pc_TRUE@am__append_5494 = $(nodist_rdmsr_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_5495 = $(nodist_rdmsr_module_SOURCES) \ - @COND_i386_pc_TRUE@ rdmsr.marker --@COND_i386_pc_TRUE@am__append_5503 = rdmsr.mod --@COND_i386_pc_TRUE@am__append_5504 = rdmsr.marker --@COND_i386_efi_TRUE@am__append_5505 = rdmsr.module --@COND_i386_efi_TRUE@am__append_5506 = rdmsr.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_5507 = --@COND_i386_efi_TRUE@am__append_5508 = $(nodist_rdmsr_module_SOURCES) --@COND_i386_efi_TRUE@am__append_5509 = $(nodist_rdmsr_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_5496 = rdmsr.mod -+@COND_i386_pc_TRUE@am__append_5497 = rdmsr.marker -+@COND_i386_efi_TRUE@am__append_5498 = rdmsr.module -+@COND_i386_efi_TRUE@am__append_5499 = rdmsr.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_5500 = -+@COND_i386_efi_TRUE@am__append_5501 = $(nodist_rdmsr_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_5502 = $(nodist_rdmsr_module_SOURCES) \ - @COND_i386_efi_TRUE@ rdmsr.marker --@COND_i386_efi_TRUE@am__append_5510 = rdmsr.mod --@COND_i386_efi_TRUE@am__append_5511 = rdmsr.marker --@COND_i386_qemu_TRUE@am__append_5512 = rdmsr.module --@COND_i386_qemu_TRUE@am__append_5513 = rdmsr.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_5514 = --@COND_i386_qemu_TRUE@am__append_5515 = $(nodist_rdmsr_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_5516 = $(nodist_rdmsr_module_SOURCES) \ -+@COND_i386_efi_TRUE@am__append_5503 = rdmsr.mod -+@COND_i386_efi_TRUE@am__append_5504 = rdmsr.marker -+@COND_i386_qemu_TRUE@am__append_5505 = rdmsr.module -+@COND_i386_qemu_TRUE@am__append_5506 = rdmsr.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_5507 = -+@COND_i386_qemu_TRUE@am__append_5508 = $(nodist_rdmsr_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_5509 = $(nodist_rdmsr_module_SOURCES) \ - @COND_i386_qemu_TRUE@ rdmsr.marker --@COND_i386_qemu_TRUE@am__append_5517 = rdmsr.mod --@COND_i386_qemu_TRUE@am__append_5518 = rdmsr.marker --@COND_i386_coreboot_TRUE@am__append_5519 = rdmsr.module --@COND_i386_coreboot_TRUE@am__append_5520 = rdmsr.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_5521 = --@COND_i386_coreboot_TRUE@am__append_5522 = $(nodist_rdmsr_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_5523 = \ -+@COND_i386_qemu_TRUE@am__append_5510 = rdmsr.mod -+@COND_i386_qemu_TRUE@am__append_5511 = rdmsr.marker -+@COND_i386_coreboot_TRUE@am__append_5512 = rdmsr.module -+@COND_i386_coreboot_TRUE@am__append_5513 = rdmsr.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_5514 = -+@COND_i386_coreboot_TRUE@am__append_5515 = $(nodist_rdmsr_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_5516 = \ - @COND_i386_coreboot_TRUE@ $(nodist_rdmsr_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ rdmsr.marker --@COND_i386_coreboot_TRUE@am__append_5524 = rdmsr.mod --@COND_i386_coreboot_TRUE@am__append_5525 = rdmsr.marker --@COND_i386_multiboot_TRUE@am__append_5526 = rdmsr.module --@COND_i386_multiboot_TRUE@am__append_5527 = rdmsr.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_5528 = --@COND_i386_multiboot_TRUE@am__append_5529 = $(nodist_rdmsr_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_5530 = \ -+@COND_i386_coreboot_TRUE@am__append_5517 = rdmsr.mod -+@COND_i386_coreboot_TRUE@am__append_5518 = rdmsr.marker -+@COND_i386_multiboot_TRUE@am__append_5519 = rdmsr.module -+@COND_i386_multiboot_TRUE@am__append_5520 = rdmsr.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_5521 = -+@COND_i386_multiboot_TRUE@am__append_5522 = $(nodist_rdmsr_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_5523 = \ - @COND_i386_multiboot_TRUE@ $(nodist_rdmsr_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ rdmsr.marker --@COND_i386_multiboot_TRUE@am__append_5531 = rdmsr.mod --@COND_i386_multiboot_TRUE@am__append_5532 = rdmsr.marker --@COND_i386_ieee1275_TRUE@am__append_5533 = rdmsr.module --@COND_i386_ieee1275_TRUE@am__append_5534 = rdmsr.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_5535 = --@COND_i386_ieee1275_TRUE@am__append_5536 = $(nodist_rdmsr_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_5537 = \ -+@COND_i386_multiboot_TRUE@am__append_5524 = rdmsr.mod -+@COND_i386_multiboot_TRUE@am__append_5525 = rdmsr.marker -+@COND_i386_ieee1275_TRUE@am__append_5526 = rdmsr.module -+@COND_i386_ieee1275_TRUE@am__append_5527 = rdmsr.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_5528 = -+@COND_i386_ieee1275_TRUE@am__append_5529 = $(nodist_rdmsr_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_5530 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_rdmsr_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ rdmsr.marker --@COND_i386_ieee1275_TRUE@am__append_5538 = rdmsr.mod --@COND_i386_ieee1275_TRUE@am__append_5539 = rdmsr.marker --@COND_x86_64_efi_TRUE@am__append_5540 = rdmsr.module --@COND_x86_64_efi_TRUE@am__append_5541 = rdmsr.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_5542 = --@COND_x86_64_efi_TRUE@am__append_5543 = $(nodist_rdmsr_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_5544 = \ -+@COND_i386_ieee1275_TRUE@am__append_5531 = rdmsr.mod -+@COND_i386_ieee1275_TRUE@am__append_5532 = rdmsr.marker -+@COND_x86_64_efi_TRUE@am__append_5533 = rdmsr.module -+@COND_x86_64_efi_TRUE@am__append_5534 = rdmsr.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_5535 = -+@COND_x86_64_efi_TRUE@am__append_5536 = $(nodist_rdmsr_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_5537 = \ - @COND_x86_64_efi_TRUE@ $(nodist_rdmsr_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ rdmsr.marker --@COND_x86_64_efi_TRUE@am__append_5545 = rdmsr.mod --@COND_x86_64_efi_TRUE@am__append_5546 = rdmsr.marker --@COND_i386_pc_TRUE@am__append_5547 = wrmsr.module --@COND_i386_pc_TRUE@am__append_5548 = wrmsr.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_5538 = rdmsr.mod -+@COND_x86_64_efi_TRUE@am__append_5539 = rdmsr.marker -+@COND_i386_pc_TRUE@am__append_5540 = wrmsr.module -+@COND_i386_pc_TRUE@am__append_5541 = wrmsr.module$(EXEEXT) - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_x86_64_efi_FALSE@wrmsr_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_5549 = --@COND_i386_pc_TRUE@am__append_5550 = $(nodist_wrmsr_module_SOURCES) --@COND_i386_pc_TRUE@am__append_5551 = $(nodist_wrmsr_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_5542 = -+@COND_i386_pc_TRUE@am__append_5543 = $(nodist_wrmsr_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_5544 = $(nodist_wrmsr_module_SOURCES) \ - @COND_i386_pc_TRUE@ wrmsr.marker --@COND_i386_pc_TRUE@am__append_5552 = wrmsr.mod --@COND_i386_pc_TRUE@am__append_5553 = wrmsr.marker --@COND_i386_efi_TRUE@am__append_5554 = wrmsr.module --@COND_i386_efi_TRUE@am__append_5555 = wrmsr.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_5556 = --@COND_i386_efi_TRUE@am__append_5557 = $(nodist_wrmsr_module_SOURCES) --@COND_i386_efi_TRUE@am__append_5558 = $(nodist_wrmsr_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_5545 = wrmsr.mod -+@COND_i386_pc_TRUE@am__append_5546 = wrmsr.marker -+@COND_i386_efi_TRUE@am__append_5547 = wrmsr.module -+@COND_i386_efi_TRUE@am__append_5548 = wrmsr.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_5549 = -+@COND_i386_efi_TRUE@am__append_5550 = $(nodist_wrmsr_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_5551 = $(nodist_wrmsr_module_SOURCES) \ - @COND_i386_efi_TRUE@ wrmsr.marker --@COND_i386_efi_TRUE@am__append_5559 = wrmsr.mod --@COND_i386_efi_TRUE@am__append_5560 = wrmsr.marker --@COND_i386_qemu_TRUE@am__append_5561 = wrmsr.module --@COND_i386_qemu_TRUE@am__append_5562 = wrmsr.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_5563 = --@COND_i386_qemu_TRUE@am__append_5564 = $(nodist_wrmsr_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_5565 = $(nodist_wrmsr_module_SOURCES) \ -+@COND_i386_efi_TRUE@am__append_5552 = wrmsr.mod -+@COND_i386_efi_TRUE@am__append_5553 = wrmsr.marker -+@COND_i386_qemu_TRUE@am__append_5554 = wrmsr.module -+@COND_i386_qemu_TRUE@am__append_5555 = wrmsr.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_5556 = -+@COND_i386_qemu_TRUE@am__append_5557 = $(nodist_wrmsr_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_5558 = $(nodist_wrmsr_module_SOURCES) \ - @COND_i386_qemu_TRUE@ wrmsr.marker --@COND_i386_qemu_TRUE@am__append_5566 = wrmsr.mod --@COND_i386_qemu_TRUE@am__append_5567 = wrmsr.marker --@COND_i386_coreboot_TRUE@am__append_5568 = wrmsr.module --@COND_i386_coreboot_TRUE@am__append_5569 = wrmsr.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_5570 = --@COND_i386_coreboot_TRUE@am__append_5571 = $(nodist_wrmsr_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_5572 = \ -+@COND_i386_qemu_TRUE@am__append_5559 = wrmsr.mod -+@COND_i386_qemu_TRUE@am__append_5560 = wrmsr.marker -+@COND_i386_coreboot_TRUE@am__append_5561 = wrmsr.module -+@COND_i386_coreboot_TRUE@am__append_5562 = wrmsr.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_5563 = -+@COND_i386_coreboot_TRUE@am__append_5564 = $(nodist_wrmsr_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_5565 = \ - @COND_i386_coreboot_TRUE@ $(nodist_wrmsr_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ wrmsr.marker --@COND_i386_coreboot_TRUE@am__append_5573 = wrmsr.mod --@COND_i386_coreboot_TRUE@am__append_5574 = wrmsr.marker --@COND_i386_multiboot_TRUE@am__append_5575 = wrmsr.module --@COND_i386_multiboot_TRUE@am__append_5576 = wrmsr.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_5577 = --@COND_i386_multiboot_TRUE@am__append_5578 = $(nodist_wrmsr_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_5579 = \ -+@COND_i386_coreboot_TRUE@am__append_5566 = wrmsr.mod -+@COND_i386_coreboot_TRUE@am__append_5567 = wrmsr.marker -+@COND_i386_multiboot_TRUE@am__append_5568 = wrmsr.module -+@COND_i386_multiboot_TRUE@am__append_5569 = wrmsr.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_5570 = -+@COND_i386_multiboot_TRUE@am__append_5571 = $(nodist_wrmsr_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_5572 = \ - @COND_i386_multiboot_TRUE@ $(nodist_wrmsr_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ wrmsr.marker --@COND_i386_multiboot_TRUE@am__append_5580 = wrmsr.mod --@COND_i386_multiboot_TRUE@am__append_5581 = wrmsr.marker --@COND_i386_ieee1275_TRUE@am__append_5582 = wrmsr.module --@COND_i386_ieee1275_TRUE@am__append_5583 = wrmsr.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_5584 = --@COND_i386_ieee1275_TRUE@am__append_5585 = $(nodist_wrmsr_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_5586 = \ -+@COND_i386_multiboot_TRUE@am__append_5573 = wrmsr.mod -+@COND_i386_multiboot_TRUE@am__append_5574 = wrmsr.marker -+@COND_i386_ieee1275_TRUE@am__append_5575 = wrmsr.module -+@COND_i386_ieee1275_TRUE@am__append_5576 = wrmsr.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_5577 = -+@COND_i386_ieee1275_TRUE@am__append_5578 = $(nodist_wrmsr_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_5579 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_wrmsr_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ wrmsr.marker --@COND_i386_ieee1275_TRUE@am__append_5587 = wrmsr.mod --@COND_i386_ieee1275_TRUE@am__append_5588 = wrmsr.marker --@COND_x86_64_efi_TRUE@am__append_5589 = wrmsr.module --@COND_x86_64_efi_TRUE@am__append_5590 = wrmsr.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_5591 = --@COND_x86_64_efi_TRUE@am__append_5592 = $(nodist_wrmsr_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_5593 = \ -+@COND_i386_ieee1275_TRUE@am__append_5580 = wrmsr.mod -+@COND_i386_ieee1275_TRUE@am__append_5581 = wrmsr.marker -+@COND_x86_64_efi_TRUE@am__append_5582 = wrmsr.module -+@COND_x86_64_efi_TRUE@am__append_5583 = wrmsr.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_5584 = -+@COND_x86_64_efi_TRUE@am__append_5585 = $(nodist_wrmsr_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_5586 = \ - @COND_x86_64_efi_TRUE@ $(nodist_wrmsr_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ wrmsr.marker --@COND_x86_64_efi_TRUE@am__append_5594 = wrmsr.mod --@COND_x86_64_efi_TRUE@am__append_5595 = wrmsr.marker --@COND_emu_TRUE@am__append_5596 = kernel.exec -+@COND_x86_64_efi_TRUE@am__append_5587 = wrmsr.mod -+@COND_x86_64_efi_TRUE@am__append_5588 = wrmsr.marker -+@COND_emu_TRUE@am__append_5589 = kernel.exec - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_FALSE@kernel_exec_DEPENDENCIES = --@COND_emu_TRUE@am__append_5597 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S --@COND_emu_TRUE@am__append_5598 = $(nodist_kernel_exec_SOURCES) --@COND_emu_TRUE@am__append_5599 = $(nodist_kernel_exec_SOURCES) \ -+@COND_emu_TRUE@am__append_5590 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S -+@COND_emu_TRUE@am__append_5591 = $(nodist_kernel_exec_SOURCES) -+@COND_emu_TRUE@am__append_5592 = $(nodist_kernel_exec_SOURCES) \ - @COND_emu_TRUE@ kernel.img --@COND_emu_TRUE@am__append_5600 = kernel.img --@COND_i386_pc_TRUE@am__append_5601 = kernel.exec --@COND_i386_pc_TRUE@am__append_5602 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S --@COND_i386_pc_TRUE@am__append_5603 = $(nodist_kernel_exec_SOURCES) --@COND_i386_pc_TRUE@am__append_5604 = $(nodist_kernel_exec_SOURCES) \ -+@COND_emu_TRUE@am__append_5593 = kernel.img -+@COND_i386_pc_TRUE@am__append_5594 = kernel.exec -+@COND_i386_pc_TRUE@am__append_5595 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S -+@COND_i386_pc_TRUE@am__append_5596 = $(nodist_kernel_exec_SOURCES) -+@COND_i386_pc_TRUE@am__append_5597 = $(nodist_kernel_exec_SOURCES) \ - @COND_i386_pc_TRUE@ kernel.img --@COND_i386_pc_TRUE@am__append_5605 = kernel.img --@COND_i386_efi_TRUE@am__append_5606 = kernel.exec --@COND_i386_efi_TRUE@am__append_5607 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S --@COND_i386_efi_TRUE@am__append_5608 = $(nodist_kernel_exec_SOURCES) --@COND_i386_efi_TRUE@am__append_5609 = $(nodist_kernel_exec_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_5598 = kernel.img -+@COND_i386_efi_TRUE@am__append_5599 = kernel.exec -+@COND_i386_efi_TRUE@am__append_5600 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S -+@COND_i386_efi_TRUE@am__append_5601 = $(nodist_kernel_exec_SOURCES) -+@COND_i386_efi_TRUE@am__append_5602 = $(nodist_kernel_exec_SOURCES) \ - @COND_i386_efi_TRUE@ kernel.img --@COND_i386_efi_TRUE@am__append_5610 = kernel.img --@COND_i386_qemu_TRUE@am__append_5611 = kernel.exec --@COND_i386_qemu_TRUE@am__append_5612 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S --@COND_i386_qemu_TRUE@am__append_5613 = $(nodist_kernel_exec_SOURCES) --@COND_i386_qemu_TRUE@am__append_5614 = $(nodist_kernel_exec_SOURCES) \ -+@COND_i386_efi_TRUE@am__append_5603 = kernel.img -+@COND_i386_qemu_TRUE@am__append_5604 = kernel.exec -+@COND_i386_qemu_TRUE@am__append_5605 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S -+@COND_i386_qemu_TRUE@am__append_5606 = $(nodist_kernel_exec_SOURCES) -+@COND_i386_qemu_TRUE@am__append_5607 = $(nodist_kernel_exec_SOURCES) \ - @COND_i386_qemu_TRUE@ kernel.img --@COND_i386_qemu_TRUE@am__append_5615 = kernel.img --@COND_i386_coreboot_TRUE@am__append_5616 = kernel.exec --@COND_i386_coreboot_TRUE@am__append_5617 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S --@COND_i386_coreboot_TRUE@am__append_5618 = $(nodist_kernel_exec_SOURCES) --@COND_i386_coreboot_TRUE@am__append_5619 = \ -+@COND_i386_qemu_TRUE@am__append_5608 = kernel.img -+@COND_i386_coreboot_TRUE@am__append_5609 = kernel.exec -+@COND_i386_coreboot_TRUE@am__append_5610 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S -+@COND_i386_coreboot_TRUE@am__append_5611 = $(nodist_kernel_exec_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_5612 = \ - @COND_i386_coreboot_TRUE@ $(nodist_kernel_exec_SOURCES) \ - @COND_i386_coreboot_TRUE@ kernel.img --@COND_i386_coreboot_TRUE@am__append_5620 = kernel.img --@COND_i386_multiboot_TRUE@am__append_5621 = kernel.exec --@COND_i386_multiboot_TRUE@am__append_5622 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S --@COND_i386_multiboot_TRUE@am__append_5623 = $(nodist_kernel_exec_SOURCES) --@COND_i386_multiboot_TRUE@am__append_5624 = \ -+@COND_i386_coreboot_TRUE@am__append_5613 = kernel.img -+@COND_i386_multiboot_TRUE@am__append_5614 = kernel.exec -+@COND_i386_multiboot_TRUE@am__append_5615 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S -+@COND_i386_multiboot_TRUE@am__append_5616 = $(nodist_kernel_exec_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_5617 = \ - @COND_i386_multiboot_TRUE@ $(nodist_kernel_exec_SOURCES) \ - @COND_i386_multiboot_TRUE@ kernel.img --@COND_i386_multiboot_TRUE@am__append_5625 = kernel.img --@COND_i386_ieee1275_TRUE@am__append_5626 = kernel.exec --@COND_i386_ieee1275_TRUE@am__append_5627 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S --@COND_i386_ieee1275_TRUE@am__append_5628 = $(nodist_kernel_exec_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_5629 = \ -+@COND_i386_multiboot_TRUE@am__append_5618 = kernel.img -+@COND_i386_ieee1275_TRUE@am__append_5619 = kernel.exec -+@COND_i386_ieee1275_TRUE@am__append_5620 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S -+@COND_i386_ieee1275_TRUE@am__append_5621 = $(nodist_kernel_exec_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_5622 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_kernel_exec_SOURCES) \ - @COND_i386_ieee1275_TRUE@ kernel.img --@COND_i386_ieee1275_TRUE@am__append_5630 = kernel.img --@COND_x86_64_efi_TRUE@am__append_5631 = kernel.exec --@COND_x86_64_efi_TRUE@am__append_5632 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S --@COND_x86_64_efi_TRUE@am__append_5633 = $(nodist_kernel_exec_SOURCES) --@COND_x86_64_efi_TRUE@am__append_5634 = $(nodist_kernel_exec_SOURCES) \ -+@COND_i386_ieee1275_TRUE@am__append_5623 = kernel.img -+@COND_x86_64_efi_TRUE@am__append_5624 = kernel.exec -+@COND_x86_64_efi_TRUE@am__append_5625 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S -+@COND_x86_64_efi_TRUE@am__append_5626 = $(nodist_kernel_exec_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_5627 = $(nodist_kernel_exec_SOURCES) \ - @COND_x86_64_efi_TRUE@ kernel.img --@COND_x86_64_efi_TRUE@am__append_5635 = kernel.img --@COND_i386_xen_TRUE@am__append_5636 = kernel.exec --@COND_i386_xen_TRUE@am__append_5637 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S --@COND_i386_xen_TRUE@am__append_5638 = $(nodist_kernel_exec_SOURCES) --@COND_i386_xen_TRUE@am__append_5639 = $(nodist_kernel_exec_SOURCES) \ -+@COND_x86_64_efi_TRUE@am__append_5628 = kernel.img -+@COND_i386_xen_TRUE@am__append_5629 = kernel.exec -+@COND_i386_xen_TRUE@am__append_5630 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S -+@COND_i386_xen_TRUE@am__append_5631 = $(nodist_kernel_exec_SOURCES) -+@COND_i386_xen_TRUE@am__append_5632 = $(nodist_kernel_exec_SOURCES) \ - @COND_i386_xen_TRUE@ kernel.img --@COND_i386_xen_TRUE@am__append_5640 = kernel.img --@COND_x86_64_xen_TRUE@am__append_5641 = kernel.exec --@COND_x86_64_xen_TRUE@am__append_5642 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S --@COND_x86_64_xen_TRUE@am__append_5643 = $(nodist_kernel_exec_SOURCES) --@COND_x86_64_xen_TRUE@am__append_5644 = $(nodist_kernel_exec_SOURCES) \ -+@COND_i386_xen_TRUE@am__append_5633 = kernel.img -+@COND_x86_64_xen_TRUE@am__append_5634 = kernel.exec -+@COND_x86_64_xen_TRUE@am__append_5635 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S -+@COND_x86_64_xen_TRUE@am__append_5636 = $(nodist_kernel_exec_SOURCES) -+@COND_x86_64_xen_TRUE@am__append_5637 = $(nodist_kernel_exec_SOURCES) \ - @COND_x86_64_xen_TRUE@ kernel.img --@COND_x86_64_xen_TRUE@am__append_5645 = kernel.img --@COND_i386_xen_pvh_TRUE@am__append_5646 = kernel.exec --@COND_i386_xen_pvh_TRUE@am__append_5647 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S --@COND_i386_xen_pvh_TRUE@am__append_5648 = $(nodist_kernel_exec_SOURCES) --@COND_i386_xen_pvh_TRUE@am__append_5649 = \ -+@COND_x86_64_xen_TRUE@am__append_5638 = kernel.img -+@COND_i386_xen_pvh_TRUE@am__append_5639 = kernel.exec -+@COND_i386_xen_pvh_TRUE@am__append_5640 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S -+@COND_i386_xen_pvh_TRUE@am__append_5641 = $(nodist_kernel_exec_SOURCES) -+@COND_i386_xen_pvh_TRUE@am__append_5642 = \ - @COND_i386_xen_pvh_TRUE@ $(nodist_kernel_exec_SOURCES) \ - @COND_i386_xen_pvh_TRUE@ kernel.img --@COND_i386_xen_pvh_TRUE@am__append_5650 = kernel.img --@COND_mips_loongson_TRUE@am__append_5651 = kernel.exec --@COND_mips_loongson_TRUE@am__append_5652 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S --@COND_mips_loongson_TRUE@am__append_5653 = $(nodist_kernel_exec_SOURCES) --@COND_mips_loongson_TRUE@am__append_5654 = \ -+@COND_i386_xen_pvh_TRUE@am__append_5643 = kernel.img -+@COND_mips_loongson_TRUE@am__append_5644 = kernel.exec -+@COND_mips_loongson_TRUE@am__append_5645 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S -+@COND_mips_loongson_TRUE@am__append_5646 = $(nodist_kernel_exec_SOURCES) -+@COND_mips_loongson_TRUE@am__append_5647 = \ - @COND_mips_loongson_TRUE@ $(nodist_kernel_exec_SOURCES) \ - @COND_mips_loongson_TRUE@ kernel.img --@COND_mips_loongson_TRUE@am__append_5655 = kernel.img --@COND_sparc64_ieee1275_TRUE@am__append_5656 = kernel.exec --@COND_sparc64_ieee1275_TRUE@am__append_5657 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S --@COND_sparc64_ieee1275_TRUE@am__append_5658 = $(nodist_kernel_exec_SOURCES) --@COND_sparc64_ieee1275_TRUE@am__append_5659 = \ -+@COND_mips_loongson_TRUE@am__append_5648 = kernel.img -+@COND_sparc64_ieee1275_TRUE@am__append_5649 = kernel.exec -+@COND_sparc64_ieee1275_TRUE@am__append_5650 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S -+@COND_sparc64_ieee1275_TRUE@am__append_5651 = $(nodist_kernel_exec_SOURCES) -+@COND_sparc64_ieee1275_TRUE@am__append_5652 = \ - @COND_sparc64_ieee1275_TRUE@ $(nodist_kernel_exec_SOURCES) \ - @COND_sparc64_ieee1275_TRUE@ kernel.img --@COND_sparc64_ieee1275_TRUE@am__append_5660 = kernel.img --@COND_powerpc_ieee1275_TRUE@am__append_5661 = kernel.exec --@COND_powerpc_ieee1275_TRUE@am__append_5662 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S --@COND_powerpc_ieee1275_TRUE@am__append_5663 = $(nodist_kernel_exec_SOURCES) --@COND_powerpc_ieee1275_TRUE@am__append_5664 = \ -+@COND_sparc64_ieee1275_TRUE@am__append_5653 = kernel.img -+@COND_powerpc_ieee1275_TRUE@am__append_5654 = kernel.exec -+@COND_powerpc_ieee1275_TRUE@am__append_5655 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S -+@COND_powerpc_ieee1275_TRUE@am__append_5656 = $(nodist_kernel_exec_SOURCES) -+@COND_powerpc_ieee1275_TRUE@am__append_5657 = \ - @COND_powerpc_ieee1275_TRUE@ $(nodist_kernel_exec_SOURCES) \ - @COND_powerpc_ieee1275_TRUE@ kernel.img --@COND_powerpc_ieee1275_TRUE@am__append_5665 = kernel.img --@COND_mips_arc_TRUE@am__append_5666 = kernel.exec --@COND_mips_arc_TRUE@am__append_5667 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S --@COND_mips_arc_TRUE@am__append_5668 = $(nodist_kernel_exec_SOURCES) --@COND_mips_arc_TRUE@am__append_5669 = $(nodist_kernel_exec_SOURCES) \ -+@COND_powerpc_ieee1275_TRUE@am__append_5658 = kernel.img -+@COND_mips_arc_TRUE@am__append_5659 = kernel.exec -+@COND_mips_arc_TRUE@am__append_5660 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S -+@COND_mips_arc_TRUE@am__append_5661 = $(nodist_kernel_exec_SOURCES) -+@COND_mips_arc_TRUE@am__append_5662 = $(nodist_kernel_exec_SOURCES) \ - @COND_mips_arc_TRUE@ kernel.img --@COND_mips_arc_TRUE@am__append_5670 = kernel.img --@COND_ia64_efi_TRUE@am__append_5671 = kernel.exec --@COND_ia64_efi_TRUE@am__append_5672 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S --@COND_ia64_efi_TRUE@am__append_5673 = $(nodist_kernel_exec_SOURCES) --@COND_ia64_efi_TRUE@am__append_5674 = $(nodist_kernel_exec_SOURCES) \ -+@COND_mips_arc_TRUE@am__append_5663 = kernel.img -+@COND_ia64_efi_TRUE@am__append_5664 = kernel.exec -+@COND_ia64_efi_TRUE@am__append_5665 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S -+@COND_ia64_efi_TRUE@am__append_5666 = $(nodist_kernel_exec_SOURCES) -+@COND_ia64_efi_TRUE@am__append_5667 = $(nodist_kernel_exec_SOURCES) \ - @COND_ia64_efi_TRUE@ kernel.img --@COND_ia64_efi_TRUE@am__append_5675 = kernel.img --@COND_mips_qemu_mips_TRUE@am__append_5676 = kernel.exec --@COND_mips_qemu_mips_TRUE@am__append_5677 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S --@COND_mips_qemu_mips_TRUE@am__append_5678 = $(nodist_kernel_exec_SOURCES) --@COND_mips_qemu_mips_TRUE@am__append_5679 = \ -+@COND_ia64_efi_TRUE@am__append_5668 = kernel.img -+@COND_mips_qemu_mips_TRUE@am__append_5669 = kernel.exec -+@COND_mips_qemu_mips_TRUE@am__append_5670 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S -+@COND_mips_qemu_mips_TRUE@am__append_5671 = $(nodist_kernel_exec_SOURCES) -+@COND_mips_qemu_mips_TRUE@am__append_5672 = \ - @COND_mips_qemu_mips_TRUE@ $(nodist_kernel_exec_SOURCES) \ - @COND_mips_qemu_mips_TRUE@ kernel.img --@COND_mips_qemu_mips_TRUE@am__append_5680 = kernel.img --@COND_arm_uboot_TRUE@am__append_5681 = kernel.exec --@COND_arm_uboot_TRUE@am__append_5682 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S --@COND_arm_uboot_TRUE@am__append_5683 = $(nodist_kernel_exec_SOURCES) --@COND_arm_uboot_TRUE@am__append_5684 = $(nodist_kernel_exec_SOURCES) \ -+@COND_mips_qemu_mips_TRUE@am__append_5673 = kernel.img -+@COND_arm_uboot_TRUE@am__append_5674 = kernel.exec -+@COND_arm_uboot_TRUE@am__append_5675 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S -+@COND_arm_uboot_TRUE@am__append_5676 = $(nodist_kernel_exec_SOURCES) -+@COND_arm_uboot_TRUE@am__append_5677 = $(nodist_kernel_exec_SOURCES) \ - @COND_arm_uboot_TRUE@ kernel.img --@COND_arm_uboot_TRUE@am__append_5685 = kernel.img --@COND_arm_efi_TRUE@am__append_5686 = kernel.exec --@COND_arm_efi_TRUE@am__append_5687 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S --@COND_arm_efi_TRUE@am__append_5688 = $(nodist_kernel_exec_SOURCES) --@COND_arm_efi_TRUE@am__append_5689 = $(nodist_kernel_exec_SOURCES) \ -+@COND_arm_uboot_TRUE@am__append_5678 = kernel.img -+@COND_arm_efi_TRUE@am__append_5679 = kernel.exec -+@COND_arm_efi_TRUE@am__append_5680 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S -+@COND_arm_efi_TRUE@am__append_5681 = $(nodist_kernel_exec_SOURCES) -+@COND_arm_efi_TRUE@am__append_5682 = $(nodist_kernel_exec_SOURCES) \ - @COND_arm_efi_TRUE@ kernel.img --@COND_arm_efi_TRUE@am__append_5690 = kernel.img --@COND_arm64_efi_TRUE@am__append_5691 = kernel.exec --@COND_arm64_efi_TRUE@am__append_5692 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S --@COND_arm64_efi_TRUE@am__append_5693 = $(nodist_kernel_exec_SOURCES) --@COND_arm64_efi_TRUE@am__append_5694 = $(nodist_kernel_exec_SOURCES) \ -+@COND_arm_efi_TRUE@am__append_5683 = kernel.img -+@COND_arm64_efi_TRUE@am__append_5684 = kernel.exec -+@COND_arm64_efi_TRUE@am__append_5685 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S -+@COND_arm64_efi_TRUE@am__append_5686 = $(nodist_kernel_exec_SOURCES) -+@COND_arm64_efi_TRUE@am__append_5687 = $(nodist_kernel_exec_SOURCES) \ - @COND_arm64_efi_TRUE@ kernel.img --@COND_arm64_efi_TRUE@am__append_5695 = kernel.img --@COND_arm_coreboot_TRUE@am__append_5696 = kernel.exec --@COND_arm_coreboot_TRUE@am__append_5697 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S --@COND_arm_coreboot_TRUE@am__append_5698 = $(nodist_kernel_exec_SOURCES) --@COND_arm_coreboot_TRUE@am__append_5699 = \ -+@COND_arm64_efi_TRUE@am__append_5688 = kernel.img -+@COND_arm_coreboot_TRUE@am__append_5689 = kernel.exec -+@COND_arm_coreboot_TRUE@am__append_5690 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S -+@COND_arm_coreboot_TRUE@am__append_5691 = $(nodist_kernel_exec_SOURCES) -+@COND_arm_coreboot_TRUE@am__append_5692 = \ - @COND_arm_coreboot_TRUE@ $(nodist_kernel_exec_SOURCES) \ - @COND_arm_coreboot_TRUE@ kernel.img --@COND_arm_coreboot_TRUE@am__append_5700 = kernel.img --@COND_riscv32_efi_TRUE@am__append_5701 = kernel.exec --@COND_riscv32_efi_TRUE@am__append_5702 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S --@COND_riscv32_efi_TRUE@am__append_5703 = $(nodist_kernel_exec_SOURCES) --@COND_riscv32_efi_TRUE@am__append_5704 = \ -+@COND_arm_coreboot_TRUE@am__append_5693 = kernel.img -+@COND_riscv32_efi_TRUE@am__append_5694 = kernel.exec -+@COND_riscv32_efi_TRUE@am__append_5695 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S -+@COND_riscv32_efi_TRUE@am__append_5696 = $(nodist_kernel_exec_SOURCES) -+@COND_riscv32_efi_TRUE@am__append_5697 = \ - @COND_riscv32_efi_TRUE@ $(nodist_kernel_exec_SOURCES) \ - @COND_riscv32_efi_TRUE@ kernel.img --@COND_riscv32_efi_TRUE@am__append_5705 = kernel.img --@COND_riscv64_efi_TRUE@am__append_5706 = kernel.exec --@COND_riscv64_efi_TRUE@am__append_5707 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S --@COND_riscv64_efi_TRUE@am__append_5708 = $(nodist_kernel_exec_SOURCES) --@COND_riscv64_efi_TRUE@am__append_5709 = \ -+@COND_riscv32_efi_TRUE@am__append_5698 = kernel.img -+@COND_riscv64_efi_TRUE@am__append_5699 = kernel.exec -+@COND_riscv64_efi_TRUE@am__append_5700 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S -+@COND_riscv64_efi_TRUE@am__append_5701 = $(nodist_kernel_exec_SOURCES) -+@COND_riscv64_efi_TRUE@am__append_5702 = \ - @COND_riscv64_efi_TRUE@ $(nodist_kernel_exec_SOURCES) \ - @COND_riscv64_efi_TRUE@ kernel.img --@COND_riscv64_efi_TRUE@am__append_5710 = kernel.img --@COND_i386_pc_TRUE@am__append_5711 = boot.image --@COND_i386_pc_TRUE@am__append_5712 = --@COND_i386_pc_TRUE@am__append_5713 = $(nodist_boot_image_SOURCES) --@COND_i386_pc_TRUE@am__append_5714 = $(nodist_boot_image_SOURCES) \ -+@COND_riscv64_efi_TRUE@am__append_5703 = kernel.img -+@COND_i386_pc_TRUE@am__append_5704 = boot.image -+@COND_i386_pc_TRUE@am__append_5705 = -+@COND_i386_pc_TRUE@am__append_5706 = $(nodist_boot_image_SOURCES) -+@COND_i386_pc_TRUE@am__append_5707 = $(nodist_boot_image_SOURCES) \ - @COND_i386_pc_TRUE@ boot.img --@COND_i386_pc_TRUE@am__append_5715 = boot.img --@COND_i386_qemu_TRUE@am__append_5716 = boot.image --@COND_i386_qemu_TRUE@am__append_5717 = --@COND_i386_qemu_TRUE@am__append_5718 = $(nodist_boot_image_SOURCES) --@COND_i386_qemu_TRUE@am__append_5719 = $(nodist_boot_image_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_5708 = boot.img -+@COND_i386_qemu_TRUE@am__append_5709 = boot.image -+@COND_i386_qemu_TRUE@am__append_5710 = -+@COND_i386_qemu_TRUE@am__append_5711 = $(nodist_boot_image_SOURCES) -+@COND_i386_qemu_TRUE@am__append_5712 = $(nodist_boot_image_SOURCES) \ - @COND_i386_qemu_TRUE@ boot.img --@COND_i386_qemu_TRUE@am__append_5720 = boot.img --@COND_sparc64_ieee1275_TRUE@am__append_5721 = boot.image --@COND_sparc64_ieee1275_TRUE@am__append_5722 = --@COND_sparc64_ieee1275_TRUE@am__append_5723 = $(nodist_boot_image_SOURCES) --@COND_sparc64_ieee1275_TRUE@am__append_5724 = \ -+@COND_i386_qemu_TRUE@am__append_5713 = boot.img -+@COND_sparc64_ieee1275_TRUE@am__append_5714 = boot.image -+@COND_sparc64_ieee1275_TRUE@am__append_5715 = -+@COND_sparc64_ieee1275_TRUE@am__append_5716 = $(nodist_boot_image_SOURCES) -+@COND_sparc64_ieee1275_TRUE@am__append_5717 = \ - @COND_sparc64_ieee1275_TRUE@ $(nodist_boot_image_SOURCES) \ - @COND_sparc64_ieee1275_TRUE@ boot.img --@COND_sparc64_ieee1275_TRUE@am__append_5725 = boot.img --@COND_i386_pc_TRUE@am__append_5726 = boot_hybrid.image cdboot.image --@COND_i386_pc_TRUE@am__append_5727 = --@COND_i386_pc_TRUE@am__append_5728 = \ -+@COND_sparc64_ieee1275_TRUE@am__append_5718 = boot.img -+@COND_i386_pc_TRUE@am__append_5719 = boot_hybrid.image cdboot.image -+@COND_i386_pc_TRUE@am__append_5720 = -+@COND_i386_pc_TRUE@am__append_5721 = \ - @COND_i386_pc_TRUE@ $(nodist_boot_hybrid_image_SOURCES) \ - @COND_i386_pc_TRUE@ $(nodist_cdboot_image_SOURCES) --@COND_i386_pc_TRUE@am__append_5729 = \ -+@COND_i386_pc_TRUE@am__append_5722 = \ - @COND_i386_pc_TRUE@ $(nodist_boot_hybrid_image_SOURCES) \ - @COND_i386_pc_TRUE@ boot_hybrid.img \ - @COND_i386_pc_TRUE@ $(nodist_cdboot_image_SOURCES) cdboot.img --@COND_i386_pc_TRUE@am__append_5730 = boot_hybrid.img cdboot.img --@COND_sparc64_ieee1275_TRUE@am__append_5731 = cdboot.image --@COND_sparc64_ieee1275_TRUE@am__append_5732 = --@COND_sparc64_ieee1275_TRUE@am__append_5733 = $(nodist_cdboot_image_SOURCES) --@COND_sparc64_ieee1275_TRUE@am__append_5734 = \ -+@COND_i386_pc_TRUE@am__append_5723 = boot_hybrid.img cdboot.img -+@COND_sparc64_ieee1275_TRUE@am__append_5724 = cdboot.image -+@COND_sparc64_ieee1275_TRUE@am__append_5725 = -+@COND_sparc64_ieee1275_TRUE@am__append_5726 = $(nodist_cdboot_image_SOURCES) -+@COND_sparc64_ieee1275_TRUE@am__append_5727 = \ - @COND_sparc64_ieee1275_TRUE@ $(nodist_cdboot_image_SOURCES) \ - @COND_sparc64_ieee1275_TRUE@ cdboot.img --@COND_sparc64_ieee1275_TRUE@am__append_5735 = cdboot.img --@COND_i386_pc_TRUE@am__append_5736 = pxeboot.image diskboot.image --@COND_i386_pc_TRUE@am__append_5737 = --@COND_i386_pc_TRUE@am__append_5738 = $(nodist_pxeboot_image_SOURCES) \ -+@COND_sparc64_ieee1275_TRUE@am__append_5728 = cdboot.img -+@COND_i386_pc_TRUE@am__append_5729 = pxeboot.image diskboot.image -+@COND_i386_pc_TRUE@am__append_5730 = -+@COND_i386_pc_TRUE@am__append_5731 = $(nodist_pxeboot_image_SOURCES) \ - @COND_i386_pc_TRUE@ $(nodist_diskboot_image_SOURCES) --@COND_i386_pc_TRUE@am__append_5739 = $(nodist_pxeboot_image_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_5732 = $(nodist_pxeboot_image_SOURCES) \ - @COND_i386_pc_TRUE@ pxeboot.img \ - @COND_i386_pc_TRUE@ $(nodist_diskboot_image_SOURCES) \ - @COND_i386_pc_TRUE@ diskboot.img --@COND_i386_pc_TRUE@am__append_5740 = pxeboot.img diskboot.img --@COND_sparc64_ieee1275_TRUE@am__append_5741 = diskboot.image --@COND_sparc64_ieee1275_TRUE@am__append_5742 = --@COND_sparc64_ieee1275_TRUE@am__append_5743 = $(nodist_diskboot_image_SOURCES) --@COND_sparc64_ieee1275_TRUE@am__append_5744 = \ -+@COND_i386_pc_TRUE@am__append_5733 = pxeboot.img diskboot.img -+@COND_sparc64_ieee1275_TRUE@am__append_5734 = diskboot.image -+@COND_sparc64_ieee1275_TRUE@am__append_5735 = -+@COND_sparc64_ieee1275_TRUE@am__append_5736 = $(nodist_diskboot_image_SOURCES) -+@COND_sparc64_ieee1275_TRUE@am__append_5737 = \ - @COND_sparc64_ieee1275_TRUE@ $(nodist_diskboot_image_SOURCES) \ - @COND_sparc64_ieee1275_TRUE@ diskboot.img --@COND_sparc64_ieee1275_TRUE@am__append_5745 = diskboot.img --@COND_i386_pc_TRUE@am__append_5746 = lnxboot.image --@COND_i386_pc_TRUE@am__append_5747 = --@COND_i386_pc_TRUE@am__append_5748 = $(nodist_lnxboot_image_SOURCES) --@COND_i386_pc_TRUE@am__append_5749 = $(nodist_lnxboot_image_SOURCES) \ -+@COND_sparc64_ieee1275_TRUE@am__append_5738 = diskboot.img -+@COND_i386_pc_TRUE@am__append_5739 = lnxboot.image -+@COND_i386_pc_TRUE@am__append_5740 = -+@COND_i386_pc_TRUE@am__append_5741 = $(nodist_lnxboot_image_SOURCES) -+@COND_i386_pc_TRUE@am__append_5742 = $(nodist_lnxboot_image_SOURCES) \ - @COND_i386_pc_TRUE@ lnxboot.img --@COND_i386_pc_TRUE@am__append_5750 = lnxboot.img --@COND_mips_loongson_TRUE@am__append_5751 = xz_decompress.image --@COND_mips_loongson_TRUE@am__append_5752 = --@COND_mips_loongson_TRUE@am__append_5753 = $(nodist_xz_decompress_image_SOURCES) --@COND_mips_loongson_TRUE@am__append_5754 = $(nodist_xz_decompress_image_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_5743 = lnxboot.img -+@COND_mips_loongson_TRUE@am__append_5744 = xz_decompress.image -+@COND_mips_loongson_TRUE@am__append_5745 = -+@COND_mips_loongson_TRUE@am__append_5746 = $(nodist_xz_decompress_image_SOURCES) -+@COND_mips_loongson_TRUE@am__append_5747 = $(nodist_xz_decompress_image_SOURCES) \ - @COND_mips_loongson_TRUE@ xz_decompress.img --@COND_mips_loongson_TRUE@am__append_5755 = xz_decompress.img --@COND_mips_arc_TRUE@am__append_5756 = xz_decompress.image --@COND_mips_arc_TRUE@am__append_5757 = --@COND_mips_arc_TRUE@am__append_5758 = $(nodist_xz_decompress_image_SOURCES) --@COND_mips_arc_TRUE@am__append_5759 = \ -+@COND_mips_loongson_TRUE@am__append_5748 = xz_decompress.img -+@COND_mips_arc_TRUE@am__append_5749 = xz_decompress.image -+@COND_mips_arc_TRUE@am__append_5750 = -+@COND_mips_arc_TRUE@am__append_5751 = $(nodist_xz_decompress_image_SOURCES) -+@COND_mips_arc_TRUE@am__append_5752 = \ - @COND_mips_arc_TRUE@ $(nodist_xz_decompress_image_SOURCES) \ - @COND_mips_arc_TRUE@ xz_decompress.img --@COND_mips_arc_TRUE@am__append_5760 = xz_decompress.img --@COND_mips_qemu_mips_TRUE@am__append_5761 = xz_decompress.image --@COND_mips_qemu_mips_TRUE@am__append_5762 = --@COND_mips_qemu_mips_TRUE@am__append_5763 = $(nodist_xz_decompress_image_SOURCES) --@COND_mips_qemu_mips_TRUE@am__append_5764 = $(nodist_xz_decompress_image_SOURCES) \ -+@COND_mips_arc_TRUE@am__append_5753 = xz_decompress.img -+@COND_mips_qemu_mips_TRUE@am__append_5754 = xz_decompress.image -+@COND_mips_qemu_mips_TRUE@am__append_5755 = -+@COND_mips_qemu_mips_TRUE@am__append_5756 = $(nodist_xz_decompress_image_SOURCES) -+@COND_mips_qemu_mips_TRUE@am__append_5757 = $(nodist_xz_decompress_image_SOURCES) \ - @COND_mips_qemu_mips_TRUE@ xz_decompress.img --@COND_mips_qemu_mips_TRUE@am__append_5765 = xz_decompress.img --@COND_mips_loongson_TRUE@am__append_5766 = none_decompress.image --@COND_mips_loongson_TRUE@am__append_5767 = --@COND_mips_loongson_TRUE@am__append_5768 = $(nodist_none_decompress_image_SOURCES) --@COND_mips_loongson_TRUE@am__append_5769 = $(nodist_none_decompress_image_SOURCES) \ -+@COND_mips_qemu_mips_TRUE@am__append_5758 = xz_decompress.img -+@COND_mips_loongson_TRUE@am__append_5759 = none_decompress.image -+@COND_mips_loongson_TRUE@am__append_5760 = -+@COND_mips_loongson_TRUE@am__append_5761 = $(nodist_none_decompress_image_SOURCES) -+@COND_mips_loongson_TRUE@am__append_5762 = $(nodist_none_decompress_image_SOURCES) \ - @COND_mips_loongson_TRUE@ none_decompress.img --@COND_mips_loongson_TRUE@am__append_5770 = none_decompress.img --@COND_mips_arc_TRUE@am__append_5771 = none_decompress.image --@COND_mips_arc_TRUE@am__append_5772 = --@COND_mips_arc_TRUE@am__append_5773 = $(nodist_none_decompress_image_SOURCES) --@COND_mips_arc_TRUE@am__append_5774 = \ -+@COND_mips_loongson_TRUE@am__append_5763 = none_decompress.img -+@COND_mips_arc_TRUE@am__append_5764 = none_decompress.image -+@COND_mips_arc_TRUE@am__append_5765 = -+@COND_mips_arc_TRUE@am__append_5766 = $(nodist_none_decompress_image_SOURCES) -+@COND_mips_arc_TRUE@am__append_5767 = \ - @COND_mips_arc_TRUE@ $(nodist_none_decompress_image_SOURCES) \ - @COND_mips_arc_TRUE@ none_decompress.img --@COND_mips_arc_TRUE@am__append_5775 = none_decompress.img --@COND_mips_qemu_mips_TRUE@am__append_5776 = none_decompress.image --@COND_mips_qemu_mips_TRUE@am__append_5777 = --@COND_mips_qemu_mips_TRUE@am__append_5778 = $(nodist_none_decompress_image_SOURCES) --@COND_mips_qemu_mips_TRUE@am__append_5779 = $(nodist_none_decompress_image_SOURCES) \ -+@COND_mips_arc_TRUE@am__append_5768 = none_decompress.img -+@COND_mips_qemu_mips_TRUE@am__append_5769 = none_decompress.image -+@COND_mips_qemu_mips_TRUE@am__append_5770 = -+@COND_mips_qemu_mips_TRUE@am__append_5771 = $(nodist_none_decompress_image_SOURCES) -+@COND_mips_qemu_mips_TRUE@am__append_5772 = $(nodist_none_decompress_image_SOURCES) \ - @COND_mips_qemu_mips_TRUE@ none_decompress.img --@COND_mips_qemu_mips_TRUE@am__append_5780 = none_decompress.img --@COND_i386_pc_TRUE@am__append_5781 = lzma_decompress.image --@COND_i386_pc_TRUE@am__append_5782 = --@COND_i386_pc_TRUE@am__append_5783 = $(nodist_lzma_decompress_image_SOURCES) --@COND_i386_pc_TRUE@am__append_5784 = \ -+@COND_mips_qemu_mips_TRUE@am__append_5773 = none_decompress.img -+@COND_i386_pc_TRUE@am__append_5774 = lzma_decompress.image -+@COND_i386_pc_TRUE@am__append_5775 = -+@COND_i386_pc_TRUE@am__append_5776 = $(nodist_lzma_decompress_image_SOURCES) -+@COND_i386_pc_TRUE@am__append_5777 = \ - @COND_i386_pc_TRUE@ $(nodist_lzma_decompress_image_SOURCES) \ - @COND_i386_pc_TRUE@ lzma_decompress.img --@COND_i386_pc_TRUE@am__append_5785 = lzma_decompress.img --@COND_mips_loongson_TRUE@am__append_5786 = fwstart.image \ -+@COND_i386_pc_TRUE@am__append_5778 = lzma_decompress.img -+@COND_mips_loongson_TRUE@am__append_5779 = fwstart.image \ - @COND_mips_loongson_TRUE@ fwstart_fuloong2f.image --@COND_mips_loongson_TRUE@am__append_5787 = --@COND_mips_loongson_TRUE@am__append_5788 = \ -+@COND_mips_loongson_TRUE@am__append_5780 = -+@COND_mips_loongson_TRUE@am__append_5781 = \ - @COND_mips_loongson_TRUE@ $(nodist_fwstart_image_SOURCES) \ - @COND_mips_loongson_TRUE@ $(nodist_fwstart_fuloong2f_image_SOURCES) --@COND_mips_loongson_TRUE@am__append_5789 = \ -+@COND_mips_loongson_TRUE@am__append_5782 = \ - @COND_mips_loongson_TRUE@ $(nodist_fwstart_image_SOURCES) \ - @COND_mips_loongson_TRUE@ fwstart.img \ - @COND_mips_loongson_TRUE@ $(nodist_fwstart_fuloong2f_image_SOURCES) \ - @COND_mips_loongson_TRUE@ fwstart_fuloong2f.img --@COND_mips_loongson_TRUE@am__append_5790 = fwstart.img \ -+@COND_mips_loongson_TRUE@am__append_5783 = fwstart.img \ - @COND_mips_loongson_TRUE@ fwstart_fuloong2f.img --@COND_emu_TRUE@am__append_5791 = grub-emu grub-emu-lite --@COND_MAN_PAGES_TRUE@@COND_emu_TRUE@am__append_5792 = grub-emu.1 --@COND_MAN_PAGES_TRUE@@COND_emu_TRUE@am__append_5793 = grub-emu.1 --@COND_emu_TRUE@am__append_5794 = --@COND_emu_TRUE@am__append_5795 = $(nodist_grub_emu_SOURCES) \ -+@COND_emu_TRUE@am__append_5784 = grub-emu grub-emu-lite -+@COND_MAN_PAGES_TRUE@@COND_emu_TRUE@am__append_5785 = grub-emu.1 -+@COND_MAN_PAGES_TRUE@@COND_emu_TRUE@am__append_5786 = grub-emu.1 -+@COND_emu_TRUE@am__append_5787 = -+@COND_emu_TRUE@am__append_5788 = $(nodist_grub_emu_SOURCES) \ - @COND_emu_TRUE@ $(nodist_grub_emu_lite_SOURCES) --@COND_emu_TRUE@am__append_5796 = $(nodist_grub_emu_SOURCES) \ -+@COND_emu_TRUE@am__append_5789 = $(nodist_grub_emu_SOURCES) \ - @COND_emu_TRUE@ $(nodist_grub_emu_lite_SOURCES) --@COND_powerpc_ieee1275_TRUE@am__append_5797 = grub.chrp bootinfo.txt --@COND_powerpc_ieee1275_TRUE@am__append_5798 = grub.chrp bootinfo.txt --@COND_powerpc_ieee1275_TRUE@am__append_5799 = --@COND_powerpc_ieee1275_TRUE@am__append_5800 = \ -+@COND_powerpc_ieee1275_TRUE@am__append_5790 = grub.chrp bootinfo.txt -+@COND_powerpc_ieee1275_TRUE@am__append_5791 = grub.chrp bootinfo.txt -+@COND_powerpc_ieee1275_TRUE@am__append_5792 = -+@COND_powerpc_ieee1275_TRUE@am__append_5793 = \ - @COND_powerpc_ieee1275_TRUE@ boot/powerpc/grub.chrp.in \ - @COND_powerpc_ieee1275_TRUE@ boot/powerpc/bootinfo.txt.in --@COND_emu_TRUE@am__append_5801 = $(top_srcdir)/include/grub/compiler-rt-emu.h --@COND_emu_FALSE@am__append_5802 = $(top_srcdir)/include/grub/compiler-rt.h --@COND_i386_pc_TRUE@am__append_5803 = $(top_builddir)/include/grub/machine/kernel.h \ -+@COND_emu_TRUE@am__append_5794 = $(top_srcdir)/include/grub/compiler-rt-emu.h -+@COND_emu_FALSE@am__append_5795 = $(top_srcdir)/include/grub/compiler-rt.h -+@COND_i386_pc_TRUE@am__append_5796 = $(top_builddir)/include/grub/machine/kernel.h \ - @COND_i386_pc_TRUE@ $(top_builddir)/include/grub/machine/pxe.h \ - @COND_i386_pc_TRUE@ $(top_builddir)/include/grub/machine/int.h \ - @COND_i386_pc_TRUE@ $(top_srcdir)/include/grub/i386/tsc.h --@COND_i386_xen_pvh_TRUE@am__append_5804 = $(top_builddir)/include/grub/machine/kernel.h \ -+@COND_i386_xen_pvh_TRUE@am__append_5797 = $(top_builddir)/include/grub/machine/kernel.h \ - @COND_i386_xen_pvh_TRUE@ $(top_builddir)/include/grub/machine/int.h \ - @COND_i386_xen_pvh_TRUE@ $(top_srcdir)/include/grub/i386/tsc.h \ - @COND_i386_xen_pvh_TRUE@ $(top_srcdir)/include/grub/terminfo.h \ -@@ -7834,14 +7824,14 @@ TESTS = - @COND_i386_xen_pvh_TRUE@ $(top_srcdir)/include/grub/lib/arg.h \ - @COND_i386_xen_pvh_TRUE@ $(top_srcdir)/include/grub/xen.h \ - @COND_i386_xen_pvh_TRUE@ $(top_srcdir)/include/grub/i386/xen/hypercall.h --@COND_i386_efi_TRUE@am__append_5805 = $(top_builddir)/include/grub/machine/kernel.h \ -+@COND_i386_efi_TRUE@am__append_5798 = $(top_builddir)/include/grub/machine/kernel.h \ - @COND_i386_efi_TRUE@ $(top_srcdir)/include/grub/efi/efi.h \ - @COND_i386_efi_TRUE@ $(top_srcdir)/include/grub/efi/disk.h \ - @COND_i386_efi_TRUE@ $(top_srcdir)/include/grub/i386/tsc.h \ - @COND_i386_efi_TRUE@ $(top_srcdir)/include/grub/acpi.h \ - @COND_i386_efi_TRUE@ $(top_srcdir)/include/grub/pci.h \ - @COND_i386_efi_TRUE@ $(top_srcdir)/include/grub/i386/pmtimer.h --@COND_i386_coreboot_TRUE@am__append_5806 = $(top_builddir)/include/grub/machine/kernel.h \ -+@COND_i386_coreboot_TRUE@am__append_5799 = $(top_builddir)/include/grub/machine/kernel.h \ - @COND_i386_coreboot_TRUE@ $(top_srcdir)/include/grub/i386/tsc.h \ - @COND_i386_coreboot_TRUE@ $(top_srcdir)/include/grub/coreboot/lbio.h \ - @COND_i386_coreboot_TRUE@ $(top_srcdir)/include/grub/video.h \ -@@ -7850,56 +7840,56 @@ TESTS = - @COND_i386_coreboot_TRUE@ $(top_srcdir)/include/grub/font.h \ - @COND_i386_coreboot_TRUE@ $(top_srcdir)/include/grub/bufio.h \ - @COND_i386_coreboot_TRUE@ $(top_srcdir)/include/grub/acpi.h --@COND_i386_multiboot_TRUE@am__append_5807 = $(top_builddir)/include/grub/machine/kernel.h \ -+@COND_i386_multiboot_TRUE@am__append_5800 = $(top_builddir)/include/grub/machine/kernel.h \ - @COND_i386_multiboot_TRUE@ $(top_srcdir)/include/grub/i386/tsc.h \ - @COND_i386_multiboot_TRUE@ $(top_srcdir)/include/grub/acpi.h --@COND_i386_qemu_TRUE@am__append_5808 = \ -+@COND_i386_qemu_TRUE@am__append_5801 = \ - @COND_i386_qemu_TRUE@ $(top_srcdir)/include/grub/pci.h \ - @COND_i386_qemu_TRUE@ $(top_srcdir)/include/grub/i386/tsc.h --@COND_i386_ieee1275_TRUE@am__append_5809 = $(top_builddir)/include/grub/machine/kernel.h \ -+@COND_i386_ieee1275_TRUE@am__append_5802 = $(top_builddir)/include/grub/machine/kernel.h \ - @COND_i386_ieee1275_TRUE@ $(top_srcdir)/include/grub/ieee1275/ieee1275.h \ - @COND_i386_ieee1275_TRUE@ $(top_srcdir)/include/grub/terminfo.h \ - @COND_i386_ieee1275_TRUE@ $(top_srcdir)/include/grub/extcmd.h \ - @COND_i386_ieee1275_TRUE@ $(top_srcdir)/include/grub/lib/arg.h \ - @COND_i386_ieee1275_TRUE@ $(top_srcdir)/include/grub/i386/tsc.h --@COND_i386_xen_TRUE@am__append_5810 = $(top_builddir)/include/grub/machine/kernel.h \ -+@COND_i386_xen_TRUE@am__append_5803 = $(top_builddir)/include/grub/machine/kernel.h \ - @COND_i386_xen_TRUE@ $(top_srcdir)/include/grub/xen.h \ - @COND_i386_xen_TRUE@ $(top_srcdir)/include/grub/i386/xen/hypercall.h \ - @COND_i386_xen_TRUE@ $(top_srcdir)/include/grub/terminfo.h \ - @COND_i386_xen_TRUE@ $(top_srcdir)/include/grub/extcmd.h \ - @COND_i386_xen_TRUE@ $(top_srcdir)/include/grub/lib/arg.h \ - @COND_i386_xen_TRUE@ $(top_srcdir)/include/grub/loader.h --@COND_x86_64_xen_TRUE@am__append_5811 = \ -+@COND_x86_64_xen_TRUE@am__append_5804 = \ - @COND_x86_64_xen_TRUE@ $(top_srcdir)/include/grub/xen.h \ - @COND_x86_64_xen_TRUE@ $(top_srcdir)/include/grub/x86_64/xen/hypercall.h \ - @COND_x86_64_xen_TRUE@ $(top_srcdir)/include/grub/terminfo.h \ - @COND_x86_64_xen_TRUE@ $(top_srcdir)/include/grub/extcmd.h \ - @COND_x86_64_xen_TRUE@ $(top_srcdir)/include/grub/lib/arg.h \ - @COND_x86_64_xen_TRUE@ $(top_srcdir)/include/grub/loader.h --@COND_x86_64_efi_TRUE@am__append_5812 = $(top_builddir)/include/grub/machine/kernel.h \ -+@COND_x86_64_efi_TRUE@am__append_5805 = $(top_builddir)/include/grub/machine/kernel.h \ - @COND_x86_64_efi_TRUE@ $(top_srcdir)/include/grub/efi/efi.h \ - @COND_x86_64_efi_TRUE@ $(top_srcdir)/include/grub/efi/disk.h \ - @COND_x86_64_efi_TRUE@ $(top_srcdir)/include/grub/i386/tsc.h \ - @COND_x86_64_efi_TRUE@ $(top_srcdir)/include/grub/pci.h \ - @COND_x86_64_efi_TRUE@ $(top_srcdir)/include/grub/acpi.h \ - @COND_x86_64_efi_TRUE@ $(top_srcdir)/include/grub/i386/pmtimer.h --@COND_ia64_efi_TRUE@am__append_5813 = \ -+@COND_ia64_efi_TRUE@am__append_5806 = \ - @COND_ia64_efi_TRUE@ $(top_srcdir)/include/grub/efi/efi.h \ - @COND_ia64_efi_TRUE@ $(top_srcdir)/include/grub/efi/disk.h \ - @COND_ia64_efi_TRUE@ $(top_srcdir)/include/grub/acpi.h --@COND_mips_TRUE@am__append_5814 = $(top_builddir)/include/grub/cpu/kernel.h --@COND_mips_arc_TRUE@am__append_5815 = \ -+@COND_mips_TRUE@am__append_5807 = $(top_builddir)/include/grub/cpu/kernel.h -+@COND_mips_arc_TRUE@am__append_5808 = \ - @COND_mips_arc_TRUE@ $(top_srcdir)/include/grub/extcmd.h \ - @COND_mips_arc_TRUE@ $(top_srcdir)/include/grub/arc/arc.h \ - @COND_mips_arc_TRUE@ $(top_srcdir)/include/grub/terminfo.h --@COND_mips_qemu_mips_TRUE@am__append_5816 = $(top_builddir)/include/grub/keyboard_layouts.h \ -+@COND_mips_qemu_mips_TRUE@am__append_5809 = $(top_builddir)/include/grub/keyboard_layouts.h \ - @COND_mips_qemu_mips_TRUE@ $(top_builddir)/include/grub/machine/kernel.h \ - @COND_mips_qemu_mips_TRUE@ $(top_srcdir)/include/grub/serial.h \ - @COND_mips_qemu_mips_TRUE@ $(top_srcdir)/include/grub/loader.h \ - @COND_mips_qemu_mips_TRUE@ $(top_srcdir)/include/grub/terminfo.h \ - @COND_mips_qemu_mips_TRUE@ $(top_srcdir)/include/grub/extcmd.h \ - @COND_mips_qemu_mips_TRUE@ $(top_srcdir)/include/grub/lib/arg.h --@COND_mips_loongson_TRUE@am__append_5817 = $(top_builddir)/include/grub/keyboard_layouts.h \ -+@COND_mips_loongson_TRUE@am__append_5810 = $(top_builddir)/include/grub/keyboard_layouts.h \ - @COND_mips_loongson_TRUE@ $(top_builddir)/include/grub/machine/kernel.h \ - @COND_mips_loongson_TRUE@ $(top_builddir)/include/grub/machine/time.h \ - @COND_mips_loongson_TRUE@ $(top_srcdir)/include/grub/video.h \ -@@ -7915,24 +7905,24 @@ TESTS = - @COND_mips_loongson_TRUE@ $(top_srcdir)/include/grub/terminfo.h \ - @COND_mips_loongson_TRUE@ $(top_srcdir)/include/grub/extcmd.h \ - @COND_mips_loongson_TRUE@ $(top_srcdir)/include/grub/lib/arg.h --@COND_mips_qemu_mips_TRUE@am__append_5818 = $(top_builddir)/include/grub/machine/memory.h \ -+@COND_mips_qemu_mips_TRUE@am__append_5811 = $(top_builddir)/include/grub/machine/memory.h \ - @COND_mips_qemu_mips_TRUE@ $(top_builddir)/include/grub/machine/kernel.h --@COND_powerpc_ieee1275_TRUE@am__append_5819 = $(top_srcdir)/include/grub/ieee1275/ieee1275.h \ -+@COND_powerpc_ieee1275_TRUE@am__append_5812 = $(top_srcdir)/include/grub/ieee1275/ieee1275.h \ - @COND_powerpc_ieee1275_TRUE@ $(top_srcdir)/include/grub/terminfo.h \ - @COND_powerpc_ieee1275_TRUE@ $(top_srcdir)/include/grub/extcmd.h \ - @COND_powerpc_ieee1275_TRUE@ $(top_srcdir)/include/grub/lib/arg.h --@COND_sparc64_ieee1275_TRUE@am__append_5820 = $(top_srcdir)/include/grub/ieee1275/ieee1275.h \ -+@COND_sparc64_ieee1275_TRUE@am__append_5813 = $(top_srcdir)/include/grub/ieee1275/ieee1275.h \ - @COND_sparc64_ieee1275_TRUE@ $(top_srcdir)/include/grub/sparc64/ieee1275/ieee1275.h \ - @COND_sparc64_ieee1275_TRUE@ $(top_srcdir)/include/grub/terminfo.h \ - @COND_sparc64_ieee1275_TRUE@ $(top_srcdir)/include/grub/extcmd.h \ - @COND_sparc64_ieee1275_TRUE@ $(top_srcdir)/include/grub/lib/arg.h --@COND_arm_uboot_TRUE@am__append_5821 = \ -+@COND_arm_uboot_TRUE@am__append_5814 = \ - @COND_arm_uboot_TRUE@ $(top_srcdir)/include/grub/uboot/uboot.h \ - @COND_arm_uboot_TRUE@ $(top_srcdir)/include/grub/uboot/disk.h \ - @COND_arm_uboot_TRUE@ $(top_srcdir)/include/grub/extcmd.h \ - @COND_arm_uboot_TRUE@ $(top_srcdir)/include/grub/lib/arg.h \ - @COND_arm_uboot_TRUE@ $(top_srcdir)/include/grub/arm/system.h --@COND_arm_coreboot_TRUE@am__append_5822 = $(top_builddir)/include/grub/keyboard_layouts.h \ -+@COND_arm_coreboot_TRUE@am__append_5815 = $(top_builddir)/include/grub/keyboard_layouts.h \ - @COND_arm_coreboot_TRUE@ $(top_srcdir)/include/grub/arm/system.h \ - @COND_arm_coreboot_TRUE@ $(top_srcdir)/include/grub/video.h \ - @COND_arm_coreboot_TRUE@ $(top_srcdir)/include/grub/video_fb.h \ -@@ -7943,35 +7933,35 @@ TESTS = - @COND_arm_coreboot_TRUE@ $(top_srcdir)/include/grub/dma.h \ - @COND_arm_coreboot_TRUE@ $(top_srcdir)/include/grub/arm/coreboot/kernel.h \ - @COND_arm_coreboot_TRUE@ $(top_srcdir)/include/grub/fdtbus.h --@COND_arm_efi_TRUE@am__append_5823 = \ -+@COND_arm_efi_TRUE@am__append_5816 = \ - @COND_arm_efi_TRUE@ $(top_srcdir)/include/grub/efi/efi.h \ - @COND_arm_efi_TRUE@ $(top_srcdir)/include/grub/efi/disk.h \ - @COND_arm_efi_TRUE@ $(top_srcdir)/include/grub/arm/system.h \ - @COND_arm_efi_TRUE@ $(top_srcdir)/include/grub/acpi.h --@COND_arm64_efi_TRUE@am__append_5824 = \ -+@COND_arm64_efi_TRUE@am__append_5817 = \ - @COND_arm64_efi_TRUE@ $(top_srcdir)/include/grub/efi/efi.h \ - @COND_arm64_efi_TRUE@ $(top_srcdir)/include/grub/efi/disk.h \ - @COND_arm64_efi_TRUE@ $(top_srcdir)/include/grub/acpi.h --@COND_riscv32_efi_TRUE@am__append_5825 = \ -+@COND_riscv32_efi_TRUE@am__append_5818 = \ - @COND_riscv32_efi_TRUE@ $(top_srcdir)/include/grub/efi/efi.h \ - @COND_riscv32_efi_TRUE@ $(top_srcdir)/include/grub/efi/disk.h \ - @COND_riscv32_efi_TRUE@ $(top_srcdir)/include/grub/acpi.h --@COND_riscv64_efi_TRUE@am__append_5826 = \ -+@COND_riscv64_efi_TRUE@am__append_5819 = \ - @COND_riscv64_efi_TRUE@ $(top_srcdir)/include/grub/efi/efi.h \ - @COND_riscv64_efi_TRUE@ $(top_srcdir)/include/grub/efi/disk.h \ - @COND_riscv64_efi_TRUE@ $(top_srcdir)/include/grub/acpi.h --@COND_emu_TRUE@am__append_5827 = \ -+@COND_emu_TRUE@am__append_5820 = \ - @COND_emu_TRUE@ $(top_srcdir)/include/grub/datetime.h \ - @COND_emu_TRUE@ $(top_srcdir)/include/grub/emu/misc.h \ - @COND_emu_TRUE@ $(top_srcdir)/include/grub/emu/net.h \ - @COND_emu_TRUE@ $(top_srcdir)/include/grub/emu/hostdisk.h \ - @COND_emu_TRUE@ $(top_srcdir)/include/grub/emu/hostfile.h \ - @COND_emu_TRUE@ $(top_srcdir)/include/grub/extcmd.h --@COND_GRUB_EMU_SDL_TRUE@@COND_emu_TRUE@am__append_5828 = $(top_srcdir)/include/grub/sdl.h --@COND_GRUB_EMU_PCI_TRUE@@COND_emu_TRUE@am__append_5829 = $(top_srcdir)/include/grub/libpciaccess.h --@COND_emu_TRUE@am__append_5830 = grub_emu_init.h grub_emu_init.c --@COND_ENABLE_EFIEMU_TRUE@am__append_5831 = efiemu32.o efiemu64.o --@COND_ENABLE_EFIEMU_TRUE@am__append_5832 = efiemu32.o efiemu64.o efiemu64_c.o efiemu64_s.o -+@COND_GRUB_EMU_SDL_TRUE@@COND_emu_TRUE@am__append_5821 = $(top_srcdir)/include/grub/sdl.h -+@COND_GRUB_EMU_PCI_TRUE@@COND_emu_TRUE@am__append_5822 = $(top_srcdir)/include/grub/libpciaccess.h -+@COND_emu_TRUE@am__append_5823 = grub_emu_init.h grub_emu_init.c -+@COND_ENABLE_EFIEMU_TRUE@am__append_5824 = efiemu32.o efiemu64.o -+@COND_ENABLE_EFIEMU_TRUE@am__append_5825 = efiemu32.o efiemu64.o efiemu64_c.o efiemu64_s.o - subdir = grub-core - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ -@@ -8380,591 +8370,590 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(platformdir)" \ - @COND_arm_coreboot_TRUE@am__EXEEXT_290 = reboot.module$(EXEEXT) - @COND_riscv32_efi_TRUE@am__EXEEXT_291 = reboot.module$(EXEEXT) - @COND_riscv64_efi_TRUE@am__EXEEXT_292 = reboot.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_293 = shim_lock.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_294 = hdparm.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_295 = hdparm.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_296 = hdparm.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_297 = hdparm.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_298 = hdparm.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_299 = hdparm.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_300 = hdparm.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__EXEEXT_301 = hdparm.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__EXEEXT_302 = hdparm.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_303 = loadbios.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_304 = loadbios.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_305 = lspci.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_306 = lspci.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_307 = lspci.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_308 = lspci.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_309 = lspci.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_310 = lspci.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_311 = lspci.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__EXEEXT_312 = lspci.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_313 = play.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_314 = play.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_315 = play.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_316 = play.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_317 = play.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_318 = play.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_319 = play.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_320 = spkmodem.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_321 = spkmodem.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_322 = spkmodem.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_323 = spkmodem.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_324 = spkmodem.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_325 = spkmodem.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_326 = spkmodem.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_327 = morse.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_328 = morse.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_329 = morse.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_330 = morse.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_331 = morse.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_332 = morse.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_333 = morse.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_334 = setpci.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_335 = setpci.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_336 = setpci.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_337 = setpci.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_338 = setpci.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_339 = setpci.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_340 = setpci.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__EXEEXT_341 = setpci.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_342 = pcidump.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_343 = pcidump.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_344 = pcidump.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_345 = pcidump.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_346 = pcidump.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_347 = pcidump.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_348 = pcidump.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__EXEEXT_349 = pcidump.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_350 = suspend.module$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__EXEEXT_351 = suspend.module$(EXEEXT) \ -+@COND_i386_pc_TRUE@am__EXEEXT_293 = hdparm.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_294 = hdparm.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_295 = hdparm.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_296 = hdparm.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_297 = hdparm.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_298 = hdparm.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_299 = hdparm.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__EXEEXT_300 = hdparm.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__EXEEXT_301 = hdparm.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_302 = loadbios.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_303 = loadbios.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_304 = lspci.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_305 = lspci.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_306 = lspci.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_307 = lspci.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_308 = lspci.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_309 = lspci.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_310 = lspci.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__EXEEXT_311 = lspci.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_312 = play.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_313 = play.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_314 = play.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_315 = play.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_316 = play.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_317 = play.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_318 = play.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_319 = spkmodem.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_320 = spkmodem.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_321 = spkmodem.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_322 = spkmodem.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_323 = spkmodem.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_324 = spkmodem.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_325 = spkmodem.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_326 = morse.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_327 = morse.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_328 = morse.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_329 = morse.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_330 = morse.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_331 = morse.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_332 = morse.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_333 = setpci.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_334 = setpci.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_335 = setpci.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_336 = setpci.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_337 = setpci.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_338 = setpci.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_339 = setpci.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__EXEEXT_340 = setpci.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_341 = pcidump.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_342 = pcidump.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_343 = pcidump.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_344 = pcidump.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_345 = pcidump.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_346 = pcidump.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_347 = pcidump.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__EXEEXT_348 = pcidump.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_349 = suspend.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__EXEEXT_350 = suspend.module$(EXEEXT) \ - @COND_powerpc_ieee1275_TRUE@ escc.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_352 = usbtest.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_353 = usbtest.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_354 = usbtest.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_355 = usbtest.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_356 = usbtest.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_357 = usbtest.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_358 = usbtest.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__EXEEXT_359 = usbtest.module$(EXEEXT) --@COND_arm_coreboot_TRUE@am__EXEEXT_360 = usbtest.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_361 = ata.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_362 = ata.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_363 = ata.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_364 = ata.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_365 = ata.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_366 = ata.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_367 = ata.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__EXEEXT_368 = ata.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__EXEEXT_369 = ata.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_370 = ahci.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_371 = ahci.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_372 = ahci.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_373 = ahci.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_374 = ahci.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_375 = ahci.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_376 = ahci.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__EXEEXT_377 = ahci.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_378 = pata.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_379 = pata.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_380 = pata.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_381 = pata.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_382 = pata.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_383 = pata.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_384 = pata.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__EXEEXT_385 = pata.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__EXEEXT_386 = pata.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_387 = biosdisk.module$(EXEEXT) \ -+@COND_i386_pc_TRUE@am__EXEEXT_351 = usbtest.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_352 = usbtest.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_353 = usbtest.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_354 = usbtest.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_355 = usbtest.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_356 = usbtest.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_357 = usbtest.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__EXEEXT_358 = usbtest.module$(EXEEXT) -+@COND_arm_coreboot_TRUE@am__EXEEXT_359 = usbtest.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_360 = ata.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_361 = ata.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_362 = ata.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_363 = ata.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_364 = ata.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_365 = ata.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_366 = ata.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__EXEEXT_367 = ata.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__EXEEXT_368 = ata.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_369 = ahci.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_370 = ahci.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_371 = ahci.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_372 = ahci.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_373 = ahci.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_374 = ahci.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_375 = ahci.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__EXEEXT_376 = ahci.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_377 = pata.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_378 = pata.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_379 = pata.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_380 = pata.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_381 = pata.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_382 = pata.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_383 = pata.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__EXEEXT_384 = pata.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__EXEEXT_385 = pata.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_386 = biosdisk.module$(EXEEXT) \ - @COND_i386_pc_TRUE@ usbms.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_388 = usbms.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_389 = usbms.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_390 = usbms.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_391 = usbms.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_392 = usbms.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_393 = usbms.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__EXEEXT_394 = usbms.module$(EXEEXT) --@COND_arm_coreboot_TRUE@am__EXEEXT_395 = usbms.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_396 = nand.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_397 = efiemu.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_398 = efiemu.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_399 = efiemu.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_400 = efiemu.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_401 = efiemu.module$(EXEEXT) --@COND_emu_TRUE@am__EXEEXT_402 = font.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_403 = font.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_404 = font.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_405 = font.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_406 = font.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_407 = font.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_408 = font.module$(EXEEXT) --@COND_i386_xen_TRUE@am__EXEEXT_409 = font.module$(EXEEXT) --@COND_x86_64_xen_TRUE@am__EXEEXT_410 = font.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__EXEEXT_411 = font.module$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@am__EXEEXT_412 = font.module$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__EXEEXT_413 = font.module$(EXEEXT) --@COND_mips_arc_TRUE@am__EXEEXT_414 = font.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__EXEEXT_415 = font.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__EXEEXT_416 = font.module$(EXEEXT) --@COND_arm_uboot_TRUE@am__EXEEXT_417 = font.module$(EXEEXT) --@COND_arm_efi_TRUE@am__EXEEXT_418 = font.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__EXEEXT_419 = font.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__EXEEXT_420 = font.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__EXEEXT_421 = font.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_422 = pxe.module$(EXEEXT) --@COND_emu_TRUE@am__EXEEXT_423 = bufio.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_424 = bufio.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_425 = bufio.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_426 = bufio.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_427 = bufio.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_428 = bufio.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_429 = bufio.module$(EXEEXT) --@COND_i386_xen_TRUE@am__EXEEXT_430 = bufio.module$(EXEEXT) --@COND_x86_64_xen_TRUE@am__EXEEXT_431 = bufio.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__EXEEXT_432 = bufio.module$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@am__EXEEXT_433 = bufio.module$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__EXEEXT_434 = bufio.module$(EXEEXT) --@COND_mips_arc_TRUE@am__EXEEXT_435 = bufio.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__EXEEXT_436 = bufio.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__EXEEXT_437 = bufio.module$(EXEEXT) --@COND_arm_uboot_TRUE@am__EXEEXT_438 = bufio.module$(EXEEXT) --@COND_arm_efi_TRUE@am__EXEEXT_439 = bufio.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__EXEEXT_440 = bufio.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__EXEEXT_441 = bufio.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__EXEEXT_442 = bufio.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_443 = relocator.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_444 = relocator.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_445 = relocator.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_446 = relocator.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_447 = relocator.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_448 = relocator.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_449 = relocator.module$(EXEEXT) --@COND_i386_xen_TRUE@am__EXEEXT_450 = relocator.module$(EXEEXT) --@COND_x86_64_xen_TRUE@am__EXEEXT_451 = relocator.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__EXEEXT_452 = relocator.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__EXEEXT_453 = relocator.module$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__EXEEXT_454 = \ -+@COND_i386_efi_TRUE@am__EXEEXT_387 = usbms.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_388 = usbms.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_389 = usbms.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_390 = usbms.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_391 = usbms.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_392 = usbms.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__EXEEXT_393 = usbms.module$(EXEEXT) -+@COND_arm_coreboot_TRUE@am__EXEEXT_394 = usbms.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_395 = nand.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_396 = efiemu.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_397 = efiemu.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_398 = efiemu.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_399 = efiemu.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_400 = efiemu.module$(EXEEXT) -+@COND_emu_TRUE@am__EXEEXT_401 = font.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_402 = font.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_403 = font.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_404 = font.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_405 = font.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_406 = font.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_407 = font.module$(EXEEXT) -+@COND_i386_xen_TRUE@am__EXEEXT_408 = font.module$(EXEEXT) -+@COND_x86_64_xen_TRUE@am__EXEEXT_409 = font.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__EXEEXT_410 = font.module$(EXEEXT) -+@COND_sparc64_ieee1275_TRUE@am__EXEEXT_411 = font.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__EXEEXT_412 = font.module$(EXEEXT) -+@COND_mips_arc_TRUE@am__EXEEXT_413 = font.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__EXEEXT_414 = font.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__EXEEXT_415 = font.module$(EXEEXT) -+@COND_arm_uboot_TRUE@am__EXEEXT_416 = font.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__EXEEXT_417 = font.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__EXEEXT_418 = font.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__EXEEXT_419 = font.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__EXEEXT_420 = font.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_421 = pxe.module$(EXEEXT) -+@COND_emu_TRUE@am__EXEEXT_422 = bufio.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_423 = bufio.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_424 = bufio.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_425 = bufio.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_426 = bufio.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_427 = bufio.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_428 = bufio.module$(EXEEXT) -+@COND_i386_xen_TRUE@am__EXEEXT_429 = bufio.module$(EXEEXT) -+@COND_x86_64_xen_TRUE@am__EXEEXT_430 = bufio.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__EXEEXT_431 = bufio.module$(EXEEXT) -+@COND_sparc64_ieee1275_TRUE@am__EXEEXT_432 = bufio.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__EXEEXT_433 = bufio.module$(EXEEXT) -+@COND_mips_arc_TRUE@am__EXEEXT_434 = bufio.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__EXEEXT_435 = bufio.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__EXEEXT_436 = bufio.module$(EXEEXT) -+@COND_arm_uboot_TRUE@am__EXEEXT_437 = bufio.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__EXEEXT_438 = bufio.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__EXEEXT_439 = bufio.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__EXEEXT_440 = bufio.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__EXEEXT_441 = bufio.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_442 = relocator.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_443 = relocator.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_444 = relocator.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_445 = relocator.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_446 = relocator.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_447 = relocator.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_448 = relocator.module$(EXEEXT) -+@COND_i386_xen_TRUE@am__EXEEXT_449 = relocator.module$(EXEEXT) -+@COND_x86_64_xen_TRUE@am__EXEEXT_450 = relocator.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__EXEEXT_451 = relocator.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__EXEEXT_452 = relocator.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__EXEEXT_453 = \ - @COND_powerpc_ieee1275_TRUE@ relocator.module$(EXEEXT) --@COND_mips_arc_TRUE@am__EXEEXT_455 = relocator.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__EXEEXT_456 = relocator.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_457 = datetime.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_458 = datetime.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_459 = datetime.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_460 = datetime.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_461 = datetime.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_462 = datetime.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_463 = datetime.module$(EXEEXT) --@COND_i386_xen_TRUE@am__EXEEXT_464 = datetime.module$(EXEEXT) --@COND_x86_64_xen_TRUE@am__EXEEXT_465 = datetime.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__EXEEXT_466 = datetime.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__EXEEXT_467 = datetime.module$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@am__EXEEXT_468 = datetime.module$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__EXEEXT_469 = datetime.module$(EXEEXT) --@COND_mips_arc_TRUE@am__EXEEXT_470 = datetime.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__EXEEXT_471 = datetime.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__EXEEXT_472 = datetime.module$(EXEEXT) --@COND_arm_uboot_TRUE@am__EXEEXT_473 = datetime.module$(EXEEXT) --@COND_arm_efi_TRUE@am__EXEEXT_474 = datetime.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__EXEEXT_475 = datetime.module$(EXEEXT) --@COND_arm_coreboot_TRUE@am__EXEEXT_476 = datetime.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__EXEEXT_477 = datetime.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__EXEEXT_478 = datetime.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_479 = aout.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_480 = aout.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_481 = aout.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_482 = aout.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_483 = aout.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_484 = aout.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_485 = aout.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_486 = bsd.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_487 = bsd.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_488 = bsd.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_489 = bsd.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_490 = bsd.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_491 = bsd.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_492 = bsd.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_493 = plan9.module$(EXEEXT) \ -+@COND_mips_arc_TRUE@am__EXEEXT_454 = relocator.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__EXEEXT_455 = relocator.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_456 = datetime.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_457 = datetime.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_458 = datetime.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_459 = datetime.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_460 = datetime.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_461 = datetime.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_462 = datetime.module$(EXEEXT) -+@COND_i386_xen_TRUE@am__EXEEXT_463 = datetime.module$(EXEEXT) -+@COND_x86_64_xen_TRUE@am__EXEEXT_464 = datetime.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__EXEEXT_465 = datetime.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__EXEEXT_466 = datetime.module$(EXEEXT) -+@COND_sparc64_ieee1275_TRUE@am__EXEEXT_467 = datetime.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__EXEEXT_468 = datetime.module$(EXEEXT) -+@COND_mips_arc_TRUE@am__EXEEXT_469 = datetime.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__EXEEXT_470 = datetime.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__EXEEXT_471 = datetime.module$(EXEEXT) -+@COND_arm_uboot_TRUE@am__EXEEXT_472 = datetime.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__EXEEXT_473 = datetime.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__EXEEXT_474 = datetime.module$(EXEEXT) -+@COND_arm_coreboot_TRUE@am__EXEEXT_475 = datetime.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__EXEEXT_476 = datetime.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__EXEEXT_477 = datetime.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_478 = aout.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_479 = aout.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_480 = aout.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_481 = aout.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_482 = aout.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_483 = aout.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_484 = aout.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_485 = bsd.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_486 = bsd.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_487 = bsd.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_488 = bsd.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_489 = bsd.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_490 = bsd.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_491 = bsd.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_492 = plan9.module$(EXEEXT) \ - @COND_i386_pc_TRUE@ linux16.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_494 = linux16.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_495 = linux16.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_496 = linux16.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_497 = linux16.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_498 = linux16.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_499 = linux16.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_500 = ntldr.module$(EXEEXT) \ -+@COND_i386_efi_TRUE@am__EXEEXT_493 = linux16.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_494 = linux16.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_495 = linux16.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_496 = linux16.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_497 = linux16.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_498 = linux16.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_499 = ntldr.module$(EXEEXT) \ - @COND_i386_pc_TRUE@ truecrypt.module$(EXEEXT) \ - @COND_i386_pc_TRUE@ freedos.module$(EXEEXT) \ - @COND_i386_pc_TRUE@ pxechain.module$(EXEEXT) \ - @COND_i386_pc_TRUE@ multiboot2.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_501 = multiboot2.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_502 = multiboot2.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_503 = multiboot2.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_504 = multiboot2.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_505 = multiboot2.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_506 = multiboot2.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__EXEEXT_507 = multiboot2.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__EXEEXT_508 = multiboot2.module$(EXEEXT) --@COND_mips_arc_TRUE@am__EXEEXT_509 = multiboot2.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__EXEEXT_510 = multiboot2.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_511 = multiboot.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_512 = multiboot.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_513 = multiboot.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_514 = multiboot.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_515 = multiboot.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_516 = multiboot.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_517 = multiboot.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__EXEEXT_518 = multiboot.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__EXEEXT_519 = xen_boot.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_520 = linux.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_521 = linux.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_522 = linux.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_523 = linux.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_524 = linux.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_525 = linux.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_526 = linux.module$(EXEEXT) --@COND_i386_xen_TRUE@am__EXEEXT_527 = linux.module$(EXEEXT) --@COND_x86_64_xen_TRUE@am__EXEEXT_528 = linux.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__EXEEXT_529 = linux.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__EXEEXT_530 = linux.module$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@am__EXEEXT_531 = linux.module$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__EXEEXT_532 = linux.module$(EXEEXT) --@COND_mips_arc_TRUE@am__EXEEXT_533 = linux.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__EXEEXT_534 = linux.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__EXEEXT_535 = linux.module$(EXEEXT) --@COND_arm_uboot_TRUE@am__EXEEXT_536 = linux.module$(EXEEXT) --@COND_arm_efi_TRUE@am__EXEEXT_537 = linux.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__EXEEXT_538 = linux.module$(EXEEXT) --@COND_arm_coreboot_TRUE@am__EXEEXT_539 = linux.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__EXEEXT_540 = linux.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__EXEEXT_541 = linux.module$(EXEEXT) --@COND_arm_uboot_TRUE@am__EXEEXT_542 = fdt.module$(EXEEXT) --@COND_arm_efi_TRUE@am__EXEEXT_543 = fdt.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__EXEEXT_544 = fdt.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__EXEEXT_545 = fdt.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__EXEEXT_546 = fdt.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_547 = xnu.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_548 = xnu.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_549 = xnu.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_550 = xnu.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_551 = xnu.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_552 = random.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_553 = random.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_554 = random.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_555 = random.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_556 = random.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_557 = appleldr.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_558 = appleldr.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_559 = chain.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_560 = chain.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_561 = chain.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_562 = chain.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__EXEEXT_563 = chain.module$(EXEEXT) --@COND_arm_efi_TRUE@am__EXEEXT_564 = chain.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__EXEEXT_565 = chain.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__EXEEXT_566 = chain.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__EXEEXT_567 = chain.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_568 = mmap.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_569 = mmap.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_570 = mmap.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_571 = mmap.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_572 = mmap.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_573 = mmap.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_574 = mmap.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__EXEEXT_575 = mmap.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__EXEEXT_576 = mmap.module$(EXEEXT) --@COND_mips_arc_TRUE@am__EXEEXT_577 = mmap.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__EXEEXT_578 = mmap.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__EXEEXT_579 = mmap.module$(EXEEXT) --@COND_arm_efi_TRUE@am__EXEEXT_580 = mmap.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__EXEEXT_581 = mmap.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__EXEEXT_582 = mmap.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__EXEEXT_583 = mmap.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_584 = at_keyboard.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_585 = at_keyboard.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_586 = at_keyboard.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_587 = at_keyboard.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_588 = \ -+@COND_i386_efi_TRUE@am__EXEEXT_500 = multiboot2.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_501 = multiboot2.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_502 = multiboot2.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_503 = multiboot2.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_504 = multiboot2.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_505 = multiboot2.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__EXEEXT_506 = multiboot2.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__EXEEXT_507 = multiboot2.module$(EXEEXT) -+@COND_mips_arc_TRUE@am__EXEEXT_508 = multiboot2.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__EXEEXT_509 = multiboot2.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_510 = multiboot.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_511 = multiboot.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_512 = multiboot.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_513 = multiboot.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_514 = multiboot.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_515 = multiboot.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_516 = multiboot.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__EXEEXT_517 = multiboot.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__EXEEXT_518 = xen_boot.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_519 = linux.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_520 = linux.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_521 = linux.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_522 = linux.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_523 = linux.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_524 = linux.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_525 = linux.module$(EXEEXT) -+@COND_i386_xen_TRUE@am__EXEEXT_526 = linux.module$(EXEEXT) -+@COND_x86_64_xen_TRUE@am__EXEEXT_527 = linux.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__EXEEXT_528 = linux.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__EXEEXT_529 = linux.module$(EXEEXT) -+@COND_sparc64_ieee1275_TRUE@am__EXEEXT_530 = linux.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__EXEEXT_531 = linux.module$(EXEEXT) -+@COND_mips_arc_TRUE@am__EXEEXT_532 = linux.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__EXEEXT_533 = linux.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__EXEEXT_534 = linux.module$(EXEEXT) -+@COND_arm_uboot_TRUE@am__EXEEXT_535 = linux.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__EXEEXT_536 = linux.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__EXEEXT_537 = linux.module$(EXEEXT) -+@COND_arm_coreboot_TRUE@am__EXEEXT_538 = linux.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__EXEEXT_539 = linux.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__EXEEXT_540 = linux.module$(EXEEXT) -+@COND_arm_uboot_TRUE@am__EXEEXT_541 = fdt.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__EXEEXT_542 = fdt.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__EXEEXT_543 = fdt.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__EXEEXT_544 = fdt.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__EXEEXT_545 = fdt.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_546 = xnu.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_547 = xnu.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_548 = xnu.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_549 = xnu.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_550 = xnu.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_551 = random.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_552 = random.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_553 = random.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_554 = random.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_555 = random.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_556 = appleldr.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_557 = appleldr.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_558 = chain.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_559 = chain.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_560 = chain.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_561 = chain.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__EXEEXT_562 = chain.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__EXEEXT_563 = chain.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__EXEEXT_564 = chain.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__EXEEXT_565 = chain.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__EXEEXT_566 = chain.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_567 = mmap.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_568 = mmap.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_569 = mmap.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_570 = mmap.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_571 = mmap.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_572 = mmap.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_573 = mmap.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__EXEEXT_574 = mmap.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__EXEEXT_575 = mmap.module$(EXEEXT) -+@COND_mips_arc_TRUE@am__EXEEXT_576 = mmap.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__EXEEXT_577 = mmap.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__EXEEXT_578 = mmap.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__EXEEXT_579 = mmap.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__EXEEXT_580 = mmap.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__EXEEXT_581 = mmap.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__EXEEXT_582 = mmap.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_583 = at_keyboard.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_584 = at_keyboard.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_585 = at_keyboard.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_586 = at_keyboard.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_587 = \ - @COND_i386_multiboot_TRUE@ at_keyboard.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_589 = at_keyboard.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_590 = at_keyboard.module$(EXEEXT) --@COND_emu_TRUE@am__EXEEXT_591 = gfxterm.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_592 = gfxterm.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_593 = gfxterm.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_594 = gfxterm.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_595 = gfxterm.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_596 = gfxterm.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_597 = gfxterm.module$(EXEEXT) --@COND_i386_xen_TRUE@am__EXEEXT_598 = gfxterm.module$(EXEEXT) --@COND_x86_64_xen_TRUE@am__EXEEXT_599 = gfxterm.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__EXEEXT_600 = gfxterm.module$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@am__EXEEXT_601 = gfxterm.module$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__EXEEXT_602 = gfxterm.module$(EXEEXT) --@COND_mips_arc_TRUE@am__EXEEXT_603 = gfxterm.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__EXEEXT_604 = gfxterm.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__EXEEXT_605 = gfxterm.module$(EXEEXT) --@COND_arm_uboot_TRUE@am__EXEEXT_606 = gfxterm.module$(EXEEXT) --@COND_arm_efi_TRUE@am__EXEEXT_607 = gfxterm.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__EXEEXT_608 = gfxterm.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__EXEEXT_609 = gfxterm.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__EXEEXT_610 = gfxterm.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_611 = serial.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_612 = serial.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_613 = serial.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_614 = serial.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_615 = serial.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_616 = serial.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_617 = serial.module$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@am__EXEEXT_618 = serial.module$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__EXEEXT_619 = serial.module$(EXEEXT) --@COND_mips_arc_TRUE@am__EXEEXT_620 = serial.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__EXEEXT_621 = serial.module$(EXEEXT) --@COND_arm_efi_TRUE@am__EXEEXT_622 = serial.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__EXEEXT_623 = serial.module$(EXEEXT) --@COND_arm_coreboot_TRUE@am__EXEEXT_624 = serial.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__EXEEXT_625 = serial.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__EXEEXT_626 = serial.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_627 = sendkey.module$(EXEEXT) \ -+@COND_i386_ieee1275_TRUE@am__EXEEXT_588 = at_keyboard.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_589 = at_keyboard.module$(EXEEXT) -+@COND_emu_TRUE@am__EXEEXT_590 = gfxterm.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_591 = gfxterm.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_592 = gfxterm.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_593 = gfxterm.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_594 = gfxterm.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_595 = gfxterm.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_596 = gfxterm.module$(EXEEXT) -+@COND_i386_xen_TRUE@am__EXEEXT_597 = gfxterm.module$(EXEEXT) -+@COND_x86_64_xen_TRUE@am__EXEEXT_598 = gfxterm.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__EXEEXT_599 = gfxterm.module$(EXEEXT) -+@COND_sparc64_ieee1275_TRUE@am__EXEEXT_600 = gfxterm.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__EXEEXT_601 = gfxterm.module$(EXEEXT) -+@COND_mips_arc_TRUE@am__EXEEXT_602 = gfxterm.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__EXEEXT_603 = gfxterm.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__EXEEXT_604 = gfxterm.module$(EXEEXT) -+@COND_arm_uboot_TRUE@am__EXEEXT_605 = gfxterm.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__EXEEXT_606 = gfxterm.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__EXEEXT_607 = gfxterm.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__EXEEXT_608 = gfxterm.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__EXEEXT_609 = gfxterm.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_610 = serial.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_611 = serial.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_612 = serial.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_613 = serial.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_614 = serial.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_615 = serial.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_616 = serial.module$(EXEEXT) -+@COND_sparc64_ieee1275_TRUE@am__EXEEXT_617 = serial.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__EXEEXT_618 = serial.module$(EXEEXT) -+@COND_mips_arc_TRUE@am__EXEEXT_619 = serial.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__EXEEXT_620 = serial.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__EXEEXT_621 = serial.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__EXEEXT_622 = serial.module$(EXEEXT) -+@COND_arm_coreboot_TRUE@am__EXEEXT_623 = serial.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__EXEEXT_624 = serial.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__EXEEXT_625 = serial.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_626 = sendkey.module$(EXEEXT) \ - @COND_i386_pc_TRUE@ terminfo.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_628 = terminfo.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_629 = terminfo.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_630 = terminfo.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_631 = terminfo.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_632 = terminfo.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__EXEEXT_633 = terminfo.module$(EXEEXT) --@COND_arm_efi_TRUE@am__EXEEXT_634 = terminfo.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__EXEEXT_635 = terminfo.module$(EXEEXT) --@COND_arm_coreboot_TRUE@am__EXEEXT_636 = terminfo.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__EXEEXT_637 = terminfo.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__EXEEXT_638 = terminfo.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_639 = usb_keyboard.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_640 = usb_keyboard.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_641 = usb_keyboard.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_642 = \ -+@COND_i386_efi_TRUE@am__EXEEXT_627 = terminfo.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_628 = terminfo.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_629 = terminfo.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_630 = terminfo.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_631 = terminfo.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__EXEEXT_632 = terminfo.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__EXEEXT_633 = terminfo.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__EXEEXT_634 = terminfo.module$(EXEEXT) -+@COND_arm_coreboot_TRUE@am__EXEEXT_635 = terminfo.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__EXEEXT_636 = terminfo.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__EXEEXT_637 = terminfo.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_638 = usb_keyboard.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_639 = usb_keyboard.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_640 = usb_keyboard.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_641 = \ - @COND_i386_coreboot_TRUE@ usb_keyboard.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_643 = \ -+@COND_i386_multiboot_TRUE@am__EXEEXT_642 = \ - @COND_i386_multiboot_TRUE@ usb_keyboard.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_644 = \ -+@COND_i386_ieee1275_TRUE@am__EXEEXT_643 = \ - @COND_i386_ieee1275_TRUE@ usb_keyboard.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_645 = usb_keyboard.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__EXEEXT_646 = \ -+@COND_x86_64_efi_TRUE@am__EXEEXT_644 = usb_keyboard.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__EXEEXT_645 = \ - @COND_mips_loongson_TRUE@ usb_keyboard.module$(EXEEXT) --@COND_arm_coreboot_TRUE@am__EXEEXT_647 = usb_keyboard.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_648 = vga.module$(EXEEXT) \ -+@COND_arm_coreboot_TRUE@am__EXEEXT_646 = usb_keyboard.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_647 = vga.module$(EXEEXT) \ - @COND_i386_pc_TRUE@ vga_text.module$(EXEEXT) \ - @COND_i386_pc_TRUE@ mda_text.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_649 = mda_text.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_650 = mda_text.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_651 = mda_text.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_652 = video_cirrus.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_653 = video_cirrus.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_654 = video_cirrus.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_655 = \ -+@COND_i386_qemu_TRUE@am__EXEEXT_648 = mda_text.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_649 = mda_text.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_650 = mda_text.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_651 = video_cirrus.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_652 = video_cirrus.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_653 = video_cirrus.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_654 = \ - @COND_i386_coreboot_TRUE@ video_cirrus.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_656 = \ -+@COND_i386_multiboot_TRUE@am__EXEEXT_655 = \ - @COND_i386_multiboot_TRUE@ video_cirrus.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_657 = \ -+@COND_i386_ieee1275_TRUE@am__EXEEXT_656 = \ - @COND_i386_ieee1275_TRUE@ video_cirrus.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_658 = video_cirrus.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_659 = video_bochs.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_660 = video_bochs.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_661 = video_bochs.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_662 = video_bochs.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_663 = \ -+@COND_x86_64_efi_TRUE@am__EXEEXT_657 = video_cirrus.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_658 = video_bochs.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_659 = video_bochs.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_660 = video_bochs.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_661 = video_bochs.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_662 = \ - @COND_i386_multiboot_TRUE@ video_bochs.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_664 = video_bochs.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_665 = video_bochs.module$(EXEEXT) --@COND_emu_TRUE@am__EXEEXT_666 = legacy_password_test.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_667 = \ -+@COND_i386_ieee1275_TRUE@am__EXEEXT_663 = video_bochs.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_664 = video_bochs.module$(EXEEXT) -+@COND_emu_TRUE@am__EXEEXT_665 = legacy_password_test.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_666 = \ - @COND_i386_pc_TRUE@ legacy_password_test.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_668 = \ -+@COND_i386_efi_TRUE@am__EXEEXT_667 = \ - @COND_i386_efi_TRUE@ legacy_password_test.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_669 = \ -+@COND_x86_64_efi_TRUE@am__EXEEXT_668 = \ - @COND_x86_64_efi_TRUE@ legacy_password_test.module$(EXEEXT) --@COND_i386_xen_TRUE@am__EXEEXT_670 = \ -+@COND_i386_xen_TRUE@am__EXEEXT_669 = \ - @COND_i386_xen_TRUE@ legacy_password_test.module$(EXEEXT) --@COND_x86_64_xen_TRUE@am__EXEEXT_671 = \ -+@COND_x86_64_xen_TRUE@am__EXEEXT_670 = \ - @COND_x86_64_xen_TRUE@ legacy_password_test.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__EXEEXT_672 = \ -+@COND_i386_xen_pvh_TRUE@am__EXEEXT_671 = \ - @COND_i386_xen_pvh_TRUE@ legacy_password_test.module$(EXEEXT) --@COND_emu_TRUE@am__EXEEXT_673 = div.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_674 = div.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_675 = div.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_676 = div.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_677 = div.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_678 = div.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_679 = div.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_680 = div.module$(EXEEXT) --@COND_i386_xen_TRUE@am__EXEEXT_681 = div.module$(EXEEXT) --@COND_x86_64_xen_TRUE@am__EXEEXT_682 = div.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__EXEEXT_683 = div.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__EXEEXT_684 = div.module$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@am__EXEEXT_685 = div.module$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__EXEEXT_686 = div.module$(EXEEXT) --@COND_mips_arc_TRUE@am__EXEEXT_687 = div.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__EXEEXT_688 = div.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__EXEEXT_689 = div.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__EXEEXT_690 = div.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_691 = efi_gop.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_692 = efi_gop.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__EXEEXT_693 = efi_gop.module$(EXEEXT) --@COND_arm_efi_TRUE@am__EXEEXT_694 = efi_gop.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__EXEEXT_695 = efi_gop.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__EXEEXT_696 = efi_gop.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__EXEEXT_697 = efi_gop.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_698 = efi_uga.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_699 = efi_uga.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_700 = vbe.module$(EXEEXT) --@COND_emu_TRUE@am__EXEEXT_701 = video_fb.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_702 = video_fb.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_703 = video_fb.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_704 = video_fb.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_705 = video_fb.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_706 = video_fb.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_707 = video_fb.module$(EXEEXT) --@COND_i386_xen_TRUE@am__EXEEXT_708 = video_fb.module$(EXEEXT) --@COND_x86_64_xen_TRUE@am__EXEEXT_709 = video_fb.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__EXEEXT_710 = video_fb.module$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@am__EXEEXT_711 = video_fb.module$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__EXEEXT_712 = video_fb.module$(EXEEXT) --@COND_mips_arc_TRUE@am__EXEEXT_713 = video_fb.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__EXEEXT_714 = video_fb.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__EXEEXT_715 = video_fb.module$(EXEEXT) --@COND_arm_uboot_TRUE@am__EXEEXT_716 = video_fb.module$(EXEEXT) --@COND_arm_efi_TRUE@am__EXEEXT_717 = video_fb.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__EXEEXT_718 = video_fb.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__EXEEXT_719 = video_fb.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__EXEEXT_720 = video_fb.module$(EXEEXT) --@COND_emu_TRUE@am__EXEEXT_721 = video.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_722 = video.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_723 = video.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_724 = video.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_725 = video.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_726 = video.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_727 = video.module$(EXEEXT) --@COND_i386_xen_TRUE@am__EXEEXT_728 = video.module$(EXEEXT) --@COND_x86_64_xen_TRUE@am__EXEEXT_729 = video.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__EXEEXT_730 = video.module$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@am__EXEEXT_731 = video.module$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__EXEEXT_732 = video.module$(EXEEXT) --@COND_mips_arc_TRUE@am__EXEEXT_733 = video.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__EXEEXT_734 = video.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__EXEEXT_735 = video.module$(EXEEXT) --@COND_arm_uboot_TRUE@am__EXEEXT_736 = video.module$(EXEEXT) --@COND_arm_efi_TRUE@am__EXEEXT_737 = video.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__EXEEXT_738 = video.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__EXEEXT_739 = video.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__EXEEXT_740 = video.module$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__EXEEXT_741 = \ -+@COND_emu_TRUE@am__EXEEXT_672 = div.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_673 = div.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_674 = div.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_675 = div.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_676 = div.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_677 = div.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_678 = div.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_679 = div.module$(EXEEXT) -+@COND_i386_xen_TRUE@am__EXEEXT_680 = div.module$(EXEEXT) -+@COND_x86_64_xen_TRUE@am__EXEEXT_681 = div.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__EXEEXT_682 = div.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__EXEEXT_683 = div.module$(EXEEXT) -+@COND_sparc64_ieee1275_TRUE@am__EXEEXT_684 = div.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__EXEEXT_685 = div.module$(EXEEXT) -+@COND_mips_arc_TRUE@am__EXEEXT_686 = div.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__EXEEXT_687 = div.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__EXEEXT_688 = div.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__EXEEXT_689 = div.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_690 = efi_gop.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_691 = efi_gop.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__EXEEXT_692 = efi_gop.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__EXEEXT_693 = efi_gop.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__EXEEXT_694 = efi_gop.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__EXEEXT_695 = efi_gop.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__EXEEXT_696 = efi_gop.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_697 = efi_uga.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_698 = efi_uga.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_699 = vbe.module$(EXEEXT) -+@COND_emu_TRUE@am__EXEEXT_700 = video_fb.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_701 = video_fb.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_702 = video_fb.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_703 = video_fb.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_704 = video_fb.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_705 = video_fb.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_706 = video_fb.module$(EXEEXT) -+@COND_i386_xen_TRUE@am__EXEEXT_707 = video_fb.module$(EXEEXT) -+@COND_x86_64_xen_TRUE@am__EXEEXT_708 = video_fb.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__EXEEXT_709 = video_fb.module$(EXEEXT) -+@COND_sparc64_ieee1275_TRUE@am__EXEEXT_710 = video_fb.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__EXEEXT_711 = video_fb.module$(EXEEXT) -+@COND_mips_arc_TRUE@am__EXEEXT_712 = video_fb.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__EXEEXT_713 = video_fb.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__EXEEXT_714 = video_fb.module$(EXEEXT) -+@COND_arm_uboot_TRUE@am__EXEEXT_715 = video_fb.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__EXEEXT_716 = video_fb.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__EXEEXT_717 = video_fb.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__EXEEXT_718 = video_fb.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__EXEEXT_719 = video_fb.module$(EXEEXT) -+@COND_emu_TRUE@am__EXEEXT_720 = video.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_721 = video.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_722 = video.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_723 = video.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_724 = video.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_725 = video.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_726 = video.module$(EXEEXT) -+@COND_i386_xen_TRUE@am__EXEEXT_727 = video.module$(EXEEXT) -+@COND_x86_64_xen_TRUE@am__EXEEXT_728 = video.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__EXEEXT_729 = video.module$(EXEEXT) -+@COND_sparc64_ieee1275_TRUE@am__EXEEXT_730 = video.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__EXEEXT_731 = video.module$(EXEEXT) -+@COND_mips_arc_TRUE@am__EXEEXT_732 = video.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__EXEEXT_733 = video.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__EXEEXT_734 = video.module$(EXEEXT) -+@COND_arm_uboot_TRUE@am__EXEEXT_735 = video.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__EXEEXT_736 = video.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__EXEEXT_737 = video.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__EXEEXT_738 = video.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__EXEEXT_739 = video.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__EXEEXT_740 = \ - @COND_powerpc_ieee1275_TRUE@ ieee1275_fb.module$(EXEEXT) --@COND_GRUB_EMU_SDL_TRUE@@COND_emu_TRUE@am__EXEEXT_742 = \ -+@COND_GRUB_EMU_SDL_TRUE@@COND_emu_TRUE@am__EXEEXT_741 = \ - @COND_GRUB_EMU_SDL_TRUE@@COND_emu_TRUE@ sdl.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_743 = ofnet.module$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@am__EXEEXT_744 = ofnet.module$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__EXEEXT_745 = ofnet.module$(EXEEXT) --@COND_arm_uboot_TRUE@am__EXEEXT_746 = ubootnet.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_747 = efinet.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_748 = efinet.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__EXEEXT_749 = efinet.module$(EXEEXT) --@COND_arm_efi_TRUE@am__EXEEXT_750 = efinet.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__EXEEXT_751 = efinet.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__EXEEXT_752 = efinet.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__EXEEXT_753 = efinet.module$(EXEEXT) --@COND_emu_TRUE@am__EXEEXT_754 = emunet.module$(EXEEXT) \ -+@COND_i386_ieee1275_TRUE@am__EXEEXT_742 = ofnet.module$(EXEEXT) -+@COND_sparc64_ieee1275_TRUE@am__EXEEXT_743 = ofnet.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__EXEEXT_744 = ofnet.module$(EXEEXT) -+@COND_arm_uboot_TRUE@am__EXEEXT_745 = ubootnet.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_746 = efinet.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_747 = efinet.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__EXEEXT_748 = efinet.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__EXEEXT_749 = efinet.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__EXEEXT_750 = efinet.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__EXEEXT_751 = efinet.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__EXEEXT_752 = efinet.module$(EXEEXT) -+@COND_emu_TRUE@am__EXEEXT_753 = emunet.module$(EXEEXT) \ - @COND_emu_TRUE@ legacycfg.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_755 = legacycfg.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_756 = legacycfg.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_757 = legacycfg.module$(EXEEXT) --@COND_i386_xen_TRUE@am__EXEEXT_758 = legacycfg.module$(EXEEXT) --@COND_x86_64_xen_TRUE@am__EXEEXT_759 = legacycfg.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__EXEEXT_760 = legacycfg.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_761 = backtrace.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_762 = backtrace.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_763 = backtrace.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_764 = backtrace.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_765 = backtrace.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_766 = backtrace.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_767 = backtrace.module$(EXEEXT) --@COND_i386_xen_TRUE@am__EXEEXT_768 = backtrace.module$(EXEEXT) --@COND_x86_64_xen_TRUE@am__EXEEXT_769 = backtrace.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__EXEEXT_770 = backtrace.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_771 = lsapm.module$(EXEEXT) \ -+@COND_i386_pc_TRUE@am__EXEEXT_754 = legacycfg.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_755 = legacycfg.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_756 = legacycfg.module$(EXEEXT) -+@COND_i386_xen_TRUE@am__EXEEXT_757 = legacycfg.module$(EXEEXT) -+@COND_x86_64_xen_TRUE@am__EXEEXT_758 = legacycfg.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__EXEEXT_759 = legacycfg.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_760 = backtrace.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_761 = backtrace.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_762 = backtrace.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_763 = backtrace.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_764 = backtrace.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_765 = backtrace.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_766 = backtrace.module$(EXEEXT) -+@COND_i386_xen_TRUE@am__EXEEXT_767 = backtrace.module$(EXEEXT) -+@COND_x86_64_xen_TRUE@am__EXEEXT_768 = backtrace.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__EXEEXT_769 = backtrace.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_770 = lsapm.module$(EXEEXT) \ - @COND_i386_pc_TRUE@ keylayouts.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_772 = keylayouts.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_773 = keylayouts.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_774 = keylayouts.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_775 = keylayouts.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_776 = keylayouts.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_777 = keylayouts.module$(EXEEXT) --@COND_ENABLE_CACHE_STATS_TRUE@am__EXEEXT_778 = \ -+@COND_i386_efi_TRUE@am__EXEEXT_771 = keylayouts.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_772 = keylayouts.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_773 = keylayouts.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_774 = keylayouts.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_775 = keylayouts.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_776 = keylayouts.module$(EXEEXT) -+@COND_ENABLE_CACHE_STATS_TRUE@am__EXEEXT_777 = \ - @COND_ENABLE_CACHE_STATS_TRUE@ cacheinfo.module$(EXEEXT) --@COND_ENABLE_BOOT_TIME_STATS_TRUE@am__EXEEXT_779 = \ -+@COND_ENABLE_BOOT_TIME_STATS_TRUE@am__EXEEXT_778 = \ - @COND_ENABLE_BOOT_TIME_STATS_TRUE@ boottime.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_780 = gdb.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_781 = gdb.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_782 = gdb.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_783 = gdb.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_784 = gdb.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_785 = gdb.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_786 = tpm.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_787 = rdmsr.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_788 = rdmsr.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_789 = rdmsr.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_790 = rdmsr.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_791 = rdmsr.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_792 = rdmsr.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_793 = rdmsr.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_794 = wrmsr.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_795 = wrmsr.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_796 = wrmsr.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_797 = wrmsr.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_798 = wrmsr.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_799 = wrmsr.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_800 = wrmsr.module$(EXEEXT) --@COND_emu_TRUE@am__EXEEXT_801 = kernel.exec$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_802 = kernel.exec$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_803 = kernel.exec$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_804 = kernel.exec$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_805 = kernel.exec$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_806 = kernel.exec$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_807 = kernel.exec$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_808 = kernel.exec$(EXEEXT) --@COND_i386_xen_TRUE@am__EXEEXT_809 = kernel.exec$(EXEEXT) --@COND_x86_64_xen_TRUE@am__EXEEXT_810 = kernel.exec$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__EXEEXT_811 = kernel.exec$(EXEEXT) --@COND_mips_loongson_TRUE@am__EXEEXT_812 = kernel.exec$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@am__EXEEXT_813 = kernel.exec$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__EXEEXT_814 = kernel.exec$(EXEEXT) --@COND_mips_arc_TRUE@am__EXEEXT_815 = kernel.exec$(EXEEXT) --@COND_ia64_efi_TRUE@am__EXEEXT_816 = kernel.exec$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__EXEEXT_817 = kernel.exec$(EXEEXT) --@COND_arm_uboot_TRUE@am__EXEEXT_818 = kernel.exec$(EXEEXT) --@COND_arm_efi_TRUE@am__EXEEXT_819 = kernel.exec$(EXEEXT) --@COND_arm64_efi_TRUE@am__EXEEXT_820 = kernel.exec$(EXEEXT) --@COND_arm_coreboot_TRUE@am__EXEEXT_821 = kernel.exec$(EXEEXT) --@COND_riscv32_efi_TRUE@am__EXEEXT_822 = kernel.exec$(EXEEXT) --@COND_riscv64_efi_TRUE@am__EXEEXT_823 = kernel.exec$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_824 = boot.image$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_825 = boot.image$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@am__EXEEXT_826 = boot.image$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_827 = boot_hybrid.image$(EXEEXT) \ -+@COND_i386_pc_TRUE@am__EXEEXT_779 = gdb.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_780 = gdb.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_781 = gdb.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_782 = gdb.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_783 = gdb.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_784 = gdb.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_785 = tpm.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_786 = rdmsr.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_787 = rdmsr.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_788 = rdmsr.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_789 = rdmsr.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_790 = rdmsr.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_791 = rdmsr.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_792 = rdmsr.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_793 = wrmsr.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_794 = wrmsr.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_795 = wrmsr.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_796 = wrmsr.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_797 = wrmsr.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_798 = wrmsr.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_799 = wrmsr.module$(EXEEXT) -+@COND_emu_TRUE@am__EXEEXT_800 = kernel.exec$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_801 = kernel.exec$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_802 = kernel.exec$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_803 = kernel.exec$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_804 = kernel.exec$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_805 = kernel.exec$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_806 = kernel.exec$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_807 = kernel.exec$(EXEEXT) -+@COND_i386_xen_TRUE@am__EXEEXT_808 = kernel.exec$(EXEEXT) -+@COND_x86_64_xen_TRUE@am__EXEEXT_809 = kernel.exec$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__EXEEXT_810 = kernel.exec$(EXEEXT) -+@COND_mips_loongson_TRUE@am__EXEEXT_811 = kernel.exec$(EXEEXT) -+@COND_sparc64_ieee1275_TRUE@am__EXEEXT_812 = kernel.exec$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__EXEEXT_813 = kernel.exec$(EXEEXT) -+@COND_mips_arc_TRUE@am__EXEEXT_814 = kernel.exec$(EXEEXT) -+@COND_ia64_efi_TRUE@am__EXEEXT_815 = kernel.exec$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__EXEEXT_816 = kernel.exec$(EXEEXT) -+@COND_arm_uboot_TRUE@am__EXEEXT_817 = kernel.exec$(EXEEXT) -+@COND_arm_efi_TRUE@am__EXEEXT_818 = kernel.exec$(EXEEXT) -+@COND_arm64_efi_TRUE@am__EXEEXT_819 = kernel.exec$(EXEEXT) -+@COND_arm_coreboot_TRUE@am__EXEEXT_820 = kernel.exec$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__EXEEXT_821 = kernel.exec$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__EXEEXT_822 = kernel.exec$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_823 = boot.image$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_824 = boot.image$(EXEEXT) -+@COND_sparc64_ieee1275_TRUE@am__EXEEXT_825 = boot.image$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_826 = boot_hybrid.image$(EXEEXT) \ - @COND_i386_pc_TRUE@ cdboot.image$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@am__EXEEXT_828 = cdboot.image$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_829 = pxeboot.image$(EXEEXT) \ -+@COND_sparc64_ieee1275_TRUE@am__EXEEXT_827 = cdboot.image$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_828 = pxeboot.image$(EXEEXT) \ - @COND_i386_pc_TRUE@ diskboot.image$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@am__EXEEXT_830 = diskboot.image$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_831 = lnxboot.image$(EXEEXT) --@COND_mips_loongson_TRUE@am__EXEEXT_832 = \ -+@COND_sparc64_ieee1275_TRUE@am__EXEEXT_829 = diskboot.image$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_830 = lnxboot.image$(EXEEXT) -+@COND_mips_loongson_TRUE@am__EXEEXT_831 = \ - @COND_mips_loongson_TRUE@ xz_decompress.image$(EXEEXT) --@COND_mips_arc_TRUE@am__EXEEXT_833 = xz_decompress.image$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__EXEEXT_834 = \ -+@COND_mips_arc_TRUE@am__EXEEXT_832 = xz_decompress.image$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__EXEEXT_833 = \ - @COND_mips_qemu_mips_TRUE@ xz_decompress.image$(EXEEXT) --@COND_mips_loongson_TRUE@am__EXEEXT_835 = \ -+@COND_mips_loongson_TRUE@am__EXEEXT_834 = \ - @COND_mips_loongson_TRUE@ none_decompress.image$(EXEEXT) --@COND_mips_arc_TRUE@am__EXEEXT_836 = none_decompress.image$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__EXEEXT_837 = \ -+@COND_mips_arc_TRUE@am__EXEEXT_835 = none_decompress.image$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__EXEEXT_836 = \ - @COND_mips_qemu_mips_TRUE@ none_decompress.image$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_838 = lzma_decompress.image$(EXEEXT) --@COND_mips_loongson_TRUE@am__EXEEXT_839 = fwstart.image$(EXEEXT) \ -+@COND_i386_pc_TRUE@am__EXEEXT_837 = lzma_decompress.image$(EXEEXT) -+@COND_mips_loongson_TRUE@am__EXEEXT_838 = fwstart.image$(EXEEXT) \ - @COND_mips_loongson_TRUE@ fwstart_fuloong2f.image$(EXEEXT) - PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) $(platform_PROGRAMS) \ - $(sbin_PROGRAMS) -@@ -12775,13 +12764,6 @@ shift_test_module_OBJECTS = $(am_shift_test_module_OBJECTS) \ - $(nodist_shift_test_module_OBJECTS) - shift_test_module_LINK = $(CCLD) $(shift_test_module_CFLAGS) $(CFLAGS) \ - $(shift_test_module_LDFLAGS) $(LDFLAGS) -o $@ --am__shim_lock_module_SOURCES_DIST = commands/efi/shim_lock.c --@COND_x86_64_efi_TRUE@am_shim_lock_module_OBJECTS = commands/efi/shim_lock_module-shim_lock.$(OBJEXT) --nodist_shim_lock_module_OBJECTS = --shim_lock_module_OBJECTS = $(am_shim_lock_module_OBJECTS) \ -- $(nodist_shim_lock_module_OBJECTS) --shim_lock_module_LINK = $(CCLD) $(shim_lock_module_CFLAGS) $(CFLAGS) \ -- $(shim_lock_module_LDFLAGS) $(LDFLAGS) -o $@ - am_signature_test_module_OBJECTS = \ - tests/signature_test_module-signature_test.$(OBJEXT) - nodist_signature_test_module_OBJECTS = -@@ -13847,7 +13829,6 @@ SOURCES = $(acpi_module_SOURCES) $(nodist_acpi_module_SOURCES) \ - $(nodist_setpci_module_SOURCES) $(sfs_module_SOURCES) \ - $(nodist_sfs_module_SOURCES) $(shift_test_module_SOURCES) \ - $(nodist_shift_test_module_SOURCES) \ -- $(shim_lock_module_SOURCES) $(nodist_shim_lock_module_SOURCES) \ - $(signature_test_module_SOURCES) \ - $(nodist_signature_test_module_SOURCES) \ - $(sleep_module_SOURCES) $(nodist_sleep_module_SOURCES) \ -@@ -14078,10 +14059,8 @@ DIST_SOURCES = $(am__acpi_module_SOURCES_DIST) \ - $(am__serial_module_SOURCES_DIST) $(setjmp_module_SOURCES) \ - $(setjmp_test_module_SOURCES) \ - $(am__setpci_module_SOURCES_DIST) $(sfs_module_SOURCES) \ -- $(shift_test_module_SOURCES) \ -- $(am__shim_lock_module_SOURCES_DIST) \ -- $(signature_test_module_SOURCES) $(sleep_module_SOURCES) \ -- $(sleep_test_module_SOURCES) \ -+ $(shift_test_module_SOURCES) $(signature_test_module_SOURCES) \ -+ $(sleep_module_SOURCES) $(sleep_test_module_SOURCES) \ - $(am__spkmodem_module_SOURCES_DIST) $(squash4_module_SOURCES) \ - $(strtoull_test_module_SOURCES) \ - $(am__suspend_module_SOURCES_DIST) \ -@@ -15514,56 +15493,55 @@ MOD_FILES = disk.mod trig.mod $(am__append_8) $(am__append_15) \ - $(am__append_2045) $(am__append_2052) $(am__append_2059) \ - $(am__append_2066) $(am__append_2073) $(am__append_2080) \ - $(am__append_2087) $(am__append_2094) $(am__append_2101) \ -- $(am__append_2108) help.mod hexdump.mod keystatus.mod \ -- $(am__append_2115) $(am__append_2122) loadenv.mod ls.mod \ -- lsmmap.mod $(am__append_2129) $(am__append_2136) \ -+ help.mod hexdump.mod keystatus.mod $(am__append_2108) \ -+ $(am__append_2115) loadenv.mod ls.mod lsmmap.mod \ -+ $(am__append_2122) $(am__append_2129) $(am__append_2136) \ - $(am__append_2143) $(am__append_2150) $(am__append_2157) \ -- $(am__append_2164) $(am__append_2171) $(am__append_2178) \ -- memrw.mod minicmd.mod parttool.mod password.mod \ -- password_pbkdf2.mod $(am__append_2185) $(am__append_2192) \ -+ $(am__append_2164) $(am__append_2171) memrw.mod minicmd.mod \ -+ parttool.mod password.mod password_pbkdf2.mod \ -+ $(am__append_2178) $(am__append_2185) $(am__append_2192) \ - $(am__append_2199) $(am__append_2206) $(am__append_2213) \ - $(am__append_2220) $(am__append_2227) $(am__append_2234) \ - $(am__append_2241) $(am__append_2248) $(am__append_2255) \ - $(am__append_2262) $(am__append_2269) $(am__append_2276) \ - $(am__append_2283) $(am__append_2290) $(am__append_2297) \ - $(am__append_2304) $(am__append_2311) $(am__append_2318) \ -- $(am__append_2325) probe.mod read.mod search.mod \ -- search_fs_file.mod search_fs_uuid.mod search_label.mod \ -+ probe.mod read.mod search.mod search_fs_file.mod \ -+ search_fs_uuid.mod search_label.mod $(am__append_2325) \ - $(am__append_2332) $(am__append_2339) $(am__append_2346) \ - $(am__append_2353) $(am__append_2360) $(am__append_2367) \ - $(am__append_2374) $(am__append_2381) $(am__append_2388) \ - $(am__append_2395) $(am__append_2402) $(am__append_2409) \ - $(am__append_2416) $(am__append_2423) $(am__append_2430) \ -- $(am__append_2437) sleep.mod $(am__append_2444) \ -- $(am__append_2451) terminal.mod test.mod true.mod \ -- $(am__append_2458) $(am__append_2465) $(am__append_2472) \ -- $(am__append_2479) $(am__append_2486) $(am__append_2493) \ -- $(am__append_2500) $(am__append_2507) $(am__append_2514) \ -- videoinfo.mod videotest.mod xnu_uuid.mod dm_nv.mod \ -- loopback.mod cryptodisk.mod luks.mod geli.mod lvm.mod ldm.mod \ -- mdraid09.mod mdraid09_be.mod mdraid1x.mod diskfilter.mod \ -- raid5rec.mod raid6rec.mod scsi.mod memdisk.mod \ -- $(am__append_2521) $(am__append_2528) $(am__append_2535) \ -- $(am__append_2542) $(am__append_2549) $(am__append_2556) \ -- $(am__append_2563) $(am__append_2570) $(am__append_2577) \ -- $(am__append_2584) $(am__append_2591) $(am__append_2598) \ -- $(am__append_2605) $(am__append_2612) $(am__append_2619) \ -- $(am__append_2626) $(am__append_2633) $(am__append_2640) \ -- $(am__append_2647) $(am__append_2654) $(am__append_2661) \ -- $(am__append_2668) $(am__append_2675) $(am__append_2682) \ -- $(am__append_2689) $(am__append_2696) $(am__append_2703) \ -- $(am__append_2710) $(am__append_2717) $(am__append_2724) \ -- $(am__append_2731) $(am__append_2738) $(am__append_2745) \ -- $(am__append_2752) $(am__append_2759) $(am__append_2766) \ -- $(am__append_2773) $(am__append_2780) $(am__append_2787) \ -- $(am__append_2794) $(am__append_2801) $(am__append_2808) \ -- $(am__append_2815) $(am__append_2822) $(am__append_2829) \ -- $(am__append_2836) $(am__append_2843) $(am__append_2850) \ -- $(am__append_2857) $(am__append_2864) $(am__append_2871) \ -- $(am__append_2878) $(am__append_2885) $(am__append_2892) \ -- $(am__append_2899) $(am__append_2906) $(am__append_2913) \ -- $(am__append_2920) $(am__append_2927) $(am__append_2934) \ -- $(am__append_2941) procfs.mod affs.mod afs.mod bfs.mod \ -+ sleep.mod $(am__append_2437) $(am__append_2444) terminal.mod \ -+ test.mod true.mod $(am__append_2451) $(am__append_2458) \ -+ $(am__append_2465) $(am__append_2472) $(am__append_2479) \ -+ $(am__append_2486) $(am__append_2493) $(am__append_2500) \ -+ $(am__append_2507) videoinfo.mod videotest.mod xnu_uuid.mod \ -+ dm_nv.mod loopback.mod cryptodisk.mod luks.mod geli.mod \ -+ lvm.mod ldm.mod mdraid09.mod mdraid09_be.mod mdraid1x.mod \ -+ diskfilter.mod raid5rec.mod raid6rec.mod scsi.mod memdisk.mod \ -+ $(am__append_2514) $(am__append_2521) $(am__append_2528) \ -+ $(am__append_2535) $(am__append_2542) $(am__append_2549) \ -+ $(am__append_2556) $(am__append_2563) $(am__append_2570) \ -+ $(am__append_2577) $(am__append_2584) $(am__append_2591) \ -+ $(am__append_2598) $(am__append_2605) $(am__append_2612) \ -+ $(am__append_2619) $(am__append_2626) $(am__append_2633) \ -+ $(am__append_2640) $(am__append_2647) $(am__append_2654) \ -+ $(am__append_2661) $(am__append_2668) $(am__append_2675) \ -+ $(am__append_2682) $(am__append_2689) $(am__append_2696) \ -+ $(am__append_2703) $(am__append_2710) $(am__append_2717) \ -+ $(am__append_2724) $(am__append_2731) $(am__append_2738) \ -+ $(am__append_2745) $(am__append_2752) $(am__append_2759) \ -+ $(am__append_2766) $(am__append_2773) $(am__append_2780) \ -+ $(am__append_2787) $(am__append_2794) $(am__append_2801) \ -+ $(am__append_2808) $(am__append_2815) $(am__append_2822) \ -+ $(am__append_2829) $(am__append_2836) $(am__append_2843) \ -+ $(am__append_2850) $(am__append_2857) $(am__append_2864) \ -+ $(am__append_2871) $(am__append_2878) $(am__append_2885) \ -+ $(am__append_2892) $(am__append_2899) $(am__append_2906) \ -+ $(am__append_2913) $(am__append_2920) $(am__append_2927) \ -+ $(am__append_2934) procfs.mod affs.mod afs.mod bfs.mod \ - zstd.mod btrfs.mod archelp.mod cbfs.mod cpio.mod cpio_be.mod \ - newc.mod odc.mod ext2.mod fat.mod exfat.mod f2fs.mod \ - fshelp.mod hfs.mod hfsplus.mod hfspluscomp.mod iso9660.mod \ -@@ -15571,150 +15549,150 @@ MOD_FILES = disk.mod trig.mod $(am__append_8) $(am__append_15) \ - minix2_be.mod minix3_be.mod nilfs2.mod ntfs.mod ntfscomp.mod \ - reiserfs.mod romfs.mod sfs.mod squash4.mod tar.mod udf.mod \ - ufs1.mod ufs1_be.mod ufs2.mod xfs.mod zfs.mod zfscrypt.mod \ -- zfsinfo.mod macbless.mod $(am__append_2948) gettext.mod \ -- gfxmenu.mod hello.mod gzio.mod offsetio.mod $(am__append_2955) \ -- $(am__append_2962) $(am__append_2969) $(am__append_2976) \ -- $(am__append_2983) $(am__append_2990) $(am__append_2997) \ -- $(am__append_3004) $(am__append_3011) $(am__append_3018) \ -- $(am__append_3025) $(am__append_3032) $(am__append_3039) \ -- $(am__append_3046) $(am__append_3053) $(am__append_3060) \ -- $(am__append_3067) $(am__append_3074) $(am__append_3081) \ -- $(am__append_3088) elf.mod crypto.mod pbkdf2.mod \ -- $(am__append_3095) $(am__append_3102) $(am__append_3109) \ -- $(am__append_3116) $(am__append_3123) $(am__append_3130) \ -- $(am__append_3137) $(am__append_3144) $(am__append_3151) \ -- $(am__append_3158) $(am__append_3165) $(am__append_3172) \ -- $(am__append_3179) $(am__append_3186) $(am__append_3193) \ -- $(am__append_3200) $(am__append_3207) $(am__append_3214) \ -- $(am__append_3221) $(am__append_3228) $(am__append_3235) \ -- $(am__append_3242) $(am__append_3249) $(am__append_3256) \ -- $(am__append_3263) $(am__append_3270) $(am__append_3277) \ -- $(am__append_3284) $(am__append_3291) $(am__append_3298) \ -- $(am__append_3305) $(am__append_3312) $(am__append_3319) \ -- $(am__append_3326) $(am__append_3333) $(am__append_3340) \ -- setjmp.mod $(am__append_3347) $(am__append_3354) \ -- $(am__append_3361) $(am__append_3368) $(am__append_3375) \ -- $(am__append_3382) $(am__append_3389) $(am__append_3396) \ -- $(am__append_3403) $(am__append_3410) $(am__append_3417) \ -- $(am__append_3424) $(am__append_3431) $(am__append_3438) \ -- $(am__append_3445) $(am__append_3452) $(am__append_3459) \ -- $(am__append_3466) $(am__append_3473) $(am__append_3480) \ -- $(am__append_3487) $(am__append_3494) $(am__append_3501) \ -- $(am__append_3508) $(am__append_3515) $(am__append_3522) \ -- $(am__append_3529) $(am__append_3536) $(am__append_3543) \ -- $(am__append_3550) $(am__append_3557) $(am__append_3564) \ -- $(am__append_3571) $(am__append_3578) $(am__append_3585) \ -- $(am__append_3592) $(am__append_3599) $(am__append_3606) \ -- $(am__append_3613) $(am__append_3620) $(am__append_3627) \ -- $(am__append_3634) $(am__append_3641) $(am__append_3648) \ -- $(am__append_3655) $(am__append_3662) $(am__append_3669) \ -- $(am__append_3676) $(am__append_3683) $(am__append_3690) \ -- $(am__append_3697) $(am__append_3704) $(am__append_3711) \ -- $(am__append_3718) $(am__append_3725) $(am__append_3732) \ -- $(am__append_3739) $(am__append_3746) $(am__append_3753) \ -- $(am__append_3760) $(am__append_3767) $(am__append_3774) \ -- $(am__append_3781) $(am__append_3788) $(am__append_3795) \ -- $(am__append_3802) $(am__append_3809) $(am__append_3816) \ -- $(am__append_3823) $(am__append_3830) $(am__append_3837) \ -- $(am__append_3844) $(am__append_3851) $(am__append_3858) \ -- $(am__append_3865) $(am__append_3872) $(am__append_3879) \ -- $(am__append_3886) macho.mod $(am__append_3893) \ -- $(am__append_3900) $(am__append_3907) $(am__append_3914) \ -- $(am__append_3921) $(am__append_3928) $(am__append_3935) \ -- $(am__append_3942) $(am__append_3949) $(am__append_3956) \ -- $(am__append_3963) $(am__append_3970) $(am__append_3977) \ -- $(am__append_3984) $(am__append_3991) $(am__append_3998) \ -- $(am__append_4005) $(am__append_4012) $(am__append_4019) \ -- $(am__append_4026) $(am__append_4033) $(am__append_4040) \ -- $(am__append_4047) $(am__append_4054) $(am__append_4061) \ -- $(am__append_4068) $(am__append_4075) normal.mod \ -+ zfsinfo.mod macbless.mod $(am__append_2941) gettext.mod \ -+ gfxmenu.mod hello.mod gzio.mod offsetio.mod $(am__append_2948) \ -+ $(am__append_2955) $(am__append_2962) $(am__append_2969) \ -+ $(am__append_2976) $(am__append_2983) $(am__append_2990) \ -+ $(am__append_2997) $(am__append_3004) $(am__append_3011) \ -+ $(am__append_3018) $(am__append_3025) $(am__append_3032) \ -+ $(am__append_3039) $(am__append_3046) $(am__append_3053) \ -+ $(am__append_3060) $(am__append_3067) $(am__append_3074) \ -+ $(am__append_3081) elf.mod crypto.mod pbkdf2.mod \ -+ $(am__append_3088) $(am__append_3095) $(am__append_3102) \ -+ $(am__append_3109) $(am__append_3116) $(am__append_3123) \ -+ $(am__append_3130) $(am__append_3137) $(am__append_3144) \ -+ $(am__append_3151) $(am__append_3158) $(am__append_3165) \ -+ $(am__append_3172) $(am__append_3179) $(am__append_3186) \ -+ $(am__append_3193) $(am__append_3200) $(am__append_3207) \ -+ $(am__append_3214) $(am__append_3221) $(am__append_3228) \ -+ $(am__append_3235) $(am__append_3242) $(am__append_3249) \ -+ $(am__append_3256) $(am__append_3263) $(am__append_3270) \ -+ $(am__append_3277) $(am__append_3284) $(am__append_3291) \ -+ $(am__append_3298) $(am__append_3305) $(am__append_3312) \ -+ $(am__append_3319) $(am__append_3326) $(am__append_3333) \ -+ setjmp.mod $(am__append_3340) $(am__append_3347) \ -+ $(am__append_3354) $(am__append_3361) $(am__append_3368) \ -+ $(am__append_3375) $(am__append_3382) $(am__append_3389) \ -+ $(am__append_3396) $(am__append_3403) $(am__append_3410) \ -+ $(am__append_3417) $(am__append_3424) $(am__append_3431) \ -+ $(am__append_3438) $(am__append_3445) $(am__append_3452) \ -+ $(am__append_3459) $(am__append_3466) $(am__append_3473) \ -+ $(am__append_3480) $(am__append_3487) $(am__append_3494) \ -+ $(am__append_3501) $(am__append_3508) $(am__append_3515) \ -+ $(am__append_3522) $(am__append_3529) $(am__append_3536) \ -+ $(am__append_3543) $(am__append_3550) $(am__append_3557) \ -+ $(am__append_3564) $(am__append_3571) $(am__append_3578) \ -+ $(am__append_3585) $(am__append_3592) $(am__append_3599) \ -+ $(am__append_3606) $(am__append_3613) $(am__append_3620) \ -+ $(am__append_3627) $(am__append_3634) $(am__append_3641) \ -+ $(am__append_3648) $(am__append_3655) $(am__append_3662) \ -+ $(am__append_3669) $(am__append_3676) $(am__append_3683) \ -+ $(am__append_3690) $(am__append_3697) $(am__append_3704) \ -+ $(am__append_3711) $(am__append_3718) $(am__append_3725) \ -+ $(am__append_3732) $(am__append_3739) $(am__append_3746) \ -+ $(am__append_3753) $(am__append_3760) $(am__append_3767) \ -+ $(am__append_3774) $(am__append_3781) $(am__append_3788) \ -+ $(am__append_3795) $(am__append_3802) $(am__append_3809) \ -+ $(am__append_3816) $(am__append_3823) $(am__append_3830) \ -+ $(am__append_3837) $(am__append_3844) $(am__append_3851) \ -+ $(am__append_3858) $(am__append_3865) $(am__append_3872) \ -+ $(am__append_3879) macho.mod $(am__append_3886) \ -+ $(am__append_3893) $(am__append_3900) $(am__append_3907) \ -+ $(am__append_3914) $(am__append_3921) $(am__append_3928) \ -+ $(am__append_3935) $(am__append_3942) $(am__append_3949) \ -+ $(am__append_3956) $(am__append_3963) $(am__append_3970) \ -+ $(am__append_3977) $(am__append_3984) $(am__append_3991) \ -+ $(am__append_3998) $(am__append_4005) $(am__append_4012) \ -+ $(am__append_4019) $(am__append_4026) $(am__append_4033) \ -+ $(am__append_4040) $(am__append_4047) $(am__append_4054) \ -+ $(am__append_4061) $(am__append_4068) normal.mod \ - part_acorn.mod part_amiga.mod part_apple.mod part_gpt.mod \ - part_msdos.mod part_sun.mod part_plan.mod part_dvh.mod \ - part_bsd.mod part_sunpc.mod part_dfly.mod msdospart.mod \ -- $(am__append_4082) $(am__append_4089) $(am__append_4096) \ -- $(am__append_4103) $(am__append_4110) $(am__append_4117) \ -- $(am__append_4124) $(am__append_4131) $(am__append_4138) \ -- $(am__append_4145) $(am__append_4152) $(am__append_4159) \ -- $(am__append_4166) $(am__append_4173) $(am__append_4180) \ -- $(am__append_4187) $(am__append_4194) $(am__append_4201) \ -- $(am__append_4208) $(am__append_4215) $(am__append_4222) \ -- $(am__append_4229) $(am__append_4236) $(am__append_4243) \ -- $(am__append_4250) $(am__append_4257) $(am__append_4264) \ -- gfxterm_background.mod $(am__append_4271) $(am__append_4278) \ -- $(am__append_4285) $(am__append_4292) $(am__append_4299) \ -- $(am__append_4306) $(am__append_4313) $(am__append_4320) \ -- $(am__append_4327) $(am__append_4334) $(am__append_4341) \ -- $(am__append_4348) $(am__append_4355) $(am__append_4362) \ -- $(am__append_4369) $(am__append_4376) $(am__append_4383) \ -- $(am__append_4390) $(am__append_4397) $(am__append_4404) \ -- $(am__append_4411) $(am__append_4418) $(am__append_4425) \ -- $(am__append_4432) $(am__append_4439) $(am__append_4446) \ -- $(am__append_4453) $(am__append_4460) $(am__append_4467) \ -- $(am__append_4474) $(am__append_4481) $(am__append_4488) \ -- $(am__append_4495) $(am__append_4502) $(am__append_4509) \ -- $(am__append_4516) $(am__append_4523) $(am__append_4530) \ -- $(am__append_4537) $(am__append_4544) $(am__append_4551) \ -- $(am__append_4558) $(am__append_4565) $(am__append_4572) \ -- $(am__append_4579) $(am__append_4586) $(am__append_4593) \ -- $(am__append_4600) $(am__append_4607) $(am__append_4614) \ -- $(am__append_4621) $(am__append_4628) $(am__append_4635) \ -- $(am__append_4642) $(am__append_4649) functional_test.mod \ -+ $(am__append_4075) $(am__append_4082) $(am__append_4089) \ -+ $(am__append_4096) $(am__append_4103) $(am__append_4110) \ -+ $(am__append_4117) $(am__append_4124) $(am__append_4131) \ -+ $(am__append_4138) $(am__append_4145) $(am__append_4152) \ -+ $(am__append_4159) $(am__append_4166) $(am__append_4173) \ -+ $(am__append_4180) $(am__append_4187) $(am__append_4194) \ -+ $(am__append_4201) $(am__append_4208) $(am__append_4215) \ -+ $(am__append_4222) $(am__append_4229) $(am__append_4236) \ -+ $(am__append_4243) $(am__append_4250) $(am__append_4257) \ -+ gfxterm_background.mod $(am__append_4264) $(am__append_4271) \ -+ $(am__append_4278) $(am__append_4285) $(am__append_4292) \ -+ $(am__append_4299) $(am__append_4306) $(am__append_4313) \ -+ $(am__append_4320) $(am__append_4327) $(am__append_4334) \ -+ $(am__append_4341) $(am__append_4348) $(am__append_4355) \ -+ $(am__append_4362) $(am__append_4369) $(am__append_4376) \ -+ $(am__append_4383) $(am__append_4390) $(am__append_4397) \ -+ $(am__append_4404) $(am__append_4411) $(am__append_4418) \ -+ $(am__append_4425) $(am__append_4432) $(am__append_4439) \ -+ $(am__append_4446) $(am__append_4453) $(am__append_4460) \ -+ $(am__append_4467) $(am__append_4474) $(am__append_4481) \ -+ $(am__append_4488) $(am__append_4495) $(am__append_4502) \ -+ $(am__append_4509) $(am__append_4516) $(am__append_4523) \ -+ $(am__append_4530) $(am__append_4537) $(am__append_4544) \ -+ $(am__append_4551) $(am__append_4558) $(am__append_4565) \ -+ $(am__append_4572) $(am__append_4579) $(am__append_4586) \ -+ $(am__append_4593) $(am__append_4600) $(am__append_4607) \ -+ $(am__append_4614) $(am__append_4621) $(am__append_4628) \ -+ $(am__append_4635) $(am__append_4642) functional_test.mod \ - exfctest.mod strtoull_test.mod setjmp_test.mod \ - signature_test.mod sleep_test.mod xnu_uuid_test.mod \ -- pbkdf2_test.mod $(am__append_4656) $(am__append_4663) \ -- $(am__append_4670) $(am__append_4677) $(am__append_4684) \ -- $(am__append_4691) $(am__append_4698) $(am__append_4705) \ -- $(am__append_4712) $(am__append_4719) $(am__append_4726) \ -- $(am__append_4733) $(am__append_4740) $(am__append_4747) \ -- $(am__append_4754) $(am__append_4761) $(am__append_4768) \ -- $(am__append_4775) $(am__append_4782) $(am__append_4789) \ -- $(am__append_4796) $(am__append_4803) $(am__append_4810) \ -- $(am__append_4817) $(am__append_4824) div_test.mod \ -+ pbkdf2_test.mod $(am__append_4649) $(am__append_4656) \ -+ $(am__append_4663) $(am__append_4670) $(am__append_4677) \ -+ $(am__append_4684) $(am__append_4691) $(am__append_4698) \ -+ $(am__append_4705) $(am__append_4712) $(am__append_4719) \ -+ $(am__append_4726) $(am__append_4733) $(am__append_4740) \ -+ $(am__append_4747) $(am__append_4754) $(am__append_4761) \ -+ $(am__append_4768) $(am__append_4775) $(am__append_4782) \ -+ $(am__append_4789) $(am__append_4796) $(am__append_4803) \ -+ $(am__append_4810) $(am__append_4817) div_test.mod \ - mul_test.mod shift_test.mod cmp_test.mod ctz_test.mod \ - bswap_test.mod videotest_checksum.mod gfxterm_menu.mod \ - cmdline_cat_test.mod bitmap.mod bitmap_scale.mod \ -- $(am__append_4831) $(am__append_4838) $(am__append_4845) \ -- $(am__append_4852) $(am__append_4859) $(am__append_4866) \ -- $(am__append_4873) $(am__append_4880) $(am__append_4887) \ -- jpeg.mod png.mod tga.mod $(am__append_4894) $(am__append_4901) \ -- $(am__append_4908) $(am__append_4915) $(am__append_4922) \ -- $(am__append_4929) $(am__append_4936) $(am__append_4943) \ -- $(am__append_4950) $(am__append_4957) $(am__append_4964) \ -- $(am__append_4971) $(am__append_4978) $(am__append_4985) \ -- $(am__append_4992) $(am__append_4999) $(am__append_5006) \ -- $(am__append_5013) $(am__append_5020) $(am__append_5027) \ -- $(am__append_5034) $(am__append_5041) $(am__append_5048) \ -- $(am__append_5055) $(am__append_5062) $(am__append_5069) \ -- $(am__append_5076) $(am__append_5083) $(am__append_5090) \ -- $(am__append_5097) $(am__append_5104) $(am__append_5111) \ -- $(am__append_5118) $(am__append_5125) $(am__append_5132) \ -- $(am__append_5139) $(am__append_5146) $(am__append_5153) \ -- $(am__append_5160) $(am__append_5167) $(am__append_5174) \ -- video_colors.mod $(am__append_5181) $(am__append_5188) \ -- datehook.mod net.mod tftp.mod http.mod $(am__append_5195) \ -- $(am__append_5202) $(am__append_5209) $(am__append_5216) \ -- $(am__append_5223) $(am__append_5230) $(am__append_5237) \ -- $(am__append_5244) $(am__append_5251) $(am__append_5258) \ -- $(am__append_5265) $(am__append_5272) $(am__append_5279) \ -- $(am__append_5286) $(am__append_5293) $(am__append_5300) \ -- $(am__append_5307) $(am__append_5314) syslinuxcfg.mod \ -+ $(am__append_4824) $(am__append_4831) $(am__append_4838) \ -+ $(am__append_4845) $(am__append_4852) $(am__append_4859) \ -+ $(am__append_4866) $(am__append_4873) $(am__append_4880) \ -+ jpeg.mod png.mod tga.mod $(am__append_4887) $(am__append_4894) \ -+ $(am__append_4901) $(am__append_4908) $(am__append_4915) \ -+ $(am__append_4922) $(am__append_4929) $(am__append_4936) \ -+ $(am__append_4943) $(am__append_4950) $(am__append_4957) \ -+ $(am__append_4964) $(am__append_4971) $(am__append_4978) \ -+ $(am__append_4985) $(am__append_4992) $(am__append_4999) \ -+ $(am__append_5006) $(am__append_5013) $(am__append_5020) \ -+ $(am__append_5027) $(am__append_5034) $(am__append_5041) \ -+ $(am__append_5048) $(am__append_5055) $(am__append_5062) \ -+ $(am__append_5069) $(am__append_5076) $(am__append_5083) \ -+ $(am__append_5090) $(am__append_5097) $(am__append_5104) \ -+ $(am__append_5111) $(am__append_5118) $(am__append_5125) \ -+ $(am__append_5132) $(am__append_5139) $(am__append_5146) \ -+ $(am__append_5153) $(am__append_5160) $(am__append_5167) \ -+ video_colors.mod $(am__append_5174) $(am__append_5181) \ -+ datehook.mod net.mod tftp.mod http.mod $(am__append_5188) \ -+ $(am__append_5195) $(am__append_5202) $(am__append_5209) \ -+ $(am__append_5216) $(am__append_5223) $(am__append_5230) \ -+ $(am__append_5237) $(am__append_5244) $(am__append_5251) \ -+ $(am__append_5258) $(am__append_5265) $(am__append_5272) \ -+ $(am__append_5279) $(am__append_5286) $(am__append_5293) \ -+ $(am__append_5300) $(am__append_5307) syslinuxcfg.mod \ - test_blockarg.mod xzio.mod lzopio.mod testload.mod \ -- $(am__append_5321) $(am__append_5328) $(am__append_5335) \ -- $(am__append_5342) $(am__append_5349) $(am__append_5356) \ -- $(am__append_5363) $(am__append_5370) $(am__append_5377) \ -- $(am__append_5384) $(am__append_5391) $(am__append_5398) \ -- $(am__append_5405) $(am__append_5412) $(am__append_5419) \ -- $(am__append_5426) $(am__append_5433) priority_queue.mod \ -- time.mod $(am__append_5440) $(am__append_5447) adler32.mod \ -- crc64.mod mpi.mod all_video.mod $(am__append_5454) \ -- $(am__append_5461) $(am__append_5468) $(am__append_5475) \ -- $(am__append_5482) $(am__append_5489) testspeed.mod \ -- $(am__append_5496) tr.mod progress.mod file.mod \ -- $(am__append_5503) $(am__append_5510) $(am__append_5517) \ -- $(am__append_5524) $(am__append_5531) $(am__append_5538) \ -- $(am__append_5545) $(am__append_5552) $(am__append_5559) \ -- $(am__append_5566) $(am__append_5573) $(am__append_5580) \ -- $(am__append_5587) $(am__append_5594) gcry_arcfour.mod \ -+ $(am__append_5314) $(am__append_5321) $(am__append_5328) \ -+ $(am__append_5335) $(am__append_5342) $(am__append_5349) \ -+ $(am__append_5356) $(am__append_5363) $(am__append_5370) \ -+ $(am__append_5377) $(am__append_5384) $(am__append_5391) \ -+ $(am__append_5398) $(am__append_5405) $(am__append_5412) \ -+ $(am__append_5419) $(am__append_5426) priority_queue.mod \ -+ time.mod $(am__append_5433) $(am__append_5440) adler32.mod \ -+ crc64.mod mpi.mod all_video.mod $(am__append_5447) \ -+ $(am__append_5454) $(am__append_5461) $(am__append_5468) \ -+ $(am__append_5475) $(am__append_5482) testspeed.mod \ -+ $(am__append_5489) tr.mod progress.mod file.mod \ -+ $(am__append_5496) $(am__append_5503) $(am__append_5510) \ -+ $(am__append_5517) $(am__append_5524) $(am__append_5531) \ -+ $(am__append_5538) $(am__append_5545) $(am__append_5552) \ -+ $(am__append_5559) $(am__append_5566) $(am__append_5573) \ -+ $(am__append_5580) $(am__append_5587) gcry_arcfour.mod \ - gcry_blowfish.mod gcry_camellia.mod gcry_cast5.mod \ - gcry_crc.mod gcry_des.mod gcry_dsa.mod gcry_idea.mod \ - gcry_md4.mod gcry_md5.mod gcry_rfc2268.mod gcry_rijndael.mod \ -@@ -15826,72 +15804,71 @@ MODULE_FILES = disk.module$(EXEEXT) trig.module$(EXEEXT) \ - hashsum.module$(EXEEXT) pgp.module$(EXEEXT) $(am__append_2041) \ - $(am__append_2048) $(am__append_2055) $(am__append_2062) \ - $(am__append_2069) $(am__append_2076) $(am__append_2083) \ -- $(am__append_2090) $(am__append_2097) $(am__append_2104) \ -- help.module$(EXEEXT) hexdump.module$(EXEEXT) \ -- keystatus.module$(EXEEXT) $(am__append_2111) \ -- $(am__append_2118) loadenv.module$(EXEEXT) ls.module$(EXEEXT) \ -- lsmmap.module$(EXEEXT) $(am__append_2125) $(am__append_2132) \ -- $(am__append_2139) $(am__append_2146) $(am__append_2153) \ -- $(am__append_2160) $(am__append_2167) $(am__append_2174) \ -- memrw.module$(EXEEXT) minicmd.module$(EXEEXT) \ -- parttool.module$(EXEEXT) password.module$(EXEEXT) \ -- password_pbkdf2.module$(EXEEXT) $(am__append_2181) \ -- $(am__append_2188) $(am__append_2195) $(am__append_2202) \ -- $(am__append_2209) $(am__append_2216) $(am__append_2223) \ -- $(am__append_2230) $(am__append_2237) $(am__append_2244) \ -- $(am__append_2251) $(am__append_2258) $(am__append_2265) \ -- $(am__append_2272) $(am__append_2279) $(am__append_2286) \ -- $(am__append_2293) $(am__append_2300) $(am__append_2307) \ -- $(am__append_2314) $(am__append_2321) probe.module$(EXEEXT) \ -- read.module$(EXEEXT) search.module$(EXEEXT) \ -- search_fs_file.module$(EXEEXT) search_fs_uuid.module$(EXEEXT) \ -- search_label.module$(EXEEXT) $(am__append_2328) \ -- $(am__append_2335) $(am__append_2342) $(am__append_2349) \ -- $(am__append_2356) $(am__append_2363) $(am__append_2370) \ -- $(am__append_2377) $(am__append_2384) $(am__append_2391) \ -- $(am__append_2398) $(am__append_2405) $(am__append_2412) \ -- $(am__append_2419) $(am__append_2426) $(am__append_2433) \ -- sleep.module$(EXEEXT) $(am__append_2440) $(am__append_2447) \ -- terminal.module$(EXEEXT) test.module$(EXEEXT) \ -- true.module$(EXEEXT) $(am__append_2454) $(am__append_2461) \ -- $(am__append_2468) $(am__append_2475) $(am__append_2482) \ -- $(am__append_2489) $(am__append_2496) $(am__append_2503) \ -- $(am__append_2510) videoinfo.module$(EXEEXT) \ -- videotest.module$(EXEEXT) xnu_uuid.module$(EXEEXT) \ -- dm_nv.module$(EXEEXT) loopback.module$(EXEEXT) \ -- cryptodisk.module$(EXEEXT) luks.module$(EXEEXT) \ -- geli.module$(EXEEXT) lvm.module$(EXEEXT) ldm.module$(EXEEXT) \ -- mdraid09.module$(EXEEXT) mdraid09_be.module$(EXEEXT) \ -- mdraid1x.module$(EXEEXT) diskfilter.module$(EXEEXT) \ -- raid5rec.module$(EXEEXT) raid6rec.module$(EXEEXT) \ -- scsi.module$(EXEEXT) memdisk.module$(EXEEXT) \ -- $(am__append_2517) $(am__append_2524) $(am__append_2531) \ -- $(am__append_2538) $(am__append_2545) $(am__append_2552) \ -- $(am__append_2559) $(am__append_2566) $(am__append_2573) \ -- $(am__append_2580) $(am__append_2587) $(am__append_2594) \ -- $(am__append_2601) $(am__append_2608) $(am__append_2615) \ -- $(am__append_2622) $(am__append_2629) $(am__append_2636) \ -- $(am__append_2643) $(am__append_2650) $(am__append_2657) \ -- $(am__append_2664) $(am__append_2671) $(am__append_2678) \ -- $(am__append_2685) $(am__append_2692) $(am__append_2699) \ -- $(am__append_2706) $(am__append_2713) $(am__append_2720) \ -- $(am__append_2727) $(am__append_2734) $(am__append_2741) \ -- $(am__append_2748) $(am__append_2755) $(am__append_2762) \ -- $(am__append_2769) $(am__append_2776) $(am__append_2783) \ -- $(am__append_2790) $(am__append_2797) $(am__append_2804) \ -- $(am__append_2811) $(am__append_2818) $(am__append_2825) \ -- $(am__append_2832) $(am__append_2839) $(am__append_2846) \ -- $(am__append_2853) $(am__append_2860) $(am__append_2867) \ -- $(am__append_2874) $(am__append_2881) $(am__append_2888) \ -- $(am__append_2895) $(am__append_2902) $(am__append_2909) \ -- $(am__append_2916) $(am__append_2923) $(am__append_2930) \ -- $(am__append_2937) procfs.module$(EXEEXT) affs.module$(EXEEXT) \ -- afs.module$(EXEEXT) bfs.module$(EXEEXT) zstd.module$(EXEEXT) \ -- btrfs.module$(EXEEXT) archelp.module$(EXEEXT) \ -- cbfs.module$(EXEEXT) cpio.module$(EXEEXT) \ -- cpio_be.module$(EXEEXT) newc.module$(EXEEXT) \ -- odc.module$(EXEEXT) ext2.module$(EXEEXT) fat.module$(EXEEXT) \ -- exfat.module$(EXEEXT) f2fs.module$(EXEEXT) \ -+ $(am__append_2090) $(am__append_2097) help.module$(EXEEXT) \ -+ hexdump.module$(EXEEXT) keystatus.module$(EXEEXT) \ -+ $(am__append_2104) $(am__append_2111) loadenv.module$(EXEEXT) \ -+ ls.module$(EXEEXT) lsmmap.module$(EXEEXT) $(am__append_2118) \ -+ $(am__append_2125) $(am__append_2132) $(am__append_2139) \ -+ $(am__append_2146) $(am__append_2153) $(am__append_2160) \ -+ $(am__append_2167) memrw.module$(EXEEXT) \ -+ minicmd.module$(EXEEXT) parttool.module$(EXEEXT) \ -+ password.module$(EXEEXT) password_pbkdf2.module$(EXEEXT) \ -+ $(am__append_2174) $(am__append_2181) $(am__append_2188) \ -+ $(am__append_2195) $(am__append_2202) $(am__append_2209) \ -+ $(am__append_2216) $(am__append_2223) $(am__append_2230) \ -+ $(am__append_2237) $(am__append_2244) $(am__append_2251) \ -+ $(am__append_2258) $(am__append_2265) $(am__append_2272) \ -+ $(am__append_2279) $(am__append_2286) $(am__append_2293) \ -+ $(am__append_2300) $(am__append_2307) $(am__append_2314) \ -+ probe.module$(EXEEXT) read.module$(EXEEXT) \ -+ search.module$(EXEEXT) search_fs_file.module$(EXEEXT) \ -+ search_fs_uuid.module$(EXEEXT) search_label.module$(EXEEXT) \ -+ $(am__append_2321) $(am__append_2328) $(am__append_2335) \ -+ $(am__append_2342) $(am__append_2349) $(am__append_2356) \ -+ $(am__append_2363) $(am__append_2370) $(am__append_2377) \ -+ $(am__append_2384) $(am__append_2391) $(am__append_2398) \ -+ $(am__append_2405) $(am__append_2412) $(am__append_2419) \ -+ $(am__append_2426) sleep.module$(EXEEXT) $(am__append_2433) \ -+ $(am__append_2440) terminal.module$(EXEEXT) \ -+ test.module$(EXEEXT) true.module$(EXEEXT) $(am__append_2447) \ -+ $(am__append_2454) $(am__append_2461) $(am__append_2468) \ -+ $(am__append_2475) $(am__append_2482) $(am__append_2489) \ -+ $(am__append_2496) $(am__append_2503) \ -+ videoinfo.module$(EXEEXT) videotest.module$(EXEEXT) \ -+ xnu_uuid.module$(EXEEXT) dm_nv.module$(EXEEXT) \ -+ loopback.module$(EXEEXT) cryptodisk.module$(EXEEXT) \ -+ luks.module$(EXEEXT) geli.module$(EXEEXT) lvm.module$(EXEEXT) \ -+ ldm.module$(EXEEXT) mdraid09.module$(EXEEXT) \ -+ mdraid09_be.module$(EXEEXT) mdraid1x.module$(EXEEXT) \ -+ diskfilter.module$(EXEEXT) raid5rec.module$(EXEEXT) \ -+ raid6rec.module$(EXEEXT) scsi.module$(EXEEXT) \ -+ memdisk.module$(EXEEXT) $(am__append_2510) $(am__append_2517) \ -+ $(am__append_2524) $(am__append_2531) $(am__append_2538) \ -+ $(am__append_2545) $(am__append_2552) $(am__append_2559) \ -+ $(am__append_2566) $(am__append_2573) $(am__append_2580) \ -+ $(am__append_2587) $(am__append_2594) $(am__append_2601) \ -+ $(am__append_2608) $(am__append_2615) $(am__append_2622) \ -+ $(am__append_2629) $(am__append_2636) $(am__append_2643) \ -+ $(am__append_2650) $(am__append_2657) $(am__append_2664) \ -+ $(am__append_2671) $(am__append_2678) $(am__append_2685) \ -+ $(am__append_2692) $(am__append_2699) $(am__append_2706) \ -+ $(am__append_2713) $(am__append_2720) $(am__append_2727) \ -+ $(am__append_2734) $(am__append_2741) $(am__append_2748) \ -+ $(am__append_2755) $(am__append_2762) $(am__append_2769) \ -+ $(am__append_2776) $(am__append_2783) $(am__append_2790) \ -+ $(am__append_2797) $(am__append_2804) $(am__append_2811) \ -+ $(am__append_2818) $(am__append_2825) $(am__append_2832) \ -+ $(am__append_2839) $(am__append_2846) $(am__append_2853) \ -+ $(am__append_2860) $(am__append_2867) $(am__append_2874) \ -+ $(am__append_2881) $(am__append_2888) $(am__append_2895) \ -+ $(am__append_2902) $(am__append_2909) $(am__append_2916) \ -+ $(am__append_2923) $(am__append_2930) procfs.module$(EXEEXT) \ -+ affs.module$(EXEEXT) afs.module$(EXEEXT) bfs.module$(EXEEXT) \ -+ zstd.module$(EXEEXT) btrfs.module$(EXEEXT) \ -+ archelp.module$(EXEEXT) cbfs.module$(EXEEXT) \ -+ cpio.module$(EXEEXT) cpio_be.module$(EXEEXT) \ -+ newc.module$(EXEEXT) odc.module$(EXEEXT) ext2.module$(EXEEXT) \ -+ fat.module$(EXEEXT) exfat.module$(EXEEXT) f2fs.module$(EXEEXT) \ - fshelp.module$(EXEEXT) hfs.module$(EXEEXT) \ - hfsplus.module$(EXEEXT) hfspluscomp.module$(EXEEXT) \ - iso9660.module$(EXEEXT) jfs.module$(EXEEXT) \ -@@ -15906,166 +15883,166 @@ MODULE_FILES = disk.module$(EXEEXT) trig.module$(EXEEXT) \ - ufs1_be.module$(EXEEXT) ufs2.module$(EXEEXT) \ - xfs.module$(EXEEXT) zfs.module$(EXEEXT) \ - zfscrypt.module$(EXEEXT) zfsinfo.module$(EXEEXT) \ -- macbless.module$(EXEEXT) $(am__append_2944) \ -+ macbless.module$(EXEEXT) $(am__append_2937) \ - gettext.module$(EXEEXT) gfxmenu.module$(EXEEXT) \ - hello.module$(EXEEXT) gzio.module$(EXEEXT) \ -- offsetio.module$(EXEEXT) $(am__append_2951) $(am__append_2958) \ -- $(am__append_2965) $(am__append_2972) $(am__append_2979) \ -- $(am__append_2986) $(am__append_2993) $(am__append_3000) \ -- $(am__append_3007) $(am__append_3014) $(am__append_3021) \ -- $(am__append_3028) $(am__append_3035) $(am__append_3042) \ -- $(am__append_3049) $(am__append_3056) $(am__append_3063) \ -- $(am__append_3070) $(am__append_3077) $(am__append_3084) \ -+ offsetio.module$(EXEEXT) $(am__append_2944) $(am__append_2951) \ -+ $(am__append_2958) $(am__append_2965) $(am__append_2972) \ -+ $(am__append_2979) $(am__append_2986) $(am__append_2993) \ -+ $(am__append_3000) $(am__append_3007) $(am__append_3014) \ -+ $(am__append_3021) $(am__append_3028) $(am__append_3035) \ -+ $(am__append_3042) $(am__append_3049) $(am__append_3056) \ -+ $(am__append_3063) $(am__append_3070) $(am__append_3077) \ - elf.module$(EXEEXT) crypto.module$(EXEEXT) \ -- pbkdf2.module$(EXEEXT) $(am__append_3091) $(am__append_3098) \ -- $(am__append_3105) $(am__append_3112) $(am__append_3119) \ -- $(am__append_3126) $(am__append_3133) $(am__append_3140) \ -- $(am__append_3147) $(am__append_3154) $(am__append_3161) \ -- $(am__append_3168) $(am__append_3175) $(am__append_3182) \ -- $(am__append_3189) $(am__append_3196) $(am__append_3203) \ -- $(am__append_3210) $(am__append_3217) $(am__append_3224) \ -- $(am__append_3231) $(am__append_3238) $(am__append_3245) \ -- $(am__append_3252) $(am__append_3259) $(am__append_3266) \ -- $(am__append_3273) $(am__append_3280) $(am__append_3287) \ -- $(am__append_3294) $(am__append_3301) $(am__append_3308) \ -- $(am__append_3315) $(am__append_3322) $(am__append_3329) \ -- $(am__append_3336) setjmp.module$(EXEEXT) $(am__append_3343) \ -- $(am__append_3350) $(am__append_3357) $(am__append_3364) \ -- $(am__append_3371) $(am__append_3378) $(am__append_3385) \ -- $(am__append_3392) $(am__append_3399) $(am__append_3406) \ -- $(am__append_3413) $(am__append_3420) $(am__append_3427) \ -- $(am__append_3434) $(am__append_3441) $(am__append_3448) \ -- $(am__append_3455) $(am__append_3462) $(am__append_3469) \ -- $(am__append_3476) $(am__append_3483) $(am__append_3490) \ -- $(am__append_3497) $(am__append_3504) $(am__append_3511) \ -- $(am__append_3518) $(am__append_3525) $(am__append_3532) \ -- $(am__append_3539) $(am__append_3546) $(am__append_3553) \ -- $(am__append_3560) $(am__append_3567) $(am__append_3574) \ -- $(am__append_3581) $(am__append_3588) $(am__append_3595) \ -- $(am__append_3602) $(am__append_3609) $(am__append_3616) \ -- $(am__append_3623) $(am__append_3630) $(am__append_3637) \ -- $(am__append_3644) $(am__append_3651) $(am__append_3658) \ -- $(am__append_3665) $(am__append_3672) $(am__append_3679) \ -- $(am__append_3686) $(am__append_3693) $(am__append_3700) \ -- $(am__append_3707) $(am__append_3714) $(am__append_3721) \ -- $(am__append_3728) $(am__append_3735) $(am__append_3742) \ -- $(am__append_3749) $(am__append_3756) $(am__append_3763) \ -- $(am__append_3770) $(am__append_3777) $(am__append_3784) \ -- $(am__append_3791) $(am__append_3798) $(am__append_3805) \ -- $(am__append_3812) $(am__append_3819) $(am__append_3826) \ -- $(am__append_3833) $(am__append_3840) $(am__append_3847) \ -- $(am__append_3854) $(am__append_3861) $(am__append_3868) \ -- $(am__append_3875) $(am__append_3882) macho.module$(EXEEXT) \ -- $(am__append_3889) $(am__append_3896) $(am__append_3903) \ -- $(am__append_3910) $(am__append_3917) $(am__append_3924) \ -- $(am__append_3931) $(am__append_3938) $(am__append_3945) \ -- $(am__append_3952) $(am__append_3959) $(am__append_3966) \ -- $(am__append_3973) $(am__append_3980) $(am__append_3987) \ -- $(am__append_3994) $(am__append_4001) $(am__append_4008) \ -- $(am__append_4015) $(am__append_4022) $(am__append_4029) \ -- $(am__append_4036) $(am__append_4043) $(am__append_4050) \ -- $(am__append_4057) $(am__append_4064) $(am__append_4071) \ -+ pbkdf2.module$(EXEEXT) $(am__append_3084) $(am__append_3091) \ -+ $(am__append_3098) $(am__append_3105) $(am__append_3112) \ -+ $(am__append_3119) $(am__append_3126) $(am__append_3133) \ -+ $(am__append_3140) $(am__append_3147) $(am__append_3154) \ -+ $(am__append_3161) $(am__append_3168) $(am__append_3175) \ -+ $(am__append_3182) $(am__append_3189) $(am__append_3196) \ -+ $(am__append_3203) $(am__append_3210) $(am__append_3217) \ -+ $(am__append_3224) $(am__append_3231) $(am__append_3238) \ -+ $(am__append_3245) $(am__append_3252) $(am__append_3259) \ -+ $(am__append_3266) $(am__append_3273) $(am__append_3280) \ -+ $(am__append_3287) $(am__append_3294) $(am__append_3301) \ -+ $(am__append_3308) $(am__append_3315) $(am__append_3322) \ -+ $(am__append_3329) setjmp.module$(EXEEXT) $(am__append_3336) \ -+ $(am__append_3343) $(am__append_3350) $(am__append_3357) \ -+ $(am__append_3364) $(am__append_3371) $(am__append_3378) \ -+ $(am__append_3385) $(am__append_3392) $(am__append_3399) \ -+ $(am__append_3406) $(am__append_3413) $(am__append_3420) \ -+ $(am__append_3427) $(am__append_3434) $(am__append_3441) \ -+ $(am__append_3448) $(am__append_3455) $(am__append_3462) \ -+ $(am__append_3469) $(am__append_3476) $(am__append_3483) \ -+ $(am__append_3490) $(am__append_3497) $(am__append_3504) \ -+ $(am__append_3511) $(am__append_3518) $(am__append_3525) \ -+ $(am__append_3532) $(am__append_3539) $(am__append_3546) \ -+ $(am__append_3553) $(am__append_3560) $(am__append_3567) \ -+ $(am__append_3574) $(am__append_3581) $(am__append_3588) \ -+ $(am__append_3595) $(am__append_3602) $(am__append_3609) \ -+ $(am__append_3616) $(am__append_3623) $(am__append_3630) \ -+ $(am__append_3637) $(am__append_3644) $(am__append_3651) \ -+ $(am__append_3658) $(am__append_3665) $(am__append_3672) \ -+ $(am__append_3679) $(am__append_3686) $(am__append_3693) \ -+ $(am__append_3700) $(am__append_3707) $(am__append_3714) \ -+ $(am__append_3721) $(am__append_3728) $(am__append_3735) \ -+ $(am__append_3742) $(am__append_3749) $(am__append_3756) \ -+ $(am__append_3763) $(am__append_3770) $(am__append_3777) \ -+ $(am__append_3784) $(am__append_3791) $(am__append_3798) \ -+ $(am__append_3805) $(am__append_3812) $(am__append_3819) \ -+ $(am__append_3826) $(am__append_3833) $(am__append_3840) \ -+ $(am__append_3847) $(am__append_3854) $(am__append_3861) \ -+ $(am__append_3868) $(am__append_3875) macho.module$(EXEEXT) \ -+ $(am__append_3882) $(am__append_3889) $(am__append_3896) \ -+ $(am__append_3903) $(am__append_3910) $(am__append_3917) \ -+ $(am__append_3924) $(am__append_3931) $(am__append_3938) \ -+ $(am__append_3945) $(am__append_3952) $(am__append_3959) \ -+ $(am__append_3966) $(am__append_3973) $(am__append_3980) \ -+ $(am__append_3987) $(am__append_3994) $(am__append_4001) \ -+ $(am__append_4008) $(am__append_4015) $(am__append_4022) \ -+ $(am__append_4029) $(am__append_4036) $(am__append_4043) \ -+ $(am__append_4050) $(am__append_4057) $(am__append_4064) \ - normal.module$(EXEEXT) part_acorn.module$(EXEEXT) \ - part_amiga.module$(EXEEXT) part_apple.module$(EXEEXT) \ - part_gpt.module$(EXEEXT) part_msdos.module$(EXEEXT) \ - part_sun.module$(EXEEXT) part_plan.module$(EXEEXT) \ - part_dvh.module$(EXEEXT) part_bsd.module$(EXEEXT) \ - part_sunpc.module$(EXEEXT) part_dfly.module$(EXEEXT) \ -- msdospart.module$(EXEEXT) $(am__append_4078) \ -- $(am__append_4085) $(am__append_4092) $(am__append_4099) \ -- $(am__append_4106) $(am__append_4113) $(am__append_4120) \ -- $(am__append_4127) $(am__append_4134) $(am__append_4141) \ -- $(am__append_4148) $(am__append_4155) $(am__append_4162) \ -- $(am__append_4169) $(am__append_4176) $(am__append_4183) \ -- $(am__append_4190) $(am__append_4197) $(am__append_4204) \ -- $(am__append_4211) $(am__append_4218) $(am__append_4225) \ -- $(am__append_4232) $(am__append_4239) $(am__append_4246) \ -- $(am__append_4253) $(am__append_4260) \ -- gfxterm_background.module$(EXEEXT) $(am__append_4267) \ -- $(am__append_4274) $(am__append_4281) $(am__append_4288) \ -- $(am__append_4295) $(am__append_4302) $(am__append_4309) \ -- $(am__append_4316) $(am__append_4323) $(am__append_4330) \ -- $(am__append_4337) $(am__append_4344) $(am__append_4351) \ -- $(am__append_4358) $(am__append_4365) $(am__append_4372) \ -- $(am__append_4379) $(am__append_4386) $(am__append_4393) \ -- $(am__append_4400) $(am__append_4407) $(am__append_4414) \ -- $(am__append_4421) $(am__append_4428) $(am__append_4435) \ -- $(am__append_4442) $(am__append_4449) $(am__append_4456) \ -- $(am__append_4463) $(am__append_4470) $(am__append_4477) \ -- $(am__append_4484) $(am__append_4491) $(am__append_4498) \ -- $(am__append_4505) $(am__append_4512) $(am__append_4519) \ -- $(am__append_4526) $(am__append_4533) $(am__append_4540) \ -- $(am__append_4547) $(am__append_4554) $(am__append_4561) \ -- $(am__append_4568) $(am__append_4575) $(am__append_4582) \ -- $(am__append_4589) $(am__append_4596) $(am__append_4603) \ -- $(am__append_4610) $(am__append_4617) $(am__append_4624) \ -- $(am__append_4631) $(am__append_4638) $(am__append_4645) \ -+ msdospart.module$(EXEEXT) $(am__append_4071) \ -+ $(am__append_4078) $(am__append_4085) $(am__append_4092) \ -+ $(am__append_4099) $(am__append_4106) $(am__append_4113) \ -+ $(am__append_4120) $(am__append_4127) $(am__append_4134) \ -+ $(am__append_4141) $(am__append_4148) $(am__append_4155) \ -+ $(am__append_4162) $(am__append_4169) $(am__append_4176) \ -+ $(am__append_4183) $(am__append_4190) $(am__append_4197) \ -+ $(am__append_4204) $(am__append_4211) $(am__append_4218) \ -+ $(am__append_4225) $(am__append_4232) $(am__append_4239) \ -+ $(am__append_4246) $(am__append_4253) \ -+ gfxterm_background.module$(EXEEXT) $(am__append_4260) \ -+ $(am__append_4267) $(am__append_4274) $(am__append_4281) \ -+ $(am__append_4288) $(am__append_4295) $(am__append_4302) \ -+ $(am__append_4309) $(am__append_4316) $(am__append_4323) \ -+ $(am__append_4330) $(am__append_4337) $(am__append_4344) \ -+ $(am__append_4351) $(am__append_4358) $(am__append_4365) \ -+ $(am__append_4372) $(am__append_4379) $(am__append_4386) \ -+ $(am__append_4393) $(am__append_4400) $(am__append_4407) \ -+ $(am__append_4414) $(am__append_4421) $(am__append_4428) \ -+ $(am__append_4435) $(am__append_4442) $(am__append_4449) \ -+ $(am__append_4456) $(am__append_4463) $(am__append_4470) \ -+ $(am__append_4477) $(am__append_4484) $(am__append_4491) \ -+ $(am__append_4498) $(am__append_4505) $(am__append_4512) \ -+ $(am__append_4519) $(am__append_4526) $(am__append_4533) \ -+ $(am__append_4540) $(am__append_4547) $(am__append_4554) \ -+ $(am__append_4561) $(am__append_4568) $(am__append_4575) \ -+ $(am__append_4582) $(am__append_4589) $(am__append_4596) \ -+ $(am__append_4603) $(am__append_4610) $(am__append_4617) \ -+ $(am__append_4624) $(am__append_4631) $(am__append_4638) \ - functional_test.module$(EXEEXT) exfctest.module$(EXEEXT) \ - strtoull_test.module$(EXEEXT) setjmp_test.module$(EXEEXT) \ - signature_test.module$(EXEEXT) sleep_test.module$(EXEEXT) \ - xnu_uuid_test.module$(EXEEXT) pbkdf2_test.module$(EXEEXT) \ -- $(am__append_4652) $(am__append_4659) $(am__append_4666) \ -- $(am__append_4673) $(am__append_4680) $(am__append_4687) \ -- $(am__append_4694) $(am__append_4701) $(am__append_4708) \ -- $(am__append_4715) $(am__append_4722) $(am__append_4729) \ -- $(am__append_4736) $(am__append_4743) $(am__append_4750) \ -- $(am__append_4757) $(am__append_4764) $(am__append_4771) \ -- $(am__append_4778) $(am__append_4785) $(am__append_4792) \ -- $(am__append_4799) $(am__append_4806) $(am__append_4813) \ -- $(am__append_4820) div_test.module$(EXEEXT) \ -+ $(am__append_4645) $(am__append_4652) $(am__append_4659) \ -+ $(am__append_4666) $(am__append_4673) $(am__append_4680) \ -+ $(am__append_4687) $(am__append_4694) $(am__append_4701) \ -+ $(am__append_4708) $(am__append_4715) $(am__append_4722) \ -+ $(am__append_4729) $(am__append_4736) $(am__append_4743) \ -+ $(am__append_4750) $(am__append_4757) $(am__append_4764) \ -+ $(am__append_4771) $(am__append_4778) $(am__append_4785) \ -+ $(am__append_4792) $(am__append_4799) $(am__append_4806) \ -+ $(am__append_4813) div_test.module$(EXEEXT) \ - mul_test.module$(EXEEXT) shift_test.module$(EXEEXT) \ - cmp_test.module$(EXEEXT) ctz_test.module$(EXEEXT) \ - bswap_test.module$(EXEEXT) videotest_checksum.module$(EXEEXT) \ - gfxterm_menu.module$(EXEEXT) cmdline_cat_test.module$(EXEEXT) \ - bitmap.module$(EXEEXT) bitmap_scale.module$(EXEEXT) \ -- $(am__append_4827) $(am__append_4834) $(am__append_4841) \ -- $(am__append_4848) $(am__append_4855) $(am__append_4862) \ -- $(am__append_4869) $(am__append_4876) $(am__append_4883) \ -+ $(am__append_4820) $(am__append_4827) $(am__append_4834) \ -+ $(am__append_4841) $(am__append_4848) $(am__append_4855) \ -+ $(am__append_4862) $(am__append_4869) $(am__append_4876) \ - jpeg.module$(EXEEXT) png.module$(EXEEXT) tga.module$(EXEEXT) \ -- $(am__append_4890) $(am__append_4897) $(am__append_4904) \ -- $(am__append_4911) $(am__append_4918) $(am__append_4925) \ -- $(am__append_4932) $(am__append_4939) $(am__append_4946) \ -- $(am__append_4953) $(am__append_4960) $(am__append_4967) \ -- $(am__append_4974) $(am__append_4981) $(am__append_4988) \ -- $(am__append_4995) $(am__append_5002) $(am__append_5009) \ -- $(am__append_5016) $(am__append_5023) $(am__append_5030) \ -- $(am__append_5037) $(am__append_5044) $(am__append_5051) \ -- $(am__append_5058) $(am__append_5065) $(am__append_5072) \ -- $(am__append_5079) $(am__append_5086) $(am__append_5093) \ -- $(am__append_5100) $(am__append_5107) $(am__append_5114) \ -- $(am__append_5121) $(am__append_5128) $(am__append_5135) \ -- $(am__append_5142) $(am__append_5149) $(am__append_5156) \ -- $(am__append_5163) $(am__append_5170) \ -- video_colors.module$(EXEEXT) $(am__append_5177) \ -- $(am__append_5184) datehook.module$(EXEEXT) \ -+ $(am__append_4883) $(am__append_4890) $(am__append_4897) \ -+ $(am__append_4904) $(am__append_4911) $(am__append_4918) \ -+ $(am__append_4925) $(am__append_4932) $(am__append_4939) \ -+ $(am__append_4946) $(am__append_4953) $(am__append_4960) \ -+ $(am__append_4967) $(am__append_4974) $(am__append_4981) \ -+ $(am__append_4988) $(am__append_4995) $(am__append_5002) \ -+ $(am__append_5009) $(am__append_5016) $(am__append_5023) \ -+ $(am__append_5030) $(am__append_5037) $(am__append_5044) \ -+ $(am__append_5051) $(am__append_5058) $(am__append_5065) \ -+ $(am__append_5072) $(am__append_5079) $(am__append_5086) \ -+ $(am__append_5093) $(am__append_5100) $(am__append_5107) \ -+ $(am__append_5114) $(am__append_5121) $(am__append_5128) \ -+ $(am__append_5135) $(am__append_5142) $(am__append_5149) \ -+ $(am__append_5156) $(am__append_5163) \ -+ video_colors.module$(EXEEXT) $(am__append_5170) \ -+ $(am__append_5177) datehook.module$(EXEEXT) \ - net.module$(EXEEXT) tftp.module$(EXEEXT) http.module$(EXEEXT) \ -- $(am__append_5191) $(am__append_5198) $(am__append_5205) \ -- $(am__append_5212) $(am__append_5219) $(am__append_5226) \ -- $(am__append_5233) $(am__append_5240) $(am__append_5247) \ -- $(am__append_5254) $(am__append_5261) $(am__append_5268) \ -- $(am__append_5275) $(am__append_5282) $(am__append_5289) \ -- $(am__append_5296) $(am__append_5303) $(am__append_5310) \ -+ $(am__append_5184) $(am__append_5191) $(am__append_5198) \ -+ $(am__append_5205) $(am__append_5212) $(am__append_5219) \ -+ $(am__append_5226) $(am__append_5233) $(am__append_5240) \ -+ $(am__append_5247) $(am__append_5254) $(am__append_5261) \ -+ $(am__append_5268) $(am__append_5275) $(am__append_5282) \ -+ $(am__append_5289) $(am__append_5296) $(am__append_5303) \ - syslinuxcfg.module$(EXEEXT) test_blockarg.module$(EXEEXT) \ - xzio.module$(EXEEXT) lzopio.module$(EXEEXT) \ -- testload.module$(EXEEXT) $(am__append_5317) $(am__append_5324) \ -- $(am__append_5331) $(am__append_5338) $(am__append_5345) \ -- $(am__append_5352) $(am__append_5359) $(am__append_5366) \ -- $(am__append_5373) $(am__append_5380) $(am__append_5387) \ -- $(am__append_5394) $(am__append_5401) $(am__append_5408) \ -- $(am__append_5415) $(am__append_5422) $(am__append_5429) \ -+ testload.module$(EXEEXT) $(am__append_5310) $(am__append_5317) \ -+ $(am__append_5324) $(am__append_5331) $(am__append_5338) \ -+ $(am__append_5345) $(am__append_5352) $(am__append_5359) \ -+ $(am__append_5366) $(am__append_5373) $(am__append_5380) \ -+ $(am__append_5387) $(am__append_5394) $(am__append_5401) \ -+ $(am__append_5408) $(am__append_5415) $(am__append_5422) \ - priority_queue.module$(EXEEXT) time.module$(EXEEXT) \ -- $(am__append_5436) $(am__append_5443) adler32.module$(EXEEXT) \ -+ $(am__append_5429) $(am__append_5436) adler32.module$(EXEEXT) \ - crc64.module$(EXEEXT) mpi.module$(EXEEXT) \ -- all_video.module$(EXEEXT) $(am__append_5450) \ -- $(am__append_5457) $(am__append_5464) $(am__append_5471) \ -- $(am__append_5478) $(am__append_5485) \ -- testspeed.module$(EXEEXT) $(am__append_5492) \ -+ all_video.module$(EXEEXT) $(am__append_5443) \ -+ $(am__append_5450) $(am__append_5457) $(am__append_5464) \ -+ $(am__append_5471) $(am__append_5478) \ -+ testspeed.module$(EXEEXT) $(am__append_5485) \ - tr.module$(EXEEXT) progress.module$(EXEEXT) \ -- file.module$(EXEEXT) $(am__append_5499) $(am__append_5506) \ -- $(am__append_5513) $(am__append_5520) $(am__append_5527) \ -- $(am__append_5534) $(am__append_5541) $(am__append_5548) \ -- $(am__append_5555) $(am__append_5562) $(am__append_5569) \ -- $(am__append_5576) $(am__append_5583) $(am__append_5590) \ -+ file.module$(EXEEXT) $(am__append_5492) $(am__append_5499) \ -+ $(am__append_5506) $(am__append_5513) $(am__append_5520) \ -+ $(am__append_5527) $(am__append_5534) $(am__append_5541) \ -+ $(am__append_5548) $(am__append_5555) $(am__append_5562) \ -+ $(am__append_5569) $(am__append_5576) $(am__append_5583) \ - gcry_arcfour.module$(EXEEXT) gcry_blowfish.module$(EXEEXT) \ - gcry_camellia.module$(EXEEXT) gcry_cast5.module$(EXEEXT) \ - gcry_crc.module$(EXEEXT) gcry_des.module$(EXEEXT) \ -@@ -16180,58 +16157,58 @@ MARKER_FILES = disk.marker trig.marker $(am__append_9) \ - hashsum.marker pgp.marker $(am__append_2046) \ - $(am__append_2053) $(am__append_2060) $(am__append_2067) \ - $(am__append_2074) $(am__append_2081) $(am__append_2088) \ -- $(am__append_2095) $(am__append_2102) $(am__append_2109) \ -- help.marker hexdump.marker keystatus.marker $(am__append_2116) \ -- $(am__append_2123) loadenv.marker ls.marker lsmmap.marker \ -- $(am__append_2130) $(am__append_2137) $(am__append_2144) \ -- $(am__append_2151) $(am__append_2158) $(am__append_2165) \ -- $(am__append_2172) $(am__append_2179) memrw.marker \ -+ $(am__append_2095) $(am__append_2102) help.marker \ -+ hexdump.marker keystatus.marker $(am__append_2109) \ -+ $(am__append_2116) loadenv.marker ls.marker lsmmap.marker \ -+ $(am__append_2123) $(am__append_2130) $(am__append_2137) \ -+ $(am__append_2144) $(am__append_2151) $(am__append_2158) \ -+ $(am__append_2165) $(am__append_2172) memrw.marker \ - minicmd.marker parttool.marker password.marker \ -- password_pbkdf2.marker $(am__append_2186) $(am__append_2193) \ -- $(am__append_2200) $(am__append_2207) $(am__append_2214) \ -- $(am__append_2221) $(am__append_2228) $(am__append_2235) \ -- $(am__append_2242) $(am__append_2249) $(am__append_2256) \ -- $(am__append_2263) $(am__append_2270) $(am__append_2277) \ -- $(am__append_2284) $(am__append_2291) $(am__append_2298) \ -- $(am__append_2305) $(am__append_2312) $(am__append_2319) \ -- $(am__append_2326) probe.marker read.marker search.marker \ -+ password_pbkdf2.marker $(am__append_2179) $(am__append_2186) \ -+ $(am__append_2193) $(am__append_2200) $(am__append_2207) \ -+ $(am__append_2214) $(am__append_2221) $(am__append_2228) \ -+ $(am__append_2235) $(am__append_2242) $(am__append_2249) \ -+ $(am__append_2256) $(am__append_2263) $(am__append_2270) \ -+ $(am__append_2277) $(am__append_2284) $(am__append_2291) \ -+ $(am__append_2298) $(am__append_2305) $(am__append_2312) \ -+ $(am__append_2319) probe.marker read.marker search.marker \ - search_fs_file.marker search_fs_uuid.marker \ -- search_label.marker $(am__append_2333) $(am__append_2340) \ -- $(am__append_2347) $(am__append_2354) $(am__append_2361) \ -- $(am__append_2368) $(am__append_2375) $(am__append_2382) \ -- $(am__append_2389) $(am__append_2396) $(am__append_2403) \ -- $(am__append_2410) $(am__append_2417) $(am__append_2424) \ -- $(am__append_2431) $(am__append_2438) sleep.marker \ -- $(am__append_2445) $(am__append_2452) terminal.marker \ -- test.marker true.marker $(am__append_2459) $(am__append_2466) \ -- $(am__append_2473) $(am__append_2480) $(am__append_2487) \ -- $(am__append_2494) $(am__append_2501) $(am__append_2508) \ -- $(am__append_2515) videoinfo.marker videotest.marker \ -+ search_label.marker $(am__append_2326) $(am__append_2333) \ -+ $(am__append_2340) $(am__append_2347) $(am__append_2354) \ -+ $(am__append_2361) $(am__append_2368) $(am__append_2375) \ -+ $(am__append_2382) $(am__append_2389) $(am__append_2396) \ -+ $(am__append_2403) $(am__append_2410) $(am__append_2417) \ -+ $(am__append_2424) $(am__append_2431) sleep.marker \ -+ $(am__append_2438) $(am__append_2445) terminal.marker \ -+ test.marker true.marker $(am__append_2452) $(am__append_2459) \ -+ $(am__append_2466) $(am__append_2473) $(am__append_2480) \ -+ $(am__append_2487) $(am__append_2494) $(am__append_2501) \ -+ $(am__append_2508) videoinfo.marker videotest.marker \ - xnu_uuid.marker dm_nv.marker loopback.marker cryptodisk.marker \ - luks.marker geli.marker lvm.marker ldm.marker mdraid09.marker \ - mdraid09_be.marker mdraid1x.marker diskfilter.marker \ - raid5rec.marker raid6rec.marker scsi.marker memdisk.marker \ -- $(am__append_2522) $(am__append_2529) $(am__append_2536) \ -- $(am__append_2543) $(am__append_2550) $(am__append_2557) \ -- $(am__append_2564) $(am__append_2571) $(am__append_2578) \ -- $(am__append_2585) $(am__append_2592) $(am__append_2599) \ -- $(am__append_2606) $(am__append_2613) $(am__append_2620) \ -- $(am__append_2627) $(am__append_2634) $(am__append_2641) \ -- $(am__append_2648) $(am__append_2655) $(am__append_2662) \ -- $(am__append_2669) $(am__append_2676) $(am__append_2683) \ -- $(am__append_2690) $(am__append_2697) $(am__append_2704) \ -- $(am__append_2711) $(am__append_2718) $(am__append_2725) \ -- $(am__append_2732) $(am__append_2739) $(am__append_2746) \ -- $(am__append_2753) $(am__append_2760) $(am__append_2767) \ -- $(am__append_2774) $(am__append_2781) $(am__append_2788) \ -- $(am__append_2795) $(am__append_2802) $(am__append_2809) \ -- $(am__append_2816) $(am__append_2823) $(am__append_2830) \ -- $(am__append_2837) $(am__append_2844) $(am__append_2851) \ -- $(am__append_2858) $(am__append_2865) $(am__append_2872) \ -- $(am__append_2879) $(am__append_2886) $(am__append_2893) \ -- $(am__append_2900) $(am__append_2907) $(am__append_2914) \ -- $(am__append_2921) $(am__append_2928) $(am__append_2935) \ -- $(am__append_2942) procfs.marker affs.marker afs.marker \ -+ $(am__append_2515) $(am__append_2522) $(am__append_2529) \ -+ $(am__append_2536) $(am__append_2543) $(am__append_2550) \ -+ $(am__append_2557) $(am__append_2564) $(am__append_2571) \ -+ $(am__append_2578) $(am__append_2585) $(am__append_2592) \ -+ $(am__append_2599) $(am__append_2606) $(am__append_2613) \ -+ $(am__append_2620) $(am__append_2627) $(am__append_2634) \ -+ $(am__append_2641) $(am__append_2648) $(am__append_2655) \ -+ $(am__append_2662) $(am__append_2669) $(am__append_2676) \ -+ $(am__append_2683) $(am__append_2690) $(am__append_2697) \ -+ $(am__append_2704) $(am__append_2711) $(am__append_2718) \ -+ $(am__append_2725) $(am__append_2732) $(am__append_2739) \ -+ $(am__append_2746) $(am__append_2753) $(am__append_2760) \ -+ $(am__append_2767) $(am__append_2774) $(am__append_2781) \ -+ $(am__append_2788) $(am__append_2795) $(am__append_2802) \ -+ $(am__append_2809) $(am__append_2816) $(am__append_2823) \ -+ $(am__append_2830) $(am__append_2837) $(am__append_2844) \ -+ $(am__append_2851) $(am__append_2858) $(am__append_2865) \ -+ $(am__append_2872) $(am__append_2879) $(am__append_2886) \ -+ $(am__append_2893) $(am__append_2900) $(am__append_2907) \ -+ $(am__append_2914) $(am__append_2921) $(am__append_2928) \ -+ $(am__append_2935) procfs.marker affs.marker afs.marker \ - bfs.marker zstd.marker btrfs.marker archelp.marker cbfs.marker \ - cpio.marker cpio_be.marker newc.marker odc.marker ext2.marker \ - fat.marker exfat.marker f2fs.marker fshelp.marker hfs.marker \ -@@ -16242,153 +16219,153 @@ MARKER_FILES = disk.marker trig.marker $(am__append_9) \ - squash4.marker tar.marker udf.marker ufs1.marker \ - ufs1_be.marker ufs2.marker xfs.marker zfs.marker \ - zfscrypt.marker zfsinfo.marker macbless.marker \ -- $(am__append_2949) gettext.marker gfxmenu.marker hello.marker \ -- gzio.marker offsetio.marker $(am__append_2956) \ -- $(am__append_2963) $(am__append_2970) $(am__append_2977) \ -- $(am__append_2984) $(am__append_2991) $(am__append_2998) \ -- $(am__append_3005) $(am__append_3012) $(am__append_3019) \ -- $(am__append_3026) $(am__append_3033) $(am__append_3040) \ -- $(am__append_3047) $(am__append_3054) $(am__append_3061) \ -- $(am__append_3068) $(am__append_3075) $(am__append_3082) \ -- $(am__append_3089) elf.marker crypto.marker pbkdf2.marker \ -- $(am__append_3096) $(am__append_3103) $(am__append_3110) \ -- $(am__append_3117) $(am__append_3124) $(am__append_3131) \ -- $(am__append_3138) $(am__append_3145) $(am__append_3152) \ -- $(am__append_3159) $(am__append_3166) $(am__append_3173) \ -- $(am__append_3180) $(am__append_3187) $(am__append_3194) \ -- $(am__append_3201) $(am__append_3208) $(am__append_3215) \ -- $(am__append_3222) $(am__append_3229) $(am__append_3236) \ -- $(am__append_3243) $(am__append_3250) $(am__append_3257) \ -- $(am__append_3264) $(am__append_3271) $(am__append_3278) \ -- $(am__append_3285) $(am__append_3292) $(am__append_3299) \ -- $(am__append_3306) $(am__append_3313) $(am__append_3320) \ -- $(am__append_3327) $(am__append_3334) $(am__append_3341) \ -- setjmp.marker $(am__append_3348) $(am__append_3355) \ -- $(am__append_3362) $(am__append_3369) $(am__append_3376) \ -- $(am__append_3383) $(am__append_3390) $(am__append_3397) \ -- $(am__append_3404) $(am__append_3411) $(am__append_3418) \ -- $(am__append_3425) $(am__append_3432) $(am__append_3439) \ -- $(am__append_3446) $(am__append_3453) $(am__append_3460) \ -- $(am__append_3467) $(am__append_3474) $(am__append_3481) \ -- $(am__append_3488) $(am__append_3495) $(am__append_3502) \ -- $(am__append_3509) $(am__append_3516) $(am__append_3523) \ -- $(am__append_3530) $(am__append_3537) $(am__append_3544) \ -- $(am__append_3551) $(am__append_3558) $(am__append_3565) \ -- $(am__append_3572) $(am__append_3579) $(am__append_3586) \ -- $(am__append_3593) $(am__append_3600) $(am__append_3607) \ -- $(am__append_3614) $(am__append_3621) $(am__append_3628) \ -- $(am__append_3635) $(am__append_3642) $(am__append_3649) \ -- $(am__append_3656) $(am__append_3663) $(am__append_3670) \ -- $(am__append_3677) $(am__append_3684) $(am__append_3691) \ -- $(am__append_3698) $(am__append_3705) $(am__append_3712) \ -- $(am__append_3719) $(am__append_3726) $(am__append_3733) \ -- $(am__append_3740) $(am__append_3747) $(am__append_3754) \ -- $(am__append_3761) $(am__append_3768) $(am__append_3775) \ -- $(am__append_3782) $(am__append_3789) $(am__append_3796) \ -- $(am__append_3803) $(am__append_3810) $(am__append_3817) \ -- $(am__append_3824) $(am__append_3831) $(am__append_3838) \ -- $(am__append_3845) $(am__append_3852) $(am__append_3859) \ -- $(am__append_3866) $(am__append_3873) $(am__append_3880) \ -- $(am__append_3887) macho.marker $(am__append_3894) \ -- $(am__append_3901) $(am__append_3908) $(am__append_3915) \ -- $(am__append_3922) $(am__append_3929) $(am__append_3936) \ -- $(am__append_3943) $(am__append_3950) $(am__append_3957) \ -- $(am__append_3964) $(am__append_3971) $(am__append_3978) \ -- $(am__append_3985) $(am__append_3992) $(am__append_3999) \ -- $(am__append_4006) $(am__append_4013) $(am__append_4020) \ -- $(am__append_4027) $(am__append_4034) $(am__append_4041) \ -- $(am__append_4048) $(am__append_4055) $(am__append_4062) \ -- $(am__append_4069) $(am__append_4076) normal.marker \ -+ $(am__append_2942) gettext.marker gfxmenu.marker hello.marker \ -+ gzio.marker offsetio.marker $(am__append_2949) \ -+ $(am__append_2956) $(am__append_2963) $(am__append_2970) \ -+ $(am__append_2977) $(am__append_2984) $(am__append_2991) \ -+ $(am__append_2998) $(am__append_3005) $(am__append_3012) \ -+ $(am__append_3019) $(am__append_3026) $(am__append_3033) \ -+ $(am__append_3040) $(am__append_3047) $(am__append_3054) \ -+ $(am__append_3061) $(am__append_3068) $(am__append_3075) \ -+ $(am__append_3082) elf.marker crypto.marker pbkdf2.marker \ -+ $(am__append_3089) $(am__append_3096) $(am__append_3103) \ -+ $(am__append_3110) $(am__append_3117) $(am__append_3124) \ -+ $(am__append_3131) $(am__append_3138) $(am__append_3145) \ -+ $(am__append_3152) $(am__append_3159) $(am__append_3166) \ -+ $(am__append_3173) $(am__append_3180) $(am__append_3187) \ -+ $(am__append_3194) $(am__append_3201) $(am__append_3208) \ -+ $(am__append_3215) $(am__append_3222) $(am__append_3229) \ -+ $(am__append_3236) $(am__append_3243) $(am__append_3250) \ -+ $(am__append_3257) $(am__append_3264) $(am__append_3271) \ -+ $(am__append_3278) $(am__append_3285) $(am__append_3292) \ -+ $(am__append_3299) $(am__append_3306) $(am__append_3313) \ -+ $(am__append_3320) $(am__append_3327) $(am__append_3334) \ -+ setjmp.marker $(am__append_3341) $(am__append_3348) \ -+ $(am__append_3355) $(am__append_3362) $(am__append_3369) \ -+ $(am__append_3376) $(am__append_3383) $(am__append_3390) \ -+ $(am__append_3397) $(am__append_3404) $(am__append_3411) \ -+ $(am__append_3418) $(am__append_3425) $(am__append_3432) \ -+ $(am__append_3439) $(am__append_3446) $(am__append_3453) \ -+ $(am__append_3460) $(am__append_3467) $(am__append_3474) \ -+ $(am__append_3481) $(am__append_3488) $(am__append_3495) \ -+ $(am__append_3502) $(am__append_3509) $(am__append_3516) \ -+ $(am__append_3523) $(am__append_3530) $(am__append_3537) \ -+ $(am__append_3544) $(am__append_3551) $(am__append_3558) \ -+ $(am__append_3565) $(am__append_3572) $(am__append_3579) \ -+ $(am__append_3586) $(am__append_3593) $(am__append_3600) \ -+ $(am__append_3607) $(am__append_3614) $(am__append_3621) \ -+ $(am__append_3628) $(am__append_3635) $(am__append_3642) \ -+ $(am__append_3649) $(am__append_3656) $(am__append_3663) \ -+ $(am__append_3670) $(am__append_3677) $(am__append_3684) \ -+ $(am__append_3691) $(am__append_3698) $(am__append_3705) \ -+ $(am__append_3712) $(am__append_3719) $(am__append_3726) \ -+ $(am__append_3733) $(am__append_3740) $(am__append_3747) \ -+ $(am__append_3754) $(am__append_3761) $(am__append_3768) \ -+ $(am__append_3775) $(am__append_3782) $(am__append_3789) \ -+ $(am__append_3796) $(am__append_3803) $(am__append_3810) \ -+ $(am__append_3817) $(am__append_3824) $(am__append_3831) \ -+ $(am__append_3838) $(am__append_3845) $(am__append_3852) \ -+ $(am__append_3859) $(am__append_3866) $(am__append_3873) \ -+ $(am__append_3880) macho.marker $(am__append_3887) \ -+ $(am__append_3894) $(am__append_3901) $(am__append_3908) \ -+ $(am__append_3915) $(am__append_3922) $(am__append_3929) \ -+ $(am__append_3936) $(am__append_3943) $(am__append_3950) \ -+ $(am__append_3957) $(am__append_3964) $(am__append_3971) \ -+ $(am__append_3978) $(am__append_3985) $(am__append_3992) \ -+ $(am__append_3999) $(am__append_4006) $(am__append_4013) \ -+ $(am__append_4020) $(am__append_4027) $(am__append_4034) \ -+ $(am__append_4041) $(am__append_4048) $(am__append_4055) \ -+ $(am__append_4062) $(am__append_4069) normal.marker \ - part_acorn.marker part_amiga.marker part_apple.marker \ - part_gpt.marker part_msdos.marker part_sun.marker \ - part_plan.marker part_dvh.marker part_bsd.marker \ - part_sunpc.marker part_dfly.marker msdospart.marker \ -- $(am__append_4083) $(am__append_4090) $(am__append_4097) \ -- $(am__append_4104) $(am__append_4111) $(am__append_4118) \ -- $(am__append_4125) $(am__append_4132) $(am__append_4139) \ -- $(am__append_4146) $(am__append_4153) $(am__append_4160) \ -- $(am__append_4167) $(am__append_4174) $(am__append_4181) \ -- $(am__append_4188) $(am__append_4195) $(am__append_4202) \ -- $(am__append_4209) $(am__append_4216) $(am__append_4223) \ -- $(am__append_4230) $(am__append_4237) $(am__append_4244) \ -- $(am__append_4251) $(am__append_4258) $(am__append_4265) \ -- gfxterm_background.marker $(am__append_4272) \ -- $(am__append_4279) $(am__append_4286) $(am__append_4293) \ -- $(am__append_4300) $(am__append_4307) $(am__append_4314) \ -- $(am__append_4321) $(am__append_4328) $(am__append_4335) \ -- $(am__append_4342) $(am__append_4349) $(am__append_4356) \ -- $(am__append_4363) $(am__append_4370) $(am__append_4377) \ -- $(am__append_4384) $(am__append_4391) $(am__append_4398) \ -- $(am__append_4405) $(am__append_4412) $(am__append_4419) \ -- $(am__append_4426) $(am__append_4433) $(am__append_4440) \ -- $(am__append_4447) $(am__append_4454) $(am__append_4461) \ -- $(am__append_4468) $(am__append_4475) $(am__append_4482) \ -- $(am__append_4489) $(am__append_4496) $(am__append_4503) \ -- $(am__append_4510) $(am__append_4517) $(am__append_4524) \ -- $(am__append_4531) $(am__append_4538) $(am__append_4545) \ -- $(am__append_4552) $(am__append_4559) $(am__append_4566) \ -- $(am__append_4573) $(am__append_4580) $(am__append_4587) \ -- $(am__append_4594) $(am__append_4601) $(am__append_4608) \ -- $(am__append_4615) $(am__append_4622) $(am__append_4629) \ -- $(am__append_4636) $(am__append_4643) $(am__append_4650) \ -+ $(am__append_4076) $(am__append_4083) $(am__append_4090) \ -+ $(am__append_4097) $(am__append_4104) $(am__append_4111) \ -+ $(am__append_4118) $(am__append_4125) $(am__append_4132) \ -+ $(am__append_4139) $(am__append_4146) $(am__append_4153) \ -+ $(am__append_4160) $(am__append_4167) $(am__append_4174) \ -+ $(am__append_4181) $(am__append_4188) $(am__append_4195) \ -+ $(am__append_4202) $(am__append_4209) $(am__append_4216) \ -+ $(am__append_4223) $(am__append_4230) $(am__append_4237) \ -+ $(am__append_4244) $(am__append_4251) $(am__append_4258) \ -+ gfxterm_background.marker $(am__append_4265) \ -+ $(am__append_4272) $(am__append_4279) $(am__append_4286) \ -+ $(am__append_4293) $(am__append_4300) $(am__append_4307) \ -+ $(am__append_4314) $(am__append_4321) $(am__append_4328) \ -+ $(am__append_4335) $(am__append_4342) $(am__append_4349) \ -+ $(am__append_4356) $(am__append_4363) $(am__append_4370) \ -+ $(am__append_4377) $(am__append_4384) $(am__append_4391) \ -+ $(am__append_4398) $(am__append_4405) $(am__append_4412) \ -+ $(am__append_4419) $(am__append_4426) $(am__append_4433) \ -+ $(am__append_4440) $(am__append_4447) $(am__append_4454) \ -+ $(am__append_4461) $(am__append_4468) $(am__append_4475) \ -+ $(am__append_4482) $(am__append_4489) $(am__append_4496) \ -+ $(am__append_4503) $(am__append_4510) $(am__append_4517) \ -+ $(am__append_4524) $(am__append_4531) $(am__append_4538) \ -+ $(am__append_4545) $(am__append_4552) $(am__append_4559) \ -+ $(am__append_4566) $(am__append_4573) $(am__append_4580) \ -+ $(am__append_4587) $(am__append_4594) $(am__append_4601) \ -+ $(am__append_4608) $(am__append_4615) $(am__append_4622) \ -+ $(am__append_4629) $(am__append_4636) $(am__append_4643) \ - functional_test.marker exfctest.marker strtoull_test.marker \ - setjmp_test.marker signature_test.marker sleep_test.marker \ -- xnu_uuid_test.marker pbkdf2_test.marker $(am__append_4657) \ -- $(am__append_4664) $(am__append_4671) $(am__append_4678) \ -- $(am__append_4685) $(am__append_4692) $(am__append_4699) \ -- $(am__append_4706) $(am__append_4713) $(am__append_4720) \ -- $(am__append_4727) $(am__append_4734) $(am__append_4741) \ -- $(am__append_4748) $(am__append_4755) $(am__append_4762) \ -- $(am__append_4769) $(am__append_4776) $(am__append_4783) \ -- $(am__append_4790) $(am__append_4797) $(am__append_4804) \ -- $(am__append_4811) $(am__append_4818) $(am__append_4825) \ -+ xnu_uuid_test.marker pbkdf2_test.marker $(am__append_4650) \ -+ $(am__append_4657) $(am__append_4664) $(am__append_4671) \ -+ $(am__append_4678) $(am__append_4685) $(am__append_4692) \ -+ $(am__append_4699) $(am__append_4706) $(am__append_4713) \ -+ $(am__append_4720) $(am__append_4727) $(am__append_4734) \ -+ $(am__append_4741) $(am__append_4748) $(am__append_4755) \ -+ $(am__append_4762) $(am__append_4769) $(am__append_4776) \ -+ $(am__append_4783) $(am__append_4790) $(am__append_4797) \ -+ $(am__append_4804) $(am__append_4811) $(am__append_4818) \ - div_test.marker mul_test.marker shift_test.marker \ - cmp_test.marker ctz_test.marker bswap_test.marker \ - videotest_checksum.marker gfxterm_menu.marker \ - cmdline_cat_test.marker bitmap.marker bitmap_scale.marker \ -- $(am__append_4832) $(am__append_4839) $(am__append_4846) \ -- $(am__append_4853) $(am__append_4860) $(am__append_4867) \ -- $(am__append_4874) $(am__append_4881) $(am__append_4888) \ -- jpeg.marker png.marker tga.marker $(am__append_4895) \ -- $(am__append_4902) $(am__append_4909) $(am__append_4916) \ -- $(am__append_4923) $(am__append_4930) $(am__append_4937) \ -- $(am__append_4944) $(am__append_4951) $(am__append_4958) \ -- $(am__append_4965) $(am__append_4972) $(am__append_4979) \ -- $(am__append_4986) $(am__append_4993) $(am__append_5000) \ -- $(am__append_5007) $(am__append_5014) $(am__append_5021) \ -- $(am__append_5028) $(am__append_5035) $(am__append_5042) \ -- $(am__append_5049) $(am__append_5056) $(am__append_5063) \ -- $(am__append_5070) $(am__append_5077) $(am__append_5084) \ -- $(am__append_5091) $(am__append_5098) $(am__append_5105) \ -- $(am__append_5112) $(am__append_5119) $(am__append_5126) \ -- $(am__append_5133) $(am__append_5140) $(am__append_5147) \ -- $(am__append_5154) $(am__append_5161) $(am__append_5168) \ -- $(am__append_5175) video_colors.marker $(am__append_5182) \ -- $(am__append_5189) datehook.marker net.marker tftp.marker \ -- http.marker $(am__append_5196) $(am__append_5203) \ -- $(am__append_5210) $(am__append_5217) $(am__append_5224) \ -- $(am__append_5231) $(am__append_5238) $(am__append_5245) \ -- $(am__append_5252) $(am__append_5259) $(am__append_5266) \ -- $(am__append_5273) $(am__append_5280) $(am__append_5287) \ -- $(am__append_5294) $(am__append_5301) $(am__append_5308) \ -- $(am__append_5315) syslinuxcfg.marker test_blockarg.marker \ -- xzio.marker lzopio.marker testload.marker $(am__append_5322) \ -- $(am__append_5329) $(am__append_5336) $(am__append_5343) \ -- $(am__append_5350) $(am__append_5357) $(am__append_5364) \ -- $(am__append_5371) $(am__append_5378) $(am__append_5385) \ -- $(am__append_5392) $(am__append_5399) $(am__append_5406) \ -- $(am__append_5413) $(am__append_5420) $(am__append_5427) \ -- $(am__append_5434) priority_queue.marker time.marker \ -- $(am__append_5441) $(am__append_5448) adler32.marker \ -- crc64.marker mpi.marker all_video.marker $(am__append_5455) \ -- $(am__append_5462) $(am__append_5469) $(am__append_5476) \ -- $(am__append_5483) $(am__append_5490) testspeed.marker \ -- $(am__append_5497) tr.marker progress.marker file.marker \ -- $(am__append_5504) $(am__append_5511) $(am__append_5518) \ -- $(am__append_5525) $(am__append_5532) $(am__append_5539) \ -- $(am__append_5546) $(am__append_5553) $(am__append_5560) \ -- $(am__append_5567) $(am__append_5574) $(am__append_5581) \ -- $(am__append_5588) $(am__append_5595) gcry_arcfour.marker \ -+ $(am__append_4825) $(am__append_4832) $(am__append_4839) \ -+ $(am__append_4846) $(am__append_4853) $(am__append_4860) \ -+ $(am__append_4867) $(am__append_4874) $(am__append_4881) \ -+ jpeg.marker png.marker tga.marker $(am__append_4888) \ -+ $(am__append_4895) $(am__append_4902) $(am__append_4909) \ -+ $(am__append_4916) $(am__append_4923) $(am__append_4930) \ -+ $(am__append_4937) $(am__append_4944) $(am__append_4951) \ -+ $(am__append_4958) $(am__append_4965) $(am__append_4972) \ -+ $(am__append_4979) $(am__append_4986) $(am__append_4993) \ -+ $(am__append_5000) $(am__append_5007) $(am__append_5014) \ -+ $(am__append_5021) $(am__append_5028) $(am__append_5035) \ -+ $(am__append_5042) $(am__append_5049) $(am__append_5056) \ -+ $(am__append_5063) $(am__append_5070) $(am__append_5077) \ -+ $(am__append_5084) $(am__append_5091) $(am__append_5098) \ -+ $(am__append_5105) $(am__append_5112) $(am__append_5119) \ -+ $(am__append_5126) $(am__append_5133) $(am__append_5140) \ -+ $(am__append_5147) $(am__append_5154) $(am__append_5161) \ -+ $(am__append_5168) video_colors.marker $(am__append_5175) \ -+ $(am__append_5182) datehook.marker net.marker tftp.marker \ -+ http.marker $(am__append_5189) $(am__append_5196) \ -+ $(am__append_5203) $(am__append_5210) $(am__append_5217) \ -+ $(am__append_5224) $(am__append_5231) $(am__append_5238) \ -+ $(am__append_5245) $(am__append_5252) $(am__append_5259) \ -+ $(am__append_5266) $(am__append_5273) $(am__append_5280) \ -+ $(am__append_5287) $(am__append_5294) $(am__append_5301) \ -+ $(am__append_5308) syslinuxcfg.marker test_blockarg.marker \ -+ xzio.marker lzopio.marker testload.marker $(am__append_5315) \ -+ $(am__append_5322) $(am__append_5329) $(am__append_5336) \ -+ $(am__append_5343) $(am__append_5350) $(am__append_5357) \ -+ $(am__append_5364) $(am__append_5371) $(am__append_5378) \ -+ $(am__append_5385) $(am__append_5392) $(am__append_5399) \ -+ $(am__append_5406) $(am__append_5413) $(am__append_5420) \ -+ $(am__append_5427) priority_queue.marker time.marker \ -+ $(am__append_5434) $(am__append_5441) adler32.marker \ -+ crc64.marker mpi.marker all_video.marker $(am__append_5448) \ -+ $(am__append_5455) $(am__append_5462) $(am__append_5469) \ -+ $(am__append_5476) $(am__append_5483) testspeed.marker \ -+ $(am__append_5490) tr.marker progress.marker file.marker \ -+ $(am__append_5497) $(am__append_5504) $(am__append_5511) \ -+ $(am__append_5518) $(am__append_5525) $(am__append_5532) \ -+ $(am__append_5539) $(am__append_5546) $(am__append_5553) \ -+ $(am__append_5560) $(am__append_5567) $(am__append_5574) \ -+ $(am__append_5581) $(am__append_5588) gcry_arcfour.marker \ - gcry_blowfish.marker gcry_camellia.marker gcry_cast5.marker \ - gcry_crc.marker gcry_des.marker gcry_dsa.marker \ - gcry_idea.marker gcry_md4.marker gcry_md5.marker \ -@@ -16410,8 +16387,8 @@ KERNEL_HEADER_FILES = $(top_srcdir)/include/grub/cache.h \ - $(top_srcdir)/include/grub/i18n.h \ - $(top_srcdir)/include/grub/kernel.h \ - $(top_srcdir)/include/grub/list.h \ -- $(top_srcdir)/include/grub/misc.h $(am__append_5801) \ -- $(am__append_5802) $(top_srcdir)/include/grub/mm.h \ -+ $(top_srcdir)/include/grub/misc.h $(am__append_5794) \ -+ $(am__append_5795) $(top_srcdir)/include/grub/mm.h \ - $(top_srcdir)/include/grub/parser.h \ - $(top_srcdir)/include/grub/partition.h \ - $(top_srcdir)/include/grub/term.h \ -@@ -16419,38 +16396,38 @@ KERNEL_HEADER_FILES = $(top_srcdir)/include/grub/cache.h \ - $(top_srcdir)/include/grub/verify.h \ - $(top_srcdir)/include/grub/mm_private.h \ - $(top_srcdir)/include/grub/net.h \ -- $(top_srcdir)/include/grub/memory.h $(am__append_5803) \ -- $(am__append_5804) $(am__append_5805) $(am__append_5806) \ -- $(am__append_5807) $(am__append_5808) $(am__append_5809) \ -- $(am__append_5810) $(am__append_5811) $(am__append_5812) \ -- $(am__append_5813) $(am__append_5814) $(am__append_5815) \ -- $(am__append_5816) $(am__append_5817) $(am__append_5818) \ -- $(am__append_5819) $(am__append_5820) $(am__append_5821) \ -- $(am__append_5822) $(am__append_5823) $(am__append_5824) \ -- $(am__append_5825) $(am__append_5826) $(am__append_5827) \ -- $(am__append_5828) $(am__append_5829) --man_MANS = $(am__append_5792) -+ $(top_srcdir)/include/grub/memory.h $(am__append_5796) \ -+ $(am__append_5797) $(am__append_5798) $(am__append_5799) \ -+ $(am__append_5800) $(am__append_5801) $(am__append_5802) \ -+ $(am__append_5803) $(am__append_5804) $(am__append_5805) \ -+ $(am__append_5806) $(am__append_5807) $(am__append_5808) \ -+ $(am__append_5809) $(am__append_5810) $(am__append_5811) \ -+ $(am__append_5812) $(am__append_5813) $(am__append_5814) \ -+ $(am__append_5815) $(am__append_5816) $(am__append_5817) \ -+ $(am__append_5818) $(am__append_5819) $(am__append_5820) \ -+ $(am__append_5821) $(am__append_5822) -+man_MANS = $(am__append_5785) - noinst_DATA = gensyminfo.sh genmod.sh modinfo.sh kernel_syms.lst - pkgdata_DATA = - bin_SCRIPTS = - sbin_SCRIPTS = --platform_DATA = $(am__append_5600) $(am__append_5605) \ -- $(am__append_5610) $(am__append_5615) $(am__append_5620) \ -- $(am__append_5625) $(am__append_5630) $(am__append_5635) \ -- $(am__append_5640) $(am__append_5645) $(am__append_5650) \ -- $(am__append_5655) $(am__append_5660) $(am__append_5665) \ -- $(am__append_5670) $(am__append_5675) $(am__append_5680) \ -- $(am__append_5685) $(am__append_5690) $(am__append_5695) \ -- $(am__append_5700) $(am__append_5705) $(am__append_5710) \ -- $(am__append_5715) $(am__append_5720) $(am__append_5725) \ -- $(am__append_5730) $(am__append_5735) $(am__append_5740) \ -- $(am__append_5745) $(am__append_5750) $(am__append_5755) \ -- $(am__append_5760) $(am__append_5765) $(am__append_5770) \ -- $(am__append_5775) $(am__append_5780) $(am__append_5785) \ -- $(am__append_5790) gmodule.pl gdb_grub $(am__append_5797) \ -+platform_DATA = $(am__append_5593) $(am__append_5598) \ -+ $(am__append_5603) $(am__append_5608) $(am__append_5613) \ -+ $(am__append_5618) $(am__append_5623) $(am__append_5628) \ -+ $(am__append_5633) $(am__append_5638) $(am__append_5643) \ -+ $(am__append_5648) $(am__append_5653) $(am__append_5658) \ -+ $(am__append_5663) $(am__append_5668) $(am__append_5673) \ -+ $(am__append_5678) $(am__append_5683) $(am__append_5688) \ -+ $(am__append_5693) $(am__append_5698) $(am__append_5703) \ -+ $(am__append_5708) $(am__append_5713) $(am__append_5718) \ -+ $(am__append_5723) $(am__append_5728) $(am__append_5733) \ -+ $(am__append_5738) $(am__append_5743) $(am__append_5748) \ -+ $(am__append_5753) $(am__append_5758) $(am__append_5763) \ -+ $(am__append_5768) $(am__append_5773) $(am__append_5778) \ -+ $(am__append_5783) gmodule.pl gdb_grub $(am__append_5790) \ - fs.lst command.lst partmap.lst terminal.lst fdt.lst \ - parttool.lst video.lst crypto.lst moddep.lst $(MOD_FILES) \ -- modinfo.sh $(am__append_5831) -+ modinfo.sh $(am__append_5824) - check_SCRIPTS = - dist_grubconf_DATA = - noinst_SCRIPTS = -@@ -16567,7 +16544,7 @@ dist_noinst_DATA = kern/disk_common.c gentrigtables.c $(am__append_5) \ - $(am__append_2259) $(am__append_2266) $(am__append_2273) \ - $(am__append_2280) $(am__append_2287) $(am__append_2294) \ - $(am__append_2301) $(am__append_2308) $(am__append_2315) \ -- $(am__append_2322) commands/search.c $(am__append_2329) \ -+ commands/search.c $(am__append_2322) $(am__append_2329) \ - $(am__append_2336) $(am__append_2343) $(am__append_2350) \ - $(am__append_2357) $(am__append_2364) $(am__append_2371) \ - $(am__append_2378) $(am__append_2385) $(am__append_2392) \ -@@ -16603,8 +16580,8 @@ dist_noinst_DATA = kern/disk_common.c gentrigtables.c $(am__append_5) \ - $(am__append_3008) $(am__append_3015) $(am__append_3022) \ - $(am__append_3029) $(am__append_3036) $(am__append_3043) \ - $(am__append_3050) $(am__append_3057) $(am__append_3064) \ -- $(am__append_3071) $(am__append_3078) $(am__append_3085) \ -- kern/elfXX.c lib/libgcrypt-grub/cipher/crypto.lst \ -+ $(am__append_3071) $(am__append_3078) kern/elfXX.c \ -+ lib/libgcrypt-grub/cipher/crypto.lst $(am__append_3085) \ - $(am__append_3092) $(am__append_3099) $(am__append_3106) \ - $(am__append_3113) $(am__append_3120) $(am__append_3127) \ - $(am__append_3134) $(am__append_3141) $(am__append_3148) \ -@@ -16616,11 +16593,11 @@ dist_noinst_DATA = kern/disk_common.c gentrigtables.c $(am__append_5) \ - $(am__append_3260) $(am__append_3267) $(am__append_3274) \ - $(am__append_3281) $(am__append_3288) $(am__append_3295) \ - $(am__append_3302) $(am__append_3309) $(am__append_3316) \ -- $(am__append_3323) $(am__append_3330) $(am__append_3337) \ -- lib/i386/setjmp.S lib/mips/setjmp.S lib/x86_64/setjmp.S \ -- lib/sparc64/setjmp.S lib/powerpc/setjmp.S lib/ia64/setjmp.S \ -- lib/ia64/longjmp.S lib/arm/setjmp.S lib/arm64/setjmp.S \ -- lib/riscv/setjmp.S $(am__append_3344) $(am__append_3351) \ -+ $(am__append_3323) $(am__append_3330) lib/i386/setjmp.S \ -+ lib/mips/setjmp.S lib/x86_64/setjmp.S lib/sparc64/setjmp.S \ -+ lib/powerpc/setjmp.S lib/ia64/setjmp.S lib/ia64/longjmp.S \ -+ lib/arm/setjmp.S lib/arm64/setjmp.S lib/riscv/setjmp.S \ -+ $(am__append_3337) $(am__append_3344) $(am__append_3351) \ - $(am__append_3358) $(am__append_3365) $(am__append_3372) \ - $(am__append_3379) $(am__append_3386) $(am__append_3393) \ - $(am__append_3400) $(am__append_3407) $(am__append_3414) \ -@@ -16646,7 +16623,7 @@ dist_noinst_DATA = kern/disk_common.c gentrigtables.c $(am__append_5) \ - $(am__append_3820) $(am__append_3827) $(am__append_3834) \ - $(am__append_3841) $(am__append_3848) $(am__append_3855) \ - $(am__append_3862) $(am__append_3869) $(am__append_3876) \ -- $(am__append_3883) loader/machoXX.c $(am__append_3890) \ -+ loader/machoXX.c $(am__append_3883) $(am__append_3890) \ - $(am__append_3897) $(am__append_3904) $(am__append_3911) \ - $(am__append_3918) $(am__append_3925) $(am__append_3932) \ - $(am__append_3939) $(am__append_3946) $(am__append_3953) \ -@@ -16655,8 +16632,8 @@ dist_noinst_DATA = kern/disk_common.c gentrigtables.c $(am__append_5) \ - $(am__append_4002) $(am__append_4009) $(am__append_4016) \ - $(am__append_4023) $(am__append_4030) $(am__append_4037) \ - $(am__append_4044) $(am__append_4051) $(am__append_4058) \ -- $(am__append_4065) $(am__append_4072) script/yylex.l \ -- script/parser.y $(am__append_4079) $(am__append_4086) \ -+ $(am__append_4065) script/yylex.l script/parser.y \ -+ $(am__append_4072) $(am__append_4079) $(am__append_4086) \ - $(am__append_4093) $(am__append_4100) $(am__append_4107) \ - $(am__append_4114) $(am__append_4121) $(am__append_4128) \ - $(am__append_4135) $(am__append_4142) $(am__append_4149) \ -@@ -16723,30 +16700,29 @@ dist_noinst_DATA = kern/disk_common.c gentrigtables.c $(am__append_5) \ - $(am__append_5416) $(am__append_5423) $(am__append_5430) \ - $(am__append_5437) $(am__append_5444) $(am__append_5451) \ - $(am__append_5458) $(am__append_5465) $(am__append_5472) \ -- $(am__append_5479) $(am__append_5486) $(am__append_5493) \ -- commands/fileXX.c loader/i386/xen_fileXX.c $(am__append_5500) \ -+ $(am__append_5479) $(am__append_5486) commands/fileXX.c \ -+ loader/i386/xen_fileXX.c $(am__append_5493) $(am__append_5500) \ - $(am__append_5507) $(am__append_5514) $(am__append_5521) \ - $(am__append_5528) $(am__append_5535) $(am__append_5542) \ - $(am__append_5549) $(am__append_5556) $(am__append_5563) \ - $(am__append_5570) $(am__append_5577) $(am__append_5584) \ -- $(am__append_5591) $(am__append_5597) $(am__append_5602) \ -- $(am__append_5607) $(am__append_5612) $(am__append_5617) \ -- $(am__append_5622) $(am__append_5627) $(am__append_5632) \ -- $(am__append_5637) $(am__append_5642) $(am__append_5647) \ -- $(am__append_5652) $(am__append_5657) $(am__append_5662) \ -- $(am__append_5667) $(am__append_5672) $(am__append_5677) \ -- $(am__append_5682) $(am__append_5687) $(am__append_5692) \ -- $(am__append_5697) $(am__append_5702) $(am__append_5707) \ -- $(am__append_5712) $(am__append_5717) $(am__append_5722) \ -- $(am__append_5727) $(am__append_5732) $(am__append_5737) \ -- $(am__append_5742) $(am__append_5747) $(am__append_5752) \ -- $(am__append_5757) $(am__append_5762) $(am__append_5767) \ -- $(am__append_5772) $(am__append_5777) $(am__append_5782) \ -- $(am__append_5787) $(am__append_5794) gensyminfo.sh.in \ -- genmod.sh.in modinfo.sh.in gmodule.pl.in gdb_grub.in \ -- $(am__append_5800) -+ $(am__append_5590) $(am__append_5595) $(am__append_5600) \ -+ $(am__append_5605) $(am__append_5610) $(am__append_5615) \ -+ $(am__append_5620) $(am__append_5625) $(am__append_5630) \ -+ $(am__append_5635) $(am__append_5640) $(am__append_5645) \ -+ $(am__append_5650) $(am__append_5655) $(am__append_5660) \ -+ $(am__append_5665) $(am__append_5670) $(am__append_5675) \ -+ $(am__append_5680) $(am__append_5685) $(am__append_5690) \ -+ $(am__append_5695) $(am__append_5700) $(am__append_5705) \ -+ $(am__append_5710) $(am__append_5715) $(am__append_5720) \ -+ $(am__append_5725) $(am__append_5730) $(am__append_5735) \ -+ $(am__append_5740) $(am__append_5745) $(am__append_5750) \ -+ $(am__append_5755) $(am__append_5760) $(am__append_5765) \ -+ $(am__append_5770) $(am__append_5775) $(am__append_5780) \ -+ $(am__append_5787) gensyminfo.sh.in genmod.sh.in modinfo.sh.in \ -+ gmodule.pl.in gdb_grub.in $(am__append_5793) - platform_SCRIPTS = --EXTRA_DIST = $(am__append_5799) -+EXTRA_DIST = $(am__append_5792) - CLEANFILES = build-grub-pep2elf$(BUILD_EXEEXT) \ - build-grub-pe2elf$(BUILD_EXEEXT) gentrigtables$(BUILD_EXEEXT) \ - build-grub-module-verifier$(BUILD_EXEEXT) trigtables.c \ -@@ -16862,48 +16838,48 @@ CLEANFILES = build-grub-pep2elf$(BUILD_EXEEXT) \ - $(nodist_pgp_module_SOURCES) pgp.marker $(am__append_2044) \ - $(am__append_2051) $(am__append_2058) $(am__append_2065) \ - $(am__append_2072) $(am__append_2079) $(am__append_2086) \ -- $(am__append_2093) $(am__append_2100) $(am__append_2107) \ -+ $(am__append_2093) $(am__append_2100) \ - $(nodist_help_module_SOURCES) help.marker \ - $(nodist_hexdump_module_SOURCES) hexdump.marker \ - $(nodist_keystatus_module_SOURCES) keystatus.marker \ -- $(am__append_2114) $(am__append_2121) \ -+ $(am__append_2107) $(am__append_2114) \ - $(nodist_loadenv_module_SOURCES) loadenv.marker \ - $(nodist_ls_module_SOURCES) ls.marker \ - $(nodist_lsmmap_module_SOURCES) lsmmap.marker \ -- $(am__append_2128) $(am__append_2135) $(am__append_2142) \ -- $(am__append_2149) $(am__append_2156) $(am__append_2163) \ -- $(am__append_2170) $(am__append_2177) \ -+ $(am__append_2121) $(am__append_2128) $(am__append_2135) \ -+ $(am__append_2142) $(am__append_2149) $(am__append_2156) \ -+ $(am__append_2163) $(am__append_2170) \ - $(nodist_memrw_module_SOURCES) memrw.marker \ - $(nodist_minicmd_module_SOURCES) minicmd.marker \ - $(nodist_parttool_module_SOURCES) parttool.marker \ - $(nodist_password_module_SOURCES) password.marker \ - $(nodist_password_pbkdf2_module_SOURCES) \ -- password_pbkdf2.marker $(am__append_2184) $(am__append_2191) \ -- $(am__append_2198) $(am__append_2205) $(am__append_2212) \ -- $(am__append_2219) $(am__append_2226) $(am__append_2233) \ -- $(am__append_2240) $(am__append_2247) $(am__append_2254) \ -- $(am__append_2261) $(am__append_2268) $(am__append_2275) \ -- $(am__append_2282) $(am__append_2289) $(am__append_2296) \ -- $(am__append_2303) $(am__append_2310) $(am__append_2317) \ -- $(am__append_2324) $(nodist_probe_module_SOURCES) probe.marker \ -+ password_pbkdf2.marker $(am__append_2177) $(am__append_2184) \ -+ $(am__append_2191) $(am__append_2198) $(am__append_2205) \ -+ $(am__append_2212) $(am__append_2219) $(am__append_2226) \ -+ $(am__append_2233) $(am__append_2240) $(am__append_2247) \ -+ $(am__append_2254) $(am__append_2261) $(am__append_2268) \ -+ $(am__append_2275) $(am__append_2282) $(am__append_2289) \ -+ $(am__append_2296) $(am__append_2303) $(am__append_2310) \ -+ $(am__append_2317) $(nodist_probe_module_SOURCES) probe.marker \ - $(nodist_read_module_SOURCES) read.marker \ - $(nodist_search_module_SOURCES) search.marker \ - $(nodist_search_fs_file_module_SOURCES) search_fs_file.marker \ - $(nodist_search_fs_uuid_module_SOURCES) search_fs_uuid.marker \ - $(nodist_search_label_module_SOURCES) search_label.marker \ -- $(am__append_2331) $(am__append_2338) $(am__append_2345) \ -- $(am__append_2352) $(am__append_2359) $(am__append_2366) \ -- $(am__append_2373) $(am__append_2380) $(am__append_2387) \ -- $(am__append_2394) $(am__append_2401) $(am__append_2408) \ -- $(am__append_2415) $(am__append_2422) $(am__append_2429) \ -- $(am__append_2436) $(nodist_sleep_module_SOURCES) sleep.marker \ -- $(am__append_2443) $(am__append_2450) \ -+ $(am__append_2324) $(am__append_2331) $(am__append_2338) \ -+ $(am__append_2345) $(am__append_2352) $(am__append_2359) \ -+ $(am__append_2366) $(am__append_2373) $(am__append_2380) \ -+ $(am__append_2387) $(am__append_2394) $(am__append_2401) \ -+ $(am__append_2408) $(am__append_2415) $(am__append_2422) \ -+ $(am__append_2429) $(nodist_sleep_module_SOURCES) sleep.marker \ -+ $(am__append_2436) $(am__append_2443) \ - $(nodist_terminal_module_SOURCES) terminal.marker \ - $(nodist_test_module_SOURCES) test.marker \ -- $(nodist_true_module_SOURCES) true.marker $(am__append_2457) \ -- $(am__append_2464) $(am__append_2471) $(am__append_2478) \ -- $(am__append_2485) $(am__append_2492) $(am__append_2499) \ -- $(am__append_2506) $(am__append_2513) \ -+ $(nodist_true_module_SOURCES) true.marker $(am__append_2450) \ -+ $(am__append_2457) $(am__append_2464) $(am__append_2471) \ -+ $(am__append_2478) $(am__append_2485) $(am__append_2492) \ -+ $(am__append_2499) $(am__append_2506) \ - $(nodist_videoinfo_module_SOURCES) videoinfo.marker \ - $(nodist_videotest_module_SOURCES) videotest.marker \ - $(nodist_xnu_uuid_module_SOURCES) xnu_uuid.marker \ -@@ -16922,27 +16898,27 @@ CLEANFILES = build-grub-pep2elf$(BUILD_EXEEXT) \ - $(nodist_raid6rec_module_SOURCES) raid6rec.marker \ - $(nodist_scsi_module_SOURCES) scsi.marker \ - $(nodist_memdisk_module_SOURCES) memdisk.marker \ -- $(am__append_2520) $(am__append_2527) $(am__append_2534) \ -- $(am__append_2541) $(am__append_2548) $(am__append_2555) \ -- $(am__append_2562) $(am__append_2569) $(am__append_2576) \ -- $(am__append_2583) $(am__append_2590) $(am__append_2597) \ -- $(am__append_2604) $(am__append_2611) $(am__append_2618) \ -- $(am__append_2625) $(am__append_2632) $(am__append_2639) \ -- $(am__append_2646) $(am__append_2653) $(am__append_2660) \ -- $(am__append_2667) $(am__append_2674) $(am__append_2681) \ -- $(am__append_2688) $(am__append_2695) $(am__append_2702) \ -- $(am__append_2709) $(am__append_2716) $(am__append_2723) \ -- $(am__append_2730) $(am__append_2737) $(am__append_2744) \ -- $(am__append_2751) $(am__append_2758) $(am__append_2765) \ -- $(am__append_2772) $(am__append_2779) $(am__append_2786) \ -- $(am__append_2793) $(am__append_2800) $(am__append_2807) \ -- $(am__append_2814) $(am__append_2821) $(am__append_2828) \ -- $(am__append_2835) $(am__append_2842) $(am__append_2849) \ -- $(am__append_2856) $(am__append_2863) $(am__append_2870) \ -- $(am__append_2877) $(am__append_2884) $(am__append_2891) \ -- $(am__append_2898) $(am__append_2905) $(am__append_2912) \ -- $(am__append_2919) $(am__append_2926) $(am__append_2933) \ -- $(am__append_2940) $(nodist_procfs_module_SOURCES) \ -+ $(am__append_2513) $(am__append_2520) $(am__append_2527) \ -+ $(am__append_2534) $(am__append_2541) $(am__append_2548) \ -+ $(am__append_2555) $(am__append_2562) $(am__append_2569) \ -+ $(am__append_2576) $(am__append_2583) $(am__append_2590) \ -+ $(am__append_2597) $(am__append_2604) $(am__append_2611) \ -+ $(am__append_2618) $(am__append_2625) $(am__append_2632) \ -+ $(am__append_2639) $(am__append_2646) $(am__append_2653) \ -+ $(am__append_2660) $(am__append_2667) $(am__append_2674) \ -+ $(am__append_2681) $(am__append_2688) $(am__append_2695) \ -+ $(am__append_2702) $(am__append_2709) $(am__append_2716) \ -+ $(am__append_2723) $(am__append_2730) $(am__append_2737) \ -+ $(am__append_2744) $(am__append_2751) $(am__append_2758) \ -+ $(am__append_2765) $(am__append_2772) $(am__append_2779) \ -+ $(am__append_2786) $(am__append_2793) $(am__append_2800) \ -+ $(am__append_2807) $(am__append_2814) $(am__append_2821) \ -+ $(am__append_2828) $(am__append_2835) $(am__append_2842) \ -+ $(am__append_2849) $(am__append_2856) $(am__append_2863) \ -+ $(am__append_2870) $(am__append_2877) $(am__append_2884) \ -+ $(am__append_2891) $(am__append_2898) $(am__append_2905) \ -+ $(am__append_2912) $(am__append_2919) $(am__append_2926) \ -+ $(am__append_2933) $(nodist_procfs_module_SOURCES) \ - procfs.marker $(nodist_affs_module_SOURCES) affs.marker \ - $(nodist_afs_module_SOURCES) afs.marker \ - $(nodist_bfs_module_SOURCES) bfs.marker \ -@@ -16987,70 +16963,70 @@ CLEANFILES = build-grub-pep2elf$(BUILD_EXEEXT) \ - $(nodist_zfscrypt_module_SOURCES) zfscrypt.marker \ - $(nodist_zfsinfo_module_SOURCES) zfsinfo.marker \ - $(nodist_macbless_module_SOURCES) macbless.marker \ -- $(am__append_2947) $(nodist_gettext_module_SOURCES) \ -+ $(am__append_2940) $(nodist_gettext_module_SOURCES) \ - gettext.marker $(nodist_gfxmenu_module_SOURCES) gfxmenu.marker \ - $(nodist_hello_module_SOURCES) hello.marker \ - $(nodist_gzio_module_SOURCES) gzio.marker \ - $(nodist_offsetio_module_SOURCES) offsetio.marker \ -- $(am__append_2954) $(am__append_2961) $(am__append_2968) \ -- $(am__append_2975) $(am__append_2982) $(am__append_2989) \ -- $(am__append_2996) $(am__append_3003) $(am__append_3010) \ -- $(am__append_3017) $(am__append_3024) $(am__append_3031) \ -- $(am__append_3038) $(am__append_3045) $(am__append_3052) \ -- $(am__append_3059) $(am__append_3066) $(am__append_3073) \ -- $(am__append_3080) $(am__append_3087) \ -+ $(am__append_2947) $(am__append_2954) $(am__append_2961) \ -+ $(am__append_2968) $(am__append_2975) $(am__append_2982) \ -+ $(am__append_2989) $(am__append_2996) $(am__append_3003) \ -+ $(am__append_3010) $(am__append_3017) $(am__append_3024) \ -+ $(am__append_3031) $(am__append_3038) $(am__append_3045) \ -+ $(am__append_3052) $(am__append_3059) $(am__append_3066) \ -+ $(am__append_3073) $(am__append_3080) \ - $(nodist_elf_module_SOURCES) elf.marker \ - $(nodist_crypto_module_SOURCES) crypto.marker \ - $(nodist_pbkdf2_module_SOURCES) pbkdf2.marker \ -- $(am__append_3094) $(am__append_3101) $(am__append_3108) \ -- $(am__append_3115) $(am__append_3122) $(am__append_3129) \ -- $(am__append_3136) $(am__append_3143) $(am__append_3150) \ -- $(am__append_3157) $(am__append_3164) $(am__append_3171) \ -- $(am__append_3178) $(am__append_3185) $(am__append_3192) \ -- $(am__append_3199) $(am__append_3206) $(am__append_3213) \ -- $(am__append_3220) $(am__append_3227) $(am__append_3234) \ -- $(am__append_3241) $(am__append_3248) $(am__append_3255) \ -- $(am__append_3262) $(am__append_3269) $(am__append_3276) \ -- $(am__append_3283) $(am__append_3290) $(am__append_3297) \ -- $(am__append_3304) $(am__append_3311) $(am__append_3318) \ -- $(am__append_3325) $(am__append_3332) $(am__append_3339) \ -+ $(am__append_3087) $(am__append_3094) $(am__append_3101) \ -+ $(am__append_3108) $(am__append_3115) $(am__append_3122) \ -+ $(am__append_3129) $(am__append_3136) $(am__append_3143) \ -+ $(am__append_3150) $(am__append_3157) $(am__append_3164) \ -+ $(am__append_3171) $(am__append_3178) $(am__append_3185) \ -+ $(am__append_3192) $(am__append_3199) $(am__append_3206) \ -+ $(am__append_3213) $(am__append_3220) $(am__append_3227) \ -+ $(am__append_3234) $(am__append_3241) $(am__append_3248) \ -+ $(am__append_3255) $(am__append_3262) $(am__append_3269) \ -+ $(am__append_3276) $(am__append_3283) $(am__append_3290) \ -+ $(am__append_3297) $(am__append_3304) $(am__append_3311) \ -+ $(am__append_3318) $(am__append_3325) $(am__append_3332) \ - $(nodist_setjmp_module_SOURCES) setjmp.marker \ -- $(am__append_3346) $(am__append_3353) $(am__append_3360) \ -- $(am__append_3367) $(am__append_3374) $(am__append_3381) \ -- $(am__append_3388) $(am__append_3395) $(am__append_3402) \ -- $(am__append_3409) $(am__append_3416) $(am__append_3423) \ -- $(am__append_3430) $(am__append_3437) $(am__append_3444) \ -- $(am__append_3451) $(am__append_3458) $(am__append_3465) \ -- $(am__append_3472) $(am__append_3479) $(am__append_3486) \ -- $(am__append_3493) $(am__append_3500) $(am__append_3507) \ -- $(am__append_3514) $(am__append_3521) $(am__append_3528) \ -- $(am__append_3535) $(am__append_3542) $(am__append_3549) \ -- $(am__append_3556) $(am__append_3563) $(am__append_3570) \ -- $(am__append_3577) $(am__append_3584) $(am__append_3591) \ -- $(am__append_3598) $(am__append_3605) $(am__append_3612) \ -- $(am__append_3619) $(am__append_3626) $(am__append_3633) \ -- $(am__append_3640) $(am__append_3647) $(am__append_3654) \ -- $(am__append_3661) $(am__append_3668) $(am__append_3675) \ -- $(am__append_3682) $(am__append_3689) $(am__append_3696) \ -- $(am__append_3703) $(am__append_3710) $(am__append_3717) \ -- $(am__append_3724) $(am__append_3731) $(am__append_3738) \ -- $(am__append_3745) $(am__append_3752) $(am__append_3759) \ -- $(am__append_3766) $(am__append_3773) $(am__append_3780) \ -- $(am__append_3787) $(am__append_3794) $(am__append_3801) \ -- $(am__append_3808) $(am__append_3815) $(am__append_3822) \ -- $(am__append_3829) $(am__append_3836) $(am__append_3843) \ -- $(am__append_3850) $(am__append_3857) $(am__append_3864) \ -- $(am__append_3871) $(am__append_3878) $(am__append_3885) \ -- $(nodist_macho_module_SOURCES) macho.marker $(am__append_3892) \ -- $(am__append_3899) $(am__append_3906) $(am__append_3913) \ -- $(am__append_3920) $(am__append_3927) $(am__append_3934) \ -- $(am__append_3941) $(am__append_3948) $(am__append_3955) \ -- $(am__append_3962) $(am__append_3969) $(am__append_3976) \ -- $(am__append_3983) $(am__append_3990) $(am__append_3997) \ -- $(am__append_4004) $(am__append_4011) $(am__append_4018) \ -- $(am__append_4025) $(am__append_4032) $(am__append_4039) \ -- $(am__append_4046) $(am__append_4053) $(am__append_4060) \ -- $(am__append_4067) $(am__append_4074) \ -+ $(am__append_3339) $(am__append_3346) $(am__append_3353) \ -+ $(am__append_3360) $(am__append_3367) $(am__append_3374) \ -+ $(am__append_3381) $(am__append_3388) $(am__append_3395) \ -+ $(am__append_3402) $(am__append_3409) $(am__append_3416) \ -+ $(am__append_3423) $(am__append_3430) $(am__append_3437) \ -+ $(am__append_3444) $(am__append_3451) $(am__append_3458) \ -+ $(am__append_3465) $(am__append_3472) $(am__append_3479) \ -+ $(am__append_3486) $(am__append_3493) $(am__append_3500) \ -+ $(am__append_3507) $(am__append_3514) $(am__append_3521) \ -+ $(am__append_3528) $(am__append_3535) $(am__append_3542) \ -+ $(am__append_3549) $(am__append_3556) $(am__append_3563) \ -+ $(am__append_3570) $(am__append_3577) $(am__append_3584) \ -+ $(am__append_3591) $(am__append_3598) $(am__append_3605) \ -+ $(am__append_3612) $(am__append_3619) $(am__append_3626) \ -+ $(am__append_3633) $(am__append_3640) $(am__append_3647) \ -+ $(am__append_3654) $(am__append_3661) $(am__append_3668) \ -+ $(am__append_3675) $(am__append_3682) $(am__append_3689) \ -+ $(am__append_3696) $(am__append_3703) $(am__append_3710) \ -+ $(am__append_3717) $(am__append_3724) $(am__append_3731) \ -+ $(am__append_3738) $(am__append_3745) $(am__append_3752) \ -+ $(am__append_3759) $(am__append_3766) $(am__append_3773) \ -+ $(am__append_3780) $(am__append_3787) $(am__append_3794) \ -+ $(am__append_3801) $(am__append_3808) $(am__append_3815) \ -+ $(am__append_3822) $(am__append_3829) $(am__append_3836) \ -+ $(am__append_3843) $(am__append_3850) $(am__append_3857) \ -+ $(am__append_3864) $(am__append_3871) $(am__append_3878) \ -+ $(nodist_macho_module_SOURCES) macho.marker $(am__append_3885) \ -+ $(am__append_3892) $(am__append_3899) $(am__append_3906) \ -+ $(am__append_3913) $(am__append_3920) $(am__append_3927) \ -+ $(am__append_3934) $(am__append_3941) $(am__append_3948) \ -+ $(am__append_3955) $(am__append_3962) $(am__append_3969) \ -+ $(am__append_3976) $(am__append_3983) $(am__append_3990) \ -+ $(am__append_3997) $(am__append_4004) $(am__append_4011) \ -+ $(am__append_4018) $(am__append_4025) $(am__append_4032) \ -+ $(am__append_4039) $(am__append_4046) $(am__append_4053) \ -+ $(am__append_4060) $(am__append_4067) \ - $(nodist_normal_module_SOURCES) normal.marker \ - $(nodist_part_acorn_module_SOURCES) part_acorn.marker \ - $(nodist_part_amiga_module_SOURCES) part_amiga.marker \ -@@ -17064,35 +17040,35 @@ CLEANFILES = build-grub-pep2elf$(BUILD_EXEEXT) \ - $(nodist_part_sunpc_module_SOURCES) part_sunpc.marker \ - $(nodist_part_dfly_module_SOURCES) part_dfly.marker \ - $(nodist_msdospart_module_SOURCES) msdospart.marker \ -- $(am__append_4081) $(am__append_4088) $(am__append_4095) \ -- $(am__append_4102) $(am__append_4109) $(am__append_4116) \ -- $(am__append_4123) $(am__append_4130) $(am__append_4137) \ -- $(am__append_4144) $(am__append_4151) $(am__append_4158) \ -- $(am__append_4165) $(am__append_4172) $(am__append_4179) \ -- $(am__append_4186) $(am__append_4193) $(am__append_4200) \ -- $(am__append_4207) $(am__append_4214) $(am__append_4221) \ -- $(am__append_4228) $(am__append_4235) $(am__append_4242) \ -- $(am__append_4249) $(am__append_4256) $(am__append_4263) \ -+ $(am__append_4074) $(am__append_4081) $(am__append_4088) \ -+ $(am__append_4095) $(am__append_4102) $(am__append_4109) \ -+ $(am__append_4116) $(am__append_4123) $(am__append_4130) \ -+ $(am__append_4137) $(am__append_4144) $(am__append_4151) \ -+ $(am__append_4158) $(am__append_4165) $(am__append_4172) \ -+ $(am__append_4179) $(am__append_4186) $(am__append_4193) \ -+ $(am__append_4200) $(am__append_4207) $(am__append_4214) \ -+ $(am__append_4221) $(am__append_4228) $(am__append_4235) \ -+ $(am__append_4242) $(am__append_4249) $(am__append_4256) \ - $(nodist_gfxterm_background_module_SOURCES) \ -- gfxterm_background.marker $(am__append_4270) \ -- $(am__append_4277) $(am__append_4284) $(am__append_4291) \ -- $(am__append_4298) $(am__append_4305) $(am__append_4312) \ -- $(am__append_4319) $(am__append_4326) $(am__append_4333) \ -- $(am__append_4340) $(am__append_4347) $(am__append_4354) \ -- $(am__append_4361) $(am__append_4368) $(am__append_4375) \ -- $(am__append_4382) $(am__append_4389) $(am__append_4396) \ -- $(am__append_4403) $(am__append_4410) $(am__append_4417) \ -- $(am__append_4424) $(am__append_4431) $(am__append_4438) \ -- $(am__append_4445) $(am__append_4452) $(am__append_4459) \ -- $(am__append_4466) $(am__append_4473) $(am__append_4480) \ -- $(am__append_4487) $(am__append_4494) $(am__append_4501) \ -- $(am__append_4508) $(am__append_4515) $(am__append_4522) \ -- $(am__append_4529) $(am__append_4536) $(am__append_4543) \ -- $(am__append_4550) $(am__append_4557) $(am__append_4564) \ -- $(am__append_4571) $(am__append_4578) $(am__append_4585) \ -- $(am__append_4592) $(am__append_4599) $(am__append_4606) \ -- $(am__append_4613) $(am__append_4620) $(am__append_4627) \ -- $(am__append_4634) $(am__append_4641) $(am__append_4648) \ -+ gfxterm_background.marker $(am__append_4263) \ -+ $(am__append_4270) $(am__append_4277) $(am__append_4284) \ -+ $(am__append_4291) $(am__append_4298) $(am__append_4305) \ -+ $(am__append_4312) $(am__append_4319) $(am__append_4326) \ -+ $(am__append_4333) $(am__append_4340) $(am__append_4347) \ -+ $(am__append_4354) $(am__append_4361) $(am__append_4368) \ -+ $(am__append_4375) $(am__append_4382) $(am__append_4389) \ -+ $(am__append_4396) $(am__append_4403) $(am__append_4410) \ -+ $(am__append_4417) $(am__append_4424) $(am__append_4431) \ -+ $(am__append_4438) $(am__append_4445) $(am__append_4452) \ -+ $(am__append_4459) $(am__append_4466) $(am__append_4473) \ -+ $(am__append_4480) $(am__append_4487) $(am__append_4494) \ -+ $(am__append_4501) $(am__append_4508) $(am__append_4515) \ -+ $(am__append_4522) $(am__append_4529) $(am__append_4536) \ -+ $(am__append_4543) $(am__append_4550) $(am__append_4557) \ -+ $(am__append_4564) $(am__append_4571) $(am__append_4578) \ -+ $(am__append_4585) $(am__append_4592) $(am__append_4599) \ -+ $(am__append_4606) $(am__append_4613) $(am__append_4620) \ -+ $(am__append_4627) $(am__append_4634) $(am__append_4641) \ - $(nodist_functional_test_module_SOURCES) \ - functional_test.marker $(nodist_exfctest_module_SOURCES) \ - exfctest.marker $(nodist_strtoull_test_module_SOURCES) \ -@@ -17101,15 +17077,15 @@ CLEANFILES = build-grub-pep2elf$(BUILD_EXEEXT) \ - signature_test.marker $(nodist_sleep_test_module_SOURCES) \ - sleep_test.marker $(nodist_xnu_uuid_test_module_SOURCES) \ - xnu_uuid_test.marker $(nodist_pbkdf2_test_module_SOURCES) \ -- pbkdf2_test.marker $(am__append_4655) $(am__append_4662) \ -- $(am__append_4669) $(am__append_4676) $(am__append_4683) \ -- $(am__append_4690) $(am__append_4697) $(am__append_4704) \ -- $(am__append_4711) $(am__append_4718) $(am__append_4725) \ -- $(am__append_4732) $(am__append_4739) $(am__append_4746) \ -- $(am__append_4753) $(am__append_4760) $(am__append_4767) \ -- $(am__append_4774) $(am__append_4781) $(am__append_4788) \ -- $(am__append_4795) $(am__append_4802) $(am__append_4809) \ -- $(am__append_4816) $(am__append_4823) \ -+ pbkdf2_test.marker $(am__append_4648) $(am__append_4655) \ -+ $(am__append_4662) $(am__append_4669) $(am__append_4676) \ -+ $(am__append_4683) $(am__append_4690) $(am__append_4697) \ -+ $(am__append_4704) $(am__append_4711) $(am__append_4718) \ -+ $(am__append_4725) $(am__append_4732) $(am__append_4739) \ -+ $(am__append_4746) $(am__append_4753) $(am__append_4760) \ -+ $(am__append_4767) $(am__append_4774) $(am__append_4781) \ -+ $(am__append_4788) $(am__append_4795) $(am__append_4802) \ -+ $(am__append_4809) $(am__append_4816) \ - $(nodist_div_test_module_SOURCES) div_test.marker \ - $(nodist_mul_test_module_SOURCES) mul_test.marker \ - $(nodist_shift_test_module_SOURCES) shift_test.marker \ -@@ -17122,65 +17098,65 @@ CLEANFILES = build-grub-pep2elf$(BUILD_EXEEXT) \ - $(nodist_cmdline_cat_test_module_SOURCES) \ - cmdline_cat_test.marker $(nodist_bitmap_module_SOURCES) \ - bitmap.marker $(nodist_bitmap_scale_module_SOURCES) \ -- bitmap_scale.marker $(am__append_4830) $(am__append_4837) \ -- $(am__append_4844) $(am__append_4851) $(am__append_4858) \ -- $(am__append_4865) $(am__append_4872) $(am__append_4879) \ -- $(am__append_4886) $(nodist_jpeg_module_SOURCES) jpeg.marker \ -+ bitmap_scale.marker $(am__append_4823) $(am__append_4830) \ -+ $(am__append_4837) $(am__append_4844) $(am__append_4851) \ -+ $(am__append_4858) $(am__append_4865) $(am__append_4872) \ -+ $(am__append_4879) $(nodist_jpeg_module_SOURCES) jpeg.marker \ - $(nodist_png_module_SOURCES) png.marker \ -- $(nodist_tga_module_SOURCES) tga.marker $(am__append_4893) \ -- $(am__append_4900) $(am__append_4907) $(am__append_4914) \ -- $(am__append_4921) $(am__append_4928) $(am__append_4935) \ -- $(am__append_4942) $(am__append_4949) $(am__append_4956) \ -- $(am__append_4963) $(am__append_4970) $(am__append_4977) \ -- $(am__append_4984) $(am__append_4991) $(am__append_4998) \ -- $(am__append_5005) $(am__append_5012) $(am__append_5019) \ -- $(am__append_5026) $(am__append_5033) $(am__append_5040) \ -- $(am__append_5047) $(am__append_5054) $(am__append_5061) \ -- $(am__append_5068) $(am__append_5075) $(am__append_5082) \ -- $(am__append_5089) $(am__append_5096) $(am__append_5103) \ -- $(am__append_5110) $(am__append_5117) $(am__append_5124) \ -- $(am__append_5131) $(am__append_5138) $(am__append_5145) \ -- $(am__append_5152) $(am__append_5159) $(am__append_5166) \ -- $(am__append_5173) $(nodist_video_colors_module_SOURCES) \ -- video_colors.marker $(am__append_5180) $(am__append_5187) \ -+ $(nodist_tga_module_SOURCES) tga.marker $(am__append_4886) \ -+ $(am__append_4893) $(am__append_4900) $(am__append_4907) \ -+ $(am__append_4914) $(am__append_4921) $(am__append_4928) \ -+ $(am__append_4935) $(am__append_4942) $(am__append_4949) \ -+ $(am__append_4956) $(am__append_4963) $(am__append_4970) \ -+ $(am__append_4977) $(am__append_4984) $(am__append_4991) \ -+ $(am__append_4998) $(am__append_5005) $(am__append_5012) \ -+ $(am__append_5019) $(am__append_5026) $(am__append_5033) \ -+ $(am__append_5040) $(am__append_5047) $(am__append_5054) \ -+ $(am__append_5061) $(am__append_5068) $(am__append_5075) \ -+ $(am__append_5082) $(am__append_5089) $(am__append_5096) \ -+ $(am__append_5103) $(am__append_5110) $(am__append_5117) \ -+ $(am__append_5124) $(am__append_5131) $(am__append_5138) \ -+ $(am__append_5145) $(am__append_5152) $(am__append_5159) \ -+ $(am__append_5166) $(nodist_video_colors_module_SOURCES) \ -+ video_colors.marker $(am__append_5173) $(am__append_5180) \ - $(nodist_datehook_module_SOURCES) datehook.marker \ - $(nodist_net_module_SOURCES) net.marker \ - $(nodist_tftp_module_SOURCES) tftp.marker \ -- $(nodist_http_module_SOURCES) http.marker $(am__append_5194) \ -- $(am__append_5201) $(am__append_5208) $(am__append_5215) \ -- $(am__append_5222) $(am__append_5229) $(am__append_5236) \ -- $(am__append_5243) $(am__append_5250) $(am__append_5257) \ -- $(am__append_5264) $(am__append_5271) $(am__append_5278) \ -- $(am__append_5285) $(am__append_5292) $(am__append_5299) \ -- $(am__append_5306) $(am__append_5313) \ -+ $(nodist_http_module_SOURCES) http.marker $(am__append_5187) \ -+ $(am__append_5194) $(am__append_5201) $(am__append_5208) \ -+ $(am__append_5215) $(am__append_5222) $(am__append_5229) \ -+ $(am__append_5236) $(am__append_5243) $(am__append_5250) \ -+ $(am__append_5257) $(am__append_5264) $(am__append_5271) \ -+ $(am__append_5278) $(am__append_5285) $(am__append_5292) \ -+ $(am__append_5299) $(am__append_5306) \ - $(nodist_syslinuxcfg_module_SOURCES) syslinuxcfg.marker \ - $(nodist_test_blockarg_module_SOURCES) test_blockarg.marker \ - $(nodist_xzio_module_SOURCES) xzio.marker \ - $(nodist_lzopio_module_SOURCES) lzopio.marker \ - $(nodist_testload_module_SOURCES) testload.marker \ -- $(am__append_5320) $(am__append_5327) $(am__append_5334) \ -- $(am__append_5341) $(am__append_5348) $(am__append_5355) \ -- $(am__append_5362) $(am__append_5369) $(am__append_5376) \ -- $(am__append_5383) $(am__append_5390) $(am__append_5397) \ -- $(am__append_5404) $(am__append_5411) $(am__append_5418) \ -- $(am__append_5425) $(am__append_5432) \ -+ $(am__append_5313) $(am__append_5320) $(am__append_5327) \ -+ $(am__append_5334) $(am__append_5341) $(am__append_5348) \ -+ $(am__append_5355) $(am__append_5362) $(am__append_5369) \ -+ $(am__append_5376) $(am__append_5383) $(am__append_5390) \ -+ $(am__append_5397) $(am__append_5404) $(am__append_5411) \ -+ $(am__append_5418) $(am__append_5425) \ - $(nodist_priority_queue_module_SOURCES) priority_queue.marker \ -- $(nodist_time_module_SOURCES) time.marker $(am__append_5439) \ -- $(am__append_5446) $(nodist_adler32_module_SOURCES) \ -+ $(nodist_time_module_SOURCES) time.marker $(am__append_5432) \ -+ $(am__append_5439) $(nodist_adler32_module_SOURCES) \ - adler32.marker $(nodist_crc64_module_SOURCES) crc64.marker \ - $(nodist_mpi_module_SOURCES) mpi.marker \ - $(nodist_all_video_module_SOURCES) all_video.marker \ -- $(am__append_5453) $(am__append_5460) $(am__append_5467) \ -- $(am__append_5474) $(am__append_5481) $(am__append_5488) \ -+ $(am__append_5446) $(am__append_5453) $(am__append_5460) \ -+ $(am__append_5467) $(am__append_5474) $(am__append_5481) \ - $(nodist_testspeed_module_SOURCES) testspeed.marker \ -- $(am__append_5495) $(nodist_tr_module_SOURCES) tr.marker \ -+ $(am__append_5488) $(nodist_tr_module_SOURCES) tr.marker \ - $(nodist_progress_module_SOURCES) progress.marker \ -- $(nodist_file_module_SOURCES) file.marker $(am__append_5502) \ -- $(am__append_5509) $(am__append_5516) $(am__append_5523) \ -- $(am__append_5530) $(am__append_5537) $(am__append_5544) \ -- $(am__append_5551) $(am__append_5558) $(am__append_5565) \ -- $(am__append_5572) $(am__append_5579) $(am__append_5586) \ -- $(am__append_5593) $(nodist_gcry_arcfour_module_SOURCES) \ -+ $(nodist_file_module_SOURCES) file.marker $(am__append_5495) \ -+ $(am__append_5502) $(am__append_5509) $(am__append_5516) \ -+ $(am__append_5523) $(am__append_5530) $(am__append_5537) \ -+ $(am__append_5544) $(am__append_5551) $(am__append_5558) \ -+ $(am__append_5565) $(am__append_5572) $(am__append_5579) \ -+ $(am__append_5586) $(nodist_gcry_arcfour_module_SOURCES) \ - gcry_arcfour.marker $(nodist_gcry_blowfish_module_SOURCES) \ - gcry_blowfish.marker $(nodist_gcry_camellia_module_SOURCES) \ - gcry_camellia.marker $(nodist_gcry_cast5_module_SOURCES) \ -@@ -17202,25 +17178,25 @@ CLEANFILES = build-grub-pep2elf$(BUILD_EXEEXT) \ - gcry_sha512.marker $(nodist_gcry_tiger_module_SOURCES) \ - gcry_tiger.marker $(nodist_gcry_twofish_module_SOURCES) \ - gcry_twofish.marker $(nodist_gcry_whirlpool_module_SOURCES) \ -- gcry_whirlpool.marker $(am__append_5599) $(am__append_5604) \ -- $(am__append_5609) $(am__append_5614) $(am__append_5619) \ -- $(am__append_5624) $(am__append_5629) $(am__append_5634) \ -- $(am__append_5639) $(am__append_5644) $(am__append_5649) \ -- $(am__append_5654) $(am__append_5659) $(am__append_5664) \ -- $(am__append_5669) $(am__append_5674) $(am__append_5679) \ -- $(am__append_5684) $(am__append_5689) $(am__append_5694) \ -- $(am__append_5699) $(am__append_5704) $(am__append_5709) \ -- $(am__append_5714) $(am__append_5719) $(am__append_5724) \ -- $(am__append_5729) $(am__append_5734) $(am__append_5739) \ -- $(am__append_5744) $(am__append_5749) $(am__append_5754) \ -- $(am__append_5759) $(am__append_5764) $(am__append_5769) \ -- $(am__append_5774) $(am__append_5779) $(am__append_5784) \ -- $(am__append_5789) $(am__append_5793) $(am__append_5796) \ -+ gcry_whirlpool.marker $(am__append_5592) $(am__append_5597) \ -+ $(am__append_5602) $(am__append_5607) $(am__append_5612) \ -+ $(am__append_5617) $(am__append_5622) $(am__append_5627) \ -+ $(am__append_5632) $(am__append_5637) $(am__append_5642) \ -+ $(am__append_5647) $(am__append_5652) $(am__append_5657) \ -+ $(am__append_5662) $(am__append_5667) $(am__append_5672) \ -+ $(am__append_5677) $(am__append_5682) $(am__append_5687) \ -+ $(am__append_5692) $(am__append_5697) $(am__append_5702) \ -+ $(am__append_5707) $(am__append_5712) $(am__append_5717) \ -+ $(am__append_5722) $(am__append_5727) $(am__append_5732) \ -+ $(am__append_5737) $(am__append_5742) $(am__append_5747) \ -+ $(am__append_5752) $(am__append_5757) $(am__append_5762) \ -+ $(am__append_5767) $(am__append_5772) $(am__append_5777) \ -+ $(am__append_5782) $(am__append_5786) $(am__append_5789) \ - gensyminfo.sh genmod.sh modinfo.sh gmodule.pl gdb_grub \ -- $(am__append_5798) symlist.h symlist.c kernel_syms.lst \ -- $(am__append_5830) fs.lst command.lst partmap.lst terminal.lst \ -+ $(am__append_5791) symlist.h symlist.c kernel_syms.lst \ -+ $(am__append_5823) fs.lst command.lst partmap.lst terminal.lst \ - fdt.lst parttool.lst video.lst crypto.lst config.log \ -- syminfo.lst moddep.lst $(MOD_FILES) $(am__append_5832) -+ syminfo.lst moddep.lst $(MOD_FILES) $(am__append_5825) - BUILT_SOURCES = $(nodist_disk_module_SOURCES) \ - $(nodist_trig_module_SOURCES) $(am__append_6) $(am__append_13) \ - $(am__append_20) $(am__append_27) $(am__append_34) \ -@@ -17329,42 +17305,41 @@ BUILT_SOURCES = $(nodist_disk_module_SOURCES) \ - $(am__append_2043) $(am__append_2050) $(am__append_2057) \ - $(am__append_2064) $(am__append_2071) $(am__append_2078) \ - $(am__append_2085) $(am__append_2092) $(am__append_2099) \ -- $(am__append_2106) $(nodist_help_module_SOURCES) \ -- $(nodist_hexdump_module_SOURCES) \ -- $(nodist_keystatus_module_SOURCES) $(am__append_2113) \ -- $(am__append_2120) $(nodist_loadenv_module_SOURCES) \ -+ $(nodist_help_module_SOURCES) $(nodist_hexdump_module_SOURCES) \ -+ $(nodist_keystatus_module_SOURCES) $(am__append_2106) \ -+ $(am__append_2113) $(nodist_loadenv_module_SOURCES) \ - $(nodist_ls_module_SOURCES) $(nodist_lsmmap_module_SOURCES) \ -- $(am__append_2127) $(am__append_2134) $(am__append_2141) \ -- $(am__append_2148) $(am__append_2155) $(am__append_2162) \ -- $(am__append_2169) $(am__append_2176) \ -+ $(am__append_2120) $(am__append_2127) $(am__append_2134) \ -+ $(am__append_2141) $(am__append_2148) $(am__append_2155) \ -+ $(am__append_2162) $(am__append_2169) \ - $(nodist_memrw_module_SOURCES) \ - $(nodist_minicmd_module_SOURCES) \ - $(nodist_parttool_module_SOURCES) \ - $(nodist_password_module_SOURCES) \ -- $(nodist_password_pbkdf2_module_SOURCES) $(am__append_2183) \ -- $(am__append_2190) $(am__append_2197) $(am__append_2204) \ -- $(am__append_2211) $(am__append_2218) $(am__append_2225) \ -- $(am__append_2232) $(am__append_2239) $(am__append_2246) \ -- $(am__append_2253) $(am__append_2260) $(am__append_2267) \ -- $(am__append_2274) $(am__append_2281) $(am__append_2288) \ -- $(am__append_2295) $(am__append_2302) $(am__append_2309) \ -- $(am__append_2316) $(am__append_2323) \ -+ $(nodist_password_pbkdf2_module_SOURCES) $(am__append_2176) \ -+ $(am__append_2183) $(am__append_2190) $(am__append_2197) \ -+ $(am__append_2204) $(am__append_2211) $(am__append_2218) \ -+ $(am__append_2225) $(am__append_2232) $(am__append_2239) \ -+ $(am__append_2246) $(am__append_2253) $(am__append_2260) \ -+ $(am__append_2267) $(am__append_2274) $(am__append_2281) \ -+ $(am__append_2288) $(am__append_2295) $(am__append_2302) \ -+ $(am__append_2309) $(am__append_2316) \ - $(nodist_probe_module_SOURCES) $(nodist_read_module_SOURCES) \ - $(nodist_search_module_SOURCES) \ - $(nodist_search_fs_file_module_SOURCES) \ - $(nodist_search_fs_uuid_module_SOURCES) \ -- $(nodist_search_label_module_SOURCES) $(am__append_2330) \ -- $(am__append_2337) $(am__append_2344) $(am__append_2351) \ -- $(am__append_2358) $(am__append_2365) $(am__append_2372) \ -- $(am__append_2379) $(am__append_2386) $(am__append_2393) \ -- $(am__append_2400) $(am__append_2407) $(am__append_2414) \ -- $(am__append_2421) $(am__append_2428) $(am__append_2435) \ -- $(nodist_sleep_module_SOURCES) $(am__append_2442) \ -- $(am__append_2449) $(nodist_terminal_module_SOURCES) \ -+ $(nodist_search_label_module_SOURCES) $(am__append_2323) \ -+ $(am__append_2330) $(am__append_2337) $(am__append_2344) \ -+ $(am__append_2351) $(am__append_2358) $(am__append_2365) \ -+ $(am__append_2372) $(am__append_2379) $(am__append_2386) \ -+ $(am__append_2393) $(am__append_2400) $(am__append_2407) \ -+ $(am__append_2414) $(am__append_2421) $(am__append_2428) \ -+ $(nodist_sleep_module_SOURCES) $(am__append_2435) \ -+ $(am__append_2442) $(nodist_terminal_module_SOURCES) \ - $(nodist_test_module_SOURCES) $(nodist_true_module_SOURCES) \ -- $(am__append_2456) $(am__append_2463) $(am__append_2470) \ -- $(am__append_2477) $(am__append_2484) $(am__append_2491) \ -- $(am__append_2498) $(am__append_2505) $(am__append_2512) \ -+ $(am__append_2449) $(am__append_2456) $(am__append_2463) \ -+ $(am__append_2470) $(am__append_2477) $(am__append_2484) \ -+ $(am__append_2491) $(am__append_2498) $(am__append_2505) \ - $(nodist_videoinfo_module_SOURCES) \ - $(nodist_videotest_module_SOURCES) \ - $(nodist_xnu_uuid_module_SOURCES) \ -@@ -17380,27 +17355,27 @@ BUILT_SOURCES = $(nodist_disk_module_SOURCES) \ - $(nodist_raid5rec_module_SOURCES) \ - $(nodist_raid6rec_module_SOURCES) \ - $(nodist_scsi_module_SOURCES) $(nodist_memdisk_module_SOURCES) \ -- $(am__append_2519) $(am__append_2526) $(am__append_2533) \ -- $(am__append_2540) $(am__append_2547) $(am__append_2554) \ -- $(am__append_2561) $(am__append_2568) $(am__append_2575) \ -- $(am__append_2582) $(am__append_2589) $(am__append_2596) \ -- $(am__append_2603) $(am__append_2610) $(am__append_2617) \ -- $(am__append_2624) $(am__append_2631) $(am__append_2638) \ -- $(am__append_2645) $(am__append_2652) $(am__append_2659) \ -- $(am__append_2666) $(am__append_2673) $(am__append_2680) \ -- $(am__append_2687) $(am__append_2694) $(am__append_2701) \ -- $(am__append_2708) $(am__append_2715) $(am__append_2722) \ -- $(am__append_2729) $(am__append_2736) $(am__append_2743) \ -- $(am__append_2750) $(am__append_2757) $(am__append_2764) \ -- $(am__append_2771) $(am__append_2778) $(am__append_2785) \ -- $(am__append_2792) $(am__append_2799) $(am__append_2806) \ -- $(am__append_2813) $(am__append_2820) $(am__append_2827) \ -- $(am__append_2834) $(am__append_2841) $(am__append_2848) \ -- $(am__append_2855) $(am__append_2862) $(am__append_2869) \ -- $(am__append_2876) $(am__append_2883) $(am__append_2890) \ -- $(am__append_2897) $(am__append_2904) $(am__append_2911) \ -- $(am__append_2918) $(am__append_2925) $(am__append_2932) \ -- $(am__append_2939) $(nodist_procfs_module_SOURCES) \ -+ $(am__append_2512) $(am__append_2519) $(am__append_2526) \ -+ $(am__append_2533) $(am__append_2540) $(am__append_2547) \ -+ $(am__append_2554) $(am__append_2561) $(am__append_2568) \ -+ $(am__append_2575) $(am__append_2582) $(am__append_2589) \ -+ $(am__append_2596) $(am__append_2603) $(am__append_2610) \ -+ $(am__append_2617) $(am__append_2624) $(am__append_2631) \ -+ $(am__append_2638) $(am__append_2645) $(am__append_2652) \ -+ $(am__append_2659) $(am__append_2666) $(am__append_2673) \ -+ $(am__append_2680) $(am__append_2687) $(am__append_2694) \ -+ $(am__append_2701) $(am__append_2708) $(am__append_2715) \ -+ $(am__append_2722) $(am__append_2729) $(am__append_2736) \ -+ $(am__append_2743) $(am__append_2750) $(am__append_2757) \ -+ $(am__append_2764) $(am__append_2771) $(am__append_2778) \ -+ $(am__append_2785) $(am__append_2792) $(am__append_2799) \ -+ $(am__append_2806) $(am__append_2813) $(am__append_2820) \ -+ $(am__append_2827) $(am__append_2834) $(am__append_2841) \ -+ $(am__append_2848) $(am__append_2855) $(am__append_2862) \ -+ $(am__append_2869) $(am__append_2876) $(am__append_2883) \ -+ $(am__append_2890) $(am__append_2897) $(am__append_2904) \ -+ $(am__append_2911) $(am__append_2918) $(am__append_2925) \ -+ $(am__append_2932) $(nodist_procfs_module_SOURCES) \ - $(nodist_affs_module_SOURCES) $(nodist_afs_module_SOURCES) \ - $(nodist_bfs_module_SOURCES) $(nodist_zstd_module_SOURCES) \ - $(nodist_btrfs_module_SOURCES) \ -@@ -17428,69 +17403,69 @@ BUILT_SOURCES = $(nodist_disk_module_SOURCES) \ - $(nodist_xfs_module_SOURCES) $(nodist_zfs_module_SOURCES) \ - $(nodist_zfscrypt_module_SOURCES) \ - $(nodist_zfsinfo_module_SOURCES) \ -- $(nodist_macbless_module_SOURCES) $(am__append_2946) \ -+ $(nodist_macbless_module_SOURCES) $(am__append_2939) \ - $(nodist_gettext_module_SOURCES) \ - $(nodist_gfxmenu_module_SOURCES) \ - $(nodist_hello_module_SOURCES) $(nodist_gzio_module_SOURCES) \ -- $(nodist_offsetio_module_SOURCES) $(am__append_2953) \ -- $(am__append_2960) $(am__append_2967) $(am__append_2974) \ -- $(am__append_2981) $(am__append_2988) $(am__append_2995) \ -- $(am__append_3002) $(am__append_3009) $(am__append_3016) \ -- $(am__append_3023) $(am__append_3030) $(am__append_3037) \ -- $(am__append_3044) $(am__append_3051) $(am__append_3058) \ -- $(am__append_3065) $(am__append_3072) $(am__append_3079) \ -- $(am__append_3086) $(nodist_elf_module_SOURCES) \ -+ $(nodist_offsetio_module_SOURCES) $(am__append_2946) \ -+ $(am__append_2953) $(am__append_2960) $(am__append_2967) \ -+ $(am__append_2974) $(am__append_2981) $(am__append_2988) \ -+ $(am__append_2995) $(am__append_3002) $(am__append_3009) \ -+ $(am__append_3016) $(am__append_3023) $(am__append_3030) \ -+ $(am__append_3037) $(am__append_3044) $(am__append_3051) \ -+ $(am__append_3058) $(am__append_3065) $(am__append_3072) \ -+ $(am__append_3079) $(nodist_elf_module_SOURCES) \ - $(nodist_crypto_module_SOURCES) \ -- $(nodist_pbkdf2_module_SOURCES) $(am__append_3093) \ -- $(am__append_3100) $(am__append_3107) $(am__append_3114) \ -- $(am__append_3121) $(am__append_3128) $(am__append_3135) \ -- $(am__append_3142) $(am__append_3149) $(am__append_3156) \ -- $(am__append_3163) $(am__append_3170) $(am__append_3177) \ -- $(am__append_3184) $(am__append_3191) $(am__append_3198) \ -- $(am__append_3205) $(am__append_3212) $(am__append_3219) \ -- $(am__append_3226) $(am__append_3233) $(am__append_3240) \ -- $(am__append_3247) $(am__append_3254) $(am__append_3261) \ -- $(am__append_3268) $(am__append_3275) $(am__append_3282) \ -- $(am__append_3289) $(am__append_3296) $(am__append_3303) \ -- $(am__append_3310) $(am__append_3317) $(am__append_3324) \ -- $(am__append_3331) $(am__append_3338) \ -- $(nodist_setjmp_module_SOURCES) $(am__append_3345) \ -- $(am__append_3352) $(am__append_3359) $(am__append_3366) \ -- $(am__append_3373) $(am__append_3380) $(am__append_3387) \ -- $(am__append_3394) $(am__append_3401) $(am__append_3408) \ -- $(am__append_3415) $(am__append_3422) $(am__append_3429) \ -- $(am__append_3436) $(am__append_3443) $(am__append_3450) \ -- $(am__append_3457) $(am__append_3464) $(am__append_3471) \ -- $(am__append_3478) $(am__append_3485) $(am__append_3492) \ -- $(am__append_3499) $(am__append_3506) $(am__append_3513) \ -- $(am__append_3520) $(am__append_3527) $(am__append_3534) \ -- $(am__append_3541) $(am__append_3548) $(am__append_3555) \ -- $(am__append_3562) $(am__append_3569) $(am__append_3576) \ -- $(am__append_3583) $(am__append_3590) $(am__append_3597) \ -- $(am__append_3604) $(am__append_3611) $(am__append_3618) \ -- $(am__append_3625) $(am__append_3632) $(am__append_3639) \ -- $(am__append_3646) $(am__append_3653) $(am__append_3660) \ -- $(am__append_3667) $(am__append_3674) $(am__append_3681) \ -- $(am__append_3688) $(am__append_3695) $(am__append_3702) \ -- $(am__append_3709) $(am__append_3716) $(am__append_3723) \ -- $(am__append_3730) $(am__append_3737) $(am__append_3744) \ -- $(am__append_3751) $(am__append_3758) $(am__append_3765) \ -- $(am__append_3772) $(am__append_3779) $(am__append_3786) \ -- $(am__append_3793) $(am__append_3800) $(am__append_3807) \ -- $(am__append_3814) $(am__append_3821) $(am__append_3828) \ -- $(am__append_3835) $(am__append_3842) $(am__append_3849) \ -- $(am__append_3856) $(am__append_3863) $(am__append_3870) \ -- $(am__append_3877) $(am__append_3884) \ -- $(nodist_macho_module_SOURCES) $(am__append_3891) \ -- $(am__append_3898) $(am__append_3905) $(am__append_3912) \ -- $(am__append_3919) $(am__append_3926) $(am__append_3933) \ -- $(am__append_3940) $(am__append_3947) $(am__append_3954) \ -- $(am__append_3961) $(am__append_3968) $(am__append_3975) \ -- $(am__append_3982) $(am__append_3989) $(am__append_3996) \ -- $(am__append_4003) $(am__append_4010) $(am__append_4017) \ -- $(am__append_4024) $(am__append_4031) $(am__append_4038) \ -- $(am__append_4045) $(am__append_4052) $(am__append_4059) \ -- $(am__append_4066) $(am__append_4073) \ -+ $(nodist_pbkdf2_module_SOURCES) $(am__append_3086) \ -+ $(am__append_3093) $(am__append_3100) $(am__append_3107) \ -+ $(am__append_3114) $(am__append_3121) $(am__append_3128) \ -+ $(am__append_3135) $(am__append_3142) $(am__append_3149) \ -+ $(am__append_3156) $(am__append_3163) $(am__append_3170) \ -+ $(am__append_3177) $(am__append_3184) $(am__append_3191) \ -+ $(am__append_3198) $(am__append_3205) $(am__append_3212) \ -+ $(am__append_3219) $(am__append_3226) $(am__append_3233) \ -+ $(am__append_3240) $(am__append_3247) $(am__append_3254) \ -+ $(am__append_3261) $(am__append_3268) $(am__append_3275) \ -+ $(am__append_3282) $(am__append_3289) $(am__append_3296) \ -+ $(am__append_3303) $(am__append_3310) $(am__append_3317) \ -+ $(am__append_3324) $(am__append_3331) \ -+ $(nodist_setjmp_module_SOURCES) $(am__append_3338) \ -+ $(am__append_3345) $(am__append_3352) $(am__append_3359) \ -+ $(am__append_3366) $(am__append_3373) $(am__append_3380) \ -+ $(am__append_3387) $(am__append_3394) $(am__append_3401) \ -+ $(am__append_3408) $(am__append_3415) $(am__append_3422) \ -+ $(am__append_3429) $(am__append_3436) $(am__append_3443) \ -+ $(am__append_3450) $(am__append_3457) $(am__append_3464) \ -+ $(am__append_3471) $(am__append_3478) $(am__append_3485) \ -+ $(am__append_3492) $(am__append_3499) $(am__append_3506) \ -+ $(am__append_3513) $(am__append_3520) $(am__append_3527) \ -+ $(am__append_3534) $(am__append_3541) $(am__append_3548) \ -+ $(am__append_3555) $(am__append_3562) $(am__append_3569) \ -+ $(am__append_3576) $(am__append_3583) $(am__append_3590) \ -+ $(am__append_3597) $(am__append_3604) $(am__append_3611) \ -+ $(am__append_3618) $(am__append_3625) $(am__append_3632) \ -+ $(am__append_3639) $(am__append_3646) $(am__append_3653) \ -+ $(am__append_3660) $(am__append_3667) $(am__append_3674) \ -+ $(am__append_3681) $(am__append_3688) $(am__append_3695) \ -+ $(am__append_3702) $(am__append_3709) $(am__append_3716) \ -+ $(am__append_3723) $(am__append_3730) $(am__append_3737) \ -+ $(am__append_3744) $(am__append_3751) $(am__append_3758) \ -+ $(am__append_3765) $(am__append_3772) $(am__append_3779) \ -+ $(am__append_3786) $(am__append_3793) $(am__append_3800) \ -+ $(am__append_3807) $(am__append_3814) $(am__append_3821) \ -+ $(am__append_3828) $(am__append_3835) $(am__append_3842) \ -+ $(am__append_3849) $(am__append_3856) $(am__append_3863) \ -+ $(am__append_3870) $(am__append_3877) \ -+ $(nodist_macho_module_SOURCES) $(am__append_3884) \ -+ $(am__append_3891) $(am__append_3898) $(am__append_3905) \ -+ $(am__append_3912) $(am__append_3919) $(am__append_3926) \ -+ $(am__append_3933) $(am__append_3940) $(am__append_3947) \ -+ $(am__append_3954) $(am__append_3961) $(am__append_3968) \ -+ $(am__append_3975) $(am__append_3982) $(am__append_3989) \ -+ $(am__append_3996) $(am__append_4003) $(am__append_4010) \ -+ $(am__append_4017) $(am__append_4024) $(am__append_4031) \ -+ $(am__append_4038) $(am__append_4045) $(am__append_4052) \ -+ $(am__append_4059) $(am__append_4066) \ - $(nodist_normal_module_SOURCES) \ - $(nodist_part_acorn_module_SOURCES) \ - $(nodist_part_amiga_module_SOURCES) \ -@@ -17503,35 +17478,35 @@ BUILT_SOURCES = $(nodist_disk_module_SOURCES) \ - $(nodist_part_bsd_module_SOURCES) \ - $(nodist_part_sunpc_module_SOURCES) \ - $(nodist_part_dfly_module_SOURCES) \ -- $(nodist_msdospart_module_SOURCES) $(am__append_4080) \ -- $(am__append_4087) $(am__append_4094) $(am__append_4101) \ -- $(am__append_4108) $(am__append_4115) $(am__append_4122) \ -- $(am__append_4129) $(am__append_4136) $(am__append_4143) \ -- $(am__append_4150) $(am__append_4157) $(am__append_4164) \ -- $(am__append_4171) $(am__append_4178) $(am__append_4185) \ -- $(am__append_4192) $(am__append_4199) $(am__append_4206) \ -- $(am__append_4213) $(am__append_4220) $(am__append_4227) \ -- $(am__append_4234) $(am__append_4241) $(am__append_4248) \ -- $(am__append_4255) $(am__append_4262) \ -- $(nodist_gfxterm_background_module_SOURCES) $(am__append_4269) \ -- $(am__append_4276) $(am__append_4283) $(am__append_4290) \ -- $(am__append_4297) $(am__append_4304) $(am__append_4311) \ -- $(am__append_4318) $(am__append_4325) $(am__append_4332) \ -- $(am__append_4339) $(am__append_4346) $(am__append_4353) \ -- $(am__append_4360) $(am__append_4367) $(am__append_4374) \ -- $(am__append_4381) $(am__append_4388) $(am__append_4395) \ -- $(am__append_4402) $(am__append_4409) $(am__append_4416) \ -- $(am__append_4423) $(am__append_4430) $(am__append_4437) \ -- $(am__append_4444) $(am__append_4451) $(am__append_4458) \ -- $(am__append_4465) $(am__append_4472) $(am__append_4479) \ -- $(am__append_4486) $(am__append_4493) $(am__append_4500) \ -- $(am__append_4507) $(am__append_4514) $(am__append_4521) \ -- $(am__append_4528) $(am__append_4535) $(am__append_4542) \ -- $(am__append_4549) $(am__append_4556) $(am__append_4563) \ -- $(am__append_4570) $(am__append_4577) $(am__append_4584) \ -- $(am__append_4591) $(am__append_4598) $(am__append_4605) \ -- $(am__append_4612) $(am__append_4619) $(am__append_4626) \ -- $(am__append_4633) $(am__append_4640) $(am__append_4647) \ -+ $(nodist_msdospart_module_SOURCES) $(am__append_4073) \ -+ $(am__append_4080) $(am__append_4087) $(am__append_4094) \ -+ $(am__append_4101) $(am__append_4108) $(am__append_4115) \ -+ $(am__append_4122) $(am__append_4129) $(am__append_4136) \ -+ $(am__append_4143) $(am__append_4150) $(am__append_4157) \ -+ $(am__append_4164) $(am__append_4171) $(am__append_4178) \ -+ $(am__append_4185) $(am__append_4192) $(am__append_4199) \ -+ $(am__append_4206) $(am__append_4213) $(am__append_4220) \ -+ $(am__append_4227) $(am__append_4234) $(am__append_4241) \ -+ $(am__append_4248) $(am__append_4255) \ -+ $(nodist_gfxterm_background_module_SOURCES) $(am__append_4262) \ -+ $(am__append_4269) $(am__append_4276) $(am__append_4283) \ -+ $(am__append_4290) $(am__append_4297) $(am__append_4304) \ -+ $(am__append_4311) $(am__append_4318) $(am__append_4325) \ -+ $(am__append_4332) $(am__append_4339) $(am__append_4346) \ -+ $(am__append_4353) $(am__append_4360) $(am__append_4367) \ -+ $(am__append_4374) $(am__append_4381) $(am__append_4388) \ -+ $(am__append_4395) $(am__append_4402) $(am__append_4409) \ -+ $(am__append_4416) $(am__append_4423) $(am__append_4430) \ -+ $(am__append_4437) $(am__append_4444) $(am__append_4451) \ -+ $(am__append_4458) $(am__append_4465) $(am__append_4472) \ -+ $(am__append_4479) $(am__append_4486) $(am__append_4493) \ -+ $(am__append_4500) $(am__append_4507) $(am__append_4514) \ -+ $(am__append_4521) $(am__append_4528) $(am__append_4535) \ -+ $(am__append_4542) $(am__append_4549) $(am__append_4556) \ -+ $(am__append_4563) $(am__append_4570) $(am__append_4577) \ -+ $(am__append_4584) $(am__append_4591) $(am__append_4598) \ -+ $(am__append_4605) $(am__append_4612) $(am__append_4619) \ -+ $(am__append_4626) $(am__append_4633) $(am__append_4640) \ - $(nodist_functional_test_module_SOURCES) \ - $(nodist_exfctest_module_SOURCES) \ - $(nodist_strtoull_test_module_SOURCES) \ -@@ -17539,15 +17514,15 @@ BUILT_SOURCES = $(nodist_disk_module_SOURCES) \ - $(nodist_signature_test_module_SOURCES) \ - $(nodist_sleep_test_module_SOURCES) \ - $(nodist_xnu_uuid_test_module_SOURCES) \ -- $(nodist_pbkdf2_test_module_SOURCES) $(am__append_4654) \ -- $(am__append_4661) $(am__append_4668) $(am__append_4675) \ -- $(am__append_4682) $(am__append_4689) $(am__append_4696) \ -- $(am__append_4703) $(am__append_4710) $(am__append_4717) \ -- $(am__append_4724) $(am__append_4731) $(am__append_4738) \ -- $(am__append_4745) $(am__append_4752) $(am__append_4759) \ -- $(am__append_4766) $(am__append_4773) $(am__append_4780) \ -- $(am__append_4787) $(am__append_4794) $(am__append_4801) \ -- $(am__append_4808) $(am__append_4815) $(am__append_4822) \ -+ $(nodist_pbkdf2_test_module_SOURCES) $(am__append_4647) \ -+ $(am__append_4654) $(am__append_4661) $(am__append_4668) \ -+ $(am__append_4675) $(am__append_4682) $(am__append_4689) \ -+ $(am__append_4696) $(am__append_4703) $(am__append_4710) \ -+ $(am__append_4717) $(am__append_4724) $(am__append_4731) \ -+ $(am__append_4738) $(am__append_4745) $(am__append_4752) \ -+ $(am__append_4759) $(am__append_4766) $(am__append_4773) \ -+ $(am__append_4780) $(am__append_4787) $(am__append_4794) \ -+ $(am__append_4801) $(am__append_4808) $(am__append_4815) \ - $(nodist_div_test_module_SOURCES) \ - $(nodist_mul_test_module_SOURCES) \ - $(nodist_shift_test_module_SOURCES) \ -@@ -17558,59 +17533,59 @@ BUILT_SOURCES = $(nodist_disk_module_SOURCES) \ - $(nodist_gfxterm_menu_module_SOURCES) \ - $(nodist_cmdline_cat_test_module_SOURCES) \ - $(nodist_bitmap_module_SOURCES) \ -- $(nodist_bitmap_scale_module_SOURCES) $(am__append_4829) \ -- $(am__append_4836) $(am__append_4843) $(am__append_4850) \ -- $(am__append_4857) $(am__append_4864) $(am__append_4871) \ -- $(am__append_4878) $(am__append_4885) \ -+ $(nodist_bitmap_scale_module_SOURCES) $(am__append_4822) \ -+ $(am__append_4829) $(am__append_4836) $(am__append_4843) \ -+ $(am__append_4850) $(am__append_4857) $(am__append_4864) \ -+ $(am__append_4871) $(am__append_4878) \ - $(nodist_jpeg_module_SOURCES) $(nodist_png_module_SOURCES) \ -- $(nodist_tga_module_SOURCES) $(am__append_4892) \ -- $(am__append_4899) $(am__append_4906) $(am__append_4913) \ -- $(am__append_4920) $(am__append_4927) $(am__append_4934) \ -- $(am__append_4941) $(am__append_4948) $(am__append_4955) \ -- $(am__append_4962) $(am__append_4969) $(am__append_4976) \ -- $(am__append_4983) $(am__append_4990) $(am__append_4997) \ -- $(am__append_5004) $(am__append_5011) $(am__append_5018) \ -- $(am__append_5025) $(am__append_5032) $(am__append_5039) \ -- $(am__append_5046) $(am__append_5053) $(am__append_5060) \ -- $(am__append_5067) $(am__append_5074) $(am__append_5081) \ -- $(am__append_5088) $(am__append_5095) $(am__append_5102) \ -- $(am__append_5109) $(am__append_5116) $(am__append_5123) \ -- $(am__append_5130) $(am__append_5137) $(am__append_5144) \ -- $(am__append_5151) $(am__append_5158) $(am__append_5165) \ -- $(am__append_5172) $(nodist_video_colors_module_SOURCES) \ -- $(am__append_5179) $(am__append_5186) \ -+ $(nodist_tga_module_SOURCES) $(am__append_4885) \ -+ $(am__append_4892) $(am__append_4899) $(am__append_4906) \ -+ $(am__append_4913) $(am__append_4920) $(am__append_4927) \ -+ $(am__append_4934) $(am__append_4941) $(am__append_4948) \ -+ $(am__append_4955) $(am__append_4962) $(am__append_4969) \ -+ $(am__append_4976) $(am__append_4983) $(am__append_4990) \ -+ $(am__append_4997) $(am__append_5004) $(am__append_5011) \ -+ $(am__append_5018) $(am__append_5025) $(am__append_5032) \ -+ $(am__append_5039) $(am__append_5046) $(am__append_5053) \ -+ $(am__append_5060) $(am__append_5067) $(am__append_5074) \ -+ $(am__append_5081) $(am__append_5088) $(am__append_5095) \ -+ $(am__append_5102) $(am__append_5109) $(am__append_5116) \ -+ $(am__append_5123) $(am__append_5130) $(am__append_5137) \ -+ $(am__append_5144) $(am__append_5151) $(am__append_5158) \ -+ $(am__append_5165) $(nodist_video_colors_module_SOURCES) \ -+ $(am__append_5172) $(am__append_5179) \ - $(nodist_datehook_module_SOURCES) $(nodist_net_module_SOURCES) \ - $(nodist_tftp_module_SOURCES) $(nodist_http_module_SOURCES) \ -- $(am__append_5193) $(am__append_5200) $(am__append_5207) \ -- $(am__append_5214) $(am__append_5221) $(am__append_5228) \ -- $(am__append_5235) $(am__append_5242) $(am__append_5249) \ -- $(am__append_5256) $(am__append_5263) $(am__append_5270) \ -- $(am__append_5277) $(am__append_5284) $(am__append_5291) \ -- $(am__append_5298) $(am__append_5305) $(am__append_5312) \ -+ $(am__append_5186) $(am__append_5193) $(am__append_5200) \ -+ $(am__append_5207) $(am__append_5214) $(am__append_5221) \ -+ $(am__append_5228) $(am__append_5235) $(am__append_5242) \ -+ $(am__append_5249) $(am__append_5256) $(am__append_5263) \ -+ $(am__append_5270) $(am__append_5277) $(am__append_5284) \ -+ $(am__append_5291) $(am__append_5298) $(am__append_5305) \ - $(nodist_syslinuxcfg_module_SOURCES) \ - $(nodist_test_blockarg_module_SOURCES) \ - $(nodist_xzio_module_SOURCES) $(nodist_lzopio_module_SOURCES) \ -- $(nodist_testload_module_SOURCES) $(am__append_5319) \ -- $(am__append_5326) $(am__append_5333) $(am__append_5340) \ -- $(am__append_5347) $(am__append_5354) $(am__append_5361) \ -- $(am__append_5368) $(am__append_5375) $(am__append_5382) \ -- $(am__append_5389) $(am__append_5396) $(am__append_5403) \ -- $(am__append_5410) $(am__append_5417) $(am__append_5424) \ -- $(am__append_5431) $(nodist_priority_queue_module_SOURCES) \ -- $(nodist_time_module_SOURCES) $(am__append_5438) \ -- $(am__append_5445) $(nodist_adler32_module_SOURCES) \ -+ $(nodist_testload_module_SOURCES) $(am__append_5312) \ -+ $(am__append_5319) $(am__append_5326) $(am__append_5333) \ -+ $(am__append_5340) $(am__append_5347) $(am__append_5354) \ -+ $(am__append_5361) $(am__append_5368) $(am__append_5375) \ -+ $(am__append_5382) $(am__append_5389) $(am__append_5396) \ -+ $(am__append_5403) $(am__append_5410) $(am__append_5417) \ -+ $(am__append_5424) $(nodist_priority_queue_module_SOURCES) \ -+ $(nodist_time_module_SOURCES) $(am__append_5431) \ -+ $(am__append_5438) $(nodist_adler32_module_SOURCES) \ - $(nodist_crc64_module_SOURCES) $(nodist_mpi_module_SOURCES) \ -- $(nodist_all_video_module_SOURCES) $(am__append_5452) \ -- $(am__append_5459) $(am__append_5466) $(am__append_5473) \ -- $(am__append_5480) $(am__append_5487) \ -- $(nodist_testspeed_module_SOURCES) $(am__append_5494) \ -+ $(nodist_all_video_module_SOURCES) $(am__append_5445) \ -+ $(am__append_5452) $(am__append_5459) $(am__append_5466) \ -+ $(am__append_5473) $(am__append_5480) \ -+ $(nodist_testspeed_module_SOURCES) $(am__append_5487) \ - $(nodist_tr_module_SOURCES) $(nodist_progress_module_SOURCES) \ -- $(nodist_file_module_SOURCES) $(am__append_5501) \ -- $(am__append_5508) $(am__append_5515) $(am__append_5522) \ -- $(am__append_5529) $(am__append_5536) $(am__append_5543) \ -- $(am__append_5550) $(am__append_5557) $(am__append_5564) \ -- $(am__append_5571) $(am__append_5578) $(am__append_5585) \ -- $(am__append_5592) $(nodist_gcry_arcfour_module_SOURCES) \ -+ $(nodist_file_module_SOURCES) $(am__append_5494) \ -+ $(am__append_5501) $(am__append_5508) $(am__append_5515) \ -+ $(am__append_5522) $(am__append_5529) $(am__append_5536) \ -+ $(am__append_5543) $(am__append_5550) $(am__append_5557) \ -+ $(am__append_5564) $(am__append_5571) $(am__append_5578) \ -+ $(am__append_5585) $(nodist_gcry_arcfour_module_SOURCES) \ - $(nodist_gcry_blowfish_module_SOURCES) \ - $(nodist_gcry_camellia_module_SOURCES) \ - $(nodist_gcry_cast5_module_SOURCES) \ -@@ -17631,20 +17606,20 @@ BUILT_SOURCES = $(nodist_disk_module_SOURCES) \ - $(nodist_gcry_sha512_module_SOURCES) \ - $(nodist_gcry_tiger_module_SOURCES) \ - $(nodist_gcry_twofish_module_SOURCES) \ -- $(nodist_gcry_whirlpool_module_SOURCES) $(am__append_5598) \ -- $(am__append_5603) $(am__append_5608) $(am__append_5613) \ -- $(am__append_5618) $(am__append_5623) $(am__append_5628) \ -- $(am__append_5633) $(am__append_5638) $(am__append_5643) \ -- $(am__append_5648) $(am__append_5653) $(am__append_5658) \ -- $(am__append_5663) $(am__append_5668) $(am__append_5673) \ -- $(am__append_5678) $(am__append_5683) $(am__append_5688) \ -- $(am__append_5693) $(am__append_5698) $(am__append_5703) \ -- $(am__append_5708) $(am__append_5713) $(am__append_5718) \ -- $(am__append_5723) $(am__append_5728) $(am__append_5733) \ -- $(am__append_5738) $(am__append_5743) $(am__append_5748) \ -- $(am__append_5753) $(am__append_5758) $(am__append_5763) \ -- $(am__append_5768) $(am__append_5773) $(am__append_5778) \ -- $(am__append_5783) $(am__append_5788) $(am__append_5795) \ -+ $(nodist_gcry_whirlpool_module_SOURCES) $(am__append_5591) \ -+ $(am__append_5596) $(am__append_5601) $(am__append_5606) \ -+ $(am__append_5611) $(am__append_5616) $(am__append_5621) \ -+ $(am__append_5626) $(am__append_5631) $(am__append_5636) \ -+ $(am__append_5641) $(am__append_5646) $(am__append_5651) \ -+ $(am__append_5656) $(am__append_5661) $(am__append_5666) \ -+ $(am__append_5671) $(am__append_5676) $(am__append_5681) \ -+ $(am__append_5686) $(am__append_5691) $(am__append_5696) \ -+ $(am__append_5701) $(am__append_5706) $(am__append_5711) \ -+ $(am__append_5716) $(am__append_5721) $(am__append_5726) \ -+ $(am__append_5731) $(am__append_5736) $(am__append_5741) \ -+ $(am__append_5746) $(am__append_5751) $(am__append_5756) \ -+ $(am__append_5761) $(am__append_5766) $(am__append_5771) \ -+ $(am__append_5776) $(am__append_5781) $(am__append_5788) \ - symlist.h symlist.c - MACHO2IMG = $(top_builddir)/grub-macho2img - AM_CFLAGS = $(TARGET_CFLAGS) -@@ -20083,14 +20058,6 @@ pgp_module_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_MODULE) - pgp_module_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_MODULE) -I$(srcdir)/lib/posix_wrap - pgp_module_CCASFLAGS = $(AM_CCASFLAGS) $(CCASFLAGS_MODULE) - pgp_module_DEPENDENCIES = $(TARGET_OBJ2ELF) --@COND_x86_64_efi_TRUE@shim_lock_module_SOURCES = commands/efi/shim_lock.c ## platform sources --@COND_x86_64_efi_TRUE@nodist_shim_lock_module_SOURCES = ## platform nodist sources --@COND_x86_64_efi_TRUE@shim_lock_module_LDADD = --@COND_x86_64_efi_TRUE@shim_lock_module_CFLAGS = $(AM_CFLAGS) $(CFLAGS_MODULE) --@COND_x86_64_efi_TRUE@shim_lock_module_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_MODULE) --@COND_x86_64_efi_TRUE@shim_lock_module_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_MODULE) --@COND_x86_64_efi_TRUE@shim_lock_module_CCASFLAGS = $(AM_CCASFLAGS) $(CCASFLAGS_MODULE) --@COND_x86_64_efi_TRUE@shim_lock_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_i386_coreboot_TRUE@hdparm_module_SOURCES = commands/hdparm.c ## platform sources - @COND_i386_efi_TRUE@hdparm_module_SOURCES = commands/hdparm.c ## platform sources - @COND_i386_ieee1275_TRUE@hdparm_module_SOURCES = commands/hdparm.c ## platform sources -@@ -29924,13 +29891,6 @@ tests/shift_test_module-shift_test.$(OBJEXT): tests/$(am__dirstamp) \ - shift_test.module$(EXEEXT): $(shift_test_module_OBJECTS) $(shift_test_module_DEPENDENCIES) $(EXTRA_shift_test_module_DEPENDENCIES) - @rm -f shift_test.module$(EXEEXT) - $(AM_V_CCLD)$(shift_test_module_LINK) $(shift_test_module_OBJECTS) $(shift_test_module_LDADD) $(LIBS) --commands/efi/shim_lock_module-shim_lock.$(OBJEXT): \ -- commands/efi/$(am__dirstamp) \ -- commands/efi/$(DEPDIR)/$(am__dirstamp) -- --shim_lock.module$(EXEEXT): $(shim_lock_module_OBJECTS) $(shim_lock_module_DEPENDENCIES) $(EXTRA_shim_lock_module_DEPENDENCIES) -- @rm -f shim_lock.module$(EXEEXT) -- $(AM_V_CCLD)$(shim_lock_module_LINK) $(shim_lock_module_OBJECTS) $(shim_lock_module_LDADD) $(LIBS) - tests/signature_test_module-signature_test.$(OBJEXT): \ - tests/$(am__dirstamp) tests/$(DEPDIR)/$(am__dirstamp) - -@@ -30831,7 +30791,6 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@commands/efi/$(DEPDIR)/lsefimmap_module-lsefimmap.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@commands/efi/$(DEPDIR)/lsefisystab_module-lsefisystab.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@commands/efi/$(DEPDIR)/lssal_module-lssal.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@commands/efi/$(DEPDIR)/shim_lock_module-shim_lock.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@commands/efi/$(DEPDIR)/tpm_module-tpm.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@commands/i386/$(DEPDIR)/cmosdump_module-cmosdump.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@commands/i386/$(DEPDIR)/cmostest_module-cmostest.Po@am__quote@ -@@ -40402,20 +40361,6 @@ tests/shift_test_module-shift_test.obj: tests/shift_test.c - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shift_test_module_CPPFLAGS) $(CPPFLAGS) $(shift_test_module_CFLAGS) $(CFLAGS) -c -o tests/shift_test_module-shift_test.obj `if test -f 'tests/shift_test.c'; then $(CYGPATH_W) 'tests/shift_test.c'; else $(CYGPATH_W) '$(srcdir)/tests/shift_test.c'; fi` - --commands/efi/shim_lock_module-shim_lock.o: commands/efi/shim_lock.c --@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shim_lock_module_CPPFLAGS) $(CPPFLAGS) $(shim_lock_module_CFLAGS) $(CFLAGS) -MT commands/efi/shim_lock_module-shim_lock.o -MD -MP -MF commands/efi/$(DEPDIR)/shim_lock_module-shim_lock.Tpo -c -o commands/efi/shim_lock_module-shim_lock.o `test -f 'commands/efi/shim_lock.c' || echo '$(srcdir)/'`commands/efi/shim_lock.c --@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) commands/efi/$(DEPDIR)/shim_lock_module-shim_lock.Tpo commands/efi/$(DEPDIR)/shim_lock_module-shim_lock.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='commands/efi/shim_lock.c' object='commands/efi/shim_lock_module-shim_lock.o' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shim_lock_module_CPPFLAGS) $(CPPFLAGS) $(shim_lock_module_CFLAGS) $(CFLAGS) -c -o commands/efi/shim_lock_module-shim_lock.o `test -f 'commands/efi/shim_lock.c' || echo '$(srcdir)/'`commands/efi/shim_lock.c -- --commands/efi/shim_lock_module-shim_lock.obj: commands/efi/shim_lock.c --@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shim_lock_module_CPPFLAGS) $(CPPFLAGS) $(shim_lock_module_CFLAGS) $(CFLAGS) -MT commands/efi/shim_lock_module-shim_lock.obj -MD -MP -MF commands/efi/$(DEPDIR)/shim_lock_module-shim_lock.Tpo -c -o commands/efi/shim_lock_module-shim_lock.obj `if test -f 'commands/efi/shim_lock.c'; then $(CYGPATH_W) 'commands/efi/shim_lock.c'; else $(CYGPATH_W) '$(srcdir)/commands/efi/shim_lock.c'; fi` --@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) commands/efi/$(DEPDIR)/shim_lock_module-shim_lock.Tpo commands/efi/$(DEPDIR)/shim_lock_module-shim_lock.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='commands/efi/shim_lock.c' object='commands/efi/shim_lock_module-shim_lock.obj' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shim_lock_module_CPPFLAGS) $(CPPFLAGS) $(shim_lock_module_CFLAGS) $(CFLAGS) -c -o commands/efi/shim_lock_module-shim_lock.obj `if test -f 'commands/efi/shim_lock.c'; then $(CYGPATH_W) 'commands/efi/shim_lock.c'; else $(CYGPATH_W) '$(srcdir)/commands/efi/shim_lock.c'; fi` -- - tests/signature_test_module-signature_test.o: tests/signature_test.c - @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(signature_test_module_CPPFLAGS) $(CPPFLAGS) $(signature_test_module_CFLAGS) $(CFLAGS) -MT tests/signature_test_module-signature_test.o -MD -MP -MF tests/$(DEPDIR)/signature_test_module-signature_test.Tpo -c -o tests/signature_test_module-signature_test.o `test -f 'tests/signature_test.c' || echo '$(srcdir)/'`tests/signature_test.c - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) tests/$(DEPDIR)/signature_test_module-signature_test.Tpo tests/$(DEPDIR)/signature_test_module-signature_test.Po -@@ -43738,10 +43683,6 @@ pgp.marker: $(pgp_module_SOURCES) $(nodist_pgp_module_SOURCES) - $(TARGET_CPP) -DGRUB_LST_GENERATOR $(CPPFLAGS_MARKER) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pgp_module_CPPFLAGS) $(CPPFLAGS) $^ > $@.new || (rm -f $@; exit 1) - grep 'MARKER' $@.new > $@; rm -f $@.new - --@COND_x86_64_efi_TRUE@shim_lock.marker: $(shim_lock_module_SOURCES) $(nodist_shim_lock_module_SOURCES) --@COND_x86_64_efi_TRUE@ $(TARGET_CPP) -DGRUB_LST_GENERATOR $(CPPFLAGS_MARKER) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shim_lock_module_CPPFLAGS) $(CPPFLAGS) $^ > $@.new || (rm -f $@; exit 1) --@COND_x86_64_efi_TRUE@ grep 'MARKER' $@.new > $@; rm -f $@.new -- - @COND_i386_pc_TRUE@hdparm.marker: $(hdparm_module_SOURCES) $(nodist_hdparm_module_SOURCES) - @COND_i386_pc_TRUE@ $(TARGET_CPP) -DGRUB_LST_GENERATOR $(CPPFLAGS_MARKER) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hdparm_module_CPPFLAGS) $(CPPFLAGS) $^ > $@.new || (rm -f $@; exit 1) - @COND_i386_pc_TRUE@ grep 'MARKER' $@.new > $@; rm -f $@.new -diff --git a/grub-core/commands/efi/shim_lock.c b/grub-core/commands/efi/shim_lock.c -deleted file mode 100644 -index d8f52d7..0000000 ---- a/grub-core/commands/efi/shim_lock.c -+++ /dev/null -@@ -1,130 +0,0 @@ --/* -- * GRUB -- GRand Unified Bootloader -- * Copyright (C) 2017 Free Software Foundation, Inc. -- * -- * GRUB is free software: you can redistribute it and/or modify -- * it under the terms of the GNU General Public License as published by -- * the Free Software Foundation, either version 3 of the License, or -- * (at your option) any later version. -- * -- * GRUB is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- * GNU General Public License for more details. -- * -- * You should have received a copy of the GNU General Public License -- * along with GRUB. If not, see . -- * -- * EFI shim lock verifier. -- */ -- --#include --#include --#include --#include --#include --#include -- --GRUB_MOD_LICENSE ("GPLv3+"); -- --static grub_efi_guid_t shim_lock_guid = GRUB_EFI_SHIM_LOCK_GUID; --static grub_efi_shim_lock_protocol_t *sl; -- --/* List of modules which cannot be loaded if UEFI secure boot mode is enabled. */ --static const char * const disabled_mods[] = {"iorw", "memrw", "wrmsr", NULL}; -- --static grub_err_t --shim_lock_init (grub_file_t io, enum grub_file_type type, -- void **context __attribute__ ((unused)), -- enum grub_verify_flags *flags) --{ -- const char *b, *e; -- int i; -- -- *flags = GRUB_VERIFY_FLAGS_SKIP_VERIFICATION; -- -- if (!sl) -- return GRUB_ERR_NONE; -- -- switch (type & GRUB_FILE_TYPE_MASK) -- { -- case GRUB_FILE_TYPE_GRUB_MODULE: -- /* Establish GRUB module name. */ -- b = grub_strrchr (io->name, '/'); -- e = grub_strrchr (io->name, '.'); -- -- b = b ? (b + 1) : io->name; -- e = e ? e : io->name + grub_strlen (io->name); -- e = (e > b) ? e : io->name + grub_strlen (io->name); -- -- for (i = 0; disabled_mods[i]; i++) -- if (!grub_strncmp (b, disabled_mods[i], grub_strlen (b) - grub_strlen (e))) -- { -- grub_error (GRUB_ERR_ACCESS_DENIED, -- N_("module cannot be loaded in UEFI secure boot mode: %s"), -- io->name); -- return GRUB_ERR_ACCESS_DENIED; -- } -- -- /* Fall through. */ -- -- case GRUB_FILE_TYPE_ACPI_TABLE: -- case GRUB_FILE_TYPE_DEVICE_TREE_IMAGE: -- *flags = GRUB_VERIFY_FLAGS_DEFER_AUTH; -- -- return GRUB_ERR_NONE; -- -- case GRUB_FILE_TYPE_LINUX_KERNEL: -- case GRUB_FILE_TYPE_MULTIBOOT_KERNEL: -- case GRUB_FILE_TYPE_BSD_KERNEL: -- case GRUB_FILE_TYPE_XNU_KERNEL: -- case GRUB_FILE_TYPE_PLAN9_KERNEL: -- for (i = 0; disabled_mods[i]; i++) -- if (grub_dl_get (disabled_mods[i])) -- { -- grub_error (GRUB_ERR_ACCESS_DENIED, -- N_("cannot boot due to dangerous module in memory: %s"), -- disabled_mods[i]); -- return GRUB_ERR_ACCESS_DENIED; -- } -- -- *flags = GRUB_VERIFY_FLAGS_SINGLE_CHUNK; -- -- /* Fall through. */ -- -- default: -- return GRUB_ERR_NONE; -- } --} -- --static grub_err_t --shim_lock_write (void *context __attribute__ ((unused)), void *buf, grub_size_t size) --{ -- if (sl->verify (buf, size) != GRUB_EFI_SUCCESS) -- return grub_error (GRUB_ERR_BAD_SIGNATURE, N_("bad shim signature")); -- -- return GRUB_ERR_NONE; --} -- --struct grub_file_verifier shim_lock = -- { -- .name = "shim_lock", -- .init = shim_lock_init, -- .write = shim_lock_write -- }; -- --GRUB_MOD_INIT(shim_lock) --{ -- sl = grub_efi_locate_protocol (&shim_lock_guid, 0); -- grub_verifier_register (&shim_lock); -- -- if (!sl) -- return; -- -- grub_dl_set_persistent (mod); --} -- --GRUB_MOD_FINI(shim_lock) --{ -- grub_verifier_unregister (&shim_lock); --} -diff --git a/grub-core/kern/efi/init.c b/grub-core/kern/efi/init.c -index 2c31847..b683bec 100644 ---- a/grub-core/kern/efi/init.c -+++ b/grub-core/kern/efi/init.c -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -39,6 +40,9 @@ grub_efi_init (void) - /* Initialize the memory management system. */ - grub_efi_mm_init (); - -+ /* Register the shim_lock verifier if UEFI Secure Boot is enabled. */ -+ grub_shim_lock_verifier_setup (); -+ - efi_call_4 (grub_efi_system_table->boot_services->set_watchdog_timer, - 0, 0, 0, NULL); - -diff --git a/grub-core/kern/efi/sb.c b/grub-core/kern/efi/sb.c -index 19658d9..ce3b7f6 100644 ---- a/grub-core/kern/efi/sb.c -+++ b/grub-core/kern/efi/sb.c -@@ -22,9 +22,16 @@ - #include - #include - #include -+#include - #include - #include - #include -+#include -+ -+static grub_efi_guid_t shim_lock_guid = GRUB_EFI_SHIM_LOCK_GUID; -+ -+/* List of modules which cannot be loaded if UEFI secure boot mode is enabled. */ -+static const char * const disabled_mods[] = {"iorw", "memrw", NULL}; - - /* - * Determine whether we're in secure boot mode. -@@ -107,3 +114,101 @@ grub_efi_get_secureboot (void) - - return secureboot; - } -+ -+static grub_err_t -+shim_lock_verifier_init (grub_file_t io __attribute__ ((unused)), -+ enum grub_file_type type, -+ void **context __attribute__ ((unused)), -+ enum grub_verify_flags *flags) -+{ -+ const char *b, *e; -+ int i; -+ -+ *flags = GRUB_VERIFY_FLAGS_SKIP_VERIFICATION; -+ -+ switch (type & GRUB_FILE_TYPE_MASK) -+ { -+ case GRUB_FILE_TYPE_GRUB_MODULE: -+ /* Establish GRUB module name. */ -+ b = grub_strrchr (io->name, '/'); -+ e = grub_strrchr (io->name, '.'); -+ -+ b = b ? (b + 1) : io->name; -+ e = e ? e : io->name + grub_strlen (io->name); -+ e = (e > b) ? e : io->name + grub_strlen (io->name); -+ -+ for (i = 0; disabled_mods[i]; i++) -+ if (!grub_strncmp (b, disabled_mods[i], grub_strlen (b) - grub_strlen (e))) -+ { -+ grub_error (GRUB_ERR_ACCESS_DENIED, -+ N_("module cannot be loaded in UEFI secure boot mode: %s"), -+ io->name); -+ return GRUB_ERR_ACCESS_DENIED; -+ } -+ -+ /* Fall through. */ -+ -+ case GRUB_FILE_TYPE_ACPI_TABLE: -+ case GRUB_FILE_TYPE_DEVICE_TREE_IMAGE: -+ *flags = GRUB_VERIFY_FLAGS_DEFER_AUTH; -+ -+ return GRUB_ERR_NONE; -+ -+ case GRUB_FILE_TYPE_LINUX_KERNEL: -+ case GRUB_FILE_TYPE_MULTIBOOT_KERNEL: -+ case GRUB_FILE_TYPE_BSD_KERNEL: -+ case GRUB_FILE_TYPE_XNU_KERNEL: -+ case GRUB_FILE_TYPE_PLAN9_KERNEL: -+ for (i = 0; disabled_mods[i]; i++) -+ if (grub_dl_get (disabled_mods[i])) -+ { -+ grub_error (GRUB_ERR_ACCESS_DENIED, -+ N_("cannot boot due to dangerous module in memory: %s"), -+ disabled_mods[i]); -+ return GRUB_ERR_ACCESS_DENIED; -+ } -+ -+ *flags = GRUB_VERIFY_FLAGS_SINGLE_CHUNK; -+ -+ /* Fall through. */ -+ -+ default: -+ return GRUB_ERR_NONE; -+ } -+} -+ -+static grub_err_t -+shim_lock_verifier_write (void *context __attribute__ ((unused)), void *buf, grub_size_t size) -+{ -+ grub_efi_shim_lock_protocol_t *sl = grub_efi_locate_protocol (&shim_lock_guid, 0); -+ -+ if (!sl) -+ return grub_error (GRUB_ERR_ACCESS_DENIED, N_("shim_lock protocol not found")); -+ -+ if (sl->verify (buf, size) != GRUB_EFI_SUCCESS) -+ return grub_error (GRUB_ERR_BAD_SIGNATURE, N_("bad shim signature")); -+ -+ return GRUB_ERR_NONE; -+} -+ -+struct grub_file_verifier shim_lock_verifier = -+ { -+ .name = "shim_lock_verifier", -+ .init = shim_lock_verifier_init, -+ .write = shim_lock_verifier_write -+ }; -+ -+void -+grub_shim_lock_verifier_setup (void) -+{ -+ grub_efi_shim_lock_protocol_t *sl = -+ grub_efi_locate_protocol (&shim_lock_guid, 0); -+ -+ if (!sl) -+ return; -+ -+ if (grub_efi_get_secureboot () != GRUB_EFI_SECUREBOOT_MODE_ENABLED) -+ return; -+ -+ grub_verifier_register (&shim_lock_verifier); -+} -diff --git a/include/grub/efi/sb.h b/include/grub/efi/sb.h -index a33d985..30c4335 100644 ---- a/include/grub/efi/sb.h -+++ b/include/grub/efi/sb.h -@@ -30,6 +30,9 @@ - #ifdef GRUB_MACHINE_EFI - extern grub_uint8_t - EXPORT_FUNC (grub_efi_get_secureboot) (void); -+ -+extern void -+grub_shim_lock_verifier_setup (void); - #else - static inline grub_uint8_t - grub_efi_get_secureboot (void) -diff --git a/po/POTFILES.in b/po/POTFILES.in -index 11c799f..49755d3 100644 ---- a/po/POTFILES.in -+++ b/po/POTFILES.in -@@ -39,7 +39,6 @@ - ./grub-core/commands/efi/lsefimmap.c - ./grub-core/commands/efi/lsefisystab.c - ./grub-core/commands/efi/lssal.c --./grub-core/commands/efi/shim_lock.c - ./grub-core/commands/efi/tpm.c - ./grub-core/commands/eval.c - ./grub-core/commands/extcmd.c --- -2.14.2 - diff --git a/buildroot/boot/grub2/0035-kern-Add-lockdown-support.patch b/buildroot/boot/grub2/0035-kern-Add-lockdown-support.patch deleted file mode 100644 index 268b652785..0000000000 --- a/buildroot/boot/grub2/0035-kern-Add-lockdown-support.patch +++ /dev/null @@ -1,763 +0,0 @@ -From 578c95298bcc46e0296f4c786db64c2ff26ce2cc Mon Sep 17 00:00:00 2001 -From: Javier Martinez Canillas -Date: Mon, 28 Sep 2020 20:08:02 +0200 -Subject: [PATCH] kern: Add lockdown support - -When the GRUB starts on a secure boot platform, some commands can be -used to subvert the protections provided by the verification mechanism and -could lead to booting untrusted system. - -To prevent that situation, allow GRUB to be locked down. That way the code -may check if GRUB has been locked down and further restrict the commands -that are registered or what subset of their functionality could be used. - -The lockdown support adds the following components: - -* The grub_lockdown() function which can be used to lockdown GRUB if, - e.g., UEFI Secure Boot is enabled. - -* The grub_is_lockdown() function which can be used to check if the GRUB - was locked down. - -* A verifier that flags OS kernels, the GRUB modules, Device Trees and ACPI - tables as GRUB_VERIFY_FLAGS_DEFER_AUTH to defer verification to other - verifiers. These files are only successfully verified if another registered - verifier returns success. Otherwise, the whole verification process fails. - - For example, PE/COFF binaries verification can be done by the shim_lock - verifier which validates the signatures using the shim_lock protocol. - However, the verification is not deferred directly to the shim_lock verifier. - The shim_lock verifier is hooked into the verification process instead. - -* A set of grub_{command,extcmd}_lockdown functions that can be used by - code registering command handlers, to only register unsafe commands if - the GRUB has not been locked down. - -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -[Add changes to generated files] -Signed-off-by: Stefan Sørensen ---- - Makefile.in | 2 ++ - conf/Makefile.common | 2 ++ - docs/grub-dev.texi | 27 +++++++++++++++ - docs/grub.texi | 8 +++++ - grub-core/Makefile.am | 5 ++- - grub-core/Makefile.core.am | 14 ++++---- - grub-core/Makefile.core.def | 1 + - grub-core/Makefile.in | 73 ++++++++++++++++++++++++++++++----------- - grub-core/commands/extcmd.c | 23 +++++++++++++ - grub-core/kern/command.c | 24 ++++++++++++++ - grub-core/kern/lockdown.c | 80 +++++++++++++++++++++++++++++++++++++++++++++ - include/grub/command.h | 5 +++ - include/grub/extcmd.h | 7 ++++ - include/grub/lockdown.h | 44 +++++++++++++++++++++++++ - po/POTFILES.in | 2 ++ - 15 files changed, 290 insertions(+), 27 deletions(-) - create mode 100644 grub-core/kern/lockdown.c - create mode 100644 include/grub/lockdown.h - -diff --git a/Makefile.in b/Makefile.in -index e6a185b..ecb3278 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -2617,7 +2617,9 @@ CPPFLAGS_PARTTOOL_LIST = -Dgrub_parttool_register=PARTTOOL_LIST_MARKER - CPPFLAGS_TERMINAL_LIST = '-Dgrub_term_register_input(...)=INPUT_TERMINAL_LIST_MARKER(__VA_ARGS__)' \ - '-Dgrub_term_register_output(...)=OUTPUT_TERMINAL_LIST_MARKER(__VA_ARGS__)' - CPPFLAGS_COMMAND_LIST = '-Dgrub_register_command(...)=COMMAND_LIST_MARKER(__VA_ARGS__)' \ -+ '-Dgrub_register_command_lockdown(...)=COMMAND_LOCKDOWN_LIST_MARKER(__VA_ARGS__)' \ - '-Dgrub_register_extcmd(...)=EXTCOMMAND_LIST_MARKER(__VA_ARGS__)' \ -+ '-Dgrub_register_extcmd_lockdown(...)=EXTCOMMAND_LOCKDOWN_LIST_MARKER(__VA_ARGS__)' \ - '-Dgrub_register_command_p1(...)=P1COMMAND_LIST_MARKER(__VA_ARGS__)' - CPPFLAGS_FDT_LIST := '-Dgrub_fdtbus_register(...)=FDT_DRIVER_LIST_MARKER(__VA_ARGS__)' - CPPFLAGS_MARKER = $(CPPFLAGS_FS_LIST) $(CPPFLAGS_VIDEO_LIST) \ -diff --git a/conf/Makefile.common b/conf/Makefile.common -index 6cd71cb..2a1a886 100644 ---- a/conf/Makefile.common -+++ b/conf/Makefile.common -@@ -84,7 +84,9 @@ CPPFLAGS_PARTTOOL_LIST = -Dgrub_parttool_register=PARTTOOL_LIST_MARKER - CPPFLAGS_TERMINAL_LIST = '-Dgrub_term_register_input(...)=INPUT_TERMINAL_LIST_MARKER(__VA_ARGS__)' - CPPFLAGS_TERMINAL_LIST += '-Dgrub_term_register_output(...)=OUTPUT_TERMINAL_LIST_MARKER(__VA_ARGS__)' - CPPFLAGS_COMMAND_LIST = '-Dgrub_register_command(...)=COMMAND_LIST_MARKER(__VA_ARGS__)' -+CPPFLAGS_COMMAND_LIST += '-Dgrub_register_command_lockdown(...)=COMMAND_LOCKDOWN_LIST_MARKER(__VA_ARGS__)' - CPPFLAGS_COMMAND_LIST += '-Dgrub_register_extcmd(...)=EXTCOMMAND_LIST_MARKER(__VA_ARGS__)' -+CPPFLAGS_COMMAND_LIST += '-Dgrub_register_extcmd_lockdown(...)=EXTCOMMAND_LOCKDOWN_LIST_MARKER(__VA_ARGS__)' - CPPFLAGS_COMMAND_LIST += '-Dgrub_register_command_p1(...)=P1COMMAND_LIST_MARKER(__VA_ARGS__)' - CPPFLAGS_FDT_LIST := '-Dgrub_fdtbus_register(...)=FDT_DRIVER_LIST_MARKER(__VA_ARGS__)' - CPPFLAGS_MARKER = $(CPPFLAGS_FS_LIST) $(CPPFLAGS_VIDEO_LIST) \ -diff --git a/docs/grub-dev.texi b/docs/grub-dev.texi -index ee389fd..635ec72 100644 ---- a/docs/grub-dev.texi -+++ b/docs/grub-dev.texi -@@ -86,6 +86,7 @@ This edition documents version @value{VERSION}. - * PFF2 Font File Format:: - * Graphical Menu Software Design:: - * Verifiers framework:: -+* Lockdown framework:: - * Copying This Manual:: Copying This Manual - * Index:: - @end menu -@@ -2086,6 +2087,32 @@ Optionally at the end of the file @samp{fini}, if it exists, is called with just - the context. If you return no error during any of @samp{init}, @samp{write} and - @samp{fini} then the file is considered as having succeded verification. - -+@node Lockdown framework -+@chapter Lockdown framework -+ -+The GRUB can be locked down, which is a restricted mode where some operations -+are not allowed. For instance, some commands cannot be used when the GRUB is -+locked down. -+ -+The function -+@code{grub_lockdown()} is used to lockdown GRUB and the function -+@code{grub_is_lockdown()} function can be used to check whether lockdown is -+enabled or not. When enabled, the function returns @samp{GRUB_LOCKDOWN_ENABLED} -+and @samp{GRUB_LOCKDOWN_DISABLED} when is not enabled. -+ -+The following functions can be used to register the commands that can only be -+used when lockdown is disabled: -+ -+@itemize -+ -+@item @code{grub_cmd_lockdown()} registers command which should not run when the -+GRUB is in lockdown mode. -+ -+@item @code{grub_cmd_lockdown()} registers extended command which should not run -+when the GRUB is in lockdown mode. -+ -+@end itemize -+ - @node Copying This Manual - @appendix Copying This Manual - -diff --git a/docs/grub.texi b/docs/grub.texi -index aefe032..a25459f 100644 ---- a/docs/grub.texi -+++ b/docs/grub.texi -@@ -5581,6 +5581,7 @@ environment variables and commands are listed in the same order. - * Using digital signatures:: Booting digitally signed code - * UEFI secure boot and shim:: Booting digitally signed PE files - * Measured Boot:: Measuring boot components -+* Lockdown:: Lockdown when booting on a secure setup - @end menu - - @node Authentication and authorisation -@@ -5795,6 +5796,13 @@ into @file{core.img} in order to avoid a potential gap in measurement between - - Measured boot is currently only supported on EFI platforms. - -+@node Lockdown -+@section Lockdown when booting on a secure setup -+ -+The GRUB can be locked down when booted on a secure boot environment, for example -+if the UEFI secure boot is enabled. On a locked down configuration, the GRUB will -+be restricted and some operations/commands cannot be executed. -+ - @node Platform limitations - @chapter Platform limitations - -diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am -index cc6fc7d..30e23ad 100644 ---- a/grub-core/Makefile.am -+++ b/grub-core/Makefile.am -@@ -80,6 +80,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/fs.h - KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i18n.h - KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/kernel.h - KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/list.h -+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/lockdown.h - KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/misc.h - if COND_emu - KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/compiler-rt-emu.h -@@ -377,8 +378,10 @@ command.lst: $(MARKER_FILES) - b=`basename $$pp .marker`; \ - sed -n \ - -e "/EXTCOMMAND_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/*\1: $$b/;p;}" \ -+ -e "/EXTCOMMAND_LOCKDOWN_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/*\1: $$b/;p;}" \ - -e "/P1COMMAND_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/*\1: $$b/;p;}" \ -- -e "/COMMAND_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/\1: $$b/;p;}" $$pp; \ -+ -e "/COMMAND_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/\1: $$b/;p;}" \ -+ -e "/COMMAND_LOCKDOWN_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/\1: $$b/;p;}" $$pp; \ - done) | sort -u > $@ - platform_DATA += command.lst - CLEANFILES += command.lst -diff --git a/grub-core/Makefile.core.am b/grub-core/Makefile.core.am -index 5623a5e..fbfb627 100644 ---- a/grub-core/Makefile.core.am -+++ b/grub-core/Makefile.core.am -@@ -22378,7 +22378,7 @@ endif - if COND_i386_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/i386/efi/startup.S --kernel_exec_SOURCES += kern/i386/efi/tsc.c kern/i386/tsc_pmtimer.c kern/i386/efi/init.c bus/pci.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/i386/efi/tsc.c kern/i386/tsc_pmtimer.c kern/i386/efi/init.c bus/pci.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22488,7 +22488,7 @@ endif - if COND_x86_64_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/x86_64/efi/startup.S --kernel_exec_SOURCES += kern/i386/efi/tsc.c kern/i386/tsc_pmtimer.c kern/x86_64/efi/callwrap.S kern/i386/efi/init.c bus/pci.c kern/x86_64/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/i386/efi/tsc.c kern/i386/tsc_pmtimer.c kern/x86_64/efi/callwrap.S kern/i386/efi/init.c bus/pci.c kern/x86_64/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22664,7 +22664,7 @@ endif - if COND_ia64_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = --kernel_exec_SOURCES += kern/ia64/efi/startup.S kern/ia64/efi/init.c kern/ia64/dl.c kern/ia64/dl_helper.c kern/ia64/cache.c lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/ia64/efi/startup.S kern/ia64/efi/init.c kern/ia64/dl.c kern/ia64/dl_helper.c kern/ia64/cache.c lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -fno-builtin -fpic -minline-int-divide-max-throughput -@@ -22730,7 +22730,7 @@ endif - if COND_arm_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/arm/efi/startup.S --kernel_exec_SOURCES += kern/arm/efi/init.c kern/efi/fdt.c kern/arm/dl.c kern/arm/dl_helper.c kern/arm/cache_armv6.S kern/arm/cache_armv7.S kern/arm/cache.c kern/arm/compiler-rt.S lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/arm/efi/init.c kern/efi/fdt.c kern/arm/dl.c kern/arm/dl_helper.c kern/arm/cache_armv6.S kern/arm/cache_armv7.S kern/arm/cache.c kern/arm/compiler-rt.S lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22752,7 +22752,7 @@ endif - if COND_arm64_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/arm64/efi/startup.S --kernel_exec_SOURCES += kern/arm64/efi/init.c kern/efi/fdt.c kern/arm64/cache.c kern/arm64/cache_flush.S kern/arm64/dl.c kern/arm64/dl_helper.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/arm64/efi/init.c kern/efi/fdt.c kern/arm64/cache.c kern/arm64/cache_flush.S kern/arm64/dl.c kern/arm64/dl_helper.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22796,7 +22796,7 @@ endif - if COND_riscv32_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/riscv/efi/startup.S --kernel_exec_SOURCES += kern/riscv/efi/init.c kern/efi/fdt.c kern/riscv/cache.c kern/riscv/cache_flush.S kern/riscv/dl.c lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/riscv/efi/init.c kern/efi/fdt.c kern/riscv/cache.c kern/riscv/cache_flush.S kern/riscv/dl.c lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22818,7 +22818,7 @@ endif - if COND_riscv64_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/riscv/efi/startup.S --kernel_exec_SOURCES += kern/riscv/efi/init.c kern/efi/fdt.c kern/riscv/cache.c kern/riscv/cache_flush.S kern/riscv/dl.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/riscv/efi/init.c kern/efi/fdt.c kern/riscv/cache.c kern/riscv/cache_flush.S kern/riscv/dl.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 4d380ed..ee8dc55 100644 ---- a/grub-core/Makefile.core.def -+++ b/grub-core/Makefile.core.def -@@ -205,6 +205,7 @@ kernel = { - efi = kern/acpi.c; - efi = kern/efi/acpi.c; - efi = kern/efi/sb.c; -+ efi = kern/lockdown.c; - i386_coreboot = kern/i386/pc/acpi.c; - i386_multiboot = kern/i386/pc/acpi.c; - i386_coreboot = kern/acpi.c; -diff --git a/grub-core/Makefile.in b/grub-core/Makefile.in -index 09dc802..ac400ea 100644 ---- a/grub-core/Makefile.in -+++ b/grub-core/Makefile.in -@@ -10457,13 +10457,14 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - kern/arm64/cache_flush.S kern/arm64/dl.c \ - kern/arm64/dl_helper.c disk/efi/efidisk.c kern/efi/efi.c \ - kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c \ -- kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c \ -- kern/time.c kern/generic/millisleep.c kern/command.c \ -- kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c \ -- kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c \ -- kern/misc.c kern/parser.c kern/partition.c \ -- kern/rescue_parser.c kern/rescue_reader.c kern/term.c \ -- kern/verifiers.c kern/arm/startup.S kern/arm/coreboot/init.c \ -+ kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c \ -+ kern/compiler-rt.c kern/mm.c kern/time.c \ -+ kern/generic/millisleep.c kern/command.c kern/corecmd.c \ -+ kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c \ -+ kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c \ -+ kern/parser.c kern/partition.c kern/rescue_parser.c \ -+ kern/rescue_reader.c kern/term.c kern/verifiers.c \ -+ kern/arm/startup.S kern/arm/coreboot/init.c \ - kern/arm/coreboot/timer.c kern/arm/coreboot/coreboot.S \ - lib/fdt.c bus/fdt.c term/ps2.c term/arm/pl050.c \ - term/arm/cros.c term/arm/cros_ec.c bus/spi/rk3288_spi.c \ -@@ -10572,6 +10573,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-acpi.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/efi/kernel_exec-acpi.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/efi/kernel_exec-sb.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-lockdown.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-compiler-rt.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ -@@ -10646,6 +10648,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-acpi.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/efi/kernel_exec-acpi.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/efi/kernel_exec-sb.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-lockdown.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-compiler-rt.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ -@@ -10683,6 +10686,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-acpi.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/efi/kernel_exec-acpi.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/efi/kernel_exec-sb.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-lockdown.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-compiler-rt.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ -@@ -10884,6 +10888,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-acpi.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/efi/kernel_exec-acpi.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/efi/kernel_exec-sb.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-lockdown.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-compiler-rt.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ -@@ -11120,6 +11125,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-acpi.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/efi/kernel_exec-acpi.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/efi/kernel_exec-sb.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-lockdown.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-compiler-rt.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ -@@ -11287,6 +11293,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-acpi.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/efi/kernel_exec-acpi.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/efi/kernel_exec-sb.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-lockdown.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-compiler-rt.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ -@@ -11379,6 +11386,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_TRUE@ kern/kernel_exec-acpi.$(OBJEXT) \ - @COND_arm64_efi_TRUE@ kern/efi/kernel_exec-acpi.$(OBJEXT) \ - @COND_arm64_efi_TRUE@ kern/efi/kernel_exec-sb.$(OBJEXT) \ -+@COND_arm64_efi_TRUE@ kern/kernel_exec-lockdown.$(OBJEXT) \ - @COND_arm64_efi_TRUE@ kern/kernel_exec-compiler-rt.$(OBJEXT) \ - @COND_arm64_efi_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ -@@ -15379,7 +15387,9 @@ CPPFLAGS_PARTTOOL_LIST = -Dgrub_parttool_register=PARTTOOL_LIST_MARKER - CPPFLAGS_TERMINAL_LIST = '-Dgrub_term_register_input(...)=INPUT_TERMINAL_LIST_MARKER(__VA_ARGS__)' \ - '-Dgrub_term_register_output(...)=OUTPUT_TERMINAL_LIST_MARKER(__VA_ARGS__)' - CPPFLAGS_COMMAND_LIST = '-Dgrub_register_command(...)=COMMAND_LIST_MARKER(__VA_ARGS__)' \ -+ '-Dgrub_register_command_lockdown(...)=COMMAND_LOCKDOWN_LIST_MARKER(__VA_ARGS__)' \ - '-Dgrub_register_extcmd(...)=EXTCOMMAND_LIST_MARKER(__VA_ARGS__)' \ -+ '-Dgrub_register_extcmd_lockdown(...)=EXTCOMMAND_LOCKDOWN_LIST_MARKER(__VA_ARGS__)' \ - '-Dgrub_register_command_p1(...)=P1COMMAND_LIST_MARKER(__VA_ARGS__)' - CPPFLAGS_FDT_LIST := '-Dgrub_fdtbus_register(...)=FDT_DRIVER_LIST_MARKER(__VA_ARGS__)' - CPPFLAGS_MARKER = $(CPPFLAGS_FS_LIST) $(CPPFLAGS_VIDEO_LIST) \ -@@ -16387,6 +16397,7 @@ KERNEL_HEADER_FILES = $(top_srcdir)/include/grub/cache.h \ - $(top_srcdir)/include/grub/i18n.h \ - $(top_srcdir)/include/grub/kernel.h \ - $(top_srcdir)/include/grub/list.h \ -+ $(top_srcdir)/include/grub/lockdown.h \ - $(top_srcdir)/include/grub/misc.h $(am__append_5794) \ - $(am__append_5795) $(top_srcdir)/include/grub/mm.h \ - $(top_srcdir)/include/grub/parser.h \ -@@ -25594,7 +25605,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_arm64_efi_TRUE@ kern/efi/efi.c kern/efi/init.c \ - @COND_arm64_efi_TRUE@ kern/efi/mm.c term/efi/console.c \ - @COND_arm64_efi_TRUE@ kern/acpi.c kern/efi/acpi.c kern/efi/sb.c \ --@COND_arm64_efi_TRUE@ kern/compiler-rt.c kern/mm.c kern/time.c \ -+@COND_arm64_efi_TRUE@ kern/lockdown.c kern/compiler-rt.c \ -+@COND_arm64_efi_TRUE@ kern/mm.c kern/time.c \ - @COND_arm64_efi_TRUE@ kern/generic/millisleep.c kern/command.c \ - @COND_arm64_efi_TRUE@ kern/corecmd.c kern/device.c kern/disk.c \ - @COND_arm64_efi_TRUE@ kern/dl.c kern/env.c kern/err.c \ -@@ -25645,7 +25657,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_arm_efi_TRUE@ kern/efi/init.c kern/efi/mm.c \ - @COND_arm_efi_TRUE@ term/efi/console.c kern/acpi.c \ - @COND_arm_efi_TRUE@ kern/efi/acpi.c kern/efi/sb.c \ --@COND_arm_efi_TRUE@ kern/compiler-rt.c kern/mm.c kern/time.c \ -+@COND_arm_efi_TRUE@ kern/lockdown.c kern/compiler-rt.c \ -+@COND_arm_efi_TRUE@ kern/mm.c kern/time.c \ - @COND_arm_efi_TRUE@ kern/generic/millisleep.c kern/command.c \ - @COND_arm_efi_TRUE@ kern/corecmd.c kern/device.c kern/disk.c \ - @COND_arm_efi_TRUE@ kern/dl.c kern/env.c kern/err.c kern/file.c \ -@@ -25725,7 +25738,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_i386_efi_TRUE@ kern/efi/efi.c kern/efi/init.c \ - @COND_i386_efi_TRUE@ kern/efi/mm.c term/efi/console.c \ - @COND_i386_efi_TRUE@ kern/acpi.c kern/efi/acpi.c kern/efi/sb.c \ --@COND_i386_efi_TRUE@ kern/compiler-rt.c kern/mm.c kern/time.c \ -+@COND_i386_efi_TRUE@ kern/lockdown.c kern/compiler-rt.c \ -+@COND_i386_efi_TRUE@ kern/mm.c kern/time.c \ - @COND_i386_efi_TRUE@ kern/generic/millisleep.c kern/command.c \ - @COND_i386_efi_TRUE@ kern/corecmd.c kern/device.c kern/disk.c \ - @COND_i386_efi_TRUE@ kern/dl.c kern/env.c kern/err.c \ -@@ -25843,7 +25857,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_ia64_efi_TRUE@ kern/efi/efi.c kern/efi/init.c \ - @COND_ia64_efi_TRUE@ kern/efi/mm.c term/efi/console.c \ - @COND_ia64_efi_TRUE@ kern/acpi.c kern/efi/acpi.c kern/efi/sb.c \ --@COND_ia64_efi_TRUE@ kern/compiler-rt.c kern/mm.c kern/time.c \ -+@COND_ia64_efi_TRUE@ kern/lockdown.c kern/compiler-rt.c \ -+@COND_ia64_efi_TRUE@ kern/mm.c kern/time.c \ - @COND_ia64_efi_TRUE@ kern/generic/millisleep.c kern/command.c \ - @COND_ia64_efi_TRUE@ kern/corecmd.c kern/device.c kern/disk.c \ - @COND_ia64_efi_TRUE@ kern/dl.c kern/env.c kern/err.c \ -@@ -25956,8 +25971,9 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_riscv32_efi_TRUE@ kern/efi/init.c kern/efi/mm.c \ - @COND_riscv32_efi_TRUE@ term/efi/console.c kern/acpi.c \ - @COND_riscv32_efi_TRUE@ kern/efi/acpi.c kern/efi/sb.c \ --@COND_riscv32_efi_TRUE@ kern/compiler-rt.c kern/mm.c \ --@COND_riscv32_efi_TRUE@ kern/time.c kern/generic/millisleep.c \ -+@COND_riscv32_efi_TRUE@ kern/lockdown.c kern/compiler-rt.c \ -+@COND_riscv32_efi_TRUE@ kern/mm.c kern/time.c \ -+@COND_riscv32_efi_TRUE@ kern/generic/millisleep.c \ - @COND_riscv32_efi_TRUE@ kern/command.c kern/corecmd.c \ - @COND_riscv32_efi_TRUE@ kern/device.c kern/disk.c kern/dl.c \ - @COND_riscv32_efi_TRUE@ kern/env.c kern/err.c kern/file.c \ -@@ -25974,9 +25990,9 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_riscv64_efi_TRUE@ kern/efi/efi.c kern/efi/init.c \ - @COND_riscv64_efi_TRUE@ kern/efi/mm.c term/efi/console.c \ - @COND_riscv64_efi_TRUE@ kern/acpi.c kern/efi/acpi.c \ --@COND_riscv64_efi_TRUE@ kern/efi/sb.c kern/compiler-rt.c \ --@COND_riscv64_efi_TRUE@ kern/mm.c kern/time.c \ --@COND_riscv64_efi_TRUE@ kern/generic/millisleep.c \ -+@COND_riscv64_efi_TRUE@ kern/efi/sb.c kern/lockdown.c \ -+@COND_riscv64_efi_TRUE@ kern/compiler-rt.c kern/mm.c \ -+@COND_riscv64_efi_TRUE@ kern/time.c kern/generic/millisleep.c \ - @COND_riscv64_efi_TRUE@ kern/command.c kern/corecmd.c \ - @COND_riscv64_efi_TRUE@ kern/device.c kern/disk.c kern/dl.c \ - @COND_riscv64_efi_TRUE@ kern/env.c kern/err.c kern/file.c \ -@@ -26022,8 +26038,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_x86_64_efi_TRUE@ kern/efi/efi.c kern/efi/init.c \ - @COND_x86_64_efi_TRUE@ kern/efi/mm.c term/efi/console.c \ - @COND_x86_64_efi_TRUE@ kern/acpi.c kern/efi/acpi.c \ --@COND_x86_64_efi_TRUE@ kern/efi/sb.c kern/compiler-rt.c \ --@COND_x86_64_efi_TRUE@ kern/mm.c kern/time.c \ -+@COND_x86_64_efi_TRUE@ kern/efi/sb.c kern/lockdown.c \ -+@COND_x86_64_efi_TRUE@ kern/compiler-rt.c kern/mm.c kern/time.c \ - @COND_x86_64_efi_TRUE@ kern/generic/millisleep.c kern/command.c \ - @COND_x86_64_efi_TRUE@ kern/corecmd.c kern/device.c kern/disk.c \ - @COND_x86_64_efi_TRUE@ kern/dl.c kern/env.c kern/err.c \ -@@ -27994,6 +28010,8 @@ kern/efi/kernel_exec-acpi.$(OBJEXT): kern/efi/$(am__dirstamp) \ - kern/efi/$(DEPDIR)/$(am__dirstamp) - kern/efi/kernel_exec-sb.$(OBJEXT): kern/efi/$(am__dirstamp) \ - kern/efi/$(DEPDIR)/$(am__dirstamp) -+kern/kernel_exec-lockdown.$(OBJEXT): kern/$(am__dirstamp) \ -+ kern/$(DEPDIR)/$(am__dirstamp) - kern/kernel_exec-compiler-rt.$(OBJEXT): kern/$(am__dirstamp) \ - kern/$(DEPDIR)/$(am__dirstamp) - kern/kernel_exec-mm.$(OBJEXT): kern/$(am__dirstamp) \ -@@ -30945,6 +30963,7 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/kernel_exec-file.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/kernel_exec-fs.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/kernel_exec-list.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/kernel_exec-lockdown.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/kernel_exec-main.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/kernel_exec-misc.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/kernel_exec-mm.Po@am__quote@ -@@ -35293,6 +35312,20 @@ kern/efi/kernel_exec-sb.obj: kern/efi/sb.c - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -c -o kern/efi/kernel_exec-sb.obj `if test -f 'kern/efi/sb.c'; then $(CYGPATH_W) 'kern/efi/sb.c'; else $(CYGPATH_W) '$(srcdir)/kern/efi/sb.c'; fi` - -+kern/kernel_exec-lockdown.o: kern/lockdown.c -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -MT kern/kernel_exec-lockdown.o -MD -MP -MF kern/$(DEPDIR)/kernel_exec-lockdown.Tpo -c -o kern/kernel_exec-lockdown.o `test -f 'kern/lockdown.c' || echo '$(srcdir)/'`kern/lockdown.c -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) kern/$(DEPDIR)/kernel_exec-lockdown.Tpo kern/$(DEPDIR)/kernel_exec-lockdown.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='kern/lockdown.c' object='kern/kernel_exec-lockdown.o' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -c -o kern/kernel_exec-lockdown.o `test -f 'kern/lockdown.c' || echo '$(srcdir)/'`kern/lockdown.c -+ -+kern/kernel_exec-lockdown.obj: kern/lockdown.c -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -MT kern/kernel_exec-lockdown.obj -MD -MP -MF kern/$(DEPDIR)/kernel_exec-lockdown.Tpo -c -o kern/kernel_exec-lockdown.obj `if test -f 'kern/lockdown.c'; then $(CYGPATH_W) 'kern/lockdown.c'; else $(CYGPATH_W) '$(srcdir)/kern/lockdown.c'; fi` -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) kern/$(DEPDIR)/kernel_exec-lockdown.Tpo kern/$(DEPDIR)/kernel_exec-lockdown.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='kern/lockdown.c' object='kern/kernel_exec-lockdown.obj' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -c -o kern/kernel_exec-lockdown.obj `if test -f 'kern/lockdown.c'; then $(CYGPATH_W) 'kern/lockdown.c'; else $(CYGPATH_W) '$(srcdir)/kern/lockdown.c'; fi` -+ - kern/kernel_exec-compiler-rt.o: kern/compiler-rt.c - @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -MT kern/kernel_exec-compiler-rt.o -MD -MP -MF kern/$(DEPDIR)/kernel_exec-compiler-rt.Tpo -c -o kern/kernel_exec-compiler-rt.o `test -f 'kern/compiler-rt.c' || echo '$(srcdir)/'`kern/compiler-rt.c - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) kern/$(DEPDIR)/kernel_exec-compiler-rt.Tpo kern/$(DEPDIR)/kernel_exec-compiler-rt.Po -@@ -46650,8 +46683,10 @@ command.lst: $(MARKER_FILES) - b=`basename $$pp .marker`; \ - sed -n \ - -e "/EXTCOMMAND_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/*\1: $$b/;p;}" \ -+ -e "/EXTCOMMAND_LOCKDOWN_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/*\1: $$b/;p;}" \ - -e "/P1COMMAND_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/*\1: $$b/;p;}" \ -- -e "/COMMAND_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/\1: $$b/;p;}" $$pp; \ -+ -e "/COMMAND_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/\1: $$b/;p;}" \ -+ -e "/COMMAND_LOCKDOWN_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/\1: $$b/;p;}" $$pp; \ - done) | sort -u > $@ - - partmap.lst: $(MARKER_FILES) -diff --git a/grub-core/commands/extcmd.c b/grub-core/commands/extcmd.c -index 69574e2..90a5ca2 100644 ---- a/grub-core/commands/extcmd.c -+++ b/grub-core/commands/extcmd.c -@@ -19,6 +19,7 @@ - - #include - #include -+#include - #include - #include - #include -@@ -110,6 +111,28 @@ grub_register_extcmd (const char *name, grub_extcmd_func_t func, - summary, description, parser, 1); - } - -+static grub_err_t -+grub_extcmd_lockdown (grub_extcmd_context_t ctxt __attribute__ ((unused)), -+ int argc __attribute__ ((unused)), -+ char **argv __attribute__ ((unused))) -+{ -+ return grub_error (GRUB_ERR_ACCESS_DENIED, -+ N_("%s: the command is not allowed when lockdown is enforced"), -+ ctxt->extcmd->cmd->name); -+} -+ -+grub_extcmd_t -+grub_register_extcmd_lockdown (const char *name, grub_extcmd_func_t func, -+ grub_command_flags_t flags, const char *summary, -+ const char *description, -+ const struct grub_arg_option *parser) -+{ -+ if (grub_is_lockdown () == GRUB_LOCKDOWN_ENABLED) -+ func = grub_extcmd_lockdown; -+ -+ return grub_register_extcmd (name, func, flags, summary, description, parser); -+} -+ - void - grub_unregister_extcmd (grub_extcmd_t ext) - { -diff --git a/grub-core/kern/command.c b/grub-core/kern/command.c -index acd7218..4aabcd4 100644 ---- a/grub-core/kern/command.c -+++ b/grub-core/kern/command.c -@@ -17,6 +17,7 @@ - * along with GRUB. If not, see . - */ - -+#include - #include - #include - -@@ -77,6 +78,29 @@ grub_register_command_prio (const char *name, - return cmd; - } - -+static grub_err_t -+grub_cmd_lockdown (grub_command_t cmd __attribute__ ((unused)), -+ int argc __attribute__ ((unused)), -+ char **argv __attribute__ ((unused))) -+ -+{ -+ return grub_error (GRUB_ERR_ACCESS_DENIED, -+ N_("%s: the command is not allowed when lockdown is enforced"), -+ cmd->name); -+} -+ -+grub_command_t -+grub_register_command_lockdown (const char *name, -+ grub_command_func_t func, -+ const char *summary, -+ const char *description) -+{ -+ if (grub_is_lockdown () == GRUB_LOCKDOWN_ENABLED) -+ func = grub_cmd_lockdown; -+ -+ return grub_register_command_prio (name, func, summary, description, 0); -+} -+ - void - grub_unregister_command (grub_command_t cmd) - { -diff --git a/grub-core/kern/lockdown.c b/grub-core/kern/lockdown.c -new file mode 100644 -index 0000000..1e56c0b ---- /dev/null -+++ b/grub-core/kern/lockdown.c -@@ -0,0 +1,80 @@ -+/* -+ * GRUB -- GRand Unified Bootloader -+ * Copyright (C) 2020 Free Software Foundation, Inc. -+ * -+ * GRUB is free software: you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation, either version 3 of the License, or -+ * (at your option) any later version. -+ * -+ * GRUB is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with GRUB. If not, see . -+ * -+ */ -+ -+#include -+#include -+#include -+#include -+ -+static int lockdown = GRUB_LOCKDOWN_DISABLED; -+ -+static grub_err_t -+lockdown_verifier_init (grub_file_t io __attribute__ ((unused)), -+ enum grub_file_type type, -+ void **context __attribute__ ((unused)), -+ enum grub_verify_flags *flags) -+{ -+ *flags = GRUB_VERIFY_FLAGS_SKIP_VERIFICATION; -+ -+ switch (type & GRUB_FILE_TYPE_MASK) -+ { -+ case GRUB_FILE_TYPE_GRUB_MODULE: -+ case GRUB_FILE_TYPE_LINUX_KERNEL: -+ case GRUB_FILE_TYPE_MULTIBOOT_KERNEL: -+ case GRUB_FILE_TYPE_XEN_HYPERVISOR: -+ case GRUB_FILE_TYPE_BSD_KERNEL: -+ case GRUB_FILE_TYPE_XNU_KERNEL: -+ case GRUB_FILE_TYPE_PLAN9_KERNEL: -+ case GRUB_FILE_TYPE_NTLDR: -+ case GRUB_FILE_TYPE_TRUECRYPT: -+ case GRUB_FILE_TYPE_FREEDOS: -+ case GRUB_FILE_TYPE_PXECHAINLOADER: -+ case GRUB_FILE_TYPE_PCCHAINLOADER: -+ case GRUB_FILE_TYPE_COREBOOT_CHAINLOADER: -+ case GRUB_FILE_TYPE_EFI_CHAINLOADED_IMAGE: -+ case GRUB_FILE_TYPE_ACPI_TABLE: -+ case GRUB_FILE_TYPE_DEVICE_TREE_IMAGE: -+ *flags = GRUB_VERIFY_FLAGS_DEFER_AUTH; -+ -+ /* Fall through. */ -+ -+ default: -+ return GRUB_ERR_NONE; -+ } -+} -+ -+struct grub_file_verifier lockdown_verifier = -+ { -+ .name = "lockdown_verifier", -+ .init = lockdown_verifier_init, -+ }; -+ -+void -+grub_lockdown (void) -+{ -+ lockdown = GRUB_LOCKDOWN_ENABLED; -+ -+ grub_verifier_register (&lockdown_verifier); -+} -+ -+int -+grub_is_lockdown (void) -+{ -+ return lockdown; -+} -diff --git a/include/grub/command.h b/include/grub/command.h -index eee4e84..2a6f7f8 100644 ---- a/include/grub/command.h -+++ b/include/grub/command.h -@@ -86,6 +86,11 @@ EXPORT_FUNC(grub_register_command_prio) (const char *name, - const char *summary, - const char *description, - int prio); -+grub_command_t -+EXPORT_FUNC(grub_register_command_lockdown) (const char *name, -+ grub_command_func_t func, -+ const char *summary, -+ const char *description); - void EXPORT_FUNC(grub_unregister_command) (grub_command_t cmd); - - static inline grub_command_t -diff --git a/include/grub/extcmd.h b/include/grub/extcmd.h -index 19fe592..fe9248b 100644 ---- a/include/grub/extcmd.h -+++ b/include/grub/extcmd.h -@@ -62,6 +62,13 @@ grub_extcmd_t EXPORT_FUNC(grub_register_extcmd) (const char *name, - const char *description, - const struct grub_arg_option *parser); - -+grub_extcmd_t EXPORT_FUNC(grub_register_extcmd_lockdown) (const char *name, -+ grub_extcmd_func_t func, -+ grub_command_flags_t flags, -+ const char *summary, -+ const char *description, -+ const struct grub_arg_option *parser); -+ - grub_extcmd_t EXPORT_FUNC(grub_register_extcmd_prio) (const char *name, - grub_extcmd_func_t func, - grub_command_flags_t flags, -diff --git a/include/grub/lockdown.h b/include/grub/lockdown.h -new file mode 100644 -index 0000000..40531fa ---- /dev/null -+++ b/include/grub/lockdown.h -@@ -0,0 +1,44 @@ -+/* -+ * GRUB -- GRand Unified Bootloader -+ * Copyright (C) 2020 Free Software Foundation, Inc. -+ * -+ * GRUB is free software: you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation, either version 3 of the License, or -+ * (at your option) any later version. -+ * -+ * GRUB is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with GRUB. If not, see . -+ */ -+ -+#ifndef GRUB_LOCKDOWN_H -+#define GRUB_LOCKDOWN_H 1 -+ -+#include -+ -+#define GRUB_LOCKDOWN_DISABLED 0 -+#define GRUB_LOCKDOWN_ENABLED 1 -+ -+#ifdef GRUB_MACHINE_EFI -+extern void -+EXPORT_FUNC (grub_lockdown) (void); -+extern int -+EXPORT_FUNC (grub_is_lockdown) (void); -+#else -+static inline void -+grub_lockdown (void) -+{ -+} -+ -+static inline int -+grub_is_lockdown (void) -+{ -+ return GRUB_LOCKDOWN_DISABLED; -+} -+#endif -+#endif /* ! GRUB_LOCKDOWN_H */ -diff --git a/po/POTFILES.in b/po/POTFILES.in -index 49755d3..5e26845 100644 ---- a/po/POTFILES.in -+++ b/po/POTFILES.in -@@ -309,6 +309,7 @@ - ./grub-core/kern/ieee1275/mmap.c - ./grub-core/kern/ieee1275/openfw.c - ./grub-core/kern/list.c -+./grub-core/kern/lockdown.c - ./grub-core/kern/main.c - ./grub-core/kern/mips/arc/init.c - ./grub-core/kern/mips/dl.c -@@ -1207,6 +1208,7 @@ - ./include/grub/linux.h - ./include/grub/list.h - ./include/grub/loader.h -+./include/grub/lockdown.h - ./include/grub/lvm.h - ./include/grub/macho.h - ./include/grub/machoload.h --- -2.14.2 - diff --git a/buildroot/boot/grub2/0036-kern-lockdown-Set-a-variable-if-the-GRUB-is-locked-d.patch b/buildroot/boot/grub2/0036-kern-lockdown-Set-a-variable-if-the-GRUB-is-locked-d.patch deleted file mode 100644 index e630d332eb..0000000000 --- a/buildroot/boot/grub2/0036-kern-lockdown-Set-a-variable-if-the-GRUB-is-locked-d.patch +++ /dev/null @@ -1,57 +0,0 @@ -From d90367471779c240e002e62edfb6b31fc85b4908 Mon Sep 17 00:00:00 2001 -From: Javier Martinez Canillas -Date: Tue, 2 Feb 2021 19:59:48 +0100 -Subject: [PATCH] kern/lockdown: Set a variable if the GRUB is locked down - -It may be useful for scripts to determine whether the GRUB is locked -down or not. Add the lockdown variable which is set to "y" when the GRUB -is locked down. - -Suggested-by: Dimitri John Ledkov -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - docs/grub.texi | 3 +++ - grub-core/kern/lockdown.c | 4 ++++ - 2 files changed, 7 insertions(+) - -diff --git a/docs/grub.texi b/docs/grub.texi -index a25459f..bdbb329 100644 ---- a/docs/grub.texi -+++ b/docs/grub.texi -@@ -5803,6 +5803,9 @@ The GRUB can be locked down when booted on a secure boot environment, for exampl - if the UEFI secure boot is enabled. On a locked down configuration, the GRUB will - be restricted and some operations/commands cannot be executed. - -+The @samp{lockdown} variable is set to @samp{y} when the GRUB is locked down. -+Otherwise it does not exit. -+ - @node Platform limitations - @chapter Platform limitations - -diff --git a/grub-core/kern/lockdown.c b/grub-core/kern/lockdown.c -index 1e56c0b..0bc70fd 100644 ---- a/grub-core/kern/lockdown.c -+++ b/grub-core/kern/lockdown.c -@@ -18,6 +18,7 @@ - */ - - #include -+#include - #include - #include - #include -@@ -71,6 +72,9 @@ grub_lockdown (void) - lockdown = GRUB_LOCKDOWN_ENABLED; - - grub_verifier_register (&lockdown_verifier); -+ -+ grub_env_set ("lockdown", "y"); -+ grub_env_export ("lockdown"); - } - - int --- -2.14.2 - diff --git a/buildroot/boot/grub2/0037-efi-Lockdown-the-GRUB-when-the-UEFI-Secure-Boot-is-e.patch b/buildroot/boot/grub2/0037-efi-Lockdown-the-GRUB-when-the-UEFI-Secure-Boot-is-e.patch deleted file mode 100644 index b55772de9a..0000000000 --- a/buildroot/boot/grub2/0037-efi-Lockdown-the-GRUB-when-the-UEFI-Secure-Boot-is-e.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 98b00a403cbf2ba6833d1ac0499871b27a08eb77 Mon Sep 17 00:00:00 2001 -From: Javier Martinez Canillas -Date: Mon, 28 Sep 2020 20:08:29 +0200 -Subject: [PATCH] efi: Lockdown the GRUB when the UEFI Secure Boot is enabled - -If the UEFI Secure Boot is enabled then the GRUB must be locked down -to prevent executing code that can potentially be used to subvert its -verification mechanisms. - -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/kern/efi/init.c | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/grub-core/kern/efi/init.c b/grub-core/kern/efi/init.c -index b683bec..1333465 100644 ---- a/grub-core/kern/efi/init.c -+++ b/grub-core/kern/efi/init.c -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -40,8 +41,15 @@ grub_efi_init (void) - /* Initialize the memory management system. */ - grub_efi_mm_init (); - -- /* Register the shim_lock verifier if UEFI Secure Boot is enabled. */ -- grub_shim_lock_verifier_setup (); -+ /* -+ * Lockdown the GRUB and register the shim_lock verifier -+ * if the UEFI Secure Boot is enabled. -+ */ -+ if (grub_efi_get_secureboot () == GRUB_EFI_SECUREBOOT_MODE_ENABLED) -+ { -+ grub_lockdown (); -+ grub_shim_lock_verifier_setup (); -+ } - - efi_call_4 (grub_efi_system_table->boot_services->set_watchdog_timer, - 0, 0, 0, NULL); --- -2.14.2 - diff --git a/buildroot/boot/grub2/0038-efi-Use-grub_is_lockdown-instead-of-hardcoding-a-dis.patch b/buildroot/boot/grub2/0038-efi-Use-grub_is_lockdown-instead-of-hardcoding-a-dis.patch deleted file mode 100644 index c551822bf0..0000000000 --- a/buildroot/boot/grub2/0038-efi-Use-grub_is_lockdown-instead-of-hardcoding-a-dis.patch +++ /dev/null @@ -1,232 +0,0 @@ -From 8f73052885892bc0dbc01e297f79d7cf4925e491 Mon Sep 17 00:00:00 2001 -From: Javier Martinez Canillas -Date: Mon, 28 Sep 2020 20:08:33 +0200 -Subject: [PATCH] efi: Use grub_is_lockdown() instead of hardcoding a disabled - modules list - -Now the GRUB can check if it has been locked down and this can be used to -prevent executing commands that can be utilized to circumvent the UEFI -Secure Boot mechanisms. So, instead of hardcoding a list of modules that -have to be disabled, prevent the usage of commands that can be dangerous. - -This not only allows the commands to be disabled on other platforms, but -also properly separate the concerns. Since the shim_lock verifier logic -should be only about preventing to run untrusted binaries and not about -defining these kind of policies. - -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - docs/grub.texi | 15 +++++++++------ - grub-core/commands/i386/wrmsr.c | 5 +++-- - grub-core/commands/iorw.c | 19 ++++++++++--------- - grub-core/commands/memrw.c | 19 ++++++++++--------- - grub-core/kern/efi/sb.c | 41 ----------------------------------------- - 5 files changed, 32 insertions(+), 67 deletions(-) - -diff --git a/docs/grub.texi b/docs/grub.texi -index bdbb329..bbe60a4 100644 ---- a/docs/grub.texi -+++ b/docs/grub.texi -@@ -5256,6 +5256,9 @@ only applies to the particular cpu/core/thread that runs the command. - Also, if you specify a reserved or unimplemented MSR address, it will - cause a general protection exception (which is not currently being handled) - and the system will reboot. -+ -+Note: The command is not allowed when lockdown is enforced (@pxref{Lockdown}). -+ This is done to prevent subverting various security mechanisms. - @end deffn - - @node xen_hypervisor -@@ -5752,12 +5755,12 @@ boot and the shim. This functionality is provided by the shim_lock verifier. It - is built into the @file{core.img} and is registered if the UEFI secure boot is - enabled. - --All modules not stored in the @file{core.img} and the ACPI tables for the --@command{acpi} command have to be signed, e.g. using PGP. Additionally, the --@command{iorw}, the @command{memrw} and the @command{wrmsr} commands are --prohibited if the UEFI secure boot is enabled. This is done due to --security reasons. All above mentioned requirements are enforced by the --shim_lock verifier logic. -+All GRUB modules not stored in the @file{core.img}, OS kernels, ACPI tables, -+Device Trees, etc. have to be signed, e.g, using PGP. Additionally, the commands -+that can be used to subvert the UEFI secure boot mechanism, such as @command{iorw} -+and @command{memrw} will not be available when the UEFI secure boot is enabled. -+This is done for security reasons and are enforced by the GRUB Lockdown mechanism -+(@pxref{Lockdown}). - - @node Measured Boot - @section Measuring boot components -diff --git a/grub-core/commands/i386/wrmsr.c b/grub-core/commands/i386/wrmsr.c -index 9c5e510..56a29c2 100644 ---- a/grub-core/commands/i386/wrmsr.c -+++ b/grub-core/commands/i386/wrmsr.c -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -83,8 +84,8 @@ grub_cmd_msr_write (grub_command_t cmd __attribute__ ((unused)), int argc, char - - GRUB_MOD_INIT(wrmsr) - { -- cmd_write = grub_register_command ("wrmsr", grub_cmd_msr_write, N_("ADDR VALUE"), -- N_("Write a value to a CPU model specific register.")); -+ cmd_write = grub_register_command_lockdown ("wrmsr", grub_cmd_msr_write, N_("ADDR VALUE"), -+ N_("Write a value to a CPU model specific register.")); - } - - GRUB_MOD_FINI(wrmsr) -diff --git a/grub-core/commands/iorw.c b/grub-core/commands/iorw.c -index a0c164e..584baec 100644 ---- a/grub-core/commands/iorw.c -+++ b/grub-core/commands/iorw.c -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - - GRUB_MOD_LICENSE ("GPLv3+"); - -@@ -131,17 +132,17 @@ GRUB_MOD_INIT(memrw) - N_("PORT"), N_("Read 32-bit value from PORT."), - options); - cmd_write_byte = -- grub_register_command ("outb", grub_cmd_write, -- N_("PORT VALUE [MASK]"), -- N_("Write 8-bit VALUE to PORT.")); -+ grub_register_command_lockdown ("outb", grub_cmd_write, -+ N_("PORT VALUE [MASK]"), -+ N_("Write 8-bit VALUE to PORT.")); - cmd_write_word = -- grub_register_command ("outw", grub_cmd_write, -- N_("PORT VALUE [MASK]"), -- N_("Write 16-bit VALUE to PORT.")); -+ grub_register_command_lockdown ("outw", grub_cmd_write, -+ N_("PORT VALUE [MASK]"), -+ N_("Write 16-bit VALUE to PORT.")); - cmd_write_dword = -- grub_register_command ("outl", grub_cmd_write, -- N_("ADDR VALUE [MASK]"), -- N_("Write 32-bit VALUE to PORT.")); -+ grub_register_command_lockdown ("outl", grub_cmd_write, -+ N_("ADDR VALUE [MASK]"), -+ N_("Write 32-bit VALUE to PORT.")); - } - - GRUB_MOD_FINI(memrw) -diff --git a/grub-core/commands/memrw.c b/grub-core/commands/memrw.c -index 98769ea..d401a6d 100644 ---- a/grub-core/commands/memrw.c -+++ b/grub-core/commands/memrw.c -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - GRUB_MOD_LICENSE ("GPLv3+"); - -@@ -133,17 +134,17 @@ GRUB_MOD_INIT(memrw) - N_("ADDR"), N_("Read 32-bit value from ADDR."), - options); - cmd_write_byte = -- grub_register_command ("write_byte", grub_cmd_write, -- N_("ADDR VALUE [MASK]"), -- N_("Write 8-bit VALUE to ADDR.")); -+ grub_register_command_lockdown ("write_byte", grub_cmd_write, -+ N_("ADDR VALUE [MASK]"), -+ N_("Write 8-bit VALUE to ADDR.")); - cmd_write_word = -- grub_register_command ("write_word", grub_cmd_write, -- N_("ADDR VALUE [MASK]"), -- N_("Write 16-bit VALUE to ADDR.")); -+ grub_register_command_lockdown ("write_word", grub_cmd_write, -+ N_("ADDR VALUE [MASK]"), -+ N_("Write 16-bit VALUE to ADDR.")); - cmd_write_dword = -- grub_register_command ("write_dword", grub_cmd_write, -- N_("ADDR VALUE [MASK]"), -- N_("Write 32-bit VALUE to ADDR.")); -+ grub_register_command_lockdown ("write_dword", grub_cmd_write, -+ N_("ADDR VALUE [MASK]"), -+ N_("Write 32-bit VALUE to ADDR.")); - } - - GRUB_MOD_FINI(memrw) -diff --git a/grub-core/kern/efi/sb.c b/grub-core/kern/efi/sb.c -index ce3b7f6..5d7210a 100644 ---- a/grub-core/kern/efi/sb.c -+++ b/grub-core/kern/efi/sb.c -@@ -30,9 +30,6 @@ - - static grub_efi_guid_t shim_lock_guid = GRUB_EFI_SHIM_LOCK_GUID; - --/* List of modules which cannot be loaded if UEFI secure boot mode is enabled. */ --static const char * const disabled_mods[] = {"iorw", "memrw", NULL}; -- - /* - * Determine whether we're in secure boot mode. - * -@@ -121,53 +118,15 @@ shim_lock_verifier_init (grub_file_t io __attribute__ ((unused)), - void **context __attribute__ ((unused)), - enum grub_verify_flags *flags) - { -- const char *b, *e; -- int i; -- - *flags = GRUB_VERIFY_FLAGS_SKIP_VERIFICATION; - - switch (type & GRUB_FILE_TYPE_MASK) - { -- case GRUB_FILE_TYPE_GRUB_MODULE: -- /* Establish GRUB module name. */ -- b = grub_strrchr (io->name, '/'); -- e = grub_strrchr (io->name, '.'); -- -- b = b ? (b + 1) : io->name; -- e = e ? e : io->name + grub_strlen (io->name); -- e = (e > b) ? e : io->name + grub_strlen (io->name); -- -- for (i = 0; disabled_mods[i]; i++) -- if (!grub_strncmp (b, disabled_mods[i], grub_strlen (b) - grub_strlen (e))) -- { -- grub_error (GRUB_ERR_ACCESS_DENIED, -- N_("module cannot be loaded in UEFI secure boot mode: %s"), -- io->name); -- return GRUB_ERR_ACCESS_DENIED; -- } -- -- /* Fall through. */ -- -- case GRUB_FILE_TYPE_ACPI_TABLE: -- case GRUB_FILE_TYPE_DEVICE_TREE_IMAGE: -- *flags = GRUB_VERIFY_FLAGS_DEFER_AUTH; -- -- return GRUB_ERR_NONE; -- - case GRUB_FILE_TYPE_LINUX_KERNEL: - case GRUB_FILE_TYPE_MULTIBOOT_KERNEL: - case GRUB_FILE_TYPE_BSD_KERNEL: - case GRUB_FILE_TYPE_XNU_KERNEL: - case GRUB_FILE_TYPE_PLAN9_KERNEL: -- for (i = 0; disabled_mods[i]; i++) -- if (grub_dl_get (disabled_mods[i])) -- { -- grub_error (GRUB_ERR_ACCESS_DENIED, -- N_("cannot boot due to dangerous module in memory: %s"), -- disabled_mods[i]); -- return GRUB_ERR_ACCESS_DENIED; -- } -- - *flags = GRUB_VERIFY_FLAGS_SINGLE_CHUNK; - - /* Fall through. */ --- -2.14.2 - diff --git a/buildroot/boot/grub2/0039-acpi-Don-t-register-the-acpi-command-when-locked-dow.patch b/buildroot/boot/grub2/0039-acpi-Don-t-register-the-acpi-command-when-locked-dow.patch deleted file mode 100644 index b258b517b7..0000000000 --- a/buildroot/boot/grub2/0039-acpi-Don-t-register-the-acpi-command-when-locked-dow.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 3e8e4c0549240fa209acffceb473e1e509b50c95 Mon Sep 17 00:00:00 2001 -From: Javier Martinez Canillas -Date: Mon, 28 Sep 2020 20:08:41 +0200 -Subject: [PATCH] acpi: Don't register the acpi command when locked down -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The command is not allowed when lockdown is enforced. Otherwise an -attacker can instruct the GRUB to load an SSDT table to overwrite -the kernel lockdown configuration and later load and execute -unsigned code. - -Fixes: CVE-2020-14372 - -Reported-by: Máté Kukri -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - docs/grub.texi | 5 +++++ - grub-core/commands/acpi.c | 15 ++++++++------- - 2 files changed, 13 insertions(+), 7 deletions(-) - -diff --git a/docs/grub.texi b/docs/grub.texi -index bbe60a4..98592d3 100644 ---- a/docs/grub.texi -+++ b/docs/grub.texi -@@ -3986,6 +3986,11 @@ Normally, this command will replace the Root System Description Pointer - (RSDP) in the Extended BIOS Data Area to point to the new tables. If the - @option{--no-ebda} option is used, the new tables will be known only to - GRUB, but may be used by GRUB's EFI emulation. -+ -+Note: The command is not allowed when lockdown is enforced (@pxref{Lockdown}). -+ Otherwise an attacker can instruct the GRUB to load an SSDT table to -+ overwrite the kernel lockdown configuration and later load and execute -+ unsigned code. - @end deffn - - -diff --git a/grub-core/commands/acpi.c b/grub-core/commands/acpi.c -index 5a1499a..1215f2a 100644 ---- a/grub-core/commands/acpi.c -+++ b/grub-core/commands/acpi.c -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - - #ifdef GRUB_MACHINE_EFI - #include -@@ -775,13 +776,13 @@ static grub_extcmd_t cmd; - - GRUB_MOD_INIT(acpi) - { -- cmd = grub_register_extcmd ("acpi", grub_cmd_acpi, 0, -- N_("[-1|-2] [--exclude=TABLE1,TABLE2|" -- "--load-only=TABLE1,TABLE2] FILE1" -- " [FILE2] [...]"), -- N_("Load host ACPI tables and tables " -- "specified by arguments."), -- options); -+ cmd = grub_register_extcmd_lockdown ("acpi", grub_cmd_acpi, 0, -+ N_("[-1|-2] [--exclude=TABLE1,TABLE2|" -+ "--load-only=TABLE1,TABLE2] FILE1" -+ " [FILE2] [...]"), -+ N_("Load host ACPI tables and tables " -+ "specified by arguments."), -+ options); - } - - GRUB_MOD_FINI(acpi) --- -2.14.2 - diff --git a/buildroot/boot/grub2/0040-mmap-Don-t-register-cutmem-and-badram-commands-when-.patch b/buildroot/boot/grub2/0040-mmap-Don-t-register-cutmem-and-badram-commands-when-.patch deleted file mode 100644 index e7376e6a5d..0000000000 --- a/buildroot/boot/grub2/0040-mmap-Don-t-register-cutmem-and-badram-commands-when-.patch +++ /dev/null @@ -1,70 +0,0 @@ -From d298b41f90cbf1f2e5a10e29daa1fc92ddee52c9 Mon Sep 17 00:00:00 2001 -From: Javier Martinez Canillas -Date: Wed, 14 Oct 2020 16:33:42 +0200 -Subject: [PATCH] mmap: Don't register cutmem and badram commands when lockdown - is enforced - -The cutmem and badram commands can be used to remove EFI memory regions -and potentially disable the UEFI Secure Boot. Prevent the commands to be -registered if the GRUB is locked down. - -Fixes: CVE-2020-27779 - -Reported-by: Teddy Reed -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - docs/grub.texi | 4 ++++ - grub-core/mmap/mmap.c | 13 +++++++------ - 2 files changed, 11 insertions(+), 6 deletions(-) - -diff --git a/docs/grub.texi b/docs/grub.texi -index 98592d3..f2fe149 100644 ---- a/docs/grub.texi -+++ b/docs/grub.texi -@@ -4051,6 +4051,10 @@ this page is to be filtered. This syntax makes it easy to represent patterns - that are often result of memory damage, due to physical distribution of memory - cells. - -+Note: The command is not allowed when lockdown is enforced (@pxref{Lockdown}). -+ This prevents removing EFI memory regions to potentially subvert the -+ security mechanisms provided by the UEFI secure boot. -+ - @node blocklist - @subsection blocklist - -diff --git a/grub-core/mmap/mmap.c b/grub-core/mmap/mmap.c -index 57b4e9a..7ebf32e 100644 ---- a/grub-core/mmap/mmap.c -+++ b/grub-core/mmap/mmap.c -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -534,12 +535,12 @@ static grub_command_t cmd, cmd_cut; - - GRUB_MOD_INIT(mmap) - { -- cmd = grub_register_command ("badram", grub_cmd_badram, -- N_("ADDR1,MASK1[,ADDR2,MASK2[,...]]"), -- N_("Declare memory regions as faulty (badram).")); -- cmd_cut = grub_register_command ("cutmem", grub_cmd_cutmem, -- N_("FROM[K|M|G] TO[K|M|G]"), -- N_("Remove any memory regions in specified range.")); -+ cmd = grub_register_command_lockdown ("badram", grub_cmd_badram, -+ N_("ADDR1,MASK1[,ADDR2,MASK2[,...]]"), -+ N_("Declare memory regions as faulty (badram).")); -+ cmd_cut = grub_register_command_lockdown ("cutmem", grub_cmd_cutmem, -+ N_("FROM[K|M|G] TO[K|M|G]"), -+ N_("Remove any memory regions in specified range.")); - - } - --- -2.14.2 - diff --git a/buildroot/boot/grub2/0041-commands-Restrict-commands-that-can-load-BIOS-or-DT-.patch b/buildroot/boot/grub2/0041-commands-Restrict-commands-that-can-load-BIOS-or-DT-.patch deleted file mode 100644 index 1980d6d97d..0000000000 --- a/buildroot/boot/grub2/0041-commands-Restrict-commands-that-can-load-BIOS-or-DT-.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 468a5699b249fe6816b4e7e86c5dc9d325c9b09e Mon Sep 17 00:00:00 2001 -From: Javier Martinez Canillas -Date: Wed, 24 Feb 2021 09:00:05 +0100 -Subject: [PATCH] commands: Restrict commands that can load BIOS or DT blobs - when locked down - -There are some more commands that should be restricted when the GRUB is -locked down. Following is the list of commands and reasons to restrict: - - * fakebios: creates BIOS-like structures for backward compatibility with - existing OSes. This should not be allowed when locked down. - - * loadbios: reads a BIOS dump from storage and loads it. This action - should not be allowed when locked down. - - * devicetree: loads a Device Tree blob and passes it to the OS. It replaces - any Device Tree provided by the firmware. This also should - not be allowed when locked down. - -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - docs/grub.texi | 3 +++ - grub-core/commands/efi/loadbios.c | 16 ++++++++-------- - grub-core/loader/arm/linux.c | 6 +++--- - grub-core/loader/efi/fdt.c | 4 ++-- - 4 files changed, 16 insertions(+), 13 deletions(-) - -diff --git a/docs/grub.texi b/docs/grub.texi -index f2fe149..79f58c5 100644 ---- a/docs/grub.texi -+++ b/docs/grub.texi -@@ -4235,6 +4235,9 @@ hour, minute, and second unchanged. - Load a device tree blob (.dtb) from a filesystem, for later use by a Linux - kernel. Does not perform merging with any device tree supplied by firmware, - but rather replaces it completely. -+ -+Note: The command is not allowed when lockdown is enforced (@pxref{Lockdown}). -+ This is done to prevent subverting various security mechanisms. - @ref{GNU/Linux}. - @end deffn - -diff --git a/grub-core/commands/efi/loadbios.c b/grub-core/commands/efi/loadbios.c -index d41d521..5c7725f 100644 ---- a/grub-core/commands/efi/loadbios.c -+++ b/grub-core/commands/efi/loadbios.c -@@ -205,14 +205,14 @@ static grub_command_t cmd_fakebios, cmd_loadbios; - - GRUB_MOD_INIT(loadbios) - { -- cmd_fakebios = grub_register_command ("fakebios", grub_cmd_fakebios, -- 0, N_("Create BIOS-like structures for" -- " backward compatibility with" -- " existing OS.")); -- -- cmd_loadbios = grub_register_command ("loadbios", grub_cmd_loadbios, -- N_("BIOS_DUMP [INT10_DUMP]"), -- N_("Load BIOS dump.")); -+ cmd_fakebios = grub_register_command_lockdown ("fakebios", grub_cmd_fakebios, -+ 0, N_("Create BIOS-like structures for" -+ " backward compatibility with" -+ " existing OS.")); -+ -+ cmd_loadbios = grub_register_command_lockdown ("loadbios", grub_cmd_loadbios, -+ N_("BIOS_DUMP [INT10_DUMP]"), -+ N_("Load BIOS dump.")); - } - - GRUB_MOD_FINI(loadbios) -diff --git a/grub-core/loader/arm/linux.c b/grub-core/loader/arm/linux.c -index d70c174..ed23dc7 100644 ---- a/grub-core/loader/arm/linux.c -+++ b/grub-core/loader/arm/linux.c -@@ -493,9 +493,9 @@ GRUB_MOD_INIT (linux) - 0, N_("Load Linux.")); - cmd_initrd = grub_register_command ("initrd", grub_cmd_initrd, - 0, N_("Load initrd.")); -- cmd_devicetree = grub_register_command ("devicetree", grub_cmd_devicetree, -- /* TRANSLATORS: DTB stands for device tree blob. */ -- 0, N_("Load DTB file.")); -+ cmd_devicetree = grub_register_command_lockdown ("devicetree", grub_cmd_devicetree, -+ /* TRANSLATORS: DTB stands for device tree blob. */ -+ 0, N_("Load DTB file.")); - my_mod = mod; - current_fdt = (const void *) grub_arm_firmware_get_boot_data (); - machine_type = grub_arm_firmware_get_machine_type (); -diff --git a/grub-core/loader/efi/fdt.c b/grub-core/loader/efi/fdt.c -index ee9c559..003d07c 100644 ---- a/grub-core/loader/efi/fdt.c -+++ b/grub-core/loader/efi/fdt.c -@@ -165,8 +165,8 @@ static grub_command_t cmd_devicetree; - GRUB_MOD_INIT (fdt) - { - cmd_devicetree = -- grub_register_command ("devicetree", grub_cmd_devicetree, 0, -- N_("Load DTB file.")); -+ grub_register_command_lockdown ("devicetree", grub_cmd_devicetree, 0, -+ N_("Load DTB file.")); - } - - GRUB_MOD_FINI (fdt) --- -2.14.2 - diff --git a/buildroot/boot/grub2/0042-commands-setpci-Restrict-setpci-command-when-locked-.patch b/buildroot/boot/grub2/0042-commands-setpci-Restrict-setpci-command-when-locked-.patch deleted file mode 100644 index dcddfe1957..0000000000 --- a/buildroot/boot/grub2/0042-commands-setpci-Restrict-setpci-command-when-locked-.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 58b77d4069823b44c5fa916fa8ddfc9c4cd51e02 Mon Sep 17 00:00:00 2001 -From: Javier Martinez Canillas -Date: Wed, 24 Feb 2021 22:59:59 +0100 -Subject: [PATCH] commands/setpci: Restrict setpci command when locked down - -This command can set PCI devices register values, which makes it dangerous -in a locked down configuration. Restrict it so can't be used on this setup. - -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/commands/setpci.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/grub-core/commands/setpci.c b/grub-core/commands/setpci.c -index d5bc97d..fa2ba7d 100644 ---- a/grub-core/commands/setpci.c -+++ b/grub-core/commands/setpci.c -@@ -329,10 +329,10 @@ static grub_extcmd_t cmd; - - GRUB_MOD_INIT(setpci) - { -- cmd = grub_register_extcmd ("setpci", grub_cmd_setpci, 0, -- N_("[-s POSITION] [-d DEVICE] [-v VAR] " -- "REGISTER[=VALUE[:MASK]]"), -- N_("Manipulate PCI devices."), options); -+ cmd = grub_register_extcmd_lockdown ("setpci", grub_cmd_setpci, 0, -+ N_("[-s POSITION] [-d DEVICE] [-v VAR] " -+ "REGISTER[=VALUE[:MASK]]"), -+ N_("Manipulate PCI devices."), options); - } - - GRUB_MOD_FINI(setpci) --- -2.14.2 - diff --git a/buildroot/boot/grub2/0043-commands-hdparm-Restrict-hdparm-command-when-locked-.patch b/buildroot/boot/grub2/0043-commands-hdparm-Restrict-hdparm-command-when-locked-.patch deleted file mode 100644 index 3c26c8604a..0000000000 --- a/buildroot/boot/grub2/0043-commands-hdparm-Restrict-hdparm-command-when-locked-.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 5c97492a29c6063567b65ed1a069f5e6f4e211f0 Mon Sep 17 00:00:00 2001 -From: Javier Martinez Canillas -Date: Wed, 24 Feb 2021 12:59:29 +0100 -Subject: [PATCH] commands/hdparm: Restrict hdparm command when locked down - -The command can be used to get/set ATA disk parameters. Some of these can -be dangerous since change the disk behavior. Restrict it when locked down. - -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/commands/hdparm.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/grub-core/commands/hdparm.c b/grub-core/commands/hdparm.c -index d3fa966..2e2319e 100644 ---- a/grub-core/commands/hdparm.c -+++ b/grub-core/commands/hdparm.c -@@ -436,9 +436,9 @@ static grub_extcmd_t cmd; - - GRUB_MOD_INIT(hdparm) - { -- cmd = grub_register_extcmd ("hdparm", grub_cmd_hdparm, 0, -- N_("[OPTIONS] DISK"), -- N_("Get/set ATA disk parameters."), options); -+ cmd = grub_register_extcmd_lockdown ("hdparm", grub_cmd_hdparm, 0, -+ N_("[OPTIONS] DISK"), -+ N_("Get/set ATA disk parameters."), options); - } - - GRUB_MOD_FINI(hdparm) --- -2.14.2 - diff --git a/buildroot/boot/grub2/0044-gdb-Restrict-GDB-access-when-locked-down.patch b/buildroot/boot/grub2/0044-gdb-Restrict-GDB-access-when-locked-down.patch deleted file mode 100644 index c671ad8820..0000000000 --- a/buildroot/boot/grub2/0044-gdb-Restrict-GDB-access-when-locked-down.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 508270838998f151a82e9c13e7cb8a470a2dc23d Mon Sep 17 00:00:00 2001 -From: Javier Martinez Canillas -Date: Wed, 24 Feb 2021 15:03:26 +0100 -Subject: [PATCH] gdb: Restrict GDB access when locked down - -The gdbstub* commands allow to start and control a GDB stub running on -local host that can be used to connect from a remote debugger. Restrict -this functionality when the GRUB is locked down. - -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/gdb/gdb.c | 32 ++++++++++++++++++-------------- - 1 file changed, 18 insertions(+), 14 deletions(-) - -diff --git a/grub-core/gdb/gdb.c b/grub-core/gdb/gdb.c -index 847a1e1..1818cb6 100644 ---- a/grub-core/gdb/gdb.c -+++ b/grub-core/gdb/gdb.c -@@ -75,20 +75,24 @@ static grub_command_t cmd, cmd_stop, cmd_break; - GRUB_MOD_INIT (gdb) - { - grub_gdb_idtinit (); -- cmd = grub_register_command ("gdbstub", grub_cmd_gdbstub, -- N_("PORT"), -- /* TRANSLATORS: GDB stub is a small part of -- GDB functionality running on local host -- which allows remote debugger to -- connect to it. */ -- N_("Start GDB stub on given port")); -- cmd_break = grub_register_command ("gdbstub_break", grub_cmd_gdb_break, -- /* TRANSLATORS: this refers to triggering -- a breakpoint so that the user will land -- into GDB. */ -- 0, N_("Break into GDB")); -- cmd_stop = grub_register_command ("gdbstub_stop", grub_cmd_gdbstop, -- 0, N_("Stop GDB stub")); -+ cmd = grub_register_command_lockdown ("gdbstub", grub_cmd_gdbstub, -+ N_("PORT"), -+ /* -+ * TRANSLATORS: GDB stub is a small part of -+ * GDB functionality running on local host -+ * which allows remote debugger to -+ * connect to it. -+ */ -+ N_("Start GDB stub on given port")); -+ cmd_break = grub_register_command_lockdown ("gdbstub_break", grub_cmd_gdb_break, -+ /* -+ * TRANSLATORS: this refers to triggering -+ * a breakpoint so that the user will land -+ * into GDB. -+ */ -+ 0, N_("Break into GDB")); -+ cmd_stop = grub_register_command_lockdown ("gdbstub_stop", grub_cmd_gdbstop, -+ 0, N_("Stop GDB stub")); - } - - GRUB_MOD_FINI (gdb) --- -2.14.2 - diff --git a/buildroot/boot/grub2/0045-loader-xnu-Don-t-allow-loading-extension-and-package.patch b/buildroot/boot/grub2/0045-loader-xnu-Don-t-allow-loading-extension-and-package.patch deleted file mode 100644 index 6548c0d6e2..0000000000 --- a/buildroot/boot/grub2/0045-loader-xnu-Don-t-allow-loading-extension-and-package.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 9c5565135f12400a925ee901b25984e7af4442f5 Mon Sep 17 00:00:00 2001 -From: Javier Martinez Canillas -Date: Wed, 24 Feb 2021 14:44:38 +0100 -Subject: [PATCH] loader/xnu: Don't allow loading extension and packages when - locked down - -The shim_lock verifier validates the XNU kernels but no its extensions -and packages. Prevent these to be loaded when the GRUB is locked down. - -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/loader/xnu.c | 31 +++++++++++++++++-------------- - 1 file changed, 17 insertions(+), 14 deletions(-) - -diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c -index 9ae4ceb..44fd5a9 100644 ---- a/grub-core/loader/xnu.c -+++ b/grub-core/loader/xnu.c -@@ -1485,20 +1485,23 @@ GRUB_MOD_INIT(xnu) - N_("Load XNU image.")); - cmd_kernel64 = grub_register_command ("xnu_kernel64", grub_cmd_xnu_kernel64, - 0, N_("Load 64-bit XNU image.")); -- cmd_mkext = grub_register_command ("xnu_mkext", grub_cmd_xnu_mkext, 0, -- N_("Load XNU extension package.")); -- cmd_kext = grub_register_command ("xnu_kext", grub_cmd_xnu_kext, 0, -- N_("Load XNU extension.")); -- cmd_kextdir = grub_register_command ("xnu_kextdir", grub_cmd_xnu_kextdir, -- /* TRANSLATORS: OSBundleRequired is a -- variable name in xnu extensions -- manifests. It behaves mostly like -- GNU/Linux runlevels. -- */ -- N_("DIRECTORY [OSBundleRequired]"), -- /* TRANSLATORS: There are many extensions -- in extension directory. */ -- N_("Load XNU extension directory.")); -+ cmd_mkext = grub_register_command_lockdown ("xnu_mkext", grub_cmd_xnu_mkext, 0, -+ N_("Load XNU extension package.")); -+ cmd_kext = grub_register_command_lockdown ("xnu_kext", grub_cmd_xnu_kext, 0, -+ N_("Load XNU extension.")); -+ cmd_kextdir = grub_register_command_lockdown ("xnu_kextdir", grub_cmd_xnu_kextdir, -+ /* -+ * TRANSLATORS: OSBundleRequired is -+ * a variable name in xnu extensions -+ * manifests. It behaves mostly like -+ * GNU/Linux runlevels. -+ */ -+ N_("DIRECTORY [OSBundleRequired]"), -+ /* -+ * TRANSLATORS: There are many extensions -+ * in extension directory. -+ */ -+ N_("Load XNU extension directory.")); - cmd_ramdisk = grub_register_command ("xnu_ramdisk", grub_cmd_xnu_ramdisk, 0, - /* TRANSLATORS: ramdisk here isn't identifier. It can be translated. */ - N_("Load XNU ramdisk. " --- -2.14.2 - diff --git a/buildroot/boot/grub2/0046-docs-Document-the-cutmem-command.patch b/buildroot/boot/grub2/0046-docs-Document-the-cutmem-command.patch deleted file mode 100644 index 978aeabc94..0000000000 --- a/buildroot/boot/grub2/0046-docs-Document-the-cutmem-command.patch +++ /dev/null @@ -1,65 +0,0 @@ -From f05e79a0143beb2d9a482a3ebf4fe0ce76778122 Mon Sep 17 00:00:00 2001 -From: Javier Martinez Canillas -Date: Sat, 7 Nov 2020 01:03:18 +0100 -Subject: [PATCH] docs: Document the cutmem command - -The command is not present in the docs/grub.texi user documentation. - -Reported-by: Daniel Kiper -Signed-off-by: Javier Martinez Canillas -Signed-off-by: Daniel Kiper -Reviewed-by: Javier Martinez Canillas -Signed-off-by: Stefan Sørensen ---- - docs/grub.texi | 21 +++++++++++++++++++++ - 1 file changed, 21 insertions(+) - -diff --git a/docs/grub.texi b/docs/grub.texi -index 79f58c5..8518cc0 100644 ---- a/docs/grub.texi -+++ b/docs/grub.texi -@@ -3892,6 +3892,7 @@ you forget a command, you can run the command @command{help} - * cpuid:: Check for CPU features - * crc:: Compute or check CRC32 checksums - * cryptomount:: Mount a crypto device -+* cutmem:: Remove memory regions - * date:: Display or set current date and time - * devicetree:: Load a device tree blob - * distrust:: Remove a pubkey from trusted keys -@@ -4051,6 +4052,8 @@ this page is to be filtered. This syntax makes it easy to represent patterns - that are often result of memory damage, due to physical distribution of memory - cells. - -+The command is similar to @command{cutmem} command. -+ - Note: The command is not allowed when lockdown is enforced (@pxref{Lockdown}). - This prevents removing EFI memory regions to potentially subvert the - security mechanisms provided by the UEFI secure boot. -@@ -4214,6 +4217,24 @@ GRUB suports devices encrypted using LUKS and geli. Note that necessary modules - be used. - @end deffn - -+@node cutmem -+@subsection cutmem -+ -+@deffn Command cutmem from[K|M|G] to[K|M|G] -+Remove any memory regions in specified range. -+@end deffn -+ -+This command notifies the memory manager that specified regions of RAM ought to -+be filtered out. This remains in effect after a payload kernel has been loaded -+by GRUB, as long as the loaded kernel obtains its memory map from GRUB. Kernels -+that support this include Linux, GNU Mach, the kernel of FreeBSD and Multiboot -+kernels in general. -+ -+The command is similar to @command{badram} command. -+ -+Note: The command is not allowed when lockdown is enforced (@pxref{Lockdown}). -+ This prevents removing EFI memory regions to potentially subvert the -+ security mechanisms provided by the UEFI secure boot. - - @node date - @subsection date --- -2.14.2 - diff --git a/buildroot/boot/grub2/0047-dl-Only-allow-unloading-modules-that-are-not-depende.patch b/buildroot/boot/grub2/0047-dl-Only-allow-unloading-modules-that-are-not-depende.patch deleted file mode 100644 index 3bb02ad4fb..0000000000 --- a/buildroot/boot/grub2/0047-dl-Only-allow-unloading-modules-that-are-not-depende.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 7630ec5397fe418276b360f9011934b8c034936c Mon Sep 17 00:00:00 2001 -From: Javier Martinez Canillas -Date: Tue, 29 Sep 2020 14:08:55 +0200 -Subject: [PATCH] dl: Only allow unloading modules that are not dependencies - -When a module is attempted to be removed its reference counter is always -decremented. This means that repeated rmmod invocations will cause the -module to be unloaded even if another module depends on it. - -This may lead to a use-after-free scenario allowing an attacker to execute -arbitrary code and by-pass the UEFI Secure Boot protection. - -While being there, add the extern keyword to some function declarations in -that header file. - -Fixes: CVE-2020-25632 - -Reported-by: Chris Coulson -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/commands/minicmd.c | 7 +++++-- - grub-core/kern/dl.c | 9 +++++++++ - include/grub/dl.h | 8 +++++--- - 3 files changed, 19 insertions(+), 5 deletions(-) - -diff --git a/grub-core/commands/minicmd.c b/grub-core/commands/minicmd.c -index 6bbce31..fa49893 100644 ---- a/grub-core/commands/minicmd.c -+++ b/grub-core/commands/minicmd.c -@@ -140,8 +140,11 @@ grub_mini_cmd_rmmod (struct grub_command *cmd __attribute__ ((unused)), - if (grub_dl_is_persistent (mod)) - return grub_error (GRUB_ERR_BAD_ARGUMENT, "cannot unload persistent module"); - -- if (grub_dl_unref (mod) <= 0) -- grub_dl_unload (mod); -+ if (grub_dl_ref_count (mod) > 1) -+ return grub_error (GRUB_ERR_BAD_ARGUMENT, "cannot unload referenced module"); -+ -+ grub_dl_unref (mod); -+ grub_dl_unload (mod); - - return 0; - } -diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c -index 48eb5e7..48f8a79 100644 ---- a/grub-core/kern/dl.c -+++ b/grub-core/kern/dl.c -@@ -549,6 +549,15 @@ grub_dl_unref (grub_dl_t mod) - return --mod->ref_count; - } - -+int -+grub_dl_ref_count (grub_dl_t mod) -+{ -+ if (mod == NULL) -+ return 0; -+ -+ return mod->ref_count; -+} -+ - static void - grub_dl_flush_cache (grub_dl_t mod) - { -diff --git a/include/grub/dl.h b/include/grub/dl.h -index f03c035..b3753c9 100644 ---- a/include/grub/dl.h -+++ b/include/grub/dl.h -@@ -203,9 +203,11 @@ grub_dl_t EXPORT_FUNC(grub_dl_load) (const char *name); - grub_dl_t grub_dl_load_core (void *addr, grub_size_t size); - grub_dl_t EXPORT_FUNC(grub_dl_load_core_noinit) (void *addr, grub_size_t size); - int EXPORT_FUNC(grub_dl_unload) (grub_dl_t mod); --void grub_dl_unload_unneeded (void); --int EXPORT_FUNC(grub_dl_ref) (grub_dl_t mod); --int EXPORT_FUNC(grub_dl_unref) (grub_dl_t mod); -+extern void grub_dl_unload_unneeded (void); -+extern int EXPORT_FUNC(grub_dl_ref) (grub_dl_t mod); -+extern int EXPORT_FUNC(grub_dl_unref) (grub_dl_t mod); -+extern int EXPORT_FUNC(grub_dl_ref_count) (grub_dl_t mod); -+ - extern grub_dl_t EXPORT_VAR(grub_dl_head); - - #ifndef GRUB_UTIL --- -2.14.2 - diff --git a/buildroot/boot/grub2/0048-usb-Avoid-possible-out-of-bound-accesses-caused-by-m.patch b/buildroot/boot/grub2/0048-usb-Avoid-possible-out-of-bound-accesses-caused-by-m.patch deleted file mode 100644 index 6a056e52a6..0000000000 --- a/buildroot/boot/grub2/0048-usb-Avoid-possible-out-of-bound-accesses-caused-by-m.patch +++ /dev/null @@ -1,116 +0,0 @@ -From 128c16a682034263eb519c89bc0934eeb6fa8cfa Mon Sep 17 00:00:00 2001 -From: Javier Martinez Canillas -Date: Fri, 11 Dec 2020 19:19:21 +0100 -Subject: [PATCH] usb: Avoid possible out-of-bound accesses caused by malicious - devices - -The maximum number of configurations and interfaces are fixed but there is -no out-of-bound checking to prevent a malicious USB device to report large -values for these and cause accesses outside the arrays' memory. - -Fixes: CVE-2020-25647 - -Reported-by: Joseph Tartaro -Reported-by: Ilja Van Sprundel -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/bus/usb/usb.c | 15 ++++++++++++--- - include/grub/usb.h | 10 +++++++--- - 2 files changed, 19 insertions(+), 6 deletions(-) - -diff --git a/grub-core/bus/usb/usb.c b/grub-core/bus/usb/usb.c -index 8da5e4c..7cb3cc2 100644 ---- a/grub-core/bus/usb/usb.c -+++ b/grub-core/bus/usb/usb.c -@@ -75,6 +75,9 @@ grub_usb_controller_iterate (grub_usb_controller_iterate_hook_t hook, - grub_usb_err_t - grub_usb_clear_halt (grub_usb_device_t dev, int endpoint) - { -+ if (endpoint >= GRUB_USB_MAX_TOGGLE) -+ return GRUB_USB_ERR_BADDEVICE; -+ - dev->toggle[endpoint] = 0; - return grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_OUT - | GRUB_USB_REQTYPE_STANDARD -@@ -134,10 +137,10 @@ grub_usb_device_initialize (grub_usb_device_t dev) - return err; - descdev = &dev->descdev; - -- for (i = 0; i < 8; i++) -+ for (i = 0; i < GRUB_USB_MAX_CONF; i++) - dev->config[i].descconf = NULL; - -- if (descdev->configcnt == 0) -+ if (descdev->configcnt == 0 || descdev->configcnt > GRUB_USB_MAX_CONF) - { - err = GRUB_USB_ERR_BADDEVICE; - goto fail; -@@ -172,6 +175,12 @@ grub_usb_device_initialize (grub_usb_device_t dev) - /* Skip the configuration descriptor. */ - pos = dev->config[i].descconf->length; - -+ if (dev->config[i].descconf->numif > GRUB_USB_MAX_IF) -+ { -+ err = GRUB_USB_ERR_BADDEVICE; -+ goto fail; -+ } -+ - /* Read all interfaces. */ - for (currif = 0; currif < dev->config[i].descconf->numif; currif++) - { -@@ -217,7 +226,7 @@ grub_usb_device_initialize (grub_usb_device_t dev) - - fail: - -- for (i = 0; i < 8; i++) -+ for (i = 0; i < GRUB_USB_MAX_CONF; i++) - grub_free (dev->config[i].descconf); - - return err; -diff --git a/include/grub/usb.h b/include/grub/usb.h -index 512ae1d..6475c55 100644 ---- a/include/grub/usb.h -+++ b/include/grub/usb.h -@@ -23,6 +23,10 @@ - #include - #include - -+#define GRUB_USB_MAX_CONF 8 -+#define GRUB_USB_MAX_IF 32 -+#define GRUB_USB_MAX_TOGGLE 256 -+ - typedef struct grub_usb_device *grub_usb_device_t; - typedef struct grub_usb_controller *grub_usb_controller_t; - typedef struct grub_usb_controller_dev *grub_usb_controller_dev_t; -@@ -167,7 +171,7 @@ struct grub_usb_configuration - struct grub_usb_desc_config *descconf; - - /* Interfaces associated to this configuration. */ -- struct grub_usb_interface interf[32]; -+ struct grub_usb_interface interf[GRUB_USB_MAX_IF]; - }; - - struct grub_usb_hub_port -@@ -191,7 +195,7 @@ struct grub_usb_device - struct grub_usb_controller controller; - - /* Device configurations (after opening the device). */ -- struct grub_usb_configuration config[8]; -+ struct grub_usb_configuration config[GRUB_USB_MAX_CONF]; - - /* Device address. */ - int addr; -@@ -203,7 +207,7 @@ struct grub_usb_device - int initialized; - - /* Data toggle values (used for bulk transfers only). */ -- int toggle[256]; -+ int toggle[GRUB_USB_MAX_TOGGLE]; - - /* Used by libusb wrapper. Schedulded for removal. */ - void *data; --- -2.14.2 - diff --git a/buildroot/boot/grub2/0049-mmap-Fix-memory-leak-when-iterating-over-mapped-memo.patch b/buildroot/boot/grub2/0049-mmap-Fix-memory-leak-when-iterating-over-mapped-memo.patch deleted file mode 100644 index f443f19027..0000000000 --- a/buildroot/boot/grub2/0049-mmap-Fix-memory-leak-when-iterating-over-mapped-memo.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 8cb2848f9699642a698af84b12ba187cab722031 Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Thu, 3 Dec 2020 14:39:45 +0000 -Subject: [PATCH] mmap: Fix memory leak when iterating over mapped memory - -When returning from grub_mmap_iterate() the memory allocated to present -is not being released causing it to leak. - -Fixes: CID 96655 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/mmap/mmap.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/grub-core/mmap/mmap.c b/grub-core/mmap/mmap.c -index 7ebf32e..8bf235f 100644 ---- a/grub-core/mmap/mmap.c -+++ b/grub-core/mmap/mmap.c -@@ -270,6 +270,7 @@ grub_mmap_iterate (grub_memory_hook_t hook, void *hook_data) - hook_data)) - { - grub_free (ctx.scanline_events); -+ grub_free (present); - return GRUB_ERR_NONE; - } - -@@ -282,6 +283,7 @@ grub_mmap_iterate (grub_memory_hook_t hook, void *hook_data) - } - - grub_free (ctx.scanline_events); -+ grub_free (present); - return GRUB_ERR_NONE; - } - --- -2.14.2 - diff --git a/buildroot/boot/grub2/0050-net-net-Fix-possible-dereference-to-of-a-NULL-pointe.patch b/buildroot/boot/grub2/0050-net-net-Fix-possible-dereference-to-of-a-NULL-pointe.patch deleted file mode 100644 index 5a8cc6d191..0000000000 --- a/buildroot/boot/grub2/0050-net-net-Fix-possible-dereference-to-of-a-NULL-pointe.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 03f2515ae0c503406f1a99a2178405049c6555db Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Fri, 27 Nov 2020 15:10:26 +0000 -Subject: [PATCH] net/net: Fix possible dereference to of a NULL pointer - -It is always possible that grub_zalloc() could fail, so we should check for -a NULL return. Otherwise we run the risk of dereferencing a NULL pointer. - -Fixes: CID 296221 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/net/net.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/grub-core/net/net.c b/grub-core/net/net.c -index 38f19df..7c2cdf2 100644 ---- a/grub-core/net/net.c -+++ b/grub-core/net/net.c -@@ -86,8 +86,13 @@ grub_net_link_layer_add_address (struct grub_net_card *card, - - /* Add sender to cache table. */ - if (card->link_layer_table == NULL) -- card->link_layer_table = grub_zalloc (LINK_LAYER_CACHE_SIZE -- * sizeof (card->link_layer_table[0])); -+ { -+ card->link_layer_table = grub_zalloc (LINK_LAYER_CACHE_SIZE -+ * sizeof (card->link_layer_table[0])); -+ if (card->link_layer_table == NULL) -+ return; -+ } -+ - entry = &(card->link_layer_table[card->new_ll_entry]); - entry->avail = 1; - grub_memcpy (&entry->ll_address, ll, sizeof (entry->ll_address)); --- -2.14.2 - diff --git a/buildroot/boot/grub2/0051-net-tftp-Fix-dangling-memory-pointer.patch b/buildroot/boot/grub2/0051-net-tftp-Fix-dangling-memory-pointer.patch deleted file mode 100644 index cc3983ea9c..0000000000 --- a/buildroot/boot/grub2/0051-net-tftp-Fix-dangling-memory-pointer.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 0cb838b281a68b536a09681f9557ea6a7ac5da7a Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Fri, 19 Feb 2021 17:12:23 +0000 -Subject: [PATCH] net/tftp: Fix dangling memory pointer - -The static code analysis tool, Parfait, reported that the valid of -file->data was left referencing memory that was freed by the call to -grub_free(data) where data was initialized from file->data. - -To ensure that there is no unintentional access to this memory -referenced by file->data we should set the pointer to NULL. - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/net/tftp.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c -index b4297bc..c106704 100644 ---- a/grub-core/net/tftp.c -+++ b/grub-core/net/tftp.c -@@ -406,6 +406,7 @@ tftp_close (struct grub_file *file) - grub_net_udp_close (data->sock); - } - grub_free (data); -+ file->data = NULL; - return GRUB_ERR_NONE; - } - --- -2.14.2 - diff --git a/buildroot/boot/grub2/0052-kern-parser-Fix-resource-leak-if-argc-0.patch b/buildroot/boot/grub2/0052-kern-parser-Fix-resource-leak-if-argc-0.patch deleted file mode 100644 index dd01092d29..0000000000 --- a/buildroot/boot/grub2/0052-kern-parser-Fix-resource-leak-if-argc-0.patch +++ /dev/null @@ -1,51 +0,0 @@ -From d06161b035dde4769199ad65aa0a587a5920012b Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Fri, 22 Jan 2021 12:32:41 +0000 -Subject: [PATCH] kern/parser: Fix resource leak if argc == 0 - -After processing the command-line yet arriving at the point where we are -setting argv, we are allocating memory, even if argc == 0, which makes -no sense since we never put anything into the allocated argv. - -The solution is to simply return that we've successfully processed the -arguments but that argc == 0, and also ensure that argv is NULL when -we're not allocating anything in it. - -There are only 2 callers of this function, and both are handling a zero -value in argc assuming nothing is allocated in argv. - -Fixes: CID 96680 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/kern/parser.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/grub-core/kern/parser.c b/grub-core/kern/parser.c -index 619db31..d1cf061 100644 ---- a/grub-core/kern/parser.c -+++ b/grub-core/kern/parser.c -@@ -146,6 +146,7 @@ grub_parser_split_cmdline (const char *cmdline, - int i; - - *argc = 0; -+ *argv = NULL; - do - { - if (!rd || !*rd) -@@ -207,6 +208,10 @@ grub_parser_split_cmdline (const char *cmdline, - (*argc)++; - } - -+ /* If there are no args, then we're done. */ -+ if (!*argc) -+ return 0; -+ - /* Reserve memory for the return values. */ - args = grub_malloc (bp - buffer); - if (!args) --- -2.14.2 - diff --git a/buildroot/boot/grub2/0053-kern-efi-Fix-memory-leak-on-failure.patch b/buildroot/boot/grub2/0053-kern-efi-Fix-memory-leak-on-failure.patch deleted file mode 100644 index e2c4997960..0000000000 --- a/buildroot/boot/grub2/0053-kern-efi-Fix-memory-leak-on-failure.patch +++ /dev/null @@ -1,31 +0,0 @@ -From ed286ceba6015d37a9304f04602451c47bf195d7 Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Thu, 5 Nov 2020 10:15:25 +0000 -Subject: [PATCH] kern/efi: Fix memory leak on failure - -Free the memory allocated to name before returning on failure. - -Fixes: CID 296222 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/kern/efi/efi.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c -index 9cfd88d..4fc14d6 100644 ---- a/grub-core/kern/efi/efi.c -+++ b/grub-core/kern/efi/efi.c -@@ -388,6 +388,7 @@ grub_efi_get_filename (grub_efi_device_path_t *dp0) - { - grub_error (GRUB_ERR_OUT_OF_RANGE, - "malformed EFI Device Path node has length=%d", len); -+ grub_free (name); - return NULL; - } - --- -2.14.2 - diff --git a/buildroot/boot/grub2/0054-kern-efi-mm-Fix-possible-NULL-pointer-dereference.patch b/buildroot/boot/grub2/0054-kern-efi-mm-Fix-possible-NULL-pointer-dereference.patch deleted file mode 100644 index 04ef9fc686..0000000000 --- a/buildroot/boot/grub2/0054-kern-efi-mm-Fix-possible-NULL-pointer-dereference.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 6aee4bfd6973c714056fb7b56890b8d524e94ee1 Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Fri, 11 Dec 2020 15:03:13 +0000 -Subject: [PATCH] kern/efi/mm: Fix possible NULL pointer dereference - -The model of grub_efi_get_memory_map() is that if memory_map is NULL, -then the purpose is to discover how much memory should be allocated to -it for the subsequent call. - -The problem here is that with grub_efi_is_finished set to 1, there is no -check at all that the function is being called with a non-NULL memory_map. - -While this MAY be true, we shouldn't assume it. - -The solution to this is to behave as expected, and if memory_map is NULL, -then don't try to use it and allow memory_map_size to be filled in, and -return 0 as is done later in the code if the buffer is too small (or NULL). - -Additionally, drop unneeded ret = 1. - -Fixes: CID 96632 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/kern/efi/mm.c | 19 ++++++++++++++----- - 1 file changed, 14 insertions(+), 5 deletions(-) - -diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c -index b02fab1..5afcef7 100644 ---- a/grub-core/kern/efi/mm.c -+++ b/grub-core/kern/efi/mm.c -@@ -328,15 +328,24 @@ grub_efi_get_memory_map (grub_efi_uintn_t *memory_map_size, - if (grub_efi_is_finished) - { - int ret = 1; -- if (*memory_map_size < finish_mmap_size) -+ -+ if (memory_map != NULL) - { -- grub_memcpy (memory_map, finish_mmap_buf, *memory_map_size); -- ret = 0; -+ if (*memory_map_size < finish_mmap_size) -+ { -+ grub_memcpy (memory_map, finish_mmap_buf, *memory_map_size); -+ ret = 0; -+ } -+ else -+ grub_memcpy (memory_map, finish_mmap_buf, finish_mmap_size); - } - else - { -- grub_memcpy (memory_map, finish_mmap_buf, finish_mmap_size); -- ret = 1; -+ /* -+ * Incomplete, no buffer to copy into, same as -+ * GRUB_EFI_BUFFER_TOO_SMALL below. -+ */ -+ ret = 0; - } - *memory_map_size = finish_mmap_size; - if (map_key) --- -2.14.2 - diff --git a/buildroot/boot/grub2/0055-gnulib-regexec-Resolve-unused-variable.patch b/buildroot/boot/grub2/0055-gnulib-regexec-Resolve-unused-variable.patch deleted file mode 100644 index 99e1354662..0000000000 --- a/buildroot/boot/grub2/0055-gnulib-regexec-Resolve-unused-variable.patch +++ /dev/null @@ -1,90 +0,0 @@ -From a983d36bd9178d377d2072fd4b11c635fdc404b4 Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Wed, 21 Oct 2020 14:41:27 +0000 -Subject: [PATCH] gnulib/regexec: Resolve unused variable - -This is a really minor issue where a variable is being assigned to but -not checked before it is overwritten again. - -The reason for this issue is that we are not building with DEBUG set and -this in turn means that the assert() that reads the value of the -variable match_last is being processed out. - -The solution, move the assignment to match_last in to an ifdef DEBUG too. - -Fixes: CID 292459 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -[Add changes to generated files] -Signed-off-by: Stefan Sørensen ---- - Makefile.in | 1 + - conf/Makefile.extra-dist | 1 + - grub-core/lib/gnulib-patches/fix-unused-value.patch | 14 ++++++++++++++ - grub-core/lib/gnulib/regexec.c | 4 ++++ - 4 files changed, 20 insertions(+) - create mode 100644 grub-core/lib/gnulib-patches/fix-unused-value.patch - -diff --git a/Makefile.in b/Makefile.in -index ecb3278..e6b287b 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -2742,6 +2742,7 @@ EXTRA_DIST = autogen.sh geninit.sh gentpl.py Makefile.util.def \ - grub-core/gensyminfo.sh.in grub-core/gensymlist.sh \ - grub-core/genemuinit.sh grub-core/genemuinitheader.sh \ - grub-core/lib/gnulib-patches/fix-null-deref.patch \ -+ grub-core/lib/gnulib-patches/fix-unused-value.patch \ - grub-core/lib/gnulib-patches/fix-width.patch \ - grub-core/lib/gnulib-patches/no-abort.patch \ - grub-core/lib/libgcrypt \ -diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist -index 46c4e95..9b01152 100644 ---- a/conf/Makefile.extra-dist -+++ b/conf/Makefile.extra-dist -@@ -29,6 +29,7 @@ EXTRA_DIST += grub-core/genemuinit.sh - EXTRA_DIST += grub-core/genemuinitheader.sh - - EXTRA_DIST += grub-core/lib/gnulib-patches/fix-null-deref.patch -+EXTRA_DIST += grub-core/lib/gnulib-patches/fix-unused-value.patch - EXTRA_DIST += grub-core/lib/gnulib-patches/fix-width.patch - EXTRA_DIST += grub-core/lib/gnulib-patches/no-abort.patch - -diff --git a/grub-core/lib/gnulib-patches/fix-unused-value.patch b/grub-core/lib/gnulib-patches/fix-unused-value.patch -new file mode 100644 -index 0000000..ba51f1b ---- /dev/null -+++ b/grub-core/lib/gnulib-patches/fix-unused-value.patch -@@ -0,0 +1,14 @@ -+--- a/lib/regexec.c 2020-10-21 14:25:35.310195912 +0000 -++++ b/lib/regexec.c 2020-10-21 14:32:07.961765604 +0000 -+@@ -828,7 +828,11 @@ -+ break; -+ if (__glibc_unlikely (err != REG_NOMATCH)) -+ goto free_return; -++#ifdef DEBUG -++ /* Only used for assertion below when DEBUG is set, otherwise -++ it will be over-written when we loop around. */ -+ match_last = -1; -++#endif -+ } -+ else -+ break; /* We found a match. */ -diff --git a/grub-core/lib/gnulib/regexec.c b/grub-core/lib/gnulib/regexec.c -index 21cf791..98a25f5 100644 ---- a/grub-core/lib/gnulib/regexec.c -+++ b/grub-core/lib/gnulib/regexec.c -@@ -828,6 +828,10 @@ re_search_internal (const regex_t *preg, const char *string, Idx length, - break; - if (__glibc_unlikely (err != REG_NOMATCH)) - goto free_return; -+#ifdef DEBUG -+ /* Only used for assertion below when DEBUG is set, otherwise -+ it will be over-written when we loop around. */ -+#endif - match_last = -1; - } - else --- -2.14.2 - diff --git a/buildroot/boot/grub2/0056-gnulib-regcomp-Fix-uninitialized-token-structure.patch b/buildroot/boot/grub2/0056-gnulib-regcomp-Fix-uninitialized-token-structure.patch deleted file mode 100644 index 24645615d0..0000000000 --- a/buildroot/boot/grub2/0056-gnulib-regcomp-Fix-uninitialized-token-structure.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 75c3d3cec4f408848f575d6d5e30a95bd6313db0 Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Thu, 22 Oct 2020 13:54:06 +0000 -Subject: [PATCH] gnulib/regcomp: Fix uninitialized token structure - -The code is assuming that the value of br_token.constraint was -initialized to zero when it wasn't. - -While some compilers will ensure that, not all do, so it is better to -fix this explicitly than leave it to chance. - -Fixes: CID 73749 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -[Add changes to generated files] -Signed-off-by: Stefan Sørensen ---- - Makefile.in | 1 + - conf/Makefile.extra-dist | 1 + - grub-core/lib/gnulib-patches/fix-uninit-structure.patch | 11 +++++++++++ - grub-core/lib/gnulib/regcomp.c | 2 +- - 4 files changed, 14 insertions(+), 1 deletion(-) - create mode 100644 grub-core/lib/gnulib-patches/fix-uninit-structure.patch - -diff --git a/Makefile.in b/Makefile.in -index e6b287b..d58a7d7 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -2742,6 +2742,7 @@ EXTRA_DIST = autogen.sh geninit.sh gentpl.py Makefile.util.def \ - grub-core/gensyminfo.sh.in grub-core/gensymlist.sh \ - grub-core/genemuinit.sh grub-core/genemuinitheader.sh \ - grub-core/lib/gnulib-patches/fix-null-deref.patch \ -+ grub-core/lib/gnulib-patches/fix-uninit-structure.patch \ - grub-core/lib/gnulib-patches/fix-unused-value.patch \ - grub-core/lib/gnulib-patches/fix-width.patch \ - grub-core/lib/gnulib-patches/no-abort.patch \ -diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist -index 9b01152..9e55458 100644 ---- a/conf/Makefile.extra-dist -+++ b/conf/Makefile.extra-dist -@@ -29,6 +29,7 @@ EXTRA_DIST += grub-core/genemuinit.sh - EXTRA_DIST += grub-core/genemuinitheader.sh - - EXTRA_DIST += grub-core/lib/gnulib-patches/fix-null-deref.patch -+EXTRA_DIST += grub-core/lib/gnulib-patches/fix-uninit-structure.patch - EXTRA_DIST += grub-core/lib/gnulib-patches/fix-unused-value.patch - EXTRA_DIST += grub-core/lib/gnulib-patches/fix-width.patch - EXTRA_DIST += grub-core/lib/gnulib-patches/no-abort.patch -diff --git a/grub-core/lib/gnulib-patches/fix-uninit-structure.patch b/grub-core/lib/gnulib-patches/fix-uninit-structure.patch -new file mode 100644 -index 0000000..7b4d9f6 ---- /dev/null -+++ b/grub-core/lib/gnulib-patches/fix-uninit-structure.patch -@@ -0,0 +1,11 @@ -+--- a/lib/regcomp.c 2020-10-22 13:49:06.770168928 +0000 -++++ b/lib/regcomp.c 2020-10-22 13:50:37.026528298 +0000 -+@@ -3662,7 +3662,7 @@ -+ Idx alloc = 0; -+ #endif /* not RE_ENABLE_I18N */ -+ reg_errcode_t ret; -+- re_token_t br_token; -++ re_token_t br_token = {0}; -+ bin_tree_t *tree; -+ -+ sbcset = (re_bitset_ptr_t) calloc (sizeof (bitset_t), 1); -diff --git a/grub-core/lib/gnulib/regcomp.c b/grub-core/lib/gnulib/regcomp.c -index fe7dfcb..2545d3e 100644 ---- a/grub-core/lib/gnulib/regcomp.c -+++ b/grub-core/lib/gnulib/regcomp.c -@@ -3662,7 +3662,7 @@ build_charclass_op (re_dfa_t *dfa, RE_TRANSLATE_TYPE trans, - Idx alloc = 0; - #endif /* not RE_ENABLE_I18N */ - reg_errcode_t ret; -- re_token_t br_token; -+ re_token_t br_token = {0}; - bin_tree_t *tree; - - sbcset = (re_bitset_ptr_t) calloc (sizeof (bitset_t), 1); --- -2.14.2 - diff --git a/buildroot/boot/grub2/0057-gnulib-argp-help-Fix-dereference-of-a-possibly-NULL-.patch b/buildroot/boot/grub2/0057-gnulib-argp-help-Fix-dereference-of-a-possibly-NULL-.patch deleted file mode 100644 index 34c630bf07..0000000000 --- a/buildroot/boot/grub2/0057-gnulib-argp-help-Fix-dereference-of-a-possibly-NULL-.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 3a37bf120a9194c373257c70175cdb5b337bc107 Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Wed, 28 Oct 2020 14:43:01 +0000 -Subject: [PATCH] gnulib/argp-help: Fix dereference of a possibly NULL state - -All other instances of call to __argp_failure() where there is -a dgettext() call is first checking whether state is NULL before -attempting to dereference it to get the root_argp->argp_domain. - -Fixes: CID 292436 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -[Add changes to generated files] -Signed-off-by: Stefan Sørensen ---- - Makefile.in | 1 + - conf/Makefile.extra-dist | 1 + - grub-core/lib/gnulib-patches/fix-null-state-deref.patch | 12 ++++++++++++ - grub-core/lib/gnulib/argp-help.c | 3 ++- - 4 files changed, 16 insertions(+), 1 deletion(-) - create mode 100644 grub-core/lib/gnulib-patches/fix-null-state-deref.patch - -diff --git a/Makefile.in b/Makefile.in -index d58a7d7..812b7c2 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -2742,6 +2742,7 @@ EXTRA_DIST = autogen.sh geninit.sh gentpl.py Makefile.util.def \ - grub-core/gensyminfo.sh.in grub-core/gensymlist.sh \ - grub-core/genemuinit.sh grub-core/genemuinitheader.sh \ - grub-core/lib/gnulib-patches/fix-null-deref.patch \ -+ grub-core/lib/gnulib-patches/fix-null-state-deref.patch \ - grub-core/lib/gnulib-patches/fix-uninit-structure.patch \ - grub-core/lib/gnulib-patches/fix-unused-value.patch \ - grub-core/lib/gnulib-patches/fix-width.patch \ -diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist -index 9e55458..96d7e69 100644 ---- a/conf/Makefile.extra-dist -+++ b/conf/Makefile.extra-dist -@@ -29,6 +29,7 @@ EXTRA_DIST += grub-core/genemuinit.sh - EXTRA_DIST += grub-core/genemuinitheader.sh - - EXTRA_DIST += grub-core/lib/gnulib-patches/fix-null-deref.patch -+EXTRA_DIST += grub-core/lib/gnulib-patches/fix-null-state-deref.patch - EXTRA_DIST += grub-core/lib/gnulib-patches/fix-uninit-structure.patch - EXTRA_DIST += grub-core/lib/gnulib-patches/fix-unused-value.patch - EXTRA_DIST += grub-core/lib/gnulib-patches/fix-width.patch -diff --git a/grub-core/lib/gnulib-patches/fix-null-state-deref.patch b/grub-core/lib/gnulib-patches/fix-null-state-deref.patch -new file mode 100644 -index 0000000..813ec09 ---- /dev/null -+++ b/grub-core/lib/gnulib-patches/fix-null-state-deref.patch -@@ -0,0 +1,12 @@ -+--- a/lib/argp-help.c 2020-10-28 14:32:19.189215988 +0000 -++++ b/lib/argp-help.c 2020-10-28 14:38:21.204673940 +0000 -+@@ -145,7 +145,8 @@ -+ if (*(int *)((char *)upptr + up->uparams_offs) >= upptr->rmargin) -+ { -+ __argp_failure (state, 0, 0, -+- dgettext (state->root_argp->argp_domain, -++ dgettext (state == NULL ? NULL -++ : state->root_argp->argp_domain, -+ "\ -+ ARGP_HELP_FMT: %s value is less than or equal to %s"), -+ "rmargin", up->name); -diff --git a/grub-core/lib/gnulib/argp-help.c b/grub-core/lib/gnulib/argp-help.c -index 5d8f451..c75568c 100644 ---- a/grub-core/lib/gnulib/argp-help.c -+++ b/grub-core/lib/gnulib/argp-help.c -@@ -145,7 +145,8 @@ validate_uparams (const struct argp_state *state, struct uparams *upptr) - if (*(int *)((char *)upptr + up->uparams_offs) >= upptr->rmargin) - { - __argp_failure (state, 0, 0, -- dgettext (state->root_argp->argp_domain, -+ dgettext (state == NULL ? NULL -+ : state->root_argp->argp_domain, - "\ - ARGP_HELP_FMT: %s value is less than or equal to %s"), - "rmargin", up->name); --- -2.14.2 - diff --git a/buildroot/boot/grub2/0058-gnulib-regexec-Fix-possible-null-dereference.patch b/buildroot/boot/grub2/0058-gnulib-regexec-Fix-possible-null-dereference.patch deleted file mode 100644 index 0ced54ae96..0000000000 --- a/buildroot/boot/grub2/0058-gnulib-regexec-Fix-possible-null-dereference.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 0b7f347638153e403ee2dd518af3ce26f4f99647 Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Thu, 5 Nov 2020 10:57:14 +0000 -Subject: [PATCH] gnulib/regexec: Fix possible null-dereference - -It appears to be possible that the mctx->state_log field may be NULL, -and the name of this function, clean_state_log_if_needed(), suggests -that it should be checking that it is valid to be cleaned before -assuming that it does. - -Fixes: CID 86720 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -[Add changes to generated files] -Signed-off-by: Stefan Sørensen ---- - Makefile.in | 1 + - conf/Makefile.extra-dist | 1 + - grub-core/lib/gnulib-patches/fix-regexec-null-deref.patch | 12 ++++++++++++ - grub-core/lib/gnulib/regexec.c | 3 +++ - 4 files changed, 17 insertions(+) - create mode 100644 grub-core/lib/gnulib-patches/fix-regexec-null-deref.patch - -diff --git a/Makefile.in b/Makefile.in -index 812b7c2..d9da6e9 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -2743,6 +2743,7 @@ EXTRA_DIST = autogen.sh geninit.sh gentpl.py Makefile.util.def \ - grub-core/genemuinit.sh grub-core/genemuinitheader.sh \ - grub-core/lib/gnulib-patches/fix-null-deref.patch \ - grub-core/lib/gnulib-patches/fix-null-state-deref.patch \ -+ grub-core/lib/gnulib-patches/fix-regexec-null-deref.patch \ - grub-core/lib/gnulib-patches/fix-uninit-structure.patch \ - grub-core/lib/gnulib-patches/fix-unused-value.patch \ - grub-core/lib/gnulib-patches/fix-width.patch \ -diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist -index 96d7e69..d27d3a9 100644 ---- a/conf/Makefile.extra-dist -+++ b/conf/Makefile.extra-dist -@@ -30,6 +30,7 @@ EXTRA_DIST += grub-core/genemuinitheader.sh - - EXTRA_DIST += grub-core/lib/gnulib-patches/fix-null-deref.patch - EXTRA_DIST += grub-core/lib/gnulib-patches/fix-null-state-deref.patch -+EXTRA_DIST += grub-core/lib/gnulib-patches/fix-regexec-null-deref.patch - EXTRA_DIST += grub-core/lib/gnulib-patches/fix-uninit-structure.patch - EXTRA_DIST += grub-core/lib/gnulib-patches/fix-unused-value.patch - EXTRA_DIST += grub-core/lib/gnulib-patches/fix-width.patch -diff --git a/grub-core/lib/gnulib-patches/fix-regexec-null-deref.patch b/grub-core/lib/gnulib-patches/fix-regexec-null-deref.patch -new file mode 100644 -index 0000000..db6dac9 ---- /dev/null -+++ b/grub-core/lib/gnulib-patches/fix-regexec-null-deref.patch -@@ -0,0 +1,12 @@ -+--- a/lib/regexec.c 2020-10-21 14:25:35.310195912 +0000 -++++ b/lib/regexec.c 2020-11-05 10:55:09.621542984 +0000 -+@@ -1692,6 +1692,9 @@ -+ { -+ Idx top = mctx->state_log_top; -+ -++ if (mctx->state_log == NULL) -++ return REG_NOERROR; -++ -+ if ((next_state_log_idx >= mctx->input.bufs_len -+ && mctx->input.bufs_len < mctx->input.len) -+ || (next_state_log_idx >= mctx->input.valid_len -diff --git a/grub-core/lib/gnulib/regexec.c b/grub-core/lib/gnulib/regexec.c -index 98a25f5..df97667 100644 ---- a/grub-core/lib/gnulib/regexec.c -+++ b/grub-core/lib/gnulib/regexec.c -@@ -1696,6 +1696,9 @@ clean_state_log_if_needed (re_match_context_t *mctx, Idx next_state_log_idx) - { - Idx top = mctx->state_log_top; - -+ if (mctx->state_log == NULL) -+ return REG_NOERROR; -+ - if ((next_state_log_idx >= mctx->input.bufs_len - && mctx->input.bufs_len < mctx->input.len) - || (next_state_log_idx >= mctx->input.valid_len --- -2.14.2 - diff --git a/buildroot/boot/grub2/0059-gnulib-regcomp-Fix-uninitialized-re_token.patch b/buildroot/boot/grub2/0059-gnulib-regcomp-Fix-uninitialized-re_token.patch deleted file mode 100644 index ecdc93c8cd..0000000000 --- a/buildroot/boot/grub2/0059-gnulib-regcomp-Fix-uninitialized-re_token.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 03477085f9a33789ba6cca7cd49ab9326a1baa0e Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Tue, 24 Nov 2020 18:04:22 +0000 -Subject: [PATCH] gnulib/regcomp: Fix uninitialized re_token - -This issue has been fixed in the latest version of gnulib, so to -maintain consistency, I've backported that change rather than doing -something different. - -Fixes: CID 73828 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -[Add changes to generated files] -Signed-off-by: Stefan Sørensen ---- - Makefile.in | 1 + - conf/Makefile.extra-dist | 1 + - .../lib/gnulib-patches/fix-regcomp-uninit-token.patch | 15 +++++++++++++++ - grub-core/lib/gnulib/regcomp.c | 6 +----- - 4 files changed, 18 insertions(+), 5 deletions(-) - create mode 100644 grub-core/lib/gnulib-patches/fix-regcomp-uninit-token.patch - -diff --git a/Makefile.in b/Makefile.in -index d9da6e9..9442504 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -2743,6 +2743,7 @@ EXTRA_DIST = autogen.sh geninit.sh gentpl.py Makefile.util.def \ - grub-core/genemuinit.sh grub-core/genemuinitheader.sh \ - grub-core/lib/gnulib-patches/fix-null-deref.patch \ - grub-core/lib/gnulib-patches/fix-null-state-deref.patch \ -+ grub-core/lib/gnulib-patches/fix-regcomp-uninit-token.patch \ - grub-core/lib/gnulib-patches/fix-regexec-null-deref.patch \ - grub-core/lib/gnulib-patches/fix-uninit-structure.patch \ - grub-core/lib/gnulib-patches/fix-unused-value.patch \ -diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist -index d27d3a9..ffe6829 100644 ---- a/conf/Makefile.extra-dist -+++ b/conf/Makefile.extra-dist -@@ -30,6 +30,7 @@ EXTRA_DIST += grub-core/genemuinitheader.sh - - EXTRA_DIST += grub-core/lib/gnulib-patches/fix-null-deref.patch - EXTRA_DIST += grub-core/lib/gnulib-patches/fix-null-state-deref.patch -+EXTRA_DIST += grub-core/lib/gnulib-patches/fix-regcomp-uninit-token.patch - EXTRA_DIST += grub-core/lib/gnulib-patches/fix-regexec-null-deref.patch - EXTRA_DIST += grub-core/lib/gnulib-patches/fix-uninit-structure.patch - EXTRA_DIST += grub-core/lib/gnulib-patches/fix-unused-value.patch -diff --git a/grub-core/lib/gnulib-patches/fix-regcomp-uninit-token.patch b/grub-core/lib/gnulib-patches/fix-regcomp-uninit-token.patch -new file mode 100644 -index 0000000..02e0631 ---- /dev/null -+++ b/grub-core/lib/gnulib-patches/fix-regcomp-uninit-token.patch -@@ -0,0 +1,15 @@ -+--- a/lib/regcomp.c 2020-11-24 17:06:08.159223858 +0000 -++++ b/lib/regcomp.c 2020-11-24 17:06:15.630253923 +0000 -+@@ -3808,11 +3808,7 @@ -+ create_tree (re_dfa_t *dfa, bin_tree_t *left, bin_tree_t *right, -+ re_token_type_t type) -+ { -+- re_token_t t; -+-#if defined GCC_LINT || defined lint -+- memset (&t, 0, sizeof t); -+-#endif -+- t.type = type; -++ re_token_t t = { .type = type }; -+ return create_token_tree (dfa, left, right, &t); -+ } -+ -diff --git a/grub-core/lib/gnulib/regcomp.c b/grub-core/lib/gnulib/regcomp.c -index 2545d3e..64a4fa7 100644 ---- a/grub-core/lib/gnulib/regcomp.c -+++ b/grub-core/lib/gnulib/regcomp.c -@@ -3808,11 +3808,7 @@ static bin_tree_t * - create_tree (re_dfa_t *dfa, bin_tree_t *left, bin_tree_t *right, - re_token_type_t type) - { -- re_token_t t; --#if defined GCC_LINT || defined lint -- memset (&t, 0, sizeof t); --#endif -- t.type = type; -+ re_token_t t = { .type = type }; - return create_token_tree (dfa, left, right, &t); - } - --- -2.14.2 - diff --git a/buildroot/boot/grub2/0060-io-lzopio-Resolve-unnecessary-self-assignment-errors.patch b/buildroot/boot/grub2/0060-io-lzopio-Resolve-unnecessary-self-assignment-errors.patch deleted file mode 100644 index cc6b217245..0000000000 --- a/buildroot/boot/grub2/0060-io-lzopio-Resolve-unnecessary-self-assignment-errors.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 59666e520f44177c97b82a44c169b3b315d63b42 Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Wed, 21 Oct 2020 14:44:10 +0000 -Subject: [PATCH] io/lzopio: Resolve unnecessary self-assignment errors - -These 2 assignments are unnecessary since they are just assigning -to themselves. - -Fixes: CID 73643 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/io/lzopio.c | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/grub-core/io/lzopio.c b/grub-core/io/lzopio.c -index 3014485..a7d4425 100644 ---- a/grub-core/io/lzopio.c -+++ b/grub-core/io/lzopio.c -@@ -125,8 +125,6 @@ read_block_header (struct grub_lzopio *lzopio) - sizeof (lzopio->block.ucheck)) != - sizeof (lzopio->block.ucheck)) - return -1; -- -- lzopio->block.ucheck = lzopio->block.ucheck; - } - - /* Read checksum of compressed data. */ -@@ -143,8 +141,6 @@ read_block_header (struct grub_lzopio *lzopio) - sizeof (lzopio->block.ccheck)) != - sizeof (lzopio->block.ccheck)) - return -1; -- -- lzopio->block.ccheck = lzopio->block.ccheck; - } - } - --- -2.14.2 - diff --git a/buildroot/boot/grub2/0061-zstd-Initialize-seq_t-structure-fully.patch b/buildroot/boot/grub2/0061-zstd-Initialize-seq_t-structure-fully.patch deleted file mode 100644 index 5e1752b3a5..0000000000 --- a/buildroot/boot/grub2/0061-zstd-Initialize-seq_t-structure-fully.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 2777cf4466719921dbe4b30af358a75e7d76f217 Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Thu, 5 Nov 2020 10:29:59 +0000 -Subject: [PATCH] zstd: Initialize seq_t structure fully - -While many compilers will initialize this to zero, not all will, so it -is better to be sure that fields not being explicitly set are at known -values, and there is code that checks this fields value elsewhere in the -code. - -Fixes: CID 292440 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/lib/zstd/zstd_decompress.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/grub-core/lib/zstd/zstd_decompress.c b/grub-core/lib/zstd/zstd_decompress.c -index 711b5b6..e4b5670 100644 ---- a/grub-core/lib/zstd/zstd_decompress.c -+++ b/grub-core/lib/zstd/zstd_decompress.c -@@ -1325,7 +1325,7 @@ typedef enum { ZSTD_lo_isRegularOffset, ZSTD_lo_isLongOffset=1 } ZSTD_longOffset - FORCE_INLINE_TEMPLATE seq_t - ZSTD_decodeSequence(seqState_t* seqState, const ZSTD_longOffset_e longOffsets) - { -- seq_t seq; -+ seq_t seq = {0}; - U32 const llBits = seqState->stateLL.table[seqState->stateLL.state].nbAdditionalBits; - U32 const mlBits = seqState->stateML.table[seqState->stateML.state].nbAdditionalBits; - U32 const ofBits = seqState->stateOffb.table[seqState->stateOffb.state].nbAdditionalBits; --- -2.14.2 - diff --git a/buildroot/boot/grub2/0062-kern-partition-Check-for-NULL-before-dereferencing-i.patch b/buildroot/boot/grub2/0062-kern-partition-Check-for-NULL-before-dereferencing-i.patch deleted file mode 100644 index 431d45fd17..0000000000 --- a/buildroot/boot/grub2/0062-kern-partition-Check-for-NULL-before-dereferencing-i.patch +++ /dev/null @@ -1,44 +0,0 @@ -From bc9c468a2ce84bc767234eec888b71f1bc744fff Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Fri, 23 Oct 2020 09:49:59 +0000 -Subject: [PATCH] kern/partition: Check for NULL before dereferencing input - string - -There is the possibility that the value of str comes from an external -source and continuing to use it before ever checking its validity is -wrong. So, needs fixing. - -Additionally, drop unneeded part initialization. - -Fixes: CID 292444 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/kern/partition.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/grub-core/kern/partition.c b/grub-core/kern/partition.c -index e499147..b10a184 100644 ---- a/grub-core/kern/partition.c -+++ b/grub-core/kern/partition.c -@@ -109,11 +109,14 @@ grub_partition_map_probe (const grub_partition_map_t partmap, - grub_partition_t - grub_partition_probe (struct grub_disk *disk, const char *str) - { -- grub_partition_t part = 0; -+ grub_partition_t part; - grub_partition_t curpart = 0; - grub_partition_t tail; - const char *ptr; - -+ if (str == NULL) -+ return 0; -+ - part = tail = disk->partition; - - for (ptr = str; *ptr;) --- -2.14.2 - diff --git a/buildroot/boot/grub2/0063-disk-ldm-Make-sure-comp-data-is-freed-before-exiting.patch b/buildroot/boot/grub2/0063-disk-ldm-Make-sure-comp-data-is-freed-before-exiting.patch deleted file mode 100644 index 5bebd400f6..0000000000 --- a/buildroot/boot/grub2/0063-disk-ldm-Make-sure-comp-data-is-freed-before-exiting.patch +++ /dev/null @@ -1,129 +0,0 @@ -From 23e39f50ca7a107f6b66396ed4d177a914dee035 Mon Sep 17 00:00:00 2001 -From: Marco A Benatto -Date: Mon, 7 Dec 2020 11:53:03 -0300 -Subject: [PATCH] disk/ldm: Make sure comp data is freed before exiting from - make_vg() - -Several error handling paths in make_vg() do not free comp data before -jumping to fail2 label and returning from the function. This will leak -memory. So, let's fix all issues of that kind. - -Fixes: CID 73804 - -Signed-off-by: Marco A Benatto -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/disk/ldm.c | 51 ++++++++++++++++++++++++++++++++++++++++++++------- - 1 file changed, 44 insertions(+), 7 deletions(-) - -diff --git a/grub-core/disk/ldm.c b/grub-core/disk/ldm.c -index 58f8a53..428415f 100644 ---- a/grub-core/disk/ldm.c -+++ b/grub-core/disk/ldm.c -@@ -554,7 +554,11 @@ make_vg (grub_disk_t disk, - comp->segments = grub_calloc (comp->segment_alloc, - sizeof (*comp->segments)); - if (!comp->segments) -- goto fail2; -+ { -+ grub_free (comp->internal_id); -+ grub_free (comp); -+ goto fail2; -+ } - } - else - { -@@ -562,7 +566,11 @@ make_vg (grub_disk_t disk, - comp->segment_count = 1; - comp->segments = grub_malloc (sizeof (*comp->segments)); - if (!comp->segments) -- goto fail2; -+ { -+ grub_free (comp->internal_id); -+ grub_free (comp); -+ goto fail2; -+ } - comp->segments->start_extent = 0; - comp->segments->extent_count = lv->size; - comp->segments->layout = 0; -@@ -574,15 +582,26 @@ make_vg (grub_disk_t disk, - comp->segments->layout = GRUB_RAID_LAYOUT_SYMMETRIC_MASK; - } - else -- goto fail2; -+ { -+ grub_free (comp->segments); -+ grub_free (comp->internal_id); -+ grub_free (comp); -+ goto fail2; -+ } - ptr += *ptr + 1; - ptr++; - if (!(vblk[i].flags & 0x10)) -- goto fail2; -+ { -+ grub_free (comp->segments); -+ grub_free (comp->internal_id); -+ grub_free (comp); -+ goto fail2; -+ } - if (ptr >= vblk[i].dynamic + sizeof (vblk[i].dynamic) - || ptr + *ptr + 1 >= vblk[i].dynamic - + sizeof (vblk[i].dynamic)) - { -+ grub_free (comp->segments); - grub_free (comp->internal_id); - grub_free (comp); - goto fail2; -@@ -592,6 +611,7 @@ make_vg (grub_disk_t disk, - if (ptr + *ptr + 1 >= vblk[i].dynamic - + sizeof (vblk[i].dynamic)) - { -+ grub_free (comp->segments); - grub_free (comp->internal_id); - grub_free (comp); - goto fail2; -@@ -601,7 +621,12 @@ make_vg (grub_disk_t disk, - comp->segments->nodes = grub_calloc (comp->segments->node_alloc, - sizeof (*comp->segments->nodes)); - if (!lv->segments->nodes) -- goto fail2; -+ { -+ grub_free (comp->segments); -+ grub_free (comp->internal_id); -+ grub_free (comp); -+ goto fail2; -+ } - } - - if (lv->segments->node_alloc == lv->segments->node_count) -@@ -611,11 +636,23 @@ make_vg (grub_disk_t disk, - - if (grub_mul (lv->segments->node_alloc, 2, &lv->segments->node_alloc) || - grub_mul (lv->segments->node_alloc, sizeof (*lv->segments->nodes), &sz)) -- goto fail2; -+ { -+ grub_free (comp->segments->nodes); -+ grub_free (comp->segments); -+ grub_free (comp->internal_id); -+ grub_free (comp); -+ goto fail2; -+ } - - t = grub_realloc (lv->segments->nodes, sz); - if (!t) -- goto fail2; -+ { -+ grub_free (comp->segments->nodes); -+ grub_free (comp->segments); -+ grub_free (comp->internal_id); -+ grub_free (comp); -+ goto fail2; -+ } - lv->segments->nodes = t; - } - lv->segments->nodes[lv->segments->node_count].pv = 0; --- -2.14.2 - diff --git a/buildroot/boot/grub2/0064-disk-ldm-If-failed-then-free-vg-variable-too.patch b/buildroot/boot/grub2/0064-disk-ldm-If-failed-then-free-vg-variable-too.patch deleted file mode 100644 index 24417a1611..0000000000 --- a/buildroot/boot/grub2/0064-disk-ldm-If-failed-then-free-vg-variable-too.patch +++ /dev/null @@ -1,29 +0,0 @@ -From e0b83df5da538d2a38f770e60817b3a4b9d5b4d7 Mon Sep 17 00:00:00 2001 -From: Paulo Flabiano Smorigo -Date: Mon, 7 Dec 2020 10:07:47 -0300 -Subject: [PATCH] disk/ldm: If failed then free vg variable too - -Fixes: CID 73809 - -Signed-off-by: Paulo Flabiano Smorigo -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/disk/ldm.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/grub-core/disk/ldm.c b/grub-core/disk/ldm.c -index 428415f..54713f4 100644 ---- a/grub-core/disk/ldm.c -+++ b/grub-core/disk/ldm.c -@@ -199,6 +199,7 @@ make_vg (grub_disk_t disk, - { - grub_free (vg->uuid); - grub_free (vg->name); -+ grub_free (vg); - return NULL; - } - grub_memcpy (vg->uuid, label->group_guid, LDM_GUID_STRLEN); --- -2.14.2 - diff --git a/buildroot/boot/grub2/0065-disk-ldm-Fix-memory-leak-on-uninserted-lv-references.patch b/buildroot/boot/grub2/0065-disk-ldm-Fix-memory-leak-on-uninserted-lv-references.patch deleted file mode 100644 index ee424e8014..0000000000 --- a/buildroot/boot/grub2/0065-disk-ldm-Fix-memory-leak-on-uninserted-lv-references.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 156c281a1625dc73fd350530630c6f2d5673d4f6 Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Tue, 8 Dec 2020 10:00:51 +0000 -Subject: [PATCH] disk/ldm: Fix memory leak on uninserted lv references - -The problem here is that the memory allocated to the variable lv is not -yet inserted into the list that is being processed at the label fail2. - -As we can already see at line 342, which correctly frees lv before going -to fail2, we should also be doing that at these earlier jumps to fail2. - -Fixes: CID 73824 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/disk/ldm.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/grub-core/disk/ldm.c b/grub-core/disk/ldm.c -index 54713f4..e82e989 100644 ---- a/grub-core/disk/ldm.c -+++ b/grub-core/disk/ldm.c -@@ -321,7 +321,10 @@ make_vg (grub_disk_t disk, - lv->visible = 1; - lv->segments = grub_zalloc (sizeof (*lv->segments)); - if (!lv->segments) -- goto fail2; -+ { -+ grub_free (lv); -+ goto fail2; -+ } - lv->segments->start_extent = 0; - lv->segments->type = GRUB_DISKFILTER_MIRROR; - lv->segments->node_count = 0; -@@ -329,7 +332,10 @@ make_vg (grub_disk_t disk, - lv->segments->nodes = grub_calloc (lv->segments->node_alloc, - sizeof (*lv->segments->nodes)); - if (!lv->segments->nodes) -- goto fail2; -+ { -+ grub_free (lv); -+ goto fail2; -+ } - ptr = vblk[i].dynamic; - if (ptr + *ptr + 1 >= vblk[i].dynamic - + sizeof (vblk[i].dynamic)) --- -2.14.2 - diff --git a/buildroot/boot/grub2/0066-disk-cryptodisk-Fix-potential-integer-overflow.patch b/buildroot/boot/grub2/0066-disk-cryptodisk-Fix-potential-integer-overflow.patch deleted file mode 100644 index 781ebc180c..0000000000 --- a/buildroot/boot/grub2/0066-disk-cryptodisk-Fix-potential-integer-overflow.patch +++ /dev/null @@ -1,51 +0,0 @@ -From a201ad17caa430aa710654fdf2e6ab4c8166f031 Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Thu, 21 Jan 2021 11:38:31 +0000 -Subject: [PATCH] disk/cryptodisk: Fix potential integer overflow - -The encrypt and decrypt functions expect a grub_size_t. So, we need to -ensure that the constant bit shift is using grub_size_t rather than -unsigned int when it is performing the shift. - -Fixes: CID 307788 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/disk/cryptodisk.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c -index 5037768..6883f48 100644 ---- a/grub-core/disk/cryptodisk.c -+++ b/grub-core/disk/cryptodisk.c -@@ -311,10 +311,10 @@ grub_cryptodisk_endecrypt (struct grub_cryptodisk *dev, - case GRUB_CRYPTODISK_MODE_CBC: - if (do_encrypt) - err = grub_crypto_cbc_encrypt (dev->cipher, data + i, data + i, -- (1U << dev->log_sector_size), iv); -+ ((grub_size_t) 1 << dev->log_sector_size), iv); - else - err = grub_crypto_cbc_decrypt (dev->cipher, data + i, data + i, -- (1U << dev->log_sector_size), iv); -+ ((grub_size_t) 1 << dev->log_sector_size), iv); - if (err) - return err; - break; -@@ -322,10 +322,10 @@ grub_cryptodisk_endecrypt (struct grub_cryptodisk *dev, - case GRUB_CRYPTODISK_MODE_PCBC: - if (do_encrypt) - err = grub_crypto_pcbc_encrypt (dev->cipher, data + i, data + i, -- (1U << dev->log_sector_size), iv); -+ ((grub_size_t) 1 << dev->log_sector_size), iv); - else - err = grub_crypto_pcbc_decrypt (dev->cipher, data + i, data + i, -- (1U << dev->log_sector_size), iv); -+ ((grub_size_t) 1 << dev->log_sector_size), iv); - if (err) - return err; - break; --- -2.14.2 - diff --git a/buildroot/boot/grub2/0067-hfsplus-Check-that-the-volume-name-length-is-valid.patch b/buildroot/boot/grub2/0067-hfsplus-Check-that-the-volume-name-length-is-valid.patch deleted file mode 100644 index 78cff9b458..0000000000 --- a/buildroot/boot/grub2/0067-hfsplus-Check-that-the-volume-name-length-is-valid.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 2298f6e0d951251bb9ca97d891d1bc8b74515f8c Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Fri, 23 Oct 2020 17:09:31 +0000 -Subject: [PATCH] hfsplus: Check that the volume name length is valid - -HFS+ documentation suggests that the maximum filename and volume name is -255 Unicode characters in length. - -So, when converting from big-endian to little-endian, we should ensure -that the name of the volume has a length that is between 0 and 255, -inclusive. - -Fixes: CID 73641 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/fs/hfsplus.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/grub-core/fs/hfsplus.c b/grub-core/fs/hfsplus.c -index 9c4e4c8..8fe7c12 100644 ---- a/grub-core/fs/hfsplus.c -+++ b/grub-core/fs/hfsplus.c -@@ -1012,6 +1012,15 @@ grub_hfsplus_label (grub_device_t device, char **label) - grub_hfsplus_btree_recptr (&data->catalog_tree, node, ptr); - - label_len = grub_be_to_cpu16 (catkey->namelen); -+ -+ /* Ensure that the length is >= 0. */ -+ if (label_len < 0) -+ label_len = 0; -+ -+ /* Ensure label length is at most 255 Unicode characters. */ -+ if (label_len > 255) -+ label_len = 255; -+ - label_name = grub_calloc (label_len, sizeof (*label_name)); - if (!label_name) - { --- -2.14.2 - diff --git a/buildroot/boot/grub2/0068-zfs-Fix-possible-negative-shift-operation.patch b/buildroot/boot/grub2/0068-zfs-Fix-possible-negative-shift-operation.patch deleted file mode 100644 index 3445619de2..0000000000 --- a/buildroot/boot/grub2/0068-zfs-Fix-possible-negative-shift-operation.patch +++ /dev/null @@ -1,43 +0,0 @@ -From a02091834d3e167320d8a262ff04b8e83c5e616d Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Tue, 24 Nov 2020 16:41:49 +0000 -Subject: [PATCH] zfs: Fix possible negative shift operation - -While it is possible for the return value from zfs_log2() to be zero -(0), it is quite unlikely, given that the previous assignment to blksz -is shifted up by SPA_MINBLOCKSHIFT (9) before 9 is subtracted at the -assignment to epbs. - -But, while unlikely during a normal operation, it may be that a carefully -crafted ZFS filesystem could result in a zero (0) value to the -dn_datalbkszsec field, which means that the shift left does nothing -and assigns zero (0) to blksz, resulting in a negative epbs value. - -Fixes: CID 73608 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/fs/zfs/zfs.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c -index 36d0373..0c42cba 100644 ---- a/grub-core/fs/zfs/zfs.c -+++ b/grub-core/fs/zfs/zfs.c -@@ -2667,6 +2667,11 @@ dnode_get (dnode_end_t * mdn, grub_uint64_t objnum, grub_uint8_t type, - blksz = grub_zfs_to_cpu16 (mdn->dn.dn_datablkszsec, - mdn->endian) << SPA_MINBLOCKSHIFT; - epbs = zfs_log2 (blksz) - DNODE_SHIFT; -+ -+ /* While this should never happen, we should check that epbs is not negative. */ -+ if (epbs < 0) -+ epbs = 0; -+ - blkid = objnum >> epbs; - idx = objnum & ((1 << epbs) - 1); - --- -2.14.2 - diff --git a/buildroot/boot/grub2/0069-zfs-Fix-resource-leaks-while-constructing-path.patch b/buildroot/boot/grub2/0069-zfs-Fix-resource-leaks-while-constructing-path.patch deleted file mode 100644 index d4a3f64966..0000000000 --- a/buildroot/boot/grub2/0069-zfs-Fix-resource-leaks-while-constructing-path.patch +++ /dev/null @@ -1,122 +0,0 @@ -From 89bdab965805e8d54d7f75349024e1a11cbe2eb8 Mon Sep 17 00:00:00 2001 -From: Paulo Flabiano Smorigo -Date: Mon, 14 Dec 2020 18:54:49 -0300 -Subject: [PATCH] zfs: Fix resource leaks while constructing path - -There are several exit points in dnode_get_path() that are causing possible -memory leaks. - -In the while(1) the correct exit mechanism should not be to do a direct return, -but to instead break out of the loop, setting err first if it is not already set. - -The reason behind this is that the dnode_path is a linked list, and while doing -through this loop, it is being allocated and built up - the only way to -correctly unravel it is to traverse it, which is what is being done at the end -of the function outside of the loop. - -Several of the existing exit points correctly did a break, but not all so this -change makes that more consistent and should resolve the leaking of memory as -found by Coverity. - -Fixes: CID 73741 - -Signed-off-by: Paulo Flabiano Smorigo -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/fs/zfs/zfs.c | 30 +++++++++++++++++++++--------- - 1 file changed, 21 insertions(+), 9 deletions(-) - -diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c -index 0c42cba..9087a72 100644 ---- a/grub-core/fs/zfs/zfs.c -+++ b/grub-core/fs/zfs/zfs.c -@@ -2836,8 +2836,8 @@ dnode_get_path (struct subvolume *subvol, const char *path_in, dnode_end_t *dn, - - if (dnode_path->dn.dn.dn_type != DMU_OT_DIRECTORY_CONTENTS) - { -- grub_free (path_buf); -- return grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("not a directory")); -+ err = grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("not a directory")); -+ break; - } - err = zap_lookup (&(dnode_path->dn), cname, &objnum, - data, subvol->case_insensitive); -@@ -2879,11 +2879,18 @@ dnode_get_path (struct subvolume *subvol, const char *path_in, dnode_end_t *dn, - << SPA_MINBLOCKSHIFT); - - if (blksz == 0) -- return grub_error(GRUB_ERR_BAD_FS, "0-sized block"); -+ { -+ err = grub_error (GRUB_ERR_BAD_FS, "0-sized block"); -+ break; -+ } - - sym_value = grub_malloc (sym_sz); - if (!sym_value) -- return grub_errno; -+ { -+ err = grub_errno; -+ break; -+ } -+ - for (block = 0; block < (sym_sz + blksz - 1) / blksz; block++) - { - void *t; -@@ -2893,7 +2900,7 @@ dnode_get_path (struct subvolume *subvol, const char *path_in, dnode_end_t *dn, - if (err) - { - grub_free (sym_value); -- return err; -+ break; - } - - movesize = sym_sz - block * blksz; -@@ -2903,6 +2910,8 @@ dnode_get_path (struct subvolume *subvol, const char *path_in, dnode_end_t *dn, - grub_memcpy (sym_value + block * blksz, t, movesize); - grub_free (t); - } -+ if (err) -+ break; - free_symval = 1; - } - path = path_buf = grub_malloc (sym_sz + grub_strlen (oldpath) + 1); -@@ -2911,7 +2920,8 @@ dnode_get_path (struct subvolume *subvol, const char *path_in, dnode_end_t *dn, - grub_free (oldpathbuf); - if (free_symval) - grub_free (sym_value); -- return grub_errno; -+ err = grub_errno; -+ break; - } - grub_memcpy (path, sym_value, sym_sz); - if (free_symval) -@@ -2949,11 +2959,12 @@ dnode_get_path (struct subvolume *subvol, const char *path_in, dnode_end_t *dn, - - err = zio_read (bp, dnode_path->dn.endian, &sahdrp, NULL, data); - if (err) -- return err; -+ break; - } - else - { -- return grub_error (GRUB_ERR_BAD_FS, "filesystem is corrupt"); -+ err = grub_error (GRUB_ERR_BAD_FS, "filesystem is corrupt"); -+ break; - } - - hdrsize = SA_HDR_SIZE (((sa_hdr_phys_t *) sahdrp)); -@@ -2974,7 +2985,8 @@ dnode_get_path (struct subvolume *subvol, const char *path_in, dnode_end_t *dn, - if (!path_buf) - { - grub_free (oldpathbuf); -- return grub_errno; -+ err = grub_errno; -+ break; - } - grub_memcpy (path, sym_value, sym_sz); - path [sym_sz] = 0; --- -2.14.2 - diff --git a/buildroot/boot/grub2/0070-zfs-Fix-possible-integer-overflows.patch b/buildroot/boot/grub2/0070-zfs-Fix-possible-integer-overflows.patch deleted file mode 100644 index b4791e6116..0000000000 --- a/buildroot/boot/grub2/0070-zfs-Fix-possible-integer-overflows.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 302c12ff5714bc455949117c1c9548ccb324d55b Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Tue, 8 Dec 2020 22:17:04 +0000 -Subject: [PATCH] zfs: Fix possible integer overflows - -In all cases the problem is that the value being acted upon by -a left-shift is a 32-bit number which is then being used in the -context of a 64-bit number. - -To avoid overflow we ensure that the number being shifted is 64-bit -before the shift is done. - -Fixes: CID 73684, CID 73695, CID 73764 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/fs/zfs/zfs.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c -index 9087a72..b078ccc 100644 ---- a/grub-core/fs/zfs/zfs.c -+++ b/grub-core/fs/zfs/zfs.c -@@ -564,7 +564,7 @@ find_bestub (uberblock_phys_t * ub_array, - ubptr = (uberblock_phys_t *) ((grub_properly_aligned_t *) ub_array - + ((i << ub_shift) - / sizeof (grub_properly_aligned_t))); -- err = uberblock_verify (ubptr, offset, 1 << ub_shift); -+ err = uberblock_verify (ubptr, offset, (grub_size_t) 1 << ub_shift); - if (err) - { - grub_errno = GRUB_ERR_NONE; -@@ -1543,7 +1543,7 @@ read_device (grub_uint64_t offset, struct grub_zfs_device_desc *desc, - - high = grub_divmod64 ((offset >> desc->ashift) + c, - desc->n_children, &devn); -- csize = bsize << desc->ashift; -+ csize = (grub_size_t) bsize << desc->ashift; - if (csize > len) - csize = len; - -@@ -1635,8 +1635,8 @@ read_device (grub_uint64_t offset, struct grub_zfs_device_desc *desc, - - while (len > 0) - { -- grub_size_t csize; -- csize = ((s / (desc->n_children - desc->nparity)) -+ grub_size_t csize = s; -+ csize = ((csize / (desc->n_children - desc->nparity)) - << desc->ashift); - if (csize > len) - csize = len; --- -2.14.2 - diff --git a/buildroot/boot/grub2/0071-zfsinfo-Correct-a-check-for-error-allocating-memory.patch b/buildroot/boot/grub2/0071-zfsinfo-Correct-a-check-for-error-allocating-memory.patch deleted file mode 100644 index 817fbc37ad..0000000000 --- a/buildroot/boot/grub2/0071-zfsinfo-Correct-a-check-for-error-allocating-memory.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 7aab03418ec6a9b991aa44416cb2585aff4e7972 Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Thu, 26 Nov 2020 10:56:45 +0000 -Subject: [PATCH] zfsinfo: Correct a check for error allocating memory - -While arguably the check for grub_errno is correct, we should really be -checking the return value from the function since it is always possible -that grub_errno was set elsewhere, making this code behave incorrectly. - -Fixes: CID 73668 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/fs/zfs/zfsinfo.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/grub-core/fs/zfs/zfsinfo.c b/grub-core/fs/zfs/zfsinfo.c -index c8a28ac..bf29180 100644 ---- a/grub-core/fs/zfs/zfsinfo.c -+++ b/grub-core/fs/zfs/zfsinfo.c -@@ -358,8 +358,8 @@ grub_cmd_zfs_bootfs (grub_command_t cmd __attribute__ ((unused)), int argc, - return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("one argument expected")); - - devname = grub_file_get_device_name (args[0]); -- if (grub_errno) -- return grub_errno; -+ if (devname == NULL) -+ return GRUB_ERR_OUT_OF_MEMORY; - - dev = grub_device_open (devname); - grub_free (devname); --- -2.14.2 - diff --git a/buildroot/boot/grub2/0072-affs-Fix-memory-leaks.patch b/buildroot/boot/grub2/0072-affs-Fix-memory-leaks.patch deleted file mode 100644 index bcbc0377e3..0000000000 --- a/buildroot/boot/grub2/0072-affs-Fix-memory-leaks.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 178ac5107389f8e5b32489d743d6824a5ebf342a Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Thu, 26 Nov 2020 12:48:07 +0000 -Subject: [PATCH] affs: Fix memory leaks - -The node structure reference is being allocated but not freed if it -reaches the end of the function. If any of the hooks had returned -a non-zero value, then node would have been copied in to the context -reference, but otherwise node is not stored and should be freed. - -Similarly, the call to grub_affs_create_node() replaces the allocated -memory in node with a newly allocated structure, leaking the existing -memory pointed by node. - -Finally, when dir->parent is set, then we again replace node with newly -allocated memory, which seems unnecessary when we copy in the values -from dir->parent immediately after. - -Fixes: CID 73759 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/fs/affs.c | 18 ++++++++---------- - 1 file changed, 8 insertions(+), 10 deletions(-) - -diff --git a/grub-core/fs/affs.c b/grub-core/fs/affs.c -index 220b371..230e26a 100644 ---- a/grub-core/fs/affs.c -+++ b/grub-core/fs/affs.c -@@ -400,12 +400,12 @@ grub_affs_iterate_dir (grub_fshelp_node_t dir, - { - unsigned int i; - struct grub_affs_file file; -- struct grub_fshelp_node *node = 0; -+ struct grub_fshelp_node *node, *orig_node; - struct grub_affs_data *data = dir->data; - grub_uint32_t *hashtable; - - /* Create the directory entries for `.' and `..'. */ -- node = grub_zalloc (sizeof (*node)); -+ node = orig_node = grub_zalloc (sizeof (*node)); - if (!node) - return 1; - -@@ -414,9 +414,6 @@ grub_affs_iterate_dir (grub_fshelp_node_t dir, - return 1; - if (dir->parent) - { -- node = grub_zalloc (sizeof (*node)); -- if (!node) -- return 1; - *node = *dir->parent; - if (hook ("..", GRUB_FSHELP_DIR, node, hook_data)) - return 1; -@@ -456,17 +453,18 @@ grub_affs_iterate_dir (grub_fshelp_node_t dir, - - if (grub_affs_create_node (dir, hook, hook_data, &node, &hashtable, - next, &file)) -- return 1; -+ { -+ /* Node has been replaced in function. */ -+ grub_free (orig_node); -+ return 1; -+ } - - next = grub_be_to_cpu32 (file.next); - } - } - -- grub_free (hashtable); -- return 0; -- - fail: -- grub_free (node); -+ grub_free (orig_node); - grub_free (hashtable); - return 0; - } --- -2.14.2 - diff --git a/buildroot/boot/grub2/0073-libgcrypt-mpi-Fix-possible-unintended-sign-extension.patch b/buildroot/boot/grub2/0073-libgcrypt-mpi-Fix-possible-unintended-sign-extension.patch deleted file mode 100644 index 5e5bb2f00f..0000000000 --- a/buildroot/boot/grub2/0073-libgcrypt-mpi-Fix-possible-unintended-sign-extension.patch +++ /dev/null @@ -1,50 +0,0 @@ -From e8814c811132a70f9b55418f7567378a34ad3883 Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Tue, 3 Nov 2020 16:43:37 +0000 -Subject: [PATCH] libgcrypt/mpi: Fix possible unintended sign extension - -The array of unsigned char gets promoted to a signed 32-bit int before -it is finally promoted to a size_t. There is the possibility that this -may result in the signed-bit being set for the intermediate signed -32-bit int. We should ensure that the promotion is to the correct type -before we bitwise-OR the values. - -Fixes: CID 96697 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/lib/libgcrypt-grub/mpi/mpicoder.c | 2 +- - grub-core/lib/libgcrypt/mpi/mpicoder.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/grub-core/lib/libgcrypt-grub/mpi/mpicoder.c b/grub-core/lib/libgcrypt-grub/mpi/mpicoder.c -index 3d55dfc..faf1cd6 100644 ---- a/grub-core/lib/libgcrypt-grub/mpi/mpicoder.c -+++ b/grub-core/lib/libgcrypt-grub/mpi/mpicoder.c -@@ -460,7 +460,7 @@ gcry_mpi_scan (struct gcry_mpi **ret_mpi, enum gcry_mpi_format format, - if (len && len < 4) - return gcry_error (GPG_ERR_TOO_SHORT); - -- n = (s[0] << 24 | s[1] << 16 | s[2] << 8 | s[3]); -+ n = ((size_t)s[0] << 24 | (size_t)s[1] << 16 | (size_t)s[2] << 8 | (size_t)s[3]); - s += 4; - if (len) - len -= 4; -diff --git a/grub-core/lib/libgcrypt/mpi/mpicoder.c b/grub-core/lib/libgcrypt/mpi/mpicoder.c -index a3435ed..7ecad27 100644 ---- a/grub-core/lib/libgcrypt/mpi/mpicoder.c -+++ b/grub-core/lib/libgcrypt/mpi/mpicoder.c -@@ -458,7 +458,7 @@ gcry_mpi_scan (struct gcry_mpi **ret_mpi, enum gcry_mpi_format format, - if (len && len < 4) - return gcry_error (GPG_ERR_TOO_SHORT); - -- n = (s[0] << 24 | s[1] << 16 | s[2] << 8 | s[3]); -+ n = ((size_t)s[0] << 24 | (size_t)s[1] << 16 | (size_t)s[2] << 8 | (size_t)s[3]); - s += 4; - if (len) - len -= 4; --- -2.14.2 - diff --git a/buildroot/boot/grub2/0074-libgcrypt-mpi-Fix-possible-NULL-dereference.patch b/buildroot/boot/grub2/0074-libgcrypt-mpi-Fix-possible-NULL-dereference.patch deleted file mode 100644 index 80446aa078..0000000000 --- a/buildroot/boot/grub2/0074-libgcrypt-mpi-Fix-possible-NULL-dereference.patch +++ /dev/null @@ -1,49 +0,0 @@ -From ae0f3fabeba7b393113d5dc185b6aff9b728136d Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Thu, 26 Nov 2020 10:41:54 +0000 -Subject: [PATCH] libgcrypt/mpi: Fix possible NULL dereference - -The code in gcry_mpi_scan() assumes that buffer is not NULL, but there -is no explicit check for that, so we add one. - -Fixes: CID 73757 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/lib/libgcrypt-grub/mpi/mpicoder.c | 3 +++ - grub-core/lib/libgcrypt/mpi/mpicoder.c | 3 +++ - 2 files changed, 6 insertions(+) - -diff --git a/grub-core/lib/libgcrypt-grub/mpi/mpicoder.c b/grub-core/lib/libgcrypt-grub/mpi/mpicoder.c -index faf1cd6..e734dcf 100644 ---- a/grub-core/lib/libgcrypt-grub/mpi/mpicoder.c -+++ b/grub-core/lib/libgcrypt-grub/mpi/mpicoder.c -@@ -381,6 +381,9 @@ gcry_mpi_scan (struct gcry_mpi **ret_mpi, enum gcry_mpi_format format, - unsigned int len; - int secure = (buffer && gcry_is_secure (buffer)); - -+ if (!buffer) -+ return gcry_error (GPG_ERR_INV_ARG); -+ - if (format == GCRYMPI_FMT_SSH) - len = 0; - else -diff --git a/grub-core/lib/libgcrypt/mpi/mpicoder.c b/grub-core/lib/libgcrypt/mpi/mpicoder.c -index 7ecad27..6fe3891 100644 ---- a/grub-core/lib/libgcrypt/mpi/mpicoder.c -+++ b/grub-core/lib/libgcrypt/mpi/mpicoder.c -@@ -379,6 +379,9 @@ gcry_mpi_scan (struct gcry_mpi **ret_mpi, enum gcry_mpi_format format, - unsigned int len; - int secure = (buffer && gcry_is_secure (buffer)); - -+ if (!buffer) -+ return gcry_error (GPG_ERR_INV_ARG); -+ - if (format == GCRYMPI_FMT_SSH) - len = 0; - else --- -2.14.2 - diff --git a/buildroot/boot/grub2/0075-syslinux-Fix-memory-leak-while-parsing.patch b/buildroot/boot/grub2/0075-syslinux-Fix-memory-leak-while-parsing.patch deleted file mode 100644 index acc3034e76..0000000000 --- a/buildroot/boot/grub2/0075-syslinux-Fix-memory-leak-while-parsing.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 95bc016dba94cab3d398dd74160665915cd08ad6 Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Thu, 26 Nov 2020 15:31:53 +0000 -Subject: [PATCH] syslinux: Fix memory leak while parsing - -In syslinux_parse_real() the 2 points where return is being called -didn't release the memory stored in buf which is no longer required. - -Fixes: CID 176634 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/lib/syslinux_parse.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/grub-core/lib/syslinux_parse.c b/grub-core/lib/syslinux_parse.c -index 4afa992..3acc6b4 100644 ---- a/grub-core/lib/syslinux_parse.c -+++ b/grub-core/lib/syslinux_parse.c -@@ -737,7 +737,10 @@ syslinux_parse_real (struct syslinux_menu *menu) - && grub_strncasecmp ("help", ptr3, ptr4 - ptr3) == 0)) - { - if (helptext (ptr5, file, menu)) -- return 1; -+ { -+ grub_free (buf); -+ return 1; -+ } - continue; - } - -@@ -757,6 +760,7 @@ syslinux_parse_real (struct syslinux_menu *menu) - } - fail: - grub_file_close (file); -+ grub_free (buf); - return err; - } - --- -2.14.2 - diff --git a/buildroot/boot/grub2/0076-normal-completion-Fix-leaking-of-memory-when-process.patch b/buildroot/boot/grub2/0076-normal-completion-Fix-leaking-of-memory-when-process.patch deleted file mode 100644 index 52f01ab96e..0000000000 --- a/buildroot/boot/grub2/0076-normal-completion-Fix-leaking-of-memory-when-process.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 9213575b7a95b514bce80be5964a28d407d7d56d Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Fri, 4 Dec 2020 18:56:48 +0000 -Subject: [PATCH] normal/completion: Fix leaking of memory when processing a - completion - -It is possible for the code to reach the end of the function without -freeing the memory allocated to argv and argc still to be 0. - -We should always call grub_free(argv). The grub_free() will handle -a NULL argument correctly if it reaches that code without the memory -being allocated. - -Fixes: CID 96672 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/normal/completion.c | 10 ++++------ - 1 file changed, 4 insertions(+), 6 deletions(-) - -diff --git a/grub-core/normal/completion.c b/grub-core/normal/completion.c -index 5961028..46e473c 100644 ---- a/grub-core/normal/completion.c -+++ b/grub-core/normal/completion.c -@@ -400,8 +400,8 @@ char * - grub_normal_do_completion (char *buf, int *restore, - void (*hook) (const char *, grub_completion_type_t, int)) - { -- int argc; -- char **argv; -+ int argc = 0; -+ char **argv = NULL; - - /* Initialize variables. */ - match = 0; -@@ -516,10 +516,8 @@ grub_normal_do_completion (char *buf, int *restore, - - fail: - if (argc != 0) -- { -- grub_free (argv[0]); -- grub_free (argv); -- } -+ grub_free (argv[0]); -+ grub_free (argv); - grub_free (match); - grub_errno = GRUB_ERR_NONE; - --- -2.14.2 - diff --git a/buildroot/boot/grub2/0077-commands-hashsum-Fix-a-memory-leak.patch b/buildroot/boot/grub2/0077-commands-hashsum-Fix-a-memory-leak.patch deleted file mode 100644 index ce06c5502e..0000000000 --- a/buildroot/boot/grub2/0077-commands-hashsum-Fix-a-memory-leak.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 8b6f528e52e18b7a69f90b8dc3671d7b1147d9f3 Mon Sep 17 00:00:00 2001 -From: Chris Coulson -Date: Tue, 1 Dec 2020 23:41:24 +0000 -Subject: [PATCH] commands/hashsum: Fix a memory leak - -check_list() uses grub_file_getline(), which allocates a buffer. -If the hash list file contains invalid lines, the function leaks -this buffer when it returns an error. - -Fixes: CID 176635 - -Signed-off-by: Chris Coulson -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/commands/hashsum.c | 15 ++++++++++++--- - 1 file changed, 12 insertions(+), 3 deletions(-) - -diff --git a/grub-core/commands/hashsum.c b/grub-core/commands/hashsum.c -index 456ba90..b8a22b0 100644 ---- a/grub-core/commands/hashsum.c -+++ b/grub-core/commands/hashsum.c -@@ -128,11 +128,17 @@ check_list (const gcry_md_spec_t *hash, const char *hashfilename, - high = hextoval (*p++); - low = hextoval (*p++); - if (high < 0 || low < 0) -- return grub_error (GRUB_ERR_BAD_FILE_TYPE, "invalid hash list"); -+ { -+ grub_free (buf); -+ return grub_error (GRUB_ERR_BAD_FILE_TYPE, "invalid hash list"); -+ } - expected[i] = (high << 4) | low; - } - if ((p[0] != ' ' && p[0] != '\t') || (p[1] != ' ' && p[1] != '\t')) -- return grub_error (GRUB_ERR_BAD_FILE_TYPE, "invalid hash list"); -+ { -+ grub_free (buf); -+ return grub_error (GRUB_ERR_BAD_FILE_TYPE, "invalid hash list"); -+ } - p += 2; - if (prefix) - { -@@ -140,7 +146,10 @@ check_list (const gcry_md_spec_t *hash, const char *hashfilename, - - filename = grub_xasprintf ("%s/%s", prefix, p); - if (!filename) -- return grub_errno; -+ { -+ grub_free (buf); -+ return grub_errno; -+ } - file = grub_file_open (filename, GRUB_FILE_TYPE_TO_HASH - | (!uncompress ? GRUB_FILE_TYPE_NO_DECOMPRESS - : GRUB_FILE_TYPE_NONE)); --- -2.14.2 - diff --git a/buildroot/boot/grub2/0079-video-efi_gop-Remove-unnecessary-return-value-of-gru.patch b/buildroot/boot/grub2/0079-video-efi_gop-Remove-unnecessary-return-value-of-gru.patch deleted file mode 100644 index f45915933c..0000000000 --- a/buildroot/boot/grub2/0079-video-efi_gop-Remove-unnecessary-return-value-of-gru.patch +++ /dev/null @@ -1,95 +0,0 @@ -From fc5951d3b1616055ef81a019a5affc09d13344d0 Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Tue, 8 Dec 2020 21:14:31 +0000 -Subject: [PATCH] video/efi_gop: Remove unnecessary return value of - grub_video_gop_fill_mode_info() - -The return value of grub_video_gop_fill_mode_info() is never able to be -anything other than GRUB_ERR_NONE. So, rather than continue to return -a value and checking it each time, it is more correct to redefine the -function to not return anything and remove checks of its return value -altogether. - -Fixes: CID 96701 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/video/efi_gop.c | 25 ++++++------------------- - 1 file changed, 6 insertions(+), 19 deletions(-) - -diff --git a/grub-core/video/efi_gop.c b/grub-core/video/efi_gop.c -index 7f9d1c2..db2ee98 100644 ---- a/grub-core/video/efi_gop.c -+++ b/grub-core/video/efi_gop.c -@@ -227,7 +227,7 @@ grub_video_gop_fill_real_mode_info (unsigned mode, - return GRUB_ERR_NONE; - } - --static grub_err_t -+static void - grub_video_gop_fill_mode_info (unsigned mode, - struct grub_efi_gop_mode_info *in, - struct grub_video_mode_info *out) -@@ -252,8 +252,6 @@ grub_video_gop_fill_mode_info (unsigned mode, - out->blit_format = GRUB_VIDEO_BLIT_FORMAT_BGRA_8888; - out->mode_type |= (GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED - | GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP); -- -- return GRUB_ERR_NONE; - } - - static int -@@ -266,7 +264,6 @@ grub_video_gop_iterate (int (*hook) (const struct grub_video_mode_info *info, vo - grub_efi_uintn_t size; - grub_efi_status_t status; - struct grub_efi_gop_mode_info *info = NULL; -- grub_err_t err; - struct grub_video_mode_info mode_info; - - status = efi_call_4 (gop->query_mode, gop, mode, &size, &info); -@@ -277,12 +274,7 @@ grub_video_gop_iterate (int (*hook) (const struct grub_video_mode_info *info, vo - continue; - } - -- err = grub_video_gop_fill_mode_info (mode, info, &mode_info); -- if (err) -- { -- grub_errno = GRUB_ERR_NONE; -- continue; -- } -+ grub_video_gop_fill_mode_info (mode, info, &mode_info); - if (hook (&mode_info, hook_arg)) - return 1; - } -@@ -466,13 +458,8 @@ grub_video_gop_setup (unsigned int width, unsigned int height, - - info = gop->mode->info; - -- err = grub_video_gop_fill_mode_info (gop->mode->mode, info, -- &framebuffer.mode_info); -- if (err) -- { -- grub_dprintf ("video", "GOP: couldn't fill mode info\n"); -- return err; -- } -+ grub_video_gop_fill_mode_info (gop->mode->mode, info, -+ &framebuffer.mode_info); - - framebuffer.ptr = (void *) (grub_addr_t) gop->mode->fb_base; - framebuffer.offscreen -@@ -486,8 +473,8 @@ grub_video_gop_setup (unsigned int width, unsigned int height, - { - grub_dprintf ("video", "GOP: couldn't allocate shadow\n"); - grub_errno = 0; -- err = grub_video_gop_fill_mode_info (gop->mode->mode, info, -- &framebuffer.mode_info); -+ grub_video_gop_fill_mode_info (gop->mode->mode, info, -+ &framebuffer.mode_info); - buffer = framebuffer.ptr; - } - --- -2.14.2 - diff --git a/buildroot/boot/grub2/0080-video-fb-fbfill-Fix-potential-integer-overflow.patch b/buildroot/boot/grub2/0080-video-fb-fbfill-Fix-potential-integer-overflow.patch deleted file mode 100644 index ef0cb1d79e..0000000000 --- a/buildroot/boot/grub2/0080-video-fb-fbfill-Fix-potential-integer-overflow.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 7ce3259f67ac2cd93acb0ec0080c24b3b69e66c6 Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Wed, 4 Nov 2020 15:10:51 +0000 -Subject: [PATCH] video/fb/fbfill: Fix potential integer overflow - -The multiplication of 2 unsigned 32-bit integers may overflow before -promotion to unsigned 64-bit. We should ensure that the multiplication -is done with overflow detection. Additionally, use grub_sub() for -subtraction. - -Fixes: CID 73640, CID 73697, CID 73702, CID 73823 - -Signed-off-by: Darren Kenny -Signed-off-by: Marco A Benatto -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/video/fb/fbfill.c | 17 +++++++++++++---- - 1 file changed, 13 insertions(+), 4 deletions(-) - -diff --git a/grub-core/video/fb/fbfill.c b/grub-core/video/fb/fbfill.c -index 11816d0..a37acd1 100644 ---- a/grub-core/video/fb/fbfill.c -+++ b/grub-core/video/fb/fbfill.c -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - #include - - /* Generic filler that works for every supported mode. */ -@@ -61,7 +62,9 @@ grub_video_fbfill_direct32 (struct grub_video_fbblit_info *dst, - - /* Calculate the number of bytes to advance from the end of one line - to the beginning of the next line. */ -- rowskip = dst->mode_info->pitch - dst->mode_info->bytes_per_pixel * width; -+ if (grub_mul (dst->mode_info->bytes_per_pixel, width, &rowskip) || -+ grub_sub (dst->mode_info->pitch, rowskip, &rowskip)) -+ return; - - /* Get the start address. */ - dstptr = grub_video_fb_get_video_ptr (dst, x, y); -@@ -98,7 +101,9 @@ grub_video_fbfill_direct24 (struct grub_video_fbblit_info *dst, - #endif - /* Calculate the number of bytes to advance from the end of one line - to the beginning of the next line. */ -- rowskip = dst->mode_info->pitch - dst->mode_info->bytes_per_pixel * width; -+ if (grub_mul (dst->mode_info->bytes_per_pixel, width, &rowskip) || -+ grub_sub (dst->mode_info->pitch, rowskip, &rowskip)) -+ return; - - /* Get the start address. */ - dstptr = grub_video_fb_get_video_ptr (dst, x, y); -@@ -131,7 +136,9 @@ grub_video_fbfill_direct16 (struct grub_video_fbblit_info *dst, - - /* Calculate the number of bytes to advance from the end of one line - to the beginning of the next line. */ -- rowskip = (dst->mode_info->pitch - dst->mode_info->bytes_per_pixel * width); -+ if (grub_mul (dst->mode_info->bytes_per_pixel, width, &rowskip) || -+ grub_sub (dst->mode_info->pitch, rowskip, &rowskip)) -+ return; - - /* Get the start address. */ - dstptr = grub_video_fb_get_video_ptr (dst, x, y); -@@ -161,7 +168,9 @@ grub_video_fbfill_direct8 (struct grub_video_fbblit_info *dst, - - /* Calculate the number of bytes to advance from the end of one line - to the beginning of the next line. */ -- rowskip = dst->mode_info->pitch - dst->mode_info->bytes_per_pixel * width; -+ if (grub_mul (dst->mode_info->bytes_per_pixel, width, &rowskip) || -+ grub_sub (dst->mode_info->pitch, rowskip, &rowskip)) -+ return; - - /* Get the start address. */ - dstptr = grub_video_fb_get_video_ptr (dst, x, y); --- -2.14.2 - diff --git a/buildroot/boot/grub2/0081-video-fb-video_fb-Fix-multiple-integer-overflows.patch b/buildroot/boot/grub2/0081-video-fb-video_fb-Fix-multiple-integer-overflows.patch deleted file mode 100644 index cd75284c18..0000000000 --- a/buildroot/boot/grub2/0081-video-fb-video_fb-Fix-multiple-integer-overflows.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 08e098b1dbf01e96376f594b337491bc4cfa48dd Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Wed, 4 Nov 2020 14:43:44 +0000 -Subject: [PATCH] video/fb/video_fb: Fix multiple integer overflows - -The calculation of the unsigned 64-bit value is being generated by -multiplying 2, signed or unsigned, 32-bit integers which may overflow -before promotion to unsigned 64-bit. Fix all of them. - -Fixes: CID 73703, CID 73767, CID 73833 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/video/fb/video_fb.c | 52 ++++++++++++++++++++++++++++++------------- - 1 file changed, 36 insertions(+), 16 deletions(-) - -diff --git a/grub-core/video/fb/video_fb.c b/grub-core/video/fb/video_fb.c -index 1a602c8..1c9a138 100644 ---- a/grub-core/video/fb/video_fb.c -+++ b/grub-core/video/fb/video_fb.c -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - - GRUB_MOD_LICENSE ("GPLv3+"); - -@@ -1417,15 +1418,23 @@ doublebuf_blit_update_screen (void) - { - if (framebuffer.current_dirty.first_line - <= framebuffer.current_dirty.last_line) -- grub_memcpy ((char *) framebuffer.pages[0] -- + framebuffer.current_dirty.first_line -- * framebuffer.back_target->mode_info.pitch, -- (char *) framebuffer.back_target->data -- + framebuffer.current_dirty.first_line -- * framebuffer.back_target->mode_info.pitch, -- framebuffer.back_target->mode_info.pitch -- * (framebuffer.current_dirty.last_line -- - framebuffer.current_dirty.first_line)); -+ { -+ grub_size_t copy_size; -+ -+ if (grub_sub (framebuffer.current_dirty.last_line, -+ framebuffer.current_dirty.first_line, ©_size) || -+ grub_mul (framebuffer.back_target->mode_info.pitch, copy_size, ©_size)) -+ { -+ /* Shouldn't happen, but if it does we've a bug. */ -+ return GRUB_ERR_BUG; -+ } -+ -+ grub_memcpy ((char *) framebuffer.pages[0] + framebuffer.current_dirty.first_line * -+ framebuffer.back_target->mode_info.pitch, -+ (char *) framebuffer.back_target->data + framebuffer.current_dirty.first_line * -+ framebuffer.back_target->mode_info.pitch, -+ copy_size); -+ } - framebuffer.current_dirty.first_line - = framebuffer.back_target->mode_info.height; - framebuffer.current_dirty.last_line = 0; -@@ -1439,7 +1448,7 @@ grub_video_fb_doublebuf_blit_init (struct grub_video_fbrender_target **back, - volatile void *framebuf) - { - grub_err_t err; -- grub_size_t page_size = mode_info.pitch * mode_info.height; -+ grub_size_t page_size = (grub_size_t) mode_info.pitch * mode_info.height; - - framebuffer.offscreen_buffer = grub_zalloc (page_size); - if (! framebuffer.offscreen_buffer) -@@ -1482,12 +1491,23 @@ doublebuf_pageflipping_update_screen (void) - last_line = framebuffer.previous_dirty.last_line; - - if (first_line <= last_line) -- grub_memcpy ((char *) framebuffer.pages[framebuffer.render_page] -- + first_line * framebuffer.back_target->mode_info.pitch, -- (char *) framebuffer.back_target->data -- + first_line * framebuffer.back_target->mode_info.pitch, -- framebuffer.back_target->mode_info.pitch -- * (last_line - first_line)); -+ { -+ grub_size_t copy_size; -+ -+ if (grub_sub (last_line, first_line, ©_size) || -+ grub_mul (framebuffer.back_target->mode_info.pitch, copy_size, ©_size)) -+ { -+ /* Shouldn't happen, but if it does we've a bug. */ -+ return GRUB_ERR_BUG; -+ } -+ -+ grub_memcpy ((char *) framebuffer.pages[framebuffer.render_page] + first_line * -+ framebuffer.back_target->mode_info.pitch, -+ (char *) framebuffer.back_target->data + first_line * -+ framebuffer.back_target->mode_info.pitch, -+ copy_size); -+ } -+ - framebuffer.previous_dirty = framebuffer.current_dirty; - framebuffer.current_dirty.first_line - = framebuffer.back_target->mode_info.height; --- -2.14.2 - diff --git a/buildroot/boot/grub2/0082-video-fb-video_fb-Fix-possible-integer-overflow.patch b/buildroot/boot/grub2/0082-video-fb-video_fb-Fix-possible-integer-overflow.patch deleted file mode 100644 index 3b4bc2271c..0000000000 --- a/buildroot/boot/grub2/0082-video-fb-video_fb-Fix-possible-integer-overflow.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 08413f2f4edec0e2d9bf15f836f6ee5ca2e379cb Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Fri, 4 Dec 2020 14:51:30 +0000 -Subject: [PATCH] video/fb/video_fb: Fix possible integer overflow - -It is minimal possibility that the values being used here will overflow. -So, change the code to use the safemath function grub_mul() to ensure -that doesn't happen. - -Fixes: CID 73761 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/video/fb/video_fb.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/grub-core/video/fb/video_fb.c b/grub-core/video/fb/video_fb.c -index 1c9a138..ae6b89f 100644 ---- a/grub-core/video/fb/video_fb.c -+++ b/grub-core/video/fb/video_fb.c -@@ -1537,7 +1537,13 @@ doublebuf_pageflipping_init (struct grub_video_mode_info *mode_info, - volatile void *page1_ptr) - { - grub_err_t err; -- grub_size_t page_size = mode_info->pitch * mode_info->height; -+ grub_size_t page_size = 0; -+ -+ if (grub_mul (mode_info->pitch, mode_info->height, &page_size)) -+ { -+ /* Shouldn't happen, but if it does we've a bug. */ -+ return GRUB_ERR_BUG; -+ } - - framebuffer.offscreen_buffer = grub_malloc (page_size); - if (! framebuffer.offscreen_buffer) --- -2.14.2 - diff --git a/buildroot/boot/grub2/0083-video-readers-jpeg-Test-for-an-invalid-next-marker-r.patch b/buildroot/boot/grub2/0083-video-readers-jpeg-Test-for-an-invalid-next-marker-r.patch deleted file mode 100644 index 12aba3647d..0000000000 --- a/buildroot/boot/grub2/0083-video-readers-jpeg-Test-for-an-invalid-next-marker-r.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 5f5eb7ca8e971227e95745abe541df3e1509360e Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Fri, 4 Dec 2020 15:39:00 +0000 -Subject: [PATCH] video/readers/jpeg: Test for an invalid next marker reference - from a jpeg file - -While it may never happen, and potentially could be caught at the end of -the function, it is worth checking up front for a bad reference to the -next marker just in case of a maliciously crafted file being provided. - -Fixes: CID 73694 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/video/readers/jpeg.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/grub-core/video/readers/jpeg.c b/grub-core/video/readers/jpeg.c -index 31359a4..0b6ce3c 100644 ---- a/grub-core/video/readers/jpeg.c -+++ b/grub-core/video/readers/jpeg.c -@@ -253,6 +253,12 @@ grub_jpeg_decode_quan_table (struct grub_jpeg_data *data) - next_marker = data->file->offset; - next_marker += grub_jpeg_get_word (data); - -+ if (next_marker > data->file->size) -+ { -+ /* Should never be set beyond the size of the file. */ -+ return grub_error (GRUB_ERR_BAD_FILE_TYPE, "jpeg: invalid next reference"); -+ } -+ - while (data->file->offset + sizeof (data->quan_table[id]) + 1 - <= next_marker) - { --- -2.14.2 - diff --git a/buildroot/boot/grub2/0084-gfxmenu-gui_list-Remove-code-that-coverity-is-flaggi.patch b/buildroot/boot/grub2/0084-gfxmenu-gui_list-Remove-code-that-coverity-is-flaggi.patch deleted file mode 100644 index 73fcd7806a..0000000000 --- a/buildroot/boot/grub2/0084-gfxmenu-gui_list-Remove-code-that-coverity-is-flaggi.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 4a1aa5917595650efbd46b581368c470ebee42ab Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Mon, 7 Dec 2020 14:44:47 +0000 -Subject: [PATCH] gfxmenu/gui_list: Remove code that coverity is flagging as - dead - -The test of value for NULL before calling grub_strdup() is not required, -since the if condition prior to this has already tested for value being -NULL and cannot reach this code if it is. - -Fixes: CID 73659 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/gfxmenu/gui_list.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/grub-core/gfxmenu/gui_list.c b/grub-core/gfxmenu/gui_list.c -index 01477cd..df334a6 100644 ---- a/grub-core/gfxmenu/gui_list.c -+++ b/grub-core/gfxmenu/gui_list.c -@@ -771,7 +771,7 @@ list_set_property (void *vself, const char *name, const char *value) - { - self->need_to_recreate_boxes = 1; - grub_free (self->selected_item_box_pattern); -- self->selected_item_box_pattern = value ? grub_strdup (value) : 0; -+ self->selected_item_box_pattern = grub_strdup (value); - self->selected_item_box_pattern_inherit = 0; - } - } --- -2.14.2 - diff --git a/buildroot/boot/grub2/0085-loader-bsd-Check-for-NULL-arg-up-front.patch b/buildroot/boot/grub2/0085-loader-bsd-Check-for-NULL-arg-up-front.patch deleted file mode 100644 index c370457595..0000000000 --- a/buildroot/boot/grub2/0085-loader-bsd-Check-for-NULL-arg-up-front.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 5d5391b0a05abe76e04c1eb68dcc6cbef5326c4a Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Tue, 8 Dec 2020 21:47:13 +0000 -Subject: [PATCH] loader/bsd: Check for NULL arg up-front - -The code in the next block suggests that it is possible for .set to be -true but .arg may still be NULL. - -This code assumes that it is never NULL, yet later is testing if it is -NULL - that is inconsistent. - -So we should check first if .arg is not NULL, and remove this check that -is being flagged by Coverity since it is no longer required. - -Fixes: CID 292471 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/loader/i386/bsd.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c -index b92cbe9..8432283 100644 ---- a/grub-core/loader/i386/bsd.c -+++ b/grub-core/loader/i386/bsd.c -@@ -1605,7 +1605,7 @@ grub_cmd_openbsd (grub_extcmd_context_t ctxt, int argc, char *argv[]) - kernel_type = KERNEL_TYPE_OPENBSD; - bootflags = grub_bsd_parse_flags (ctxt->state, openbsd_flags); - -- if (ctxt->state[OPENBSD_ROOT_ARG].set) -+ if (ctxt->state[OPENBSD_ROOT_ARG].set && ctxt->state[OPENBSD_ROOT_ARG].arg != NULL) - { - const char *arg = ctxt->state[OPENBSD_ROOT_ARG].arg; - unsigned type, unit, part; -@@ -1622,7 +1622,7 @@ grub_cmd_openbsd (grub_extcmd_context_t ctxt, int argc, char *argv[]) - "unknown disk type name"); - - unit = grub_strtoul (arg, (char **) &arg, 10); -- if (! (arg && *arg >= 'a' && *arg <= 'z')) -+ if (! (*arg >= 'a' && *arg <= 'z')) - return grub_error (GRUB_ERR_BAD_ARGUMENT, - "only device specifications of form " - " are supported"); --- -2.14.2 - diff --git a/buildroot/boot/grub2/0086-loader-xnu-Fix-memory-leak.patch b/buildroot/boot/grub2/0086-loader-xnu-Fix-memory-leak.patch deleted file mode 100644 index aae6774cf6..0000000000 --- a/buildroot/boot/grub2/0086-loader-xnu-Fix-memory-leak.patch +++ /dev/null @@ -1,39 +0,0 @@ -From bcb59ece3263d118510c4440c4da0950f224bb7f Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Thu, 26 Nov 2020 12:53:10 +0000 -Subject: [PATCH] loader/xnu: Fix memory leak - -The code here is finished with the memory stored in name, but it only -frees it if there curvalue is valid, while it could actually free it -regardless. - -The fix is a simple relocation of the grub_free() to before the test -of curvalue. - -Fixes: CID 96646 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/loader/xnu.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c -index 44fd5a9..eb14462 100644 ---- a/grub-core/loader/xnu.c -+++ b/grub-core/loader/xnu.c -@@ -1391,9 +1391,9 @@ grub_xnu_fill_devicetree (void) - name[len] = 0; - - curvalue = grub_xnu_create_value (curkey, name); -+ grub_free (name); - if (!curvalue) - return grub_errno; -- grub_free (name); - - data = grub_malloc (grub_strlen (var->value) + 1); - if (!data) --- -2.14.2 - diff --git a/buildroot/boot/grub2/0087-loader-xnu-Free-driverkey-data-when-an-error-is-dete.patch b/buildroot/boot/grub2/0087-loader-xnu-Free-driverkey-data-when-an-error-is-dete.patch deleted file mode 100644 index 6388c5cfc0..0000000000 --- a/buildroot/boot/grub2/0087-loader-xnu-Free-driverkey-data-when-an-error-is-dete.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 4b4027b6b1c877d7ab467896b04c7bd1aadcfa15 Mon Sep 17 00:00:00 2001 -From: Marco A Benatto -Date: Mon, 30 Nov 2020 12:18:24 -0300 -Subject: [PATCH] loader/xnu: Free driverkey data when an error is detected in - grub_xnu_writetree_toheap() - -... to avoid memory leaks. - -Fixes: CID 96640 - -Signed-off-by: Marco A Benatto -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/loader/xnu.c | 24 ++++++++++++++++++++---- - 1 file changed, 20 insertions(+), 4 deletions(-) - -diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c -index eb14462..1a590db 100644 ---- a/grub-core/loader/xnu.c -+++ b/grub-core/loader/xnu.c -@@ -227,26 +227,33 @@ grub_xnu_writetree_toheap (grub_addr_t *target, grub_size_t *size) - if (! memorymap) - return grub_errno; - -- driverkey = (struct grub_xnu_devtree_key *) grub_malloc (sizeof (*driverkey)); -+ driverkey = (struct grub_xnu_devtree_key *) grub_zalloc (sizeof (*driverkey)); - if (! driverkey) - return grub_errno; - driverkey->name = grub_strdup ("DeviceTree"); - if (! driverkey->name) -- return grub_errno; -+ { -+ err = grub_errno; -+ goto fail; -+ } -+ - driverkey->datasize = sizeof (*extdesc); - driverkey->next = memorymap->first_child; - memorymap->first_child = driverkey; - driverkey->data = extdesc - = (struct grub_xnu_extdesc *) grub_malloc (sizeof (*extdesc)); - if (! driverkey->data) -- return grub_errno; -+ { -+ err = grub_errno; -+ goto fail; -+ } - - /* Allocate the space based on the size with dummy value. */ - *size = grub_xnu_writetree_get_size (grub_xnu_devtree_root, "/"); - err = grub_xnu_heap_malloc (ALIGN_UP (*size + 1, GRUB_XNU_PAGESIZE), - &src, target); - if (err) -- return err; -+ goto fail; - - /* Put real data in the dummy. */ - extdesc->addr = *target; -@@ -255,6 +262,15 @@ grub_xnu_writetree_toheap (grub_addr_t *target, grub_size_t *size) - /* Write the tree to heap. */ - grub_xnu_writetree_toheap_real (src, grub_xnu_devtree_root, "/"); - return GRUB_ERR_NONE; -+ -+ fail: -+ memorymap->first_child = NULL; -+ -+ grub_free (driverkey->data); -+ grub_free (driverkey->name); -+ grub_free (driverkey); -+ -+ return err; - } - - /* Find a key or value in parent key. */ --- -2.14.2 - diff --git a/buildroot/boot/grub2/0088-loader-xnu-Check-if-pointer-is-NULL-before-using-it.patch b/buildroot/boot/grub2/0088-loader-xnu-Check-if-pointer-is-NULL-before-using-it.patch deleted file mode 100644 index c26c26441e..0000000000 --- a/buildroot/boot/grub2/0088-loader-xnu-Check-if-pointer-is-NULL-before-using-it.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 7c8a2b5d1421a0f2a33d33531f7561f3da93b844 Mon Sep 17 00:00:00 2001 -From: Paulo Flabiano Smorigo -Date: Mon, 30 Nov 2020 10:36:00 -0300 -Subject: [PATCH] loader/xnu: Check if pointer is NULL before using it - -Fixes: CID 73654 - -Signed-off-by: Paulo Flabiano Smorigo -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/loader/xnu.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c -index 1a590db..1c0cf6a 100644 ---- a/grub-core/loader/xnu.c -+++ b/grub-core/loader/xnu.c -@@ -670,6 +670,9 @@ grub_xnu_load_driver (char *infoplistname, grub_file_t binaryfile, - char *name, *nameend; - int namelen; - -+ if (infoplistname == NULL) -+ return grub_error (GRUB_ERR_BAD_FILENAME, N_("missing p-list filename")); -+ - name = get_name_ptr (infoplistname); - nameend = grub_strchr (name, '/'); - -@@ -701,10 +704,7 @@ grub_xnu_load_driver (char *infoplistname, grub_file_t binaryfile, - else - macho = 0; - -- if (infoplistname) -- infoplist = grub_file_open (infoplistname, GRUB_FILE_TYPE_XNU_INFO_PLIST); -- else -- infoplist = 0; -+ infoplist = grub_file_open (infoplistname, GRUB_FILE_TYPE_XNU_INFO_PLIST); - grub_errno = GRUB_ERR_NONE; - if (infoplist) - { --- -2.14.2 - diff --git a/buildroot/boot/grub2/0089-util-grub-install-Fix-NULL-pointer-dereferences.patch b/buildroot/boot/grub2/0089-util-grub-install-Fix-NULL-pointer-dereferences.patch deleted file mode 100644 index f9c3f5d686..0000000000 --- a/buildroot/boot/grub2/0089-util-grub-install-Fix-NULL-pointer-dereferences.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 8b3a95655b4391122e7b0315d8cc6f876caf8183 Mon Sep 17 00:00:00 2001 -From: Daniel Kiper -Date: Thu, 25 Feb 2021 18:35:01 +0100 -Subject: [PATCH] util/grub-install: Fix NULL pointer dereferences - -Two grub_device_open() calls does not have associated NULL checks -for returned values. Fix that and appease the Coverity. - -Fixes: CID 314583 - -Signed-off-by: Daniel Kiper -Reviewed-by: Javier Martinez Canillas -Signed-off-by: Stefan Sørensen ---- - util/grub-install.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/util/grub-install.c b/util/grub-install.c -index a82725f..367350f 100644 ---- a/util/grub-install.c -+++ b/util/grub-install.c -@@ -1775,6 +1775,8 @@ main (int argc, char *argv[]) - fill_core_services (core_services); - - ins_dev = grub_device_open (install_drive); -+ if (ins_dev == NULL) -+ grub_util_error ("%s", grub_errmsg); - - bless (ins_dev, core_services, 0); - -@@ -1875,6 +1877,8 @@ main (int argc, char *argv[]) - fill_core_services(core_services); - - ins_dev = grub_device_open (install_drive); -+ if (ins_dev == NULL) -+ grub_util_error ("%s", grub_errmsg); - - bless (ins_dev, boot_efi, 1); - if (!removable && update_nvram) --- -2.14.2 - diff --git a/buildroot/boot/grub2/0090-util-grub-editenv-Fix-incorrect-casting-of-a-signed-.patch b/buildroot/boot/grub2/0090-util-grub-editenv-Fix-incorrect-casting-of-a-signed-.patch deleted file mode 100644 index 4420152a85..0000000000 --- a/buildroot/boot/grub2/0090-util-grub-editenv-Fix-incorrect-casting-of-a-signed-.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 5dc41edc4eba259c6043ae7698c245ec1baaacc6 Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Thu, 5 Nov 2020 14:33:50 +0000 -Subject: [PATCH] util/grub-editenv: Fix incorrect casting of a signed value - -The return value of ftell() may be negative (-1) on error. While it is -probably unlikely to occur, we should not blindly cast to an unsigned -value without first testing that it is not negative. - -Fixes: CID 73856 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - util/grub-editenv.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/util/grub-editenv.c b/util/grub-editenv.c -index f3662c9..db6f187 100644 ---- a/util/grub-editenv.c -+++ b/util/grub-editenv.c -@@ -125,6 +125,7 @@ open_envblk_file (const char *name) - { - FILE *fp; - char *buf; -+ long loc; - size_t size; - grub_envblk_t envblk; - -@@ -143,7 +144,12 @@ open_envblk_file (const char *name) - grub_util_error (_("cannot seek `%s': %s"), name, - strerror (errno)); - -- size = (size_t) ftell (fp); -+ loc = ftell (fp); -+ if (loc < 0) -+ grub_util_error (_("cannot get file location `%s': %s"), name, -+ strerror (errno)); -+ -+ size = (size_t) loc; - - if (fseek (fp, 0, SEEK_SET) < 0) - grub_util_error (_("cannot seek `%s': %s"), name, --- -2.14.2 - diff --git a/buildroot/boot/grub2/0091-util-glue-efi-Fix-incorrect-use-of-a-possibly-negati.patch b/buildroot/boot/grub2/0091-util-glue-efi-Fix-incorrect-use-of-a-possibly-negati.patch deleted file mode 100644 index 6acc37189f..0000000000 --- a/buildroot/boot/grub2/0091-util-glue-efi-Fix-incorrect-use-of-a-possibly-negati.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 1641d74e16f9d1ca35ba1a87ee4a0bf3afa48e72 Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Fri, 4 Dec 2020 15:04:28 +0000 -Subject: [PATCH] util/glue-efi: Fix incorrect use of a possibly negative value - -It is possible for the ftell() function to return a negative value, -although it is fairly unlikely here, we should be checking for -a negative value before we assign it to an unsigned value. - -Fixes: CID 73744 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - util/glue-efi.c | 14 ++++++++++++-- - 1 file changed, 12 insertions(+), 2 deletions(-) - -diff --git a/util/glue-efi.c b/util/glue-efi.c -index 68f5316..de0fa6d 100644 ---- a/util/glue-efi.c -+++ b/util/glue-efi.c -@@ -39,13 +39,23 @@ write_fat (FILE *in32, FILE *in64, FILE *out, const char *out_filename, - struct grub_macho_fat_header head; - struct grub_macho_fat_arch arch32, arch64; - grub_uint32_t size32, size64; -+ long size; - char *buf; - - fseek (in32, 0, SEEK_END); -- size32 = ftell (in32); -+ size = ftell (in32); -+ if (size < 0) -+ grub_util_error ("cannot get end of input file '%s': %s", -+ name32, strerror (errno)); -+ size32 = (grub_uint32_t) size; - fseek (in32, 0, SEEK_SET); -+ - fseek (in64, 0, SEEK_END); -- size64 = ftell (in64); -+ size = ftell (in64); -+ if (size < 0) -+ grub_util_error ("cannot get end of input file '%s': %s", -+ name64, strerror (errno)); -+ size64 = (grub_uint64_t) size; - fseek (in64, 0, SEEK_SET); - - head.magic = grub_cpu_to_le32_compile_time (GRUB_MACHO_FAT_EFI_MAGIC); --- -2.14.2 - diff --git a/buildroot/boot/grub2/0092-script-execute-Fix-NULL-dereference-in-grub_script_e.patch b/buildroot/boot/grub2/0092-script-execute-Fix-NULL-dereference-in-grub_script_e.patch deleted file mode 100644 index 028e587952..0000000000 --- a/buildroot/boot/grub2/0092-script-execute-Fix-NULL-dereference-in-grub_script_e.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 41ae93b2e6c75453514629bcfe684300e3aec0ce Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Fri, 3 Apr 2020 23:05:13 +1100 -Subject: [PATCH] script/execute: Fix NULL dereference in - grub_script_execute_cmdline() - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/script/execute.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c -index 7e028e1..5ea2aef 100644 ---- a/grub-core/script/execute.c -+++ b/grub-core/script/execute.c -@@ -940,7 +940,7 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd) - struct grub_script_argv argv = { 0, 0, 0 }; - - /* Lookup the command. */ -- if (grub_script_arglist_to_argv (cmdline->arglist, &argv) || ! argv.args[0]) -+ if (grub_script_arglist_to_argv (cmdline->arglist, &argv) || ! argv.args || ! argv.args[0]) - return grub_errno; - - for (i = 0; i < argv.argc; i++) --- -2.14.2 - diff --git a/buildroot/boot/grub2/0093-commands-ls-Require-device_name-is-not-NULL-before-p.patch b/buildroot/boot/grub2/0093-commands-ls-Require-device_name-is-not-NULL-before-p.patch deleted file mode 100644 index 58b61fd636..0000000000 --- a/buildroot/boot/grub2/0093-commands-ls-Require-device_name-is-not-NULL-before-p.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 6afbe6063c95b827372f9ec310c9fc7461311eb1 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Mon, 11 Jan 2021 16:57:37 +1100 -Subject: [PATCH] commands/ls: Require device_name is not NULL before printing - -This can be triggered with: - ls -l (0 0*) -and causes a NULL deref in grub_normal_print_device_info(). - -I'm not sure if there's any implication with the IEEE 1275 platform. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/commands/ls.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/grub-core/commands/ls.c b/grub-core/commands/ls.c -index 5b7491a..326d2d6 100644 ---- a/grub-core/commands/ls.c -+++ b/grub-core/commands/ls.c -@@ -196,7 +196,7 @@ grub_ls_list_files (char *dirname, int longlist, int all, int human) - goto fail; - } - -- if (! *path) -+ if (! *path && device_name) - { - if (grub_errno == GRUB_ERR_UNKNOWN_FS) - grub_errno = GRUB_ERR_NONE; --- -2.14.2 - diff --git a/buildroot/boot/grub2/0094-script-execute-Avoid-crash-when-using-outside-a-func.patch b/buildroot/boot/grub2/0094-script-execute-Avoid-crash-when-using-outside-a-func.patch deleted file mode 100644 index a37390890f..0000000000 --- a/buildroot/boot/grub2/0094-script-execute-Avoid-crash-when-using-outside-a-func.patch +++ /dev/null @@ -1,38 +0,0 @@ -From fe0586347ee46f927ae27bb9673532da9f5dead5 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Mon, 11 Jan 2021 17:30:42 +1100 -Subject: [PATCH] script/execute: Avoid crash when using "$#" outside a - function scope - -"$#" represents the number of arguments to a function. It is only -defined in a function scope, where "scope" is non-NULL. Currently, -if we attempt to evaluate "$#" outside a function scope, "scope" will -be NULL and we will crash with a NULL pointer dereference. - -Do not attempt to count arguments for "$#" if "scope" is NULL. This -will result in "$#" being interpreted as an empty string if evaluated -outside a function scope. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/script/execute.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c -index 5ea2aef..23d34bd 100644 ---- a/grub-core/script/execute.c -+++ b/grub-core/script/execute.c -@@ -485,7 +485,7 @@ gettext_putvar (const char *str, grub_size_t len, - return 0; - - /* Enough for any number. */ -- if (len == 1 && str[0] == '#') -+ if (len == 1 && str[0] == '#' && scope != NULL) - { - grub_snprintf (*ptr, 30, "%u", scope->argv.argc); - *ptr += grub_strlen (*ptr); --- -2.14.2 - diff --git a/buildroot/boot/grub2/0095-lib-arg-Block-repeated-short-options-that-require-an.patch b/buildroot/boot/grub2/0095-lib-arg-Block-repeated-short-options-that-require-an.patch deleted file mode 100644 index 0338502a23..0000000000 --- a/buildroot/boot/grub2/0095-lib-arg-Block-repeated-short-options-that-require-an.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 2a330dba93ff11bc00eda76e9419bc52b0c7ead6 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Fri, 22 Jan 2021 16:07:29 +1100 -Subject: [PATCH] lib/arg: Block repeated short options that require an - argument - -Fuzzing found the following crash: - - search -hhhhhhhhhhhhhf - -We didn't allocate enough option space for 13 hints because the -allocation code counts the number of discrete arguments (i.e. argc). -However, the shortopt parsing code will happily keep processing -a combination of short options without checking if those short -options require an argument. This means you can easily end writing -past the allocated option space. - -This fixes a OOB write which can cause heap corruption. - -Fixes: CVE-2021-20225 - -Reported-by: Daniel Axtens -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/lib/arg.c | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - -diff --git a/grub-core/lib/arg.c b/grub-core/lib/arg.c -index 3288609..537c5e9 100644 ---- a/grub-core/lib/arg.c -+++ b/grub-core/lib/arg.c -@@ -299,6 +299,19 @@ grub_arg_parse (grub_extcmd_t cmd, int argc, char **argv, - it can have an argument value. */ - if (*curshort) - { -+ /* -+ * Only permit further short opts if this one doesn't -+ * require a value. -+ */ -+ if (opt->type != ARG_TYPE_NONE && -+ !(opt->flags & GRUB_ARG_OPTION_OPTIONAL)) -+ { -+ grub_error (GRUB_ERR_BAD_ARGUMENT, -+ N_("missing mandatory option for `%s'"), -+ opt->longarg); -+ goto fail; -+ } -+ - if (parse_option (cmd, opt, 0, usr) || grub_errno) - goto fail; - } --- -2.14.2 - diff --git a/buildroot/boot/grub2/0096-script-execute-Don-t-crash-on-a-for-loop-with-no-ite.patch b/buildroot/boot/grub2/0096-script-execute-Don-t-crash-on-a-for-loop-with-no-ite.patch deleted file mode 100644 index 4f543c5e22..0000000000 --- a/buildroot/boot/grub2/0096-script-execute-Don-t-crash-on-a-for-loop-with-no-ite.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 0a05f88e2bb33ed2a0cfd93f481f471efb7791aa Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Fri, 22 Jan 2021 16:18:26 +1100 -Subject: [PATCH] script/execute: Don't crash on a "for" loop with no items - -The following crashes the parser: - - for x in; do - 0 - done - -This is because grub_script_arglist_to_argv() doesn't consider the -possibility that arglist is NULL. Catch that explicitly. - -This avoids a NULL pointer dereference. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/script/execute.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c -index 23d34bd..31dac25 100644 ---- a/grub-core/script/execute.c -+++ b/grub-core/script/execute.c -@@ -624,6 +624,9 @@ grub_script_arglist_to_argv (struct grub_script_arglist *arglist, - struct grub_script_arg *arg = 0; - struct grub_script_argv result = { 0, 0, 0 }; - -+ if (arglist == NULL) -+ return 1; -+ - for (; arglist && arglist->arg; arglist = arglist->next) - { - if (grub_script_argv_next (&result)) --- -2.14.2 - diff --git a/buildroot/boot/grub2/0097-commands-menuentry-Fix-quoting-in-setparams_prefix.patch b/buildroot/boot/grub2/0097-commands-menuentry-Fix-quoting-in-setparams_prefix.patch deleted file mode 100644 index 23818d4eb4..0000000000 --- a/buildroot/boot/grub2/0097-commands-menuentry-Fix-quoting-in-setparams_prefix.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 2f533a89a8dfcacbf2c9dbc77d910f111f24bf33 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Fri, 22 Jan 2021 17:10:48 +1100 -Subject: [PATCH] commands/menuentry: Fix quoting in setparams_prefix() - -Commit 9acdcbf32542 (use single quotes in menuentry setparams command) -says that expressing a quoted single quote will require 3 characters. It -actually requires (and always did require!) 4 characters: - - str: a'b => a'\''b - len: 3 => 6 (2 for the letters + 4 for the quote) - -This leads to not allocating enough memory and thus out of bounds writes -that have been observed to cause heap corruption. - -Allocate 4 bytes for each single quote. - -Commit 22e7dbb2bb81 (Fix quoting in legacy parser.) does the same -quoting, but it adds 3 as extra overhead on top of the single byte that -the quote already needs. So it's correct. - -Fixes: 9acdcbf32542 (use single quotes in menuentry setparams command) -Fixes: CVE-2021-20233 - -Reported-by: Daniel Axtens -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/commands/menuentry.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/grub-core/commands/menuentry.c b/grub-core/commands/menuentry.c -index 9164df7..720e6d8 100644 ---- a/grub-core/commands/menuentry.c -+++ b/grub-core/commands/menuentry.c -@@ -230,7 +230,7 @@ setparams_prefix (int argc, char **args) - len += 3; /* 3 = 1 space + 2 quotes */ - p = args[i]; - while (*p) -- len += (*p++ == '\'' ? 3 : 1); -+ len += (*p++ == '\'' ? 4 : 1); - } - - result = grub_malloc (len + 2); --- -2.14.2 - diff --git a/buildroot/boot/grub2/0098-kern-misc-Always-set-end-in-grub_strtoull.patch b/buildroot/boot/grub2/0098-kern-misc-Always-set-end-in-grub_strtoull.patch deleted file mode 100644 index 838804a82d..0000000000 --- a/buildroot/boot/grub2/0098-kern-misc-Always-set-end-in-grub_strtoull.patch +++ /dev/null @@ -1,47 +0,0 @@ -From f41f0af48ab7f7c135aac17ac862c30bde0bbab7 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Wed, 13 Jan 2021 22:19:01 +1100 -Subject: [PATCH] kern/misc: Always set *end in grub_strtoull() - -Currently, if there is an error in grub_strtoull(), *end is not set. -This differs from the usual behavior of strtoull(), and also means that -some callers may use an uninitialized value for *end. - -Set *end unconditionally. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/kern/misc.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c -index a7abd36..b02693b 100644 ---- a/grub-core/kern/misc.c -+++ b/grub-core/kern/misc.c -@@ -406,6 +406,10 @@ grub_strtoull (const char *str, char **end, int base) - { - grub_error (GRUB_ERR_OUT_OF_RANGE, - N_("overflow is detected")); -+ -+ if (end) -+ *end = (char *) str; -+ - return ~0ULL; - } - -@@ -417,6 +421,10 @@ grub_strtoull (const char *str, char **end, int base) - { - grub_error (GRUB_ERR_BAD_NUMBER, - N_("unrecognized number")); -+ -+ if (end) -+ *end = (char *) str; -+ - return 0; - } - --- -2.14.2 - diff --git a/buildroot/boot/grub2/0099-video-readers-jpeg-Catch-files-with-unsupported-quan.patch b/buildroot/boot/grub2/0099-video-readers-jpeg-Catch-files-with-unsupported-quan.patch deleted file mode 100644 index d09f777186..0000000000 --- a/buildroot/boot/grub2/0099-video-readers-jpeg-Catch-files-with-unsupported-quan.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 693989598fd38c3c0b2a928f4f64865b5681762f Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Fri, 15 Jan 2021 12:57:04 +1100 -Subject: [PATCH] video/readers/jpeg: Catch files with unsupported quantization - or Huffman tables - -Our decoder only supports 2 quantization tables. If a file asks for -a quantization table with index > 1, reject it. - -Similarly, our decoder only supports 4 Huffman tables. If a file asks -for a Huffman table with index > 3, reject it. - -This fixes some out of bounds reads. It's not clear what degree of control -over subsequent execution could be gained by someone who can carefully -set up the contents of memory before loading an invalid JPEG file. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/video/readers/jpeg.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/grub-core/video/readers/jpeg.c b/grub-core/video/readers/jpeg.c -index 0b6ce3c..23f919a 100644 ---- a/grub-core/video/readers/jpeg.c -+++ b/grub-core/video/readers/jpeg.c -@@ -333,7 +333,11 @@ grub_jpeg_decode_sof (struct grub_jpeg_data *data) - else if (ss != JPEG_SAMPLING_1x1) - return grub_error (GRUB_ERR_BAD_FILE_TYPE, - "jpeg: sampling method not supported"); -+ - data->comp_index[id][0] = grub_jpeg_get_byte (data); -+ if (data->comp_index[id][0] > 1) -+ return grub_error (GRUB_ERR_BAD_FILE_TYPE, -+ "jpeg: too many quantization tables"); - } - - if (data->file->offset != next_marker) -@@ -602,6 +606,10 @@ grub_jpeg_decode_sos (struct grub_jpeg_data *data) - ht = grub_jpeg_get_byte (data); - data->comp_index[id][1] = (ht >> 4); - data->comp_index[id][2] = (ht & 0xF) + 2; -+ -+ if ((data->comp_index[id][1] < 0) || (data->comp_index[id][1] > 3) || -+ (data->comp_index[id][2] < 0) || (data->comp_index[id][2] > 3)) -+ return grub_error (GRUB_ERR_BAD_FILE_TYPE, "jpeg: invalid hufftable index"); - } - - grub_jpeg_get_byte (data); /* Skip 3 unused bytes. */ --- -2.14.2 - diff --git a/buildroot/boot/grub2/0100-video-readers-jpeg-Catch-OOB-reads-writes-in-grub_jp.patch b/buildroot/boot/grub2/0100-video-readers-jpeg-Catch-OOB-reads-writes-in-grub_jp.patch deleted file mode 100644 index 9dabd97bd5..0000000000 --- a/buildroot/boot/grub2/0100-video-readers-jpeg-Catch-OOB-reads-writes-in-grub_jp.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 34b85a6e07014383ddcad09f99ff239ad752dd1a Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Fri, 15 Jan 2021 13:29:53 +1100 -Subject: [PATCH] video/readers/jpeg: Catch OOB reads/writes in - grub_jpeg_decode_du() - -The key line is: - - du[jpeg_zigzag_order[pos]] = val * (int) data->quan_table[qt][pos]; - -jpeg_zigzag_order is grub_uint8_t[64]. - -I don't understand JPEG decoders quite well enough to explain what's -going on here. However, I observe sometimes pos=64, which leads to an -OOB read of the jpeg_zigzag_order global then an OOB write to du. -That leads to various unpleasant memory corruption conditions. - -Catch where pos >= ARRAY_SIZE(jpeg_zigzag_order) and bail. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/video/readers/jpeg.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/grub-core/video/readers/jpeg.c b/grub-core/video/readers/jpeg.c -index 23f919a..e514812 100644 ---- a/grub-core/video/readers/jpeg.c -+++ b/grub-core/video/readers/jpeg.c -@@ -526,6 +526,14 @@ grub_jpeg_decode_du (struct grub_jpeg_data *data, int id, jpeg_data_unit_t du) - val = grub_jpeg_get_number (data, num & 0xF); - num >>= 4; - pos += num; -+ -+ if (pos >= ARRAY_SIZE (jpeg_zigzag_order)) -+ { -+ grub_error (GRUB_ERR_BAD_FILE_TYPE, -+ "jpeg: invalid position in zigzag order!?"); -+ return; -+ } -+ - du[jpeg_zigzag_order[pos]] = val * (int) data->quan_table[qt][pos]; - pos++; - } --- -2.14.2 - diff --git a/buildroot/boot/grub2/0101-video-readers-jpeg-Don-t-decode-data-before-start-of.patch b/buildroot/boot/grub2/0101-video-readers-jpeg-Don-t-decode-data-before-start-of.patch deleted file mode 100644 index 89d08303cb..0000000000 --- a/buildroot/boot/grub2/0101-video-readers-jpeg-Don-t-decode-data-before-start-of.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 8338a8238f08d9f3ae4c2ddfff0603eff80af9e2 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Fri, 15 Jan 2021 14:06:46 +1100 -Subject: [PATCH] video/readers/jpeg: Don't decode data before start of stream - -When a start of stream marker is encountered, we call grub_jpeg_decode_sos() -which allocates space for a bitmap. - -When a restart marker is encountered, we call grub_jpeg_decode_data() which -then fills in that bitmap. - -If we get a restart marker before the start of stream marker, we will -attempt to write to a bitmap_ptr that hasn't been allocated. Catch this -and bail out. This fixes an attempt to write to NULL. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/video/readers/jpeg.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/grub-core/video/readers/jpeg.c b/grub-core/video/readers/jpeg.c -index e514812..e31602f 100644 ---- a/grub-core/video/readers/jpeg.c -+++ b/grub-core/video/readers/jpeg.c -@@ -646,6 +646,10 @@ grub_jpeg_decode_data (struct grub_jpeg_data *data) - nr1 = (data->image_height + vb - 1) >> (3 + data->log_vs); - nc1 = (data->image_width + hb - 1) >> (3 + data->log_hs); - -+ if (data->bitmap_ptr == NULL) -+ return grub_error(GRUB_ERR_BAD_FILE_TYPE, -+ "jpeg: attempted to decode data before start of stream"); -+ - for (; data->r1 < nr1 && (!data->dri || rst); - data->r1++, data->bitmap_ptr += (vb * data->image_width - hb * nc1) * 3) - for (c1 = 0; c1 < nc1 && (!data->dri || rst); --- -2.14.2 - diff --git a/buildroot/boot/grub2/0102-term-gfxterm-Don-t-set-up-a-font-with-glyphs-that-ar.patch b/buildroot/boot/grub2/0102-term-gfxterm-Don-t-set-up-a-font-with-glyphs-that-ar.patch deleted file mode 100644 index fa818747c4..0000000000 --- a/buildroot/boot/grub2/0102-term-gfxterm-Don-t-set-up-a-font-with-glyphs-that-ar.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 829329bddb2c3e623270cc634cc9ab32e6455fe7 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Fri, 15 Jan 2021 20:03:20 +1100 -Subject: [PATCH] term/gfxterm: Don't set up a font with glyphs that are too - big - -Catch the case where we have a font so big that it causes the number of -rows or columns to be 0. Currently we continue and allocate a -virtual_screen.text_buffer of size 0. We then try to use that for glpyhs -and things go badly. - -On the emu platform, malloc() may give us a valid pointer, in which case -we'll access heap memory which we shouldn't. Alternatively, it may give us -NULL, in which case we'll crash. For other platforms, if I understand -grub_memalign() correctly, we will receive a valid but small allocation -that we will very likely later overrun. - -Prevent the creation of a virtual screen that isn't at least 40 cols -by 12 rows. This is arbitrary, but it seems that if your width or height -is half a standard 80x24 terminal, you're probably going to struggle to -read anything anyway. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/term/gfxterm.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/grub-core/term/gfxterm.c b/grub-core/term/gfxterm.c -index af7c090..b40fcce 100644 ---- a/grub-core/term/gfxterm.c -+++ b/grub-core/term/gfxterm.c -@@ -232,6 +232,15 @@ grub_virtual_screen_setup (unsigned int x, unsigned int y, - virtual_screen.columns = virtual_screen.width / virtual_screen.normal_char_width; - virtual_screen.rows = virtual_screen.height / virtual_screen.normal_char_height; - -+ /* -+ * There must be a minimum number of rows and columns for the screen to -+ * make sense. Arbitrarily pick half of 80x24. If either dimensions is 0 -+ * we would allocate 0 bytes for the text_buffer. -+ */ -+ if (virtual_screen.columns < 40 || virtual_screen.rows < 12) -+ return grub_error (GRUB_ERR_BAD_FONT, -+ "font: glyphs too large to fit on screen"); -+ - /* Allocate memory for text buffer. */ - virtual_screen.text_buffer = - (struct grub_colored_char *) grub_malloc (virtual_screen.columns --- -2.14.2 - diff --git a/buildroot/boot/grub2/0103-fs-fshelp-Catch-impermissibly-large-block-sizes-in-r.patch b/buildroot/boot/grub2/0103-fs-fshelp-Catch-impermissibly-large-block-sizes-in-r.patch deleted file mode 100644 index 00523ec80a..0000000000 --- a/buildroot/boot/grub2/0103-fs-fshelp-Catch-impermissibly-large-block-sizes-in-r.patch +++ /dev/null @@ -1,47 +0,0 @@ -From b5bc456f664bc301ab4cd5a17d3d23c6661c259e Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Mon, 18 Jan 2021 11:46:39 +1100 -Subject: [PATCH] fs/fshelp: Catch impermissibly large block sizes in read - helper - -A fuzzed HFS+ filesystem had log2blocksize = 22. This gave -log2blocksize + GRUB_DISK_SECTOR_BITS = 31. 1 << 31 = 0x80000000, -which is -1 as an int. This caused some wacky behavior later on in -the function, leading to out-of-bounds writes on the destination buffer. - -Catch log2blocksize + GRUB_DISK_SECTOR_BITS >= 31. We could be stricter, -but this is the minimum that will prevent integer size weirdness. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/fs/fshelp.c | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/grub-core/fs/fshelp.c b/grub-core/fs/fshelp.c -index 4c902ad..a2d0d29 100644 ---- a/grub-core/fs/fshelp.c -+++ b/grub-core/fs/fshelp.c -@@ -362,6 +362,18 @@ grub_fshelp_read_file (grub_disk_t disk, grub_fshelp_node_t node, - grub_disk_addr_t i, blockcnt; - int blocksize = 1 << (log2blocksize + GRUB_DISK_SECTOR_BITS); - -+ /* -+ * Catch blatantly invalid log2blocksize. We could be a lot stricter, but -+ * this is the most permissive we can be before we start to see integer -+ * overflow/underflow issues. -+ */ -+ if (log2blocksize + GRUB_DISK_SECTOR_BITS >= 31) -+ { -+ grub_error (GRUB_ERR_OUT_OF_RANGE, -+ N_("blocksize too large")); -+ return -1; -+ } -+ - if (pos > filesize) - { - grub_error (GRUB_ERR_OUT_OF_RANGE, --- -2.14.2 - diff --git a/buildroot/boot/grub2/0104-fs-hfsplus-Don-t-fetch-a-key-beyond-the-end-of-the-n.patch b/buildroot/boot/grub2/0104-fs-hfsplus-Don-t-fetch-a-key-beyond-the-end-of-the-n.patch deleted file mode 100644 index a8609a6705..0000000000 --- a/buildroot/boot/grub2/0104-fs-hfsplus-Don-t-fetch-a-key-beyond-the-end-of-the-n.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 58ea11d5b9ca0966bd9c68d8ba5240cf7dc3ba83 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Fri, 22 Jan 2021 18:13:56 +1100 -Subject: [PATCH] fs/hfsplus: Don't fetch a key beyond the end of the node - -Otherwise you get a wild pointer, leading to a bunch of invalid reads. -Check it falls inside the given node. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/fs/hfsplus.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/grub-core/fs/hfsplus.c b/grub-core/fs/hfsplus.c -index 8fe7c12..1c7791b 100644 ---- a/grub-core/fs/hfsplus.c -+++ b/grub-core/fs/hfsplus.c -@@ -635,6 +635,10 @@ grub_hfsplus_btree_search (struct grub_hfsplus_btree *btree, - pointer = ((char *) currkey - + grub_be_to_cpu16 (currkey->keylen) - + 2); -+ -+ if ((char *) pointer > node + btree->nodesize - 2) -+ return grub_error (GRUB_ERR_BAD_FS, "HFS+ key beyond end of node"); -+ - currnode = grub_be_to_cpu32 (grub_get_unaligned32 (pointer)); - match = 1; - } --- -2.14.2 - diff --git a/buildroot/boot/grub2/0105-fs-hfsplus-Don-t-use-uninitialized-data-on-corrupt-f.patch b/buildroot/boot/grub2/0105-fs-hfsplus-Don-t-use-uninitialized-data-on-corrupt-f.patch deleted file mode 100644 index a83a21ef57..0000000000 --- a/buildroot/boot/grub2/0105-fs-hfsplus-Don-t-use-uninitialized-data-on-corrupt-f.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 2ca0e5dbcdcb6fc93ccae39a0f39d0dba4a7ff20 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Tue, 2 Feb 2021 16:59:35 +1100 -Subject: [PATCH] fs/hfsplus: Don't use uninitialized data on corrupt - filesystems - -Valgrind identified the following use of uninitialized data: - - ==2782220== Conditional jump or move depends on uninitialised value(s) - ==2782220== at 0x42B364: grub_hfsplus_btree_search (hfsplus.c:566) - ==2782220== by 0x42B21D: grub_hfsplus_read_block (hfsplus.c:185) - ==2782220== by 0x42A693: grub_fshelp_read_file (fshelp.c:386) - ==2782220== by 0x42C598: grub_hfsplus_read_file (hfsplus.c:219) - ==2782220== by 0x42C598: grub_hfsplus_mount (hfsplus.c:330) - ==2782220== by 0x42B8C5: grub_hfsplus_dir (hfsplus.c:958) - ==2782220== by 0x4C1AE6: grub_fs_probe (fs.c:73) - ==2782220== by 0x407C94: grub_ls_list_files (ls.c:186) - ==2782220== by 0x407C94: grub_cmd_ls (ls.c:284) - ==2782220== by 0x4D7130: grub_extcmd_dispatcher (extcmd.c:55) - ==2782220== by 0x4045A6: execute_command (grub-fstest.c:59) - ==2782220== by 0x4045A6: fstest (grub-fstest.c:433) - ==2782220== by 0x4045A6: main (grub-fstest.c:772) - ==2782220== Uninitialised value was created by a heap allocation - ==2782220== at 0x483C7F3: malloc (in /usr/lib/x86_64-linux-gnu/valgrind/vgpreload_memcheck-amd64-linux.so) - ==2782220== by 0x4C0305: grub_malloc (mm.c:42) - ==2782220== by 0x42C21D: grub_hfsplus_mount (hfsplus.c:239) - ==2782220== by 0x42B8C5: grub_hfsplus_dir (hfsplus.c:958) - ==2782220== by 0x4C1AE6: grub_fs_probe (fs.c:73) - ==2782220== by 0x407C94: grub_ls_list_files (ls.c:186) - ==2782220== by 0x407C94: grub_cmd_ls (ls.c:284) - ==2782220== by 0x4D7130: grub_extcmd_dispatcher (extcmd.c:55) - ==2782220== by 0x4045A6: execute_command (grub-fstest.c:59) - ==2782220== by 0x4045A6: fstest (grub-fstest.c:433) - ==2782220== by 0x4045A6: main (grub-fstest.c:772) - -This happens when the process of reading the catalog file goes sufficiently -wrong that there's an attempt to read the extent overflow file, which has -not yet been loaded. Keep track of when the extent overflow file is -fully loaded and refuse to use it before then. - -The load valgrind doesn't like is btree->nodesize, and that's then used -to allocate a data structure. It looks like there are subsequently a lot -of reads based on that pointer so OOB reads are likely, and indeed crashes -(albeit difficult-to-replicate ones) have been observed in fuzzing. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/fs/hfsplus.c | 14 ++++++++++++++ - include/grub/hfsplus.h | 2 ++ - 2 files changed, 16 insertions(+) - -diff --git a/grub-core/fs/hfsplus.c b/grub-core/fs/hfsplus.c -index 1c7791b..361e5be 100644 ---- a/grub-core/fs/hfsplus.c -+++ b/grub-core/fs/hfsplus.c -@@ -177,6 +177,17 @@ grub_hfsplus_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock) - break; - } - -+ /* -+ * If the extent overflow tree isn't ready yet, we can't look -+ * in it. This can happen where the catalog file is corrupted. -+ */ -+ if (!node->data->extoverflow_tree_ready) -+ { -+ grub_error (GRUB_ERR_BAD_FS, -+ "attempted to read extent overflow tree before loading"); -+ break; -+ } -+ - /* Set up the key to look for in the extent overflow file. */ - extoverflow.extkey.fileid = node->fileid; - extoverflow.extkey.type = 0; -@@ -241,6 +252,7 @@ grub_hfsplus_mount (grub_disk_t disk) - return 0; - - data->disk = disk; -+ data->extoverflow_tree_ready = 0; - - /* Read the bootblock. */ - grub_disk_read (disk, GRUB_HFSPLUS_SBLOCK, 0, sizeof (volheader), -@@ -357,6 +369,8 @@ grub_hfsplus_mount (grub_disk_t disk) - if (data->extoverflow_tree.nodesize < 2) - goto fail; - -+ data->extoverflow_tree_ready = 1; -+ - if (grub_hfsplus_read_file (&data->attr_tree.file, 0, 0, - sizeof (struct grub_hfsplus_btnode), - sizeof (header), (char *) &header) <= 0) -diff --git a/include/grub/hfsplus.h b/include/grub/hfsplus.h -index 117740a..e14dd31 100644 ---- a/include/grub/hfsplus.h -+++ b/include/grub/hfsplus.h -@@ -113,6 +113,8 @@ struct grub_hfsplus_data - struct grub_hfsplus_btree extoverflow_tree; - struct grub_hfsplus_btree attr_tree; - -+ int extoverflow_tree_ready; -+ - struct grub_hfsplus_file dirroot; - struct grub_hfsplus_file opened_file; - --- -2.14.2 - diff --git a/buildroot/boot/grub2/0106-fs-hfs-Disable-under-lockdown.patch b/buildroot/boot/grub2/0106-fs-hfs-Disable-under-lockdown.patch deleted file mode 100644 index 42e4ee4461..0000000000 --- a/buildroot/boot/grub2/0106-fs-hfs-Disable-under-lockdown.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 1c15848838d924552611247110723e2a1c17a5a1 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Mon, 18 Jan 2021 12:19:07 +1100 -Subject: [PATCH] fs/hfs: Disable under lockdown - -HFS has issues such as infinite mutual recursion that are simply too -complex to fix for such a legacy format. So simply do not permit -it to be loaded under lockdown. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/fs/hfs.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/grub-core/fs/hfs.c b/grub-core/fs/hfs.c -index 3fe842b..9a5b7bb 100644 ---- a/grub-core/fs/hfs.c -+++ b/grub-core/fs/hfs.c -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - GRUB_MOD_LICENSE ("GPLv3+"); - -@@ -1433,11 +1434,13 @@ static struct grub_fs grub_hfs_fs = - - GRUB_MOD_INIT(hfs) - { -- grub_fs_register (&grub_hfs_fs); -+ if (!grub_is_lockdown ()) -+ grub_fs_register (&grub_hfs_fs); - my_mod = mod; - } - - GRUB_MOD_FINI(hfs) - { -- grub_fs_unregister (&grub_hfs_fs); -+ if (!grub_is_lockdown()) -+ grub_fs_unregister (&grub_hfs_fs); - } --- -2.14.2 - diff --git a/buildroot/boot/grub2/0107-fs-sfs-Fix-over-read-of-root-object-name.patch b/buildroot/boot/grub2/0107-fs-sfs-Fix-over-read-of-root-object-name.patch deleted file mode 100644 index 840bfc247a..0000000000 --- a/buildroot/boot/grub2/0107-fs-sfs-Fix-over-read-of-root-object-name.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 8d3ae59dee2930d640add3bba983006e1f5dd1b6 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Mon, 18 Jan 2021 14:34:58 +1100 -Subject: [PATCH] fs/sfs: Fix over-read of root object name - -There's a read of the name of the root object that assumes that the name -is nul-terminated within the root block. This isn't guaranteed - it seems -SFS would require you to read multiple blocks to get a full name in general, -but maybe that doesn't apply to the root object. - -Either way, figure out how much space is left in the root block and don't -over-read it. This fixes some OOB reads. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/fs/sfs.c | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/grub-core/fs/sfs.c b/grub-core/fs/sfs.c -index de2b107..983e880 100644 ---- a/grub-core/fs/sfs.c -+++ b/grub-core/fs/sfs.c -@@ -373,6 +373,7 @@ grub_sfs_mount (grub_disk_t disk) - struct grub_sfs_objc *rootobjc; - char *rootobjc_data = 0; - grub_uint32_t blk; -+ unsigned int max_len; - - data = grub_malloc (sizeof (*data)); - if (!data) -@@ -421,7 +422,13 @@ grub_sfs_mount (grub_disk_t disk) - data->diropen.data = data; - data->diropen.cache = 0; - data->disk = disk; -- data->label = grub_strdup ((char *) (rootobjc->objects[0].filename)); -+ -+ /* We only read 1 block of data, so truncate the name if needed. */ -+ max_len = ((GRUB_DISK_SECTOR_SIZE << data->log_blocksize) -+ - 24 /* offsetof (struct grub_sfs_objc, objects) */ -+ - 25); /* offsetof (struct grub_sfs_obj, filename) */ -+ data->label = grub_zalloc (max_len + 1); -+ grub_strncpy (data->label, (char *) rootobjc->objects[0].filename, max_len); - - grub_free (rootobjc_data); - return data; --- -2.14.2 - diff --git a/buildroot/boot/grub2/0108-fs-jfs-Do-not-move-to-leaf-level-if-name-length-is-n.patch b/buildroot/boot/grub2/0108-fs-jfs-Do-not-move-to-leaf-level-if-name-length-is-n.patch deleted file mode 100644 index dc629ba890..0000000000 --- a/buildroot/boot/grub2/0108-fs-jfs-Do-not-move-to-leaf-level-if-name-length-is-n.patch +++ /dev/null @@ -1,34 +0,0 @@ -From ffd5a46f68710e2781899d0be4d701429a5a817d Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Mon, 18 Jan 2021 14:51:11 +1100 -Subject: [PATCH] fs/jfs: Do not move to leaf level if name length is negative - -Fuzzing JFS revealed crashes where a negative number would be passed -to le_to_cpu16_copy(). There it would be cast to a large positive number -and the copy would read and write off the end of the respective buffers. - -Catch this at the top as well as the bottom of the loop. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/fs/jfs.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/grub-core/fs/jfs.c b/grub-core/fs/jfs.c -index d5a6d65..e5bbda6 100644 ---- a/grub-core/fs/jfs.c -+++ b/grub-core/fs/jfs.c -@@ -567,7 +567,7 @@ grub_jfs_getent (struct grub_jfs_diropen *diro) - - /* Move down to the leaf level. */ - nextent = leaf->next; -- if (leaf->next != 255) -+ if (leaf->next != 255 && len > 0) - do - { - next_leaf = &diro->next_leaf[nextent]; --- -2.14.2 - diff --git a/buildroot/boot/grub2/0109-fs-jfs-Limit-the-extents-that-getblk-can-consider.patch b/buildroot/boot/grub2/0109-fs-jfs-Limit-the-extents-that-getblk-can-consider.patch deleted file mode 100644 index 9c8ecd2c62..0000000000 --- a/buildroot/boot/grub2/0109-fs-jfs-Limit-the-extents-that-getblk-can-consider.patch +++ /dev/null @@ -1,62 +0,0 @@ -From bd0cf8148ccf721f6e39ffbd70f8abad0c8897f0 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Mon, 18 Jan 2021 14:57:17 +1100 -Subject: [PATCH] fs/jfs: Limit the extents that getblk() can consider - -getblk() implicitly trusts that treehead->count is an accurate count of -the number of extents. However, that value is read from disk and is not -trustworthy, leading to OOB reads and crashes. I am not sure to what -extent the data read from OOB can influence subsequent program execution. - -Require callers to pass in the maximum number of extents for which -they have storage. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/fs/jfs.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/grub-core/fs/jfs.c b/grub-core/fs/jfs.c -index e5bbda6..804c42d 100644 ---- a/grub-core/fs/jfs.c -+++ b/grub-core/fs/jfs.c -@@ -261,13 +261,15 @@ static grub_err_t grub_jfs_lookup_symlink (struct grub_jfs_data *data, grub_uint - static grub_int64_t - getblk (struct grub_jfs_treehead *treehead, - struct grub_jfs_tree_extent *extents, -+ int max_extents, - struct grub_jfs_data *data, - grub_uint64_t blk) - { - int found = -1; - int i; - -- for (i = 0; i < grub_le_to_cpu16 (treehead->count) - 2; i++) -+ for (i = 0; i < grub_le_to_cpu16 (treehead->count) - 2 && -+ i < max_extents; i++) - { - if (treehead->flags & GRUB_JFS_TREE_LEAF) - { -@@ -302,7 +304,7 @@ getblk (struct grub_jfs_treehead *treehead, - << (grub_le_to_cpu16 (data->sblock.log2_blksz) - - GRUB_DISK_SECTOR_BITS), 0, - sizeof (*tree), (char *) tree)) -- ret = getblk (&tree->treehead, &tree->extents[0], data, blk); -+ ret = getblk (&tree->treehead, &tree->extents[0], 254, data, blk); - grub_free (tree); - return ret; - } -@@ -316,7 +318,7 @@ static grub_int64_t - grub_jfs_blkno (struct grub_jfs_data *data, struct grub_jfs_inode *inode, - grub_uint64_t blk) - { -- return getblk (&inode->file.tree, &inode->file.extents[0], data, blk); -+ return getblk (&inode->file.tree, &inode->file.extents[0], 16, data, blk); - } - - --- -2.14.2 - diff --git a/buildroot/boot/grub2/0110-fs-jfs-Catch-infinite-recursion.patch b/buildroot/boot/grub2/0110-fs-jfs-Catch-infinite-recursion.patch deleted file mode 100644 index 98866599c6..0000000000 --- a/buildroot/boot/grub2/0110-fs-jfs-Catch-infinite-recursion.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 223120dd83745126cb232a0248c9a8901d7e350d Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Mon, 18 Jan 2021 15:47:24 +1100 -Subject: [PATCH] fs/jfs: Catch infinite recursion - -It's possible with a fuzzed filesystem for JFS to keep getblk()-ing -the same data over and over again, leading to stack exhaustion. - -Check if we'd be calling the function with exactly the same data as -was passed in, and if so abort. - -I'm not sure what the performance impact of this is and am open to -better ideas. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/fs/jfs.c | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/grub-core/fs/jfs.c b/grub-core/fs/jfs.c -index 804c42d..6f7c439 100644 ---- a/grub-core/fs/jfs.c -+++ b/grub-core/fs/jfs.c -@@ -304,7 +304,16 @@ getblk (struct grub_jfs_treehead *treehead, - << (grub_le_to_cpu16 (data->sblock.log2_blksz) - - GRUB_DISK_SECTOR_BITS), 0, - sizeof (*tree), (char *) tree)) -- ret = getblk (&tree->treehead, &tree->extents[0], 254, data, blk); -+ { -+ if (grub_memcmp (&tree->treehead, treehead, sizeof (struct grub_jfs_treehead)) || -+ grub_memcmp (&tree->extents, extents, 254 * sizeof (struct grub_jfs_tree_extent))) -+ ret = getblk (&tree->treehead, &tree->extents[0], 254, data, blk); -+ else -+ { -+ grub_error (GRUB_ERR_BAD_FS, "jfs: infinite recursion detected"); -+ ret = -1; -+ } -+ } - grub_free (tree); - return ret; - } --- -2.14.2 - diff --git a/buildroot/boot/grub2/0111-fs-nilfs2-Reject-too-large-keys.patch b/buildroot/boot/grub2/0111-fs-nilfs2-Reject-too-large-keys.patch deleted file mode 100644 index d442f3cee2..0000000000 --- a/buildroot/boot/grub2/0111-fs-nilfs2-Reject-too-large-keys.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 20ab8cb44bc140a1dedda82a3fccdd45e9bc6929 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Mon, 18 Jan 2021 16:49:09 +1100 -Subject: [PATCH] fs/nilfs2: Reject too-large keys - -NILFS2 has up to 7 keys, per the data structure. Do not permit array -indices in excess of that. - -This catches some OOB reads. I don't know how controllable the invalidly -read data is or if that could be used later in the program. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/fs/nilfs2.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/grub-core/fs/nilfs2.c b/grub-core/fs/nilfs2.c -index 7ed148d..fee2242 100644 ---- a/grub-core/fs/nilfs2.c -+++ b/grub-core/fs/nilfs2.c -@@ -569,6 +569,11 @@ grub_nilfs2_btree_lookup (struct grub_nilfs2_data *data, - static inline grub_uint64_t - grub_nilfs2_direct_lookup (struct grub_nilfs2_inode *inode, grub_uint64_t key) - { -+ if (1 + key > 6) -+ { -+ grub_error (GRUB_ERR_BAD_FS, "key is too large"); -+ return 0xffffffffffffffff; -+ } - return grub_le_to_cpu64 (inode->i_bmap[1 + key]); - } - -@@ -584,7 +589,7 @@ grub_nilfs2_bmap_lookup (struct grub_nilfs2_data *data, - { - grub_uint64_t ptr; - ptr = grub_nilfs2_direct_lookup (inode, key); -- if (need_translate) -+ if (ptr != ((grub_uint64_t) 0xffffffffffffffff) && need_translate) - ptr = grub_nilfs2_dat_translate (data, ptr); - return ptr; - } --- -2.14.2 - diff --git a/buildroot/boot/grub2/0112-fs-nilfs2-Don-t-search-children-if-provided-number-i.patch b/buildroot/boot/grub2/0112-fs-nilfs2-Don-t-search-children-if-provided-number-i.patch deleted file mode 100644 index 426aceebe7..0000000000 --- a/buildroot/boot/grub2/0112-fs-nilfs2-Don-t-search-children-if-provided-number-i.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 37c0eb05cdcc64c28d31c4ebd300f14d5239d05e Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Mon, 18 Jan 2021 16:49:44 +1100 -Subject: [PATCH] fs/nilfs2: Don't search children if provided number is too - large - -NILFS2 reads the number of children a node has from the node. Unfortunately, -that's not trustworthy. Check if it's beyond what the filesystem permits and -reject it if so. - -This blocks some OOB reads. I'm not sure how controllable the read is and what -could be done with invalidly read data later on. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/fs/nilfs2.c | 38 +++++++++++++++++++++++--------------- - 1 file changed, 23 insertions(+), 15 deletions(-) - -diff --git a/grub-core/fs/nilfs2.c b/grub-core/fs/nilfs2.c -index fee2242..43ac1ad 100644 ---- a/grub-core/fs/nilfs2.c -+++ b/grub-core/fs/nilfs2.c -@@ -416,14 +416,34 @@ grub_nilfs2_btree_node_get_key (struct grub_nilfs2_btree_node *node, - } - - static inline int --grub_nilfs2_btree_node_lookup (struct grub_nilfs2_btree_node *node, -+grub_nilfs2_btree_node_nchildren_max (struct grub_nilfs2_data *data, -+ struct grub_nilfs2_btree_node *node) -+{ -+ int node_children_max = ((NILFS2_BLOCK_SIZE (data) - -+ sizeof (struct grub_nilfs2_btree_node) - -+ NILFS_BTREE_NODE_EXTRA_PAD_SIZE) / -+ (sizeof (grub_uint64_t) + sizeof (grub_uint64_t))); -+ -+ return (node->bn_flags & NILFS_BTREE_NODE_ROOT) ? 3 : node_children_max; -+} -+ -+static inline int -+grub_nilfs2_btree_node_lookup (struct grub_nilfs2_data *data, -+ struct grub_nilfs2_btree_node *node, - grub_uint64_t key, int *indexp) - { - grub_uint64_t nkey; - int index, low, high, s; - - low = 0; -+ - high = grub_le_to_cpu16 (node->bn_nchildren) - 1; -+ if (high >= grub_nilfs2_btree_node_nchildren_max (data, node)) -+ { -+ grub_error (GRUB_ERR_BAD_FS, "too many children"); -+ return 0; -+ } -+ - index = 0; - s = 0; - while (low <= high) -@@ -459,18 +479,6 @@ grub_nilfs2_btree_node_lookup (struct grub_nilfs2_btree_node *node, - return s == 0; - } - --static inline int --grub_nilfs2_btree_node_nchildren_max (struct grub_nilfs2_data *data, -- struct grub_nilfs2_btree_node *node) --{ -- int node_children_max = ((NILFS2_BLOCK_SIZE (data) - -- sizeof (struct grub_nilfs2_btree_node) - -- NILFS_BTREE_NODE_EXTRA_PAD_SIZE) / -- (sizeof (grub_uint64_t) + sizeof (grub_uint64_t))); -- -- return (node->bn_flags & NILFS_BTREE_NODE_ROOT) ? 3 : node_children_max; --} -- - static inline grub_uint64_t * - grub_nilfs2_btree_node_dptrs (struct grub_nilfs2_data *data, - struct grub_nilfs2_btree_node *node) -@@ -517,7 +525,7 @@ grub_nilfs2_btree_lookup (struct grub_nilfs2_data *data, - node = grub_nilfs2_btree_get_root (inode); - level = grub_nilfs2_btree_get_level (node); - -- found = grub_nilfs2_btree_node_lookup (node, key, &index); -+ found = grub_nilfs2_btree_node_lookup (data, node, key, &index); - ptr = grub_nilfs2_btree_node_get_ptr (data, node, index); - if (need_translate) - ptr = grub_nilfs2_dat_translate (data, ptr); -@@ -538,7 +546,7 @@ grub_nilfs2_btree_lookup (struct grub_nilfs2_data *data, - } - - if (!found) -- found = grub_nilfs2_btree_node_lookup (node, key, &index); -+ found = grub_nilfs2_btree_node_lookup (data, node, key, &index); - else - index = 0; - --- -2.14.2 - diff --git a/buildroot/boot/grub2/0113-fs-nilfs2-Properly-bail-on-errors-in-grub_nilfs2_btr.patch b/buildroot/boot/grub2/0113-fs-nilfs2-Properly-bail-on-errors-in-grub_nilfs2_btr.patch deleted file mode 100644 index 85cb82d1ee..0000000000 --- a/buildroot/boot/grub2/0113-fs-nilfs2-Properly-bail-on-errors-in-grub_nilfs2_btr.patch +++ /dev/null @@ -1,68 +0,0 @@ -From ca5d9ac206043b1fb4cb06259272fb1c5946bb6d Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Mon, 18 Jan 2021 17:06:19 +1100 -Subject: [PATCH] fs/nilfs2: Properly bail on errors in - grub_nilfs2_btree_node_lookup() - -We just introduced an error return in grub_nilfs2_btree_node_lookup(). -Make sure the callers catch it. - -At the same time, make sure that grub_nilfs2_btree_node_lookup() always -inits the index pointer passed to it. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/fs/nilfs2.c | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/grub-core/fs/nilfs2.c b/grub-core/fs/nilfs2.c -index 43ac1ad..aaba002 100644 ---- a/grub-core/fs/nilfs2.c -+++ b/grub-core/fs/nilfs2.c -@@ -433,7 +433,7 @@ grub_nilfs2_btree_node_lookup (struct grub_nilfs2_data *data, - grub_uint64_t key, int *indexp) - { - grub_uint64_t nkey; -- int index, low, high, s; -+ int index = 0, low, high, s; - - low = 0; - -@@ -441,10 +441,10 @@ grub_nilfs2_btree_node_lookup (struct grub_nilfs2_data *data, - if (high >= grub_nilfs2_btree_node_nchildren_max (data, node)) - { - grub_error (GRUB_ERR_BAD_FS, "too many children"); -+ *indexp = index; - return 0; - } - -- index = 0; - s = 0; - while (low <= high) - { -@@ -526,6 +526,10 @@ grub_nilfs2_btree_lookup (struct grub_nilfs2_data *data, - level = grub_nilfs2_btree_get_level (node); - - found = grub_nilfs2_btree_node_lookup (data, node, key, &index); -+ -+ if (grub_errno != GRUB_ERR_NONE) -+ goto fail; -+ - ptr = grub_nilfs2_btree_node_get_ptr (data, node, index); - if (need_translate) - ptr = grub_nilfs2_dat_translate (data, ptr); -@@ -550,7 +554,8 @@ grub_nilfs2_btree_lookup (struct grub_nilfs2_data *data, - else - index = 0; - -- if (index < grub_nilfs2_btree_node_nchildren_max (data, node)) -+ if (index < grub_nilfs2_btree_node_nchildren_max (data, node) && -+ grub_errno == GRUB_ERR_NONE) - { - ptr = grub_nilfs2_btree_node_get_ptr (data, node, index); - if (need_translate) --- -2.14.2 - diff --git a/buildroot/boot/grub2/0114-io-gzio-Bail-if-gzio-tl-td-is-NULL.patch b/buildroot/boot/grub2/0114-io-gzio-Bail-if-gzio-tl-td-is-NULL.patch deleted file mode 100644 index cf6b778401..0000000000 --- a/buildroot/boot/grub2/0114-io-gzio-Bail-if-gzio-tl-td-is-NULL.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 3334a5e6c86f10e715cca3bf66ce0fc2f164b61b Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Wed, 13 Jan 2021 20:59:09 +1100 -Subject: [PATCH] io/gzio: Bail if gzio->tl/td is NULL - -This is an ugly fix that doesn't address why gzio->tl comes to be NULL. -However, it seems to be sufficient to patch up a bunch of NULL derefs. - -It would be good to revisit this in future and see if we can have -a cleaner solution that addresses some of the causes of the unexpected -NULL pointers. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/io/gzio.c | 20 ++++++++++++++++++++ - 1 file changed, 20 insertions(+) - -diff --git a/grub-core/io/gzio.c b/grub-core/io/gzio.c -index 43d98a7..4a8eaea 100644 ---- a/grub-core/io/gzio.c -+++ b/grub-core/io/gzio.c -@@ -669,6 +669,13 @@ inflate_codes_in_window (grub_gzio_t gzio) - { - if (! gzio->code_state) - { -+ -+ if (gzio->tl == NULL) -+ { -+ grub_error (GRUB_ERR_BAD_COMPRESSED_DATA, "NULL gzio->tl"); -+ return 1; -+ } -+ - NEEDBITS ((unsigned) gzio->bl); - if ((e = (t = gzio->tl + ((unsigned) b & ml))->e) > 16) - do -@@ -707,6 +714,12 @@ inflate_codes_in_window (grub_gzio_t gzio) - n = t->v.n + ((unsigned) b & mask_bits[e]); - DUMPBITS (e); - -+ if (gzio->td == NULL) -+ { -+ grub_error (GRUB_ERR_BAD_COMPRESSED_DATA, "NULL gzio->td"); -+ return 1; -+ } -+ - /* decode distance of block to copy */ - NEEDBITS ((unsigned) gzio->bd); - if ((e = (t = gzio->td + ((unsigned) b & md))->e) > 16) -@@ -917,6 +930,13 @@ init_dynamic_block (grub_gzio_t gzio) - n = nl + nd; - m = mask_bits[gzio->bl]; - i = l = 0; -+ -+ if (gzio->tl == NULL) -+ { -+ grub_error (GRUB_ERR_BAD_COMPRESSED_DATA, "NULL gzio->tl"); -+ return; -+ } -+ - while ((unsigned) i < n) - { - NEEDBITS ((unsigned) gzio->bl); --- -2.14.2 - diff --git a/buildroot/boot/grub2/0115-io-gzio-Add-init_dynamic_block-clean-up-if-unpacking.patch b/buildroot/boot/grub2/0115-io-gzio-Add-init_dynamic_block-clean-up-if-unpacking.patch deleted file mode 100644 index 25b270aeeb..0000000000 --- a/buildroot/boot/grub2/0115-io-gzio-Add-init_dynamic_block-clean-up-if-unpacking.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 18490336d91da2b532277cba56473bfed1376fc4 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Thu, 21 Jan 2021 00:05:58 +1100 -Subject: [PATCH] io/gzio: Add init_dynamic_block() clean up if unpacking codes - fails - -init_dynamic_block() didn't clean up gzio->tl and td in some error -paths. This left td pointing to part of tl. Then in grub_gzio_close(), -when tl was freed the storage for td would also be freed. The code then -attempts to free td explicitly, performing a UAF and then a double free. - -Explicitly clean up tl and td in the error paths. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/io/gzio.c | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -diff --git a/grub-core/io/gzio.c b/grub-core/io/gzio.c -index 4a8eaea..4236f0f 100644 ---- a/grub-core/io/gzio.c -+++ b/grub-core/io/gzio.c -@@ -953,7 +953,7 @@ init_dynamic_block (grub_gzio_t gzio) - if ((unsigned) i + j > n) - { - grub_error (GRUB_ERR_BAD_COMPRESSED_DATA, "too many codes found"); -- return; -+ goto fail; - } - while (j--) - ll[i++] = l; -@@ -966,7 +966,7 @@ init_dynamic_block (grub_gzio_t gzio) - if ((unsigned) i + j > n) - { - grub_error (GRUB_ERR_BAD_COMPRESSED_DATA, "too many codes found"); -- return; -+ goto fail; - } - while (j--) - ll[i++] = 0; -@@ -981,7 +981,7 @@ init_dynamic_block (grub_gzio_t gzio) - if ((unsigned) i + j > n) - { - grub_error (GRUB_ERR_BAD_COMPRESSED_DATA, "too many codes found"); -- return; -+ goto fail; - } - while (j--) - ll[i++] = 0; -@@ -1019,6 +1019,12 @@ init_dynamic_block (grub_gzio_t gzio) - /* indicate we're now working on a block */ - gzio->code_state = 0; - gzio->block_len++; -+ return; -+ -+ fail: -+ huft_free (gzio->tl); -+ gzio->td = NULL; -+ gzio->tl = NULL; - } - - --- -2.14.2 - diff --git a/buildroot/boot/grub2/0116-io-gzio-Catch-missing-values-in-huft_build-and-bail.patch b/buildroot/boot/grub2/0116-io-gzio-Catch-missing-values-in-huft_build-and-bail.patch deleted file mode 100644 index 3ee520c141..0000000000 --- a/buildroot/boot/grub2/0116-io-gzio-Catch-missing-values-in-huft_build-and-bail.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 4e76b08f7171a8603d74fcafb27409a91f578647 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Thu, 21 Jan 2021 12:20:49 +1100 -Subject: [PATCH] io/gzio: Catch missing values in huft_build() and bail - -In huft_build(), "v" is a table of values in order of bit length. -The code later (when setting up table entries in "r") assumes that all -elements of this array corresponding to a code are initialized and less -than N_MAX. However, it doesn't enforce this. - -With sufficiently manipulated inputs (e.g. from fuzzing), there can be -elements of "v" that are not filled. Therefore a lookup into "e" or "d" -will use an uninitialized value. This can lead to an invalid/OOB read on -those values, often leading to a crash. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/io/gzio.c | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/grub-core/io/gzio.c b/grub-core/io/gzio.c -index 4236f0f..19adebe 100644 ---- a/grub-core/io/gzio.c -+++ b/grub-core/io/gzio.c -@@ -507,6 +507,7 @@ huft_build (unsigned *b, /* code lengths in bits (all assumed <= BMAX) */ - } - - /* Make a table of values in order of bit lengths */ -+ grub_memset (v, N_MAX, ARRAY_SIZE (v)); - p = b; - i = 0; - do -@@ -588,11 +589,18 @@ huft_build (unsigned *b, /* code lengths in bits (all assumed <= BMAX) */ - r.v.n = (ush) (*p); /* simple code is just the value */ - p++; /* one compiler does not like *p++ */ - } -- else -+ else if (*p < N_MAX) - { - r.e = (uch) e[*p - s]; /* non-simple--look up in lists */ - r.v.n = d[*p++ - s]; - } -+ else -+ { -+ /* Detected an uninitialised value, abort. */ -+ if (h) -+ huft_free (u[0]); -+ return 2; -+ } - - /* fill code-like entries with r */ - f = 1 << (k - w); --- -2.14.2 - diff --git a/buildroot/boot/grub2/0117-io-gzio-Zero-gzio-tl-td-in-init_dynamic_block-if-huf.patch b/buildroot/boot/grub2/0117-io-gzio-Zero-gzio-tl-td-in-init_dynamic_block-if-huf.patch deleted file mode 100644 index a7ae3fb9ed..0000000000 --- a/buildroot/boot/grub2/0117-io-gzio-Zero-gzio-tl-td-in-init_dynamic_block-if-huf.patch +++ /dev/null @@ -1,42 +0,0 @@ -From b5a2b59cc5b8f5ee7ba3b951e7693e402d5b3a6f Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Thu, 21 Jan 2021 12:22:28 +1100 -Subject: [PATCH] io/gzio: Zero gzio->tl/td in init_dynamic_block() if - huft_build() fails - -If huft_build() fails, gzio->tl or gzio->td could contain pointers that -are no longer valid. Zero them out. - -This prevents a double free when grub_gzio_close() comes through and -attempts to free them again. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/io/gzio.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/grub-core/io/gzio.c b/grub-core/io/gzio.c -index 19adebe..aea86a0 100644 ---- a/grub-core/io/gzio.c -+++ b/grub-core/io/gzio.c -@@ -1010,6 +1010,7 @@ init_dynamic_block (grub_gzio_t gzio) - gzio->bl = lbits; - if (huft_build (ll, nl, 257, cplens, cplext, &gzio->tl, &gzio->bl) != 0) - { -+ gzio->tl = 0; - grub_error (GRUB_ERR_BAD_COMPRESSED_DATA, - "failed in building a Huffman code table"); - return; -@@ -1019,6 +1020,7 @@ init_dynamic_block (grub_gzio_t gzio) - { - huft_free (gzio->tl); - gzio->tl = 0; -+ gzio->td = 0; - grub_error (GRUB_ERR_BAD_COMPRESSED_DATA, - "failed in building a Huffman code table"); - return; --- -2.14.2 - diff --git a/buildroot/boot/grub2/0118-disk-lvm-Don-t-go-beyond-the-end-of-the-data-we-read.patch b/buildroot/boot/grub2/0118-disk-lvm-Don-t-go-beyond-the-end-of-the-data-we-read.patch deleted file mode 100644 index 31c99fbce7..0000000000 --- a/buildroot/boot/grub2/0118-disk-lvm-Don-t-go-beyond-the-end-of-the-data-we-read.patch +++ /dev/null @@ -1,49 +0,0 @@ -From a8cc95de74ccc3ad090e8062ac335c844f13c9f4 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Thu, 21 Jan 2021 17:59:14 +1100 -Subject: [PATCH] disk/lvm: Don't go beyond the end of the data we read from - disk - -We unconditionally trusted offset_xl from the LVM label header, even if -it told us that the PV header/disk locations were way off past the end -of the data we read from disk. - -Require that the offset be sane, fixing an OOB read and crash. - -Fixes: CID 314367, CID 314371 - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/disk/lvm.c | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c -index 139fafd..8136122 100644 ---- a/grub-core/disk/lvm.c -+++ b/grub-core/disk/lvm.c -@@ -141,6 +141,20 @@ grub_lvm_detect (grub_disk_t disk, - goto fail; - } - -+ /* -+ * We read a grub_lvm_pv_header and then 2 grub_lvm_disk_locns that -+ * immediately follow the PV header. Make sure we have space for both. -+ */ -+ if (grub_le_to_cpu32 (lh->offset_xl) >= -+ GRUB_LVM_LABEL_SIZE - sizeof (struct grub_lvm_pv_header) - -+ 2 * sizeof (struct grub_lvm_disk_locn)) -+ { -+#ifdef GRUB_UTIL -+ grub_util_info ("LVM PV header/disk locations are beyond the end of the block"); -+#endif -+ goto fail; -+ } -+ - pvh = (struct grub_lvm_pv_header *) (buf + grub_le_to_cpu32(lh->offset_xl)); - - for (i = 0, j = 0; i < GRUB_LVM_ID_LEN; i++) --- -2.14.2 - diff --git a/buildroot/boot/grub2/0119-disk-lvm-Don-t-blast-past-the-end-of-the-circular-me.patch b/buildroot/boot/grub2/0119-disk-lvm-Don-t-blast-past-the-end-of-the-circular-me.patch deleted file mode 100644 index 4f083847c2..0000000000 --- a/buildroot/boot/grub2/0119-disk-lvm-Don-t-blast-past-the-end-of-the-circular-me.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 27a79bf38e6d050e497eb96a3fdddce43af25577 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Thu, 21 Jan 2021 18:19:51 +1100 -Subject: [PATCH] disk/lvm: Don't blast past the end of the circular metadata - buffer - -This catches at least some OOB reads, and it's possible I suppose that -if 2 * mda_size is less than GRUB_LVM_MDA_HEADER_SIZE it might catch some -OOB writes too (although that hasn't showed up as a crash in fuzzing yet). - -It's a bit ugly and I'd appreciate better suggestions. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/disk/lvm.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c -index 8136122..36da575 100644 ---- a/grub-core/disk/lvm.c -+++ b/grub-core/disk/lvm.c -@@ -214,6 +214,16 @@ grub_lvm_detect (grub_disk_t disk, - if (grub_le_to_cpu64 (rlocn->offset) + grub_le_to_cpu64 (rlocn->size) > - grub_le_to_cpu64 (mdah->size)) - { -+ if (2 * mda_size < GRUB_LVM_MDA_HEADER_SIZE || -+ (grub_le_to_cpu64 (rlocn->offset) + grub_le_to_cpu64 (rlocn->size) - -+ grub_le_to_cpu64 (mdah->size) > mda_size - GRUB_LVM_MDA_HEADER_SIZE)) -+ { -+#ifdef GRUB_UTIL -+ grub_util_info ("cannot copy metadata wrap in circular buffer"); -+#endif -+ goto fail2; -+ } -+ - /* Metadata is circular. Copy the wrap in place. */ - grub_memcpy (metadatabuf + mda_size, - metadatabuf + GRUB_LVM_MDA_HEADER_SIZE, --- -2.14.2 - diff --git a/buildroot/boot/grub2/0120-disk-lvm-Bail-on-missing-PV-list.patch b/buildroot/boot/grub2/0120-disk-lvm-Bail-on-missing-PV-list.patch deleted file mode 100644 index f23740655c..0000000000 --- a/buildroot/boot/grub2/0120-disk-lvm-Bail-on-missing-PV-list.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 2958695c4cdc785de6ed708709af071a2d20afef Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Thu, 21 Jan 2021 18:54:29 +1100 -Subject: [PATCH] disk/lvm: Bail on missing PV list - -There's an if block for the presence of "physical_volumes {", but if -that block is absent, then p remains NULL and a NULL-deref will result -when looking for logical volumes. - -It doesn't seem like LVM makes sense without physical volumes, so error -out rather than crashing. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/disk/lvm.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c -index 36da575..8e560f3 100644 ---- a/grub-core/disk/lvm.c -+++ b/grub-core/disk/lvm.c -@@ -370,6 +370,8 @@ grub_lvm_detect (grub_disk_t disk, - goto fail4; - } - } -+ else -+ goto fail4; - - p = grub_strstr (p, "logical_volumes {"); - if (p) --- -2.14.2 - diff --git a/buildroot/boot/grub2/0121-disk-lvm-Do-not-crash-if-an-expected-string-is-not-f.patch b/buildroot/boot/grub2/0121-disk-lvm-Do-not-crash-if-an-expected-string-is-not-f.patch deleted file mode 100644 index 720e5a2184..0000000000 --- a/buildroot/boot/grub2/0121-disk-lvm-Do-not-crash-if-an-expected-string-is-not-f.patch +++ /dev/null @@ -1,83 +0,0 @@ -From db29073fc7aec71a40dabfc722a96ea9f3280907 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Thu, 21 Jan 2021 18:35:22 +1100 -Subject: [PATCH] disk/lvm: Do not crash if an expected string is not found - -Clean up a bunch of cases where we could have strstr() fail and lead to -us dereferencing NULL. - -We'll still leak memory in some cases (loops don't clean up allocations -from earlier iterations if a later iteration fails) but at least we're -not crashing. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/disk/lvm.c | 22 +++++++++++++++++----- - 1 file changed, 17 insertions(+), 5 deletions(-) - -diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c -index 8e560f3..bd5ae87 100644 ---- a/grub-core/disk/lvm.c -+++ b/grub-core/disk/lvm.c -@@ -539,7 +539,16 @@ grub_lvm_detect (grub_disk_t disk, - } - - if (seg->node_count != 1) -- seg->stripe_size = grub_lvm_getvalue (&p, "stripe_size = "); -+ { -+ seg->stripe_size = grub_lvm_getvalue (&p, "stripe_size = "); -+ if (p == NULL) -+ { -+#ifdef GRUB_UTIL -+ grub_util_info ("unknown stripe_size"); -+#endif -+ goto lvs_segment_fail; -+ } -+ } - - seg->nodes = grub_calloc (seg->node_count, - sizeof (*stripe)); -@@ -559,7 +568,7 @@ grub_lvm_detect (grub_disk_t disk, - { - p = grub_strchr (p, '"'); - if (p == NULL) -- continue; -+ goto lvs_segment_fail2; - q = ++p; - while (*q != '"') - q++; -@@ -578,7 +587,10 @@ grub_lvm_detect (grub_disk_t disk, - stripe->start = grub_lvm_getvalue (&p, ",") - * vg->extent_size; - if (p == NULL) -- continue; -+ { -+ grub_free (stripe->name); -+ goto lvs_segment_fail2; -+ } - - stripe++; - } -@@ -615,7 +627,7 @@ grub_lvm_detect (grub_disk_t disk, - - p = grub_strchr (p, '"'); - if (p == NULL) -- continue; -+ goto lvs_segment_fail2; - q = ++p; - while (*q != '"') - q++; -@@ -703,7 +715,7 @@ grub_lvm_detect (grub_disk_t disk, - p = p ? grub_strchr (p + 1, '"') : 0; - p = p ? grub_strchr (p + 1, '"') : 0; - if (p == NULL) -- continue; -+ goto lvs_segment_fail2; - q = ++p; - while (*q != '"') - q++; --- -2.14.2 - diff --git a/buildroot/boot/grub2/0122-disk-lvm-Do-not-overread-metadata.patch b/buildroot/boot/grub2/0122-disk-lvm-Do-not-overread-metadata.patch deleted file mode 100644 index 1aeb61ca59..0000000000 --- a/buildroot/boot/grub2/0122-disk-lvm-Do-not-overread-metadata.patch +++ /dev/null @@ -1,111 +0,0 @@ -From 1155d7dffd3337942cb7583706b429d567d4db86 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Thu, 21 Jan 2021 18:35:22 +1100 -Subject: [PATCH] disk/lvm: Do not overread metadata - -We could reach the end of valid metadata and not realize, leading to -some buffer overreads. Check if we have reached the end and bail. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/disk/lvm.c | 31 +++++++++++++++++++++++++------ - 1 file changed, 25 insertions(+), 6 deletions(-) - -diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c -index bd5ae87..742ecd6 100644 ---- a/grub-core/disk/lvm.c -+++ b/grub-core/disk/lvm.c -@@ -313,17 +313,23 @@ grub_lvm_detect (grub_disk_t disk, - while (1) - { - grub_ssize_t s; -- while (grub_isspace (*p)) -+ while (grub_isspace (*p) && p < mda_end) - p++; - -+ if (p == mda_end) -+ goto fail4; -+ - if (*p == '}') - break; - - pv = grub_zalloc (sizeof (*pv)); - q = p; -- while (*q != ' ') -+ while (*q != ' ' && q < mda_end) - q++; - -+ if (q == mda_end) -+ goto pvs_fail_noname; -+ - s = q - p; - pv->name = grub_malloc (s + 1); - grub_memcpy (pv->name, p, s); -@@ -366,6 +372,7 @@ grub_lvm_detect (grub_disk_t disk, - continue; - pvs_fail: - grub_free (pv->name); -+ pvs_fail_noname: - grub_free (pv); - goto fail4; - } -@@ -387,18 +394,24 @@ grub_lvm_detect (grub_disk_t disk, - struct grub_diskfilter_segment *seg; - int is_pvmove; - -- while (grub_isspace (*p)) -+ while (grub_isspace (*p) && p < mda_end) - p++; - -+ if (p == mda_end) -+ goto fail4; -+ - if (*p == '}') - break; - - lv = grub_zalloc (sizeof (*lv)); - - q = p; -- while (*q != ' ') -+ while (*q != ' ' && q < mda_end) - q++; - -+ if (q == mda_end) -+ goto lvs_fail; -+ - s = q - p; - lv->name = grub_strndup (p, s); - if (!lv->name) -@@ -570,9 +583,12 @@ grub_lvm_detect (grub_disk_t disk, - if (p == NULL) - goto lvs_segment_fail2; - q = ++p; -- while (*q != '"') -+ while (q < mda_end && *q != '"') - q++; - -+ if (q == mda_end) -+ goto lvs_segment_fail2; -+ - s = q - p; - - stripe->name = grub_malloc (s + 1); -@@ -629,9 +645,12 @@ grub_lvm_detect (grub_disk_t disk, - if (p == NULL) - goto lvs_segment_fail2; - q = ++p; -- while (*q != '"') -+ while (q < mda_end && *q != '"') - q++; - -+ if (q == mda_end) -+ goto lvs_segment_fail2; -+ - s = q - p; - - lvname = grub_malloc (s + 1); --- -2.14.2 - diff --git a/buildroot/boot/grub2/0123-disk-lvm-Sanitize-rlocn-offset-to-prevent-wild-read.patch b/buildroot/boot/grub2/0123-disk-lvm-Sanitize-rlocn-offset-to-prevent-wild-read.patch deleted file mode 100644 index 449e2634fc..0000000000 --- a/buildroot/boot/grub2/0123-disk-lvm-Sanitize-rlocn-offset-to-prevent-wild-read.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 701293684742d00133b39bf957d3642c81dc83f4 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Fri, 22 Jan 2021 14:43:58 +1100 -Subject: [PATCH] disk/lvm: Sanitize rlocn->offset to prevent wild read - -rlocn->offset is read directly from disk and added to the metadatabuf -pointer to create a pointer to a block of metadata. It's a 64-bit -quantity so as long as you don't overflow you can set subsequent -pointers to point anywhere in memory. - -Require that rlocn->offset fits within the metadata buffer size. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/disk/lvm.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c -index 742ecd6..ed0712f 100644 ---- a/grub-core/disk/lvm.c -+++ b/grub-core/disk/lvm.c -@@ -211,6 +211,14 @@ grub_lvm_detect (grub_disk_t disk, - } - - rlocn = mdah->raw_locns; -+ if (grub_le_to_cpu64 (rlocn->offset) >= grub_le_to_cpu64 (mda_size)) -+ { -+#ifdef GRUB_UTIL -+ grub_util_info ("metadata offset is beyond end of metadata area"); -+#endif -+ goto fail2; -+ } -+ - if (grub_le_to_cpu64 (rlocn->offset) + grub_le_to_cpu64 (rlocn->size) > - grub_le_to_cpu64 (mdah->size)) - { --- -2.14.2 - diff --git a/buildroot/boot/grub2/0124-disk-lvm-Do-not-allow-a-LV-to-be-it-s-own-segment-s-.patch b/buildroot/boot/grub2/0124-disk-lvm-Do-not-allow-a-LV-to-be-it-s-own-segment-s-.patch deleted file mode 100644 index 183b1fff66..0000000000 --- a/buildroot/boot/grub2/0124-disk-lvm-Do-not-allow-a-LV-to-be-it-s-own-segment-s-.patch +++ /dev/null @@ -1,39 +0,0 @@ -From e18a00073890021362b4a48097672f1d4b340d3c Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Fri, 22 Jan 2021 14:42:21 +1100 -Subject: [PATCH] disk/lvm: Do not allow a LV to be it's own segment's node's - LV - -This prevents infinite recursion in the diskfilter verification code. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/disk/lvm.c | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c -index ed0712f..81dc375 100644 ---- a/grub-core/disk/lvm.c -+++ b/grub-core/disk/lvm.c -@@ -838,9 +838,13 @@ grub_lvm_detect (grub_disk_t disk, - } - if (lv1->segments[i].nodes[j].pv == NULL) - for (lv2 = vg->lvs; lv2; lv2 = lv2->next) -- if (grub_strcmp (lv2->name, -- lv1->segments[i].nodes[j].name) == 0) -- lv1->segments[i].nodes[j].lv = lv2; -+ { -+ if (lv1 == lv2) -+ continue; -+ if (grub_strcmp (lv2->name, -+ lv1->segments[i].nodes[j].name) == 0) -+ lv1->segments[i].nodes[j].lv = lv2; -+ } - } - - } --- -2.14.2 - diff --git a/buildroot/boot/grub2/0125-fs-btrfs-Validate-the-number-of-stripes-parities-in-.patch b/buildroot/boot/grub2/0125-fs-btrfs-Validate-the-number-of-stripes-parities-in-.patch deleted file mode 100644 index 2caa1b038b..0000000000 --- a/buildroot/boot/grub2/0125-fs-btrfs-Validate-the-number-of-stripes-parities-in-.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b88a82e78cdd0ab8e0339c1c3f9564c4d8c0c969 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Mon, 18 Jan 2021 17:17:16 +1100 -Subject: [PATCH] fs/btrfs: Validate the number of stripes/parities in RAID5/6 - -This prevents a divide by zero if nstripes == nparities, and -also prevents propagation of invalid values if nstripes ends up -less than nparities. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/fs/btrfs.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c -index 2b65bd5..e4e87ba 100644 ---- a/grub-core/fs/btrfs.c -+++ b/grub-core/fs/btrfs.c -@@ -1076,6 +1076,9 @@ grub_btrfs_read_logical (struct grub_btrfs_data *data, grub_disk_addr_t addr, - * stripen is computed without the parities - * (0 for A0, A1, A2, 1 for B0, B1, B2, etc.). - */ -+ if (nparities >= nstripes) -+ return grub_error (GRUB_ERR_BAD_FS, -+ "invalid RAID5/6: nparities >= nstripes"); - high = grub_divmod64 (stripe_nr, nstripes - nparities, &stripen); - - /* --- -2.14.2 - diff --git a/buildroot/boot/grub2/0126-fs-btrfs-Squash-some-uninitialized-reads.patch b/buildroot/boot/grub2/0126-fs-btrfs-Squash-some-uninitialized-reads.patch deleted file mode 100644 index 32381f09b4..0000000000 --- a/buildroot/boot/grub2/0126-fs-btrfs-Squash-some-uninitialized-reads.patch +++ /dev/null @@ -1,43 +0,0 @@ -From b911884dd707ba1e6f641eb17857df3155013a45 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Mon, 18 Jan 2021 17:27:18 +1100 -Subject: [PATCH] fs/btrfs: Squash some uninitialized reads - -We need to check errors before calling into a function that uses the result. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/fs/btrfs.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c -index e4e87ba..d489cb0 100644 ---- a/grub-core/fs/btrfs.c -+++ b/grub-core/fs/btrfs.c -@@ -381,9 +381,9 @@ next (struct grub_btrfs_data *data, - - err = grub_btrfs_read_logical (data, grub_le_to_cpu64 (node.addr), - &head, sizeof (head), 0); -- check_btrfs_header (data, &head, grub_le_to_cpu64 (node.addr)); - if (err) - return -err; -+ check_btrfs_header (data, &head, grub_le_to_cpu64 (node.addr)); - - save_ref (desc, grub_le_to_cpu64 (node.addr), 0, - grub_le_to_cpu32 (head.nitems), !head.level); -@@ -443,9 +443,9 @@ lower_bound (struct grub_btrfs_data *data, - /* FIXME: preread few nodes into buffer. */ - err = grub_btrfs_read_logical (data, addr, &head, sizeof (head), - recursion_depth + 1); -- check_btrfs_header (data, &head, addr); - if (err) - return err; -+ check_btrfs_header (data, &head, addr); - addr += sizeof (head); - if (head.level) - { --- -2.14.2 - diff --git a/buildroot/boot/grub2/0127-kern-parser-Fix-a-memory-leak.patch b/buildroot/boot/grub2/0127-kern-parser-Fix-a-memory-leak.patch deleted file mode 100644 index 77b1cac291..0000000000 --- a/buildroot/boot/grub2/0127-kern-parser-Fix-a-memory-leak.patch +++ /dev/null @@ -1,77 +0,0 @@ -From c6c426e5ab6ea715153b72584de6bd8c82f698ec Mon Sep 17 00:00:00 2001 -From: Chris Coulson -Date: Wed, 18 Nov 2020 00:59:24 +0000 -Subject: [PATCH] kern/parser: Fix a memory leak - -The getline() function supplied to grub_parser_split_cmdline() returns -a newly allocated buffer and can be called multiple times, but the -returned buffer is never freed. - -Signed-off-by: Chris Coulson -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/kern/parser.c | 20 ++++++++++++++++---- - 1 file changed, 16 insertions(+), 4 deletions(-) - -diff --git a/grub-core/kern/parser.c b/grub-core/kern/parser.c -index d1cf061..39e4df6 100644 ---- a/grub-core/kern/parser.c -+++ b/grub-core/kern/parser.c -@@ -140,6 +140,7 @@ grub_parser_split_cmdline (const char *cmdline, - char buffer[1024]; - char *bp = buffer; - char *rd = (char *) cmdline; -+ char *rp = rd; - char varname[200]; - char *vp = varname; - char *args; -@@ -149,10 +150,18 @@ grub_parser_split_cmdline (const char *cmdline, - *argv = NULL; - do - { -- if (!rd || !*rd) -+ if (rp == NULL || *rp == '\0') - { -+ if (rd != cmdline) -+ { -+ grub_free (rd); -+ rd = rp = NULL; -+ } - if (getline) -- getline (&rd, 1, getline_data); -+ { -+ getline (&rd, 1, getline_data); -+ rp = rd; -+ } - else - break; - } -@@ -160,12 +169,12 @@ grub_parser_split_cmdline (const char *cmdline, - if (!rd) - break; - -- for (; *rd; rd++) -+ for (; *rp != '\0'; rp++) - { - grub_parser_state_t newstate; - char use; - -- newstate = grub_parser_cmdline_state (state, *rd, &use); -+ newstate = grub_parser_cmdline_state (state, *rp, &use); - - /* If a variable was being processed and this character does - not describe the variable anymore, write the variable to -@@ -198,6 +207,9 @@ grub_parser_split_cmdline (const char *cmdline, - } - while (state != GRUB_PARSER_STATE_TEXT && !check_varstate (state)); - -+ if (rd != cmdline) -+ grub_free (rd); -+ - /* A special case for when the last character was part of a - variable. */ - add_var (varname, &bp, &vp, state, GRUB_PARSER_STATE_TEXT); --- -2.14.2 - diff --git a/buildroot/boot/grub2/0128-kern-parser-Introduce-process_char-helper.patch b/buildroot/boot/grub2/0128-kern-parser-Introduce-process_char-helper.patch deleted file mode 100644 index f771748b08..0000000000 --- a/buildroot/boot/grub2/0128-kern-parser-Introduce-process_char-helper.patch +++ /dev/null @@ -1,120 +0,0 @@ -From b1c9e9e889e4273fb15712051c887e6078511448 Mon Sep 17 00:00:00 2001 -From: Chris Coulson -Date: Tue, 5 Jan 2021 22:17:28 +0000 -Subject: [PATCH] kern/parser: Introduce process_char() helper - -grub_parser_split_cmdline() iterates over each command line character. -In order to add error checking and to simplify the subsequent error -handling, split the character processing in to a separate function. - -Signed-off-by: Chris Coulson -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/kern/parser.c | 74 ++++++++++++++++++++++++++++++------------------- - 1 file changed, 46 insertions(+), 28 deletions(-) - -diff --git a/grub-core/kern/parser.c b/grub-core/kern/parser.c -index 39e4df6..0d3582b 100644 ---- a/grub-core/kern/parser.c -+++ b/grub-core/kern/parser.c -@@ -1,7 +1,7 @@ - /* parser.c - the part of the parser that can return partial tokens */ - /* - * GRUB -- GRand Unified Bootloader -- * Copyright (C) 2005,2007,2009 Free Software Foundation, Inc. -+ * Copyright (C) 2005,2007,2009,2021 Free Software Foundation, Inc. - * - * GRUB is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -129,6 +129,46 @@ add_var (char *varname, char **bp, char **vp, - *((*bp)++) = *val; - } - -+static grub_err_t -+process_char (char c, char *buffer, char **bp, char *varname, char **vp, -+ grub_parser_state_t state, int *argc, -+ grub_parser_state_t *newstate) -+{ -+ char use; -+ -+ *newstate = grub_parser_cmdline_state (state, c, &use); -+ -+ /* -+ * If a variable was being processed and this character does -+ * not describe the variable anymore, write the variable to -+ * the buffer. -+ */ -+ add_var (varname, bp, vp, state, *newstate); -+ -+ if (check_varstate (*newstate)) -+ { -+ if (use) -+ *((*vp)++) = use; -+ } -+ else if (*newstate == GRUB_PARSER_STATE_TEXT && -+ state != GRUB_PARSER_STATE_ESC && grub_isspace (use)) -+ { -+ /* -+ * Don't add more than one argument if multiple -+ * spaces are used. -+ */ -+ if (*bp != buffer && *((*bp) - 1) != '\0') -+ { -+ *((*bp)++) = '\0'; -+ (*argc)++; -+ } -+ } -+ else if (use) -+ *((*bp)++) = use; -+ -+ return GRUB_ERR_NONE; -+} -+ - grub_err_t - grub_parser_split_cmdline (const char *cmdline, - grub_reader_getline_t getline, void *getline_data, -@@ -172,35 +212,13 @@ grub_parser_split_cmdline (const char *cmdline, - for (; *rp != '\0'; rp++) - { - grub_parser_state_t newstate; -- char use; -- -- newstate = grub_parser_cmdline_state (state, *rp, &use); - -- /* If a variable was being processed and this character does -- not describe the variable anymore, write the variable to -- the buffer. */ -- add_var (varname, &bp, &vp, state, newstate); -- -- if (check_varstate (newstate)) -- { -- if (use) -- *(vp++) = use; -- } -- else -+ if (process_char (*rp, buffer, &bp, varname, &vp, state, argc, -+ &newstate) != GRUB_ERR_NONE) - { -- if (newstate == GRUB_PARSER_STATE_TEXT -- && state != GRUB_PARSER_STATE_ESC && grub_isspace (use)) -- { -- /* Don't add more than one argument if multiple -- spaces are used. */ -- if (bp != buffer && *(bp - 1)) -- { -- *(bp++) = '\0'; -- (*argc)++; -- } -- } -- else if (use) -- *(bp++) = use; -+ if (rd != cmdline) -+ grub_free (rd); -+ return grub_errno; - } - state = newstate; - } --- -2.14.2 - diff --git a/buildroot/boot/grub2/0129-kern-parser-Introduce-terminate_arg-helper.patch b/buildroot/boot/grub2/0129-kern-parser-Introduce-terminate_arg-helper.patch deleted file mode 100644 index 7ed9f987a5..0000000000 --- a/buildroot/boot/grub2/0129-kern-parser-Introduce-terminate_arg-helper.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 3d157bbd06506b170fde5ec23980c4bf9f7660e2 Mon Sep 17 00:00:00 2001 -From: Chris Coulson -Date: Thu, 7 Jan 2021 19:53:55 +0000 -Subject: [PATCH] kern/parser: Introduce terminate_arg() helper - -process_char() and grub_parser_split_cmdline() use similar code for -terminating the most recent argument. Add a helper function for this. - -Signed-off-by: Chris Coulson -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/kern/parser.c | 23 +++++++++++++---------- - 1 file changed, 13 insertions(+), 10 deletions(-) - -diff --git a/grub-core/kern/parser.c b/grub-core/kern/parser.c -index 0d3582b..572c670 100644 ---- a/grub-core/kern/parser.c -+++ b/grub-core/kern/parser.c -@@ -129,6 +129,16 @@ add_var (char *varname, char **bp, char **vp, - *((*bp)++) = *val; - } - -+static void -+terminate_arg (char *buffer, char **bp, int *argc) -+{ -+ if (*bp != buffer && *((*bp) - 1) != '\0') -+ { -+ *((*bp)++) = '\0'; -+ (*argc)++; -+ } -+} -+ - static grub_err_t - process_char (char c, char *buffer, char **bp, char *varname, char **vp, - grub_parser_state_t state, int *argc, -@@ -157,11 +167,7 @@ process_char (char c, char *buffer, char **bp, char *varname, char **vp, - * Don't add more than one argument if multiple - * spaces are used. - */ -- if (*bp != buffer && *((*bp) - 1) != '\0') -- { -- *((*bp)++) = '\0'; -- (*argc)++; -- } -+ terminate_arg (buffer, bp, argc); - } - else if (use) - *((*bp)++) = use; -@@ -232,11 +238,8 @@ grub_parser_split_cmdline (const char *cmdline, - variable. */ - add_var (varname, &bp, &vp, state, GRUB_PARSER_STATE_TEXT); - -- if (bp != buffer && *(bp - 1)) -- { -- *(bp++) = '\0'; -- (*argc)++; -- } -+ /* Ensure that the last argument is terminated. */ -+ terminate_arg (buffer, &bp, argc); - - /* If there are no args, then we're done. */ - if (!*argc) --- -2.14.2 - diff --git a/buildroot/boot/grub2/0130-kern-parser-Refactor-grub_parser_split_cmdline-clean.patch b/buildroot/boot/grub2/0130-kern-parser-Refactor-grub_parser_split_cmdline-clean.patch deleted file mode 100644 index e1e955ff2a..0000000000 --- a/buildroot/boot/grub2/0130-kern-parser-Refactor-grub_parser_split_cmdline-clean.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 8bc817014ce3d7a498db44eae33c8b90e2430926 Mon Sep 17 00:00:00 2001 -From: Chris Coulson -Date: Wed, 6 Jan 2021 13:54:26 +0000 -Subject: [PATCH] kern/parser: Refactor grub_parser_split_cmdline() cleanup - -Introduce a common function epilogue used for cleaning up on all -return paths, which will simplify additional error handling to be -introduced in a subsequent commit. - -Signed-off-by: Chris Coulson -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/kern/parser.c | 35 ++++++++++++++++++++--------------- - 1 file changed, 20 insertions(+), 15 deletions(-) - -diff --git a/grub-core/kern/parser.c b/grub-core/kern/parser.c -index 572c670..e010eaa 100644 ---- a/grub-core/kern/parser.c -+++ b/grub-core/kern/parser.c -@@ -221,19 +221,13 @@ grub_parser_split_cmdline (const char *cmdline, - - if (process_char (*rp, buffer, &bp, varname, &vp, state, argc, - &newstate) != GRUB_ERR_NONE) -- { -- if (rd != cmdline) -- grub_free (rd); -- return grub_errno; -- } -+ goto fail; -+ - state = newstate; - } - } - while (state != GRUB_PARSER_STATE_TEXT && !check_varstate (state)); - -- if (rd != cmdline) -- grub_free (rd); -- - /* A special case for when the last character was part of a - variable. */ - add_var (varname, &bp, &vp, state, GRUB_PARSER_STATE_TEXT); -@@ -243,20 +237,20 @@ grub_parser_split_cmdline (const char *cmdline, - - /* If there are no args, then we're done. */ - if (!*argc) -- return 0; -+ { -+ grub_errno = GRUB_ERR_NONE; -+ goto out; -+ } - - /* Reserve memory for the return values. */ - args = grub_malloc (bp - buffer); - if (!args) -- return grub_errno; -+ goto fail; - grub_memcpy (args, buffer, bp - buffer); - - *argv = grub_calloc (*argc + 1, sizeof (char *)); - if (!*argv) -- { -- grub_free (args); -- return grub_errno; -- } -+ goto fail; - - /* The arguments are separated with 0's, setup argv so it points to - the right values. */ -@@ -269,7 +263,18 @@ grub_parser_split_cmdline (const char *cmdline, - bp++; - } - -- return 0; -+ grub_errno = GRUB_ERR_NONE; -+ -+ out: -+ if (rd != cmdline) -+ grub_free (rd); -+ -+ return grub_errno; -+ -+ fail: -+ grub_free (*argv); -+ grub_free (args); -+ goto out; - } - - /* Helper for grub_parser_execute. */ --- -2.14.2 - diff --git a/buildroot/boot/grub2/0131-kern-buffer-Add-variable-sized-heap-buffer.patch b/buildroot/boot/grub2/0131-kern-buffer-Add-variable-sized-heap-buffer.patch deleted file mode 100644 index 1731011ca6..0000000000 --- a/buildroot/boot/grub2/0131-kern-buffer-Add-variable-sized-heap-buffer.patch +++ /dev/null @@ -1,1237 +0,0 @@ -From 030fb6c4fa354cdbd6a8d6903dfed5d36eaf3cb2 Mon Sep 17 00:00:00 2001 -From: Chris Coulson -Date: Thu, 7 Jan 2021 15:15:43 +0000 -Subject: [PATCH] kern/buffer: Add variable sized heap buffer - -Add a new variable sized heap buffer type (grub_buffer_t) with simple -operations for appending data, accessing the data and maintaining -a read cursor. - -Signed-off-by: Chris Coulson -Reviewed-by: Daniel Kiper -[Add changes to generated files] -Signed-off-by: Stefan Sørensen ---- - grub-core/Makefile.core.am | 46 +++--- - grub-core/Makefile.core.def | 1 + - grub-core/Makefile.in | 341 +++++++++++++++++++++++++------------------- - grub-core/kern/buffer.c | 117 +++++++++++++++ - include/grub/buffer.h | 144 +++++++++++++++++++ - po/POTFILES.in | 2 + - 6 files changed, 485 insertions(+), 166 deletions(-) - create mode 100644 grub-core/kern/buffer.c - create mode 100644 include/grub/buffer.h - -diff --git a/grub-core/Makefile.core.am b/grub-core/Makefile.core.am -index fbfb627..2fa9a8e 100644 ---- a/grub-core/Makefile.core.am -+++ b/grub-core/Makefile.core.am -@@ -22334,7 +22334,7 @@ gcry_whirlpool.marker: $(gcry_whirlpool_module_SOURCES) $(nodist_gcry_whirlpool_ - if COND_emu - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = --kernel_exec_SOURCES += disk/host.c kern/emu/cache_s.S kern/emu/hostdisk.c osdep/unix/hostdisk.c osdep/exec.c osdep/devmapper/hostdisk.c osdep/hostdisk.c kern/emu/hostfs.c kern/emu/main.c kern/emu/argp_common.c kern/emu/misc.c kern/emu/mm.c kern/emu/time.c kern/emu/cache.c osdep/emuconsole.c osdep/dl.c osdep/sleep.c osdep/init.c osdep/emunet.c osdep/cputime.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += disk/host.c kern/emu/cache_s.S kern/emu/hostdisk.c osdep/unix/hostdisk.c osdep/exec.c osdep/devmapper/hostdisk.c osdep/hostdisk.c kern/emu/hostfs.c kern/emu/main.c kern/emu/argp_common.c kern/emu/misc.c kern/emu/mm.c kern/emu/time.c kern/emu/cache.c osdep/emuconsole.c osdep/dl.c osdep/sleep.c osdep/init.c osdep/emunet.c osdep/cputime.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/buffer.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) $(CFLAGS_GNULIB) -@@ -22356,7 +22356,7 @@ endif - if COND_i386_pc - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/i386/pc/startup.S --kernel_exec_SOURCES += kern/i386/pc/init.c kern/i386/pc/mmap.c term/i386/pc/console.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/i386/pc/init.c kern/i386/pc/mmap.c term/i386/pc/console.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/buffer.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22378,7 +22378,7 @@ endif - if COND_i386_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/i386/efi/startup.S --kernel_exec_SOURCES += kern/i386/efi/tsc.c kern/i386/tsc_pmtimer.c kern/i386/efi/init.c bus/pci.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/i386/efi/tsc.c kern/i386/tsc_pmtimer.c kern/i386/efi/init.c bus/pci.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/buffer.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22400,7 +22400,7 @@ endif - if COND_i386_qemu - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/i386/qemu/startup.S --kernel_exec_SOURCES += kern/i386/qemu/init.c bus/pci.c kern/vga_init.c kern/i386/qemu/mmap.c term/i386/pc/vga_text.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/i386/qemu/init.c bus/pci.c kern/vga_init.c kern/i386/qemu/mmap.c term/i386/pc/vga_text.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/buffer.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22422,7 +22422,7 @@ endif - if COND_i386_coreboot - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/i386/coreboot/startup.S --kernel_exec_SOURCES += kern/i386/coreboot/init.c kern/i386/pc/acpi.c kern/acpi.c kern/i386/tsc_pmtimer.c kern/i386/coreboot/cbtable.c video/coreboot/cbfb.c kern/coreboot/mmap.c kern/coreboot/cbtable.c term/gfxterm.c font/font.c font/font_cmd.c io/bufio.c video/fb/fbblit.c video/fb/fbfill.c video/fb/fbutil.c video/fb/video_fb.c video/video.c term/i386/pc/vga_text.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/i386/coreboot/init.c kern/i386/pc/acpi.c kern/acpi.c kern/i386/tsc_pmtimer.c kern/i386/coreboot/cbtable.c video/coreboot/cbfb.c kern/coreboot/mmap.c kern/coreboot/cbtable.c term/gfxterm.c font/font.c font/font_cmd.c io/bufio.c video/fb/fbblit.c video/fb/fbfill.c video/fb/fbutil.c video/fb/video_fb.c video/video.c term/i386/pc/vga_text.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/buffer.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22444,7 +22444,7 @@ endif - if COND_i386_multiboot - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/i386/coreboot/startup.S --kernel_exec_SOURCES += kern/i386/coreboot/init.c kern/i386/pc/acpi.c kern/acpi.c kern/i386/multiboot_mmap.c term/i386/pc/vga_text.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/i386/coreboot/init.c kern/i386/pc/acpi.c kern/acpi.c kern/i386/multiboot_mmap.c term/i386/pc/vga_text.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/buffer.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22466,7 +22466,7 @@ endif - if COND_i386_ieee1275 - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/i386/ieee1275/startup.S --kernel_exec_SOURCES += disk/ieee1275/ofdisk.c kern/ieee1275/cmain.c kern/ieee1275/ieee1275.c kern/ieee1275/mmap.c kern/ieee1275/openfw.c term/ieee1275/console.c kern/ieee1275/init.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += disk/ieee1275/ofdisk.c kern/ieee1275/cmain.c kern/ieee1275/ieee1275.c kern/ieee1275/mmap.c kern/ieee1275/openfw.c term/ieee1275/console.c kern/ieee1275/init.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/buffer.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22488,7 +22488,7 @@ endif - if COND_x86_64_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/x86_64/efi/startup.S --kernel_exec_SOURCES += kern/i386/efi/tsc.c kern/i386/tsc_pmtimer.c kern/x86_64/efi/callwrap.S kern/i386/efi/init.c bus/pci.c kern/x86_64/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/i386/efi/tsc.c kern/i386/tsc_pmtimer.c kern/x86_64/efi/callwrap.S kern/i386/efi/init.c bus/pci.c kern/x86_64/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/buffer.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22510,7 +22510,7 @@ endif - if COND_i386_xen - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/i386/xen/startup.S --kernel_exec_SOURCES += kern/i386/dl.c kern/i386/xen/hypercall.S kern/i386/tsc.c kern/i386/xen/tsc.c kern/xen/init.c term/xen/console.c disk/xen/xendisk.c commands/boot.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/i386/dl.c kern/i386/xen/hypercall.S kern/i386/tsc.c kern/i386/xen/tsc.c kern/xen/init.c term/xen/console.c disk/xen/xendisk.c commands/boot.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/buffer.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22532,7 +22532,7 @@ endif - if COND_x86_64_xen - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/x86_64/xen/startup.S --kernel_exec_SOURCES += kern/x86_64/dl.c kern/x86_64/xen/hypercall.S kern/i386/tsc.c kern/i386/xen/tsc.c kern/xen/init.c term/xen/console.c disk/xen/xendisk.c commands/boot.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/x86_64/dl.c kern/x86_64/xen/hypercall.S kern/i386/tsc.c kern/i386/xen/tsc.c kern/xen/init.c term/xen/console.c disk/xen/xendisk.c commands/boot.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/buffer.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22554,7 +22554,7 @@ endif - if COND_i386_xen_pvh - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/i386/xen/startup_pvh.S --kernel_exec_SOURCES += kern/i386/dl.c commands/boot.c disk/xen/xendisk.c kern/i386/tsc.c kern/i386/xen/tsc.c kern/i386/xen/pvh.c kern/xen/init.c term/xen/console.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/i386/dl.c commands/boot.c disk/xen/xendisk.c kern/i386/tsc.c kern/i386/xen/tsc.c kern/i386/xen/pvh.c kern/xen/init.c term/xen/console.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/buffer.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22576,7 +22576,7 @@ endif - if COND_mips_loongson - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/mips/startup.S --kernel_exec_SOURCES += term/ns8250.c bus/bonito.c bus/cs5536.c bus/pci.c kern/mips/loongson/init.c term/at_keyboard.c term/ps2.c commands/boot.c term/serial.c video/sm712.c video/sis315pro.c video/radeon_fuloong2e.c video/radeon_yeeloong3a.c commands/keylayouts.c term/gfxterm.c font/font.c font/font_cmd.c io/bufio.c video/fb/fbblit.c video/fb/fbfill.c video/fb/fbutil.c video/fb/video_fb.c video/video.c kern/generic/rtc_get_time_ms.c kern/mips/cache.S kern/mips/dl.c kern/mips/init.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += term/ns8250.c bus/bonito.c bus/cs5536.c bus/pci.c kern/mips/loongson/init.c term/at_keyboard.c term/ps2.c commands/boot.c term/serial.c video/sm712.c video/sis315pro.c video/radeon_fuloong2e.c video/radeon_yeeloong3a.c commands/keylayouts.c term/gfxterm.c font/font.c font/font_cmd.c io/bufio.c video/fb/fbblit.c video/fb/fbfill.c video/fb/fbutil.c video/fb/video_fb.c video/video.c kern/generic/rtc_get_time_ms.c kern/mips/cache.S kern/mips/dl.c kern/mips/init.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/buffer.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22598,7 +22598,7 @@ endif - if COND_sparc64_ieee1275 - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/sparc64/ieee1275/crt0.S --kernel_exec_SOURCES += kern/sparc64/cache.S kern/sparc64/dl.c kern/sparc64/ieee1275/ieee1275.c disk/ieee1275/obdisk.c disk/ieee1275/ofdisk.c kern/ieee1275/cmain.c kern/ieee1275/ieee1275.c kern/ieee1275/mmap.c kern/ieee1275/openfw.c term/ieee1275/console.c kern/ieee1275/init.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/sparc64/cache.S kern/sparc64/dl.c kern/sparc64/ieee1275/ieee1275.c disk/ieee1275/obdisk.c disk/ieee1275/ofdisk.c kern/ieee1275/cmain.c kern/ieee1275/ieee1275.c kern/ieee1275/mmap.c kern/ieee1275/openfw.c term/ieee1275/console.c kern/ieee1275/init.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/buffer.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22620,7 +22620,7 @@ endif - if COND_powerpc_ieee1275 - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/powerpc/ieee1275/startup.S --kernel_exec_SOURCES += kern/powerpc/cache.S kern/powerpc/dl.c kern/powerpc/compiler-rt.S disk/ieee1275/ofdisk.c kern/ieee1275/cmain.c kern/ieee1275/ieee1275.c kern/ieee1275/mmap.c kern/ieee1275/openfw.c term/ieee1275/console.c kern/ieee1275/init.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/powerpc/cache.S kern/powerpc/dl.c kern/powerpc/compiler-rt.S disk/ieee1275/ofdisk.c kern/ieee1275/cmain.c kern/ieee1275/ieee1275.c kern/ieee1275/mmap.c kern/ieee1275/openfw.c term/ieee1275/console.c kern/ieee1275/init.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/buffer.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22642,7 +22642,7 @@ endif - if COND_mips_arc - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/mips/startup.S --kernel_exec_SOURCES += kern/mips/arc/init.c term/arc/console.c disk/arc/arcdisk.c kern/generic/rtc_get_time_ms.c kern/mips/cache.S kern/mips/dl.c kern/mips/init.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/mips/arc/init.c term/arc/console.c disk/arc/arcdisk.c kern/generic/rtc_get_time_ms.c kern/mips/cache.S kern/mips/dl.c kern/mips/init.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/buffer.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22664,7 +22664,7 @@ endif - if COND_ia64_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = --kernel_exec_SOURCES += kern/ia64/efi/startup.S kern/ia64/efi/init.c kern/ia64/dl.c kern/ia64/dl_helper.c kern/ia64/cache.c lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/ia64/efi/startup.S kern/ia64/efi/init.c kern/ia64/dl.c kern/ia64/dl_helper.c kern/ia64/cache.c lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/buffer.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -fno-builtin -fpic -minline-int-divide-max-throughput -@@ -22686,7 +22686,7 @@ endif - if COND_mips_qemu_mips - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/mips/startup.S --kernel_exec_SOURCES += kern/mips/qemu_mips/init.c term/ns8250.c term/serial.c term/at_keyboard.c term/ps2.c commands/boot.c commands/keylayouts.c term/i386/pc/vga_text.c kern/vga_init.c kern/generic/rtc_get_time_ms.c kern/mips/cache.S kern/mips/dl.c kern/mips/init.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/mips/qemu_mips/init.c term/ns8250.c term/serial.c term/at_keyboard.c term/ps2.c commands/boot.c commands/keylayouts.c term/i386/pc/vga_text.c kern/vga_init.c kern/generic/rtc_get_time_ms.c kern/mips/cache.S kern/mips/dl.c kern/mips/init.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/buffer.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22708,7 +22708,7 @@ endif - if COND_arm_uboot - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/arm/startup.S --kernel_exec_SOURCES += kern/arm/uboot/init.c kern/arm/uboot/uboot.S disk/uboot/ubootdisk.c kern/uboot/uboot.c kern/uboot/init.c kern/uboot/hw.c term/uboot/console.c kern/arm/dl.c kern/arm/dl_helper.c kern/arm/cache_armv6.S kern/arm/cache_armv7.S kern/arm/cache.c kern/arm/compiler-rt.S lib/division.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/arm/uboot/init.c kern/arm/uboot/uboot.S disk/uboot/ubootdisk.c kern/uboot/uboot.c kern/uboot/init.c kern/uboot/hw.c term/uboot/console.c kern/arm/dl.c kern/arm/dl_helper.c kern/arm/cache_armv6.S kern/arm/cache_armv7.S kern/arm/cache.c kern/arm/compiler-rt.S lib/division.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/buffer.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22730,7 +22730,7 @@ endif - if COND_arm_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/arm/efi/startup.S --kernel_exec_SOURCES += kern/arm/efi/init.c kern/efi/fdt.c kern/arm/dl.c kern/arm/dl_helper.c kern/arm/cache_armv6.S kern/arm/cache_armv7.S kern/arm/cache.c kern/arm/compiler-rt.S lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/arm/efi/init.c kern/efi/fdt.c kern/arm/dl.c kern/arm/dl_helper.c kern/arm/cache_armv6.S kern/arm/cache_armv7.S kern/arm/cache.c kern/arm/compiler-rt.S lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/buffer.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22752,7 +22752,7 @@ endif - if COND_arm64_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/arm64/efi/startup.S --kernel_exec_SOURCES += kern/arm64/efi/init.c kern/efi/fdt.c kern/arm64/cache.c kern/arm64/cache_flush.S kern/arm64/dl.c kern/arm64/dl_helper.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/arm64/efi/init.c kern/efi/fdt.c kern/arm64/cache.c kern/arm64/cache_flush.S kern/arm64/dl.c kern/arm64/dl_helper.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/buffer.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22774,7 +22774,7 @@ endif - if COND_arm_coreboot - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/arm/startup.S --kernel_exec_SOURCES += kern/arm/coreboot/init.c kern/arm/coreboot/timer.c kern/arm/coreboot/coreboot.S lib/fdt.c bus/fdt.c term/ps2.c term/arm/pl050.c term/arm/cros.c term/arm/cros_ec.c bus/spi/rk3288_spi.c commands/keylayouts.c kern/arm/coreboot/dma.c kern/arm/coreboot/cbtable.c video/coreboot/cbfb.c kern/coreboot/mmap.c kern/coreboot/cbtable.c term/gfxterm.c font/font.c font/font_cmd.c io/bufio.c video/fb/fbblit.c video/fb/fbfill.c video/fb/fbutil.c video/fb/video_fb.c video/video.c kern/arm/dl.c kern/arm/dl_helper.c kern/arm/cache_armv6.S kern/arm/cache_armv7.S kern/arm/cache.c kern/arm/compiler-rt.S lib/division.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/arm/coreboot/init.c kern/arm/coreboot/timer.c kern/arm/coreboot/coreboot.S lib/fdt.c bus/fdt.c term/ps2.c term/arm/pl050.c term/arm/cros.c term/arm/cros_ec.c bus/spi/rk3288_spi.c commands/keylayouts.c kern/arm/coreboot/dma.c kern/arm/coreboot/cbtable.c video/coreboot/cbfb.c kern/coreboot/mmap.c kern/coreboot/cbtable.c term/gfxterm.c font/font.c font/font_cmd.c io/bufio.c video/fb/fbblit.c video/fb/fbfill.c video/fb/fbutil.c video/fb/video_fb.c video/video.c kern/arm/dl.c kern/arm/dl_helper.c kern/arm/cache_armv6.S kern/arm/cache_armv7.S kern/arm/cache.c kern/arm/compiler-rt.S lib/division.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/buffer.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22796,7 +22796,7 @@ endif - if COND_riscv32_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/riscv/efi/startup.S --kernel_exec_SOURCES += kern/riscv/efi/init.c kern/efi/fdt.c kern/riscv/cache.c kern/riscv/cache_flush.S kern/riscv/dl.c lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/riscv/efi/init.c kern/efi/fdt.c kern/riscv/cache.c kern/riscv/cache_flush.S kern/riscv/dl.c lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/buffer.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22818,7 +22818,7 @@ endif - if COND_riscv64_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/riscv/efi/startup.S --kernel_exec_SOURCES += kern/riscv/efi/init.c kern/efi/fdt.c kern/riscv/cache.c kern/riscv/cache_flush.S kern/riscv/dl.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/riscv/efi/init.c kern/efi/fdt.c kern/riscv/cache.c kern/riscv/cache_flush.S kern/riscv/dl.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/buffer.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index ee8dc55..291b58a 100644 ---- a/grub-core/Makefile.core.def -+++ b/grub-core/Makefile.core.def -@@ -123,6 +123,7 @@ kernel = { - riscv32_efi_startup = kern/riscv/efi/startup.S; - riscv64_efi_startup = kern/riscv/efi/startup.S; - -+ common = kern/buffer.c; - common = kern/command.c; - common = kern/corecmd.c; - common = kern/device.c; -diff --git a/grub-core/Makefile.in b/grub-core/Makefile.in -index ac400ea..1f8133b 100644 ---- a/grub-core/Makefile.in -+++ b/grub-core/Makefile.in -@@ -10459,12 +10459,12 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c \ - kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c \ - kern/compiler-rt.c kern/mm.c kern/time.c \ -- kern/generic/millisleep.c kern/command.c kern/corecmd.c \ -- kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c \ -- kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c \ -- kern/parser.c kern/partition.c kern/rescue_parser.c \ -- kern/rescue_reader.c kern/term.c kern/verifiers.c \ -- kern/arm/startup.S kern/arm/coreboot/init.c \ -+ kern/generic/millisleep.c kern/buffer.c kern/command.c \ -+ kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c \ -+ kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c \ -+ kern/misc.c kern/parser.c kern/partition.c \ -+ kern/rescue_parser.c kern/rescue_reader.c kern/term.c \ -+ kern/verifiers.c kern/arm/startup.S kern/arm/coreboot/init.c \ - kern/arm/coreboot/timer.c kern/arm/coreboot/coreboot.S \ - lib/fdt.c bus/fdt.c term/ps2.c term/arm/pl050.c \ - term/arm/cros.c term/arm/cros_ec.c bus/spi/rk3288_spi.c \ -@@ -10538,6 +10538,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_TRUE@ kern/generic/kernel_exec-millisleep.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_TRUE@ kern/kernel_exec-buffer.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_TRUE@ kern/kernel_exec-command.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_TRUE@ kern/kernel_exec-corecmd.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_TRUE@ kern/kernel_exec-device.$(OBJEXT) \ -@@ -10578,6 +10579,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/generic/kernel_exec-millisleep.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-buffer.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-command.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-corecmd.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-device.$(OBJEXT) \ -@@ -10616,6 +10618,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_TRUE@ kern/generic/kernel_exec-millisleep.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_TRUE@ kern/kernel_exec-buffer.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_TRUE@ kern/kernel_exec-command.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_TRUE@ kern/kernel_exec-corecmd.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_TRUE@ kern/kernel_exec-device.$(OBJEXT) \ -@@ -10653,6 +10656,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/generic/kernel_exec-millisleep.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-buffer.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-command.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-corecmd.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-device.$(OBJEXT) \ -@@ -10691,6 +10695,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/generic/kernel_exec-millisleep.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-buffer.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-command.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-corecmd.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-device.$(OBJEXT) \ -@@ -10728,6 +10733,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_TRUE@ kern/generic/kernel_exec-millisleep.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_TRUE@ kern/kernel_exec-buffer.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_TRUE@ kern/kernel_exec-command.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_TRUE@ kern/kernel_exec-corecmd.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_TRUE@ kern/kernel_exec-device.$(OBJEXT) \ -@@ -10768,6 +10774,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_TRUE@ kern/generic/kernel_exec-millisleep.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_TRUE@ kern/kernel_exec-buffer.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_TRUE@ kern/kernel_exec-command.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_TRUE@ kern/kernel_exec-corecmd.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_TRUE@ kern/kernel_exec-device.$(OBJEXT) \ -@@ -10822,6 +10829,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_TRUE@ kern/generic/kernel_exec-millisleep.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_TRUE@ kern/kernel_exec-buffer.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_TRUE@ kern/kernel_exec-command.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_TRUE@ kern/kernel_exec-corecmd.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_TRUE@ kern/kernel_exec-device.$(OBJEXT) \ -@@ -10856,6 +10864,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_TRUE@ kern/generic/kernel_exec-millisleep.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_TRUE@ kern/kernel_exec-buffer.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_TRUE@ kern/kernel_exec-command.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_TRUE@ kern/kernel_exec-corecmd.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_TRUE@ kern/kernel_exec-device.$(OBJEXT) \ -@@ -10893,6 +10902,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/generic/kernel_exec-millisleep.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-buffer.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-command.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-corecmd.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-device.$(OBJEXT) \ -@@ -10928,6 +10938,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_TRUE@ kern/generic/kernel_exec-millisleep.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_TRUE@ kern/kernel_exec-buffer.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_TRUE@ kern/kernel_exec-command.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_TRUE@ kern/kernel_exec-corecmd.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_TRUE@ kern/kernel_exec-device.$(OBJEXT) \ -@@ -10963,6 +10974,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_TRUE@ kern/generic/kernel_exec-millisleep.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_TRUE@ kern/kernel_exec-buffer.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_TRUE@ kern/kernel_exec-command.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_TRUE@ kern/kernel_exec-corecmd.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_TRUE@ kern/kernel_exec-device.$(OBJEXT) \ -@@ -10994,6 +11006,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_TRUE@ kern/generic/kernel_exec-millisleep.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_TRUE@ kern/kernel_exec-buffer.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_TRUE@ kern/kernel_exec-command.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_TRUE@ kern/kernel_exec-corecmd.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_TRUE@ kern/kernel_exec-device.$(OBJEXT) \ -@@ -11023,6 +11036,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_TRUE@ kern/generic/kernel_exec-millisleep.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_TRUE@ kern/kernel_exec-buffer.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_TRUE@ kern/kernel_exec-command.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_TRUE@ kern/kernel_exec-corecmd.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_TRUE@ kern/kernel_exec-device.$(OBJEXT) \ -@@ -11054,6 +11068,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_TRUE@ kern/generic/kernel_exec-millisleep.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_TRUE@ kern/kernel_exec-buffer.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_TRUE@ kern/kernel_exec-command.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_TRUE@ kern/kernel_exec-corecmd.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_TRUE@ kern/kernel_exec-device.$(OBJEXT) \ -@@ -11091,6 +11106,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_TRUE@ kern/generic/kernel_exec-millisleep.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_TRUE@ kern/kernel_exec-buffer.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_TRUE@ kern/kernel_exec-command.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_TRUE@ kern/kernel_exec-corecmd.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_TRUE@ kern/kernel_exec-device.$(OBJEXT) \ -@@ -11130,6 +11146,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/generic/kernel_exec-millisleep.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-buffer.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-command.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-corecmd.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-device.$(OBJEXT) \ -@@ -11174,6 +11191,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_TRUE@ kern/generic/kernel_exec-millisleep.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_TRUE@ kern/kernel_exec-buffer.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_TRUE@ kern/kernel_exec-command.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_TRUE@ kern/kernel_exec-corecmd.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_TRUE@ kern/kernel_exec-device.$(OBJEXT) \ -@@ -11216,6 +11234,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_TRUE@ term/kernel_exec-tparm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_TRUE@ commands/kernel_exec-extcmd.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_TRUE@ lib/kernel_exec-arg.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_TRUE@ kern/kernel_exec-buffer.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_TRUE@ kern/kernel_exec-command.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_TRUE@ kern/kernel_exec-corecmd.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_TRUE@ kern/kernel_exec-device.$(OBJEXT) \ -@@ -11257,6 +11276,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_TRUE@ kern/generic/kernel_exec-millisleep.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_TRUE@ kern/kernel_exec-buffer.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_TRUE@ kern/kernel_exec-command.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_TRUE@ kern/kernel_exec-corecmd.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_TRUE@ kern/kernel_exec-device.$(OBJEXT) \ -@@ -11298,6 +11318,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/generic/kernel_exec-millisleep.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-buffer.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-command.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-corecmd.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-device.$(OBJEXT) \ -@@ -11353,6 +11374,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_TRUE@ kern/generic/kernel_exec-millisleep.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_TRUE@ kern/kernel_exec-buffer.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_TRUE@ kern/kernel_exec-command.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_TRUE@ kern/kernel_exec-corecmd.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_TRUE@ kern/kernel_exec-device.$(OBJEXT) \ -@@ -11391,6 +11413,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ - @COND_arm64_efi_TRUE@ kern/generic/kernel_exec-millisleep.$(OBJEXT) \ -+@COND_arm64_efi_TRUE@ kern/kernel_exec-buffer.$(OBJEXT) \ - @COND_arm64_efi_TRUE@ kern/kernel_exec-command.$(OBJEXT) \ - @COND_arm64_efi_TRUE@ kern/kernel_exec-corecmd.$(OBJEXT) \ - @COND_arm64_efi_TRUE@ kern/kernel_exec-device.$(OBJEXT) \ -@@ -25607,11 +25630,12 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_arm64_efi_TRUE@ kern/acpi.c kern/efi/acpi.c kern/efi/sb.c \ - @COND_arm64_efi_TRUE@ kern/lockdown.c kern/compiler-rt.c \ - @COND_arm64_efi_TRUE@ kern/mm.c kern/time.c \ --@COND_arm64_efi_TRUE@ kern/generic/millisleep.c kern/command.c \ --@COND_arm64_efi_TRUE@ kern/corecmd.c kern/device.c kern/disk.c \ --@COND_arm64_efi_TRUE@ kern/dl.c kern/env.c kern/err.c \ --@COND_arm64_efi_TRUE@ kern/file.c kern/fs.c kern/list.c \ --@COND_arm64_efi_TRUE@ kern/main.c kern/misc.c kern/parser.c \ -+@COND_arm64_efi_TRUE@ kern/generic/millisleep.c kern/buffer.c \ -+@COND_arm64_efi_TRUE@ kern/command.c kern/corecmd.c \ -+@COND_arm64_efi_TRUE@ kern/device.c kern/disk.c kern/dl.c \ -+@COND_arm64_efi_TRUE@ kern/env.c kern/err.c kern/file.c \ -+@COND_arm64_efi_TRUE@ kern/fs.c kern/list.c kern/main.c \ -+@COND_arm64_efi_TRUE@ kern/misc.c kern/parser.c \ - @COND_arm64_efi_TRUE@ kern/partition.c kern/rescue_parser.c \ - @COND_arm64_efi_TRUE@ kern/rescue_reader.c kern/term.c \ - @COND_arm64_efi_TRUE@ kern/verifiers.c -@@ -25639,12 +25663,13 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_arm_coreboot_TRUE@ kern/arm/compiler-rt.S lib/division.c \ - @COND_arm_coreboot_TRUE@ kern/compiler-rt.c kern/mm.c \ - @COND_arm_coreboot_TRUE@ kern/time.c kern/generic/millisleep.c \ --@COND_arm_coreboot_TRUE@ kern/command.c kern/corecmd.c \ --@COND_arm_coreboot_TRUE@ kern/device.c kern/disk.c kern/dl.c \ --@COND_arm_coreboot_TRUE@ kern/env.c kern/err.c kern/file.c \ --@COND_arm_coreboot_TRUE@ kern/fs.c kern/list.c kern/main.c \ --@COND_arm_coreboot_TRUE@ kern/misc.c kern/parser.c \ --@COND_arm_coreboot_TRUE@ kern/partition.c kern/rescue_parser.c \ -+@COND_arm_coreboot_TRUE@ kern/buffer.c kern/command.c \ -+@COND_arm_coreboot_TRUE@ kern/corecmd.c kern/device.c \ -+@COND_arm_coreboot_TRUE@ kern/disk.c kern/dl.c kern/env.c \ -+@COND_arm_coreboot_TRUE@ kern/err.c kern/file.c kern/fs.c \ -+@COND_arm_coreboot_TRUE@ kern/list.c kern/main.c kern/misc.c \ -+@COND_arm_coreboot_TRUE@ kern/parser.c kern/partition.c \ -+@COND_arm_coreboot_TRUE@ kern/rescue_parser.c \ - @COND_arm_coreboot_TRUE@ kern/rescue_reader.c kern/term.c \ - @COND_arm_coreboot_TRUE@ kern/verifiers.c - @COND_arm_efi_TRUE@kernel_exec_SOURCES = kern/arm/efi/startup.S \ -@@ -25659,13 +25684,14 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_arm_efi_TRUE@ kern/efi/acpi.c kern/efi/sb.c \ - @COND_arm_efi_TRUE@ kern/lockdown.c kern/compiler-rt.c \ - @COND_arm_efi_TRUE@ kern/mm.c kern/time.c \ --@COND_arm_efi_TRUE@ kern/generic/millisleep.c kern/command.c \ --@COND_arm_efi_TRUE@ kern/corecmd.c kern/device.c kern/disk.c \ --@COND_arm_efi_TRUE@ kern/dl.c kern/env.c kern/err.c kern/file.c \ --@COND_arm_efi_TRUE@ kern/fs.c kern/list.c kern/main.c \ --@COND_arm_efi_TRUE@ kern/misc.c kern/parser.c kern/partition.c \ --@COND_arm_efi_TRUE@ kern/rescue_parser.c kern/rescue_reader.c \ --@COND_arm_efi_TRUE@ kern/term.c kern/verifiers.c -+@COND_arm_efi_TRUE@ kern/generic/millisleep.c kern/buffer.c \ -+@COND_arm_efi_TRUE@ kern/command.c kern/corecmd.c kern/device.c \ -+@COND_arm_efi_TRUE@ kern/disk.c kern/dl.c kern/env.c kern/err.c \ -+@COND_arm_efi_TRUE@ kern/file.c kern/fs.c kern/list.c \ -+@COND_arm_efi_TRUE@ kern/main.c kern/misc.c kern/parser.c \ -+@COND_arm_efi_TRUE@ kern/partition.c kern/rescue_parser.c \ -+@COND_arm_efi_TRUE@ kern/rescue_reader.c kern/term.c \ -+@COND_arm_efi_TRUE@ kern/verifiers.c - @COND_arm_uboot_TRUE@kernel_exec_SOURCES = kern/arm/startup.S \ - @COND_arm_uboot_TRUE@ kern/arm/uboot/init.c \ - @COND_arm_uboot_TRUE@ kern/arm/uboot/uboot.S \ -@@ -25679,11 +25705,12 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_arm_uboot_TRUE@ term/terminfo.c term/tparm.c \ - @COND_arm_uboot_TRUE@ commands/extcmd.c lib/arg.c \ - @COND_arm_uboot_TRUE@ kern/compiler-rt.c kern/mm.c kern/time.c \ --@COND_arm_uboot_TRUE@ kern/generic/millisleep.c kern/command.c \ --@COND_arm_uboot_TRUE@ kern/corecmd.c kern/device.c kern/disk.c \ --@COND_arm_uboot_TRUE@ kern/dl.c kern/env.c kern/err.c \ --@COND_arm_uboot_TRUE@ kern/file.c kern/fs.c kern/list.c \ --@COND_arm_uboot_TRUE@ kern/main.c kern/misc.c kern/parser.c \ -+@COND_arm_uboot_TRUE@ kern/generic/millisleep.c kern/buffer.c \ -+@COND_arm_uboot_TRUE@ kern/command.c kern/corecmd.c \ -+@COND_arm_uboot_TRUE@ kern/device.c kern/disk.c kern/dl.c \ -+@COND_arm_uboot_TRUE@ kern/env.c kern/err.c kern/file.c \ -+@COND_arm_uboot_TRUE@ kern/fs.c kern/list.c kern/main.c \ -+@COND_arm_uboot_TRUE@ kern/misc.c kern/parser.c \ - @COND_arm_uboot_TRUE@ kern/partition.c kern/rescue_parser.c \ - @COND_arm_uboot_TRUE@ kern/rescue_reader.c kern/term.c \ - @COND_arm_uboot_TRUE@ kern/verifiers.c -@@ -25696,11 +25723,11 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_emu_TRUE@ kern/emu/cache.c osdep/emuconsole.c osdep/dl.c \ - @COND_emu_TRUE@ osdep/sleep.c osdep/init.c osdep/emunet.c \ - @COND_emu_TRUE@ osdep/cputime.c term/terminfo.c term/tparm.c \ --@COND_emu_TRUE@ commands/extcmd.c lib/arg.c kern/command.c \ --@COND_emu_TRUE@ kern/corecmd.c kern/device.c kern/disk.c \ --@COND_emu_TRUE@ kern/dl.c kern/env.c kern/err.c kern/file.c \ --@COND_emu_TRUE@ kern/fs.c kern/list.c kern/main.c kern/misc.c \ --@COND_emu_TRUE@ kern/parser.c kern/partition.c \ -+@COND_emu_TRUE@ commands/extcmd.c lib/arg.c kern/buffer.c \ -+@COND_emu_TRUE@ kern/command.c kern/corecmd.c kern/device.c \ -+@COND_emu_TRUE@ kern/disk.c kern/dl.c kern/env.c kern/err.c \ -+@COND_emu_TRUE@ kern/file.c kern/fs.c kern/list.c kern/main.c \ -+@COND_emu_TRUE@ kern/misc.c kern/parser.c kern/partition.c \ - @COND_emu_TRUE@ kern/rescue_parser.c kern/rescue_reader.c \ - @COND_emu_TRUE@ kern/term.c kern/verifiers.c - @COND_i386_coreboot_TRUE@kernel_exec_SOURCES = \ -@@ -25721,12 +25748,13 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_i386_coreboot_TRUE@ kern/i386/tsc_pit.c \ - @COND_i386_coreboot_TRUE@ kern/compiler-rt.c kern/mm.c \ - @COND_i386_coreboot_TRUE@ kern/time.c kern/generic/millisleep.c \ --@COND_i386_coreboot_TRUE@ kern/command.c kern/corecmd.c \ --@COND_i386_coreboot_TRUE@ kern/device.c kern/disk.c kern/dl.c \ --@COND_i386_coreboot_TRUE@ kern/env.c kern/err.c kern/file.c \ --@COND_i386_coreboot_TRUE@ kern/fs.c kern/list.c kern/main.c \ --@COND_i386_coreboot_TRUE@ kern/misc.c kern/parser.c \ --@COND_i386_coreboot_TRUE@ kern/partition.c kern/rescue_parser.c \ -+@COND_i386_coreboot_TRUE@ kern/buffer.c kern/command.c \ -+@COND_i386_coreboot_TRUE@ kern/corecmd.c kern/device.c \ -+@COND_i386_coreboot_TRUE@ kern/disk.c kern/dl.c kern/env.c \ -+@COND_i386_coreboot_TRUE@ kern/err.c kern/file.c kern/fs.c \ -+@COND_i386_coreboot_TRUE@ kern/list.c kern/main.c kern/misc.c \ -+@COND_i386_coreboot_TRUE@ kern/parser.c kern/partition.c \ -+@COND_i386_coreboot_TRUE@ kern/rescue_parser.c \ - @COND_i386_coreboot_TRUE@ kern/rescue_reader.c kern/term.c \ - @COND_i386_coreboot_TRUE@ kern/verifiers.c - @COND_i386_efi_TRUE@kernel_exec_SOURCES = kern/i386/efi/startup.S \ -@@ -25740,14 +25768,14 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_i386_efi_TRUE@ kern/acpi.c kern/efi/acpi.c kern/efi/sb.c \ - @COND_i386_efi_TRUE@ kern/lockdown.c kern/compiler-rt.c \ - @COND_i386_efi_TRUE@ kern/mm.c kern/time.c \ --@COND_i386_efi_TRUE@ kern/generic/millisleep.c kern/command.c \ --@COND_i386_efi_TRUE@ kern/corecmd.c kern/device.c kern/disk.c \ --@COND_i386_efi_TRUE@ kern/dl.c kern/env.c kern/err.c \ --@COND_i386_efi_TRUE@ kern/file.c kern/fs.c kern/list.c \ --@COND_i386_efi_TRUE@ kern/main.c kern/misc.c kern/parser.c \ --@COND_i386_efi_TRUE@ kern/partition.c kern/rescue_parser.c \ --@COND_i386_efi_TRUE@ kern/rescue_reader.c kern/term.c \ --@COND_i386_efi_TRUE@ kern/verifiers.c -+@COND_i386_efi_TRUE@ kern/generic/millisleep.c kern/buffer.c \ -+@COND_i386_efi_TRUE@ kern/command.c kern/corecmd.c \ -+@COND_i386_efi_TRUE@ kern/device.c kern/disk.c kern/dl.c \ -+@COND_i386_efi_TRUE@ kern/env.c kern/err.c kern/file.c \ -+@COND_i386_efi_TRUE@ kern/fs.c kern/list.c kern/main.c \ -+@COND_i386_efi_TRUE@ kern/misc.c kern/parser.c kern/partition.c \ -+@COND_i386_efi_TRUE@ kern/rescue_parser.c kern/rescue_reader.c \ -+@COND_i386_efi_TRUE@ kern/term.c kern/verifiers.c - @COND_i386_ieee1275_TRUE@kernel_exec_SOURCES = \ - @COND_i386_ieee1275_TRUE@ kern/i386/ieee1275/startup.S \ - @COND_i386_ieee1275_TRUE@ disk/ieee1275/ofdisk.c \ -@@ -25762,12 +25790,13 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_i386_ieee1275_TRUE@ commands/extcmd.c lib/arg.c \ - @COND_i386_ieee1275_TRUE@ kern/compiler-rt.c kern/mm.c \ - @COND_i386_ieee1275_TRUE@ kern/time.c kern/generic/millisleep.c \ --@COND_i386_ieee1275_TRUE@ kern/command.c kern/corecmd.c \ --@COND_i386_ieee1275_TRUE@ kern/device.c kern/disk.c kern/dl.c \ --@COND_i386_ieee1275_TRUE@ kern/env.c kern/err.c kern/file.c \ --@COND_i386_ieee1275_TRUE@ kern/fs.c kern/list.c kern/main.c \ --@COND_i386_ieee1275_TRUE@ kern/misc.c kern/parser.c \ --@COND_i386_ieee1275_TRUE@ kern/partition.c kern/rescue_parser.c \ -+@COND_i386_ieee1275_TRUE@ kern/buffer.c kern/command.c \ -+@COND_i386_ieee1275_TRUE@ kern/corecmd.c kern/device.c \ -+@COND_i386_ieee1275_TRUE@ kern/disk.c kern/dl.c kern/env.c \ -+@COND_i386_ieee1275_TRUE@ kern/err.c kern/file.c kern/fs.c \ -+@COND_i386_ieee1275_TRUE@ kern/list.c kern/main.c kern/misc.c \ -+@COND_i386_ieee1275_TRUE@ kern/parser.c kern/partition.c \ -+@COND_i386_ieee1275_TRUE@ kern/rescue_parser.c \ - @COND_i386_ieee1275_TRUE@ kern/rescue_reader.c kern/term.c \ - @COND_i386_ieee1275_TRUE@ kern/verifiers.c - @COND_i386_multiboot_TRUE@kernel_exec_SOURCES = \ -@@ -25781,12 +25810,12 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_i386_multiboot_TRUE@ kern/compiler-rt.c kern/mm.c \ - @COND_i386_multiboot_TRUE@ kern/time.c \ - @COND_i386_multiboot_TRUE@ kern/generic/millisleep.c \ --@COND_i386_multiboot_TRUE@ kern/command.c kern/corecmd.c \ --@COND_i386_multiboot_TRUE@ kern/device.c kern/disk.c kern/dl.c \ --@COND_i386_multiboot_TRUE@ kern/env.c kern/err.c kern/file.c \ --@COND_i386_multiboot_TRUE@ kern/fs.c kern/list.c kern/main.c \ --@COND_i386_multiboot_TRUE@ kern/misc.c kern/parser.c \ --@COND_i386_multiboot_TRUE@ kern/partition.c \ -+@COND_i386_multiboot_TRUE@ kern/buffer.c kern/command.c \ -+@COND_i386_multiboot_TRUE@ kern/corecmd.c kern/device.c \ -+@COND_i386_multiboot_TRUE@ kern/disk.c kern/dl.c kern/env.c \ -+@COND_i386_multiboot_TRUE@ kern/err.c kern/file.c kern/fs.c \ -+@COND_i386_multiboot_TRUE@ kern/list.c kern/main.c kern/misc.c \ -+@COND_i386_multiboot_TRUE@ kern/parser.c kern/partition.c \ - @COND_i386_multiboot_TRUE@ kern/rescue_parser.c \ - @COND_i386_multiboot_TRUE@ kern/rescue_reader.c kern/term.c \ - @COND_i386_multiboot_TRUE@ kern/verifiers.c -@@ -25795,24 +25824,26 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_i386_pc_TRUE@ term/i386/pc/console.c kern/i386/dl.c \ - @COND_i386_pc_TRUE@ kern/i386/tsc.c kern/i386/tsc_pit.c \ - @COND_i386_pc_TRUE@ kern/compiler-rt.c kern/mm.c kern/time.c \ --@COND_i386_pc_TRUE@ kern/generic/millisleep.c kern/command.c \ --@COND_i386_pc_TRUE@ kern/corecmd.c kern/device.c kern/disk.c \ --@COND_i386_pc_TRUE@ kern/dl.c kern/env.c kern/err.c kern/file.c \ --@COND_i386_pc_TRUE@ kern/fs.c kern/list.c kern/main.c \ --@COND_i386_pc_TRUE@ kern/misc.c kern/parser.c kern/partition.c \ --@COND_i386_pc_TRUE@ kern/rescue_parser.c kern/rescue_reader.c \ --@COND_i386_pc_TRUE@ kern/term.c kern/verifiers.c -+@COND_i386_pc_TRUE@ kern/generic/millisleep.c kern/buffer.c \ -+@COND_i386_pc_TRUE@ kern/command.c kern/corecmd.c kern/device.c \ -+@COND_i386_pc_TRUE@ kern/disk.c kern/dl.c kern/env.c kern/err.c \ -+@COND_i386_pc_TRUE@ kern/file.c kern/fs.c kern/list.c \ -+@COND_i386_pc_TRUE@ kern/main.c kern/misc.c kern/parser.c \ -+@COND_i386_pc_TRUE@ kern/partition.c kern/rescue_parser.c \ -+@COND_i386_pc_TRUE@ kern/rescue_reader.c kern/term.c \ -+@COND_i386_pc_TRUE@ kern/verifiers.c - @COND_i386_qemu_TRUE@kernel_exec_SOURCES = kern/i386/qemu/startup.S \ - @COND_i386_qemu_TRUE@ kern/i386/qemu/init.c bus/pci.c \ - @COND_i386_qemu_TRUE@ kern/vga_init.c kern/i386/qemu/mmap.c \ - @COND_i386_qemu_TRUE@ term/i386/pc/vga_text.c kern/i386/dl.c \ - @COND_i386_qemu_TRUE@ kern/i386/tsc.c kern/i386/tsc_pit.c \ - @COND_i386_qemu_TRUE@ kern/compiler-rt.c kern/mm.c kern/time.c \ --@COND_i386_qemu_TRUE@ kern/generic/millisleep.c kern/command.c \ --@COND_i386_qemu_TRUE@ kern/corecmd.c kern/device.c kern/disk.c \ --@COND_i386_qemu_TRUE@ kern/dl.c kern/env.c kern/err.c \ --@COND_i386_qemu_TRUE@ kern/file.c kern/fs.c kern/list.c \ --@COND_i386_qemu_TRUE@ kern/main.c kern/misc.c kern/parser.c \ -+@COND_i386_qemu_TRUE@ kern/generic/millisleep.c kern/buffer.c \ -+@COND_i386_qemu_TRUE@ kern/command.c kern/corecmd.c \ -+@COND_i386_qemu_TRUE@ kern/device.c kern/disk.c kern/dl.c \ -+@COND_i386_qemu_TRUE@ kern/env.c kern/err.c kern/file.c \ -+@COND_i386_qemu_TRUE@ kern/fs.c kern/list.c kern/main.c \ -+@COND_i386_qemu_TRUE@ kern/misc.c kern/parser.c \ - @COND_i386_qemu_TRUE@ kern/partition.c kern/rescue_parser.c \ - @COND_i386_qemu_TRUE@ kern/rescue_reader.c kern/term.c \ - @COND_i386_qemu_TRUE@ kern/verifiers.c -@@ -25824,14 +25855,14 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_i386_xen_TRUE@ term/terminfo.c term/tparm.c \ - @COND_i386_xen_TRUE@ commands/extcmd.c lib/arg.c \ - @COND_i386_xen_TRUE@ kern/compiler-rt.c kern/mm.c kern/time.c \ --@COND_i386_xen_TRUE@ kern/generic/millisleep.c kern/command.c \ --@COND_i386_xen_TRUE@ kern/corecmd.c kern/device.c kern/disk.c \ --@COND_i386_xen_TRUE@ kern/dl.c kern/env.c kern/err.c \ --@COND_i386_xen_TRUE@ kern/file.c kern/fs.c kern/list.c \ --@COND_i386_xen_TRUE@ kern/main.c kern/misc.c kern/parser.c \ --@COND_i386_xen_TRUE@ kern/partition.c kern/rescue_parser.c \ --@COND_i386_xen_TRUE@ kern/rescue_reader.c kern/term.c \ --@COND_i386_xen_TRUE@ kern/verifiers.c -+@COND_i386_xen_TRUE@ kern/generic/millisleep.c kern/buffer.c \ -+@COND_i386_xen_TRUE@ kern/command.c kern/corecmd.c \ -+@COND_i386_xen_TRUE@ kern/device.c kern/disk.c kern/dl.c \ -+@COND_i386_xen_TRUE@ kern/env.c kern/err.c kern/file.c \ -+@COND_i386_xen_TRUE@ kern/fs.c kern/list.c kern/main.c \ -+@COND_i386_xen_TRUE@ kern/misc.c kern/parser.c kern/partition.c \ -+@COND_i386_xen_TRUE@ kern/rescue_parser.c kern/rescue_reader.c \ -+@COND_i386_xen_TRUE@ kern/term.c kern/verifiers.c - @COND_i386_xen_pvh_TRUE@kernel_exec_SOURCES = \ - @COND_i386_xen_pvh_TRUE@ kern/i386/xen/startup_pvh.S \ - @COND_i386_xen_pvh_TRUE@ kern/i386/dl.c commands/boot.c \ -@@ -25842,12 +25873,13 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_i386_xen_pvh_TRUE@ term/tparm.c commands/extcmd.c \ - @COND_i386_xen_pvh_TRUE@ lib/arg.c kern/compiler-rt.c kern/mm.c \ - @COND_i386_xen_pvh_TRUE@ kern/time.c kern/generic/millisleep.c \ --@COND_i386_xen_pvh_TRUE@ kern/command.c kern/corecmd.c \ --@COND_i386_xen_pvh_TRUE@ kern/device.c kern/disk.c kern/dl.c \ --@COND_i386_xen_pvh_TRUE@ kern/env.c kern/err.c kern/file.c \ --@COND_i386_xen_pvh_TRUE@ kern/fs.c kern/list.c kern/main.c \ --@COND_i386_xen_pvh_TRUE@ kern/misc.c kern/parser.c \ --@COND_i386_xen_pvh_TRUE@ kern/partition.c kern/rescue_parser.c \ -+@COND_i386_xen_pvh_TRUE@ kern/buffer.c kern/command.c \ -+@COND_i386_xen_pvh_TRUE@ kern/corecmd.c kern/device.c \ -+@COND_i386_xen_pvh_TRUE@ kern/disk.c kern/dl.c kern/env.c \ -+@COND_i386_xen_pvh_TRUE@ kern/err.c kern/file.c kern/fs.c \ -+@COND_i386_xen_pvh_TRUE@ kern/list.c kern/main.c kern/misc.c \ -+@COND_i386_xen_pvh_TRUE@ kern/parser.c kern/partition.c \ -+@COND_i386_xen_pvh_TRUE@ kern/rescue_parser.c \ - @COND_i386_xen_pvh_TRUE@ kern/rescue_reader.c kern/term.c \ - @COND_i386_xen_pvh_TRUE@ kern/verifiers.c - @COND_ia64_efi_TRUE@kernel_exec_SOURCES = kern/ia64/efi/startup.S \ -@@ -25859,14 +25891,14 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_ia64_efi_TRUE@ kern/acpi.c kern/efi/acpi.c kern/efi/sb.c \ - @COND_ia64_efi_TRUE@ kern/lockdown.c kern/compiler-rt.c \ - @COND_ia64_efi_TRUE@ kern/mm.c kern/time.c \ --@COND_ia64_efi_TRUE@ kern/generic/millisleep.c kern/command.c \ --@COND_ia64_efi_TRUE@ kern/corecmd.c kern/device.c kern/disk.c \ --@COND_ia64_efi_TRUE@ kern/dl.c kern/env.c kern/err.c \ --@COND_ia64_efi_TRUE@ kern/file.c kern/fs.c kern/list.c \ --@COND_ia64_efi_TRUE@ kern/main.c kern/misc.c kern/parser.c \ --@COND_ia64_efi_TRUE@ kern/partition.c kern/rescue_parser.c \ --@COND_ia64_efi_TRUE@ kern/rescue_reader.c kern/term.c \ --@COND_ia64_efi_TRUE@ kern/verifiers.c -+@COND_ia64_efi_TRUE@ kern/generic/millisleep.c kern/buffer.c \ -+@COND_ia64_efi_TRUE@ kern/command.c kern/corecmd.c \ -+@COND_ia64_efi_TRUE@ kern/device.c kern/disk.c kern/dl.c \ -+@COND_ia64_efi_TRUE@ kern/env.c kern/err.c kern/file.c \ -+@COND_ia64_efi_TRUE@ kern/fs.c kern/list.c kern/main.c \ -+@COND_ia64_efi_TRUE@ kern/misc.c kern/parser.c kern/partition.c \ -+@COND_ia64_efi_TRUE@ kern/rescue_parser.c kern/rescue_reader.c \ -+@COND_ia64_efi_TRUE@ kern/term.c kern/verifiers.c - @COND_mips_arc_TRUE@kernel_exec_SOURCES = kern/mips/startup.S \ - @COND_mips_arc_TRUE@ kern/mips/arc/init.c term/arc/console.c \ - @COND_mips_arc_TRUE@ disk/arc/arcdisk.c \ -@@ -25875,14 +25907,14 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_mips_arc_TRUE@ kern/mips/init.c term/terminfo.c \ - @COND_mips_arc_TRUE@ term/tparm.c commands/extcmd.c lib/arg.c \ - @COND_mips_arc_TRUE@ kern/compiler-rt.c kern/mm.c kern/time.c \ --@COND_mips_arc_TRUE@ kern/generic/millisleep.c kern/command.c \ --@COND_mips_arc_TRUE@ kern/corecmd.c kern/device.c kern/disk.c \ --@COND_mips_arc_TRUE@ kern/dl.c kern/env.c kern/err.c \ --@COND_mips_arc_TRUE@ kern/file.c kern/fs.c kern/list.c \ --@COND_mips_arc_TRUE@ kern/main.c kern/misc.c kern/parser.c \ --@COND_mips_arc_TRUE@ kern/partition.c kern/rescue_parser.c \ --@COND_mips_arc_TRUE@ kern/rescue_reader.c kern/term.c \ --@COND_mips_arc_TRUE@ kern/verifiers.c -+@COND_mips_arc_TRUE@ kern/generic/millisleep.c kern/buffer.c \ -+@COND_mips_arc_TRUE@ kern/command.c kern/corecmd.c \ -+@COND_mips_arc_TRUE@ kern/device.c kern/disk.c kern/dl.c \ -+@COND_mips_arc_TRUE@ kern/env.c kern/err.c kern/file.c \ -+@COND_mips_arc_TRUE@ kern/fs.c kern/list.c kern/main.c \ -+@COND_mips_arc_TRUE@ kern/misc.c kern/parser.c kern/partition.c \ -+@COND_mips_arc_TRUE@ kern/rescue_parser.c kern/rescue_reader.c \ -+@COND_mips_arc_TRUE@ kern/term.c kern/verifiers.c - @COND_mips_loongson_TRUE@kernel_exec_SOURCES = kern/mips/startup.S \ - @COND_mips_loongson_TRUE@ term/ns8250.c bus/bonito.c \ - @COND_mips_loongson_TRUE@ bus/cs5536.c bus/pci.c \ -@@ -25904,12 +25936,13 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_mips_loongson_TRUE@ lib/arg.c kern/compiler-rt.c \ - @COND_mips_loongson_TRUE@ kern/mm.c kern/time.c \ - @COND_mips_loongson_TRUE@ kern/generic/millisleep.c \ --@COND_mips_loongson_TRUE@ kern/command.c kern/corecmd.c \ --@COND_mips_loongson_TRUE@ kern/device.c kern/disk.c kern/dl.c \ --@COND_mips_loongson_TRUE@ kern/env.c kern/err.c kern/file.c \ --@COND_mips_loongson_TRUE@ kern/fs.c kern/list.c kern/main.c \ --@COND_mips_loongson_TRUE@ kern/misc.c kern/parser.c \ --@COND_mips_loongson_TRUE@ kern/partition.c kern/rescue_parser.c \ -+@COND_mips_loongson_TRUE@ kern/buffer.c kern/command.c \ -+@COND_mips_loongson_TRUE@ kern/corecmd.c kern/device.c \ -+@COND_mips_loongson_TRUE@ kern/disk.c kern/dl.c kern/env.c \ -+@COND_mips_loongson_TRUE@ kern/err.c kern/file.c kern/fs.c \ -+@COND_mips_loongson_TRUE@ kern/list.c kern/main.c kern/misc.c \ -+@COND_mips_loongson_TRUE@ kern/parser.c kern/partition.c \ -+@COND_mips_loongson_TRUE@ kern/rescue_parser.c \ - @COND_mips_loongson_TRUE@ kern/rescue_reader.c kern/term.c \ - @COND_mips_loongson_TRUE@ kern/verifiers.c - @COND_mips_qemu_mips_TRUE@kernel_exec_SOURCES = kern/mips/startup.S \ -@@ -25927,12 +25960,12 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_mips_qemu_mips_TRUE@ lib/arg.c kern/compiler-rt.c \ - @COND_mips_qemu_mips_TRUE@ kern/mm.c kern/time.c \ - @COND_mips_qemu_mips_TRUE@ kern/generic/millisleep.c \ --@COND_mips_qemu_mips_TRUE@ kern/command.c kern/corecmd.c \ --@COND_mips_qemu_mips_TRUE@ kern/device.c kern/disk.c kern/dl.c \ --@COND_mips_qemu_mips_TRUE@ kern/env.c kern/err.c kern/file.c \ --@COND_mips_qemu_mips_TRUE@ kern/fs.c kern/list.c kern/main.c \ --@COND_mips_qemu_mips_TRUE@ kern/misc.c kern/parser.c \ --@COND_mips_qemu_mips_TRUE@ kern/partition.c \ -+@COND_mips_qemu_mips_TRUE@ kern/buffer.c kern/command.c \ -+@COND_mips_qemu_mips_TRUE@ kern/corecmd.c kern/device.c \ -+@COND_mips_qemu_mips_TRUE@ kern/disk.c kern/dl.c kern/env.c \ -+@COND_mips_qemu_mips_TRUE@ kern/err.c kern/file.c kern/fs.c \ -+@COND_mips_qemu_mips_TRUE@ kern/list.c kern/main.c kern/misc.c \ -+@COND_mips_qemu_mips_TRUE@ kern/parser.c kern/partition.c \ - @COND_mips_qemu_mips_TRUE@ kern/rescue_parser.c \ - @COND_mips_qemu_mips_TRUE@ kern/rescue_reader.c kern/term.c \ - @COND_mips_qemu_mips_TRUE@ kern/verifiers.c -@@ -25953,12 +25986,13 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_powerpc_ieee1275_TRUE@ kern/compiler-rt.c kern/mm.c \ - @COND_powerpc_ieee1275_TRUE@ kern/time.c \ - @COND_powerpc_ieee1275_TRUE@ kern/generic/millisleep.c \ --@COND_powerpc_ieee1275_TRUE@ kern/command.c kern/corecmd.c \ --@COND_powerpc_ieee1275_TRUE@ kern/device.c kern/disk.c \ --@COND_powerpc_ieee1275_TRUE@ kern/dl.c kern/env.c kern/err.c \ --@COND_powerpc_ieee1275_TRUE@ kern/file.c kern/fs.c kern/list.c \ --@COND_powerpc_ieee1275_TRUE@ kern/main.c kern/misc.c \ --@COND_powerpc_ieee1275_TRUE@ kern/parser.c kern/partition.c \ -+@COND_powerpc_ieee1275_TRUE@ kern/buffer.c kern/command.c \ -+@COND_powerpc_ieee1275_TRUE@ kern/corecmd.c kern/device.c \ -+@COND_powerpc_ieee1275_TRUE@ kern/disk.c kern/dl.c kern/env.c \ -+@COND_powerpc_ieee1275_TRUE@ kern/err.c kern/file.c kern/fs.c \ -+@COND_powerpc_ieee1275_TRUE@ kern/list.c kern/main.c \ -+@COND_powerpc_ieee1275_TRUE@ kern/misc.c kern/parser.c \ -+@COND_powerpc_ieee1275_TRUE@ kern/partition.c \ - @COND_powerpc_ieee1275_TRUE@ kern/rescue_parser.c \ - @COND_powerpc_ieee1275_TRUE@ kern/rescue_reader.c kern/term.c \ - @COND_powerpc_ieee1275_TRUE@ kern/verifiers.c -@@ -25973,7 +26007,7 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_riscv32_efi_TRUE@ kern/efi/acpi.c kern/efi/sb.c \ - @COND_riscv32_efi_TRUE@ kern/lockdown.c kern/compiler-rt.c \ - @COND_riscv32_efi_TRUE@ kern/mm.c kern/time.c \ --@COND_riscv32_efi_TRUE@ kern/generic/millisleep.c \ -+@COND_riscv32_efi_TRUE@ kern/generic/millisleep.c kern/buffer.c \ - @COND_riscv32_efi_TRUE@ kern/command.c kern/corecmd.c \ - @COND_riscv32_efi_TRUE@ kern/device.c kern/disk.c kern/dl.c \ - @COND_riscv32_efi_TRUE@ kern/env.c kern/err.c kern/file.c \ -@@ -25993,12 +26027,13 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_riscv64_efi_TRUE@ kern/efi/sb.c kern/lockdown.c \ - @COND_riscv64_efi_TRUE@ kern/compiler-rt.c kern/mm.c \ - @COND_riscv64_efi_TRUE@ kern/time.c kern/generic/millisleep.c \ --@COND_riscv64_efi_TRUE@ kern/command.c kern/corecmd.c \ --@COND_riscv64_efi_TRUE@ kern/device.c kern/disk.c kern/dl.c \ --@COND_riscv64_efi_TRUE@ kern/env.c kern/err.c kern/file.c \ --@COND_riscv64_efi_TRUE@ kern/fs.c kern/list.c kern/main.c \ --@COND_riscv64_efi_TRUE@ kern/misc.c kern/parser.c \ --@COND_riscv64_efi_TRUE@ kern/partition.c kern/rescue_parser.c \ -+@COND_riscv64_efi_TRUE@ kern/buffer.c kern/command.c \ -+@COND_riscv64_efi_TRUE@ kern/corecmd.c kern/device.c \ -+@COND_riscv64_efi_TRUE@ kern/disk.c kern/dl.c kern/env.c \ -+@COND_riscv64_efi_TRUE@ kern/err.c kern/file.c kern/fs.c \ -+@COND_riscv64_efi_TRUE@ kern/list.c kern/main.c kern/misc.c \ -+@COND_riscv64_efi_TRUE@ kern/parser.c kern/partition.c \ -+@COND_riscv64_efi_TRUE@ kern/rescue_parser.c \ - @COND_riscv64_efi_TRUE@ kern/rescue_reader.c kern/term.c \ - @COND_riscv64_efi_TRUE@ kern/verifiers.c - @COND_sparc64_ieee1275_TRUE@kernel_exec_SOURCES = \ -@@ -26019,12 +26054,13 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_sparc64_ieee1275_TRUE@ kern/compiler-rt.c kern/mm.c \ - @COND_sparc64_ieee1275_TRUE@ kern/time.c \ - @COND_sparc64_ieee1275_TRUE@ kern/generic/millisleep.c \ --@COND_sparc64_ieee1275_TRUE@ kern/command.c kern/corecmd.c \ --@COND_sparc64_ieee1275_TRUE@ kern/device.c kern/disk.c \ --@COND_sparc64_ieee1275_TRUE@ kern/dl.c kern/env.c kern/err.c \ --@COND_sparc64_ieee1275_TRUE@ kern/file.c kern/fs.c kern/list.c \ --@COND_sparc64_ieee1275_TRUE@ kern/main.c kern/misc.c \ --@COND_sparc64_ieee1275_TRUE@ kern/parser.c kern/partition.c \ -+@COND_sparc64_ieee1275_TRUE@ kern/buffer.c kern/command.c \ -+@COND_sparc64_ieee1275_TRUE@ kern/corecmd.c kern/device.c \ -+@COND_sparc64_ieee1275_TRUE@ kern/disk.c kern/dl.c kern/env.c \ -+@COND_sparc64_ieee1275_TRUE@ kern/err.c kern/file.c kern/fs.c \ -+@COND_sparc64_ieee1275_TRUE@ kern/list.c kern/main.c \ -+@COND_sparc64_ieee1275_TRUE@ kern/misc.c kern/parser.c \ -+@COND_sparc64_ieee1275_TRUE@ kern/partition.c \ - @COND_sparc64_ieee1275_TRUE@ kern/rescue_parser.c \ - @COND_sparc64_ieee1275_TRUE@ kern/rescue_reader.c kern/term.c \ - @COND_sparc64_ieee1275_TRUE@ kern/verifiers.c -@@ -26040,11 +26076,12 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_x86_64_efi_TRUE@ kern/acpi.c kern/efi/acpi.c \ - @COND_x86_64_efi_TRUE@ kern/efi/sb.c kern/lockdown.c \ - @COND_x86_64_efi_TRUE@ kern/compiler-rt.c kern/mm.c kern/time.c \ --@COND_x86_64_efi_TRUE@ kern/generic/millisleep.c kern/command.c \ --@COND_x86_64_efi_TRUE@ kern/corecmd.c kern/device.c kern/disk.c \ --@COND_x86_64_efi_TRUE@ kern/dl.c kern/env.c kern/err.c \ --@COND_x86_64_efi_TRUE@ kern/file.c kern/fs.c kern/list.c \ --@COND_x86_64_efi_TRUE@ kern/main.c kern/misc.c kern/parser.c \ -+@COND_x86_64_efi_TRUE@ kern/generic/millisleep.c kern/buffer.c \ -+@COND_x86_64_efi_TRUE@ kern/command.c kern/corecmd.c \ -+@COND_x86_64_efi_TRUE@ kern/device.c kern/disk.c kern/dl.c \ -+@COND_x86_64_efi_TRUE@ kern/env.c kern/err.c kern/file.c \ -+@COND_x86_64_efi_TRUE@ kern/fs.c kern/list.c kern/main.c \ -+@COND_x86_64_efi_TRUE@ kern/misc.c kern/parser.c \ - @COND_x86_64_efi_TRUE@ kern/partition.c kern/rescue_parser.c \ - @COND_x86_64_efi_TRUE@ kern/rescue_reader.c kern/term.c \ - @COND_x86_64_efi_TRUE@ kern/verifiers.c -@@ -26057,11 +26094,12 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_x86_64_xen_TRUE@ term/terminfo.c term/tparm.c \ - @COND_x86_64_xen_TRUE@ commands/extcmd.c lib/arg.c \ - @COND_x86_64_xen_TRUE@ kern/compiler-rt.c kern/mm.c kern/time.c \ --@COND_x86_64_xen_TRUE@ kern/generic/millisleep.c kern/command.c \ --@COND_x86_64_xen_TRUE@ kern/corecmd.c kern/device.c kern/disk.c \ --@COND_x86_64_xen_TRUE@ kern/dl.c kern/env.c kern/err.c \ --@COND_x86_64_xen_TRUE@ kern/file.c kern/fs.c kern/list.c \ --@COND_x86_64_xen_TRUE@ kern/main.c kern/misc.c kern/parser.c \ -+@COND_x86_64_xen_TRUE@ kern/generic/millisleep.c kern/buffer.c \ -+@COND_x86_64_xen_TRUE@ kern/command.c kern/corecmd.c \ -+@COND_x86_64_xen_TRUE@ kern/device.c kern/disk.c kern/dl.c \ -+@COND_x86_64_xen_TRUE@ kern/env.c kern/err.c kern/file.c \ -+@COND_x86_64_xen_TRUE@ kern/fs.c kern/list.c kern/main.c \ -+@COND_x86_64_xen_TRUE@ kern/misc.c kern/parser.c \ - @COND_x86_64_xen_TRUE@ kern/partition.c kern/rescue_parser.c \ - @COND_x86_64_xen_TRUE@ kern/rescue_reader.c kern/term.c \ - @COND_x86_64_xen_TRUE@ kern/verifiers.c -@@ -28027,6 +28065,8 @@ kern/generic/$(DEPDIR)/$(am__dirstamp): - kern/generic/kernel_exec-millisleep.$(OBJEXT): \ - kern/generic/$(am__dirstamp) \ - kern/generic/$(DEPDIR)/$(am__dirstamp) -+kern/kernel_exec-buffer.$(OBJEXT): kern/$(am__dirstamp) \ -+ kern/$(DEPDIR)/$(am__dirstamp) - kern/kernel_exec-command.$(OBJEXT): kern/$(am__dirstamp) \ - kern/$(DEPDIR)/$(am__dirstamp) - kern/kernel_exec-corecmd.$(OBJEXT): kern/$(am__dirstamp) \ -@@ -30952,6 +30992,7 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/acpi_module-acpi.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/elf_module-elf.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/kernel_exec-acpi.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/kernel_exec-buffer.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/kernel_exec-command.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/kernel_exec-compiler-rt.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/kernel_exec-corecmd.Po@am__quote@ -@@ -35382,6 +35423,20 @@ kern/generic/kernel_exec-millisleep.obj: kern/generic/millisleep.c - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -c -o kern/generic/kernel_exec-millisleep.obj `if test -f 'kern/generic/millisleep.c'; then $(CYGPATH_W) 'kern/generic/millisleep.c'; else $(CYGPATH_W) '$(srcdir)/kern/generic/millisleep.c'; fi` - -+kern/kernel_exec-buffer.o: kern/buffer.c -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -MT kern/kernel_exec-buffer.o -MD -MP -MF kern/$(DEPDIR)/kernel_exec-buffer.Tpo -c -o kern/kernel_exec-buffer.o `test -f 'kern/buffer.c' || echo '$(srcdir)/'`kern/buffer.c -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) kern/$(DEPDIR)/kernel_exec-buffer.Tpo kern/$(DEPDIR)/kernel_exec-buffer.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='kern/buffer.c' object='kern/kernel_exec-buffer.o' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -c -o kern/kernel_exec-buffer.o `test -f 'kern/buffer.c' || echo '$(srcdir)/'`kern/buffer.c -+ -+kern/kernel_exec-buffer.obj: kern/buffer.c -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -MT kern/kernel_exec-buffer.obj -MD -MP -MF kern/$(DEPDIR)/kernel_exec-buffer.Tpo -c -o kern/kernel_exec-buffer.obj `if test -f 'kern/buffer.c'; then $(CYGPATH_W) 'kern/buffer.c'; else $(CYGPATH_W) '$(srcdir)/kern/buffer.c'; fi` -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) kern/$(DEPDIR)/kernel_exec-buffer.Tpo kern/$(DEPDIR)/kernel_exec-buffer.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='kern/buffer.c' object='kern/kernel_exec-buffer.obj' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -c -o kern/kernel_exec-buffer.obj `if test -f 'kern/buffer.c'; then $(CYGPATH_W) 'kern/buffer.c'; else $(CYGPATH_W) '$(srcdir)/kern/buffer.c'; fi` -+ - kern/kernel_exec-command.o: kern/command.c - @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -MT kern/kernel_exec-command.o -MD -MP -MF kern/$(DEPDIR)/kernel_exec-command.Tpo -c -o kern/kernel_exec-command.o `test -f 'kern/command.c' || echo '$(srcdir)/'`kern/command.c - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) kern/$(DEPDIR)/kernel_exec-command.Tpo kern/$(DEPDIR)/kernel_exec-command.Po -diff --git a/grub-core/kern/buffer.c b/grub-core/kern/buffer.c -new file mode 100644 -index 0000000..9f5f8b8 ---- /dev/null -+++ b/grub-core/kern/buffer.c -@@ -0,0 +1,117 @@ -+/* -+ * GRUB -- GRand Unified Bootloader -+ * Copyright (C) 2021 Free Software Foundation, Inc. -+ * -+ * GRUB is free software: you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation, either version 3 of the License, or -+ * (at your option) any later version. -+ * -+ * GRUB is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with GRUB. If not, see . -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+ -+grub_buffer_t -+grub_buffer_new (grub_size_t sz) -+{ -+ struct grub_buffer *ret; -+ -+ ret = (struct grub_buffer *) grub_malloc (sizeof (*ret)); -+ if (ret == NULL) -+ return NULL; -+ -+ ret->data = (grub_uint8_t *) grub_malloc (sz); -+ if (ret->data == NULL) -+ { -+ grub_free (ret); -+ return NULL; -+ } -+ -+ ret->sz = sz; -+ ret->pos = 0; -+ ret->used = 0; -+ -+ return ret; -+} -+ -+void -+grub_buffer_free (grub_buffer_t buf) -+{ -+ grub_free (buf->data); -+ grub_free (buf); -+} -+ -+grub_err_t -+grub_buffer_ensure_space (grub_buffer_t buf, grub_size_t req) -+{ -+ grub_uint8_t *d; -+ grub_size_t newsz = 1; -+ -+ /* Is the current buffer size adequate? */ -+ if (buf->sz >= req) -+ return GRUB_ERR_NONE; -+ -+ /* Find the smallest power-of-2 size that satisfies the request. */ -+ while (newsz < req) -+ { -+ if (newsz == 0) -+ return grub_error (GRUB_ERR_OUT_OF_RANGE, -+ N_("requested buffer size is too large")); -+ newsz <<= 1; -+ } -+ -+ d = (grub_uint8_t *) grub_realloc (buf->data, newsz); -+ if (d == NULL) -+ return grub_errno; -+ -+ buf->data = d; -+ buf->sz = newsz; -+ -+ return GRUB_ERR_NONE; -+} -+ -+void * -+grub_buffer_take_data (grub_buffer_t buf) -+{ -+ void *data = buf->data; -+ -+ buf->data = NULL; -+ buf->sz = buf->pos = buf->used = 0; -+ -+ return data; -+} -+ -+void -+grub_buffer_reset (grub_buffer_t buf) -+{ -+ buf->pos = buf->used = 0; -+} -+ -+grub_err_t -+grub_buffer_advance_read_pos (grub_buffer_t buf, grub_size_t n) -+{ -+ grub_size_t newpos; -+ -+ if (grub_add (buf->pos, n, &newpos)) -+ return grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is detected")); -+ -+ if (newpos > buf->used) -+ return grub_error (GRUB_ERR_OUT_OF_RANGE, -+ N_("new read is position beyond the end of the written data")); -+ -+ buf->pos = newpos; -+ -+ return GRUB_ERR_NONE; -+} -diff --git a/include/grub/buffer.h b/include/grub/buffer.h -new file mode 100644 -index 0000000..f4b10cf ---- /dev/null -+++ b/include/grub/buffer.h -@@ -0,0 +1,144 @@ -+/* -+ * GRUB -- GRand Unified Bootloader -+ * Copyright (C) 2021 Free Software Foundation, Inc. -+ * -+ * GRUB is free software: you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation, either version 3 of the License, or -+ * (at your option) any later version. -+ * -+ * GRUB is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with GRUB. If not, see . -+ */ -+ -+#ifndef GRUB_BUFFER_H -+#define GRUB_BUFFER_H 1 -+ -+#include -+#include -+#include -+#include -+#include -+ -+struct grub_buffer -+{ -+ grub_uint8_t *data; -+ grub_size_t sz; -+ grub_size_t pos; -+ grub_size_t used; -+}; -+ -+/* -+ * grub_buffer_t represents a simple variable sized byte buffer with -+ * read and write cursors. It currently only implements -+ * functionality required by the only user in GRUB (append byte[s], -+ * peeking data at a specified position and updating the read cursor. -+ * Some things that this doesn't do yet are: -+ * - Reading a portion of the buffer by copying data from the current -+ * read position in to a caller supplied destination buffer and then -+ * automatically updating the read cursor. -+ * - Dropping the read part at the start of the buffer when an append -+ * requires more space. -+ */ -+typedef struct grub_buffer *grub_buffer_t; -+ -+/* Allocate a new buffer with the specified initial size. */ -+extern grub_buffer_t grub_buffer_new (grub_size_t sz); -+ -+/* Free the buffer and its resources. */ -+extern void grub_buffer_free (grub_buffer_t buf); -+ -+/* Return the number of unread bytes in this buffer. */ -+static inline grub_size_t -+grub_buffer_get_unread_bytes (grub_buffer_t buf) -+{ -+ return buf->used - buf->pos; -+} -+ -+/* -+ * Ensure that the buffer size is at least the requested -+ * number of bytes. -+ */ -+extern grub_err_t grub_buffer_ensure_space (grub_buffer_t buf, grub_size_t req); -+ -+/* -+ * Append the specified number of bytes from the supplied -+ * data to the buffer. -+ */ -+static inline grub_err_t -+grub_buffer_append_data (grub_buffer_t buf, const void *data, grub_size_t len) -+{ -+ grub_size_t req; -+ -+ if (grub_add (buf->used, len, &req)) -+ return grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is detected")); -+ -+ if (grub_buffer_ensure_space (buf, req) != GRUB_ERR_NONE) -+ return grub_errno; -+ -+ grub_memcpy (&buf->data[buf->used], data, len); -+ buf->used = req; -+ -+ return GRUB_ERR_NONE; -+} -+ -+/* Append the supplied character to the buffer. */ -+static inline grub_err_t -+grub_buffer_append_char (grub_buffer_t buf, char c) -+{ -+ return grub_buffer_append_data (buf, &c, 1); -+} -+ -+/* -+ * Forget and return the underlying data buffer. The caller -+ * becomes the owner of this buffer, and must free it when it -+ * is no longer required. -+ */ -+extern void *grub_buffer_take_data (grub_buffer_t buf); -+ -+/* Reset this buffer. Note that this does not deallocate any resources. */ -+void grub_buffer_reset (grub_buffer_t buf); -+ -+/* -+ * Return a pointer to the underlying data buffer at the specified -+ * offset from the current read position. Note that this pointer may -+ * become invalid if the buffer is mutated further. -+ */ -+static inline void * -+grub_buffer_peek_data_at (grub_buffer_t buf, grub_size_t off) -+{ -+ if (grub_add (buf->pos, off, &off)) -+ { -+ grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is detected.")); -+ return NULL; -+ } -+ -+ if (off >= buf->used) -+ { -+ grub_error (GRUB_ERR_OUT_OF_RANGE, N_("peek out of range")); -+ return NULL; -+ } -+ -+ return &buf->data[off]; -+} -+ -+/* -+ * Return a pointer to the underlying data buffer at the current -+ * read position. Note that this pointer may become invalid if the -+ * buffer is mutated further. -+ */ -+static inline void * -+grub_buffer_peek_data (grub_buffer_t buf) -+{ -+ return grub_buffer_peek_data_at (buf, 0); -+} -+ -+/* Advance the read position by the specified number of bytes. */ -+extern grub_err_t grub_buffer_advance_read_pos (grub_buffer_t buf, grub_size_t n); -+ -+#endif /* GRUB_BUFFER_H */ -diff --git a/po/POTFILES.in b/po/POTFILES.in -index 5e26845..7753ab4 100644 ---- a/po/POTFILES.in -+++ b/po/POTFILES.in -@@ -250,6 +250,7 @@ - ./grub-core/kern/arm64/dl.c - ./grub-core/kern/arm64/dl_helper.c - ./grub-core/kern/arm64/efi/init.c -+./grub-core/kern/buffer.c - ./grub-core/kern/command.c - ./grub-core/kern/compiler-rt.c - ./grub-core/kern/coreboot/cbtable.c -@@ -1021,6 +1022,7 @@ - ./include/grub/boottime.h - ./include/grub/bsdlabel.h - ./include/grub/btrfs.h -+./include/grub/buffer.h - ./include/grub/bufio.h - ./include/grub/cache.h - ./include/grub/cbfs_core.h --- -2.14.2 - diff --git a/buildroot/boot/grub2/0132-kern-parser-Fix-a-stack-buffer-overflow.patch b/buildroot/boot/grub2/0132-kern-parser-Fix-a-stack-buffer-overflow.patch deleted file mode 100644 index b017c1e5f9..0000000000 --- a/buildroot/boot/grub2/0132-kern-parser-Fix-a-stack-buffer-overflow.patch +++ /dev/null @@ -1,248 +0,0 @@ -From 4ea7bae51f97e49c84dc67ea30b466ca8633b9f6 Mon Sep 17 00:00:00 2001 -From: Chris Coulson -Date: Thu, 7 Jan 2021 19:21:03 +0000 -Subject: [PATCH] kern/parser: Fix a stack buffer overflow - -grub_parser_split_cmdline() expands variable names present in the supplied -command line in to their corresponding variable contents and uses a 1 kiB -stack buffer for temporary storage without sufficient bounds checking. If -the function is called with a command line that references a variable with -a sufficiently large payload, it is possible to overflow the stack -buffer via tab completion, corrupt the stack frame and potentially -control execution. - -Fixes: CVE-2020-27749 - -Reported-by: Chris Coulson -Signed-off-by: Chris Coulson -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/kern/parser.c | 110 +++++++++++++++++++++++++++++------------------- - 1 file changed, 67 insertions(+), 43 deletions(-) - -diff --git a/grub-core/kern/parser.c b/grub-core/kern/parser.c -index e010eaa..6ab7aa4 100644 ---- a/grub-core/kern/parser.c -+++ b/grub-core/kern/parser.c -@@ -18,6 +18,7 @@ - */ - - #include -+#include - #include - #include - #include -@@ -107,8 +108,8 @@ check_varstate (grub_parser_state_t s) - } - - --static void --add_var (char *varname, char **bp, char **vp, -+static grub_err_t -+add_var (grub_buffer_t varname, grub_buffer_t buf, - grub_parser_state_t state, grub_parser_state_t newstate) - { - const char *val; -@@ -116,31 +117,41 @@ add_var (char *varname, char **bp, char **vp, - /* Check if a variable was being read in and the end of the name - was reached. */ - if (!(check_varstate (state) && !check_varstate (newstate))) -- return; -+ return GRUB_ERR_NONE; -+ -+ if (grub_buffer_append_char (varname, '\0') != GRUB_ERR_NONE) -+ return grub_errno; - -- *((*vp)++) = '\0'; -- val = grub_env_get (varname); -- *vp = varname; -+ val = grub_env_get ((const char *) grub_buffer_peek_data (varname)); -+ grub_buffer_reset (varname); - if (!val) -- return; -+ return GRUB_ERR_NONE; - - /* Insert the contents of the variable in the buffer. */ -- for (; *val; val++) -- *((*bp)++) = *val; -+ return grub_buffer_append_data (buf, val, grub_strlen (val)); - } - --static void --terminate_arg (char *buffer, char **bp, int *argc) -+static grub_err_t -+terminate_arg (grub_buffer_t buffer, int *argc) - { -- if (*bp != buffer && *((*bp) - 1) != '\0') -- { -- *((*bp)++) = '\0'; -- (*argc)++; -- } -+ grub_size_t unread = grub_buffer_get_unread_bytes (buffer); -+ -+ if (unread == 0) -+ return GRUB_ERR_NONE; -+ -+ if (*(const char *) grub_buffer_peek_data_at (buffer, unread - 1) == '\0') -+ return GRUB_ERR_NONE; -+ -+ if (grub_buffer_append_char (buffer, '\0') != GRUB_ERR_NONE) -+ return grub_errno; -+ -+ (*argc)++; -+ -+ return GRUB_ERR_NONE; - } - - static grub_err_t --process_char (char c, char *buffer, char **bp, char *varname, char **vp, -+process_char (char c, grub_buffer_t buffer, grub_buffer_t varname, - grub_parser_state_t state, int *argc, - grub_parser_state_t *newstate) - { -@@ -153,12 +164,13 @@ process_char (char c, char *buffer, char **bp, char *varname, char **vp, - * not describe the variable anymore, write the variable to - * the buffer. - */ -- add_var (varname, bp, vp, state, *newstate); -+ if (add_var (varname, buffer, state, *newstate) != GRUB_ERR_NONE) -+ return grub_errno; - - if (check_varstate (*newstate)) - { - if (use) -- *((*vp)++) = use; -+ return grub_buffer_append_char (varname, use); - } - else if (*newstate == GRUB_PARSER_STATE_TEXT && - state != GRUB_PARSER_STATE_ESC && grub_isspace (use)) -@@ -167,10 +179,10 @@ process_char (char c, char *buffer, char **bp, char *varname, char **vp, - * Don't add more than one argument if multiple - * spaces are used. - */ -- terminate_arg (buffer, bp, argc); -+ return terminate_arg (buffer, argc); - } - else if (use) -- *((*bp)++) = use; -+ return grub_buffer_append_char (buffer, use); - - return GRUB_ERR_NONE; - } -@@ -181,19 +193,22 @@ grub_parser_split_cmdline (const char *cmdline, - int *argc, char ***argv) - { - grub_parser_state_t state = GRUB_PARSER_STATE_TEXT; -- /* XXX: Fixed size buffer, perhaps this buffer should be dynamically -- allocated. */ -- char buffer[1024]; -- char *bp = buffer; -+ grub_buffer_t buffer, varname; - char *rd = (char *) cmdline; - char *rp = rd; -- char varname[200]; -- char *vp = varname; -- char *args; - int i; - - *argc = 0; - *argv = NULL; -+ -+ buffer = grub_buffer_new (1024); -+ if (buffer == NULL) -+ return grub_errno; -+ -+ varname = grub_buffer_new (200); -+ if (varname == NULL) -+ goto fail; -+ - do - { - if (rp == NULL || *rp == '\0') -@@ -219,7 +234,7 @@ grub_parser_split_cmdline (const char *cmdline, - { - grub_parser_state_t newstate; - -- if (process_char (*rp, buffer, &bp, varname, &vp, state, argc, -+ if (process_char (*rp, buffer, varname, state, argc, - &newstate) != GRUB_ERR_NONE) - goto fail; - -@@ -230,10 +245,12 @@ grub_parser_split_cmdline (const char *cmdline, - - /* A special case for when the last character was part of a - variable. */ -- add_var (varname, &bp, &vp, state, GRUB_PARSER_STATE_TEXT); -+ if (add_var (varname, buffer, state, GRUB_PARSER_STATE_TEXT) != GRUB_ERR_NONE) -+ goto fail; - - /* Ensure that the last argument is terminated. */ -- terminate_arg (buffer, &bp, argc); -+ if (terminate_arg (buffer, argc) != GRUB_ERR_NONE) -+ goto fail; - - /* If there are no args, then we're done. */ - if (!*argc) -@@ -242,38 +259,45 @@ grub_parser_split_cmdline (const char *cmdline, - goto out; - } - -- /* Reserve memory for the return values. */ -- args = grub_malloc (bp - buffer); -- if (!args) -- goto fail; -- grub_memcpy (args, buffer, bp - buffer); -- - *argv = grub_calloc (*argc + 1, sizeof (char *)); - if (!*argv) - goto fail; - - /* The arguments are separated with 0's, setup argv so it points to - the right values. */ -- bp = args; - for (i = 0; i < *argc; i++) - { -- (*argv)[i] = bp; -- while (*bp) -- bp++; -- bp++; -+ char *arg; -+ -+ if (i > 0) -+ { -+ if (grub_buffer_advance_read_pos (buffer, 1) != GRUB_ERR_NONE) -+ goto fail; -+ } -+ -+ arg = (char *) grub_buffer_peek_data (buffer); -+ if (arg == NULL || -+ grub_buffer_advance_read_pos (buffer, grub_strlen (arg)) != GRUB_ERR_NONE) -+ goto fail; -+ -+ (*argv)[i] = arg; - } - -+ /* Keep memory for the return values. */ -+ grub_buffer_take_data (buffer); -+ - grub_errno = GRUB_ERR_NONE; - - out: - if (rd != cmdline) - grub_free (rd); -+ grub_buffer_free (buffer); -+ grub_buffer_free (varname); - - return grub_errno; - - fail: - grub_free (*argv); -- grub_free (args); - goto out; - } - --- -2.14.2 - diff --git a/buildroot/boot/grub2/0133-kern-efi-Add-initial-stack-protector-implementation.patch b/buildroot/boot/grub2/0133-kern-efi-Add-initial-stack-protector-implementation.patch deleted file mode 100644 index c0b6bf6a83..0000000000 --- a/buildroot/boot/grub2/0133-kern-efi-Add-initial-stack-protector-implementation.patch +++ /dev/null @@ -1,466 +0,0 @@ -From 133d73079c5771bbf3d8311281b6772846357ec1 Mon Sep 17 00:00:00 2001 -From: Chris Coulson -Date: Tue, 1 Dec 2020 23:03:39 +0000 -Subject: [PATCH] kern/efi: Add initial stack protector implementation - -It works only on UEFI platforms but can be quite easily extended to -others architectures and platforms if needed. - -Signed-off-by: Chris Coulson -Signed-off-by: Daniel Kiper -Reviewed-by: Marco A Benatto -Reviewed-by: Javier Martinez Canillas -Signed-off-by: Stefan Sørensen ---- - acinclude.m4 | 38 ++++++++++++++++- - configure | 97 +++++++++++++++++++++++++++++++++++++++--- - configure.ac | 44 ++++++++++++++++--- - grub-core/Makefile.am | 1 + - grub-core/Makefile.in | 1 + - grub-core/kern/efi/init.c | 54 +++++++++++++++++++++++ - include/grub/efi/api.h | 19 +++++++++ - include/grub/stack_protector.h | 30 +++++++++++++ - po/POTFILES.in | 1 + - 9 files changed, 272 insertions(+), 13 deletions(-) - create mode 100644 include/grub/stack_protector.h - -diff --git a/acinclude.m4 b/acinclude.m4 -index 78cdf6e..6e14bb5 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -305,9 +305,9 @@ fi - ]) - - --dnl Check if the C compiler supports `-fstack-protector'. -+dnl Check if the C compiler supports the stack protector - AC_DEFUN([grub_CHECK_STACK_PROTECTOR],[ --[# Smashing stack protector. -+[# Stack smashing protector. - ssp_possible=yes] - AC_MSG_CHECKING([whether `$CC' accepts `-fstack-protector']) - # Is this a reliable test case? -@@ -324,6 +324,40 @@ else - ssp_possible=no] - AC_MSG_RESULT([no]) - [fi] -+[# Strong stack smashing protector. -+ssp_strong_possible=yes] -+AC_MSG_CHECKING([whether `$CC' accepts `-fstack-protector-strong']) -+# Is this a reliable test case? -+AC_LANG_CONFTEST([AC_LANG_SOURCE([[ -+void foo (void) { volatile char a[8]; a[3]; } -+]])]) -+[# `$CC -c -o ...' might not be portable. But, oh, well... Is calling -+# `ac_compile' like this correct, after all? -+if eval "$ac_compile -S -fstack-protector-strong -o conftest.s" 2> /dev/null; then] -+ AC_MSG_RESULT([yes]) -+ [# Should we clear up other files as well, having called `AC_LANG_CONFTEST'? -+ rm -f conftest.s -+else -+ ssp_strong_possible=no] -+ AC_MSG_RESULT([no]) -+[fi] -+[# Global stack smashing protector. -+ssp_global_possible=yes] -+AC_MSG_CHECKING([whether `$CC' accepts `-mstack-protector-guard=global']) -+# Is this a reliable test case? -+AC_LANG_CONFTEST([AC_LANG_SOURCE([[ -+void foo (void) { volatile char a[8]; a[3]; } -+]])]) -+[# `$CC -c -o ...' might not be portable. But, oh, well... Is calling -+# `ac_compile' like this correct, after all? -+if eval "$ac_compile -S -fstack-protector -mstack-protector-guard=global -o conftest.s" 2> /dev/null; then] -+ AC_MSG_RESULT([yes]) -+ [# Should we clear up other files as well, having called `AC_LANG_CONFTEST'? -+ rm -f conftest.s -+else -+ ssp_global_possible=no] -+ AC_MSG_RESULT([no]) -+[fi] - ]) - - dnl Check if the C compiler supports `-mstack-arg-probe' (Cygwin). -diff --git a/configure b/configure -index 9290ae8..973f702 100755 ---- a/configure -+++ b/configure -@@ -1778,6 +1778,7 @@ with_libintl_prefix - with_libpth_prefix - with_included_regex - enable_efiemu -+enable_stack_protector - enable_mm_debug - enable_cache_stats - enable_boot_time -@@ -2459,6 +2460,8 @@ Optional Features: - --disable-rpath do not hardcode runtime library paths - --enable-efiemu build and install the efiemu runtimes - (default=guessed) -+ --enable-stack-protector -+ enable the stack protector - --enable-mm-debug include memory manager debugging - --enable-cache-stats enable disk cache statistics collection - --enable-boot-time enable boot time statistics collection -@@ -32348,9 +32351,9 @@ fi - - CFLAGS="$TARGET_CFLAGS" - --# Smashing stack protector. -+# Stack smashing protector. - --# Smashing stack protector. -+# Stack smashing protector. - ssp_possible=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`$CC' accepts \`-fstack-protector'" >&5 - $as_echo_n "checking whether \`$CC' accepts \`-fstack-protector'... " >&6; } -@@ -32373,11 +32376,88 @@ else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi -+# Strong stack smashing protector. -+ssp_strong_possible=yes -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`$CC' accepts \`-fstack-protector-strong'" >&5 -+$as_echo_n "checking whether \`$CC' accepts \`-fstack-protector-strong'... " >&6; } -+# Is this a reliable test case? -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ - --# Need that, because some distributions ship compilers that include --# `-fstack-protector' in the default specs. --if test "x$ssp_possible" = xyes; then -- TARGET_CFLAGS="$TARGET_CFLAGS -fno-stack-protector" -+void foo (void) { volatile char a[8]; a[3]; } -+ -+_ACEOF -+# `$CC -c -o ...' might not be portable. But, oh, well... Is calling -+# `ac_compile' like this correct, after all? -+if eval "$ac_compile -S -fstack-protector-strong -o conftest.s" 2> /dev/null; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } -+ # Should we clear up other files as well, having called `AC_LANG_CONFTEST'? -+ rm -f conftest.s -+else -+ ssp_strong_possible=no -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+# Global stack smashing protector. -+ssp_global_possible=yes -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`$CC' accepts \`-mstack-protector-guard=global'" >&5 -+$as_echo_n "checking whether \`$CC' accepts \`-mstack-protector-guard=global'... " >&6; } -+# Is this a reliable test case? -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+void foo (void) { volatile char a[8]; a[3]; } -+ -+_ACEOF -+# `$CC -c -o ...' might not be portable. But, oh, well... Is calling -+# `ac_compile' like this correct, after all? -+if eval "$ac_compile -S -fstack-protector -mstack-protector-guard=global -o conftest.s" 2> /dev/null; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } -+ # Should we clear up other files as well, having called `AC_LANG_CONFTEST'? -+ rm -f conftest.s -+else -+ ssp_global_possible=no -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+# Check whether --enable-stack-protector was given. -+if test "${enable_stack_protector+set}" = set; then : -+ enableval=$enable_stack_protector; -+else -+ enable_stack_protector=no -+fi -+ -+if test "x$enable_stack_protector" = xno; then -+ if test "x$ssp_possible" = xyes; then -+ # Need that, because some distributions ship compilers that include -+ # `-fstack-protector' in the default specs. -+ TARGET_CFLAGS="$TARGET_CFLAGS -fno-stack-protector" -+ fi -+elif test "x$platform" != xefi; then -+ as_fn_error $? "--enable-stack-protector is only supported on EFI platforms" "$LINENO" 5 -+elif test "x$ssp_global_possible" != xyes; then -+ as_fn_error $? "--enable-stack-protector is not supported (compiler doesn't support -mstack-protector-guard=global)" "$LINENO" 5 -+else -+ TARGET_CFLAGS="$TARGET_CFLAGS -mstack-protector-guard=global" -+ if test "x$enable_stack_protector" = xyes; then -+ if test "x$ssp_possible" != xyes; then -+ as_fn_error $? "--enable-stack-protector is not supported (compiler doesn't support -fstack-protector)" "$LINENO" 5 -+ fi -+ TARGET_CFLAGS="$TARGET_CFLAGS -fstack-protector" -+ elif test "x$enable_stack_protector" = xstrong; then -+ if test "x$ssp_strong_possible" != xyes; then -+ as_fn_error $? "--enable-stack-protector=strong is not supported (compiler doesn't support -fstack-protector-strong)" "$LINENO" 5 -+ fi -+ TARGET_CFLAGS="$TARGET_CFLAGS -fstack-protector-strong" -+ else -+ # Note, -fstack-protector-all requires that the protector is disabled for -+ # functions that appear in the call stack when the canary is initialized. -+ as_fn_error $? "invalid value $enable_stack_protector for --enable-stack-protector" "$LINENO" 5 -+ fi -+ TARGET_CPPFLAGS="$TARGET_CPPFLAGS -DGRUB_STACK_PROTECTOR=1" - fi - - CFLAGS="$TARGET_CFLAGS" -@@ -37054,5 +37134,10 @@ echo "Without liblzma (no support for XZ-compressed mips images) ($liblzma_excus - else - echo "With liblzma from $LIBLZMA (support for XZ-compressed mips images)" - fi -+if test "x$enable_stack_protector" != xno; then -+echo "With stack smashing protector: Yes" -+else -+echo "With stack smashing protector: No" -+fi - echo "*******************************************************" - -diff --git a/configure.ac b/configure.ac -index 7656f24..bb6b02a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1285,12 +1285,41 @@ fi] - - CFLAGS="$TARGET_CFLAGS" - --# Smashing stack protector. -+# Stack smashing protector. - grub_CHECK_STACK_PROTECTOR --# Need that, because some distributions ship compilers that include --# `-fstack-protector' in the default specs. --if test "x$ssp_possible" = xyes; then -- TARGET_CFLAGS="$TARGET_CFLAGS -fno-stack-protector" -+AC_ARG_ENABLE([stack-protector], -+ AS_HELP_STRING([--enable-stack-protector], -+ [enable the stack protector]), -+ [], -+ [enable_stack_protector=no]) -+if test "x$enable_stack_protector" = xno; then -+ if test "x$ssp_possible" = xyes; then -+ # Need that, because some distributions ship compilers that include -+ # `-fstack-protector' in the default specs. -+ TARGET_CFLAGS="$TARGET_CFLAGS -fno-stack-protector" -+ fi -+elif test "x$platform" != xefi; then -+ AC_MSG_ERROR([--enable-stack-protector is only supported on EFI platforms]) -+elif test "x$ssp_global_possible" != xyes; then -+ AC_MSG_ERROR([--enable-stack-protector is not supported (compiler doesn't support -mstack-protector-guard=global)]) -+else -+ TARGET_CFLAGS="$TARGET_CFLAGS -mstack-protector-guard=global" -+ if test "x$enable_stack_protector" = xyes; then -+ if test "x$ssp_possible" != xyes; then -+ AC_MSG_ERROR([--enable-stack-protector is not supported (compiler doesn't support -fstack-protector)]) -+ fi -+ TARGET_CFLAGS="$TARGET_CFLAGS -fstack-protector" -+ elif test "x$enable_stack_protector" = xstrong; then -+ if test "x$ssp_strong_possible" != xyes; then -+ AC_MSG_ERROR([--enable-stack-protector=strong is not supported (compiler doesn't support -fstack-protector-strong)]) -+ fi -+ TARGET_CFLAGS="$TARGET_CFLAGS -fstack-protector-strong" -+ else -+ # Note, -fstack-protector-all requires that the protector is disabled for -+ # functions that appear in the call stack when the canary is initialized. -+ AC_MSG_ERROR([invalid value $enable_stack_protector for --enable-stack-protector]) -+ fi -+ TARGET_CPPFLAGS="$TARGET_CPPFLAGS -DGRUB_STACK_PROTECTOR=1" - fi - - CFLAGS="$TARGET_CFLAGS" -@@ -2103,5 +2132,10 @@ echo "Without liblzma (no support for XZ-compressed mips images) ($liblzma_excus - else - echo "With liblzma from $LIBLZMA (support for XZ-compressed mips images)" - fi -+if test "x$enable_stack_protector" != xno; then -+echo "With stack smashing protector: Yes" -+else -+echo "With stack smashing protector: No" -+fi - echo "*******************************************************" - ] -diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am -index 30e23ad..ee88e44 100644 ---- a/grub-core/Makefile.am -+++ b/grub-core/Makefile.am -@@ -90,6 +90,7 @@ endif - KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/mm.h - KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/parser.h - KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/partition.h -+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/stack_protector.h - KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/term.h - KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/time.h - KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/verify.h -diff --git a/grub-core/Makefile.in b/grub-core/Makefile.in -index 1f8133b..50c70b5 100644 ---- a/grub-core/Makefile.in -+++ b/grub-core/Makefile.in -@@ -16425,6 +16425,7 @@ KERNEL_HEADER_FILES = $(top_srcdir)/include/grub/cache.h \ - $(am__append_5795) $(top_srcdir)/include/grub/mm.h \ - $(top_srcdir)/include/grub/parser.h \ - $(top_srcdir)/include/grub/partition.h \ -+ $(top_srcdir)/include/grub/stack_protector.h \ - $(top_srcdir)/include/grub/term.h \ - $(top_srcdir)/include/grub/time.h \ - $(top_srcdir)/include/grub/verify.h \ -diff --git a/grub-core/kern/efi/init.c b/grub-core/kern/efi/init.c -index 1333465..7facacf 100644 ---- a/grub-core/kern/efi/init.c -+++ b/grub-core/kern/efi/init.c -@@ -27,6 +27,58 @@ - #include - #include - #include -+#include -+ -+#ifdef GRUB_STACK_PROTECTOR -+ -+static grub_efi_guid_t rng_protocol_guid = GRUB_EFI_RNG_PROTOCOL_GUID; -+ -+/* -+ * Don't put this on grub_efi_init()'s local stack to avoid it -+ * getting a stack check. -+ */ -+static grub_efi_uint8_t stack_chk_guard_buf[32]; -+ -+grub_addr_t __stack_chk_guard; -+ -+void __attribute__ ((noreturn)) -+__stack_chk_fail (void) -+{ -+ /* -+ * Assume it's not safe to call into EFI Boot Services. Sorry, that -+ * means no console message here. -+ */ -+ do -+ { -+ /* Do not optimize out the loop. */ -+ asm volatile (""); -+ } -+ while (1); -+} -+ -+static void -+stack_protector_init (void) -+{ -+ grub_efi_rng_protocol_t *rng; -+ -+ /* Set up the stack canary. Make errors here non-fatal for now. */ -+ rng = grub_efi_locate_protocol (&rng_protocol_guid, NULL); -+ if (rng != NULL) -+ { -+ grub_efi_status_t status; -+ -+ status = efi_call_4 (rng->get_rng, rng, NULL, sizeof (stack_chk_guard_buf), -+ stack_chk_guard_buf); -+ if (status == GRUB_EFI_SUCCESS) -+ grub_memcpy (&__stack_chk_guard, stack_chk_guard_buf, sizeof (__stack_chk_guard)); -+ } -+} -+#else -+static void -+stack_protector_init (void) -+{ -+} -+#endif - - grub_addr_t grub_modbase; - -@@ -38,6 +90,8 @@ grub_efi_init (void) - messages. */ - grub_console_init (); - -+ stack_protector_init (); -+ - /* Initialize the memory management system. */ - grub_efi_mm_init (); - -diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h -index 13e5715..5517f7e 100644 ---- a/include/grub/efi/api.h -+++ b/include/grub/efi/api.h -@@ -339,6 +339,11 @@ - { 0xab, 0xb6, 0x3d, 0xd8, 0x10, 0xdd, 0x8b, 0x23 } \ - } - -+#define GRUB_EFI_RNG_PROTOCOL_GUID \ -+ { 0x3152bca5, 0xeade, 0x433d, \ -+ { 0x86, 0x2e, 0xc0, 0x1c, 0xdc, 0x29, 0x1f, 0x44 } \ -+ } -+ - struct grub_efi_sal_system_table - { - grub_uint32_t signature; -@@ -1700,6 +1705,20 @@ struct grub_efi_shim_lock_protocol - }; - typedef struct grub_efi_shim_lock_protocol grub_efi_shim_lock_protocol_t; - -+typedef grub_efi_guid_t grub_efi_rng_algorithm_t; -+ -+struct grub_efi_rng_protocol -+{ -+ grub_efi_status_t (*get_info) (struct grub_efi_rng_protocol *this, -+ grub_efi_uintn_t *rng_algorithm_list_size, -+ grub_efi_rng_algorithm_t *rng_algorithm_list); -+ grub_efi_status_t (*get_rng) (struct grub_efi_rng_protocol *this, -+ grub_efi_rng_algorithm_t *rng_algorithm, -+ grub_efi_uintn_t rng_value_length, -+ grub_efi_uint8_t *rng_value); -+}; -+typedef struct grub_efi_rng_protocol grub_efi_rng_protocol_t; -+ - #if (GRUB_TARGET_SIZEOF_VOID_P == 4) || defined (__ia64__) \ - || defined (__aarch64__) || defined (__MINGW64__) || defined (__CYGWIN__) \ - || defined(__riscv) -diff --git a/include/grub/stack_protector.h b/include/grub/stack_protector.h -new file mode 100644 -index 0000000..c88dc00 ---- /dev/null -+++ b/include/grub/stack_protector.h -@@ -0,0 +1,30 @@ -+/* -+ * GRUB -- GRand Unified Bootloader -+ * Copyright (C) 2021 Free Software Foundation, Inc. -+ * -+ * GRUB is free software: you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation, either version 3 of the License, or -+ * (at your option) any later version. -+ * -+ * GRUB is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with GRUB. If not, see . -+ */ -+ -+#ifndef GRUB_STACK_PROTECTOR_H -+#define GRUB_STACK_PROTECTOR_H 1 -+ -+#include -+#include -+ -+#ifdef GRUB_STACK_PROTECTOR -+extern grub_addr_t EXPORT_VAR (__stack_chk_guard); -+extern void __attribute__ ((noreturn)) EXPORT_FUNC (__stack_chk_fail) (void); -+#endif -+ -+#endif /* GRUB_STACK_PROTECTOR_H */ -diff --git a/po/POTFILES.in b/po/POTFILES.in -index 7753ab4..ef42c7d 100644 ---- a/po/POTFILES.in -+++ b/po/POTFILES.in -@@ -1319,6 +1319,7 @@ - ./include/grub/sparc64/time.h - ./include/grub/sparc64/types.h - ./include/grub/speaker.h -+./include/grub/stack_protector.h - ./include/grub/symbol.h - ./include/grub/syslinux_parse.h - ./include/grub/term.h --- -2.14.2 - diff --git a/buildroot/boot/grub2/0134-util-mkimage-Remove-unused-code-to-add-BSS-section.patch b/buildroot/boot/grub2/0134-util-mkimage-Remove-unused-code-to-add-BSS-section.patch deleted file mode 100644 index a3eb78ebc7..0000000000 --- a/buildroot/boot/grub2/0134-util-mkimage-Remove-unused-code-to-add-BSS-section.patch +++ /dev/null @@ -1,61 +0,0 @@ -From d52f78def1b9c4f435fdbf6b24fd899208580c76 Mon Sep 17 00:00:00 2001 -From: Javier Martinez Canillas -Date: Thu, 11 Feb 2021 17:06:49 +0100 -Subject: [PATCH] util/mkimage: Remove unused code to add BSS section - -The code is compiled out so there is no reason to keep it. - -Additionally, don't set bss_size field since we do not add a BSS section. - -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - util/mkimage.c | 17 ----------------- - 1 file changed, 17 deletions(-) - -diff --git a/util/mkimage.c b/util/mkimage.c -index 37d6249..32bb8ea 100644 ---- a/util/mkimage.c -+++ b/util/mkimage.c -@@ -1304,7 +1304,6 @@ grub_install_generate_image (const char *dir, const char *prefix, - o->code_size = grub_host_to_target32 (layout.exec_size); - o->data_size = grub_cpu_to_le32 (reloc_addr - layout.exec_size - - header_size); -- o->bss_size = grub_cpu_to_le32 (layout.bss_size); - o->entry_addr = grub_cpu_to_le32 (layout.start_address); - o->code_base = grub_cpu_to_le32 (header_size); - -@@ -1342,7 +1341,6 @@ grub_install_generate_image (const char *dir, const char *prefix, - o->code_size = grub_host_to_target32 (layout.exec_size); - o->data_size = grub_cpu_to_le32 (reloc_addr - layout.exec_size - - header_size); -- o->bss_size = grub_cpu_to_le32 (layout.bss_size); - o->entry_addr = grub_cpu_to_le32 (layout.start_address); - o->code_base = grub_cpu_to_le32 (header_size); - o->image_base = 0; -@@ -1387,21 +1385,6 @@ grub_install_generate_image (const char *dir, const char *prefix, - = grub_cpu_to_le32_compile_time (GRUB_PE32_SCN_CNT_INITIALIZED_DATA - | GRUB_PE32_SCN_MEM_READ - | GRUB_PE32_SCN_MEM_WRITE); -- --#if 0 -- bss_section = data_section + 1; -- strcpy (bss_section->name, ".bss"); -- bss_section->virtual_size = grub_cpu_to_le32 (layout.bss_size); -- bss_section->virtual_address = grub_cpu_to_le32 (header_size + layout.kernel_size); -- bss_section->raw_data_size = 0; -- bss_section->raw_data_offset = 0; -- bss_section->characteristics -- = grub_cpu_to_le32_compile_time (GRUB_PE32_SCN_MEM_READ -- | GRUB_PE32_SCN_MEM_WRITE -- | GRUB_PE32_SCN_ALIGN_64BYTES -- | GRUB_PE32_SCN_CNT_INITIALIZED_DATA -- | 0x80); --#endif - - mods_section = data_section + 1; - strcpy (mods_section->name, "mods"); --- -2.14.2 - diff --git a/buildroot/boot/grub2/0135-util-mkimage-Use-grub_host_to_target32-instead-of-gr.patch b/buildroot/boot/grub2/0135-util-mkimage-Use-grub_host_to_target32-instead-of-gr.patch deleted file mode 100644 index 778065ce5f..0000000000 --- a/buildroot/boot/grub2/0135-util-mkimage-Use-grub_host_to_target32-instead-of-gr.patch +++ /dev/null @@ -1,113 +0,0 @@ -From 1710452aca05ccdd21e74390ec08c63fdf0ee10a Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Mon, 15 Feb 2021 13:59:21 +0100 -Subject: [PATCH] util/mkimage: Use grub_host_to_target32() instead of - grub_cpu_to_le32() - -The latter doesn't take into account the target image endianness. There is -a grub_cpu_to_le32_compile_time() but no compile time variant for function -grub_host_to_target32(). So, let's keep using the other one for this case. - -Signed-off-by: Peter Jones -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - util/mkimage.c | 44 ++++++++++++++++++++++---------------------- - 1 file changed, 22 insertions(+), 22 deletions(-) - -diff --git a/util/mkimage.c b/util/mkimage.c -index 32bb8ea..02944f2 100644 ---- a/util/mkimage.c -+++ b/util/mkimage.c -@@ -1302,10 +1302,10 @@ grub_install_generate_image (const char *dir, const char *prefix, - + sizeof (struct grub_pe32_coff_header)); - o->magic = grub_host_to_target16 (GRUB_PE32_PE32_MAGIC); - o->code_size = grub_host_to_target32 (layout.exec_size); -- o->data_size = grub_cpu_to_le32 (reloc_addr - layout.exec_size -+ o->data_size = grub_host_to_target32 (reloc_addr - layout.exec_size - - header_size); -- o->entry_addr = grub_cpu_to_le32 (layout.start_address); -- o->code_base = grub_cpu_to_le32 (header_size); -+ o->entry_addr = grub_host_to_target32 (layout.start_address); -+ o->code_base = grub_host_to_target32 (header_size); - - o->data_base = grub_host_to_target32 (header_size + layout.exec_size); - -@@ -1339,10 +1339,10 @@ grub_install_generate_image (const char *dir, const char *prefix, - + sizeof (struct grub_pe32_coff_header)); - o->magic = grub_host_to_target16 (GRUB_PE32_PE64_MAGIC); - o->code_size = grub_host_to_target32 (layout.exec_size); -- o->data_size = grub_cpu_to_le32 (reloc_addr - layout.exec_size -+ o->data_size = grub_host_to_target32 (reloc_addr - layout.exec_size - - header_size); -- o->entry_addr = grub_cpu_to_le32 (layout.start_address); -- o->code_base = grub_cpu_to_le32 (header_size); -+ o->entry_addr = grub_host_to_target32 (layout.start_address); -+ o->code_base = grub_host_to_target32 (header_size); - o->image_base = 0; - o->section_alignment = grub_host_to_target32 (image_target->section_align); - o->file_alignment = grub_host_to_target32 (GRUB_PE32_FILE_ALIGNMENT); -@@ -1366,10 +1366,10 @@ grub_install_generate_image (const char *dir, const char *prefix, - /* The sections. */ - text_section = sections; - strcpy (text_section->name, ".text"); -- text_section->virtual_size = grub_cpu_to_le32 (layout.exec_size); -- text_section->virtual_address = grub_cpu_to_le32 (header_size); -- text_section->raw_data_size = grub_cpu_to_le32 (layout.exec_size); -- text_section->raw_data_offset = grub_cpu_to_le32 (header_size); -+ text_section->virtual_size = grub_host_to_target32 (layout.exec_size); -+ text_section->virtual_address = grub_host_to_target32 (header_size); -+ text_section->raw_data_size = grub_host_to_target32 (layout.exec_size); -+ text_section->raw_data_offset = grub_host_to_target32 (header_size); - text_section->characteristics = grub_cpu_to_le32_compile_time ( - GRUB_PE32_SCN_CNT_CODE - | GRUB_PE32_SCN_MEM_EXECUTE -@@ -1377,10 +1377,10 @@ grub_install_generate_image (const char *dir, const char *prefix, - - data_section = text_section + 1; - strcpy (data_section->name, ".data"); -- data_section->virtual_size = grub_cpu_to_le32 (layout.kernel_size - layout.exec_size); -- data_section->virtual_address = grub_cpu_to_le32 (header_size + layout.exec_size); -- data_section->raw_data_size = grub_cpu_to_le32 (layout.kernel_size - layout.exec_size); -- data_section->raw_data_offset = grub_cpu_to_le32 (header_size + layout.exec_size); -+ data_section->virtual_size = grub_host_to_target32 (layout.kernel_size - layout.exec_size); -+ data_section->virtual_address = grub_host_to_target32 (header_size + layout.exec_size); -+ data_section->raw_data_size = grub_host_to_target32 (layout.kernel_size - layout.exec_size); -+ data_section->raw_data_offset = grub_host_to_target32 (header_size + layout.exec_size); - data_section->characteristics - = grub_cpu_to_le32_compile_time (GRUB_PE32_SCN_CNT_INITIALIZED_DATA - | GRUB_PE32_SCN_MEM_READ -@@ -1388,10 +1388,10 @@ grub_install_generate_image (const char *dir, const char *prefix, - - mods_section = data_section + 1; - strcpy (mods_section->name, "mods"); -- mods_section->virtual_size = grub_cpu_to_le32 (reloc_addr - layout.kernel_size - header_size); -- mods_section->virtual_address = grub_cpu_to_le32 (header_size + layout.kernel_size + layout.bss_size); -- mods_section->raw_data_size = grub_cpu_to_le32 (reloc_addr - layout.kernel_size - header_size); -- mods_section->raw_data_offset = grub_cpu_to_le32 (header_size + layout.kernel_size); -+ mods_section->virtual_size = grub_host_to_target32 (reloc_addr - layout.kernel_size - header_size); -+ mods_section->virtual_address = grub_host_to_target32 (header_size + layout.kernel_size + layout.bss_size); -+ mods_section->raw_data_size = grub_host_to_target32 (reloc_addr - layout.kernel_size - header_size); -+ mods_section->raw_data_offset = grub_host_to_target32 (header_size + layout.kernel_size); - mods_section->characteristics - = grub_cpu_to_le32_compile_time (GRUB_PE32_SCN_CNT_INITIALIZED_DATA - | GRUB_PE32_SCN_MEM_READ -@@ -1399,10 +1399,10 @@ grub_install_generate_image (const char *dir, const char *prefix, - - reloc_section = mods_section + 1; - strcpy (reloc_section->name, ".reloc"); -- reloc_section->virtual_size = grub_cpu_to_le32 (layout.reloc_size); -- reloc_section->virtual_address = grub_cpu_to_le32 (reloc_addr + layout.bss_size); -- reloc_section->raw_data_size = grub_cpu_to_le32 (layout.reloc_size); -- reloc_section->raw_data_offset = grub_cpu_to_le32 (reloc_addr); -+ reloc_section->virtual_size = grub_host_to_target32 (layout.reloc_size); -+ reloc_section->virtual_address = grub_host_to_target32 (reloc_addr + layout.bss_size); -+ reloc_section->raw_data_size = grub_host_to_target32 (layout.reloc_size); -+ reloc_section->raw_data_offset = grub_host_to_target32 (reloc_addr); - reloc_section->characteristics - = grub_cpu_to_le32_compile_time (GRUB_PE32_SCN_CNT_INITIALIZED_DATA - | GRUB_PE32_SCN_MEM_DISCARDABLE --- -2.14.2 - diff --git a/buildroot/boot/grub2/0136-util-mkimage-Always-use-grub_host_to_target32-to-ini.patch b/buildroot/boot/grub2/0136-util-mkimage-Always-use-grub_host_to_target32-to-ini.patch deleted file mode 100644 index 81d7d01f9b..0000000000 --- a/buildroot/boot/grub2/0136-util-mkimage-Always-use-grub_host_to_target32-to-ini.patch +++ /dev/null @@ -1,39 +0,0 @@ -From ae8936f9c375e1a38129e85a1b5d573fb451f288 Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Mon, 15 Feb 2021 14:14:24 +0100 -Subject: [PATCH] util/mkimage: Always use grub_host_to_target32() to - initialize PE stack and heap stuff - -This change does not impact final result of initialization itself. -However, it eases PE code unification in subsequent patches. - -Signed-off-by: Peter Jones -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - util/mkimage.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/util/mkimage.c b/util/mkimage.c -index 02944f2..b94bfb7 100644 ---- a/util/mkimage.c -+++ b/util/mkimage.c -@@ -1351,10 +1351,10 @@ grub_install_generate_image (const char *dir, const char *prefix, - o->subsystem = grub_host_to_target16 (GRUB_PE32_SUBSYSTEM_EFI_APPLICATION); - - /* Do these really matter? */ -- o->stack_reserve_size = grub_host_to_target64 (0x10000); -- o->stack_commit_size = grub_host_to_target64 (0x10000); -- o->heap_reserve_size = grub_host_to_target64 (0x10000); -- o->heap_commit_size = grub_host_to_target64 (0x10000); -+ o->stack_reserve_size = grub_host_to_target32 (0x10000); -+ o->stack_commit_size = grub_host_to_target32 (0x10000); -+ o->heap_reserve_size = grub_host_to_target32 (0x10000); -+ o->heap_commit_size = grub_host_to_target32 (0x10000); - - o->num_data_directories - = grub_host_to_target32 (GRUB_PE32_NUM_DATA_DIRECTORIES); --- -2.14.2 - diff --git a/buildroot/boot/grub2/0137-util-mkimage-Unify-more-of-the-PE32-and-PE32-header-.patch b/buildroot/boot/grub2/0137-util-mkimage-Unify-more-of-the-PE32-and-PE32-header-.patch deleted file mode 100644 index 1f8cb8e2fd..0000000000 --- a/buildroot/boot/grub2/0137-util-mkimage-Unify-more-of-the-PE32-and-PE32-header-.patch +++ /dev/null @@ -1,169 +0,0 @@ -From a4e8936f010a8e928e973b80390c8f83ad6b8000 Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Mon, 15 Feb 2021 14:19:31 +0100 -Subject: [PATCH] util/mkimage: Unify more of the PE32 and PE32+ header set-up - -There's quite a bit of code duplication in the code that sets the optional -header for PE32 and PE32+. The two are very similar with the exception of -a few fields that have type grub_uint64_t instead of grub_uint32_t. - -Factor out the common code and add a PE_OHDR() macro that simplifies the -set-up and make the code more readable. - -Signed-off-by: Peter Jones -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - util/mkimage.c | 111 ++++++++++++++++++++++++++------------------------------- - 1 file changed, 51 insertions(+), 60 deletions(-) - -diff --git a/util/mkimage.c b/util/mkimage.c -index b94bfb7..a039039 100644 ---- a/util/mkimage.c -+++ b/util/mkimage.c -@@ -816,6 +816,21 @@ grub_install_get_image_targets_string (void) - return formats; - } - -+/* -+ * tmp_ is just here so the compiler knows we'll never derefernce a NULL. -+ * It should get fully optimized away. -+ */ -+#define PE_OHDR(o32, o64, field) (*( \ -+{ \ -+ __typeof__((o64)->field) tmp_; \ -+ __typeof__((o64)->field) *ret_ = &tmp_; \ -+ if (o32) \ -+ ret_ = (void *)(&((o32)->field)); \ -+ else if (o64) \ -+ ret_ = (void *)(&((o64)->field)); \ -+ ret_; \ -+})) -+ - void - grub_install_generate_image (const char *dir, const char *prefix, - FILE *out, const char *outname, char *mods[], -@@ -1252,6 +1267,8 @@ grub_install_generate_image (const char *dir, const char *prefix, - static const grub_uint8_t stub[] = GRUB_PE32_MSDOS_STUB; - int header_size; - int reloc_addr; -+ struct grub_pe32_optional_header *o32 = NULL; -+ struct grub_pe64_optional_header *o64 = NULL; - - if (image_target->voidp_sizeof == 4) - header_size = EFI32_HEADER_SIZE; -@@ -1293,76 +1310,50 @@ grub_install_generate_image (const char *dir, const char *prefix, - /* The PE Optional header. */ - if (image_target->voidp_sizeof == 4) - { -- struct grub_pe32_optional_header *o; -- - c->optional_header_size = grub_host_to_target16 (sizeof (struct grub_pe32_optional_header)); - -- o = (struct grub_pe32_optional_header *) -- (header + GRUB_PE32_MSDOS_STUB_SIZE + GRUB_PE32_SIGNATURE_SIZE -- + sizeof (struct grub_pe32_coff_header)); -- o->magic = grub_host_to_target16 (GRUB_PE32_PE32_MAGIC); -- o->code_size = grub_host_to_target32 (layout.exec_size); -- o->data_size = grub_host_to_target32 (reloc_addr - layout.exec_size -- - header_size); -- o->entry_addr = grub_host_to_target32 (layout.start_address); -- o->code_base = grub_host_to_target32 (header_size); -- -- o->data_base = grub_host_to_target32 (header_size + layout.exec_size); -- -- o->image_base = 0; -- o->section_alignment = grub_host_to_target32 (image_target->section_align); -- o->file_alignment = grub_host_to_target32 (GRUB_PE32_FILE_ALIGNMENT); -- o->image_size = grub_host_to_target32 (pe_size); -- o->header_size = grub_host_to_target32 (header_size); -- o->subsystem = grub_host_to_target16 (GRUB_PE32_SUBSYSTEM_EFI_APPLICATION); -- -- /* Do these really matter? */ -- o->stack_reserve_size = grub_host_to_target32 (0x10000); -- o->stack_commit_size = grub_host_to_target32 (0x10000); -- o->heap_reserve_size = grub_host_to_target32 (0x10000); -- o->heap_commit_size = grub_host_to_target32 (0x10000); -- -- o->num_data_directories = grub_host_to_target32 (GRUB_PE32_NUM_DATA_DIRECTORIES); -+ o32 = (struct grub_pe32_optional_header *) -+ (header + GRUB_PE32_MSDOS_STUB_SIZE + GRUB_PE32_SIGNATURE_SIZE + -+ sizeof (struct grub_pe32_coff_header)); -+ o32->magic = grub_host_to_target16 (GRUB_PE32_PE32_MAGIC); -+ o32->data_base = grub_host_to_target32 (header_size + layout.exec_size); - -- o->base_relocation_table.rva = grub_host_to_target32 (reloc_addr); -- o->base_relocation_table.size = grub_host_to_target32 (layout.reloc_size); -- sections = o + 1; -+ sections = o32 + 1; - } - else - { -- struct grub_pe64_optional_header *o; -- - c->optional_header_size = grub_host_to_target16 (sizeof (struct grub_pe64_optional_header)); - -- o = (struct grub_pe64_optional_header *) -- (header + GRUB_PE32_MSDOS_STUB_SIZE + GRUB_PE32_SIGNATURE_SIZE -- + sizeof (struct grub_pe32_coff_header)); -- o->magic = grub_host_to_target16 (GRUB_PE32_PE64_MAGIC); -- o->code_size = grub_host_to_target32 (layout.exec_size); -- o->data_size = grub_host_to_target32 (reloc_addr - layout.exec_size -- - header_size); -- o->entry_addr = grub_host_to_target32 (layout.start_address); -- o->code_base = grub_host_to_target32 (header_size); -- o->image_base = 0; -- o->section_alignment = grub_host_to_target32 (image_target->section_align); -- o->file_alignment = grub_host_to_target32 (GRUB_PE32_FILE_ALIGNMENT); -- o->image_size = grub_host_to_target32 (pe_size); -- o->header_size = grub_host_to_target32 (header_size); -- o->subsystem = grub_host_to_target16 (GRUB_PE32_SUBSYSTEM_EFI_APPLICATION); -- -- /* Do these really matter? */ -- o->stack_reserve_size = grub_host_to_target32 (0x10000); -- o->stack_commit_size = grub_host_to_target32 (0x10000); -- o->heap_reserve_size = grub_host_to_target32 (0x10000); -- o->heap_commit_size = grub_host_to_target32 (0x10000); -- -- o->num_data_directories -- = grub_host_to_target32 (GRUB_PE32_NUM_DATA_DIRECTORIES); -+ o64 = (struct grub_pe64_optional_header *) -+ (header + GRUB_PE32_MSDOS_STUB_SIZE + GRUB_PE32_SIGNATURE_SIZE + -+ sizeof (struct grub_pe32_coff_header)); -+ o64->magic = grub_host_to_target16 (GRUB_PE32_PE64_MAGIC); - -- o->base_relocation_table.rva = grub_host_to_target32 (reloc_addr); -- o->base_relocation_table.size = grub_host_to_target32 (layout.reloc_size); -- sections = o + 1; -+ sections = o64 + 1; - } -+ -+ PE_OHDR (o32, o64, code_size) = grub_host_to_target32 (layout.exec_size); -+ PE_OHDR (o32, o64, data_size) = grub_host_to_target32 (reloc_addr - layout.exec_size - header_size); -+ PE_OHDR (o32, o64, entry_addr) = grub_host_to_target32 (layout.start_address); -+ PE_OHDR (o32, o64, code_base) = grub_host_to_target32 (header_size); -+ -+ PE_OHDR (o32, o64, image_base) = 0; -+ PE_OHDR (o32, o64, section_alignment) = grub_host_to_target32 (image_target->section_align); -+ PE_OHDR (o32, o64, file_alignment) = grub_host_to_target32 (GRUB_PE32_FILE_ALIGNMENT); -+ PE_OHDR (o32, o64, image_size) = grub_host_to_target32 (pe_size); -+ PE_OHDR (o32, o64, header_size) = grub_host_to_target32 (header_size); -+ PE_OHDR (o32, o64, subsystem) = grub_host_to_target16 (GRUB_PE32_SUBSYSTEM_EFI_APPLICATION); -+ -+ /* Do these really matter? */ -+ PE_OHDR (o32, o64, stack_reserve_size) = grub_host_to_target32 (0x10000); -+ PE_OHDR (o32, o64, stack_commit_size) = grub_host_to_target32 (0x10000); -+ PE_OHDR (o32, o64, heap_reserve_size) = grub_host_to_target32 (0x10000); -+ PE_OHDR (o32, o64, heap_commit_size) = grub_host_to_target32 (0x10000); -+ -+ PE_OHDR (o32, o64, num_data_directories) = grub_host_to_target32 (GRUB_PE32_NUM_DATA_DIRECTORIES); -+ PE_OHDR (o32, o64, base_relocation_table.rva) = grub_host_to_target32 (reloc_addr); -+ PE_OHDR (o32, o64, base_relocation_table.size) = grub_host_to_target32 (layout.reloc_size); -+ - /* The sections. */ - text_section = sections; - strcpy (text_section->name, ".text"); --- -2.14.2 - diff --git a/buildroot/boot/grub2/0138-util-mkimage-Reorder-PE-optional-header-fields-set-u.patch b/buildroot/boot/grub2/0138-util-mkimage-Reorder-PE-optional-header-fields-set-u.patch deleted file mode 100644 index cb65f96405..0000000000 --- a/buildroot/boot/grub2/0138-util-mkimage-Reorder-PE-optional-header-fields-set-u.patch +++ /dev/null @@ -1,73 +0,0 @@ -From ba44c87e56a8bccde235ebb7d41d5aa54604d241 Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Mon, 15 Feb 2021 14:21:48 +0100 -Subject: [PATCH] util/mkimage: Reorder PE optional header fields set-up - -This makes the PE32 and PE32+ header fields set-up easier to follow by -setting them closer to the initialization of their related sections. - -Signed-off-by: Peter Jones -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - util/mkimage.c | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/util/mkimage.c b/util/mkimage.c -index a039039..deaef56 100644 ---- a/util/mkimage.c -+++ b/util/mkimage.c -@@ -1332,16 +1332,12 @@ grub_install_generate_image (const char *dir, const char *prefix, - sections = o64 + 1; - } - -- PE_OHDR (o32, o64, code_size) = grub_host_to_target32 (layout.exec_size); -- PE_OHDR (o32, o64, data_size) = grub_host_to_target32 (reloc_addr - layout.exec_size - header_size); -+ PE_OHDR (o32, o64, header_size) = grub_host_to_target32 (header_size); - PE_OHDR (o32, o64, entry_addr) = grub_host_to_target32 (layout.start_address); -- PE_OHDR (o32, o64, code_base) = grub_host_to_target32 (header_size); -- - PE_OHDR (o32, o64, image_base) = 0; -+ PE_OHDR (o32, o64, image_size) = grub_host_to_target32 (pe_size); - PE_OHDR (o32, o64, section_alignment) = grub_host_to_target32 (image_target->section_align); - PE_OHDR (o32, o64, file_alignment) = grub_host_to_target32 (GRUB_PE32_FILE_ALIGNMENT); -- PE_OHDR (o32, o64, image_size) = grub_host_to_target32 (pe_size); -- PE_OHDR (o32, o64, header_size) = grub_host_to_target32 (header_size); - PE_OHDR (o32, o64, subsystem) = grub_host_to_target16 (GRUB_PE32_SUBSYSTEM_EFI_APPLICATION); - - /* Do these really matter? */ -@@ -1351,10 +1347,10 @@ grub_install_generate_image (const char *dir, const char *prefix, - PE_OHDR (o32, o64, heap_commit_size) = grub_host_to_target32 (0x10000); - - PE_OHDR (o32, o64, num_data_directories) = grub_host_to_target32 (GRUB_PE32_NUM_DATA_DIRECTORIES); -- PE_OHDR (o32, o64, base_relocation_table.rva) = grub_host_to_target32 (reloc_addr); -- PE_OHDR (o32, o64, base_relocation_table.size) = grub_host_to_target32 (layout.reloc_size); - - /* The sections. */ -+ PE_OHDR (o32, o64, code_base) = grub_host_to_target32 (header_size); -+ PE_OHDR (o32, o64, code_size) = grub_host_to_target32 (layout.exec_size); - text_section = sections; - strcpy (text_section->name, ".text"); - text_section->virtual_size = grub_host_to_target32 (layout.exec_size); -@@ -1366,6 +1362,8 @@ grub_install_generate_image (const char *dir, const char *prefix, - | GRUB_PE32_SCN_MEM_EXECUTE - | GRUB_PE32_SCN_MEM_READ); - -+ PE_OHDR (o32, o64, data_size) = grub_host_to_target32 (reloc_addr - layout.exec_size - header_size); -+ - data_section = text_section + 1; - strcpy (data_section->name, ".data"); - data_section->virtual_size = grub_host_to_target32 (layout.kernel_size - layout.exec_size); -@@ -1388,6 +1386,8 @@ grub_install_generate_image (const char *dir, const char *prefix, - | GRUB_PE32_SCN_MEM_READ - | GRUB_PE32_SCN_MEM_WRITE); - -+ PE_OHDR (o32, o64, base_relocation_table.rva) = grub_host_to_target32 (reloc_addr); -+ PE_OHDR (o32, o64, base_relocation_table.size) = grub_host_to_target32 (layout.reloc_size); - reloc_section = mods_section + 1; - strcpy (reloc_section->name, ".reloc"); - reloc_section->virtual_size = grub_host_to_target32 (layout.reloc_size); --- -2.14.2 - diff --git a/buildroot/boot/grub2/0139-util-mkimage-Improve-data_size-value-calculation.patch b/buildroot/boot/grub2/0139-util-mkimage-Improve-data_size-value-calculation.patch deleted file mode 100644 index cc25519a1b..0000000000 --- a/buildroot/boot/grub2/0139-util-mkimage-Improve-data_size-value-calculation.patch +++ /dev/null @@ -1,50 +0,0 @@ -From ff406eff25465932b97a2857ee5a75fd0957e9b9 Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Thu, 11 Feb 2021 17:07:33 +0100 -Subject: [PATCH] util/mkimage: Improve data_size value calculation - -According to "Microsoft Portable Executable and Common Object File Format -Specification", the Optional Header SizeOfInitializedData field contains: - - Size of the initialized data section, or the sum of all such sections if - there are multiple data sections. - -Make this explicit by adding the GRUB kernel data size to the sum of all -the modules sizes. The ALIGN_UP() is not required by the PE spec but do -it to avoid alignment issues. - -Signed-off-by: Peter Jones -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - util/mkimage.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/util/mkimage.c b/util/mkimage.c -index deaef56..853a521 100644 ---- a/util/mkimage.c -+++ b/util/mkimage.c -@@ -1260,6 +1260,7 @@ grub_install_generate_image (const char *dir, const char *prefix, - void *pe_img; - grub_uint8_t *header; - void *sections; -+ size_t scn_size; - size_t pe_size; - struct grub_pe32_coff_header *c; - struct grub_pe32_section_table *text_section, *data_section; -@@ -1362,7 +1363,10 @@ grub_install_generate_image (const char *dir, const char *prefix, - | GRUB_PE32_SCN_MEM_EXECUTE - | GRUB_PE32_SCN_MEM_READ); - -- PE_OHDR (o32, o64, data_size) = grub_host_to_target32 (reloc_addr - layout.exec_size - header_size); -+ scn_size = ALIGN_UP (layout.kernel_size - layout.exec_size, GRUB_PE32_FILE_ALIGNMENT); -+ PE_OHDR (o32, o64, data_size) = grub_host_to_target32 (scn_size + -+ ALIGN_UP (total_module_size, -+ GRUB_PE32_FILE_ALIGNMENT)); - - data_section = text_section + 1; - strcpy (data_section->name, ".data"); --- -2.14.2 - diff --git a/buildroot/boot/grub2/0140-util-mkimage-Refactor-section-setup-to-use-a-helper.patch b/buildroot/boot/grub2/0140-util-mkimage-Refactor-section-setup-to-use-a-helper.patch deleted file mode 100644 index cc0270edb7..0000000000 --- a/buildroot/boot/grub2/0140-util-mkimage-Refactor-section-setup-to-use-a-helper.patch +++ /dev/null @@ -1,221 +0,0 @@ -From f60ba9e5945892e835e53f0619406d96002f7f70 Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Mon, 15 Feb 2021 14:58:06 +0100 -Subject: [PATCH] util/mkimage: Refactor section setup to use a helper - -Add a init_pe_section() helper function to setup PE sections. This makes -the code simpler and easier to read. - -Signed-off-by: Peter Jones -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - util/mkimage.c | 143 +++++++++++++++++++++++++++++++-------------------------- - 1 file changed, 77 insertions(+), 66 deletions(-) - -diff --git a/util/mkimage.c b/util/mkimage.c -index 853a521..8b475a6 100644 ---- a/util/mkimage.c -+++ b/util/mkimage.c -@@ -816,6 +816,38 @@ grub_install_get_image_targets_string (void) - return formats; - } - -+/* -+ * The image_target parameter is used by the grub_host_to_target32() macro. -+ */ -+static struct grub_pe32_section_table * -+init_pe_section(const struct grub_install_image_target_desc *image_target, -+ struct grub_pe32_section_table *section, -+ const char * const name, -+ grub_uint32_t *vma, grub_uint32_t vsz, grub_uint32_t valign, -+ grub_uint32_t *rda, grub_uint32_t rsz, -+ grub_uint32_t characteristics) -+{ -+ size_t len = strlen (name); -+ -+ if (len > sizeof (section->name)) -+ grub_util_error (_("section name %s length is bigger than %lu"), -+ name, (unsigned long) sizeof (section->name)); -+ -+ memcpy (section->name, name, len); -+ -+ section->virtual_address = grub_host_to_target32 (*vma); -+ section->virtual_size = grub_host_to_target32 (vsz); -+ (*vma) = ALIGN_UP (*vma + vsz, valign); -+ -+ section->raw_data_offset = grub_host_to_target32 (*rda); -+ section->raw_data_size = grub_host_to_target32 (rsz); -+ (*rda) = ALIGN_UP (*rda + rsz, GRUB_PE32_FILE_ALIGNMENT); -+ -+ section->characteristics = grub_host_to_target32 (characteristics); -+ -+ return section + 1; -+} -+ - /* - * tmp_ is just here so the compiler knows we'll never derefernce a NULL. - * It should get fully optimized away. -@@ -1257,17 +1289,13 @@ grub_install_generate_image (const char *dir, const char *prefix, - break; - case IMAGE_EFI: - { -- void *pe_img; -- grub_uint8_t *header; -- void *sections; -+ char *pe_img, *header; -+ struct grub_pe32_section_table *section; - size_t scn_size; -- size_t pe_size; -+ grub_uint32_t vma, raw_data; -+ size_t pe_size, header_size; - struct grub_pe32_coff_header *c; -- struct grub_pe32_section_table *text_section, *data_section; -- struct grub_pe32_section_table *mods_section, *reloc_section; - static const grub_uint8_t stub[] = GRUB_PE32_MSDOS_STUB; -- int header_size; -- int reloc_addr; - struct grub_pe32_optional_header *o32 = NULL; - struct grub_pe64_optional_header *o64 = NULL; - -@@ -1276,17 +1304,12 @@ grub_install_generate_image (const char *dir, const char *prefix, - else - header_size = EFI64_HEADER_SIZE; - -- reloc_addr = ALIGN_UP (header_size + core_size, -- GRUB_PE32_FILE_ALIGNMENT); -+ vma = raw_data = header_size; -+ pe_size = ALIGN_UP (header_size + core_size, GRUB_PE32_FILE_ALIGNMENT) + -+ ALIGN_UP (layout.reloc_size, GRUB_PE32_FILE_ALIGNMENT); -+ header = pe_img = xcalloc (1, pe_size); - -- pe_size = ALIGN_UP (reloc_addr + layout.reloc_size, -- GRUB_PE32_FILE_ALIGNMENT); -- pe_img = xmalloc (reloc_addr + layout.reloc_size); -- memset (pe_img, 0, header_size); -- memcpy ((char *) pe_img + header_size, core_img, core_size); -- memset ((char *) pe_img + header_size + core_size, 0, reloc_addr - (header_size + core_size)); -- memcpy ((char *) pe_img + reloc_addr, layout.reloc_section, layout.reloc_size); -- header = pe_img; -+ memcpy (pe_img + raw_data, core_img, core_size); - - /* The magic. */ - memcpy (header, stub, GRUB_PE32_MSDOS_STUB_SIZE); -@@ -1319,18 +1342,17 @@ grub_install_generate_image (const char *dir, const char *prefix, - o32->magic = grub_host_to_target16 (GRUB_PE32_PE32_MAGIC); - o32->data_base = grub_host_to_target32 (header_size + layout.exec_size); - -- sections = o32 + 1; -+ section = (struct grub_pe32_section_table *)(o32 + 1); - } - else - { - c->optional_header_size = grub_host_to_target16 (sizeof (struct grub_pe64_optional_header)); -- - o64 = (struct grub_pe64_optional_header *) - (header + GRUB_PE32_MSDOS_STUB_SIZE + GRUB_PE32_SIGNATURE_SIZE + - sizeof (struct grub_pe32_coff_header)); - o64->magic = grub_host_to_target16 (GRUB_PE32_PE64_MAGIC); - -- sections = o64 + 1; -+ section = (struct grub_pe32_section_table *)(o64 + 1); - } - - PE_OHDR (o32, o64, header_size) = grub_host_to_target32 (header_size); -@@ -1350,58 +1372,47 @@ grub_install_generate_image (const char *dir, const char *prefix, - PE_OHDR (o32, o64, num_data_directories) = grub_host_to_target32 (GRUB_PE32_NUM_DATA_DIRECTORIES); - - /* The sections. */ -- PE_OHDR (o32, o64, code_base) = grub_host_to_target32 (header_size); -+ PE_OHDR (o32, o64, code_base) = grub_host_to_target32 (vma); - PE_OHDR (o32, o64, code_size) = grub_host_to_target32 (layout.exec_size); -- text_section = sections; -- strcpy (text_section->name, ".text"); -- text_section->virtual_size = grub_host_to_target32 (layout.exec_size); -- text_section->virtual_address = grub_host_to_target32 (header_size); -- text_section->raw_data_size = grub_host_to_target32 (layout.exec_size); -- text_section->raw_data_offset = grub_host_to_target32 (header_size); -- text_section->characteristics = grub_cpu_to_le32_compile_time ( -- GRUB_PE32_SCN_CNT_CODE -- | GRUB_PE32_SCN_MEM_EXECUTE -- | GRUB_PE32_SCN_MEM_READ); -+ section = init_pe_section (image_target, section, ".text", -+ &vma, layout.exec_size, -+ image_target->section_align, -+ &raw_data, layout.exec_size, -+ GRUB_PE32_SCN_CNT_CODE | -+ GRUB_PE32_SCN_MEM_EXECUTE | -+ GRUB_PE32_SCN_MEM_READ); - - scn_size = ALIGN_UP (layout.kernel_size - layout.exec_size, GRUB_PE32_FILE_ALIGNMENT); - PE_OHDR (o32, o64, data_size) = grub_host_to_target32 (scn_size + - ALIGN_UP (total_module_size, - GRUB_PE32_FILE_ALIGNMENT)); - -- data_section = text_section + 1; -- strcpy (data_section->name, ".data"); -- data_section->virtual_size = grub_host_to_target32 (layout.kernel_size - layout.exec_size); -- data_section->virtual_address = grub_host_to_target32 (header_size + layout.exec_size); -- data_section->raw_data_size = grub_host_to_target32 (layout.kernel_size - layout.exec_size); -- data_section->raw_data_offset = grub_host_to_target32 (header_size + layout.exec_size); -- data_section->characteristics -- = grub_cpu_to_le32_compile_time (GRUB_PE32_SCN_CNT_INITIALIZED_DATA -- | GRUB_PE32_SCN_MEM_READ -- | GRUB_PE32_SCN_MEM_WRITE); -- -- mods_section = data_section + 1; -- strcpy (mods_section->name, "mods"); -- mods_section->virtual_size = grub_host_to_target32 (reloc_addr - layout.kernel_size - header_size); -- mods_section->virtual_address = grub_host_to_target32 (header_size + layout.kernel_size + layout.bss_size); -- mods_section->raw_data_size = grub_host_to_target32 (reloc_addr - layout.kernel_size - header_size); -- mods_section->raw_data_offset = grub_host_to_target32 (header_size + layout.kernel_size); -- mods_section->characteristics -- = grub_cpu_to_le32_compile_time (GRUB_PE32_SCN_CNT_INITIALIZED_DATA -- | GRUB_PE32_SCN_MEM_READ -- | GRUB_PE32_SCN_MEM_WRITE); -- -- PE_OHDR (o32, o64, base_relocation_table.rva) = grub_host_to_target32 (reloc_addr); -- PE_OHDR (o32, o64, base_relocation_table.size) = grub_host_to_target32 (layout.reloc_size); -- reloc_section = mods_section + 1; -- strcpy (reloc_section->name, ".reloc"); -- reloc_section->virtual_size = grub_host_to_target32 (layout.reloc_size); -- reloc_section->virtual_address = grub_host_to_target32 (reloc_addr + layout.bss_size); -- reloc_section->raw_data_size = grub_host_to_target32 (layout.reloc_size); -- reloc_section->raw_data_offset = grub_host_to_target32 (reloc_addr); -- reloc_section->characteristics -- = grub_cpu_to_le32_compile_time (GRUB_PE32_SCN_CNT_INITIALIZED_DATA -- | GRUB_PE32_SCN_MEM_DISCARDABLE -- | GRUB_PE32_SCN_MEM_READ); -+ section = init_pe_section (image_target, section, ".data", -+ &vma, scn_size, image_target->section_align, -+ &raw_data, scn_size, -+ GRUB_PE32_SCN_CNT_INITIALIZED_DATA | -+ GRUB_PE32_SCN_MEM_READ | -+ GRUB_PE32_SCN_MEM_WRITE); -+ -+ scn_size = pe_size - layout.reloc_size - raw_data; -+ section = init_pe_section (image_target, section, "mods", -+ &vma, scn_size, image_target->section_align, -+ &raw_data, scn_size, -+ GRUB_PE32_SCN_CNT_INITIALIZED_DATA | -+ GRUB_PE32_SCN_MEM_READ | -+ GRUB_PE32_SCN_MEM_WRITE); -+ -+ scn_size = layout.reloc_size; -+ PE_OHDR (o32, o64, base_relocation_table.rva) = grub_host_to_target32 (vma); -+ PE_OHDR (o32, o64, base_relocation_table.size) = grub_host_to_target32 (scn_size); -+ memcpy (pe_img + raw_data, layout.reloc_section, scn_size); -+ init_pe_section (image_target, section, ".reloc", -+ &vma, scn_size, image_target->section_align, -+ &raw_data, scn_size, -+ GRUB_PE32_SCN_CNT_INITIALIZED_DATA | -+ GRUB_PE32_SCN_MEM_DISCARDABLE | -+ GRUB_PE32_SCN_MEM_READ); -+ - free (core_img); - core_img = pe_img; - core_size = pe_size; --- -2.14.2 - diff --git a/buildroot/boot/grub2/0141-util-mkimage-Add-an-option-to-import-SBAT-metadata-i.patch b/buildroot/boot/grub2/0141-util-mkimage-Add-an-option-to-import-SBAT-metadata-i.patch deleted file mode 100644 index 3cc6b498c0..0000000000 --- a/buildroot/boot/grub2/0141-util-mkimage-Add-an-option-to-import-SBAT-metadata-i.patch +++ /dev/null @@ -1,264 +0,0 @@ -From b11547137703bbc642114a816233a5b6fed61b06 Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Mon, 15 Feb 2021 17:07:00 +0100 -Subject: [PATCH] util/mkimage: Add an option to import SBAT metadata into a - .sbat section - -Add a --sbat option to the grub-mkimage tool which allows us to import -an SBAT metadata formatted as a CSV file into a .sbat section of the -EFI binary. - -Signed-off-by: Peter Jones -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - docs/grub.texi | 19 +++++++++++++++++++ - include/grub/util/install.h | 3 ++- - include/grub/util/mkimage.h | 1 + - util/grub-install-common.c | 2 +- - util/grub-mkimage.c | 15 ++++++++++++++- - util/mkimage.c | 43 ++++++++++++++++++++++++++++++++++++------- - 6 files changed, 73 insertions(+), 10 deletions(-) - -diff --git a/docs/grub.texi b/docs/grub.texi -index 8518cc0..bff6dfc 100644 ---- a/docs/grub.texi -+++ b/docs/grub.texi -@@ -5616,6 +5616,7 @@ environment variables and commands are listed in the same order. - * Authentication and authorisation:: Users and access control - * Using digital signatures:: Booting digitally signed code - * UEFI secure boot and shim:: Booting digitally signed PE files -+* Secure Boot Advanced Targeting:: Embedded information for generation number based revocation - * Measured Boot:: Measuring boot components - * Lockdown:: Lockdown when booting on a secure setup - @end menu -@@ -5795,6 +5796,24 @@ and @command{memrw} will not be available when the UEFI secure boot is enabled. - This is done for security reasons and are enforced by the GRUB Lockdown mechanism - (@pxref{Lockdown}). - -+@node Secure Boot Advanced Targeting -+@section Embedded information for generation number based revocation -+ -+The Secure Boot Advanced Targeting (SBAT) is a mechanism to allow the revocation -+of components in the boot path by using generation numbers embedded into the EFI -+binaries. The SBAT metadata is located in an .sbat data section that has set of -+UTF-8 strings as comma-separated values (CSV). See -+@uref{https://github.com/rhboot/shim/blob/main/SBAT.md} for more details. -+ -+To add a data section containing the SBAT information into the binary, the -+@option{--sbat} option of @command{grub-mkimage} command should be used. The content -+of a CSV file, encoded with UTF-8, is copied as is to the .sbat data section into -+the generated EFI binary. The CSV file can be stored anywhere on the file system. -+ -+@example -+grub-mkimage -O x86_64-efi -o grubx64.efi -p '(tftp)/grub' --sbat sbat.csv efinet tftp -+@end example -+ - @node Measured Boot - @section Measuring boot components - -diff --git a/include/grub/util/install.h b/include/grub/util/install.h -index 2631b10..c03befd 100644 ---- a/include/grub/util/install.h -+++ b/include/grub/util/install.h -@@ -183,7 +183,8 @@ grub_install_generate_image (const char *dir, const char *prefix, - char *config_path, - const struct grub_install_image_target_desc *image_target, - int note, -- grub_compression_t comp, const char *dtb_file); -+ grub_compression_t comp, const char *dtb_file, -+ const char *sbat_path); - - const struct grub_install_image_target_desc * - grub_install_get_image_target (const char *arg); -diff --git a/include/grub/util/mkimage.h b/include/grub/util/mkimage.h -index ba9f568..3819a67 100644 ---- a/include/grub/util/mkimage.h -+++ b/include/grub/util/mkimage.h -@@ -24,6 +24,7 @@ struct grub_mkimage_layout - size_t exec_size; - size_t kernel_size; - size_t bss_size; -+ size_t sbat_size; - grub_uint64_t start_address; - void *reloc_section; - size_t reloc_size; -diff --git a/util/grub-install-common.c b/util/grub-install-common.c -index 0295d40..5d43ed1 100644 ---- a/util/grub-install-common.c -+++ b/util/grub-install-common.c -@@ -511,7 +511,7 @@ grub_install_make_image_wrap_file (const char *dir, const char *prefix, - grub_install_generate_image (dir, prefix, fp, outname, - modules.entries, memdisk_path, - pubkeys, npubkeys, config_path, tgt, -- note, compression, dtb); -+ note, compression, dtb, NULL); - while (dc--) - grub_install_pop_module (); - } -diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c -index 912564e..75b8847 100644 ---- a/util/grub-mkimage.c -+++ b/util/grub-mkimage.c -@@ -81,6 +81,7 @@ static struct argp_option options[] = { - {"output", 'o', N_("FILE"), 0, N_("output a generated image to FILE [default=stdout]"), 0}, - {"format", 'O', N_("FORMAT"), 0, 0, 0}, - {"compression", 'C', "(xz|none|auto)", 0, N_("choose the compression to use for core image"), 0}, -+ {"sbat", 's', N_("FILE"), 0, N_("SBAT metadata"), 0}, - {"verbose", 'v', 0, 0, N_("print verbose messages."), 0}, - { 0, 0, 0, 0, 0, 0 } - }; -@@ -123,6 +124,7 @@ struct arguments - size_t npubkeys; - char *font; - char *config; -+ char *sbat; - int note; - const struct grub_install_image_target_desc *image_target; - grub_compression_t comp; -@@ -224,6 +226,13 @@ argp_parser (int key, char *arg, struct argp_state *state) - arguments->prefix = xstrdup (arg); - break; - -+ case 's': -+ if (arguments->sbat) -+ free (arguments->sbat); -+ -+ arguments->sbat = xstrdup (arg); -+ break; -+ - case 'v': - verbosity++; - break; -@@ -309,7 +318,8 @@ main (int argc, char *argv[]) - arguments.memdisk, arguments.pubkeys, - arguments.npubkeys, arguments.config, - arguments.image_target, arguments.note, -- arguments.comp, arguments.dtb); -+ arguments.comp, arguments.dtb, -+ arguments.sbat); - - if (grub_util_file_sync (fp) < 0) - grub_util_error (_("cannot sync `%s': %s"), arguments.output ? : "stdout", -@@ -328,5 +338,8 @@ main (int argc, char *argv[]) - if (arguments.output) - free (arguments.output); - -+ if (arguments.sbat) -+ free (arguments.sbat); -+ - return 0; - } -diff --git a/util/mkimage.c b/util/mkimage.c -index 8b475a6..b354ec1 100644 ---- a/util/mkimage.c -+++ b/util/mkimage.c -@@ -869,12 +869,13 @@ grub_install_generate_image (const char *dir, const char *prefix, - char *memdisk_path, char **pubkey_paths, - size_t npubkeys, char *config_path, - const struct grub_install_image_target_desc *image_target, -- int note, grub_compression_t comp, const char *dtb_path) -+ int note, grub_compression_t comp, const char *dtb_path, -+ const char *sbat_path) - { - char *kernel_img, *core_img; - size_t total_module_size, core_size; - size_t memdisk_size = 0, config_size = 0; -- size_t prefix_size = 0, dtb_size = 0; -+ size_t prefix_size = 0, dtb_size = 0, sbat_size = 0; - char *kernel_path; - size_t offset; - struct grub_util_path_list *path_list, *p; -@@ -925,6 +926,9 @@ grub_install_generate_image (const char *dir, const char *prefix, - total_module_size += dtb_size + sizeof (struct grub_module_header); - } - -+ if (sbat_path != NULL && image_target->id != IMAGE_EFI) -+ grub_util_error (_(".sbat section can be embedded into EFI images only")); -+ - if (config_path) - { - config_size = ALIGN_ADDR (grub_util_get_image_size (config_path) + 1); -@@ -1289,8 +1293,9 @@ grub_install_generate_image (const char *dir, const char *prefix, - break; - case IMAGE_EFI: - { -- char *pe_img, *header; -+ char *pe_img, *pe_sbat, *header; - struct grub_pe32_section_table *section; -+ size_t n_sections = 4; - size_t scn_size; - grub_uint32_t vma, raw_data; - size_t pe_size, header_size; -@@ -1305,8 +1310,15 @@ grub_install_generate_image (const char *dir, const char *prefix, - header_size = EFI64_HEADER_SIZE; - - vma = raw_data = header_size; -+ -+ if (sbat_path != NULL) -+ { -+ sbat_size = ALIGN_ADDR (grub_util_get_image_size (sbat_path)); -+ sbat_size = ALIGN_UP (sbat_size, GRUB_PE32_FILE_ALIGNMENT); -+ } -+ - pe_size = ALIGN_UP (header_size + core_size, GRUB_PE32_FILE_ALIGNMENT) + -- ALIGN_UP (layout.reloc_size, GRUB_PE32_FILE_ALIGNMENT); -+ ALIGN_UP (layout.reloc_size, GRUB_PE32_FILE_ALIGNMENT) + sbat_size; - header = pe_img = xcalloc (1, pe_size); - - memcpy (pe_img + raw_data, core_img, core_size); -@@ -1321,7 +1333,10 @@ grub_install_generate_image (const char *dir, const char *prefix, - + GRUB_PE32_SIGNATURE_SIZE); - c->machine = grub_host_to_target16 (image_target->pe_target); - -- c->num_sections = grub_host_to_target16 (4); -+ if (sbat_path != NULL) -+ n_sections++; -+ -+ c->num_sections = grub_host_to_target16 (n_sections); - c->time = grub_host_to_target32 (STABLE_EMBEDDING_TIMESTAMP); - c->characteristics = grub_host_to_target16 (GRUB_PE32_EXECUTABLE_IMAGE - | GRUB_PE32_LINE_NUMS_STRIPPED -@@ -1383,7 +1398,8 @@ grub_install_generate_image (const char *dir, const char *prefix, - GRUB_PE32_SCN_MEM_READ); - - scn_size = ALIGN_UP (layout.kernel_size - layout.exec_size, GRUB_PE32_FILE_ALIGNMENT); -- PE_OHDR (o32, o64, data_size) = grub_host_to_target32 (scn_size + -+ /* ALIGN_UP (sbat_size, GRUB_PE32_FILE_ALIGNMENT) is done earlier. */ -+ PE_OHDR (o32, o64, data_size) = grub_host_to_target32 (scn_size + sbat_size + - ALIGN_UP (total_module_size, - GRUB_PE32_FILE_ALIGNMENT)); - -@@ -1394,7 +1410,7 @@ grub_install_generate_image (const char *dir, const char *prefix, - GRUB_PE32_SCN_MEM_READ | - GRUB_PE32_SCN_MEM_WRITE); - -- scn_size = pe_size - layout.reloc_size - raw_data; -+ scn_size = pe_size - layout.reloc_size - sbat_size - raw_data; - section = init_pe_section (image_target, section, "mods", - &vma, scn_size, image_target->section_align, - &raw_data, scn_size, -@@ -1402,6 +1418,19 @@ grub_install_generate_image (const char *dir, const char *prefix, - GRUB_PE32_SCN_MEM_READ | - GRUB_PE32_SCN_MEM_WRITE); - -+ if (sbat_path != NULL) -+ { -+ pe_sbat = pe_img + raw_data; -+ grub_util_load_image (sbat_path, pe_sbat); -+ -+ section = init_pe_section (image_target, section, ".sbat", -+ &vma, sbat_size, -+ image_target->section_align, -+ &raw_data, sbat_size, -+ GRUB_PE32_SCN_CNT_INITIALIZED_DATA | -+ GRUB_PE32_SCN_MEM_READ); -+ } -+ - scn_size = layout.reloc_size; - PE_OHDR (o32, o64, base_relocation_table.rva) = grub_host_to_target32 (vma); - PE_OHDR (o32, o64, base_relocation_table.size) = grub_host_to_target32 (scn_size); --- -2.14.2 - diff --git a/buildroot/boot/grub2/0142-grub-install-common-Add-sbat-option.patch b/buildroot/boot/grub2/0142-grub-install-common-Add-sbat-option.patch deleted file mode 100644 index 13f71ff84f..0000000000 --- a/buildroot/boot/grub2/0142-grub-install-common-Add-sbat-option.patch +++ /dev/null @@ -1,85 +0,0 @@ -From bb51ee2b49fbda0f66c1fa580a33442ff578f110 Mon Sep 17 00:00:00 2001 -From: Dimitri John Ledkov -Date: Mon, 22 Feb 2021 17:05:25 +0000 -Subject: [PATCH] grub-install-common: Add --sbat option - -Signed-off-by: Dimitri John Ledkov -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - include/grub/util/install.h | 5 ++++- - util/grub-install-common.c | 12 ++++++++++-- - 2 files changed, 14 insertions(+), 3 deletions(-) - -diff --git a/include/grub/util/install.h b/include/grub/util/install.h -index c03befd..8cb5056 100644 ---- a/include/grub/util/install.h -+++ b/include/grub/util/install.h -@@ -63,6 +63,8 @@ - /* TRANSLATORS: "embed" is a verb (command description). "*/ \ - { "pubkey", 'k', N_("FILE"), 0, \ - N_("embed FILE as public key for signature checking"), 0}, \ -+ { "sbat", GRUB_INSTALL_OPTIONS_SBAT, N_("FILE"), 0, \ -+ N_("SBAT metadata"), 0 }, \ - { "verbose", 'v', 0, 0, \ - N_("print verbose messages."), 1 } - -@@ -122,7 +124,8 @@ enum grub_install_options { - GRUB_INSTALL_OPTIONS_THEMES_DIRECTORY, - GRUB_INSTALL_OPTIONS_GRUB_MKIMAGE, - GRUB_INSTALL_OPTIONS_INSTALL_CORE_COMPRESS, -- GRUB_INSTALL_OPTIONS_DTB -+ GRUB_INSTALL_OPTIONS_DTB, -+ GRUB_INSTALL_OPTIONS_SBAT - }; - - extern char *grub_install_source_directory; -diff --git a/util/grub-install-common.c b/util/grub-install-common.c -index 5d43ed1..1fcccd2 100644 ---- a/util/grub-install-common.c -+++ b/util/grub-install-common.c -@@ -307,6 +307,7 @@ handle_install_list (struct install_list *il, const char *val, - - static char **pubkeys; - static size_t npubkeys; -+static char *sbat; - static grub_compression_t compression; - - int -@@ -337,6 +338,12 @@ grub_install_parse (int key, char *arg) - * (npubkeys + 1)); - pubkeys[npubkeys++] = xstrdup (arg); - return 1; -+ case GRUB_INSTALL_OPTIONS_SBAT: -+ if (sbat) -+ free (sbat); -+ -+ sbat = xstrdup (arg); -+ return 1; - - case GRUB_INSTALL_OPTIONS_VERBOSITY: - verbosity++; -@@ -498,9 +505,10 @@ grub_install_make_image_wrap_file (const char *dir, const char *prefix, - grub_util_info ("grub-mkimage --directory '%s' --prefix '%s'" - " --output '%s' " - " --dtb '%s' " -+ "--sbat '%s' " - "--format '%s' --compression '%s' %s %s\n", - dir, prefix, -- outname, dtb ? : "", mkimage_target, -+ outname, dtb ? : "", sbat ? : "", mkimage_target, - compnames[compression], note ? "--note" : "", s); - free (s); - -@@ -511,7 +519,7 @@ grub_install_make_image_wrap_file (const char *dir, const char *prefix, - grub_install_generate_image (dir, prefix, fp, outname, - modules.entries, memdisk_path, - pubkeys, npubkeys, config_path, tgt, -- note, compression, dtb, NULL); -+ note, compression, dtb, sbat); - while (dc--) - grub_install_pop_module (); - } --- -2.14.2 - diff --git a/buildroot/boot/grub2/0143-shim_lock-Only-skip-loading-shim_lock-verifier-with-.patch b/buildroot/boot/grub2/0143-shim_lock-Only-skip-loading-shim_lock-verifier-with-.patch deleted file mode 100644 index ef20639ca4..0000000000 --- a/buildroot/boot/grub2/0143-shim_lock-Only-skip-loading-shim_lock-verifier-with-.patch +++ /dev/null @@ -1,270 +0,0 @@ -From 968de8c23c1cba0f18230f778ebcf6c412ec8ec5 Mon Sep 17 00:00:00 2001 -From: Dimitri John Ledkov -Date: Sat, 20 Feb 2021 17:10:34 +0000 -Subject: [PATCH] shim_lock: Only skip loading shim_lock verifier with explicit - consent - -Commit 32ddc42c (efi: Only register shim_lock verifier if shim_lock -protocol is found and SB enabled) reintroduced CVE-2020-15705 which -previously only existed in the out-of-tree linuxefi patches and was -fixed as part of the BootHole patch series. - -Under Secure Boot enforce loading shim_lock verifier. Allow skipping -shim_lock verifier if SecureBoot/MokSBState EFI variables indicate -skipping validations, or if GRUB image is built with --disable-shim-lock. - -Fixes: 132ddc42c (efi: Only register shim_lock verifier if shim_lock - protocol is found and SB enabled) -Fixes: CVE-2020-15705 -Fixes: CVE-2021-3418 - -Reported-by: Dimitri John Ledkov -Signed-off-by: Dimitri John Ledkov -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - docs/grub.texi | 5 ++++- - grub-core/kern/efi/sb.c | 17 ++++++++++++++++- - include/grub/kernel.h | 3 ++- - include/grub/util/install.h | 7 +++++-- - util/grub-install-common.c | 12 +++++++++--- - util/grub-mkimage.c | 8 +++++++- - util/mkimage.c | 15 ++++++++++++++- - 7 files changed, 57 insertions(+), 10 deletions(-) - -diff --git a/docs/grub.texi b/docs/grub.texi -index bff6dfc..e302797 100644 ---- a/docs/grub.texi -+++ b/docs/grub.texi -@@ -5787,7 +5787,10 @@ secure boot chain. - The GRUB, except the @command{chainloader} command, works with the UEFI secure - boot and the shim. This functionality is provided by the shim_lock verifier. It - is built into the @file{core.img} and is registered if the UEFI secure boot is --enabled. -+enabled. The @samp{shim_lock} variable is set to @samp{y} when shim_lock verifier -+is registered. If it is desired to use UEFI secure boot without shim, one can -+disable shim_lock by disabling shim verification with MokSbState UEFI variable -+or by building grub image with @samp{--disable-shim-lock} option. - - All GRUB modules not stored in the @file{core.img}, OS kernels, ACPI tables, - Device Trees, etc. have to be signed, e.g, using PGP. Additionally, the commands -diff --git a/grub-core/kern/efi/sb.c b/grub-core/kern/efi/sb.c -index 5d7210a..41dadcd 100644 ---- a/grub-core/kern/efi/sb.c -+++ b/grub-core/kern/efi/sb.c -@@ -21,9 +21,11 @@ - #include - #include - #include -+#include - #include - #include - #include -+#include - #include - #include - #include -@@ -160,14 +162,27 @@ struct grub_file_verifier shim_lock_verifier = - void - grub_shim_lock_verifier_setup (void) - { -+ struct grub_module_header *header; - grub_efi_shim_lock_protocol_t *sl = - grub_efi_locate_protocol (&shim_lock_guid, 0); - -+ /* shim_lock is missing, check if GRUB image is built with --disable-shim-lock. */ - if (!sl) -- return; -+ { -+ FOR_MODULES (header) -+ { -+ if (header->type == OBJ_TYPE_DISABLE_SHIM_LOCK) -+ return; -+ } -+ } - -+ /* Secure Boot is off. Do not load shim_lock. */ - if (grub_efi_get_secureboot () != GRUB_EFI_SECUREBOOT_MODE_ENABLED) - return; - -+ /* Enforce shim_lock_verifier. */ - grub_verifier_register (&shim_lock_verifier); -+ -+ grub_env_set ("shim_lock", "y"); -+ grub_env_export ("shim_lock"); - } -diff --git a/include/grub/kernel.h b/include/grub/kernel.h -index 133a37c..abbca5e 100644 ---- a/include/grub/kernel.h -+++ b/include/grub/kernel.h -@@ -29,7 +29,8 @@ enum - OBJ_TYPE_CONFIG, - OBJ_TYPE_PREFIX, - OBJ_TYPE_PUBKEY, -- OBJ_TYPE_DTB -+ OBJ_TYPE_DTB, -+ OBJ_TYPE_DISABLE_SHIM_LOCK - }; - - /* The module header. */ -diff --git a/include/grub/util/install.h b/include/grub/util/install.h -index 8cb5056..11a8df8 100644 ---- a/include/grub/util/install.h -+++ b/include/grub/util/install.h -@@ -65,6 +65,8 @@ - N_("embed FILE as public key for signature checking"), 0}, \ - { "sbat", GRUB_INSTALL_OPTIONS_SBAT, N_("FILE"), 0, \ - N_("SBAT metadata"), 0 }, \ -+ { "disable-shim-lock", GRUB_INSTALL_OPTIONS_DISABLE_SHIM_LOCK, 0, 0, \ -+ N_("disable shim_lock verifier"), 0 }, \ - { "verbose", 'v', 0, 0, \ - N_("print verbose messages."), 1 } - -@@ -125,7 +127,8 @@ enum grub_install_options { - GRUB_INSTALL_OPTIONS_GRUB_MKIMAGE, - GRUB_INSTALL_OPTIONS_INSTALL_CORE_COMPRESS, - GRUB_INSTALL_OPTIONS_DTB, -- GRUB_INSTALL_OPTIONS_SBAT -+ GRUB_INSTALL_OPTIONS_SBAT, -+ GRUB_INSTALL_OPTIONS_DISABLE_SHIM_LOCK - }; - - extern char *grub_install_source_directory; -@@ -187,7 +190,7 @@ grub_install_generate_image (const char *dir, const char *prefix, - const struct grub_install_image_target_desc *image_target, - int note, - grub_compression_t comp, const char *dtb_file, -- const char *sbat_path); -+ const char *sbat_path, const int disable_shim_lock); - - const struct grub_install_image_target_desc * - grub_install_get_image_target (const char *arg); -diff --git a/util/grub-install-common.c b/util/grub-install-common.c -index 1fcccd2..13d9fe9 100644 ---- a/util/grub-install-common.c -+++ b/util/grub-install-common.c -@@ -308,6 +308,7 @@ handle_install_list (struct install_list *il, const char *val, - static char **pubkeys; - static size_t npubkeys; - static char *sbat; -+static int disable_shim_lock; - static grub_compression_t compression; - - int -@@ -344,6 +345,9 @@ grub_install_parse (int key, char *arg) - - sbat = xstrdup (arg); - return 1; -+ case GRUB_INSTALL_OPTIONS_DISABLE_SHIM_LOCK: -+ disable_shim_lock = 1; -+ return 1; - - case GRUB_INSTALL_OPTIONS_VERBOSITY: - verbosity++; -@@ -506,10 +510,11 @@ grub_install_make_image_wrap_file (const char *dir, const char *prefix, - " --output '%s' " - " --dtb '%s' " - "--sbat '%s' " -- "--format '%s' --compression '%s' %s %s\n", -+ "--format '%s' --compression '%s' %s %s %s\n", - dir, prefix, - outname, dtb ? : "", sbat ? : "", mkimage_target, -- compnames[compression], note ? "--note" : "", s); -+ compnames[compression], note ? "--note" : "", -+ disable_shim_lock ? "--disable-shim-lock" : "", s); - free (s); - - tgt = grub_install_get_image_target (mkimage_target); -@@ -519,7 +524,8 @@ grub_install_make_image_wrap_file (const char *dir, const char *prefix, - grub_install_generate_image (dir, prefix, fp, outname, - modules.entries, memdisk_path, - pubkeys, npubkeys, config_path, tgt, -- note, compression, dtb, sbat); -+ note, compression, dtb, sbat, -+ disable_shim_lock); - while (dc--) - grub_install_pop_module (); - } -diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c -index 75b8847..c0d5599 100644 ---- a/util/grub-mkimage.c -+++ b/util/grub-mkimage.c -@@ -82,6 +82,7 @@ static struct argp_option options[] = { - {"format", 'O', N_("FORMAT"), 0, 0, 0}, - {"compression", 'C', "(xz|none|auto)", 0, N_("choose the compression to use for core image"), 0}, - {"sbat", 's', N_("FILE"), 0, N_("SBAT metadata"), 0}, -+ {"disable-shim-lock", GRUB_INSTALL_OPTIONS_DISABLE_SHIM_LOCK, 0, 0, N_("disable shim_lock verifier"), 0}, - {"verbose", 'v', 0, 0, N_("print verbose messages."), 0}, - { 0, 0, 0, 0, 0, 0 } - }; -@@ -126,6 +127,7 @@ struct arguments - char *config; - char *sbat; - int note; -+ int disable_shim_lock; - const struct grub_install_image_target_desc *image_target; - grub_compression_t comp; - }; -@@ -233,6 +235,10 @@ argp_parser (int key, char *arg, struct argp_state *state) - arguments->sbat = xstrdup (arg); - break; - -+ case GRUB_INSTALL_OPTIONS_DISABLE_SHIM_LOCK: -+ arguments->disable_shim_lock = 1; -+ break; -+ - case 'v': - verbosity++; - break; -@@ -319,7 +325,7 @@ main (int argc, char *argv[]) - arguments.npubkeys, arguments.config, - arguments.image_target, arguments.note, - arguments.comp, arguments.dtb, -- arguments.sbat); -+ arguments.sbat, arguments.disable_shim_lock); - - if (grub_util_file_sync (fp) < 0) - grub_util_error (_("cannot sync `%s': %s"), arguments.output ? : "stdout", -diff --git a/util/mkimage.c b/util/mkimage.c -index b354ec1..a26cf76 100644 ---- a/util/mkimage.c -+++ b/util/mkimage.c -@@ -870,7 +870,7 @@ grub_install_generate_image (const char *dir, const char *prefix, - size_t npubkeys, char *config_path, - const struct grub_install_image_target_desc *image_target, - int note, grub_compression_t comp, const char *dtb_path, -- const char *sbat_path) -+ const char *sbat_path, int disable_shim_lock) - { - char *kernel_img, *core_img; - size_t total_module_size, core_size; -@@ -929,6 +929,9 @@ grub_install_generate_image (const char *dir, const char *prefix, - if (sbat_path != NULL && image_target->id != IMAGE_EFI) - grub_util_error (_(".sbat section can be embedded into EFI images only")); - -+ if (disable_shim_lock) -+ total_module_size += sizeof (struct grub_module_header); -+ - if (config_path) - { - config_size = ALIGN_ADDR (grub_util_get_image_size (config_path) + 1); -@@ -1065,6 +1068,16 @@ grub_install_generate_image (const char *dir, const char *prefix, - offset += dtb_size; - } - -+ if (disable_shim_lock) -+ { -+ struct grub_module_header *header; -+ -+ header = (struct grub_module_header *) (kernel_img + offset); -+ header->type = grub_host_to_target32 (OBJ_TYPE_DISABLE_SHIM_LOCK); -+ header->size = grub_host_to_target32 (sizeof (*header)); -+ offset += sizeof (*header); -+ } -+ - if (config_path) - { - struct grub_module_header *header; --- -2.14.2 - diff --git a/buildroot/boot/grub2/0144-kern-misc-Split-parse_printf_args-into-format-parsin.patch b/buildroot/boot/grub2/0144-kern-misc-Split-parse_printf_args-into-format-parsin.patch deleted file mode 100644 index 74fdc1dbe6..0000000000 --- a/buildroot/boot/grub2/0144-kern-misc-Split-parse_printf_args-into-format-parsin.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 7f11bde3143b21b40d8225ea1d641e0f83b5a01e Mon Sep 17 00:00:00 2001 -From: Thomas Frauendorfer | Miray Software -Date: Mon, 15 Feb 2021 13:40:16 +0100 -Subject: [PATCH] kern/misc: Split parse_printf_args() into format parsing and - va_list handling - -This patch is preparing for a follow up patch which will use -the format parsing part to compare the arguments in a printf() -format from an external source against a printf() format with -expected arguments. - -Signed-off-by: Thomas Frauendorfer | Miray Software -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/kern/misc.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c -index b02693b..50bf3ee 100644 ---- a/grub-core/kern/misc.c -+++ b/grub-core/kern/misc.c -@@ -632,8 +632,7 @@ grub_lltoa (char *str, int c, unsigned long long n) - } - - static void --parse_printf_args (const char *fmt0, struct printf_args *args, -- va_list args_in) -+parse_printf_arg_fmt (const char *fmt0, struct printf_args *args) - { - const char *fmt; - char c; -@@ -789,6 +788,14 @@ parse_printf_args (const char *fmt0, struct printf_args *args, - break; - } - } -+} -+ -+static void -+parse_printf_args (const char *fmt0, struct printf_args *args, va_list args_in) -+{ -+ grub_size_t n; -+ -+ parse_printf_arg_fmt (fmt0, args); - - for (n = 0; n < args->count; n++) - switch (args->ptr[n].type) --- -2.14.2 - diff --git a/buildroot/boot/grub2/0145-kern-misc-Add-STRING-type-for-internal-printf-format.patch b/buildroot/boot/grub2/0145-kern-misc-Add-STRING-type-for-internal-printf-format.patch deleted file mode 100644 index 56463b0846..0000000000 --- a/buildroot/boot/grub2/0145-kern-misc-Add-STRING-type-for-internal-printf-format.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 1a2a5aff71e8edba436398492279de434abfe7a3 Mon Sep 17 00:00:00 2001 -From: Thomas Frauendorfer | Miray Software -Date: Mon, 15 Feb 2021 14:04:26 +0100 -Subject: [PATCH] kern/misc: Add STRING type for internal printf() format - handling - -Set printf() argument type for "%s" to new type STRING. This is in -preparation for a follow up patch to compare a printf() format string -against an expected printf() format string. - -For "%s" the corresponding printf() argument is dereferenced as pointer -while all other argument types are defined as integer value. However, -when validating a printf() format it is necessary to differentiate "%s" -from "%p" and other integers. So, let's do that. - -Signed-off-by: Thomas Frauendorfer | Miray Software -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/kern/misc.c | 13 +++++++++++-- - 1 file changed, 11 insertions(+), 2 deletions(-) - -diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c -index 50bf3ee..22417f7 100644 ---- a/grub-core/kern/misc.c -+++ b/grub-core/kern/misc.c -@@ -33,7 +33,8 @@ union printf_arg - enum - { - INT, LONG, LONGLONG, -- UNSIGNED_INT = 3, UNSIGNED_LONG, UNSIGNED_LONGLONG -+ UNSIGNED_INT = 3, UNSIGNED_LONG, UNSIGNED_LONGLONG, -+ STRING - } type; - long long ll; - }; -@@ -776,12 +777,14 @@ parse_printf_arg_fmt (const char *fmt0, struct printf_args *args) - args->ptr[curn].type = INT + longfmt; - break; - case 'p': -- case 's': - if (sizeof (void *) == sizeof (long long)) - args->ptr[curn].type = UNSIGNED_LONGLONG; - else - args->ptr[curn].type = UNSIGNED_INT; - break; -+ case 's': -+ args->ptr[curn].type = STRING; -+ break; - case 'C': - case 'c': - args->ptr[curn].type = INT; -@@ -816,6 +819,12 @@ parse_printf_args (const char *fmt0, struct printf_args *args, va_list args_in) - case UNSIGNED_LONGLONG: - args->ptr[n].ll = va_arg (args_in, long long); - break; -+ case STRING: -+ if (sizeof (void *) == sizeof (long long)) -+ args->ptr[n].ll = va_arg (args_in, long long); -+ else -+ args->ptr[n].ll = va_arg (args_in, unsigned int); -+ break; - } - } - --- -2.14.2 - diff --git a/buildroot/boot/grub2/0146-kern-misc-Add-function-to-check-printf-format-agains.patch b/buildroot/boot/grub2/0146-kern-misc-Add-function-to-check-printf-format-agains.patch deleted file mode 100644 index 1b0d6738af..0000000000 --- a/buildroot/boot/grub2/0146-kern-misc-Add-function-to-check-printf-format-agains.patch +++ /dev/null @@ -1,219 +0,0 @@ -From 83603bea6ce8fdff5ab3fbc4c9e592a8c71a8706 Mon Sep 17 00:00:00 2001 -From: Thomas Frauendorfer | Miray Software -Date: Thu, 4 Feb 2021 19:02:33 +0100 -Subject: [PATCH] kern/misc: Add function to check printf() format against - expected format - -The grub_printf_fmt_check() function parses the arguments of an untrusted -printf() format and an expected printf() format and then compares the -arguments counts and arguments types. The arguments count in the untrusted -format string must be less or equal to the arguments count in the expected -format string and both arguments types must match. - -To do this the parse_printf_arg_fmt() helper function is extended in the -following way: - - 1. Add a return value to report errors to the grub_printf_fmt_check(). - - 2. Add the fmt_check argument to enable stricter format verification: - - the function expects that arguments definitions are always - terminated by a supported conversion specifier. - - positional parameters, "$", are not allowed, as they cannot be - validated correctly with the current implementation. For example - "%s%1$d" would assign the first args entry twice while leaving the - second one unchanged. - - Return an error if preallocated space in args is too small and - allocation fails for the needed size. The grub_printf_fmt_check() - should verify all arguments. So, if validation is not possible for - any reason it should return an error. - This also adds a case entry to handle "%%", which is the escape - sequence to print "%" character. - - 3. Add the max_args argument to check for the maximum allowed arguments - count in a printf() string. This should be set to the arguments count - of the expected format. Then the parse_printf_arg_fmt() function will - return an error if the arguments count is exceeded. - -The two additional arguments allow us to use parse_printf_arg_fmt() in -printf() and grub_printf_fmt_check() calls. - -When parse_printf_arg_fmt() is used by grub_printf_fmt_check() the -function parse user provided untrusted format string too. So, in -that case it is better to be too strict than too lenient. - -Signed-off-by: Thomas Frauendorfer | Miray Software -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/kern/misc.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++--- - include/grub/misc.h | 16 ++++++++++ - 2 files changed, 94 insertions(+), 4 deletions(-) - -diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c -index 22417f7..90317b6 100644 ---- a/grub-core/kern/misc.c -+++ b/grub-core/kern/misc.c -@@ -632,8 +632,26 @@ grub_lltoa (char *str, int c, unsigned long long n) - return p; - } - --static void --parse_printf_arg_fmt (const char *fmt0, struct printf_args *args) -+/* -+ * Parse printf() fmt0 string into args arguments. -+ * -+ * The parsed arguments are either used by a printf() function to format the fmt0 -+ * string or they are used to compare a format string from an untrusted source -+ * against a format string with expected arguments. -+ * -+ * When the fmt_check is set to !0, e.g. 1, then this function is executed in -+ * printf() format check mode. This enforces stricter rules for parsing the -+ * fmt0 to limit exposure to possible errors in printf() handling. It also -+ * disables positional parameters, "$", because some formats, e.g "%s%1$d", -+ * cannot be validated with the current implementation. -+ * -+ * The max_args allows to set a maximum number of accepted arguments. If the fmt0 -+ * string defines more arguments than the max_args then the parse_printf_arg_fmt() -+ * function returns an error. This is currently used for format check only. -+ */ -+static grub_err_t -+parse_printf_arg_fmt (const char *fmt0, struct printf_args *args, -+ int fmt_check, grub_size_t max_args) - { - const char *fmt; - char c; -@@ -660,7 +678,12 @@ parse_printf_arg_fmt (const char *fmt0, struct printf_args *args) - fmt++; - - if (*fmt == '$') -- fmt++; -+ { -+ if (fmt_check) -+ return grub_error (GRUB_ERR_BAD_ARGUMENT, -+ "positional arguments are not supported"); -+ fmt++; -+ } - - if (*fmt =='-') - fmt++; -@@ -691,9 +714,19 @@ parse_printf_arg_fmt (const char *fmt0, struct printf_args *args) - case 's': - args->count++; - break; -+ case '%': -+ /* "%%" is the escape sequence to output "%". */ -+ break; -+ default: -+ if (fmt_check) -+ return grub_error (GRUB_ERR_BAD_ARGUMENT, "unexpected format"); -+ break; - } - } - -+ if (fmt_check && args->count > max_args) -+ return grub_error (GRUB_ERR_BAD_ARGUMENT, "too many arguments"); -+ - if (args->count <= ARRAY_SIZE (args->prealloc)) - args->ptr = args->prealloc; - else -@@ -701,6 +734,9 @@ parse_printf_arg_fmt (const char *fmt0, struct printf_args *args) - args->ptr = grub_calloc (args->count, sizeof (args->ptr[0])); - if (!args->ptr) - { -+ if (fmt_check) -+ return grub_errno; -+ - grub_errno = GRUB_ERR_NONE; - args->ptr = args->prealloc; - args->count = ARRAY_SIZE (args->prealloc); -@@ -791,6 +827,8 @@ parse_printf_arg_fmt (const char *fmt0, struct printf_args *args) - break; - } - } -+ -+ return GRUB_ERR_NONE; - } - - static void -@@ -798,7 +836,7 @@ parse_printf_args (const char *fmt0, struct printf_args *args, va_list args_in) - { - grub_size_t n; - -- parse_printf_arg_fmt (fmt0, args); -+ parse_printf_arg_fmt (fmt0, args, 0, 0); - - for (n = 0; n < args->count; n++) - switch (args->ptr[n].type) -@@ -1105,6 +1143,42 @@ grub_xasprintf (const char *fmt, ...) - return ret; - } - -+grub_err_t -+grub_printf_fmt_check (const char *fmt, const char *fmt_expected) -+{ -+ struct printf_args args_expected, args_fmt; -+ grub_err_t ret; -+ grub_size_t n; -+ -+ if (fmt == NULL || fmt_expected == NULL) -+ return grub_error (GRUB_ERR_BAD_ARGUMENT, "invalid format"); -+ -+ ret = parse_printf_arg_fmt (fmt_expected, &args_expected, 1, GRUB_SIZE_MAX); -+ if (ret != GRUB_ERR_NONE) -+ return ret; -+ -+ /* Limit parsing to the number of expected arguments. */ -+ ret = parse_printf_arg_fmt (fmt, &args_fmt, 1, args_expected.count); -+ if (ret != GRUB_ERR_NONE) -+ { -+ free_printf_args (&args_expected); -+ return ret; -+ } -+ -+ for (n = 0; n < args_fmt.count; n++) -+ if (args_fmt.ptr[n].type != args_expected.ptr[n].type) -+ { -+ ret = grub_error (GRUB_ERR_BAD_ARGUMENT, "arguments types do not match"); -+ break; -+ } -+ -+ free_printf_args (&args_expected); -+ free_printf_args (&args_fmt); -+ -+ return ret; -+} -+ -+ - /* Abort GRUB. This function does not return. */ - static void __attribute__ ((noreturn)) - grub_abort (void) -diff --git a/include/grub/misc.h b/include/grub/misc.h -index ee48eb7..d1c5709 100644 ---- a/include/grub/misc.h -+++ b/include/grub/misc.h -@@ -440,6 +440,22 @@ grub_error_load (const struct grub_error_saved *save) - grub_errno = save->grub_errno; - } - -+/* -+ * grub_printf_fmt_checks() a fmt string for printf() against an expected -+ * format. It is intended for cases where the fmt string could come from -+ * an outside source and cannot be trusted. -+ * -+ * While expected fmt accepts a printf() format string it should be kept -+ * as simple as possible. The printf() format strings with positional -+ * parameters are NOT accepted, neither for fmt nor for fmt_expected. -+ * -+ * The fmt is accepted if it has equal or less arguments than fmt_expected -+ * and if the type of all arguments match. -+ * -+ * Returns GRUB_ERR_NONE if fmt is acceptable. -+ */ -+grub_err_t EXPORT_FUNC (grub_printf_fmt_check) (const char *fmt, const char *fmt_expected); -+ - #if BOOT_TIME_STATS - struct grub_boot_time - { --- -2.14.2 - diff --git a/buildroot/boot/grub2/0147-gfxmenu-gui-Check-printf-format-in-the-gui_progress_.patch b/buildroot/boot/grub2/0147-gfxmenu-gui-Check-printf-format-in-the-gui_progress_.patch deleted file mode 100644 index e0acb07c8c..0000000000 --- a/buildroot/boot/grub2/0147-gfxmenu-gui-Check-printf-format-in-the-gui_progress_.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 42facd577231cf5ffe4c7128fed15b7e7d99cbca Mon Sep 17 00:00:00 2001 -From: Thomas Frauendorfer | Miray Software -Date: Tue, 4 Aug 2020 13:49:51 +0200 -Subject: [PATCH] gfxmenu/gui: Check printf() format in the gui_progress_bar - and gui_label - -The gui_progress_bar and gui_label components can display the timeout -value. The format string can be set through a theme file. This patch -adds a validation step to the format string. - -If a user loads a theme file into the GRUB without this patch then -a GUI label with the following settings - - + label { - ... - id = "__timeout__" - text = "%s" - } - -will interpret the current timeout value as string pointer and print the -memory at that position on the screen. It is not desired behavior. - -Signed-off-by: Thomas Frauendorfer | Miray Software -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/gfxmenu/gui_label.c | 4 ++++ - grub-core/gfxmenu/gui_progress_bar.c | 3 +++ - 2 files changed, 7 insertions(+) - -diff --git a/grub-core/gfxmenu/gui_label.c b/grub-core/gfxmenu/gui_label.c -index a4c8178..1c19054 100644 ---- a/grub-core/gfxmenu/gui_label.c -+++ b/grub-core/gfxmenu/gui_label.c -@@ -193,6 +193,10 @@ label_set_property (void *vself, const char *name, const char *value) - else if (grub_strcmp (value, "@KEYMAP_SHORT@") == 0) - value = _("enter: boot, `e': options, `c': cmd-line"); - /* FIXME: Add more templates here if needed. */ -+ -+ if (grub_printf_fmt_check(value, "%d") != GRUB_ERR_NONE) -+ value = ""; /* Unsupported format. */ -+ - self->template = grub_strdup (value); - self->text = grub_xasprintf (value, self->value); - } -diff --git a/grub-core/gfxmenu/gui_progress_bar.c b/grub-core/gfxmenu/gui_progress_bar.c -index b128f08..ace85a1 100644 ---- a/grub-core/gfxmenu/gui_progress_bar.c -+++ b/grub-core/gfxmenu/gui_progress_bar.c -@@ -348,6 +348,9 @@ progress_bar_set_property (void *vself, const char *name, const char *value) - Please use the shortest form available in you language. */ - value = _("%ds"); - -+ if (grub_printf_fmt_check(value, "%d") != GRUB_ERR_NONE) -+ value = ""; /* Unsupported format. */ -+ - self->template = grub_strdup (value); - } - else if (grub_strcmp (name, "font") == 0) --- -2.14.2 - diff --git a/buildroot/boot/grub2/0148-templates-Disable-the-os-prober-by-default.patch b/buildroot/boot/grub2/0148-templates-Disable-the-os-prober-by-default.patch deleted file mode 100644 index 7cc89c2d0f..0000000000 --- a/buildroot/boot/grub2/0148-templates-Disable-the-os-prober-by-default.patch +++ /dev/null @@ -1,87 +0,0 @@ -From e346414725a70e5c74ee87ca14e580c66f517666 Mon Sep 17 00:00:00 2001 -From: Alex Burmashev -Date: Tue, 16 Feb 2021 11:12:12 +0100 -Subject: [PATCH] templates: Disable the os-prober by default - -The os-prober is enabled by default what may lead to potentially -dangerous use cases and borderline opening attack vectors. This -patch disables the os-prober, adds warning messages and updates -GRUB_DISABLE_OS_PROBER configuration option documentation. This -way we make it clear that the os-prober usage is not recommended. - -Simplistic nature of this change allows downstream vendors, who -really want os-prober to be enabled out of the box in their -relevant products, easily revert to it's old behavior. - -Reported-by: NyankoSec (, https://twitter.com/NyankoSec), - working with SSD Secure Disclosure -Signed-off-by: Alex Burmashev -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - docs/grub.texi | 18 ++++++++++-------- - util/grub.d/30_os-prober.in | 5 ++++- - 2 files changed, 14 insertions(+), 9 deletions(-) - -diff --git a/docs/grub.texi b/docs/grub.texi -index e302797..45a9f80 100644 ---- a/docs/grub.texi -+++ b/docs/grub.texi -@@ -1481,10 +1481,13 @@ boot sequence. If you have problems, set this option to @samp{text} and - GRUB will tell Linux to boot in normal text mode. - - @item GRUB_DISABLE_OS_PROBER --Normally, @command{grub-mkconfig} will try to use the external --@command{os-prober} program, if installed, to discover other operating --systems installed on the same system and generate appropriate menu entries --for them. Set this option to @samp{true} to disable this. -+The @command{grub-mkconfig} has a feature to use the external -+@command{os-prober} program to discover other operating systems installed on -+the same machine and generate appropriate menu entries for them. It is disabled -+by default since automatic and silent execution of @command{os-prober}, and -+creating boot entries based on that data, is a potential attack vector. Set -+this option to @samp{false} to enable this feature in the -+@command{grub-mkconfig} command. - - @item GRUB_OS_PROBER_SKIP_LIST - List of space-separated FS UUIDs of filesystems to be ignored from os-prober -@@ -1812,10 +1815,9 @@ than zero; otherwise 0. - @section Multi-boot manual config - - Currently autogenerating config files for multi-boot environments depends on --os-prober and has several shortcomings. While fixing it is scheduled for the --next release, meanwhile you can make use of the power of GRUB syntax and do it --yourself. A possible configuration is detailed here, feel free to adjust to your --needs. -+os-prober and has several shortcomings. Due to that it is disabled by default. -+It is advised to use the power of GRUB syntax and do it yourself. A possible -+configuration is detailed here, feel free to adjust to your needs. - - First create a separate GRUB partition, big enough to hold GRUB. Some of the - following entries show how to load OS installer images from this same partition, -diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in -index 515a68c..99de043 100644 ---- a/util/grub.d/30_os-prober.in -+++ b/util/grub.d/30_os-prober.in -@@ -26,7 +26,8 @@ export TEXTDOMAINDIR="@localedir@" - - . "$pkgdatadir/grub-mkconfig_lib" - --if [ "x${GRUB_DISABLE_OS_PROBER}" = "xtrue" ]; then -+if [ "x${GRUB_DISABLE_OS_PROBER}" = "xfalse" ]; then -+ gettext_printf "os-prober will not be executed to detect other bootable partitions.\nSystems on them will not be added to the GRUB boot configuration.\nCheck GRUB_DISABLE_OS_PROBER documentation entry.\n" - exit 0 - fi - -@@ -39,6 +40,8 @@ OSPROBED="`os-prober | tr ' ' '^' | paste -s -d ' '`" - if [ -z "${OSPROBED}" ] ; then - # empty os-prober output, nothing doing - exit 0 -+else -+ grub_warn "$(gettext_printf "os-prober was executed to detect other bootable partitions.\nIt's output will be used to detect bootable binaries on them and create new boot entries.")" - fi - - osx_entry() { --- -2.14.2 - diff --git a/buildroot/boot/grub2/0149-kern-mm-Fix-grub_debug_calloc-compilation-error.patch b/buildroot/boot/grub2/0149-kern-mm-Fix-grub_debug_calloc-compilation-error.patch deleted file mode 100644 index bda0507307..0000000000 --- a/buildroot/boot/grub2/0149-kern-mm-Fix-grub_debug_calloc-compilation-error.patch +++ /dev/null @@ -1,33 +0,0 @@ -From a9d8de960834f376087856f9d60a214b47c76f61 Mon Sep 17 00:00:00 2001 -From: Marco A Benatto -Date: Tue, 9 Feb 2021 12:33:06 -0300 -Subject: [PATCH] kern/mm: Fix grub_debug_calloc() compilation error - -Fix compilation error due to missing parameter to -grub_printf() when MM_DEBUG is defined. - -Fixes: 64e26162e (calloc: Make sure we always have an overflow-checking calloc() available) - -Signed-off-by: Marco A Benatto -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/kern/mm.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/grub-core/kern/mm.c b/grub-core/kern/mm.c -index f2822a8..c070afc 100644 ---- a/grub-core/kern/mm.c -+++ b/grub-core/kern/mm.c -@@ -594,7 +594,7 @@ grub_debug_calloc (const char *file, int line, grub_size_t nmemb, grub_size_t si - - if (grub_mm_debug) - grub_printf ("%s:%d: calloc (0x%" PRIxGRUB_SIZE ", 0x%" PRIxGRUB_SIZE ") = ", -- file, line, size); -+ file, line, nmemb, size); - ptr = grub_calloc (nmemb, size); - if (grub_mm_debug) - grub_printf ("%p\n", ptr); --- -2.14.2 - diff --git a/buildroot/boot/grub2/0150-Makefile-Make-libgrub.pp-depend-on-config-util.h.patch b/buildroot/boot/grub2/0150-Makefile-Make-libgrub.pp-depend-on-config-util.h.patch deleted file mode 100644 index 97c315406b..0000000000 --- a/buildroot/boot/grub2/0150-Makefile-Make-libgrub.pp-depend-on-config-util.h.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 42f4054faf3c7f2cd2cab5b43e63f9d97d81f7a1 Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Wed, 4 Mar 2020 12:58:42 +0100 -Subject: [PATCH] Makefile: Make libgrub.pp depend on config-util.h - -If you build with "make -j48" a lot, sometimes you see: - -gcc -E -DHAVE_CONFIG_H -I. -I.. -Wall -W -DGRUB_UTIL=1 -D_FILE_OFFSET_BITS=64 -I./include -DGRUB_FILE=\"grub_script.tab.h\" -I. -I.. -I. -I.. -I../include -I./include -I../grub-core/lib/libgcrypt-grub/src/ -I../grub-core/lib/minilzo -I../grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H -Wall -W -DGRUB_UTIL=1 -D_FILE_OFFSET_BITS=64 -I./include -DGRUB_FILE=\"grub_script.tab.h\" -I. -I.. -I. -I.. -I../include -I./include -I../grub-core/lib/libgcrypt-grub/src/ -I./grub-core/gnulib -I../grub-core/gnulib -I/builddir/build/BUILD/grub-2.02/grub-aarch64-efi-2.02 -D_FILE_OFFSET_BITS=64 \ - -D'GRUB_MOD_INIT(x)=@MARKER@x@' grub_script.tab.h grub_script.yy.h ../grub-core/commands/blocklist.c ../grub-core/commands/macbless.c ../grub-core/commands/xnu_uuid.c ../grub-core/commands/testload.c ../grub-core/commands/ls.c ../grub-core/disk/dmraid_nvidia.c ../grub-core/disk/loopback.c ../grub-core/disk/lvm.c ../grub-core/disk/mdraid_linux.c ../grub-core/disk/mdraid_linux_be.c ../grub-core/disk/mdraid1x_linux.c ../grub-core/disk/raid5_recover.c ../grub-core/disk/raid6_recover.c ../grub-core/font/font.c ../grub-core/gfxmenu/font.c ../grub-core/normal/charset.c ../grub-core/video/fb/fbblit.c ../grub-core/video/fb/fbutil.c ../grub-core/video/fb/fbfill.c ../grub-core/video/fb/video_fb.c ../grub-core/video/video.c ../grub-core/video/capture.c ../grub-core/video/colors.c ../grub-core/unidata.c ../grub-core/io/bufio.c ../grub-core/fs/affs.c ../grub-core/fs/afs.c ../grub-core/fs/bfs.c ../grub-core/fs/btrfs.c ../grub-core/fs/cbfs.c ../grub-core/fs/cpio.c ../grub-core/fs/cpio_be.c ../grub-core/fs/odc.c ../grub-core/fs/newc.c ../grub-core/fs/ext2.c ../grub-core/fs/fat.c ../grub-core/fs/exfat.c ../grub-core/fs/fshelp.c ../grub-core/fs/hfs.c ../grub-core/fs/hfsplus.c ../grub-core/fs/hfspluscomp.c ../grub-core/fs/iso9660.c ../grub-core/fs/jfs.c ../grub-core/fs/minix.c ../grub-core/fs/minix2.c ../grub-core/fs/minix3.c ../grub-core/fs/minix_be.c ../grub-core/fs/minix2_be.c ../grub-core/fs/minix3_be.c ../grub-core/fs/nilfs2.c ../grub-core/fs/ntfs.c ../grub-core/fs/ntfscomp.c ../grub-core/fs/reiserfs.c ../grub-core/fs/romfs.c ../grub-core/fs/sfs.c ../grub-core/fs/squash4.c ../grub-core/fs/tar.c ../grub-core/fs/udf.c ../grub-core/fs/ufs2.c ../grub-core/fs/ufs.c ../grub-core/fs/ufs_be.c ../grub-core/fs/xfs.c ../grub-core/fs/zfs/zfscrypt.c ../grub-core/fs/zfs/zfs.c ../grub-core/fs/zfs/zfsinfo.c ../grub-core/fs/zfs/zfs_lzjb.c ../grub-core/fs/zfs/zfs_lz4.c ../grub-core/fs/zfs/zfs_sha256.c ../grub-core/fs/zfs/zfs_fletcher.c ../grub-core/lib/envblk.c ../grub-core/lib/hexdump.c ../grub-core/lib/LzFind.c ../grub-core/lib/LzmaEnc.c ../grub-core/lib/crc.c ../grub-core/lib/adler32.c ../grub-core/lib/crc64.c ../grub-core/normal/datetime.c ../grub-core/normal/misc.c ../grub-core/partmap/acorn.c ../grub-core/partmap/amiga.c ../grub-core/partmap/apple.c ../grub-core/partmap/sun.c ../grub-core/partmap/plan.c ../grub-core/partmap/dvh.c ../grub-core/partmap/sunpc.c ../grub-core/partmap/bsdlabel.c ../grub-core/partmap/dfly.c ../grub-core/script/function.c ../grub-core/script/lexer.c ../grub-core/script/main.c ../grub-core/script/script.c ../grub-core/script/argv.c ../grub-core/io/gzio.c ../grub-core/io/xzio.c ../grub-core/io/lzopio.c ../grub-core/kern/ia64/dl_helper.c ../grub-core/kern/arm/dl_helper.c ../grub-core/kern/arm64/dl_helper.c ../grub-core/lib/minilzo/minilzo.c ../grub-core/lib/xzembed/xz_dec_bcj.c ../grub-core/lib/xzembed/xz_dec_lzma2.c ../grub-core/lib/xzembed/xz_dec_stream.c ../util/misc.c ../grub-core/kern/command.c ../grub-core/kern/device.c ../grub-core/kern/disk.c ../grub-core/lib/disk.c ../util/getroot.c ../grub-core/osdep/unix/getroot.c ../grub-core/osdep/getroot.c ../grub-core/osdep/devmapper/getroot.c ../grub-core/osdep/relpath.c ../grub-core/kern/emu/hostdisk.c ../grub-core/osdep/devmapper/hostdisk.c ../grub-core/osdep/hostdisk.c ../grub-core/osdep/unix/hostdisk.c ../grub-core/osdep/exec.c ../grub-core/osdep/sleep.c ../grub-core/osdep/password.c ../grub-core/kern/emu/misc.c ../grub-core/kern/emu/mm.c ../grub-core/kern/env.c ../grub-core/kern/err.c ../grub-core/kern/file.c ../grub-core/kern/fs.c ../grub-core/kern/list.c ../grub-core/kern/misc.c ../grub-core/kern/partition.c ../grub-core/lib/crypto.c ../grub-core/disk/luks.c ../grub-core/disk/geli.c ../grub-core/disk/cryptodisk.c ../grub-core/disk/AFSplitter.c ../grub-core/lib/pbkdf2.c ../grub-core/commands/extcmd.c ../grub-core/lib/arg.c ../grub-core/disk/ldm.c ../grub-core/disk/diskfilter.c ../grub-core/partmap/gpt.c ../grub-core/partmap/msdos.c ../grub-core/fs/proc.c ../grub-core/fs/archelp.c > libgrub.pp || (rm -f libgrub.pp; exit 1) -rm -f stamp-h1 -touch ../config-util.h.in -cd . && /bin/sh ./config.status config-util.h -config.status: creating config-util.h -In file included from ../include/grub/mm.h:25:0, - from ../include/grub/disk.h:29, - from ../include/grub/file.h:26, - from ../grub-core/fs/btrfs.c:21: -./config.h:38:10: fatal error: ./config-util.h: No such file or directory - #include - ^~~~~~~~~~~~~~~ -compilation terminated. -make: *** [Makefile:13098: libgrub.pp] Error 1 - -This is because libgrub.pp is built with -DGRUB_UTIL=1, which means -it'll try to include config-util.h, but a parallel make is actually -building that file. I think. - -Signed-off-by: Peter Jones -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 1f4bb9b8c..bf9c1ba64 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -37,7 +37,7 @@ grub_script.yy.c: grub_script.yy.h - CLEANFILES += grub_script.yy.c grub_script.yy.h - - # For libgrub.a --libgrub.pp: grub_script.tab.h grub_script.yy.h $(libgrubmods_a_SOURCES) $(libgrubkern_a_SOURCES) -+libgrub.pp: config-util.h grub_script.tab.h grub_script.yy.h $(libgrubmods_a_SOURCES) $(libgrubkern_a_SOURCES) - $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgrubmods_a_CPPFLAGS) $(libgrubkern_a_CPPFLAGS) $(CPPFLAGS) \ - -D'GRUB_MOD_INIT(x)=@MARKER@x@' $^ > $@ || (rm -f $@; exit 1) - CLEANFILES += libgrub.pp --- -2.25.1 - -diff --git a/Makefile.in b/Makefile.in -index 1f4bb9b8c..bf9c1ba64 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -37,7 +37,7 @@ grub_script.yy.c: grub_script.yy.h - CLEANFILES += grub_script.yy.c grub_script.yy.h - - # For libgrub.a --libgrub.pp: grub_script.tab.h grub_script.yy.h $(libgrubmods_a_SOURCES) $(libgrubkern_a_SOURCES) -+libgrub.pp: config-util.h grub_script.tab.h grub_script.yy.h $(libgrubmods_a_SOURCES) $(libgrubkern_a_SOURCES) - $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgrubmods_a_CPPFLAGS) $(libgrubkern_a_CPPFLAGS) $(CPPFLAGS) \ - -D'GRUB_MOD_INIT(x)=@MARKER@x@' $^ > $@ || (rm -f $@; exit 1) - CLEANFILES += libgrub.pp --- -2.25.1 - diff --git a/buildroot/boot/grub2/Config.in b/buildroot/boot/grub2/Config.in index 92b5dd501b..e1f2fc105e 100644 --- a/buildroot/boot/grub2/Config.in +++ b/buildroot/boot/grub2/Config.in @@ -4,6 +4,7 @@ config BR2_TARGET_GRUB2_ARCH_SUPPORTS default y if BR2_x86_64 default y if BR2_arm default y if BR2_aarch64 + default y if BR2_RISCV_64 depends on BR2_USE_MMU config BR2_TARGET_GRUB2 @@ -27,6 +28,10 @@ config BR2_TARGET_GRUB2 Amongst others, GRUB2 offers EFI support, which GRUB Legacy doesn't provide. + The file boot/grub2/grub.cfg is used by default as the Grub + configuration file. It can be overridden using a rootfs + overlay or post-build script. + For additional notes on using Grub 2 with Buildroot, see boot/grub2/readme.txt @@ -48,7 +53,7 @@ config BR2_TARGET_GRUB2_I386_PC depends on BR2_i386 || BR2_x86_64 select BR2_TARGET_GRUB2_HAS_LEGACY_BOOT help - Select this option if the platform you're targetting is a + Select this option if the platform you're targeting is a x86 or x86-64 legacy BIOS based platform. config BR2_TARGET_GRUB2_I386_EFI @@ -57,7 +62,7 @@ config BR2_TARGET_GRUB2_I386_EFI select BR2_TARGET_GRUB2_HAS_PTF select BR2_TARGET_GRUB2_HAS_EFI_BOOT help - Select this option if the platform you're targetting has a + Select this option if the platform you're targeting has a 32 bits EFI BIOS. Note that some x86-64 platforms use a 32 bits EFI BIOS, and this option should be used in this case. @@ -67,7 +72,7 @@ config BR2_TARGET_GRUB2_X86_64_EFI select BR2_TARGET_GRUB2_HAS_PTF select BR2_TARGET_GRUB2_HAS_EFI_BOOT help - Select this option if the platform you're targetting has a + Select this option if the platform you're targeting has a 64 bits EFI BIOS. config BR2_TARGET_GRUB2_ARM_UBOOT @@ -75,7 +80,7 @@ config BR2_TARGET_GRUB2_ARM_UBOOT depends on BR2_arm select BR2_TARGET_GRUB2_HAS_LEGACY_BOOT help - Select this option if the platform you're targetting is an + Select this option if the platform you're targeting is an ARM u-boot platform, and you want to boot Grub 2 as an u-boot compatible image. @@ -85,7 +90,7 @@ config BR2_TARGET_GRUB2_ARM_EFI select BR2_TARGET_GRUB2_HAS_PTF select BR2_TARGET_GRUB2_HAS_EFI_BOOT help - Select this option if the platform you're targetting is an + Select this option if the platform you're targeting is an ARM platform and you want to boot Grub 2 as an EFI application. @@ -94,10 +99,19 @@ config BR2_TARGET_GRUB2_ARM64_EFI depends on BR2_aarch64 select BR2_TARGET_GRUB2_HAS_EFI_BOOT help - Select this option if the platform you're targetting is an + Select this option if the platform you're targeting is an Aarch64 platform and you want to boot Grub 2 as an EFI application. +config BR2_TARGET_GRUB2_RISCV64_EFI + bool "riscv64-efi" + depends on BR2_RISCV_64 + select BR2_TARGET_GRUB2_HAS_EFI_BOOT + help + Select this option if the platform you're targeting is a + 64bit RISC-V platform and you want to boot Grub 2 as an EFI + application. + if BR2_TARGET_GRUB2_HAS_LEGACY_BOOT comment "Options for the x86 legacy BIOS or ARM U-Boot support" diff --git a/buildroot/boot/grub2/grub2.hash b/buildroot/boot/grub2/grub2.hash index 338fe59724..65a8ec8e4f 100644 --- a/buildroot/boot/grub2/grub2.hash +++ b/buildroot/boot/grub2/grub2.hash @@ -1,3 +1,5 @@ +# Locally calculated after checking signature +# https://ftp.gnu.org/gnu/grub/grub-2.12.tar.xz.sig +sha256 f3c97391f7c4eaa677a78e090c7e97e6dc47b16f655f04683ebd37bef7fe0faa grub-2.12.tar.xz # Locally computed: -sha256 e5292496995ad42dabe843a0192cf2a2c502e7ffcc7479398232b10a472df77d grub-2.04.tar.xz -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/boot/grub2/grub2.mk b/buildroot/boot/grub2/grub2.mk index d93e383422..4df12774a3 100644 --- a/buildroot/boot/grub2/grub2.mk +++ b/buildroot/boot/grub2/grub2.mk @@ -4,41 +4,17 @@ # ################################################################################ -GRUB2_VERSION = 2.04 +GRUB2_VERSION = 2.12 GRUB2_SITE = http://ftp.gnu.org/gnu/grub GRUB2_SOURCE = grub-$(GRUB2_VERSION).tar.xz GRUB2_LICENSE = GPL-3.0+ GRUB2_LICENSE_FILES = COPYING -GRUB2_DEPENDENCIES = host-bison host-flex host-grub2 -HOST_GRUB2_DEPENDENCIES = host-bison host-flex +GRUB2_DEPENDENCIES = host-bison host-flex host-gawk host-grub2 \ + $(BR2_PYTHON3_HOST_DEPENDENCY) +HOST_GRUB2_DEPENDENCIES = host-bison host-flex host-gawk \ + $(BR2_PYTHON3_HOST_DEPENDENCY) GRUB2_INSTALL_IMAGES = YES -# 0001-build-Fix-GRUB-i386-pc-build-with-Ubuntu-gcc.patch and 2021/03/02 -# security fixes (patches 0029-0149) -define GRUB2_AVOID_AUTORECONF - $(Q)touch $(@D)/Makefile.util.am - $(Q)touch $(@D)/aclocal.m4 - $(Q)touch $(@D)/Makefile.in - $(Q)touch $(@D)/configure -endef -GRUB2_POST_PATCH_HOOKS += GRUB2_AVOID_AUTORECONF -HOST_GRUB2_POST_PATCH_HOOKS += GRUB2_AVOID_AUTORECONF - -# 0002-yylex-Make-lexer-fatal-errors-actually-be-fatal.patch -GRUB2_IGNORE_CVES += CVE-2020-10713 -# 0005-calloc-Use-calloc-at-most-places.patch -GRUB2_IGNORE_CVES += CVE-2020-14308 -# 0006-malloc-Use-overflow-checking-primitives-where-we-do-.patch -GRUB2_IGNORE_CVES += CVE-2020-14309 CVE-2020-14310 CVE-2020-14311 -# 0019-script-Avoid-a-use-after-free-when-redefining-a-func.patch -GRUB2_IGNORE_CVES += CVE-2020-15706 -# 0028-linux-Fix-integer-overflows-in-initrd-size-handling.patch -GRUB2_IGNORE_CVES += CVE-2020-15707 -# 2021/03/02 security fixes - patches 0029-0149 -GRUB2_IGNORE_CVES += CVE-2020-25632 CVE-2020-25647 CVE-2020-27749 \ - CVE-2020-27779 CVE-2021-3418 CVE-2021-20225 CVE-2021-20233 -# 0039-acpi-Don-t-register-the-acpi-command-when-locked-dow.patch -GRUB2_IGNORE_CVES += CVE-2020-14372 # CVE-2019-14865 is about a flaw in the grub2-set-bootflag tool, which # doesn't exist upstream, but is added by the Redhat/Fedora # packaging. Not applicable to Buildroot. @@ -49,6 +25,14 @@ GRUB2_IGNORE_CVES += CVE-2019-14865 # grub_linuxefi_secure_validate() is not implemented in the grub2 # version available in Buildroot. GRUB2_IGNORE_CVES += CVE-2020-15705 +# vulnerability is specific to the SUSE distribution +GRUB2_IGNORE_CVES += CVE-2021-46705 +# vulnerability is specific to the Redhat distribution, affects a +# downstream change from Redhat related to password authentication +GRUB2_IGNORE_CVES += CVE-2023-4001 +# vulnerability is specific to the Redhat distribution, affects the +# grub2-set-bootflag tool, which doesn't exist upstream +GRUB2_IGNORE_CVES += CVE-2024-1048 ifeq ($(BR2_TARGET_GRUB2_INSTALL_TOOLS),y) GRUB2_INSTALL_TARGET = YES @@ -117,6 +101,15 @@ GRUB2_BUILTIN_CONFIG_arm64-efi = $(GRUB2_BUILTIN_CONFIG_EFI) GRUB2_BUILTIN_MODULES_arm64-efi = $(GRUB2_BUILTIN_MODULES_EFI) GRUB2_TUPLES-$(BR2_TARGET_GRUB2_ARM64_EFI) += arm64-efi +GRUB2_IMAGE_riscv64-efi = $(BINARIES_DIR)/efi-part/EFI/BOOT/bootriscv64.efi +GRUB2_CFG_riscv64-efi = $(BINARIES_DIR)/efi-part/EFI/BOOT/grub.cfg +GRUB2_PREFIX_riscv64-efi = /EFI/BOOT +GRUB2_TARGET_riscv64-efi = riscv64 +GRUB2_PLATFORM_riscv64-efi = efi +GRUB2_BUILTIN_CONFIG_riscv64-efi = $(GRUB2_BUILTIN_CONFIG_EFI) +GRUB2_BUILTIN_MODULES_riscv64-efi = $(GRUB2_BUILTIN_MODULES_EFI) +GRUB2_TUPLES-$(BR2_TARGET_GRUB2_RISCV64_EFI) += riscv64-efi + # Grub2 is kind of special: it considers CC, LD and so on to be the # tools to build the host programs and uses TARGET_CC, TARGET_CFLAGS, # TARGET_CPPFLAGS, TARGET_LDFLAGS to build the bootloader itself. @@ -183,7 +176,7 @@ define GRUB2_INSTALL_IMAGES_CMDS $(foreach tuple, $(GRUB2_TUPLES-y), \ @$(call MESSAGE,Installing $(tuple) to images directory) mkdir -p $(dir $(GRUB2_IMAGE_$(tuple))) - $(HOST_DIR)/usr/bin/grub-mkimage \ + $(HOST_DIR)/bin/grub-mkimage \ -d $(@D)/build-$(tuple)/grub-core/ \ -O $(tuple) \ -o $(GRUB2_IMAGE_$(tuple)) \ diff --git a/buildroot/boot/grub2/readme.txt b/buildroot/boot/grub2/readme.txt index 0282fbdd13..90866e83a9 100644 --- a/buildroot/boot/grub2/readme.txt +++ b/buildroot/boot/grub2/readme.txt @@ -10,20 +10,20 @@ Notes on using Grub2 for BIOS-based platforms is enough free space *before* the first partition to store Grub2. Leaving 1 MB of free space is safe. 3. Setup loop device and loop partitions - sudo losetup -f disk.img - sudo partx -a /dev/loop0 + loop_dev=$(sudo losetup -f disk.img) + sudo partx -a "$loop_dev" 4. Prepare the root partition - sudo mkfs.ext3 -L root /dev/loop0p1 - sudo mount /dev/loop0p1 /mnt + sudo mkfs.ext3 -L root "${loop_dev}p1" + sudo mount "${loop_dev}p1" /mnt sudo tar -C /mnt -xf output/images/rootfs.tar sudo umount /mnt 5. Install Grub2 sudo ./output/host/sbin/grub-bios-setup \ -b ./output/host/lib/grub/i386-pc/boot.img \ - -c ./output/images/grub.img -d . /dev/loop0 + -c ./output/images/grub.img -d . "$loop_dev" 6. Cleanup loop device - sudo partx -d /dev/loop0 - sudo losetup -d /dev/loop0 + sudo partx -d "$loop_dev" + sudo losetup -d "$loop_dev" 7. Your disk.img is ready! Using genimage @@ -65,38 +65,35 @@ Notes on using Grub2 for x86/x86_64 EFI-based platforms - Create a second partition, type 8300, for the root filesystem. 3. Setup loop device and loop partitions - sudo losetup -f disk.img - sudo partx -a /dev/loop0 + loop_dev=$(sudo losetup -f disk.img) + sudo partx -a "$loop_dev" 4. Prepare the boot partition - sudo mkfs.vfat -n boot /dev/loop0p1 - sudo mount /dev/loop0p1 /mnt + sudo mkfs.vfat -n boot "${loop_dev}p1" + sudo mount "${loop_dev}p1" /mnt sudo cp -a output/images/efi-part/* /mnt/ sudo cp output/images/bzImage /mnt/ sudo umount /mnt 5. Prepare the root partition - sudo mkfs.ext3 -L root /dev/loop0p2 - sudo mount /dev/loop0p2 /mnt + sudo mkfs.ext3 -L root "${loop_dev}p2" + sudo mount "${loop_dev}p2" /mnt sudo tar -C /mnt -xf output/images/rootfs.tar sudo umount /mnt 6 Cleanup loop device - sudo partx -d /dev/loop0 - sudo losetup -d /dev/loop0 + sudo partx -d "$loop_dev" + sudo losetup -d "$loop_dev" 7. Your disk.img is ready! To test your i386/x86-64 EFI image in Qemu ------------------------------------------ -1. Download the EFI BIOS for Qemu - Version IA32 or X64 depending on the chosen Grub2 - platform (i386-efi vs. x86-64-efi) - https://www.kraxel.org/repos/jenkins/edk2/ - (or use one provided by your distribution as OVMF) -2. Extract, and rename OVMF.fd to bios.bin and - CirrusLogic5446.rom to vgabios-cirrus.bin. -3. qemu-system-{i386,x86-64} -L ovmf-dir/ -hda disk.img -4. Make sure to pass pci=nocrs to the kernel command line, - to workaround a bug in the EFI BIOS regarding the - EFI framebuffer. +1. Download/install the EFI BIOS for Qemu + You can get it using the edk2 package in Buildroot (installed + in BINARIES_DIR), grab prebuilt images from the unofficial nightly + builds [0], or use one provided by your distribution as OVMF. + + [0] https://github.com/retrage/edk2-nightly + +2. qemu-system-{i386,x86-64} -bios -hda disk.img Notes on using Grub2 for ARM u-boot-based platforms =================================================== @@ -177,8 +174,13 @@ using qemu and EFI firmware built for qemu. 2. make 3. Download the EFI firmware for qemu aarch64 - https://www.kraxel.org/repos/jenkins/edk2/ - (or use one provided by your distribution as OVMF-aarch64 or AAVMF) + + You can get it using the edk2 package in Buildroot (installed + in BINARIES_DIR), grab prebuilt images from the unofficial nightly + builds [1], or use one provided by your distribution as OVMF-aarch64 + or AAVMF. + + [1] https://github.com/retrage/edk2-nightly 4. Run qemu with: diff --git a/buildroot/boot/gummiboot/0001-Allow-building-with-newer-glibc-versions.patch b/buildroot/boot/gummiboot/0001-Allow-building-with-newer-glibc-versions.patch deleted file mode 100644 index b35cd499bc..0000000000 --- a/buildroot/boot/gummiboot/0001-Allow-building-with-newer-glibc-versions.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 40ab4167b5a45c772304a879c71b47d54de3b0e3 Mon Sep 17 00:00:00 2001 -From: Esben Haabendal -Date: Wed, 20 Mar 2019 14:19:40 +0100 -Subject: [PATCH] Allow building with newer glibc versions - -Newer glibc versions does not include sys/sysmacros.h from sys/types.h -anymore. Including it unconditionally should be safe. - -See https://sourceware.org/ml/libc-alpha/2015-11/msg00253.html for why -this was done. - -Signed-off-by: Esben Haabendal ---- - src/setup/setup.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/setup/setup.c b/src/setup/setup.c -index 6a4275a2ae36..53429375a146 100644 ---- a/src/setup/setup.c -+++ b/src/setup/setup.c -@@ -37,6 +37,7 @@ - #include - #include - #include -+#include - - #include "efivars.h" - --- -2.21.0 - diff --git a/buildroot/boot/gummiboot/0002-Fix-linking-for-non-host-compatible-targets.patch b/buildroot/boot/gummiboot/0002-Fix-linking-for-non-host-compatible-targets.patch deleted file mode 100644 index 7104a581e2..0000000000 --- a/buildroot/boot/gummiboot/0002-Fix-linking-for-non-host-compatible-targets.patch +++ /dev/null @@ -1,54 +0,0 @@ -From fc05ced797b87286b8ec7303fe32bf200a072972 Mon Sep 17 00:00:00 2001 -From: Esben Haabendal -Date: Mon, 18 Mar 2019 11:14:31 +0100 -Subject: [PATCH] Fix linking for non-host compatible targets - -Without this, gummiboot build system will use host 'ld' when linking -target binary, which is obviously not a good idea. - -Signed-off-by: Esben Haabendal ---- - Makefile.am | 4 ++-- - configure.ac | 4 ++++ - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 6568a355ed74..9051dd44edd9 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -142,7 +142,7 @@ $(top_builddir)/src/efi/%.o: $(top_srcdir)/src/efi/%.c $(addprefix $(top_srcdir) - $(AM_V_CC)$(EFI_CC) $(efi_cppflags) $(efi_cflags) -c $< -o $@ - - $(gummiboot_solib): $(gummiboot_objects) -- $(AM_V_CCLD)$(LD) $(efi_ldflags) $(gummiboot_objects) \ -+ $(AM_V_CCLD)$(EFI_LD) $(efi_ldflags) $(gummiboot_objects) \ - -o $@ -lefi -lgnuefi $(shell $(CC) -print-libgcc-file-name); \ - nm -D -u $@ | grep ' U ' && exit 1 || : - .DELETE_ON_ERROR: $(gummboot_solib) -@@ -177,7 +177,7 @@ $(top_builddir)/src/efi/%.o: $(top_srcdir)/src/efi/%.c $(addprefix $(top_srcdir) - $(AM_V_CC)$(EFI_CC) $(efi_cppflags) $(efi_cflags) -c $< -o $@ - - $(stub_solib): $(stub_objects) -- $(AM_V_CCLD)$(LD) $(efi_ldflags) $(stub_objects) \ -+ $(AM_V_CCLD)$(EFI_LD) $(efi_ldflags) $(stub_objects) \ - -o $@ -lefi -lgnuefi $(shell $(CC) -print-libgcc-file-name); \ - nm -D -u $@ | grep ' U ' && exit 1 || : - .DELETE_ON_ERROR: $(gummboot_solib) -diff --git a/configure.ac b/configure.ac -index 27bbe1d73396..b948696c220b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -40,6 +40,10 @@ dnl Don't try to use things like -std=c99 for efi compilation - EFI_CC=$CC - AC_SUBST([EFI_CC]) - -+dnl Allow specifying linker compatible with the compiler -+EFI_LD=$LD -+AC_SUBST([EFI_LD]) -+ - AC_PROG_CC_C99 - AM_PROG_CC_C_O - AC_PROG_GCC_TRADITIONAL --- -2.21.0 - diff --git a/buildroot/boot/gummiboot/Config.in b/buildroot/boot/gummiboot/Config.in deleted file mode 100644 index 1b5c4279f7..0000000000 --- a/buildroot/boot/gummiboot/Config.in +++ /dev/null @@ -1,24 +0,0 @@ -config BR2_TARGET_GUMMIBOOT - bool "gummiboot" - depends on BR2_i386 || BR2_x86_64 - depends on BR2_PACKAGE_GNU_EFI_ARCH_SUPPORTS - select BR2_PACKAGE_GNU_EFI - select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBBLKID - help - gummiboot is a simple UEFI boot manager which executes - configured EFI images. The default entry is selected by a - configured pattern (glob) or an on-screen menu. - - gummiboot operates on the EFI System Partition (ESP) - only. Configuration file fragments, kernels, initrds, other - EFI images need to reside on the ESP. Linux kernels need to - be built with CONFIG_EFI_STUB to be able to be directly - executed as an EFI image. - - See the Grub2 help text for details on preparing an EFI - capable disk image using Gummiboot: the instructions are - exactly the same, except that the Gummiboot configuration - files will be located in /loader/ inside the EFI partition. - - http://freedesktop.org/wiki/Software/gummiboot/ diff --git a/buildroot/boot/gummiboot/buildroot.conf b/buildroot/boot/gummiboot/buildroot.conf deleted file mode 100644 index 8a6f02e56a..0000000000 --- a/buildroot/boot/gummiboot/buildroot.conf +++ /dev/null @@ -1,4 +0,0 @@ -title Buildroot -version 1 -linux /bzImage -options console=ttyS0 root=/dev/sda2 diff --git a/buildroot/boot/gummiboot/gummiboot.mk b/buildroot/boot/gummiboot/gummiboot.mk deleted file mode 100644 index eb1f3da78c..0000000000 --- a/buildroot/boot/gummiboot/gummiboot.mk +++ /dev/null @@ -1,41 +0,0 @@ -################################################################################ -# -# gummiboot -# -################################################################################ - -GUMMIBOOT_SITE = https://gitlab.freedesktop.org/archived-projects/gummiboot.git -GUMMIBOOT_SITE_METHOD = git -GUMMIBOOT_VERSION = 2bcd919c681c952eb867ef1bdb458f1bc49c2d55 -GUMMIBOOT_LICENSE = LGPL-2.1+ -GUMMIBOOT_LICENSE_FILES = LICENSE - -# The git archive does not have the autoconf/automake stuff generated. -GUMMIBOOT_AUTORECONF = YES -GUMMIBOOT_DEPENDENCIES = gnu-efi host-pkgconf util-linux -GUMMIBOOT_INSTALL_TARGET = NO -GUMMIBOOT_INSTALL_IMAGES = YES - -ifeq ($(BR2_i386),y) -GUMMIBOOT_IMGARCH = ia32 -else ifeq ($(BR2_x86_64),y) -GUMMIBOOT_IMGARCH = x64 -endif - -GUMMIBOOT_CONF_OPTS = \ - --host=$(BR2_ARCH) \ - --with-efi-libdir=$(STAGING_DIR)/usr/lib \ - --with-efi-ldsdir=$(STAGING_DIR)/usr/lib \ - --with-efi-includedir=$(STAGING_DIR)/usr/include \ - --disable-manpages - -define GUMMIBOOT_INSTALL_IMAGES_CMDS - $(INSTALL) -D -m 0644 $(@D)/gummiboot$(GUMMIBOOT_IMGARCH).efi \ - $(BINARIES_DIR)/efi-part/EFI/BOOT/boot$(GUMMIBOOT_IMGARCH).efi - $(INSTALL) -D -m 0644 boot/gummiboot/loader.conf \ - $(BINARIES_DIR)/efi-part/loader/loader.conf - $(INSTALL) -D -m 0644 boot/gummiboot/buildroot.conf \ - $(BINARIES_DIR)/efi-part/loader/entries/buildroot.conf -endef - -$(eval $(autotools-package)) diff --git a/buildroot/boot/gummiboot/loader.conf b/buildroot/boot/gummiboot/loader.conf deleted file mode 100644 index 93b77b8f93..0000000000 --- a/buildroot/boot/gummiboot/loader.conf +++ /dev/null @@ -1,2 +0,0 @@ -timeout 3 -default buildroot diff --git a/buildroot/boot/lpc32xxcdl/0001-compiler_name.patch b/buildroot/boot/lpc32xxcdl/0001-compiler_name.patch deleted file mode 100644 index 6aecbdeba6..0000000000 --- a/buildroot/boot/lpc32xxcdl/0001-compiler_name.patch +++ /dev/null @@ -1,52 +0,0 @@ -Use CROSS_COMPILE as compiler name and stop using libc - -Signed-off-by: Alexandre Belloni ---- - makerule/lpc32xx/make.lpc32xx.gnu | 22 +++++++++++----------- - 1 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/makerule/lpc32xx/make.lpc32xx.gnu b/makerule/lpc32xx/make.lpc32xx.gnu -index 1014c28..3277d99 100644 ---- a/makerule/lpc32xx/make.lpc32xx.gnu -+++ b/makerule/lpc32xx/make.lpc32xx.gnu -@@ -27,19 +27,19 @@ CFLAGS += -mno-sched-prolog -fno-hosted -mno-thumb-interwork -ffunction-sectio - CFLAGS += -I$(CSP_INC_DIR) -I$(BSP_INC_DIR) -I$(GEN_INC_DIR) - AFLAGS = -mcpu=arm926ej-s - AFLAGS += -I$(CSP_INC_DIR) -I$(BSP_INC_DIR) -I$(GEN_INC_DIR) --CC = arm-none-eabi-gcc --AS = arm-none-eabi-as --AR = arm-none-eabi-ar -r --LD = arm-none-eabi-gcc --NM = arm-none-eabi-nm --OBJDUMP = arm-none-eabi-objdump --OBJCOPY = arm-none-eabi-objcopy --READELF = arm-none-eabi-readelf -+CC = $(CROSS_COMPILE)gcc -+AS = $(CROSS_COMPILE)as -+AR = $(CROSS_COMPILE)ar -r -+LD = $(CROSS_COMPILE)gcc -+NM = $(CROSS_COMPILE)nm -+OBJDUMP = $(CROSS_COMPILE)objdump -+OBJCOPY = $(CROSS_COMPILE)objcopy -+READELF = $(CROSS_COMPILE)readelf - LDFLAGS += -Wl,--gc-sections - - LK = -static - LK += -Wl,--start-group $(TARGET_CSP_LIB) $(TARGET_BSP_LIB) $(TARGET_GEN_LIB) --LK += -lgcc -lc -lg -lm -lstdc++ -lsupc++ -+LK += -nostdlib -lgcc #-lc -lg -lm -lstdc++ -lsupc++ - LK += -Wl,--end-group - MAP = -Xlinker -Map -Xlinker - LDESC = -Xlinker -T -@@ -47,6 +47,6 @@ ENTRY = -e - BIN = -bin - EXT = .elf - LEXT = --ELFTOREC =arm-none-eabi-objcopy -O srec --strip-all --verbose --ELFTOBIN =arm-none-eabi-objcopy -I elf32-littlearm -O binary --strip-all --verbose -+ELFTOREC = $(OBJCOPY) -O srec --strip-all --verbose -+ELFTOBIN = $(OBJCOPY) -I elf32-littlearm -O binary --strip-all --verbose - REC =.srec --- -1.7.7.3 - diff --git a/buildroot/boot/lpc32xxcdl/0002-delete_redundant_files.patch b/buildroot/boot/lpc32xxcdl/0002-delete_redundant_files.patch deleted file mode 100644 index 39966f01e9..0000000000 --- a/buildroot/boot/lpc32xxcdl/0002-delete_redundant_files.patch +++ /dev/null @@ -1,969 +0,0 @@ -Remove duplicated files to stop the linker from complaining about duplicate -symbols - -Signed-off-by: Alexandre Belloni ---- ---- a/csps/lpc32xx/bsps/fdi3250/startup/examples/s1l/sysapi_timer.c 2011-10-05 19:10:37.000000000 +0200 -+++ /dev/null 2012-01-01 16:39:47.918907000 +0100 -@@ -1,212 +0,0 @@ --/*********************************************************************** -- * $Id:: sysapi_timer.c 3394 2010-05-06 17:56:27Z usb10132 $ -- * -- * Project: Time support functions -- * -- * Description: -- * Implements the following functions required for the S1L API -- * time_init -- * time_reset -- * time_start -- * time_stop -- * time_get -- * time_get_rate -- * -- *********************************************************************** -- * Software that is described herein is for illustrative purposes only -- * which provides customers with programming information regarding the -- * products. This software is supplied "AS IS" without any warranties. -- * NXP Semiconductors assumes no responsibility or liability for the -- * use of the software, conveys no license or title under any patent, -- * copyright, or mask work right to the product. NXP Semiconductors -- * reserves the right to make changes in the software without -- * notification. NXP Semiconductors also make no representation or -- * warranty that such application will be suitable for the specified -- * use without further testing or modification. -- **********************************************************************/ -- --#include "s1l_sys_inf.h" --#include "lpc32xx_intc_driver.h" --#include "lpc32xx_timer_driver.h" -- --static UNS_64 base_rate; --static INT_32 tdev = 0; -- --/*********************************************************************** -- * -- * Function: time_init -- * -- * Purpose: Initializes time system -- * -- * Processing: Initializes the system timer. -- * -- * Parameters: None -- * -- * Outputs: None -- * -- * Returns: 0 if the init failed, otherwise non-zero -- * -- * Notes: None -- * -- **********************************************************************/ --INT_32 time_init(void) --{ -- TMR_PSCALE_SETUP_T pscale; -- -- /* Open timer driver */ -- if (tdev == 0) -- { -- tdev = timer_open((void *) TIMER_CNTR0, 0); -- if (tdev != 0) -- { -- /* Use a prescale count to 100000 */ -- pscale.ps_tick_val = 100000; -- pscale.ps_us_val = 0; /* Not needed when ps_tick_val != 0 */ -- timer_ioctl(tdev, TMR_SETUP_PSCALE, (INT_32) &pscale); -- -- /* Get timer clock rate */ -- base_rate = (UNS_64) timer_ioctl(tdev, TMR_GET_STATUS, -- TMR_GET_CLOCK); -- } -- } -- -- return tdev; --} -- --/*********************************************************************** -- * -- * Function: time_reset -- * -- * Purpose: Resets system timer -- * -- * Processing: -- * See function. -- * -- * Parameters: None -- * -- * Outputs: None -- * -- * Returns: Nothing -- * -- * Notes: None -- * -- **********************************************************************/ --void time_reset(void) --{ -- if (tdev != 0) -- { -- timer_ioctl(tdev, TMR_RESET, 1); -- } --} -- --/*********************************************************************** -- * -- * Function: time_start -- * -- * Purpose: Starts system timer -- * -- * Processing: -- * See function. -- * -- * Parameters: None -- * -- * Outputs: None -- * -- * Returns: Nothing -- * -- * Notes: None -- * -- **********************************************************************/ --void time_start(void) --{ -- if (tdev != 0) -- { -- timer_ioctl(tdev, TMR_ENABLE, 1); -- } --} -- --/*********************************************************************** -- * -- * Function: time_stop -- * -- * Purpose: Stops system timer -- * -- * Processing: -- * See function. -- * -- * Parameters: None -- * -- * Outputs: None -- * -- * Returns: Nothing -- * -- * Notes: None -- * -- **********************************************************************/ --void time_stop(void) --{ -- if (tdev != 0) -- { -- timer_ioctl(tdev, TMR_ENABLE, 0); -- } --} -- --/*********************************************************************** -- * -- * Function: time_get -- * -- * Purpose: Returns current system time value -- * -- * Processing: -- * See function. -- * -- * Parameters: None -- * -- * Outputs: None -- * -- * Returns: The number of ticks of the timer counter -- * -- * Notes: None -- * -- **********************************************************************/ --UNS_64 time_get(void) --{ -- TMR_COUNTS_T tcounts; -- UNS_64 ticks = 0; -- -- if (tdev != 0) -- { -- timer_ioctl(tdev, TMR_GET_COUNTS, (INT_32) &tcounts); -- -- /* Compute number of timer ticks */ -- ticks = (UNS_64) tcounts.count_val * 100000; -- ticks = ticks + (UNS_64) tcounts.ps_count_val; -- } -- -- return ticks; --} -- --/*********************************************************************** -- * -- * Function: time_get_rate -- * -- * Purpose: -- * Returns base tick rate (ticks per second) of the time counter -- * -- * Processing: -- * See function. -- * -- * Parameters: None -- * -- * Outputs: None -- * -- * Returns: The timer tick rate (in ticks per second) -- * -- * Notes: None -- * -- **********************************************************************/ --UNS_64 time_get_rate(void) --{ -- return base_rate; --} -- ---- a/csps/lpc32xx/bsps/fdi3250/startup/examples/s1l/sys_mmu_cmd_group.c 2011-10-05 19:10:37.000000000 +0200 -+++ /dev/null 2012-01-01 16:39:47.918907000 +0100 -@@ -1,746 +0,0 @@ --/*********************************************************************** -- * $Id:: sys_mmu_cmd_group.c 3430 2010-05-07 17:39:08Z usb10132 $ -- * -- * Project: Command processor for peek, poke, dump, and fill -- * -- * Description: -- * Processes commands from the command prompt -- * -- *********************************************************************** -- * Software that is described herein is for illustrative purposes only -- * which provides customers with programming information regarding the -- * products. This software is supplied "AS IS" without any warranties. -- * NXP Semiconductors assumes no responsibility or liability for the -- * use of the software, conveys no license or title under any patent, -- * copyright, or mask work right to the product. NXP Semiconductors -- * reserves the right to make changes in the software without -- * notification. NXP Semiconductors also make no representation or -- * warranty that such application will be suitable for the specified -- * use without further testing or modification. -- **********************************************************************/ -- --#include "lpc_arm922t_cp15_driver.h" --#include "lpc_string.h" --#include "startup.h" --#include "s1l_cmds.h" --#include "s1l_sys_inf.h" -- --/* dcache command */ --BOOL_32 cmd_dcache(void); --static UNS_32 cmd_dcache_plist[] = --{ -- (PARSE_TYPE_STR), /* The "dcache" command */ -- (PARSE_TYPE_DEC | PARSE_TYPE_END) --}; --static CMD_ROUTE_T core_dcache_cmd = --{ -- (UNS_8 *) "dcache", -- cmd_dcache, -- (UNS_8 *) "Enables, disables, or flushes data cache", -- (UNS_8 *) "dcache [0(disable), 1(enable), 2(flush)]", -- cmd_dcache_plist, -- NULL --}; -- --/* icache command */ --BOOL_32 cmd_icache(void); --static UNS_32 cmd_icache_plist[] = --{ -- (PARSE_TYPE_STR), /* The "icache" command */ -- (PARSE_TYPE_DEC | PARSE_TYPE_END) --}; --static CMD_ROUTE_T core_icache_cmd = --{ -- (UNS_8 *) "icache", -- cmd_icache, -- (UNS_8 *) "Enables or disables instruction cache", -- (UNS_8 *) "icache [0(disable), 1(enable)]", -- cmd_icache_plist, -- NULL --}; -- --/* inval command */ --BOOL_32 cmd_inval(void); --static UNS_32 cmd_inval_plist[] = --{ -- (PARSE_TYPE_STR | PARSE_TYPE_END) /* The "inval" command */ --}; --static CMD_ROUTE_T core_inval_cmd = --{ -- (UNS_8 *) "inval", -- cmd_inval, -- (UNS_8 *) "Flushes data cache and invalidates instruction cache", -- (UNS_8 *) "inval", -- cmd_inval_plist, -- NULL --}; -- --/* mmuenab command */ --BOOL_32 cmd_mmuenab(void); --static UNS_32 cmd_mmuenab_plist[] = --{ -- (PARSE_TYPE_STR), /* The "mmuenab" command */ -- (PARSE_TYPE_DEC | PARSE_TYPE_END) --}; --static CMD_ROUTE_T core_mmuenab_cmd = --{ -- (UNS_8 *) "mmuenab", -- cmd_mmuenab, -- (UNS_8 *) "Enables or disables the MMU", -- (UNS_8 *) "mmuenab [0(disable), 1(enable)]", -- cmd_mmuenab_plist, -- NULL --}; -- --/* map command */ --BOOL_32 cmd_map(void); --static UNS_32 cmd_map_plist[] = --{ -- (PARSE_TYPE_STR), /* The "map" command */ -- (PARSE_TYPE_HEX), -- (PARSE_TYPE_HEX), -- (PARSE_TYPE_DEC), -- (PARSE_TYPE_DEC | PARSE_TYPE_END), --}; --static CMD_ROUTE_T core_map_cmd = --{ -- (UNS_8 *) "map", -- cmd_map, -- (UNS_8 *) "Maps a range of physical address sections to virtual addresses", -- (UNS_8 *) "map [virt hex addr][phy hex addr][sections][0(uncached), 1(cached), 2(unmap)]", -- cmd_map_plist, -- NULL --}; -- --/* mmuinfo command */ --static BOOL_32 cmd_mmuinfo(void); --static UNS_32 cmd_mmuinfo_plist[] = --{ -- (PARSE_TYPE_STR | PARSE_TYPE_END) /* The "mmuinfo" command */ --}; --static CMD_ROUTE_T core_mmuinfo_cmd = --{ -- (UNS_8 *) "mmuinfo", -- cmd_mmuinfo, -- (UNS_8 *) "Dumps page table and MMU info", -- (UNS_8 *) "mmuinfo", -- cmd_mmuinfo_plist, -- NULL --}; -- --/* MMU group */ --static GROUP_LIST_T mmu_group = --{ -- (UNS_8 *) "mmu", /* mmu group */ -- (UNS_8 *) "MMU command group", -- NULL, -- NULL --}; -- --static UNS_8 enabled_msg [] =" enabled"; --static UNS_8 disabled_msg [] =" disabled"; --static UNS_8 dcache_msg[] = "Data cache"; --static UNS_8 icache_msg[] = "Instruction cache"; --static UNS_8 pagetab_msg[] = "Page table at address: "; --static UNS_8 slist_msg[] = "Type Virt Phy fl Size"; --static UNS_8 mmu_msg [] ="MMU"; --static UNS_8 cpage_msg[] = "Coarse page:"; --static UNS_8 fpage_msg[] = "Fine page :"; --static UNS_8 sect_msg[] = "Section :"; --static UNS_8 mbytes_msg[] = "M"; --static UNS_8 map1_err_msg[] = -- "Error : section addresses must be aligned on a 32-bit boundary"; --static UNS_8 map2_err_msg[] = -- "Error : Number of sections exceeds address range of device"; --static UNS_8 phya_msg[] = "Virtual address "; --static UNS_8 mapped_msg[] = " mapped to physical address "; --static UNS_8 unmapped_msg[] = " unmapped from physical address "; --static UNS_8 cached_msg[] = " (cached)"; --static UNS_8 inval_msg[] = " invalidated"; --static UNS_8 caches_msg [] ="Caches"; --static UNS_8 flushed_msg[] = " flushed"; -- --/*********************************************************************** -- * -- * Function: show_section -- * -- * Purpose: Display section information -- * -- * Processing: -- * See function. -- * -- * Parameters: -- * mmu_reg : MMU settings for this section -- * virt_addr : Starting virtual address for this section -- * segs : Number of 1M segments for this section -- * -- * Outputs: None -- * -- * Returns: Nothing -- * -- * Notes: None -- * -- **********************************************************************/ --static void show_section(UNS_32 mmu_reg, -- UNS_32 virt_addr, -- UNS_32 segs) --{ -- UNS_8 straddr [16]; -- UNS_32 mmu_phy; -- -- if ((mmu_reg & ARM922T_L1D_TYPE_PG_SN_MASK) != -- ARM922T_L1D_TYPE_FAULT) -- { -- if ((mmu_reg & ARM922T_L1D_TYPE_PG_SN_MASK) == -- ARM922T_L1D_TYPE_CPAGE) -- { -- term_dat_out(cpage_msg); -- } -- else if ((mmu_reg & ARM922T_L1D_TYPE_PG_SN_MASK) == -- ARM922T_L1D_TYPE_FPAGE) -- { -- term_dat_out(fpage_msg); -- } -- else -- { -- term_dat_out(sect_msg); -- } -- -- /* Compute virtual address */ -- str_makehex(straddr, virt_addr, 8); -- term_dat_out(straddr); -- term_dat_out((UNS_8 *) " "); -- -- /* Compute mapped physical address */ -- if ((mmu_reg & ARM922T_L1D_TYPE_PG_SN_MASK) == -- ARM922T_L1D_TYPE_SECTION) -- { -- mmu_phy = mmu_reg & 0xFFF00000; -- } -- else -- { -- /* Don't compute addresses for non-sections */ -- mmu_phy = 0; -- } -- str_makehex(straddr, mmu_phy, 8); -- term_dat_out(straddr); -- term_dat_out((UNS_8 *) " "); -- -- /* MMU flags */ -- if ((mmu_reg & ARM922T_L1D_BUFFERABLE) != 0) -- { -- term_dat_out((UNS_8 *) "b"); -- } -- else -- { -- term_dat_out((UNS_8 *) " "); -- } -- if ((mmu_reg & ARM922T_L1D_CACHEABLE) != 0) -- { -- term_dat_out((UNS_8 *) "c"); -- } -- else -- { -- term_dat_out((UNS_8 *) " "); -- } -- term_dat_out((UNS_8 *) " "); -- -- /* Displays used megabytes */ -- str_makedec(straddr, segs); -- term_dat_out(straddr); -- term_dat_out_crlf(mbytes_msg); -- } --} -- --/*********************************************************************** -- * -- * Function: mmu_dumpinfo -- * -- * Purpose: Display MMU info -- * -- * Processing: -- * Display the MMU information, including enable status, cache -- * status, and page table. -- * -- * Parameters: None -- * -- * Outputs: None -- * -- * Returns: TRUE if the command was processed, otherwise FALSE -- * -- * Notes: None -- * -- **********************************************************************/ --static BOOL_32 mmu_dumpinfo(void) --{ -- UNS_32 segsz, last_mmu_reg, mmu_vrt, mmu_reg, mmu_vrtsav = 0, *pt; -- UNS_32 mlast_mmu_reg, mmmu_reg; -- int idx; -- UNS_8 hexaddr [16]; -- -- term_dat_out(mmu_msg); -- if (cp15_mmu_enabled() == FALSE) -- { -- term_dat_out_crlf(disabled_msg); -- } -- else -- { -- term_dat_out_crlf(enabled_msg); -- -- /* Get MMU control register word */ -- mmu_reg = cp15_get_mmu_control_reg(); -- -- /* Instruction cache status */ -- term_dat_out(icache_msg); -- if ((mmu_reg & ARM922T_MMU_CONTROL_I) == 0) -- { -- term_dat_out_crlf(disabled_msg); -- } -- else -- { -- term_dat_out_crlf(enabled_msg); -- } -- -- /* Data cache status */ -- term_dat_out(dcache_msg); -- if ((mmu_reg & ARM922T_MMU_CONTROL_C) == 0) -- { -- term_dat_out_crlf(disabled_msg); -- } -- else -- { -- term_dat_out_crlf(enabled_msg); -- } -- -- term_dat_out(pagetab_msg); -- mmu_reg = (UNS_32) cp15_get_ttb(); -- str_makehex(hexaddr, mmu_reg, 8); -- term_dat_out_crlf(hexaddr); -- term_dat_out_crlf(slist_msg); -- -- /* Process MMU table - assume that the physical and -- virtual locations of table are the same */ -- pt = (UNS_32 *) mmu_reg; -- mmu_vrt = 0x0; -- segsz = 0xFFFFFFFF; -- last_mmu_reg = mlast_mmu_reg = 0xFFFFFFFF; -- for (idx = 0; idx < 4096; idx++) -- { -- mmu_reg = *pt; -- mmmu_reg = (mmu_reg & (ARM922T_L1D_TYPE_PG_SN_MASK | -- ARM922T_L1D_BUFFERABLE | ARM922T_L1D_CACHEABLE)); -- segsz = segsz + 1; -- -- if ((last_mmu_reg != 0xFFFFFFFF) && -- (mlast_mmu_reg != mmmu_reg)) -- { -- show_section(last_mmu_reg, mmu_vrtsav, segsz); -- segsz = 0; -- } -- -- if (mlast_mmu_reg != mmmu_reg) -- { -- mmu_vrtsav = mmu_vrt; -- last_mmu_reg = mmu_reg; -- mlast_mmu_reg = mmmu_reg; -- } -- -- pt++; -- mmu_vrt += 0x00100000; -- } -- } -- -- return TRUE; --} -- --/*********************************************************************** -- * -- * Function: mmu_dumpmap -- * -- * Purpose: Map a virtual address range to a physical range -- * -- * Processing: -- * From the input addresses and number of sections, generate the -- * appropriate entries in the page table. -- * -- * Parameters: None -- * -- * Outputs: None -- * -- * Returns: TRUE if the command was processed, otherwise FALSE -- * -- * Notes: None -- * -- **********************************************************************/ --static BOOL_32 mmu_dumpmap(UNS_32 vrt, -- UNS_32 phy, -- UNS_32 sections, -- UNS_32 cache) --{ -- BOOL_32 processed = FALSE; -- UNS_32 mmu_phy, mmu_vrt, tmp1 = 0, tmp2, *pt; -- UNS_8 hexaddr [16]; -- -- /* Verify address boundaries are sectional */ -- mmu_vrt = vrt & ~ARM922T_L2D_SN_BASE_MASK; -- mmu_phy = phy & ~ARM922T_L2D_SN_BASE_MASK; -- if ((mmu_vrt != 0) || (mmu_phy != 0)) -- { -- term_dat_out_crlf(map1_err_msg); -- } -- else -- { -- /* Verify that address range and section count will not -- exceed address range of device */ -- tmp1 = vrt >> 20; -- tmp1 = (tmp1 + sections) - 1; -- tmp2 = phy >> 20; -- tmp2 = (tmp2 + sections) - 1; -- if ((tmp1 < 4096) && (tmp2 < 4096)) -- { -- /* Good address range and good section count */ -- processed = TRUE; -- } -- else -- { -- term_dat_out_crlf(map2_err_msg); -- } -- } -- -- /* Generate static part of MMU word */ -- if (cache == 0) -- { -- /* Section mapped with cache disabled */ -- tmp1 = ARM922T_L1D_TYPE_SECTION; -- } -- else if (cache == 1) -- { -- /* Section mapped with cache enabled */ -- tmp1 = (ARM922T_L1D_BUFFERABLE | ARM922T_L1D_CACHEABLE | -- ARM922T_L1D_TYPE_SECTION); -- } -- else if (cache == 2) -- { -- /* Section unmapped */ -- tmp1 = ARM922T_L1D_TYPE_FAULT; -- } -- tmp1 |= ARM922T_L1D_AP_ALL; -- -- /* Offset into page table for virtual address */ -- tmp2 = (vrt >> 20); -- pt = cp15_get_ttb() + tmp2; -- -- /* Loop until all sections are complete */ -- while ((sections > 0) && (processed == TRUE)) -- { -- /* Add in physical address */ -- tmp2 = tmp1 | (phy & ARM922T_L2D_SN_BASE_MASK); -- -- /* Save new section descriptor for virtual address */ -- *pt = tmp2; -- -- /* Output message shown the map */ -- term_dat_out(phya_msg); -- str_makehex(hexaddr, phy, 8); -- term_dat_out(hexaddr); -- if (cache == 2) -- { -- term_dat_out(unmapped_msg); -- } -- else -- { -- term_dat_out(mapped_msg); -- } -- str_makehex(hexaddr, vrt, 8); -- term_dat_out(hexaddr); -- if (cache == 1) -- { -- term_dat_out(cached_msg); -- } -- term_dat_out_crlf((UNS_8 *) ""); -- -- /* Next section and page table entry*/ -- phy += 0x00100000; -- vrt += 0x00100000; -- pt++; -- sections--; -- } -- -- return processed; --} -- --/*********************************************************************** -- * -- * Function: cmd_mmuinfo -- * -- * Purpose: Display MMU information -- * -- * Processing: -- * See function. -- * -- * Parameters: None -- * -- * Outputs: None -- * -- * Returns: TRUE if the command was processed, otherwise FALSE -- * -- * Notes: None -- * -- **********************************************************************/ --static BOOL_32 cmd_mmuinfo(void) --{ -- mmu_dumpinfo(); -- -- return TRUE; --} -- --/*********************************************************************** -- * -- * Function: cmd_map -- * -- * Purpose: Map a physical address region to a virtual region -- * -- * Processing: -- * See function. -- * -- * Parameters: None -- * -- * Outputs: None -- * -- * Returns: TRUE if the command was processed, otherwise FALSE -- * -- * Notes: None -- * -- **********************************************************************/ --BOOL_32 cmd_map(void) --{ -- UNS_32 phy, virt, sects, ce = 0; -- -- /* Get arguments */ -- virt = cmd_get_field_val(1); -- phy = cmd_get_field_val(2); -- sects = cmd_get_field_val(3); -- ce = cmd_get_field_val(4); -- -- if (ce <= 2) -- { -- mmu_dumpmap(virt, phy, sects, ce); -- } -- -- return TRUE; --} -- --/*********************************************************************** -- * -- * Function: cmd_inval -- * -- * Purpose: MMU cache flush and invalidate -- * -- * Processing: -- * See function. -- * -- * Parameters: None -- * -- * Outputs: None -- * -- * Returns: TRUE if the command was processed, otherwise FALSE -- * -- * Notes: None -- * -- **********************************************************************/ --BOOL_32 cmd_inval(void) --{ -- dcache_flush(); -- icache_inval(); -- term_dat_out(caches_msg); -- term_dat_out(inval_msg); -- -- return TRUE; --} -- --/*********************************************************************** -- * -- * Function: cmd_dcache -- * -- * Purpose: MMU data cache enable and disable -- * -- * Processing: -- * If the value passed in the parser is 1, enable the data cache, -- * otherwise disable the data cache. -- * -- * Parameters: None -- * -- * Outputs: None -- * -- * Returns: TRUE if the command was processed, otherwise FALSE -- * -- * Notes: None -- * -- **********************************************************************/ --BOOL_32 cmd_dcache(void) --{ -- UNS_32 cenable; -- UNS_8 *ppar; -- -- /* Get argument */ -- cenable = cmd_get_field_val(1); -- -- switch (cenable) -- { -- case 0: -- dcache_flush(); -- cp15_set_dcache(0); -- ppar = disabled_msg; -- break; -- -- case 1: -- cp15_invalidate_cache(); -- cp15_set_dcache(1); -- ppar = enabled_msg; -- break; -- -- case 2: -- default: -- dcache_flush(); -- ppar = flushed_msg; -- break; -- } -- -- term_dat_out(dcache_msg); -- term_dat_out_crlf(ppar); -- -- return TRUE; --} -- --/*********************************************************************** -- * -- * Function: cmd_icache -- * -- * Purpose: MMU instruction cache enable and disable -- * -- * Processing: -- * If the value passed in the parser is 1, enable the instruction -- * cache, otherwise disable the instruction cache. -- * -- * Parameters: None -- * -- * Outputs: None -- * -- * Returns: TRUE if the command was processed, otherwise FALSE -- * -- * Notes: None -- * -- **********************************************************************/ --BOOL_32 cmd_icache(void) --{ -- UNS_32 cenable; -- UNS_8 *ppar; -- -- /* Get argument */ -- cenable = cmd_get_field_val(1); -- -- if (cenable == 1) -- { -- dcache_flush(); -- cp15_invalidate_cache(); -- cp15_set_icache(1); -- ppar = enabled_msg; -- } -- else -- { -- cp15_set_icache(0); -- ppar = disabled_msg; -- } -- -- term_dat_out(icache_msg); -- term_dat_out_crlf(ppar); -- -- return TRUE; --} -- -- --/*********************************************************************** -- * -- * Function: cmd_mmuenab -- * -- * Purpose: Enable or disable MMU -- * -- * Processing: -- * See function. -- * -- * Parameters: None -- * -- * Outputs: None -- * -- * Returns: TRUE if the command was processed, otherwise FALSE -- * -- * Notes: None -- * -- **********************************************************************/ --BOOL_32 cmd_mmuenab(void) --{ -- UNS_8 *ppar; -- UNS_32 cenable; -- -- term_dat_out_crlf((UNS_8 *) "Warning: Changing MMU status on " -- " cached and buffered code can cause system crashes."); -- -- /* Get argument */ -- cenable = cmd_get_field_val(1); -- -- if (cenable == 1) -- { -- if ((cp15_get_mmu_control_reg() & ARM922T_MMU_CONTROL_C) != 0) -- { -- cp15_invalidate_cache(); -- } -- -- cp15_set_mmu(1); -- ppar = enabled_msg; -- } -- else -- { -- cp15_dcache_flush(); -- cp15_write_buffer_flush(); -- cp15_invalidate_cache(); -- cp15_set_mmu(0); -- ppar = disabled_msg; -- } -- -- term_dat_out(mmu_msg); -- term_dat_out_crlf(ppar); -- -- return TRUE; --} -- --/*********************************************************************** -- * -- * Function: mmu_cmd_group_init -- * -- * Purpose: Initialize MMU command group -- * -- * Processing: -- * See function. -- * -- * Parameters: None -- * -- * Outputs: None -- * -- * Returns: Nothin -- * -- * Notes: None -- * -- **********************************************************************/ --void mmu_cmd_group_init(void) --{ -- /* Add MMU group */ -- cmd_add_group(&mmu_group); -- -- /* Add commands to the MMU group */ -- cmd_add_new_command(&mmu_group, &core_dcache_cmd); -- cmd_add_new_command(&mmu_group, &core_icache_cmd); -- cmd_add_new_command(&mmu_group, &core_inval_cmd); -- cmd_add_new_command(&mmu_group, &core_mmuenab_cmd); -- cmd_add_new_command(&mmu_group, &core_map_cmd); -- cmd_add_new_command(&mmu_group, &core_mmuinfo_cmd); --} diff --git a/buildroot/boot/lpc32xxcdl/0003-libnosys_gnu.patch b/buildroot/boot/lpc32xxcdl/0003-libnosys_gnu.patch deleted file mode 100644 index cfd77bead6..0000000000 --- a/buildroot/boot/lpc32xxcdl/0003-libnosys_gnu.patch +++ /dev/null @@ -1,188 +0,0 @@ -Fix compilation and eabi issues - -Since we are not linking with libc anymore, we need to define our own memset, -strlen and memcpy. Also, as we are using a *libc compiler, we need to "handle" -exceptions (mostly division by 0) by defining raise() and -__aeabi_unwind_cpp_pr0. - -Signed-off-by: Alexandre Belloni ---- - csps/lpc32xx/bsps/ea3250/source/libnosys_gnu.c | 41 +++++++++++++++++++++++ - csps/lpc32xx/bsps/fdi3250/source/libnosys_gnu.c | 41 +++++++++++++++++++++++ - csps/lpc32xx/bsps/phy3250/source/libnosys_gnu.c | 41 +++++++++++++++++++++++ - 3 files changed, 123 insertions(+), 0 deletions(-) - -diff --git a/csps/lpc32xx/bsps/ea3250/source/libnosys_gnu.c b/csps/lpc32xx/bsps/ea3250/source/libnosys_gnu.c -index 385b0ab..f1f0a0a 100644 ---- a/csps/lpc32xx/bsps/ea3250/source/libnosys_gnu.c -+++ b/csps/lpc32xx/bsps/ea3250/source/libnosys_gnu.c -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - - /* errno definition */ - #undef errno -@@ -125,4 +126,44 @@ int _write(int file, char *ptr, int len){ - return 0; - } - -+void * memset(void * s,int c,size_t count) -+{ -+ char *xs = (char *) s; -+ -+ while (count--) -+ *xs++ = c; -+ -+ return s; -+} -+ -+ -+size_t strlen(const char * s) -+{ -+ const char *sc; -+ -+ for (sc = s; *sc != '\0'; ++sc) -+ /* nothing */; -+ return sc - s; -+} -+ -+void * memcpy(void * dest,const void *src,size_t count) -+{ -+ char *tmp = (char *) dest, *s = (char *) src; -+ -+ while (count--) -+ *tmp++ = *s++; -+ -+ return dest; -+} -+ -+ -+/* Dummy functions to avoid linker complaints */ -+void __aeabi_unwind_cpp_pr0(void) -+{ -+}; -+ -+void raise(void) -+{ -+}; -+ - #endif /*__GNUC__*/ -diff --git a/csps/lpc32xx/bsps/fdi3250/source/libnosys_gnu.c b/csps/lpc32xx/bsps/fdi3250/source/libnosys_gnu.c -index 385b0ab..f1f0a0a 100644 ---- a/csps/lpc32xx/bsps/fdi3250/source/libnosys_gnu.c -+++ b/csps/lpc32xx/bsps/fdi3250/source/libnosys_gnu.c -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - - /* errno definition */ - #undef errno -@@ -125,4 +126,44 @@ int _write(int file, char *ptr, int len){ - return 0; - } - -+void * memset(void * s,int c,size_t count) -+{ -+ char *xs = (char *) s; -+ -+ while (count--) -+ *xs++ = c; -+ -+ return s; -+} -+ -+ -+size_t strlen(const char * s) -+{ -+ const char *sc; -+ -+ for (sc = s; *sc != '\0'; ++sc) -+ /* nothing */; -+ return sc - s; -+} -+ -+void * memcpy(void * dest,const void *src,size_t count) -+{ -+ char *tmp = (char *) dest, *s = (char *) src; -+ -+ while (count--) -+ *tmp++ = *s++; -+ -+ return dest; -+} -+ -+ -+/* Dummy functions to avoid linker complaints */ -+void __aeabi_unwind_cpp_pr0(void) -+{ -+}; -+ -+void raise(void) -+{ -+}; -+ - #endif /*__GNUC__*/ -diff --git a/csps/lpc32xx/bsps/phy3250/source/libnosys_gnu.c b/csps/lpc32xx/bsps/phy3250/source/libnosys_gnu.c -index cfdb674..6b50c60 100644 ---- a/csps/lpc32xx/bsps/phy3250/source/libnosys_gnu.c -+++ b/csps/lpc32xx/bsps/phy3250/source/libnosys_gnu.c -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - - /* errno definition */ - #undef errno -@@ -125,4 +126,44 @@ int _write(int file, char *ptr, int len){ - return 0; - } - -+void * memset(void * s,int c,size_t count) -+{ -+ char *xs = (char *) s; -+ -+ while (count--) -+ *xs++ = c; -+ -+ return s; -+} -+ -+ -+size_t strlen(const char * s) -+{ -+ const char *sc; -+ -+ for (sc = s; *sc != '\0'; ++sc) -+ /* nothing */; -+ return sc - s; -+} -+ -+void * memcpy(void * dest,const void *src,size_t count) -+{ -+ char *tmp = (char *) dest, *s = (char *) src; -+ -+ while (count--) -+ *tmp++ = *s++; -+ -+ return dest; -+} -+ -+ -+/* Dummy functions to avoid linker complaints */ -+void __aeabi_unwind_cpp_pr0(void) -+{ -+}; -+ -+void raise(void) -+{ -+}; -+ - #endif /*__GNUC__*/ --- -1.7.7.3 - diff --git a/buildroot/boot/lpc32xxcdl/0004-slashes.patch b/buildroot/boot/lpc32xxcdl/0004-slashes.patch deleted file mode 100644 index 94c184780e..0000000000 --- a/buildroot/boot/lpc32xxcdl/0004-slashes.patch +++ /dev/null @@ -1,521 +0,0 @@ -Use slashes instead of backslashes - -Signed-off-by: Alexandre Belloni ---- - .../bsps/common/examples/buildfiles/makefile | 10 +++--- - .../startup/examples/burners/makefile.burner | 16 +++++----- - csps/lpc32xx/bsps/ea3250/source/makefile | 10 +++--- - csps/lpc32xx/bsps/fdi3250/source/makefile | 12 ++++---- - csps/lpc32xx/bsps/phy3250/examples/makefile | 2 +- - csps/lpc32xx/bsps/phy3250/source/makefile | 2 +- - .../examples/Burners/nor/kickstart/makefile | 2 +- - .../startup/examples/Burners/nor/norerase/makefile | 2 +- - .../startup/examples/Burners/nor/s1lapp/makefile | 2 +- - .../examples/Burners/spi/kickstart/makefile | 2 +- - csps/lpc32xx/source/makefile | 10 +++--- - lpc/source/makefile | 10 +++--- - makefile | 2 +- - makerule/common/make.rules.environment | 30 ++++++++++---------- - makerule/lpc32xx/make.lpc32xx.gnu | 2 +- - makerule/lpc32xx/make.lpc32xx.iar | 12 ++++---- - makerule/lpc32xx/make.lpc32xx.keil | 6 ++-- - makerule/lpc32xx/make.lpc32xx.rvw | 2 +- - 18 files changed, 67 insertions(+), 67 deletions(-) - -diff --git a/csps/lpc32xx/bsps/common/examples/buildfiles/makefile b/csps/lpc32xx/bsps/common/examples/buildfiles/makefile -index cf4977c..1da2201 100644 ---- a/csps/lpc32xx/bsps/common/examples/buildfiles/makefile -+++ b/csps/lpc32xx/bsps/common/examples/buildfiles/makefile -@@ -25,16 +25,16 @@ - # - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\$(CSP)\make.$(CSP).$(TOOL) -+include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL) - - ######################################################################## - # - # Pick up the assembler and C source files in the directory - # - ######################################################################## --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.ftypes --AFLAGS +=-I..\Include --CFLAGS +=-I..\Include -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.ftypes -+AFLAGS +=-I../Include -+CFLAGS +=-I../Include - - ######################################################################## - # -@@ -42,6 +42,6 @@ CFLAGS +=-I..\Include - # - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.build -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.build - - -diff --git a/csps/lpc32xx/bsps/common/startup/examples/burners/makefile.burner b/csps/lpc32xx/bsps/common/startup/examples/burners/makefile.burner -index fca3947..18bd703 100644 ---- a/csps/lpc32xx/bsps/common/startup/examples/burners/makefile.burner -+++ b/csps/lpc32xx/bsps/common/startup/examples/burners/makefile.burner -@@ -22,9 +22,9 @@ - # - ######################################################################## - --COMMON_BASE := $(NXPMCU_SOFTWARE)\csps\$(CSP)\bsps\common --include $(NXPMCU_SOFTWARE)\makerule\$(CSP)\make.$(CSP).$(TOOL) --include $(COMMON_BASE)\startup\examples\buildfiles\make.env -+COMMON_BASE := $(NXPMCU_SOFTWARE)/csps/$(CSP)/bsps/common -+include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL) -+include $(COMMON_BASE)/startup/examples/buildfiles/make.env - - ######################################################################## - # ARM Realview -@@ -38,7 +38,7 @@ AFLAGS += --predefine "USE_ALL_STACKS SETL {TRUE}" - #AFLAGS += --predefine "RW_RELOC SETL {TRUE}" - - # This runs from IRAM --LDSCRIPT =$(COMMON_BASE)\startup\examples\buildfiles\ldscript_iram_rvw.ld -+LDSCRIPT =$(COMMON_BASE)/startup/examples/buildfiles/ldscript_iram_rvw.ld - LDFLAGS = --remove - MAP = --map --info=totals,sizes,unused --symbols --list - endif -@@ -55,7 +55,7 @@ AFLAGS += --predefine "USE_ALL_STACKS SETL {TRUE}" - #AFLAGS += --predefine "RW_RELOC SETL {TRUE}" - - # This runs from IRAM --LDSCRIPT =$(COMMON_BASE)\startup\examples\buildfiles\ldscript_iram_rvw.ld -+LDSCRIPT =$(COMMON_BASE)/startup/examples/buildfiles/ldscript_iram_rvw.ld - LDFLAGS = --remove - MAP = --map --info=totals,sizes,unused --symbols --list - endif -@@ -72,7 +72,7 @@ AFLAGS += --defsym USE_ALL_STACKS=1 - #AFLAGS += --defsym RW_RELOC=1 - - # This runs from IRAM --LDSCRIPT =$(COMMON_BASE)\startup\examples\buildfiles\ldscript_iram_gnu.ld -+LDSCRIPT =$(COMMON_BASE)/startup/examples/buildfiles/ldscript_iram_gnu.ld - - endif - -@@ -108,7 +108,7 @@ endif - # Pick up the assembler and C source files in the directory - # - ######################################################################## --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.ftypes -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.ftypes - - ######################################################################## - # -@@ -157,6 +157,6 @@ endif - # - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.build -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.build - - .PHONY: debug bin -diff --git a/csps/lpc32xx/bsps/ea3250/source/makefile b/csps/lpc32xx/bsps/ea3250/source/makefile -index 7cada25..2899b20 100644 ---- a/csps/lpc32xx/bsps/ea3250/source/makefile -+++ b/csps/lpc32xx/bsps/ea3250/source/makefile -@@ -22,16 +22,16 @@ - # - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\$(CSP)\make.$(CSP).$(TOOL) -+include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL) - - ######################################################################## - # - # Pick up the assembler and C source files in the directory - # - ######################################################################## --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.ftypes --AFLAGS +=-I..\Include --CFLAGS +=-I..\Include -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.ftypes -+AFLAGS +=-I../Include -+CFLAGS +=-I../Include - - ######################################################################## - # -@@ -64,7 +64,7 @@ realclean: lib_realclean - # - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.build -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.build - - .PHONY: all lib_clean lib_realclean - -diff --git a/csps/lpc32xx/bsps/fdi3250/source/makefile b/csps/lpc32xx/bsps/fdi3250/source/makefile -index 4e153bb..11e4b63 100644 ---- a/csps/lpc32xx/bsps/fdi3250/source/makefile -+++ b/csps/lpc32xx/bsps/fdi3250/source/makefile -@@ -22,16 +22,16 @@ - # - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\$(CSP)\make.$(CSP).$(TOOL) -+include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL) - - ######################################################################## - # - # Pick up the assembler and C source files in the directory - # - ######################################################################## --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.ftypes --AFLAGS +=-I..\Include --CFLAGS +=-I..\Include -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.ftypes -+AFLAGS +=-I../Include -+CFLAGS +=-I../Include - - ######################################################################## - # -@@ -53,7 +53,7 @@ lib_clean: - # delete all targets this Makefile can make and all built libraries - # linked in - lib_realclean: -- -@$(RM) $(BSP_LIB_DIR)\*.a -+ -@$(RM) $(BSP_LIB_DIR)/*.a - -@$(RMDIR) $(BSP_LIB_DIR) - - clean: lib_clean -@@ -65,7 +65,7 @@ realclean: lib_realclean - # - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.build -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.build - - .PHONY: all lib_clean lib_realclean - -diff --git a/csps/lpc32xx/bsps/phy3250/examples/makefile b/csps/lpc32xx/bsps/phy3250/examples/makefile -index b939252..e7feaa6 100644 ---- a/csps/lpc32xx/bsps/phy3250/examples/makefile -+++ b/csps/lpc32xx/bsps/phy3250/examples/makefile -@@ -25,7 +25,7 @@ - # - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\$(CSP)\make.$(CSP).$(TOOL) -+include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL) - - SUBDIRS = adc dram_self_refresh hstimer hsuart i2c kscan lcd_colorbars - SUBDIRS += lcd_tsc mi2c mstimer pwm pwm_simple rtc sdcard sdcard_dma -diff --git a/csps/lpc32xx/bsps/phy3250/source/makefile b/csps/lpc32xx/bsps/phy3250/source/makefile -index 7c48e7d..750b776 100644 ---- a/csps/lpc32xx/bsps/phy3250/source/makefile -+++ b/csps/lpc32xx/bsps/phy3250/source/makefile -@@ -32,7 +32,7 @@ include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL) - # Pick up the assembler and C source files in the directory - # - ######################################################################## --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.ftypes -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.ftypes - AFLAGS +=-I../Include - CFLAGS +=-I../Include - -diff --git a/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/kickstart/makefile b/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/kickstart/makefile -index 01e2b38..526d6cc 100644 ---- a/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/kickstart/makefile -+++ b/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/kickstart/makefile -@@ -78,7 +78,7 @@ endif - - ######################################################################## - # --# Compiler\linker specific stuff -+# Compiler/linker specific stuff - # - ######################################################################## - -diff --git a/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/norerase/makefile b/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/norerase/makefile -index ce329f5..e81b8db 100644 ---- a/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/norerase/makefile -+++ b/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/norerase/makefile -@@ -77,7 +77,7 @@ endif - - ######################################################################## - # --# Compiler\linker specific stuff -+# Compiler/linker specific stuff - # - ######################################################################## - -diff --git a/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/s1lapp/makefile b/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/s1lapp/makefile -index 4426fc7..196faec 100644 ---- a/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/s1lapp/makefile -+++ b/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/s1lapp/makefile -@@ -77,7 +77,7 @@ endif - - ######################################################################## - # --# Compiler\linker specific stuff -+# Compiler/linker specific stuff - # - ######################################################################## - -diff --git a/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/spi/kickstart/makefile b/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/spi/kickstart/makefile -index dc73b64..39fc304 100644 ---- a/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/spi/kickstart/makefile -+++ b/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/spi/kickstart/makefile -@@ -78,7 +78,7 @@ endif - - ######################################################################## - # --# Compiler\linker specific stuff -+# Compiler/linker specific stuff - # - ######################################################################## - -diff --git a/csps/lpc32xx/source/makefile b/csps/lpc32xx/source/makefile -index 8e05456..16bd944 100644 ---- a/csps/lpc32xx/source/makefile -+++ b/csps/lpc32xx/source/makefile -@@ -25,16 +25,16 @@ - # - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\$(CSP)\make.$(CSP).$(TOOL) -+include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL) - - ######################################################################## - # - # Pick up the assembler and C source files in the directory - # - ######################################################################## --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.ftypes --AFLAGS +=-I..\Include --CFLAGS +=-I..\Include -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.ftypes -+AFLAGS +=-I../Include -+CFLAGS +=-I../Include - - - ######################################################################## -@@ -68,7 +68,7 @@ realclean: lib_realclean - # - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.build -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.build - - .PHONY: all lib_clean lib_realclean - -diff --git a/lpc/source/makefile b/lpc/source/makefile -index 2860db9..ae7d612 100644 ---- a/lpc/source/makefile -+++ b/lpc/source/makefile -@@ -25,16 +25,16 @@ - # - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\$(CSP)\make.$(CSP).$(TOOL) -+include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL) - - ######################################################################## - # - # Pick up the assembler and C source files in the directory - # - ######################################################################## --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.ftypes --AFLAGS +=-I..\Include --CFLAGS +=-I..\Include -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.ftypes -+AFLAGS +=-I../Include -+CFLAGS +=-I../Include - - ######################################################################## - # -@@ -67,7 +67,7 @@ realclean: lib_realclean - # - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.build -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.build - - .PHONY: all lib_clean lib_realclean - -diff --git a/makefile b/makefile -index 8645fcc..86fa6bc 100644 ---- a/makefile -+++ b/makefile -@@ -34,7 +34,7 @@ TARGETS_CLN =gen_clean csp_clean bsp_clean - # - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\$(CSP)\make.$(CSP).$(TOOL) -+include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL) - - ######################################################################## - # -diff --git a/makerule/common/make.rules.environment b/makerule/common/make.rules.environment -index d5737fe..4e6df48 100644 ---- a/makerule/common/make.rules.environment -+++ b/makerule/common/make.rules.environment -@@ -52,7 +52,7 @@ ASTYLE =astyle --options=$(BUILD_ROOT)/tools/astyle.cfg - # - ######################################################################## - --CSP_LIB_DIR =$(BUILD_ROOT)\csps\$(CSP)\lib -+CSP_LIB_DIR =$(BUILD_ROOT)/csps/$(CSP)/lib - - ######################################################################## - # -@@ -60,7 +60,7 @@ CSP_LIB_DIR =$(BUILD_ROOT)\csps\$(CSP)\lib - # - ######################################################################## - --BSP_LIB_DIR =$(BUILD_ROOT)\csps\$(CSP)\bsps\$(BSP)\lib -+BSP_LIB_DIR =$(BUILD_ROOT)/csps/$(CSP)/bsps/$(BSP)/lib - - ######################################################################## - # -@@ -68,7 +68,7 @@ BSP_LIB_DIR =$(BUILD_ROOT)\csps\$(CSP)\bsps\$(BSP)\lib - # - ######################################################################## - --GEN_LIB_DIR =$(BUILD_ROOT)\$(GEN)\lib -+GEN_LIB_DIR =$(BUILD_ROOT)/$(GEN)/lib - - ######################################################################## - # -@@ -76,9 +76,9 @@ GEN_LIB_DIR =$(BUILD_ROOT)\$(GEN)\lib - # - ######################################################################## - --CSP_DIR =$(BUILD_ROOT)\csps\$(CSP) --CSP_SRC_DIR =$(CSP_DIR)\source --CSP_INC_DIR =$(CSP_DIR)\include -+CSP_DIR =$(BUILD_ROOT)/csps/$(CSP) -+CSP_SRC_DIR =$(CSP_DIR)/source -+CSP_INC_DIR =$(CSP_DIR)/include - - ######################################################################## - # -@@ -86,9 +86,9 @@ CSP_INC_DIR =$(CSP_DIR)\include - # - ######################################################################## - --BSP_DIR =$(BUILD_ROOT)\csps\$(CSP)\bsps\$(BSP) --BSP_SRC_DIR =$(BSP_DIR)\source --BSP_INC_DIR =$(BSP_DIR)\include -+BSP_DIR =$(BUILD_ROOT)/csps/$(CSP)/bsps/$(BSP) -+BSP_SRC_DIR =$(BSP_DIR)/source -+BSP_INC_DIR =$(BSP_DIR)/include - - ######################################################################## - # -@@ -96,9 +96,9 @@ BSP_INC_DIR =$(BSP_DIR)\include - # - ######################################################################## - --GEN_DIR =$(BUILD_ROOT)\$(GEN) --GEN_SRC_DIR =$(GEN_DIR)\source --GEN_INC_DIR =$(GEN_DIR)\include -+GEN_DIR =$(BUILD_ROOT)/$(GEN) -+GEN_SRC_DIR =$(GEN_DIR)/source -+GEN_INC_DIR =$(GEN_DIR)/include - - ######################################################################## - # -@@ -151,6 +151,6 @@ endif - # - ######################################################################## - --TARGET_CSP_LIB =$(CSP_LIB_DIR)\$(CSP_ARCHIVE) --TARGET_BSP_LIB =$(BSP_LIB_DIR)\$(BSP_ARCHIVE) --TARGET_GEN_LIB =$(GEN_LIB_DIR)\$(GEN_ARCHIVE) -+TARGET_CSP_LIB =$(CSP_LIB_DIR)/$(CSP_ARCHIVE) -+TARGET_BSP_LIB =$(BSP_LIB_DIR)/$(BSP_ARCHIVE) -+TARGET_GEN_LIB =$(GEN_LIB_DIR)/$(GEN_ARCHIVE) -diff --git a/makerule/lpc32xx/make.lpc32xx.gnu b/makerule/lpc32xx/make.lpc32xx.gnu -index 3277d99..d80b98d 100644 ---- a/makerule/lpc32xx/make.lpc32xx.gnu -+++ b/makerule/lpc32xx/make.lpc32xx.gnu -@@ -19,7 +19,7 @@ - # use without further testing or modification. - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.environment -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.environment - - CPU = arm926ej-s - CFLAGS = -mcpu=arm926ej-s -Wall -Os -diff --git a/makerule/lpc32xx/make.lpc32xx.iar b/makerule/lpc32xx/make.lpc32xx.iar -index 238ebbf..27d163f 100644 ---- a/makerule/lpc32xx/make.lpc32xx.iar -+++ b/makerule/lpc32xx/make.lpc32xx.iar -@@ -19,12 +19,12 @@ - # use without further testing or modification. - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.environment -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.environment - --IARBASE = $(IAR_ROOT)\ARM --IARTOOLS = $(IARBASE)\bin --IAR_LIB = $(IARBASE)\lib --IAR_INC = $(IARBASE)\inc -+IARBASE = $(IAR_ROOT)/ARM -+IARTOOLS = $(IARBASE)/bin -+IAR_LIB = $(IARBASE)/lib -+IAR_INC = $(IARBASE)/inc - CC = iccarm - CCP = iccarm - AS = iasmarm -@@ -36,7 +36,7 @@ CFLAGS += -I"$(IAR_INC)" - AFLAGS = --cpu 5TEJ - LDFLAGS = - LK = "$(TARGET_GEN_LIB)" "$(TARGET_CSP_LIB)" "$(TARGET_BSP_LIB)" --;LK += "$(IAR_LIB)\dl4tpannl8f.r79" -+;LK += "$(IAR_LIB)/dl4tpannl8f.r79" - MAP = --map - LDESC = --config - ENTRY = --entry -diff --git a/makerule/lpc32xx/make.lpc32xx.keil b/makerule/lpc32xx/make.lpc32xx.keil -index dd27583..7334d3f 100644 ---- a/makerule/lpc32xx/make.lpc32xx.keil -+++ b/makerule/lpc32xx/make.lpc32xx.keil -@@ -19,7 +19,7 @@ - # use without further testing or modification. - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.environment -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.environment - - CC =armcc - CCP =armcc -@@ -27,11 +27,11 @@ AS =armasm - LD =armlink - AR =armar -r -s - CFLAGS =--arm -O3 -g --device DARMP3 -D__MICROLIB --CFLAGS +=-I$(KEIL_RVCT)\inc -I$(CSP_INC_DIR) -I$(BSP_INC_DIR) -I$(GEN_INC_DIR) -+CFLAGS +=-I$(KEIL_RVCT)/inc -I$(CSP_INC_DIR) -I$(BSP_INC_DIR) -I$(GEN_INC_DIR) - AFLAGS =--arm --device=DARMP3 - AFLAGS +=-I$(CSP_INC_DIR) -I$(BSP_INC_DIR) -I$(GEN_INC_DIR) - LDFLAGS =--noremove --LK =--device DARMP3 --libpath $(KEIL_RVCT)\lib --scan $(TARGET_CSP_LIB) -+LK =--device DARMP3 --libpath $(KEIL_RVCT)/lib --scan $(TARGET_CSP_LIB) - LK +=--scan $(TARGET_BSP_LIB) - LK +=--scan $(TARGET_GEN_LIB) - MAP =--map --list -diff --git a/makerule/lpc32xx/make.lpc32xx.rvw b/makerule/lpc32xx/make.lpc32xx.rvw -index 59961dd..2419976 100644 ---- a/makerule/lpc32xx/make.lpc32xx.rvw -+++ b/makerule/lpc32xx/make.lpc32xx.rvw -@@ -19,7 +19,7 @@ - # use without further testing or modification. - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.environment -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.environment - - CC =armcc - CCP =armcpp --- -1.7.7.3 - diff --git a/buildroot/boot/lpc32xxcdl/Config.in b/buildroot/boot/lpc32xxcdl/Config.in deleted file mode 100644 index 97137aa7d4..0000000000 --- a/buildroot/boot/lpc32xxcdl/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_TARGET_LPC32XXCDL - bool "LPC32XX CDL (kickstart and S1L)" - depends on BR2_arm926t - -if BR2_TARGET_LPC32XXCDL - -config BR2_TARGET_LPC32XXCDL_BOARDNAME - string "LPC32xx board name" - -endif #BR2_TARGET_LPC32XXCDL diff --git a/buildroot/boot/lpc32xxcdl/lpc32xxcdl.hash b/buildroot/boot/lpc32xxcdl/lpc32xxcdl.hash deleted file mode 100644 index 8c6b73d63f..0000000000 --- a/buildroot/boot/lpc32xxcdl/lpc32xxcdl.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 ded3fa936a96d3fb8188ca6214f57b5208bd49e5416bd69f38bfc810b34197bc lpc32xx_cdl-v2.11.zip diff --git a/buildroot/boot/lpc32xxcdl/lpc32xxcdl.mk b/buildroot/boot/lpc32xxcdl/lpc32xxcdl.mk deleted file mode 100644 index 9f5cd27f50..0000000000 --- a/buildroot/boot/lpc32xxcdl/lpc32xxcdl.mk +++ /dev/null @@ -1,71 +0,0 @@ -################################################################################ -# -# lpc32xxcdl -# -################################################################################ - -LPC32XXCDL_VERSION = 2.11 -LPC32XXCDL_SOURCE = lpc32xx_cdl-v$(LPC32XXCDL_VERSION).zip -LPC32XXCDL_SITE = https://community.nxp.com/pwmxy87654/attachments/pwmxy87654/lpcware-archive/61/2 - -LPC32XXCDL_INSTALL_TARGET = NO -LPC32XXCDL_INSTALL_IMAGES = YES - -ifeq ($(BR2_TARGET_LPC32XXCDL_BOARDNAME),"ea3250") -LPC32XXCDL_KICKSTART = kickstart/nand -LPC32XXCDL_KICKSTART_BURNER = nand/kickstart -LPC32XXCDL_S1L = s1l -LPC32XXCDL_S1L_BURNER = nand/s1lapp -endif - -ifeq ($(BR2_TARGET_LPC32XXCDL_BOARDNAME),"phy3250") -LPC32XXCDL_KICKSTART = kickstart/kickstart_nand -LPC32XXCDL_KICKSTART_BURNER = nand/kickstart -LPC32XXCDL_S1L = s1l/s1l_nand_boot -LPC32XXCDL_S1L_BURNER = nand/s1lapp -endif - -ifeq ($(BR2_TARGET_LPC32XXCDL_BOARDNAME),"fdi3250") -LPC32XXCDL_KICKSTART = kickstart/nand -LPC32XXCDL_KICKSTART_BURNER = nand/kickstart_jtag -LPC32XXCDL_S1L = s1l -LPC32XXCDL_S1L_BURNER = nand/s1lapp_jtag -endif - -LPC32XXCDL_BUILD_FLAGS = \ - CROSS_COMPILE=$(TARGET_CROSS) \ - NXPMCU_WINBASE=$(@D) \ - NXPMCU_SOFTWARE=$(@D) \ - BSP=$(BR2_TARGET_LPC32XXCDL_BOARDNAME) \ - CSP=lpc32xx TOOL=gnu GEN=lpc - -LPC32XXCDL_BOARD_STARTUP_DIR = \ - csps/lpc32xx/bsps/$(BR2_TARGET_LPC32XXCDL_BOARDNAME)/startup/examples/ - -# Source files are with dos newlines, which our patch infrastructure doesn't -# handle. Work around it by converting the affected files to unix newlines -# before patching -define LPC32XXCDL_EXTRACT_CMDS - unzip $(LPC32XXCDL_DL_DIR)/$(LPC32XXCDL_SOURCE) -d $(@D) - mv $(@D)/lpc3xxx_cdl/* $(@D) - rmdir $(@D)/lpc3xxx_cdl/ - sed -n 's|^[+-]\{3\} [^/]\+\([^ \t]*\)\(.*\)|$(@D)\1|p' \ - boot/lpc32xxcdl/*.patch| sort -u | xargs $(SED) 's/\x0D$$//' -endef - -define LPC32XXCDL_BUILD_CMDS - $(MAKE1) $(LPC32XXCDL_BUILD_FLAGS) -C $(@D) - $(MAKE1) $(LPC32XXCDL_BUILD_FLAGS) -C $(@D)/$(LPC32XXCDL_BOARD_STARTUP_DIR)/Burners/$(LPC32XXCDL_KICKSTART_BURNER) - $(MAKE1) $(LPC32XXCDL_BUILD_FLAGS) -C $(@D)/$(LPC32XXCDL_BOARD_STARTUP_DIR)/$(LPC32XXCDL_KICKSTART) - $(MAKE1) $(LPC32XXCDL_BUILD_FLAGS) -C $(@D)/$(LPC32XXCDL_BOARD_STARTUP_DIR)/Burners/$(LPC32XXCDL_S1L_BURNER) - $(MAKE1) $(LPC32XXCDL_BUILD_FLAGS) -C $(@D)/$(LPC32XXCDL_BOARD_STARTUP_DIR)/$(LPC32XXCDL_S1L) -endef - -define LPC32XXCDL_INSTALL_IMAGES_CMDS - cp $(@D)/$(LPC32XXCDL_BOARD_STARTUP_DIR)/Burners/$(LPC32XXCDL_KICKSTART_BURNER)/*gnu.bin $(BINARIES_DIR) - cp $(@D)/$(LPC32XXCDL_BOARD_STARTUP_DIR)/$(LPC32XXCDL_KICKSTART)/*gnu.bin $(BINARIES_DIR) - cp $(@D)/$(LPC32XXCDL_BOARD_STARTUP_DIR)/Burners/$(LPC32XXCDL_S1L_BURNER)/*gnu.bin $(BINARIES_DIR) - cp $(@D)/$(LPC32XXCDL_BOARD_STARTUP_DIR)/$(LPC32XXCDL_S1L)/*gnu.bin $(BINARIES_DIR) -endef - -$(eval $(generic-package)) diff --git a/buildroot/boot/mv-ddr-marvell/0001-Allow-access-to-low-addresses-with-gcc-12.patch b/buildroot/boot/mv-ddr-marvell/0001-Allow-access-to-low-addresses-with-gcc-12.patch new file mode 100644 index 0000000000..5a623f28f9 --- /dev/null +++ b/buildroot/boot/mv-ddr-marvell/0001-Allow-access-to-low-addresses-with-gcc-12.patch @@ -0,0 +1,49 @@ +From 4796a1eacc6a5ccb623e7d2e46a5196f8335e496 Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Fri, 11 Aug 2023 11:19:49 +0300 +Subject: [PATCH] Allow access to low addresses with gcc 12 + +gcc 12 added a warning that triggers on access to low addresses. Add a +compile option that allows access to lower addresses. + +Add the 'cc_option' macro to avoid the compile option when the compiler +does not support it. + +This fixes build with TF-A. TF-A added a similar fix in commit +dea23e245fb89. + +See some more details in +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105523 + +Upstream: https://github.com/MarvellEmbeddedProcessors/mv-ddr-marvell/pull/42 +Signed-off-by: Baruch Siach +--- + Makefile | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/Makefile b/Makefile +index 3f0dd89a7381..045284c30cbc 100644 +--- a/Makefile ++++ b/Makefile +@@ -108,6 +108,10 @@ MV_DDR_VER_CSRC = mv_ddr_build_message.c + # create mv_ddr build message and version string source file + $(shell $(MV_DDR_ROOT)/scripts/localversion.sh $(MV_DDR_ROOT) $(MV_DDR_VER_CSRC) 2> /dev/null) + ++define cc_option ++ $(shell if $(CC) $(1) -c -x c /dev/null -o /dev/null >/dev/null 2>&1; then echo $(1); fi ) ++endef ++ + # ****************** + # U-BOOT SPL SUPPORT + # ****************** +@@ -331,6 +335,7 @@ OBJ_DIR ?= $(MV_DDR_ROOT) + CFLAGS = -DMV_DDR_ATF -DCONFIG_DDR4 + CFLAGS += -Wall -Werror -Os -ffreestanding -mlittle-endian -g -gdwarf-2 -nostdinc + CFLAGS += -march=armv8-a -fpie ++CFLAGS += $(call cc_option, --param=min-pagesize=0) + + # PLATFORM is set in ble/ble.mk + ifneq ($(findstring a80x0,$(PLATFORM)),) +-- +2.40.1 + diff --git a/buildroot/boot/mv-ddr-marvell/0002-Makefile-disable-stack-protection.patch b/buildroot/boot/mv-ddr-marvell/0002-Makefile-disable-stack-protection.patch new file mode 100644 index 0000000000..626279eb47 --- /dev/null +++ b/buildroot/boot/mv-ddr-marvell/0002-Makefile-disable-stack-protection.patch @@ -0,0 +1,33 @@ +From 53e34e3bff26fcbb7cc14178fa9fc80e7a73d556 Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Tue, 11 Oct 2022 16:34:44 +0300 +Subject: [PATCH] Makefile: disable stack protection + +The Buildroot toolchain might enable stack protection by default. That +breaks linking because ATF does not provide the required __stack_chk +routines. + +The mv-ddr-marvell Makefile provides no way to add custom CFLAGS. Patch +Makefile to disable stack protection. + +Upstream: not applicable; Buildroot specific +Signed-off-by: Baruch Siach +--- + Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile b/Makefile +index 045284c30cbc..9641354bcf86 100644 +--- a/Makefile ++++ b/Makefile +@@ -336,6 +336,7 @@ CFLAGS = -DMV_DDR_ATF -DCONFIG_DDR4 + CFLAGS += -Wall -Werror -Os -ffreestanding -mlittle-endian -g -gdwarf-2 -nostdinc + CFLAGS += -march=armv8-a -fpie + CFLAGS += $(call cc_option, --param=min-pagesize=0) ++CFLAGS += -fno-stack-protector + + # PLATFORM is set in ble/ble.mk + ifneq ($(findstring a80x0,$(PLATFORM)),) +-- +2.40.1 + diff --git a/buildroot/boot/mv-ddr-marvell/mv-ddr-marvell.hash b/buildroot/boot/mv-ddr-marvell/mv-ddr-marvell.hash index 5bfae8af45..75e87d833d 100644 --- a/buildroot/boot/mv-ddr-marvell/mv-ddr-marvell.hash +++ b/buildroot/boot/mv-ddr-marvell/mv-ddr-marvell.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 bfab74a625d65238c569b9df282b55c0fc9a1e2d3decedcf194d44774df2ede4 mv-ddr-marvell-305d923e6bc4236cd3b902f6679b0aef9e5fa52d.tar.gz -sha256 48bb930b6fbc3f5db72e29c849b096df3868e4a6d2bdc0e2dd3365c768241cd5 ddr3_init.c +sha256 16f02232e21a15979b3d9971e28f7e59562484a5c1f99c2b28c248a3b76a63fa mv-ddr-marvell-d5acc10c287e40cc2feeb28710b92e45c93c702c.tar.gz +sha256 907a03943ca940790e97620aca8d46b5b04c653dcf2ab6c66a25238b60cf5635 ddr3_init.c diff --git a/buildroot/boot/mv-ddr-marvell/mv-ddr-marvell.mk b/buildroot/boot/mv-ddr-marvell/mv-ddr-marvell.mk index 442b6aed53..e05192fe9b 100644 --- a/buildroot/boot/mv-ddr-marvell/mv-ddr-marvell.mk +++ b/buildroot/boot/mv-ddr-marvell/mv-ddr-marvell.mk @@ -4,8 +4,8 @@ # ################################################################################ -# This is the latest commit on mv-ddr-devel as of 20201207 -MV_DDR_MARVELL_VERSION = 305d923e6bc4236cd3b902f6679b0aef9e5fa52d +# This is the latest commit on mv-ddr-devel as of 20220529 +MV_DDR_MARVELL_VERSION = d5acc10c287e40cc2feeb28710b92e45c93c702c MV_DDR_MARVELL_SITE = $(call github,MarvellEmbeddedProcessors,mv-ddr-marvell,$(MV_DDR_MARVELL_VERSION)) MV_DDR_MARVELL_LICENSE = GPL-2.0+ or LGPL-2.1 with freertos-exception-2.0, BSD-3-Clause, Marvell Commercial MV_DDR_MARVELL_LICENSE_FILES = ddr3_init.c diff --git a/buildroot/boot/mxs-bootlets/Config.in b/buildroot/boot/mxs-bootlets/Config.in index b3e392afa8..8f9334b610 100644 --- a/buildroot/boot/mxs-bootlets/Config.in +++ b/buildroot/boot/mxs-bootlets/Config.in @@ -1,6 +1,8 @@ config BR2_TARGET_MXS_BOOTLETS bool "mxs-bootlets" depends on BR2_arm + depends on BR2_TARGET_BAREBOX || BR2_LINUX_KERNEL || \ + BR2_TARGET_UBOOT help Stage1 bootloaders for Freescale iMX23/iMX28 SoCs diff --git a/buildroot/boot/opensbi/0.9/0001-Makefile-Don-t-specify-mabi-or-march.patch b/buildroot/boot/opensbi/0.9/0001-Makefile-Don-t-specify-mabi-or-march.patch deleted file mode 100644 index 5f554a6c24..0000000000 --- a/buildroot/boot/opensbi/0.9/0001-Makefile-Don-t-specify-mabi-or-march.patch +++ /dev/null @@ -1,37 +0,0 @@ -From f5871e1f3650d6c8a032928cb5d8ca00c275c377 Mon Sep 17 00:00:00 2001 -From: Alistair Francis -Date: Fri, 15 Feb 2019 14:57:41 -0800 -Subject: [PATCH] Makefile: Don't specify mabi or march - -To avoid - can't link double-float modules with soft-float modules -errors when building 32-bit openSBI don't specify mabi or march. - -Signed-off-by: Alistair Francis ---- - Makefile | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/Makefile b/Makefile -index ae68f55..10851fc 100644 ---- a/Makefile -+++ b/Makefile -@@ -145,7 +145,6 @@ GENFLAGS += $(firmware-genflags-y) - CFLAGS = -g -Wall -Werror -nostdlib -fno-strict-aliasing -O2 - CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls - CFLAGS += -mno-save-restore -mstrict-align --CFLAGS += -mabi=$(PLATFORM_RISCV_ABI) -march=$(PLATFORM_RISCV_ISA) - CFLAGS += -mcmodel=$(PLATFORM_RISCV_CODE_MODEL) - CFLAGS += $(GENFLAGS) - CFLAGS += $(platform-cflags-y) -@@ -158,7 +157,6 @@ CPPFLAGS += $(firmware-cppflags-y) - ASFLAGS = -g -Wall -nostdlib -D__ASSEMBLY__ - ASFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls - ASFLAGS += -mno-save-restore -mstrict-align --ASFLAGS += -mabi=$(PLATFORM_RISCV_ABI) -march=$(PLATFORM_RISCV_ISA) - ASFLAGS += -mcmodel=$(PLATFORM_RISCV_CODE_MODEL) - ASFLAGS += $(GENFLAGS) - ASFLAGS += $(platform-asflags-y) --- -2.20.1 - diff --git a/buildroot/boot/opensbi/0.9/0002-Makefile-unconditionally-disable-SSP.patch b/buildroot/boot/opensbi/0.9/0002-Makefile-unconditionally-disable-SSP.patch deleted file mode 100644 index c4edd37f1a..0000000000 --- a/buildroot/boot/opensbi/0.9/0002-Makefile-unconditionally-disable-SSP.patch +++ /dev/null @@ -1,53 +0,0 @@ -From e389d5fbc296e496db15368b2b621e0f178f7f34 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 8 May 2021 21:28:10 +0200 -Subject: [PATCH] Makefile: unconditionally disable SSP - -Though -nostdlib is passed in {C,+AS,DTSCPP}FLAGS, -fno-stack-protector -must also be passed to avoid linking errors related to undefined -references to '__stack_chk_guard' and '__stack_chk_fail' if toolchain -enforces -fstack-protector. - -Fixes: - - https://gitlab.com/kubu93/buildroot/-/jobs/1247043359 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/riscv/opensbi/pull/211] ---- - Makefile | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Makefile b/Makefile -index eeffe6b..1419360 100644 ---- a/Makefile -+++ b/Makefile -@@ -203,7 +203,7 @@ GENFLAGS += $(libsbiutils-genflags-y) - GENFLAGS += $(platform-genflags-y) - GENFLAGS += $(firmware-genflags-y) - --CFLAGS = -g -Wall -Werror -ffreestanding -nostdlib -fno-strict-aliasing -O2 -+CFLAGS = -g -Wall -Werror -ffreestanding -nostdlib -fno-stack-protector -fno-strict-aliasing -O2 - CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls - CFLAGS += -mno-save-restore -mstrict-align - CFLAGS += -mabi=$(PLATFORM_RISCV_ABI) -march=$(PLATFORM_RISCV_ISA) -@@ -217,7 +217,7 @@ CPPFLAGS += $(GENFLAGS) - CPPFLAGS += $(platform-cppflags-y) - CPPFLAGS += $(firmware-cppflags-y) - --ASFLAGS = -g -Wall -nostdlib -D__ASSEMBLY__ -+ASFLAGS = -g -Wall -nostdlib -fno-stack-protector -D__ASSEMBLY__ - ASFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls - ASFLAGS += -mno-save-restore -mstrict-align - ASFLAGS += -mabi=$(PLATFORM_RISCV_ABI) -march=$(PLATFORM_RISCV_ISA) -@@ -236,7 +236,7 @@ MERGEFLAGS += -r - MERGEFLAGS += -b elf$(PLATFORM_RISCV_XLEN)-littleriscv - MERGEFLAGS += -m elf$(PLATFORM_RISCV_XLEN)lriscv - --DTSCPPFLAGS = $(CPPFLAGS) -nostdinc -nostdlib -fno-builtin -D__DTS__ -x assembler-with-cpp -+DTSCPPFLAGS = $(CPPFLAGS) -nostdinc -nostdlib -fno-stack-protector -fno-builtin -D__DTS__ -x assembler-with-cpp - - # Setup functions for compilation - define dynamic_flags --- -2.30.2 - diff --git a/buildroot/boot/opensbi/Config.in b/buildroot/boot/opensbi/Config.in index f1443498d9..de2f0aae20 100644 --- a/buildroot/boot/opensbi/Config.in +++ b/buildroot/boot/opensbi/Config.in @@ -19,7 +19,7 @@ choice Select the specific OpenSBI version you want to use config BR2_TARGET_OPENSBI_LATEST_VERSION - bool "0.9" + bool "1.3" config BR2_TARGET_OPENSBI_CUSTOM_VERSION bool "Custom version" @@ -57,10 +57,10 @@ endif config BR2_TARGET_OPENSBI_VERSION string - default "0.9" if BR2_TARGET_OPENSBI_LATEST_VERSION + default "1.3" if BR2_TARGET_OPENSBI_LATEST_VERSION default BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE \ if BR2_TARGET_OPENSBI_CUSTOM_VERSION - default "custom" if BR2_TARGET_OPENSBI_CUSTOM_TARBALL + default "custom" if BR2_TARGET_OPENSBI_CUSTOM_TARBALL default BR2_TARGET_OPENSBI_CUSTOM_REPO_VERSION \ if BR2_TARGET_OPENSBI_CUSTOM_GIT @@ -119,4 +119,10 @@ config BR2_TARGET_OPENSBI_FW_FDT_PATH must be set in the U-Boot configuration for this file to be produced. +config BR2_TARGET_OPENSBI_ADDITIONAL_VARIABLES + string "Additional build variables" + help + Additional parameters for the build, which will be passed on + the make command line. E.g: BUILD_INFO=1. + endif diff --git a/buildroot/boot/opensbi/opensbi.hash b/buildroot/boot/opensbi/opensbi.hash index 3b6d97c42d..980fb141dc 100644 --- a/buildroot/boot/opensbi/opensbi.hash +++ b/buildroot/boot/opensbi/opensbi.hash @@ -1,3 +1,3 @@ # locally computed -sha256 60f995cb3cd03e3cf5e649194d3395d0fe67499fd960a36cf7058a4efde686f0 opensbi-0.9.tar.gz +sha256 2c0501eb3475f463b15f5b8531996f64604ea49e0e3ed040ecbd1fc27ecd8c5c opensbi-1.3.tar.gz sha256 82d13fb1bf6bb162629deeea9eb9c117e74548d3b707e478967691fe79a68e21 COPYING.BSD diff --git a/buildroot/boot/opensbi/opensbi.mk b/buildroot/boot/opensbi/opensbi.mk index 8e055633a8..dd113a0bf8 100644 --- a/buildroot/boot/opensbi/opensbi.mk +++ b/buildroot/boot/opensbi/opensbi.mk @@ -6,7 +6,7 @@ OPENSBI_VERSION = $(call qstrip,$(BR2_TARGET_OPENSBI_VERSION)) -ifeq ($(OPENSBI_VERSION),custom) +ifeq ($(BR2_TARGET_OPENSBI_CUSTOM_TARBALL),y) # Handle custom OpenSBI tarballs as specified by the configuration OPENSBI_TARBALL = $(call qstrip,$(BR2_TARGET_OPENSBI_CUSTOM_TARBALL_LOCATION)) OPENSBI_SITE = $(patsubst %/,%,$(dir $(OPENSBI_TARBALL))) @@ -31,7 +31,8 @@ BR_NO_CHECK_HASH_FOR += $(OPENSBI_SOURCE) endif OPENSBI_MAKE_ENV = \ - CROSS_COMPILE=$(TARGET_CROSS) + CROSS_COMPILE=$(TARGET_CROSS) \ + $(call qstrip,$(BR2_TARGET_OPENSBI_ADDITIONAL_VARIABLES)) OPENSBI_PLAT = $(call qstrip,$(BR2_TARGET_OPENSBI_PLAT)) ifneq ($(OPENSBI_PLAT),) @@ -70,6 +71,7 @@ OPENSBI_INSTALL_IMAGES = YES OPENSBI_FW_IMAGES += payload endif +ifneq ($(OPENSBI_PLAT),) define OPENSBI_INSTALL_IMAGES_CMDS $(foreach f,$(OPENSBI_FW_IMAGES),\ $(INSTALL) -m 0644 -D $(@D)/build/platform/$(OPENSBI_PLAT)/firmware/fw_$(f).bin \ @@ -78,6 +80,7 @@ define OPENSBI_INSTALL_IMAGES_CMDS $(BINARIES_DIR)/fw_$(f).elf ) endef +endif # libsbi.a is not a library meant to be linked in user-space code, but # with bare metal code, which is why we don't install it in diff --git a/buildroot/boot/optee-os/Config.in b/buildroot/boot/optee-os/Config.in index ea16550b72..cc0044f00a 100644 --- a/buildroot/boot/optee-os/Config.in +++ b/buildroot/boot/optee-os/Config.in @@ -1,6 +1,6 @@ config BR2_TARGET_OPTEE_OS bool "optee_os" - depends on BR2_ARM_CPU_ARMV8A || BR2_ARM_CPU_ARMV7A + depends on BR2_ARM_CPU_ARMV8A || BR2_ARM_CPU_ARMV7A || BR2_RISCV_64 help OP-TEE OS provides the secure world boot image and the trust application development kit of the OP-TEE project. OP-TEE OS @@ -13,16 +13,29 @@ if BR2_TARGET_OPTEE_OS choice prompt "OP-TEE OS version" - default BR2_TARGET_OPTEE_OS_LATEST + default BR2_TARGET_OPTEE_OS_LATEST if BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS help Select the version of OP-TEE OS you want to use config BR2_TARGET_OPTEE_OS_LATEST - bool "3.15.0" + bool "4.3.0" + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS + select BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY help Use the latest release tag from the OP-TEE OS official Git repository. +config BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL + bool "Custom tarball" + help + This option allows to specify a URL pointing to an OP-TEE OS + source tarball. This URL can use any protocol recognized by + Buildroot, like http://, ftp://, file:// or scp://. + + When pointing to a local tarball using file://, you may want + to use a make variable like $(TOPDIR) to reference the root of + the Buildroot tree. + config BR2_TARGET_OPTEE_OS_CUSTOM_GIT bool "Custom Git repository" help @@ -30,6 +43,13 @@ config BR2_TARGET_OPTEE_OS_CUSTOM_GIT endchoice +if BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL + +config BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL_LOCATION + string "URL of custom OP-TEE OS tarball" + +endif + if BR2_TARGET_OPTEE_OS_CUSTOM_GIT config BR2_TARGET_OPTEE_OS_CUSTOM_REPO_URL @@ -50,7 +70,8 @@ endif config BR2_TARGET_OPTEE_OS_VERSION string - default "3.15.0" if BR2_TARGET_OPTEE_OS_LATEST + default "4.3.0" if BR2_TARGET_OPTEE_OS_LATEST + default "custom" if BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL default BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION \ if BR2_TARGET_OPTEE_OS_CUSTOM_GIT @@ -61,6 +82,21 @@ config BR2_TARGET_OPTEE_OS_NEEDS_DTC Select this option if your OP-TEE OS platform configuration requires the Device Tree compiler to be available. +config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY + bool "OP-TEE OS needs host-python-cryptography" + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS + help + OP-TEE OS version below 3.16 used python-pycryptodomex + package in python scripts. Newer version uses + python-cryptography. Select this option if optee-os needs + python-cryptography to be built. + +config BR2_TARGET_OPTEE_OS_NEEDS_CMAKE + bool "OP-TEE OS needs cmake" + help + Select this option if your OP-TEE OS platform configuration + requires the cmake build system to be available. + config BR2_TARGET_OPTEE_OS_CORE bool "Build core" default y @@ -100,6 +136,18 @@ config BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR Value for the optional PLATFORM_FLAVOR build directive provided to OP-TEE OS. +config BR2_TARGET_OPTEE_OS_CUSTOM_DTS_PATH + string "Device Tree Source file paths" + help + Space-separated list of paths to device tree source files + that will be copied to core/arch/arm/dts/ before starting + the build. + + To use this device tree source file, the OP-TEE OS + configuration must refer to it with the + CFG_EMBED_DTB_SOURCE_FILE option and no platform flavor + needs to be specified. + config BR2_TARGET_OPTEE_OS_ADDITIONAL_VARIABLES string "Additional build variables" help diff --git a/buildroot/boot/optee-os/optee-os.hash b/buildroot/boot/optee-os/optee-os.hash index 3c32e25b36..16b3d7430e 100644 --- a/buildroot/boot/optee-os/optee-os.hash +++ b/buildroot/boot/optee-os/optee-os.hash @@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_os/archive/3.15.0/optee-os-3.15.0.tar.gz -sha256 e5bb3d9eedaf7785af091602addac5b52118f4cdc108af9cd6f6c96b21503ab8 optee-os-3.15.0.tar.gz +# From https://github.com/OP-TEE/optee_os/archive/4.3.0/optee-os-4.3.0.tar.gz +sha256 390b271905c828d6def9fa6a77bbaa425f3b434d733c8eb18f582ccbc6896096 optee-os-4.3.0.tar.gz # Locally computed -sha256 1247ee90858f4037b6cac63cbffddfed435d0d73c631b37d78c1e6e6ab3e5d1a LICENSE +sha256 1247ee90858f4037b6cac63cbffddfed435d0d73c631b37d78c1e6e6ab3e5d1a LICENSE diff --git a/buildroot/boot/optee-os/optee-os.mk b/buildroot/boot/optee-os/optee-os.mk index 9f76d8450e..883f166fc1 100644 --- a/buildroot/boot/optee-os/optee-os.mk +++ b/buildroot/boot/optee-os/optee-os.mk @@ -13,15 +13,32 @@ endif OPTEE_OS_INSTALL_STAGING = YES OPTEE_OS_INSTALL_IMAGES = YES -ifeq ($(BR2_TARGET_OPTEE_OS_CUSTOM_GIT),y) +ifeq ($(BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL),y) +OPTEE_OS_TARBALL = $(call qstrip,$(BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL_LOCATION)) +OPTEE_OS_SITE = $(patsubst %/,%,$(dir $(OPTEE_OS_TARBALL))) +OPTEE_OS_SOURCE = $(notdir $(OPTEE_OS_TARBALL)) +else ifeq ($(BR2_TARGET_OPTEE_OS_CUSTOM_GIT),y) OPTEE_OS_SITE = $(call qstrip,$(BR2_TARGET_OPTEE_OS_CUSTOM_REPO_URL)) OPTEE_OS_SITE_METHOD = git -BR_NO_CHECK_HASH_FOR += $(OPTEE_OS_SOURCE) else OPTEE_OS_SITE = $(call github,OP-TEE,optee_os,$(OPTEE_OS_VERSION)) endif -OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pycryptodomex host-python-pyelftools +ifeq ($(BR2_TARGET_OPTEE_OS):$(BR2_TARGET_OPTEE_OS_LATEST),y:) +BR_NO_CHECK_HASH_FOR += $(OPTEE_OS_SOURCE) +endif + +OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pyelftools + +ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_CMAKE),y) +OPTEE_OS_DEPENDENCIES += $(BR2_CMAKE_HOST_DEPENDENCY) +endif + +ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY),y) +OPTEE_OS_DEPENDENCIES += host-python-cryptography +else +OPTEE_OS_DEPENDENCIES += host-python-pycryptodomex +endif ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_DTC),y) OPTEE_OS_DEPENDENCIES += host-dtc @@ -37,18 +54,28 @@ OPTEE_OS_MAKE_OPTS = \ CROSS_COMPILE_core="$(TARGET_CROSS)" \ CROSS_COMPILE_ta_arm64="$(TARGET_CROSS)" \ CROSS_COMPILE_ta_arm32="$(TARGET_CROSS)" \ + CROSS_COMPILE_ta_rv64="$(TARGET_CROSS)" \ PYTHON3="$(HOST_DIR)/bin/python3" +ifeq ($(BR2_riscv),y) +OPTEE_OS_MAKE_OPTS += \ + ARCH=riscv \ + CFG_RV64_core=y \ + CFG_USER_TA_TARGETS=ta_rv64 +else ifeq ($(BR2_aarch64),y) OPTEE_OS_MAKE_OPTS += \ + ARCH=arm \ CFG_ARM64_core=y \ CFG_USER_TA_TARGETS=ta_arm64 else OPTEE_OS_MAKE_OPTS += \ + ARCH=arm \ CFG_ARM32_core=y endif +endif -# Get mandatory PLAFORM and optional PLATFORM_FLAVOR and additional +# Get mandatory PLATFORM and optional PLATFORM_FLAVOR and additional # variables OPTEE_OS_MAKE_OPTS += PLATFORM=$(call qstrip,$(BR2_TARGET_OPTEE_OS_PLATFORM)) ifneq ($(call qstrip,$(BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR)),) @@ -60,6 +87,10 @@ OPTEE_OS_MAKE_OPTS += $(call qstrip,$(BR2_TARGET_OPTEE_OS_ADDITIONAL_VARIABLES)) # root path otherwise the output directory path depends on the target # platform name. OPTEE_OS_BUILDDIR_OUT = out +ifeq ($(BR2_riscv),y) +OPTEE_OS_LOCAL_SDK = $(OPTEE_OS_BUILDDIR_OUT)/export-ta_rv64 +OPTEE_OS_SDK = $(STAGING_DIR)/lib/optee/export-ta_rv64 +endif ifeq ($(BR2_aarch64),y) OPTEE_OS_LOCAL_SDK = $(OPTEE_OS_BUILDDIR_OUT)/export-ta_arm64 OPTEE_OS_SDK = $(STAGING_DIR)/lib/optee/export-ta_arm64 @@ -71,6 +102,8 @@ endif OPTEE_OS_IMAGE_FILES = $(call qstrip,$(BR2_TARGET_OPTEE_OS_CORE_IMAGES)) +OPTEE_OS_CUSTOM_DTS_PATH = $(call qstrip,$(BR2_TARGET_OPTEE_OS_CUSTOM_DTS_PATH)) + ifeq ($(BR2_TARGET_OPTEE_OS_CORE),y) define OPTEE_OS_BUILD_CORE $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) O=$(OPTEE_OS_BUILDDIR_OUT) \ @@ -107,6 +140,9 @@ endef endif # BR2_TARGET_OPTEE_OS_SDK define OPTEE_OS_BUILD_CMDS + $(if $(OPTEE_OS_CUSTOM_DTS_PATH), + cp -f $(OPTEE_OS_CUSTOM_DTS_PATH) $(@D)/core/arch/arm/dts/ + ) $(OPTEE_OS_BUILD_CORE) $(OPTEE_OS_BUILD_SDK) endef @@ -120,6 +156,19 @@ ifeq ($(BR2_TARGET_OPTEE_OS)$(BR_BUILDING),yy) ifeq ($(call qstrip,$(BR2_TARGET_OPTEE_OS_PLATFORM)),) $(error No OP-TEE OS platform set. Check your BR2_TARGET_OPTEE_OS_PLATFORM setting) endif + +ifeq ($(BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL),y) +ifeq ($(call qstrip,$(BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL_LOCATION)),) +$(error No tarball location specified. Please check BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL_LOCATION) +endif +endif + +ifeq ($(BR2_TARGET_OPTEE_OS_CUSTOM_GIT),y) +ifeq ($(call qstrip,$(BR2_TARGET_OPTEE_OS_CUSTOM_REPO_URL)),) +$(error No repository specified. Please check BR2_TARGET_OPTEE_OS_CUSTOM_REPO_URL) +endif +endif + endif # BR2_TARGET_OPTEE_OS && BR2_BUILDING $(eval $(generic-package)) diff --git a/buildroot/boot/s500-bootloader/s500-bootloader.hash b/buildroot/boot/s500-bootloader/s500-bootloader.hash index d538f23b2a..2ebd933e52 100644 --- a/buildroot/boot/s500-bootloader/s500-bootloader.hash +++ b/buildroot/boot/s500-bootloader/s500-bootloader.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 b183024ac69f51ea7befd28d03b2ec35a7280e270405600fb4f37aa91d9c9571 s500-bootloader-a8d7fa1d9a7f353ec4613febf30f4ca99a10a106.tar.gz +sha256 b183024ac69f51ea7befd28d03b2ec35a7280e270405600fb4f37aa91d9c9571 s500-bootloader-a8d7fa1d9a7f353ec4613febf30f4ca99a10a106.tar.gz diff --git a/buildroot/boot/shim/shim.hash b/buildroot/boot/shim/shim.hash index 15c763abca..5aa4ca06e8 100644 --- a/buildroot/boot/shim/shim.hash +++ b/buildroot/boot/shim/shim.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 8344473dd10569588b8238a4656b8fab226714eea9f5363f8c410aa8a5090297 shim-15.4.tar.bz2 -sha256 15edf527919ddcb2f514ab9d16ad07ef219e4bb490e0b79560be510f0c159cc2 COPYRIGHT +sha256 a79f0a9b89f3681ab384865b1a46ab3f79d88b11b4ca59aa040ab03fffae80a9 shim-15.8.tar.bz2 +sha256 15edf527919ddcb2f514ab9d16ad07ef219e4bb490e0b79560be510f0c159cc2 COPYRIGHT diff --git a/buildroot/boot/shim/shim.mk b/buildroot/boot/shim/shim.mk index 0a6d1527aa..f5b3d1cee6 100644 --- a/buildroot/boot/shim/shim.mk +++ b/buildroot/boot/shim/shim.mk @@ -4,7 +4,7 @@ # ################################################################################ -SHIM_VERSION = 15.4 +SHIM_VERSION = 15.8 SHIM_SITE = https://github.com/rhboot/shim/releases/download/$(SHIM_VERSION) SHIM_SOURCE = shim-$(SHIM_VERSION).tar.bz2 SHIM_LICENSE = BSD-2-Clause @@ -13,10 +13,19 @@ SHIM_CPE_ID_VENDOR = redhat SHIM_INSTALL_TARGET = NO SHIM_INSTALL_IMAGES = YES +SHIM_CFLAGS = $(TARGET_CFLAGS) SHIM_MAKE_OPTS = \ ARCH="$(GNU_EFI_PLATFORM)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ - DASHJ="-j$(PARALLEL_JOBS)" + DASHJ="-j$(PARALLEL_JOBS)" \ + OPTIMIZATIONS="$(SHIM_CFLAGS)" + +# shim has some assembly function that is not present in Thumb mode: +# Error: selected processor does not support `mrc p15,0,r2,c9,c13,0' in Thumb mode +# so, we deactivate Thumb mode +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +SHIM_CFLAGS += -marm +endif define SHIM_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(SHIM_MAKE_OPTS) diff --git a/buildroot/boot/sun20i-d1-spl/Config.in b/buildroot/boot/sun20i-d1-spl/Config.in deleted file mode 100644 index 9d94d87b1c..0000000000 --- a/buildroot/boot/sun20i-d1-spl/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_TARGET_SUN20I_D1_SPL - bool "sun20-d1-spl" - depends on BR2_RISCV_64 - help - Allwinner D1 boot0 code with modifications to use as U-Boot - SPL. - - https://github.com/smaeul/sun20i_d1_spl diff --git a/buildroot/boot/sun20i-d1-spl/sun20i-d1-spl.hash b/buildroot/boot/sun20i-d1-spl/sun20i-d1-spl.hash deleted file mode 100644 index 11d17a9a16..0000000000 --- a/buildroot/boot/sun20i-d1-spl/sun20i-d1-spl.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 08e2d0574e58c99734cd1d9ea89b86464242bf2db4f6769b23803bf9dcdac3c4 sun20i-d1-spl-882671fcf53137aaafc3a94fa32e682cb7b921f1.tar.gz diff --git a/buildroot/boot/sun20i-d1-spl/sun20i-d1-spl.mk b/buildroot/boot/sun20i-d1-spl/sun20i-d1-spl.mk deleted file mode 100644 index 6bcea0fa96..0000000000 --- a/buildroot/boot/sun20i-d1-spl/sun20i-d1-spl.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# sun20i-d1-spl -# -################################################################################ - -# Commit on the 'mainline' branch -SUN20I_D1_SPL_VERSION = 882671fcf53137aaafc3a94fa32e682cb7b921f1 -SUN20I_D1_SPL_SITE = $(call github,smaeul,sun20i_d1_spl,$(SUN20I_D1_SPL_VERSION)) -SUN20I_D1_SPL_INSTALL_TARGET = NO -SUN20I_D1_SPL_INSTALL_IMAGES = YES -SUN20I_D1_SPL_LICENSE = GPL-2.0+ - -define SUN20I_D1_SPL_BUILD_CMDS - $(MAKE) -C $(@D) CROSS_COMPILE="$(TARGET_CROSS)" p=sun20iw1p1 mmc -endef - -define SUN20I_D1_SPL_INSTALL_IMAGES_CMDS - $(INSTALL) -D -m 0644 $(@D)/nboot/boot0_sdcard_sun20iw1p1.bin \ - $(BINARIES_DIR)/boot0_sdcard_sun20iw1p1.bin -endef - -$(eval $(generic-package)) diff --git a/buildroot/boot/syslinux/0015-efi-main.c-include-efisetjmp.h.patch b/buildroot/boot/syslinux/0015-efi-main.c-include-efisetjmp.h.patch index 2fd61ecbc8..15adfc49f3 100644 --- a/buildroot/boot/syslinux/0015-efi-main.c-include-efisetjmp.h.patch +++ b/buildroot/boot/syslinux/0015-efi-main.c-include-efisetjmp.h.patch @@ -1,4 +1,4 @@ -From 7d68fa68cd9f2987bd85339f3391913a8b0e58c7 Mon Sep 17 00:00:00 2001 +From 26979f738518404b1d3dc9ecdcf4fa5811412c49 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 24 Mar 2020 10:21:27 +0100 Subject: [PATCH] efi/main.c: include @@ -38,13 +38,15 @@ This is due to gnu-efi commit 486ba3c3bdd147b7d98159b9e650be60bce0f027 So we act as specified, and include from efi/main.c. Signed-off-by: Thomas Petazzoni +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi Upstream: https://www.syslinux.org/archives/2020-March/026621.html --- efi/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/efi/main.c b/efi/main.c -index 6a748412..e924cfb1 100644 +index 71d31a5c1f13..7dc7bca7aeba 100644 --- a/efi/main.c +++ b/efi/main.c @@ -12,6 +12,7 @@ @@ -54,7 +56,7 @@ index 6a748412..e924cfb1 100644 +#include #include "fio.h" #include "version.h" - #include "efi_pxe.h" + -- -2.25.1 +2.43.0 diff --git a/buildroot/boot/syslinux/0018-single-load-segment.patch b/buildroot/boot/syslinux/0018-single-load-segment.patch new file mode 100644 index 0000000000..11d73c31a4 --- /dev/null +++ b/buildroot/boot/syslinux/0018-single-load-segment.patch @@ -0,0 +1,313 @@ +From: Lukas Schwaighofer +Date: Sat, 18 Aug 2018 16:56:35 +0200 +Subject: Force the linker to put all sections into a single PT_LOAD segment + +This is required when using binutils >= 2.31 which writes two PT_LOAD segments +by default. This is not supported by the wrapper.c script used to convert the +shared object into an elf binary. + +Forwarded: https://www.syslinux.org/archives/2018-August/026167.html +[yann.morin.1998@free.fr: + - grab from the Debian package + - https://salsa.debian.org/images-team/syslinux/-/blob/fa1349f1f8e5f5d6307e589f02c0a679031d1c7f/debian/patches/0017-single-load-segment.patch +] +Signed-off-by: Yann E. MORIN +Upstream: reported https://www.syslinux.org/archives/2018-August/026167.html +Upstream: acknowledged https://wiki.syslinux.org/wiki/index.php?title=Building +--- + efi/i386/syslinux.ld | 37 +++++++++++++++++++++---------------- + efi/x86_64/syslinux.ld | 37 +++++++++++++++++++++---------------- + 2 files changed, 42 insertions(+), 32 deletions(-) + +diff --git a/efi/i386/syslinux.ld b/efi/i386/syslinux.ld +index bab3fc7..19c1647 100644 +--- a/efi/i386/syslinux.ld ++++ b/efi/i386/syslinux.ld +@@ -19,6 +19,11 @@ OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386") + OUTPUT_ARCH(i386) + ENTRY(_start) + ++PHDRS ++{ ++ all PT_LOAD ; ++} ++ + SECTIONS + { + . = 0; +@@ -31,7 +36,7 @@ SECTIONS + *(.text) + *(.text.*) + __text_end = .; +- } ++ } :all + + . = ALIGN(16); + +@@ -40,7 +45,7 @@ SECTIONS + *(.rodata) + *(.rodata.*) + __rodata_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -49,14 +54,14 @@ SECTIONS + KEEP (*(SORT(.ctors.*))) + KEEP (*(.ctors)) + __ctors_end = .; +- } ++ } :all + + .dtors : { + __dtors_start = .; + KEEP (*(SORT(.dtors.*))) + KEEP (*(.dtors)) + __dtors_end = .; +- } ++ } :all + + . = ALIGN(4096); + .rel : { +@@ -64,7 +69,7 @@ SECTIONS + *(.rel.data) + *(.rel.data.*) + *(.rel.ctors) +- } ++ } :all + + . = ALIGN(4); + +@@ -72,14 +77,14 @@ SECTIONS + __gnu_hash_start = .; + *(.gnu.hash) + __gnu_hash_end = .; +- } ++ } :all + + + .dynsym : { + __dynsym_start = .; + *(.dynsym) + __dynsym_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -87,7 +92,7 @@ SECTIONS + __dynstr_start = .; + *(.dynstr) + __dynstr_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -104,7 +109,7 @@ SECTIONS + KEEP (*(.got.plt)) + KEEP (*(.got)) + __got_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -112,7 +117,7 @@ SECTIONS + __dynamic_start = .; + *(.dynamic) + __dynamic_end = .; +- } ++ } :all + + . = ALIGN(16); + +@@ -122,19 +127,19 @@ SECTIONS + *(.data.*) + *(.lowmem) + __data_end = .; +- } ++ } :all + + .reloc : { + *(.reloc) +- } ++ } :all + + .symtab : { + *(.symtab) +- } ++ } :all + + .strtab : { + *(.strtab) +- } ++ } :all + + .bss (NOLOAD) : { + /* the EFI loader doesn't seem to like a .bss section, +@@ -148,7 +153,7 @@ SECTIONS + __bss_end = .; + *(.sbss) + *(.scommon) +- } ++ } :all + __bss_len = ABSOLUTE(__bss_end) - ABSOLUTE(__bss_start); + __bss_dwords = (__bss_len + 3) >> 2; + +@@ -161,7 +166,7 @@ SECTIONS + *(.hugebss) + *(.hugebss.*) + __hugebss_end = .; +- } ++ } :all + + _end = .; + +diff --git a/efi/x86_64/syslinux.ld b/efi/x86_64/syslinux.ld +index 450641c..a2c124f 100644 +--- a/efi/x86_64/syslinux.ld ++++ b/efi/x86_64/syslinux.ld +@@ -19,6 +19,11 @@ OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64") + OUTPUT_ARCH(i386:x86-64) + ENTRY(_start) + ++PHDRS ++{ ++ all PT_LOAD ; ++} ++ + SECTIONS + { + . = 0; +@@ -31,7 +36,7 @@ SECTIONS + *(.text) + *(.text.*) + __text_end = .; +- } ++ } :all + + . = ALIGN(16); + +@@ -40,7 +45,7 @@ SECTIONS + *(.rodata) + *(.rodata.*) + __rodata_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -49,14 +54,14 @@ SECTIONS + KEEP (*(SORT(.ctors.*))) + KEEP (*(.ctors)) + __ctors_end = .; +- } ++ } :all + + .dtors : { + __dtors_start = .; + KEEP (*(SORT(.dtors.*))) + KEEP (*(.dtors)) + __dtors_end = .; +- } ++ } :all + + . = ALIGN(4096); + .rel : { +@@ -64,7 +69,7 @@ SECTIONS + *(.rel.data) + *(.rel.data.*) + *(.rel.ctors) +- } ++ } :all + + . = ALIGN(4); + +@@ -72,14 +77,14 @@ SECTIONS + __gnu_hash_start = .; + *(.gnu.hash) + __gnu_hash_end = .; +- } ++ } :all + + + .dynsym : { + __dynsym_start = .; + *(.dynsym) + __dynsym_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -87,7 +92,7 @@ SECTIONS + __dynstr_start = .; + *(.dynstr) + __dynstr_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -104,7 +109,7 @@ SECTIONS + KEEP (*(.got.plt)) + KEEP (*(.got)) + __got_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -112,7 +117,7 @@ SECTIONS + __dynamic_start = .; + *(.dynamic) + __dynamic_end = .; +- } ++ } :all + + . = ALIGN(16); + +@@ -122,19 +127,19 @@ SECTIONS + *(.data.*) + *(.lowmem) + __data_end = .; +- } ++ } :all + + .reloc : { + *(.reloc) +- } ++ } :all + + .symtab : { + *(.symtab) +- } ++ } :all + + .strtab : { + *(.strtab) +- } ++ } :all + + .bss (NOLOAD) : { + /* the EFI loader doesn't seem to like a .bss section, +@@ -148,7 +153,7 @@ SECTIONS + __bss_end = .; + *(.sbss) + *(.scommon) +- } ++ } :all + __bss_len = ABSOLUTE(__bss_end) - ABSOLUTE(__bss_start); + __bss_dwords = (__bss_len + 3) >> 2; + +@@ -161,7 +166,7 @@ SECTIONS + *(.hugebss) + *(.hugebss.*) + __hugebss_end = .; +- } ++ } :all + + _end = .; + diff --git a/buildroot/boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch b/buildroot/boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch new file mode 100644 index 0000000000..65d9463a6f --- /dev/null +++ b/buildroot/boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch @@ -0,0 +1,59 @@ +From 063dac55c45d0264671c3463e824ab659e5cbb87 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Tue, 27 Feb 2024 21:09:15 +0100 +Subject: [PATCH] stddef.h: add wchar_t type definition + +Syslinux fail to build with gnu-efi >= 3.0.16 with error: + + In file included from /host/i686-buildroot-linux-gnu/sysroot/usr/include/efi/efi.h:44, + from /build/syslinux-6.03/efi/efi.h:23, + from /build/syslinux-6.03/efi/adv.h:4, + from /build/syslinux-6.03/efi/adv.c:29: + /host/i686-buildroot-linux-gnu/sysroot/usr/include/efi/ia32/efibind.h:90:9: error: unknown type name 'wchar_t' + typedef wchar_t CHAR16; + ^~~~~~~ + +This is because gnu-efi started to use the "wchar_t" type from the +toolchain's header, in commit [1]. Before this commit, +gnu-efi was defining the type as "short". + +Syslinux is including its own minimal stddef.h file, which masks the +one provided by the toolchain. See [2]. This file does not have a type +definition for "wchar_t". + +Finally, the POSIX header is supposed to provide this +"wchar_t" type definition. See [3]. + +This commit fixes the issue by adding the "wchar_t" type definition in +the com32/include/stddef.h header. Since Syslinux has "-fshort-wchar" +in its CFLAGS (see [4]), "wchar_t" is simply defined as "short". This +also follow the previous gnu-efi < 3.0.16 behavior. + +This issue was seen in Buildroot Linux, in [5]. + +[1] https://sourceforge.net/p/gnu-efi/code/ci/189200d0b0f6fff473d302880d9569f45d4d8c4d +[2] https://repo.or.cz/syslinux.git/blob/refs/tags/syslinux-6.03:/com32/include/stddef.h +[3] https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/stddef.h.html +[4] https://repo.or.cz/syslinux.git/blob/refs/tags/syslinux-6.03:/mk/efi.mk#l27 +[5] https://lists.buildroot.org/pipermail/buildroot/2024-February/685971.html + +Upstream: Proposed: https://www.syslinux.org/archives/2024-February/026903.html +Signed-off-by: Julien Olivain +--- + com32/include/stddef.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/com32/include/stddef.h b/com32/include/stddef.h +index f52d62f3..437b11f2 100644 +--- a/com32/include/stddef.h ++++ b/com32/include/stddef.h +@@ -29,4 +29,6 @@ + */ + #define container_of(p, c, m) ((c *)((char *)(p) - offsetof(c,m))) + ++typedef short wchar_t; ++ + #endif /* _STDDEF_H */ +-- +2.44.0 + diff --git a/buildroot/boot/syslinux/0020-pull-in-stdio-h-for-gcc14.patch b/buildroot/boot/syslinux/0020-pull-in-stdio-h-for-gcc14.patch new file mode 100644 index 0000000000..09a0074b31 --- /dev/null +++ b/buildroot/boot/syslinux/0020-pull-in-stdio-h-for-gcc14.patch @@ -0,0 +1,34 @@ +From dfa2705100a893bc017d23406daa9a383fbc3c95 Mon Sep 17 00:00:00 2001 +From: Lance Fredrickson +Date: Wed, 5 Jun 2024 14:31:38 -0600 +Subject: [PATCH] com32/lib/syslinux/debug.c: add missing stdio.h include. + +Fix building syslinux with GCC 14.x + +Add missing stdio.h include. Without it results in the following error under GCC 14.x + +../../../com32/lib/syslinux/debug.c: In function ‘syslinux_debug’: +../../../com32/lib/syslinux/debug.c:91:5: error: implicit declaration of function ‘printf’ [-Wimplicit-function-declaration] + 91 | printf("Dynamic debug unavailable\n"); + +Upstream: dead (last release in 2014) +Signed-off-by: Lance Fredrickson +--- + com32/lib/syslinux/debug.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/com32/lib/syslinux/debug.c b/com32/lib/syslinux/debug.c +index d9ab863f..e8f53d57 100644 +--- a/com32/lib/syslinux/debug.c ++++ b/com32/lib/syslinux/debug.c +@@ -1,6 +1,7 @@ + #include + #include + #include ++#include + + #ifdef DYNAMIC_DEBUG + +-- +2.39.2 + diff --git a/buildroot/boot/syslinux/syslinux.mk b/buildroot/boot/syslinux/syslinux.mk index 2df415fcfd..cc52c49aee 100644 --- a/buildroot/boot/syslinux/syslinux.mk +++ b/buildroot/boot/syslinux/syslinux.mk @@ -58,6 +58,8 @@ SYSLINUX_POST_PATCH_HOOKS += SYSLINUX_CLEANUP # be used. define SYSLINUX_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE1) \ + ASCIIDOC_OK=-1 \ + A2X_XML_OK=-1 \ CC="$(TARGET_CC)" \ LD="$(TARGET_LD)" \ OBJCOPY="$(TARGET_OBJCOPY)" \ diff --git a/buildroot/boot/ti-k3-boot-firmware/Config.in b/buildroot/boot/ti-k3-boot-firmware/Config.in new file mode 100644 index 0000000000..d80bb4bdb3 --- /dev/null +++ b/buildroot/boot/ti-k3-boot-firmware/Config.in @@ -0,0 +1,7 @@ +config BR2_TARGET_TI_K3_BOOT_FIRMWARE + bool "ti-k3-boot-firmware" + depends on BR2_aarch64 + help + This package downloads and installs the TI-specific ti-sysfw + and ti-dm firmware needed to boot TI K3 platforms (which + include AM62x, AM64x, AM65x and more). diff --git a/buildroot/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.hash b/buildroot/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.hash new file mode 100644 index 0000000000..2398d02da2 --- /dev/null +++ b/buildroot/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 ab20ffbe7bba7e94be246b3417d33a914b3f07c16c47ef5a7f7602349a666a61 LICENSE.ti +sha256 ae888a0a22f8c5b8fe841236d6e40bb2f821d9a4161dab6924fd989e1467ef0e ti-linux-firmware-09.02.00.009.tar.xz diff --git a/buildroot/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk b/buildroot/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk new file mode 100644 index 0000000000..9332732ad4 --- /dev/null +++ b/buildroot/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# ti-k3-boot-firmware +# +################################################################################ + +TI_K3_BOOT_FIRMWARE_VERSION = 09.02.00.009 +TI_K3_BOOT_FIRMWARE_SITE = https://git.ti.com/cgit/processor-firmware/ti-linux-firmware/snapshot +TI_K3_BOOT_FIRMWARE_SOURCE = ti-linux-firmware-$(TI_K3_BOOT_FIRMWARE_VERSION).tar.xz +TI_K3_BOOT_FIRMWARE_INSTALL_IMAGES = YES +TI_K3_BOOT_FIRMWARE_LICENSE = TI Proprietary +TI_K3_BOOT_FIRMWARE_LICENSE_FILES = LICENSE.ti + +define TI_K3_BOOT_FIRMWARE_INSTALL_IMAGES_CMDS + cp -dpfr $(@D)/ti-sysfw $(BINARIES_DIR)/ + cp -dpfr $(@D)/ti-dm $(BINARIES_DIR)/ +endef + +$(eval $(generic-package)) diff --git a/buildroot/boot/ti-k3-r5-loader/Config.in b/buildroot/boot/ti-k3-r5-loader/Config.in new file mode 100644 index 0000000000..8c7898ebf6 --- /dev/null +++ b/buildroot/boot/ti-k3-r5-loader/Config.in @@ -0,0 +1,147 @@ +config BR2_TARGET_TI_K3_R5_LOADER + bool "ti-k3-r5-loader" + depends on BR2_aarch64 + select BR2_TARGET_TI_K3_BOOT_FIRMWARE # binman + help + Separate U-Boot SPL build for R5 core on TI's K3 processors. + Usually used to build tiboot3.bin with k3-image-gen. + +if BR2_TARGET_TI_K3_R5_LOADER + +choice + prompt "U-Boot Version" + help + Select the specific U-Boot version you want to use to build + the initial SPL running on the R5 core. Note that for most + use cases you will want to use the exact same version/source + here as it is used to build the main U-Boot package. + +config BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION + bool "2024.10" + +config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION + bool "Custom version" + help + This option allows to use a specific official versions + +config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_TARBALL + bool "Custom tarball" + +config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_GIT + bool "Custom Git repository" + +config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_HG + bool "Custom Mercurial repository" + +config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_SVN + bool "Custom Subversion repository" + +endchoice + +config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE + string "U-Boot version" + depends on BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION + +config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_TARBALL_LOCATION + string "URL of custom U-Boot tarball" + depends on BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_TARBALL + +if BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_GIT || BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_HG || BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_SVN + +config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_REPO_URL + string "URL of custom repository" + +config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_REPO_VERSION + string "Custom repository version" + help + Revision to use in the typical format used by + Git/Mercurial/Subversion E.G. a sha id, a tag, branch, .. + +endif + +config BR2_TARGET_TI_K3_R5_LOADER_VERSION + string + default "2024.10" if BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION + default BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE \ + if BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION + default "custom" if BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_TARBALL + default BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_REPO_VERSION \ + if BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_GIT || \ + BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_HG || \ + BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_SVN +choice + prompt "U-Boot Configuration" + default BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG + +config BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG + bool "Using an in-tree board defconfig file" + +config BR2_TARGET_TI_K3_R5_LOADER_USE_CUSTOM_CONFIG + bool "Using a custom board (def)config file" + +endchoice + +config BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG + string "Board defconfig" + depends on BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG + help + Name of the board for which TI K3 R5 Loader should be + built, without the _defconfig suffix. + +config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_CONFIG_FILE + string "Configuration file path" + depends on BR2_TARGET_TI_K3_R5_LOADER_USE_CUSTOM_CONFIG + help + Path to the TI K3 R5 Loader configuration file. + +config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_DTS_PATH + string "Device Tree Source file paths" + help + Space-separated list of paths to device tree source files + that will be copied to arch/arm/dts/ before starting the + build. + + To use this device tree source file, the U-Boot configuration + file must refer to it. + +config BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN + string "tiboot3.bin binary name" + default "tiboot3.bin" + help + Name of the TI K3 tiboot3.bin binary to use. + + The tiboot3 binary name must match with the TI K3 SoC boot + ROM: + + - General Purpose devices (gp) + - High Security - Field Securable devices (hs-fs) + - High Security - Security Enforcing devices (hs) + + Or if the tiboot3 binary generated use a custom name. + + If unsure, use the default tiboot3.bin (symlink) generated by + binman. + +config BR2_TARGET_TI_K3_R5_LOADER_SYSFW_ITB + string "sysfw.itb binary name" + default "sysfw.itb" + help + Name of the TI K3 sysfw.itb binary to use (if any required). + + sysfw*.itb are only generated for Split binary based Boot + Flow (eg: am65, j721e). This option is not used on other + TI K3 devices. + + The sysfw binary name must match with the TI K3 SoC boot + ROM: + + - General Purpose devices (gp) + - High Security - Field Securable devices (hs-fs) + - High Security - Security Enforcing devices (hs) + + Or if the sysfw binary generated use a custom name. + + If unsure, use the default sysfw.itb (symlink) generated by + binman. + +endif diff --git a/buildroot/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash b/buildroot/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash new file mode 100644 index 0000000000..af025a583e --- /dev/null +++ b/buildroot/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0 u-boot-2024.10.tar.bz2 +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Licenses/gpl-2.0.txt diff --git a/buildroot/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/buildroot/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk new file mode 100644 index 0000000000..e426f039e0 --- /dev/null +++ b/buildroot/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk @@ -0,0 +1,124 @@ +################################################################################ +# +# ti-k3-r5-loader +# +################################################################################ + +TI_K3_R5_LOADER_VERSION = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_VERSION)) +TI_K3_R5_LOADER_DL_SUBDIR = uboot + +ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_TARBALL),y) +# Handle custom U-Boot tarballs as specified by the configuration +TI_K3_R5_LOADER_TARBALL = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_TARBALL_LOCATION)) +TI_K3_R5_LOADER_SITE = $(patsubst %/,%,$(dir $(TI_K3_R5_LOADER_TARBALL))) +TI_K3_R5_LOADER_SOURCE = $(notdir $(TI_K3_R5_LOADER_TARBALL)) +else ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_GIT),y) +TI_K3_R5_LOADER_SITE = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_REPO_URL)) +TI_K3_R5_LOADER_SITE_METHOD = git +TI_K3_R5_LOADER_SOURCE = u-boot-$(TI_K3_R5_LOADER_VERSION).tar.gz +else ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_HG),y) +TI_K3_R5_LOADER_SITE = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_REPO_URL)) +TI_K3_R5_LOADER_SITE_METHOD = hg +TI_K3_R5_LOADER_SOURCE = u-boot-$(TI_K3_R5_LOADER_VERSION).tar.gz +else ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_SVN),y) +TI_K3_R5_LOADER_SITE = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_REPO_URL)) +TI_K3_R5_LOADER_SITE_METHOD = svn +TI_K3_R5_LOADER_SOURCE = u-boot-$(TI_K3_R5_LOADER_VERSION).tar.gz +else +# Handle stable official U-Boot versions +TI_K3_R5_LOADER_SITE = https://ftp.denx.de/pub/u-boot +TI_K3_R5_LOADER_SOURCE = u-boot-$(TI_K3_R5_LOADER_VERSION).tar.bz2 +endif + +ifeq ($(BR2_TARGET_TI_K3_R5_LOADER)$(BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION),y) +BR_NO_CHECK_HASH_FOR += $(TI_K3_R5_LOADER_SOURCE) +endif + +TI_K3_R5_LOADER_LICENSE = GPL-2.0+ +TI_K3_R5_LOADER_LICENSE_FILES = Licenses/gpl-2.0.txt +TI_K3_R5_LOADER_CPE_ID_VENDOR = denx +TI_K3_R5_LOADER_CPE_ID_PRODUCT = u-boot +TI_K3_R5_LOADER_INSTALL_IMAGES = YES +# https://source.denx.de/u-boot/u-boot/-/blob/v2024.04/tools/binman/binman.rst?plain=1#L377 +# https://source.denx.de/u-boot/u-boot/-/blob/v2024.04/tools/buildman/requirements.txt +# Make sure that all binman requirements are built before ti-k3-r5-loader. +TI_K3_R5_LOADER_DEPENDENCIES = \ + host-pkgconf \ + $(BR2_MAKE_HOST_DEPENDENCY) \ + host-arm-gnu-toolchain \ + host-openssl \ + host-python3 \ + host-python-jsonschema \ + host-python-pyelftools \ + host-python-pylibfdt \ + host-python-pyyaml \ + host-python-setuptools \ + host-python-yamllint \ + ti-k3-boot-firmware + +TI_K3_R5_LOADER_MAKE = $(BR2_MAKE) +TI_K3_R5_LOADER_MAKE_ENV = $(TARGET_MAKE_ENV) +TI_K3_R5_LOADER_KCONFIG_DEPENDENCIES = \ + host-arm-gnu-toolchain \ + $(BR2_MAKE_HOST_DEPENDENCY) \ + $(BR2_BISON_HOST_DEPENDENCY) \ + $(BR2_FLEX_HOST_DEPENDENCY) + +ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG),y) +TI_K3_R5_LOADER_KCONFIG_DEFCONFIG = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG))_defconfig +else ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_CUSTOM_CONFIG),y) +TI_K3_R5_LOADER_KCONFIG_FILE = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_CONFIG_FILE)) +endif # BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG +TI_K3_R5_LOADER_MAKE_OPTS = \ + CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ + ARCH=arm \ + HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS)))" \ + HOSTLDFLAGS="$(HOST_LDFLAGS)" \ + BINMAN_INDIRS=$(BINARIES_DIR) + +TI_K3_R5_LOADER_TIBOOT3_BIN = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN)) + +define TI_K3_R5_LOADER_INSTALL_TIBOOT3_BIN + cp $(@D)/$(TI_K3_R5_LOADER_TIBOOT3_BIN) $(BINARIES_DIR)/tiboot3.bin +endef + +TI_K3_R5_LOADER_SYSFW_ITB = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_SYSFW_ITB)) + +# sysfw*.itb are only generated for Split binary based Boot Flow (eg: am65, j721e). +# So, if sysfw.itb symlink exist we must copy it or the custom sysfw.itb. +define TI_K3_R5_LOADER_INSTALL_SWSFW_ITB + if test -e $(@D)/sysfw.itb ; then \ + cp $(@D)/$(TI_K3_R5_LOADER_SYSFW_ITB) $(BINARIES_DIR)/sysfw.itb ; \ + fi +endef + +TI_K3_R5_LOADER_CUSTOM_DTS_PATH = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_DTS_PATH)) + +define TI_K3_R5_LOADER_BUILD_CMDS + $(if $(TI_K3_R5_LOADER_CUSTOM_DTS_PATH), + cp -f $(TI_K3_R5_LOADER_CUSTOM_DTS_PATH) $(@D)/arch/arm/dts/ + ) + $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) +endef + +define TI_K3_R5_LOADER_INSTALL_IMAGES_CMDS + cp $(@D)/spl/u-boot-spl.bin $(BINARIES_DIR)/r5-u-boot-spl.bin + $(TI_K3_R5_LOADER_INSTALL_TIBOOT3_BIN) + $(TI_K3_R5_LOADER_INSTALL_SWSFW_ITB) +endef + +# Checks to give errors that the user can understand +# Must be before we call to kconfig-package +ifeq ($(BR2_TARGET_TI_K3_R5_LOADER)$(BR_BUILDING),yy) + +ifeq ($(TI_K3_R5_LOADER_TIBOOT3_BIN),) +$(error No custom tiboot3 name specified, check your BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN setting) +endif + +ifeq ($(TI_K3_R5_LOADER_SYSFW_ITB),) +$(error No custom sysfw name specified, check your BR2_TARGET_TI_K3_R5_LOADER_SYSFW_ITB setting) +endif + +endif # BR_BUILDING + +$(eval $(kconfig-package)) diff --git a/buildroot/boot/uboot/2015.07/0001-Revert-arch-Make-board-selection-choices-optional.patch b/buildroot/boot/uboot/2015.07/0001-Revert-arch-Make-board-selection-choices-optional.patch deleted file mode 100644 index 8b814f2d69..0000000000 --- a/buildroot/boot/uboot/2015.07/0001-Revert-arch-Make-board-selection-choices-optional.patch +++ /dev/null @@ -1,742 +0,0 @@ -From ee11fed43e2bd029f71af1e72ab9bb5652f5fc54 Mon Sep 17 00:00:00 2001 -From: Alexey Brodkin -Date: Wed, 29 Jul 2015 20:32:59 +0300 -Subject: [PATCH] Revert "arch: Make board selection choices optional" - -This reverts commit a26cd04920dc069fd6e91abb785426cf6c29f45f. - -Reverted commit caused an issue with "make oldconfig" - default prompt -for target selection was set as No that lead to missing platform -selection by automated scripts like that: ------------------->8------------------ -"yes "" | make oldconfig" on defconfig ------------------->8------------------ - -And that lead to build failure: ------------------->8------------------ -$ make -scripts/kconfig/conf --silentoldconfig Kconfig - CHK include/config.h - UPD include/config.h - GEN include/autoconf.mk -In file included from ./include/common.h:18:0: -include/config.h:5:22: fatal error: configs/.h: No such file or directory - #include - ^ -compilation terminated. -scripts/Makefile.autoconf:72: recipe for target 'include/autoconf.mk' failed -make[1]: *** [include/autoconf.mk] Error 1 ------------------->8------------------ - -Signed-off-by: Alexey Brodkin ---- - arch/arc/Kconfig | 1 - - arch/arm/Kconfig | 1 - - arch/arm/cpu/armv7/exynos/Kconfig | 1 - - arch/arm/cpu/armv7/mx5/Kconfig | 1 - - arch/arm/cpu/armv7/mx6/Kconfig | 1 - - arch/arm/cpu/armv7/omap3/Kconfig | 1 - - arch/arm/cpu/armv7/omap4/Kconfig | 1 - - arch/arm/cpu/armv7/omap5/Kconfig | 1 - - arch/arm/cpu/armv7/rmobile/Kconfig | 1 - - arch/arm/cpu/armv7/s5pc1xx/Kconfig | 1 - - arch/arm/mach-at91/Kconfig | 1 - - arch/arm/mach-bcm283x/Kconfig | 1 - - arch/arm/mach-davinci/Kconfig | 1 - - arch/arm/mach-integrator/Kconfig | 2 -- - arch/arm/mach-keystone/Kconfig | 1 - - arch/arm/mach-kirkwood/Kconfig | 1 - - arch/arm/mach-nomadik/Kconfig | 1 - - arch/arm/mach-orion5x/Kconfig | 1 - - arch/arm/mach-socfpga/Kconfig | 1 - - arch/arm/mach-tegra/Kconfig | 1 - - arch/arm/mach-tegra/tegra114/Kconfig | 1 - - arch/arm/mach-tegra/tegra124/Kconfig | 1 - - arch/arm/mach-tegra/tegra20/Kconfig | 1 - - arch/arm/mach-tegra/tegra30/Kconfig | 1 - - arch/arm/mach-zynq/Kconfig | 1 - - arch/avr32/Kconfig | 1 - - arch/blackfin/Kconfig | 1 - - arch/m68k/Kconfig | 1 - - arch/microblaze/Kconfig | 1 - - arch/mips/Kconfig | 1 - - arch/nds32/Kconfig | 1 - - arch/nios2/Kconfig | 1 - - arch/openrisc/Kconfig | 1 - - arch/powerpc/Kconfig | 1 - - arch/powerpc/cpu/mpc512x/Kconfig | 1 - - arch/powerpc/cpu/mpc5xx/Kconfig | 1 - - arch/powerpc/cpu/mpc5xxx/Kconfig | 1 - - arch/powerpc/cpu/mpc8260/Kconfig | 1 - - arch/powerpc/cpu/mpc83xx/Kconfig | 1 - - arch/powerpc/cpu/mpc85xx/Kconfig | 1 - - arch/powerpc/cpu/mpc86xx/Kconfig | 1 - - arch/powerpc/cpu/mpc8xx/Kconfig | 1 - - arch/powerpc/cpu/ppc4xx/Kconfig | 1 - - arch/sh/Kconfig | 1 - - arch/sparc/Kconfig | 1 - - board/amcc/canyonlands/Kconfig | 1 - - board/coreboot/Kconfig | 1 - - board/dbau1x00/Kconfig | 1 - - board/google/Kconfig | 1 - - board/intel/Kconfig | 1 - - board/micronas/vct/Kconfig | 1 - - board/seco/Kconfig | 2 -- - board/sunxi/Kconfig | 1 - - 53 files changed, 55 deletions(-) - -diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig -index 925e312..640cda8 100644 ---- a/arch/arc/Kconfig -+++ b/arch/arc/Kconfig -@@ -129,7 +129,6 @@ config ARC_CACHE_LINE_SHIFT - - choice - prompt "Target select" -- optional - - config TARGET_TB100 - bool "Support tb100" -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 9908b43..8eeb46c 100644 ---- a/arch/arm/Kconfig -+++ b/arch/arm/Kconfig -@@ -64,7 +64,6 @@ config SEMIHOSTING - - choice - prompt "Target select" -- optional - - config ARCH_AT91 - bool "Atmel AT91" -diff --git a/arch/arm/cpu/armv7/exynos/Kconfig b/arch/arm/cpu/armv7/exynos/Kconfig -index 4a7d82f..f2fe748 100644 ---- a/arch/arm/cpu/armv7/exynos/Kconfig -+++ b/arch/arm/cpu/armv7/exynos/Kconfig -@@ -2,7 +2,6 @@ if ARCH_EXYNOS - - choice - prompt "EXYNOS board select" -- optional - - config TARGET_SMDKV310 - select SUPPORT_SPL -diff --git a/arch/arm/cpu/armv7/mx5/Kconfig b/arch/arm/cpu/armv7/mx5/Kconfig -index 9f250c6..2d6c0ce 100644 ---- a/arch/arm/cpu/armv7/mx5/Kconfig -+++ b/arch/arm/cpu/armv7/mx5/Kconfig -@@ -12,7 +12,6 @@ config MX53 - - choice - prompt "MX5 board select" -- optional - - config TARGET_USBARMORY - bool "Support USB armory" -diff --git a/arch/arm/cpu/armv7/mx6/Kconfig b/arch/arm/cpu/armv7/mx6/Kconfig -index 10908c4..662596f 100644 ---- a/arch/arm/cpu/armv7/mx6/Kconfig -+++ b/arch/arm/cpu/armv7/mx6/Kconfig -@@ -27,7 +27,6 @@ config MX6SX - - choice - prompt "MX6 board select" -- optional - - config TARGET_SECOMX6 - bool "Support secomx6 boards" -diff --git a/arch/arm/cpu/armv7/omap3/Kconfig b/arch/arm/cpu/armv7/omap3/Kconfig -index b32a6b0..cc82c50 100644 ---- a/arch/arm/cpu/armv7/omap3/Kconfig -+++ b/arch/arm/cpu/armv7/omap3/Kconfig -@@ -2,7 +2,6 @@ if OMAP34XX - - choice - prompt "OMAP3 board select" -- optional - - config TARGET_AM3517_EVM - bool "AM3517 EVM" -diff --git a/arch/arm/cpu/armv7/omap4/Kconfig b/arch/arm/cpu/armv7/omap4/Kconfig -index df27ea1..eccf897 100644 ---- a/arch/arm/cpu/armv7/omap4/Kconfig -+++ b/arch/arm/cpu/armv7/omap4/Kconfig -@@ -2,7 +2,6 @@ if OMAP44XX - - choice - prompt "OMAP4 board select" -- optional - - config TARGET_DUOVERO - bool "OMAP4430 Gumstix Duovero" -diff --git a/arch/arm/cpu/armv7/omap5/Kconfig b/arch/arm/cpu/armv7/omap5/Kconfig -index 20c3bd9..aca862d 100644 ---- a/arch/arm/cpu/armv7/omap5/Kconfig -+++ b/arch/arm/cpu/armv7/omap5/Kconfig -@@ -2,7 +2,6 @@ if OMAP54XX - - choice - prompt "OMAP5 board select" -- optional - - config TARGET_CM_T54 - bool "CompuLab CM-T54" -diff --git a/arch/arm/cpu/armv7/rmobile/Kconfig b/arch/arm/cpu/armv7/rmobile/Kconfig -index ef56286..638b63d 100644 ---- a/arch/arm/cpu/armv7/rmobile/Kconfig -+++ b/arch/arm/cpu/armv7/rmobile/Kconfig -@@ -2,7 +2,6 @@ if RMOBILE - - choice - prompt "Renesus ARM SoCs board select" -- optional - - config TARGET_ARMADILLO_800EVA - bool "armadillo 800 eva board" -diff --git a/arch/arm/cpu/armv7/s5pc1xx/Kconfig b/arch/arm/cpu/armv7/s5pc1xx/Kconfig -index 792ef59..65cc9eb 100644 ---- a/arch/arm/cpu/armv7/s5pc1xx/Kconfig -+++ b/arch/arm/cpu/armv7/s5pc1xx/Kconfig -@@ -2,7 +2,6 @@ if ARCH_S5PC1XX - - choice - prompt "S5PC1XX board select" -- optional - - config TARGET_S5P_GONI - bool "S5P Goni board" -diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig -index bbf4228..5dc2cb2 100644 ---- a/arch/arm/mach-at91/Kconfig -+++ b/arch/arm/mach-at91/Kconfig -@@ -2,7 +2,6 @@ if ARCH_AT91 - - choice - prompt "Atmel AT91 board select" -- optional - - config TARGET_AT91RM9200EK - bool "Atmel AT91RM9200 evaluation kit" -diff --git a/arch/arm/mach-bcm283x/Kconfig b/arch/arm/mach-bcm283x/Kconfig -index 2315a13..d40f505 100644 ---- a/arch/arm/mach-bcm283x/Kconfig -+++ b/arch/arm/mach-bcm283x/Kconfig -@@ -3,7 +3,6 @@ menu "Broadcom BCM283X family" - - choice - prompt "Broadcom BCM283X board select" -- optional - - config TARGET_RPI - bool "Raspberry Pi" -diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig -index e6cb390..3ef55d3 100644 ---- a/arch/arm/mach-davinci/Kconfig -+++ b/arch/arm/mach-davinci/Kconfig -@@ -2,7 +2,6 @@ if ARCH_DAVINCI - - choice - prompt "DaVinci board select" -- optional - - config TARGET_ENBW_CMC - bool "EnBW CMC board" -diff --git a/arch/arm/mach-integrator/Kconfig b/arch/arm/mach-integrator/Kconfig -index c54d69d..8ffc544 100644 ---- a/arch/arm/mach-integrator/Kconfig -+++ b/arch/arm/mach-integrator/Kconfig -@@ -3,7 +3,6 @@ menu "Integrator Options" - - choice - prompt "Integrator platform select" -- optional - - config ARCH_INTEGRATOR_AP - bool "Support Integrator/AP platform" -@@ -19,7 +18,6 @@ config ARCH_CINTEGRATOR - - choice - prompt "Integrator core module select" -- optional - - config CM720T - bool "Core Module for ARM720T" -diff --git a/arch/arm/mach-keystone/Kconfig b/arch/arm/mach-keystone/Kconfig -index 67f1a33..134ae87 100644 ---- a/arch/arm/mach-keystone/Kconfig -+++ b/arch/arm/mach-keystone/Kconfig -@@ -2,7 +2,6 @@ if ARCH_KEYSTONE - - choice - prompt "TI Keystone board select" -- optional - - config TARGET_K2HK_EVM - bool "TI Keystone 2 Kepler/Hawking EVM" -diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig -index 1261885..45c6687 100644 ---- a/arch/arm/mach-kirkwood/Kconfig -+++ b/arch/arm/mach-kirkwood/Kconfig -@@ -2,7 +2,6 @@ if KIRKWOOD - - choice - prompt "Marvell Kirkwood board select" -- optional - - config TARGET_OPENRD - bool "Marvell OpenRD Board" -diff --git a/arch/arm/mach-nomadik/Kconfig b/arch/arm/mach-nomadik/Kconfig -index ba72a41..265f336 100644 ---- a/arch/arm/mach-nomadik/Kconfig -+++ b/arch/arm/mach-nomadik/Kconfig -@@ -2,7 +2,6 @@ if ARCH_NOMADIK - - choice - prompt "Nomadik board select" -- optional - - config NOMADIK_NHK8815 - bool "ST 8815 Nomadik Hardware Kit" -diff --git a/arch/arm/mach-orion5x/Kconfig b/arch/arm/mach-orion5x/Kconfig -index 7644b8d..291c511 100644 ---- a/arch/arm/mach-orion5x/Kconfig -+++ b/arch/arm/mach-orion5x/Kconfig -@@ -2,7 +2,6 @@ if ORION5X - - choice - prompt "Marvell Orion board select" -- optional - - config TARGET_EDMINIV2 - bool "LaCie Ethernet Disk mini V2" -diff --git a/arch/arm/mach-socfpga/Kconfig b/arch/arm/mach-socfpga/Kconfig -index e46c348..204efca 100644 ---- a/arch/arm/mach-socfpga/Kconfig -+++ b/arch/arm/mach-socfpga/Kconfig -@@ -2,7 +2,6 @@ if ARCH_SOCFPGA - - choice - prompt "Altera SOCFPGA board select" -- optional - - config TARGET_SOCFPGA_ARRIA5 - bool "Altera SOCFPGA Arria V" -diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig -index 54bd648..ef77c84 100644 ---- a/arch/arm/mach-tegra/Kconfig -+++ b/arch/arm/mach-tegra/Kconfig -@@ -2,7 +2,6 @@ if TEGRA - - choice - prompt "Tegra SoC select" -- optional - - config TEGRA20 - bool "Tegra20 family" -diff --git a/arch/arm/mach-tegra/tegra114/Kconfig b/arch/arm/mach-tegra/tegra114/Kconfig -index 1047b92..31012bc 100644 ---- a/arch/arm/mach-tegra/tegra114/Kconfig -+++ b/arch/arm/mach-tegra/tegra114/Kconfig -@@ -2,7 +2,6 @@ if TEGRA114 - - choice - prompt "Tegra114 board select" -- optional - - config TARGET_DALMORE - bool "NVIDIA Tegra114 Dalmore evaluation board" -diff --git a/arch/arm/mach-tegra/tegra124/Kconfig b/arch/arm/mach-tegra/tegra124/Kconfig -index f3324ff..86c1301 100644 ---- a/arch/arm/mach-tegra/tegra124/Kconfig -+++ b/arch/arm/mach-tegra/tegra124/Kconfig -@@ -2,7 +2,6 @@ if TEGRA124 - - choice - prompt "Tegra124 board select" -- optional - - config TARGET_JETSON_TK1 - bool "NVIDIA Tegra124 Jetson TK1 board" -diff --git a/arch/arm/mach-tegra/tegra20/Kconfig b/arch/arm/mach-tegra/tegra20/Kconfig -index 1bb8dff..7f09f81 100644 ---- a/arch/arm/mach-tegra/tegra20/Kconfig -+++ b/arch/arm/mach-tegra/tegra20/Kconfig -@@ -2,7 +2,6 @@ if TEGRA20 - - choice - prompt "Tegra20 board select" -- optional - - config TARGET_HARMONY - bool "NVIDIA Tegra20 Harmony evaluation board" -diff --git a/arch/arm/mach-tegra/tegra30/Kconfig b/arch/arm/mach-tegra/tegra30/Kconfig -index e78331e..3abdc7b 100644 ---- a/arch/arm/mach-tegra/tegra30/Kconfig -+++ b/arch/arm/mach-tegra/tegra30/Kconfig -@@ -2,7 +2,6 @@ if TEGRA30 - - choice - prompt "Tegra30 board select" -- optional - - config TARGET_APALIS_T30 - bool "Toradex Apalis T30 board" -diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig -index 1de5b07..6b0e295 100644 ---- a/arch/arm/mach-zynq/Kconfig -+++ b/arch/arm/mach-zynq/Kconfig -@@ -10,7 +10,6 @@ config ZYNQ_CUSTOM_INIT - - choice - prompt "Xilinx Zynq board select" -- optional - - config TARGET_ZYNQ_ZED - bool "Zynq ZedBoard" -diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig -index eb33774..801b9cc 100644 ---- a/arch/avr32/Kconfig -+++ b/arch/avr32/Kconfig -@@ -6,7 +6,6 @@ config SYS_ARCH - - choice - prompt "Target select" -- optional - - config TARGET_ATNGW100 - bool "Support atngw100" -diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig -index 0a2fb4d..31913fe 100644 ---- a/arch/blackfin/Kconfig -+++ b/arch/blackfin/Kconfig -@@ -6,7 +6,6 @@ config SYS_ARCH - - choice - prompt "Target select" -- optional - - config TARGET_BCT_BRETTL2 - bool "Support bct-brettl2" -diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig -index 26509b7..69cb0f7 100644 ---- a/arch/m68k/Kconfig -+++ b/arch/m68k/Kconfig -@@ -114,7 +114,6 @@ config M548x - - choice - prompt "Target select" -- optional - - config TARGET_M52277EVB - bool "Support M52277EVB" -diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig -index 077b2a7..6f419f0 100644 ---- a/arch/microblaze/Kconfig -+++ b/arch/microblaze/Kconfig -@@ -6,7 +6,6 @@ config SYS_ARCH - - choice - prompt "Target select" -- optional - - config TARGET_MICROBLAZE_GENERIC - bool "Support microblaze-generic" -diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig -index 7f7e258..87b94ac 100644 ---- a/arch/mips/Kconfig -+++ b/arch/mips/Kconfig -@@ -10,7 +10,6 @@ config SYS_CPU - - choice - prompt "Target select" -- optional - - config TARGET_QEMU_MIPS - bool "Support qemu-mips" -diff --git a/arch/nds32/Kconfig b/arch/nds32/Kconfig -index 98b0282..81b0a01 100644 ---- a/arch/nds32/Kconfig -+++ b/arch/nds32/Kconfig -@@ -6,7 +6,6 @@ config SYS_ARCH - - choice - prompt "Target select" -- optional - - config TARGET_ADP_AG101 - bool "Support adp-ag101" -diff --git a/arch/nios2/Kconfig b/arch/nios2/Kconfig -index 8ae7f6e..b3be7b5 100644 ---- a/arch/nios2/Kconfig -+++ b/arch/nios2/Kconfig -@@ -6,7 +6,6 @@ config SYS_ARCH - - choice - prompt "Target select" -- optional - - config TARGET_NIOS2_GENERIC - bool "Support nios2-generic" -diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig -index 11014d1..4d62b4c 100644 ---- a/arch/openrisc/Kconfig -+++ b/arch/openrisc/Kconfig -@@ -6,7 +6,6 @@ config SYS_ARCH - - choice - prompt "Target select" -- optional - - config TARGET_OPENRISC_GENERIC - bool "Support openrisc-generic" -diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig -index 3b3f446..8e5a3e2 100644 ---- a/arch/powerpc/Kconfig -+++ b/arch/powerpc/Kconfig -@@ -6,7 +6,6 @@ config SYS_ARCH - - choice - prompt "CPU select" -- optional - - config MPC512X - bool "MPC512X" -diff --git a/arch/powerpc/cpu/mpc512x/Kconfig b/arch/powerpc/cpu/mpc512x/Kconfig -index 53450ae..a0f0ede 100644 ---- a/arch/powerpc/cpu/mpc512x/Kconfig -+++ b/arch/powerpc/cpu/mpc512x/Kconfig -@@ -6,7 +6,6 @@ config SYS_CPU - - choice - prompt "Target select" -- optional - - config TARGET_PDM360NG - bool "Support pdm360ng" -diff --git a/arch/powerpc/cpu/mpc5xx/Kconfig b/arch/powerpc/cpu/mpc5xx/Kconfig -index 5275447..aad4a7c 100644 ---- a/arch/powerpc/cpu/mpc5xx/Kconfig -+++ b/arch/powerpc/cpu/mpc5xx/Kconfig -@@ -6,7 +6,6 @@ config SYS_CPU - - choice - prompt "Target select" -- optional - - config TARGET_CMI_MPC5XX - bool "Support cmi_mpc5xx" -diff --git a/arch/powerpc/cpu/mpc5xxx/Kconfig b/arch/powerpc/cpu/mpc5xxx/Kconfig -index 5d49228..eec9d7d 100644 ---- a/arch/powerpc/cpu/mpc5xxx/Kconfig -+++ b/arch/powerpc/cpu/mpc5xxx/Kconfig -@@ -6,7 +6,6 @@ config SYS_CPU - - choice - prompt "Target select" -- optional - - config TARGET_A3M071 - bool "Support a3m071" -diff --git a/arch/powerpc/cpu/mpc8260/Kconfig b/arch/powerpc/cpu/mpc8260/Kconfig -index e93732d..55941c8 100644 ---- a/arch/powerpc/cpu/mpc8260/Kconfig -+++ b/arch/powerpc/cpu/mpc8260/Kconfig -@@ -6,7 +6,6 @@ config SYS_CPU - - choice - prompt "Target select" -- optional - - config TARGET_KM82XX - bool "Support km82xx" -diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig -index 3fb901f..88a3bd6 100644 ---- a/arch/powerpc/cpu/mpc83xx/Kconfig -+++ b/arch/powerpc/cpu/mpc83xx/Kconfig -@@ -6,7 +6,6 @@ config SYS_CPU - - choice - prompt "Target select" -- optional - - config TARGET_MPC8308_P1M - bool "Support mpc8308_p1m" -diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig -index 3e8d0b1..aff5fdb 100644 ---- a/arch/powerpc/cpu/mpc85xx/Kconfig -+++ b/arch/powerpc/cpu/mpc85xx/Kconfig -@@ -6,7 +6,6 @@ config SYS_CPU - - choice - prompt "Target select" -- optional - - config TARGET_SBC8548 - bool "Support sbc8548" -diff --git a/arch/powerpc/cpu/mpc86xx/Kconfig b/arch/powerpc/cpu/mpc86xx/Kconfig -index fe1859d..14e8b1a 100644 ---- a/arch/powerpc/cpu/mpc86xx/Kconfig -+++ b/arch/powerpc/cpu/mpc86xx/Kconfig -@@ -6,7 +6,6 @@ config SYS_CPU - - choice - prompt "Target select" -- optional - - config TARGET_SBC8641D - bool "Support sbc8641d" -diff --git a/arch/powerpc/cpu/mpc8xx/Kconfig b/arch/powerpc/cpu/mpc8xx/Kconfig -index 79cee35..e8bcbe9 100644 ---- a/arch/powerpc/cpu/mpc8xx/Kconfig -+++ b/arch/powerpc/cpu/mpc8xx/Kconfig -@@ -6,7 +6,6 @@ config SYS_CPU - - choice - prompt "Target select" -- optional - - config TARGET_TQM823L - bool "Support TQM823L" -diff --git a/arch/powerpc/cpu/ppc4xx/Kconfig b/arch/powerpc/cpu/ppc4xx/Kconfig -index 10b86e0..4d5954a 100644 ---- a/arch/powerpc/cpu/ppc4xx/Kconfig -+++ b/arch/powerpc/cpu/ppc4xx/Kconfig -@@ -6,7 +6,6 @@ config SYS_CPU - - choice - prompt "Target select" -- optional - - config TARGET_CSB272 - bool "Support csb272" -diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig -index 6ac22af..ff8f5b5 100644 ---- a/arch/sh/Kconfig -+++ b/arch/sh/Kconfig -@@ -29,7 +29,6 @@ config SH_32BIT - - choice - prompt "Target select" -- optional - - config TARGET_RSK7203 - bool "RSK+ 7203" -diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig -index 04dc08f..2df09b2 100644 ---- a/arch/sparc/Kconfig -+++ b/arch/sparc/Kconfig -@@ -14,7 +14,6 @@ config LEON3 - - choice - prompt "Board select" -- optional - - config TARGET_GRSIM_LEON2 - bool "GRSIM simulating a LEON2 board" -diff --git a/board/amcc/canyonlands/Kconfig b/board/amcc/canyonlands/Kconfig -index a655dbc..ef66ad4 100644 ---- a/board/amcc/canyonlands/Kconfig -+++ b/board/amcc/canyonlands/Kconfig -@@ -11,7 +11,6 @@ config SYS_CONFIG_NAME - - choice BOARD_TYPE - prompt "Select which board to build for" -- optional - - config CANYONLANDS - bool "Glacier" -diff --git a/board/coreboot/Kconfig b/board/coreboot/Kconfig -index ede6065..dc9b70f 100644 ---- a/board/coreboot/Kconfig -+++ b/board/coreboot/Kconfig -@@ -8,7 +8,6 @@ if VENDOR_COREBOOT - - choice - prompt "Mainboard model" -- optional - - config TARGET_COREBOOT - bool "coreboot" -diff --git a/board/dbau1x00/Kconfig b/board/dbau1x00/Kconfig -index b813adb..1286e45 100644 ---- a/board/dbau1x00/Kconfig -+++ b/board/dbau1x00/Kconfig -@@ -13,7 +13,6 @@ menu "dbau1x00 board options" - - choice - prompt "Select au1x00 SoC type" -- optional - - config DBAU1100 - bool "Select AU1100" -diff --git a/board/google/Kconfig b/board/google/Kconfig -index e9559c9..302f68e 100644 ---- a/board/google/Kconfig -+++ b/board/google/Kconfig -@@ -8,7 +8,6 @@ if VENDOR_GOOGLE - - choice - prompt "Mainboard model" -- optional - - config TARGET_CHROMEBOOK_LINK - bool "Chromebook link" -diff --git a/board/intel/Kconfig b/board/intel/Kconfig -index 3d9ecf0..7fe21b9 100644 ---- a/board/intel/Kconfig -+++ b/board/intel/Kconfig -@@ -8,7 +8,6 @@ if VENDOR_INTEL - - choice - prompt "Mainboard model" -- optional - - config TARGET_CROWNBAY - bool "Crown Bay" -diff --git a/board/micronas/vct/Kconfig b/board/micronas/vct/Kconfig -index c518079..288a1ae 100644 ---- a/board/micronas/vct/Kconfig -+++ b/board/micronas/vct/Kconfig -@@ -13,7 +13,6 @@ menu "vct board options" - - choice - prompt "Board variant" -- optional - - config VCT_PLATINUM - bool "Enable VCT_PLATINUM" -diff --git a/board/seco/Kconfig b/board/seco/Kconfig -index af16697..dcb1ac8 100644 ---- a/board/seco/Kconfig -+++ b/board/seco/Kconfig -@@ -2,7 +2,6 @@ if TARGET_SECOMX6 - - choice - prompt "SECO i.MX6 Board variant" -- optional - - config SECOMX6_Q7 - bool "Q7" -@@ -17,7 +16,6 @@ endchoice - - choice - prompt "SECO i.MX6 SoC variant" -- optional - - config SECOMX6Q - bool "i.MX6Q" -diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig -index 2a1cd3c..808de26 100644 ---- a/board/sunxi/Kconfig -+++ b/board/sunxi/Kconfig -@@ -18,7 +18,6 @@ config SUNXI_GEN_SUN6I - - choice - prompt "Sunxi SoC Variant" -- optional - - config MACH_SUN4I - bool "sun4i (Allwinner A10)" --- -2.4.3 - diff --git a/buildroot/boot/uboot/2016.07/0001-arc-Use-mcpu-XXX-instead-of-obsolete-marcXXX.patch b/buildroot/boot/uboot/2016.07/0001-arc-Use-mcpu-XXX-instead-of-obsolete-marcXXX.patch deleted file mode 100644 index eded9a3128..0000000000 --- a/buildroot/boot/uboot/2016.07/0001-arc-Use-mcpu-XXX-instead-of-obsolete-marcXXX.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 7c8d81605302e7d7fdd3e7d8eb69302bddc64a2c Mon Sep 17 00:00:00 2001 -From: Alexey Brodkin -Date: Fri, 16 Sep 2016 12:12:26 +0300 -Subject: [PATCH] arc: Use -mcpu=XXX instead of obsolete -marcXXX - -With newer ARC tools old way of CPU specification gets obsolete, -so we're switching to newer and more common way of setting "-mcpu". - -Signed-off-by: Alexey Brodkin ---- - arch/arc/config.mk | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/arch/arc/config.mk b/arch/arc/config.mk -index 7c974f0..13676bd 100644 ---- a/arch/arc/config.mk -+++ b/arch/arc/config.mk -@@ -31,15 +31,15 @@ CONFIG_MMU = 1 - endif - - ifdef CONFIG_CPU_ARC750D --PLATFORM_CPPFLAGS += -marc700 -+PLATFORM_CPPFLAGS += -mcpu=arc700 - endif - - ifdef CONFIG_CPU_ARC770D --PLATFORM_CPPFLAGS += -marc700 -mlock -mswape -+PLATFORM_CPPFLAGS += -mcpu=arc700 -mlock -mswape - endif - - ifdef CONFIG_CPU_ARCEM6 --PLATFORM_CPPFLAGS += -marcem -+PLATFORM_CPPFLAGS += -mcpu=arcem - endif - - ifdef CONFIG_CPU_ARCHS34 --- -2.7.4 - diff --git a/buildroot/boot/uboot/2016.09.01/0001-arc-Use-mcpu-XXX-instead-of-obsolete-marcXXX.patch b/buildroot/boot/uboot/2016.09.01/0001-arc-Use-mcpu-XXX-instead-of-obsolete-marcXXX.patch deleted file mode 100644 index eded9a3128..0000000000 --- a/buildroot/boot/uboot/2016.09.01/0001-arc-Use-mcpu-XXX-instead-of-obsolete-marcXXX.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 7c8d81605302e7d7fdd3e7d8eb69302bddc64a2c Mon Sep 17 00:00:00 2001 -From: Alexey Brodkin -Date: Fri, 16 Sep 2016 12:12:26 +0300 -Subject: [PATCH] arc: Use -mcpu=XXX instead of obsolete -marcXXX - -With newer ARC tools old way of CPU specification gets obsolete, -so we're switching to newer and more common way of setting "-mcpu". - -Signed-off-by: Alexey Brodkin ---- - arch/arc/config.mk | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/arch/arc/config.mk b/arch/arc/config.mk -index 7c974f0..13676bd 100644 ---- a/arch/arc/config.mk -+++ b/arch/arc/config.mk -@@ -31,15 +31,15 @@ CONFIG_MMU = 1 - endif - - ifdef CONFIG_CPU_ARC750D --PLATFORM_CPPFLAGS += -marc700 -+PLATFORM_CPPFLAGS += -mcpu=arc700 - endif - - ifdef CONFIG_CPU_ARC770D --PLATFORM_CPPFLAGS += -marc700 -mlock -mswape -+PLATFORM_CPPFLAGS += -mcpu=arc700 -mlock -mswape - endif - - ifdef CONFIG_CPU_ARCEM6 --PLATFORM_CPPFLAGS += -marcem -+PLATFORM_CPPFLAGS += -mcpu=arcem - endif - - ifdef CONFIG_CPU_ARCHS34 --- -2.7.4 - diff --git a/buildroot/boot/uboot/Config.in b/buildroot/boot/uboot/Config.in index 953c36135e..8648d6eb7e 100644 --- a/buildroot/boot/uboot/Config.in +++ b/buildroot/boot/uboot/Config.in @@ -3,7 +3,7 @@ config BR2_TARGET_UBOOT help Build "Das U-Boot" Boot Monitor - https://www.denx.de/wiki/U-Boot + https://docs.u-boot.org/en/latest/ if BR2_TARGET_UBOOT choice @@ -41,7 +41,7 @@ choice Select the specific U-Boot version you want to use config BR2_TARGET_UBOOT_LATEST_VERSION - bool "2022.01" + bool "2024.10" config BR2_TARGET_UBOOT_CUSTOM_VERSION bool "Custom version" @@ -85,7 +85,7 @@ endif config BR2_TARGET_UBOOT_VERSION string - default "2022.01" if BR2_TARGET_UBOOT_LATEST_VERSION + default "2024.10" if BR2_TARGET_UBOOT_LATEST_VERSION default BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE \ if BR2_TARGET_UBOOT_CUSTOM_VERSION default "custom" if BR2_TARGET_UBOOT_CUSTOM_TARBALL @@ -136,6 +136,42 @@ config BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES that will be merged to the main U-Boot configuration file. endif +# Hidden boolean that allows to select BR2_TARGET_UBOOT_NEEDS_XXD when +# needed. +config BR2_TARGET_UBOOT_DEFAULT_ENV_FILE_ENABLED + bool + default y if BR2_TARGET_UBOOT_DEFAULT_ENV_FILE != "" + select BR2_TARGET_UBOOT_NEEDS_XXD + +config BR2_TARGET_UBOOT_DEFAULT_ENV_FILE + string "Text file with default environment" + depends on BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG + help + Text file containing the variables to be used as the default + environment in U-Boot. + + If empty, let U-Boot generate the default environment from the + source code and other U-Boot configuration values, which is + the default behaviour. + + If set to the path to a file, instructs U-Boot to define the + entire U-Boot default environment from the provided file, + disabling all the default behaviour. + + From the U-Boot documentation: + + The format is the same as accepted by the mkenvimage tool, + with lines containing key=value pairs. Blank lines and + lines beginning with '#' are ignored. + + Based on the USE_DEFAULT_ENV_FILE and DEFAULT_ENV_FILE U-Boot + configuration variables. + + For more info see: + https://docs.u-boot.org/en/latest/usage/environment.html#external-environment-file + + Requires U-Boot >= v2018.05. + config BR2_TARGET_UBOOT_NEEDS_DTC bool "U-Boot needs dtc" select BR2_PACKAGE_HOST_DTC @@ -182,6 +218,30 @@ config BR2_TARGET_UBOOT_NEEDS_LZOP the case when the board configuration has CONFIG_SPL_LZO enabled. +config BR2_TARGET_UBOOT_NEEDS_GNUTLS + bool "U-Boot needs gnutls" + help + Select this option if your U-Boot board configuration + requires gnutls to be available on the host. This is + typically the case when the board configuration has + CONFIG_TOOLS_MKEFICAPSULE enabled. + +config BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX + bool "U-Boot needs util-linux" + help + Select this option if your U-Boot board configuration + requires util-linux (-luuid) to be available on the host. + This is typically the case when the board configuration + has CONFIG_TOOLS_MKEFICAPSULE enabled. + +config BR2_TARGET_UBOOT_NEEDS_XXD + bool "U-Boot needs xxd" + help + Select this option if your U-Boot board configuration + requires xxd to be available on the host. This is + typically the case when the board configuration has + CONFIG_USE_DEFAULT_ENV_FILE enabled. + config BR2_TARGET_UBOOT_NEEDS_ATF_BL31 bool "U-Boot needs ATF BL31" depends on BR2_TARGET_ARM_TRUSTED_FIRMWARE @@ -238,6 +298,25 @@ config BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE This option makes sure that the i.MX firmwares are copied into the U-Boot source directory. +config BR2_TARGET_UBOOT_NEEDS_ROCKCHIP_RKBIN + bool "U-Boot needs rockchip-rkbin" + depends on BR2_PACKAGE_ROCKCHIP_RKBIN + help + For some Rockchip SoCs U-Boot needs binary blobs from + Rockchip. + This option makes sure that the needed binary blobs are copied + into the U-Boot source directory. + +config BR2_TARGET_UBOOT_USE_BINMAN + bool "U-Boot use binman" + select BR2_TARGET_UBOOT_NEEDS_PYTHON3 + select BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS + select BR2_TARGET_UBOOT_NEEDS_PYLIBFDT + help + Use binman tool for generation and signing of boot images. + + https://docs.u-boot.org/en/v2024.10/develop/package/binman.html + menu "U-Boot binary format" config BR2_TARGET_UBOOT_FORMAT_AIS @@ -261,7 +340,19 @@ config BR2_TARGET_UBOOT_FORMAT_NAND_BIN bool "u-boot-nand.bin" config BR2_TARGET_UBOOT_FORMAT_ELF + bool "u-boot" + help + Install the u-boot image, which is directly the ELF binary + for the main U-Boot, potentially with debugging symbols. + +config BR2_TARGET_UBOOT_FORMAT_REMAKE_ELF bool "u-boot.elf" + help + Install the u-boot.elf image, which is produced when + CONFIG_REMAKE_ELF=y. It is an ELF image (u-boot.elf) + produced from the raw U-Boot binary (u-boot.bin), which may + already have been statically relocated and may already have + a device-tree appended to it. config BR2_TARGET_UBOOT_FORMAT_IMG bool "u-boot.img" @@ -359,6 +450,16 @@ config BR2_TARGET_UBOOT_FORMAT_STM32 bool "u-boot.stm32" depends on BR2_arm +if BR2_TARGET_UBOOT_FORMAT_STM32 +config BR2_TARGET_UBOOT_BUILD_FORMAT_STM32_LEGACY + bool "Legacy build (u-boot.stm32 target)" + help + Select this option if you use U-Boot with version older than + 2022.01), so that we use the old build target. Otherwise, + binman application is called to create the stm32 binary + format. +endif + config BR2_TARGET_UBOOT_FORMAT_CUSTOM bool "Custom (specify below)" help @@ -414,7 +515,6 @@ endif config BR2_TARGET_UBOOT_SPL bool "Install U-Boot SPL binary image" - depends on !BR2_TARGET_XLOADER help Install the U-Boot SPL binary image to the images directory. @@ -433,6 +533,13 @@ config BR2_TARGET_UBOOT_SPL_NAME and TPL name is tpl/u-boot-tpl.bin but not always. SPL name is MLO on OMAP and SPL on i.MX6 for example. +config BR2_TARGET_UBOOT_INITIAL_ENV + bool "Install u-boot-initial-env" + help + Install the U-Boot u-boot-initial-env on the target. + + This file is typically required by libubootenv. + config BR2_TARGET_UBOOT_ZYNQMP bool "Boot on the Xilinx ZynqMP SoCs" depends on BR2_aarch64 @@ -441,9 +548,23 @@ config BR2_TARGET_UBOOT_ZYNQMP if BR2_TARGET_UBOOT_ZYNQMP +config BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT + bool "xilinx-prebuilt pmufw.elf" + depends on BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG + depends on BR2_TARGET_XILINX_PREBUILT_ZYNQMP || BR2_TARGET_XILINX_PREBUILT_KRIA + help + Use xilinx-prebuilt boot package for downloading prebuilt + zynqmp pmufw.elf from + https://github.com/Xilinx/soc-prebuilt-firmware repo. + + U-Boot build process will generate a boot.bin (to be loaded by + by the ZynqMP boot ROM) containing both the U-Boot SPL and the + PMU firmware in the Xilinx-specific boot format. + config BR2_TARGET_UBOOT_ZYNQMP_PMUFW - string "PMU firmware location" + string "Custom PMU firmware location" depends on BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG + depends on !BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT help Location of a PMU firmware binary. @@ -457,6 +578,8 @@ config BR2_TARGET_UBOOT_ZYNQMP_PMUFW (e.g. http://...), and it will be downloaded and used from the download directory. + The PMU firmware binary can be either in ELF or BIN format. + If empty, the generated boot.bin will not contain a PMU firmware. diff --git a/buildroot/boot/uboot/uboot.hash b/buildroot/boot/uboot/uboot.hash index 9171a794a1..af025a583e 100644 --- a/buildroot/boot/uboot/uboot.hash +++ b/buildroot/boot/uboot/uboot.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 81b4543227db228c03f8a1bf5ddbc813b0bb8f6555ce46064ef721a6fc680413 u-boot-2022.01.tar.bz2 +sha256 b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0 u-boot-2024.10.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Licenses/gpl-2.0.txt diff --git a/buildroot/boot/uboot/uboot.mk b/buildroot/boot/uboot/uboot.mk index cb26fc8d3e..d8faef648f 100644 --- a/buildroot/boot/uboot/uboot.mk +++ b/buildroot/boot/uboot/uboot.mk @@ -20,7 +20,7 @@ UBOOT_INSTALL_IMAGES = YES UBOOT_DEPENDENCIES = host-pkgconf $(BR2_MAKE_HOST_DEPENDENCY) UBOOT_MAKE = $(BR2_MAKE) -ifeq ($(UBOOT_VERSION),custom) +ifeq ($(BR2_TARGET_UBOOT_CUSTOM_TARBALL),y) # Handle custom U-Boot tarballs as specified by the configuration UBOOT_TARBALL = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION)) UBOOT_SITE = $(patsubst %/,%,$(dir $(UBOOT_TARBALL))) @@ -54,12 +54,16 @@ endif ifeq ($(BR2_TARGET_UBOOT_FORMAT_ELF),y) UBOOT_BINS += u-boot -# To make elf usable for debuging on ARC use special target +# To make elf usable for debugging on ARC use special target ifeq ($(BR2_arc),y) UBOOT_MAKE_TARGET += mdbtrick endif endif +ifeq ($(BR2_TARGET_UBOOT_FORMAT_REMAKE_ELF),y) +UBOOT_BINS += u-boot.elf +endif + # Call 'make all' unconditionally UBOOT_MAKE_TARGET += all @@ -129,8 +133,18 @@ endif ifeq ($(BR2_TARGET_UBOOT_FORMAT_STM32),y) UBOOT_BINS += u-boot.stm32 +ifeq ($(BR2_TARGET_UBOOT_BUILD_FORMAT_STM32_LEGACY),y) UBOOT_MAKE_TARGET += u-boot.stm32 endif +endif + +ifeq ($(BR2_TARGET_UBOOT_INITIAL_ENV),y) +UBOOT_MAKE_TARGET += u-boot-initial-env +define UBOOT_INSTALL_UBOOT_INITIAL_ENV + $(INSTALL) -D -m 0644 $(@D)/u-boot-initial-env $(TARGET_DIR)/etc/u-boot-initial-env +endef +UBOOT_POST_INSTALL_TARGET_HOOKS += UBOOT_INSTALL_UBOOT_INITIAL_ENV +endif ifeq ($(BR2_TARGET_UBOOT_FORMAT_CUSTOM),y) UBOOT_BINS += $(call qstrip,$(BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME)) @@ -158,6 +172,11 @@ UBOOT_MAKE_OPTS += \ HOSTLDFLAGS="$(HOST_LDFLAGS)" \ $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS)) +# Disable FDPIC if enabled by default in toolchain +ifeq ($(BR2_BINFMT_FDPIC),y) +UBOOT_MAKE_OPTS += KCFLAGS=-mno-fdpic +endif + ifeq ($(BR2_TARGET_UBOOT_NEEDS_ATF_BL31),y) UBOOT_DEPENDENCIES += arm-trusted-firmware ifeq ($(BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF),y) @@ -180,6 +199,14 @@ UBOOT_DEPENDENCIES += optee-os UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/tee.elf endif +# TI K3 devices needs at least ti-sysfw (System Firmware) provided +# by ti-k3-boot-firmware when built with u-boot's binman tool. +# Some TI K3 devices using a split firmware boot flow (AM62, +# j721e) also need the Device Manager (DM) firmware. +ifeq ($(BR2_TARGET_TI_K3_BOOT_FIRMWARE),y) +UBOOT_DEPENDENCIES += ti-k3-boot-firmware +endif + ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y) UBOOT_DEPENDENCIES += opensbi UBOOT_MAKE_OPTS += OPENSBI=$(BINARIES_DIR)/fw_dynamic.bin @@ -203,8 +230,26 @@ endef UBOOT_PRE_BUILD_HOOKS += UBOOT_COPY_IMX_FW_FILES endif +ifeq ($(BR2_TARGET_UBOOT_NEEDS_ROCKCHIP_RKBIN),y) +UBOOT_DEPENDENCIES += rockchip-rkbin +define UBOOT_INSTALL_UBOOT_ROCKCHIP_BIN + $(INSTALL) -D -m 0644 $(@D)/u-boot-rockchip.bin $(BINARIES_DIR)/u-boot-rockchip.bin +endef +UBOOT_POST_INSTALL_IMAGES_HOOKS += UBOOT_INSTALL_UBOOT_ROCKCHIP_BIN +ifneq ($(ROCKCHIP_RKBIN_BL31_FILENAME),) +UBOOT_MAKE_OPTS += BL31=$(BINARIES_DIR)/$(notdir $(ROCKCHIP_RKBIN_BL31_FILENAME)) +endif +ifneq ($(ROCKCHIP_RKBIN_TPL_FILENAME),) +UBOOT_MAKE_OPTS += ROCKCHIP_TPL=$(BINARIES_DIR)/$(notdir $(ROCKCHIP_RKBIN_TPL_FILENAME)) +endif +ifneq ($(ROCKCHIP_RKBIN_TEE_FILENAME),) +UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/$(notdir $(ROCKCHIP_RKBIN_TEE_FILENAME)) +endif +endif + ifeq ($(BR2_TARGET_UBOOT_NEEDS_DTC),y) UBOOT_DEPENDENCIES += host-dtc +UBOOT_MAKE_OPTS += DTC=$(HOST_DIR)/bin/dtc endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON3),y) @@ -212,7 +257,7 @@ UBOOT_DEPENDENCIES += host-python3 host-python-setuptools endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYLIBFDT),y) -UBOOT_DEPENDENCIES += host-swig +UBOOT_DEPENDENCIES += host-python-pylibfdt endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS),y) @@ -227,6 +272,28 @@ ifeq ($(BR2_TARGET_UBOOT_NEEDS_LZOP),y) UBOOT_DEPENDENCIES += host-lzop endif +ifeq ($(BR2_TARGET_UBOOT_NEEDS_GNUTLS),y) +UBOOT_DEPENDENCIES += host-gnutls +endif + +ifeq ($(BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX),y) +UBOOT_DEPENDENCIES += host-util-linux +endif + +ifeq ($(BR2_TARGET_UBOOT_NEEDS_XXD),y) +UBOOT_DEPENDENCIES += host-vim +endif + +ifeq ($(BR2_TARGET_UBOOT_USE_BINMAN),y) +# https://source.denx.de/u-boot/u-boot/-/blob/v2024.04/tools/binman/binman.rst?plain=1#L377 +# https://source.denx.de/u-boot/u-boot/-/blob/v2024.04/tools/buildman/requirements.txt +UBOOT_DEPENDENCIES += \ + host-python-jsonschema \ + host-python-pyyaml \ + host-python-yamllint +UBOOT_MAKE_OPTS += BINMAN_INDIRS=$(BINARIES_DIR) +endif + # prior to u-boot 2013.10 the license info was in COPYING. Copy it so # legal-info finds it define UBOOT_COPY_OLD_LICENSE_FILE @@ -328,6 +395,14 @@ UBOOT_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig # override again. In addition, host-ccache is not ready at kconfig # time, so use HOSTCC_NOCCACHE. UBOOT_KCONFIG_OPTS = $(UBOOT_MAKE_OPTS) HOSTCC="$(HOSTCC_NOCCACHE)" HOSTLDFLAGS="" + +ifeq ($(BR2_TARGET_UBOOT_DEFAULT_ENV_FILE_ENABLED),y) +UBOOT_DEFAULT_ENV_FILE = $(call qstrip,$(BR2_TARGET_UBOOT_DEFAULT_ENV_FILE)) +define UBOOT_KCONFIG_DEFAULT_ENV_FILE + $(call KCONFIG_SET_OPT,CONFIG_USE_DEFAULT_ENV_FILE,y) + $(call KCONFIG_SET_OPT,CONFIG_DEFAULT_ENV_FILE,"$(shell readlink -f $(UBOOT_DEFAULT_ENV_FILE))") +endef +endif endif # BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY UBOOT_CUSTOM_DTS_PATH = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_DTS_PATH)) @@ -374,6 +449,10 @@ endef ifeq ($(BR2_TARGET_UBOOT_ZYNQMP),y) +ifeq ($(BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT),y) +UBOOT_DEPENDENCIES += xilinx-prebuilt +UBOOT_ZYNQMP_PMUFW_PATH = $(BINARIES_DIR)/pmufw.elf +else UBOOT_ZYNQMP_PMUFW = $(call qstrip,$(BR2_TARGET_UBOOT_ZYNQMP_PMUFW)) ifneq ($(findstring ://,$(UBOOT_ZYNQMP_PMUFW)),) @@ -382,10 +461,23 @@ BR_NO_CHECK_HASH_FOR += $(notdir $(UBOOT_ZYNQMP_PMUFW)) UBOOT_ZYNQMP_PMUFW_PATH = $(UBOOT_DL_DIR)/$(notdir $(UBOOT_ZYNQMP_PMUFW)) else ifneq ($(UBOOT_ZYNQMP_PMUFW),) UBOOT_ZYNQMP_PMUFW_PATH = $(shell readlink -f $(UBOOT_ZYNQMP_PMUFW)) -endif +endif #ifneq ($(findstring ://,$(UBOOT_ZYNQMP_PMUFW)),) +endif #BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT + +ifeq ($(suffix $(UBOOT_ZYNQMP_PMUFW_PATH)),.elf) +UBOOT_ZYNQMP_PMUFW_PATH_FINAL = $(basename $(UBOOT_ZYNQMP_PMUFW_PATH)).bin +# objcopy is arch-agnostic so we can use $(TARGET_OBJCOPY) in lack of a +# microblaze objcopy +define UBOOT_ZYNQMP_PMUFW_CONVERT + $(TARGET_OBJCOPY) -O binary -I elf32-little $(UBOOT_ZYNQMP_PMUFW_PATH) $(UBOOT_ZYNQMP_PMUFW_PATH_FINAL) +endef +UBOOT_PRE_BUILD_HOOKS += UBOOT_ZYNQMP_PMUFW_CONVERT +else +UBOOT_ZYNQMP_PMUFW_PATH_FINAL = $(UBOOT_ZYNQMP_PMUFW_PATH) +endif define UBOOT_ZYNQMP_KCONFIG_PMUFW - $(call KCONFIG_SET_OPT,CONFIG_PMUFW_INIT_FILE,"$(UBOOT_ZYNQMP_PMUFW_PATH)") + $(call KCONFIG_SET_OPT,CONFIG_PMUFW_INIT_FILE,"$(UBOOT_ZYNQMP_PMUFW_PATH_FINAL)") endef UBOOT_ZYNQMP_PM_CFG = $(call qstrip,$(BR2_TARGET_UBOOT_ZYNQMP_PM_CFG)) @@ -457,6 +549,7 @@ define UBOOT_KCONFIG_FIXUP_CMDS $(UBOOT_ZYNQMP_KCONFIG_PMUFW) $(UBOOT_ZYNQMP_KCONFIG_PM_CFG) $(UBOOT_ZYNQMP_KCONFIG_PSU_INIT) + $(UBOOT_KCONFIG_DEFAULT_ENV_FILE) endef ifeq ($(BR2_TARGET_UBOOT)$(BR_BUILDING),yy) diff --git a/buildroot/boot/vexpress-firmware/vexpress-firmware.hash b/buildroot/boot/vexpress-firmware/vexpress-firmware.hash index ac636e1512..26d1ccc6e5 100644 --- a/buildroot/boot/vexpress-firmware/vexpress-firmware.hash +++ b/buildroot/boot/vexpress-firmware/vexpress-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 ea92d686e6e211074fb0f62cb5e011f4cfc294c7f6ec9fb27b7d987db7bf51c5 vexpress-firmware-901f81977c3b367a2e0bf3d6444be302822d97a3-br1.tar.gz +sha256 ba3253d422a53e97cff99548956b911eb971c8b28cd767118d563a3c2cd1da39 vexpress-firmware-901f81977c3b367a2e0bf3d6444be302822d97a3-git4.tar.gz diff --git a/buildroot/boot/xilinx-prebuilt/Config.in b/buildroot/boot/xilinx-prebuilt/Config.in new file mode 100644 index 0000000000..94ef3dd111 --- /dev/null +++ b/buildroot/boot/xilinx-prebuilt/Config.in @@ -0,0 +1,73 @@ +config BR2_TARGET_XILINX_PREBUILT + bool "xilinx-prebuilt" + depends on BR2_aarch64 + help + Pre-built firmware files for Xilinx boards. + + https://github.com/Xilinx/soc-prebuilt-firmware + +if BR2_TARGET_XILINX_PREBUILT + +config BR2_TARGET_XILINX_PREBUILT_VERSION + string "prebuilt version" + default "xilinx_v2024.1" + help + Release version of Xilinx firmware. + Must be xilinx_v2023.1 or newer. + +choice + bool "family variant" + default BR2_TARGET_XILINX_PREBUILT_VERSAL if BR2_PACKAGE_VERSAL_FIRMWARE # legacy + default BR2_TARGET_XILINX_PREBUILT_ZYNQMP + +config BR2_TARGET_XILINX_PREBUILT_ZYNQMP + bool "zynqmp" + +config BR2_TARGET_XILINX_PREBUILT_KRIA + bool "kria" + +config BR2_TARGET_XILINX_PREBUILT_VERSAL + bool "versal" + +endchoice + +config BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA + bool "download a prebuilt Versal XSA" + depends on BR2_TARGET_XILINX_PREBUILT_VERSAL + help + The Xilinx Support Archive (XSA) provides custom Xilinx + firmware files generated by the AMD Vivado Design Suite. + + https://docs.amd.com/r/en-US/ug1400-vitis-embedded/Creating-a-Hardware-Design-XSA-File + +if BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA + +config BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA_LOCATION + string "URL of custom XSA" + help + This option allows to specify a URL pointing to an XSA source + file. This URL can use any protocol recognized by Buildroot, + like http://, ftp://, file:// or scp://. + + When pointing to a local XSA using file://, you may want to + use a make variable like $(TOPDIR) to reference the root of + the Buildroot tree. + +endif # BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA + +config BR2_TARGET_XILINX_PREBUILT_FAMILY + string + default "zynqmp" if BR2_TARGET_XILINX_PREBUILT_ZYNQMP + default "kria" if BR2_TARGET_XILINX_PREBUILT_KRIA + default "versal" if BR2_TARGET_XILINX_PREBUILT_VERSAL + +config BR2_TARGET_XILINX_PREBUILT_BOARD + string "board name" + default "zcu102" if BR2_TARGET_XILINX_PREBUILT_ZYNQMP + default "kr260" if BR2_TARGET_XILINX_PREBUILT_KRIA + default "vck190" if BR2_TARGET_XILINX_PREBUILT_VERSAL + help + Name of Xilinx target board. + Used for installing the appropriate firmware. + +endif # BR2_TARGET_XILINX_PREBUILT diff --git a/buildroot/boot/xilinx-prebuilt/xilinx-prebuilt.hash b/buildroot/boot/xilinx-prebuilt/xilinx-prebuilt.hash new file mode 100644 index 0000000000..c955cd79f5 --- /dev/null +++ b/buildroot/boot/xilinx-prebuilt/xilinx-prebuilt.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 7abcba4e0e44e3a4adf9c1f971d918575226d7604dfd64a386baaa00c1c6c35f xilinx-prebuilt-xilinx_v2024.1.tar.gz diff --git a/buildroot/boot/xilinx-prebuilt/xilinx-prebuilt.mk b/buildroot/boot/xilinx-prebuilt/xilinx-prebuilt.mk new file mode 100644 index 0000000000..9f36ee7285 --- /dev/null +++ b/buildroot/boot/xilinx-prebuilt/xilinx-prebuilt.mk @@ -0,0 +1,68 @@ +################################################################################ +# +# xilinx-prebuilt +# +################################################################################ + +XILINX_PREBUILT_VERSION = $(call qstrip,$(BR2_TARGET_XILINX_PREBUILT_VERSION)) + +ifeq ($(BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA),y) +XILINX_PREBUILT_FILE = $(call qstrip,$(BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA_LOCATION)) +XILINX_PREBUILT_SITE = $(patsubst %/,%,$(dir $(XILINX_PREBUILT_FILE))) +XILINX_PREBUILT_SOURCE = $(notdir $(XILINX_PREBUILT_FILE)) +define XILINX_PREBUILT_EXTRACT_CMDS + $(UNZIP) $(XILINX_PREBUILT_DL_DIR)/$(XILINX_PREBUILT_SOURCE) -d $(@D) +endef +else # BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA +XILINX_PREBUILT_SITE = $(call github,Xilinx,soc-prebuilt-firmware,$(XILINX_PREBUILT_VERSION)) +XILINX_PREBUILT_LICENSE = MIT +XILINX_PREBUILT_LICENSE_FILES = LICENSE +endif # BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA + +XILINX_PREBUILT_INSTALL_TARGET = NO +XILINX_PREBUILT_INSTALL_IMAGES = YES + +XILINX_PREBUILT_FAMILY = $(call qstrip,$(BR2_TARGET_XILINX_PREBUILT_FAMILY)) +XILINX_PREBUILT_BOARD = $(call qstrip,$(BR2_TARGET_XILINX_PREBUILT_BOARD)) + +XILINX_PREBUILT_BOARD_DIR = $(@D)/$(XILINX_PREBUILT_BOARD)-$(XILINX_PREBUILT_FAMILY) + +ifeq ($(BR2_TARGET_XILINX_PREBUILT_VERSAL),y) +# We need the *.pdi glob, because the file has different names for the +# different boards, but there is only one, and it has to be named +# vpl_gen_fixed.pdi when installed. +ifeq ($(BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA),y) +XILINX_PREBUILT_PLM = $(@D)/pdi_files/gen_files/plm.elf +# Unlike the psmfw.elf file for Xilinx development boards, +# AMD Vivado Design Suite currently generates a file named psm_fw.elf. +# Future versions of AMD Vivado will generate a file named psmfw.elf, +# so to support current and future AMD Vivado versions, the filename +# psm*fw.elf is used. +XILINX_PREBUILT_PSMFW = $(@D)/pdi_files/static_files/psm*fw.elf +XILINX_PREBUILT_PDI = $(@D)/*.pdi +else # BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA +XILINX_PREBUILT_PLM = $(XILINX_PREBUILT_BOARD_DIR)/plm.elf +XILINX_PREBUILT_PSMFW = $(XILINX_PREBUILT_BOARD_DIR)/psmfw.elf +XILINX_PREBUILT_PDI = $(XILINX_PREBUILT_BOARD_DIR)/*.pdi +endif # BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA + +define XILINX_PREBUILT_INSTALL + $(INSTALL) -D -m 0755 $(XILINX_PREBUILT_PLM) \ + $(BINARIES_DIR)/plm.elf + $(INSTALL) -D -m 0755 $(XILINX_PREBUILT_PSMFW) \ + $(BINARIES_DIR)/psmfw.elf + $(INSTALL) -D -m 0755 $(XILINX_PREBUILT_PDI) \ + $(BINARIES_DIR)/vpl_gen_fixed.pdi +endef +else # BR2_TARGET_XILINX_PREBUILT_VERSAL +define XILINX_PREBUILT_INSTALL + $(INSTALL) -D -m 0755 $(XILINX_PREBUILT_BOARD_DIR)/pmufw.elf \ + $(BINARIES_DIR)/pmufw.elf +endef +endif # BR2_TARGET_XILINX_PREBUILT_VERSAL + +define XILINX_PREBUILT_INSTALL_IMAGES_CMDS + $(XILINX_PREBUILT_INSTALL) +endef + +$(eval $(generic-package)) diff --git a/buildroot/configs/aarch64_efi_defconfig b/buildroot/configs/aarch64_efi_defconfig index 1bd06c51f3..9f284ff74b 100644 --- a/buildroot/configs/aarch64_efi_defconfig +++ b/buildroot/configs/aarch64_efi_defconfig @@ -1,37 +1,21 @@ -# Architecture BR2_aarch64=y - -# Toolchain, required for eudev and grub -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y - -# System +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_10=y +BR2_GLOBAL_PATCH_DIR="board/aarch64-efi/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y - -## Required tools to create bootable media -BR2_PACKAGE_HOST_GENIMAGE=y - -# Bootloader -BR2_TARGET_GRUB2=y -BR2_TARGET_GRUB2_ARM64_EFI=y - -# Filesystem / image -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="200M" -# BR2_TARGET_ROOTFS_TAR is not set BR2_ROOTFS_POST_IMAGE_SCRIPT="board/aarch64-efi/post-image.sh support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/aarch64-efi/genimage-efi.cfg" - -# Linux headers same as kernel, a 5.15 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.10.12" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Host tools for genimage +BR2_LINUX_KERNEL_NEEDS_HOST_PYTHON3=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="200M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_GRUB2=y BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/acmesystems_acqua_a5_256mb_defconfig b/buildroot/configs/acmesystems_acqua_a5_256mb_defconfig index f8129f3780..b102dde0ba 100644 --- a/buildroot/configs/acmesystems_acqua_a5_256mb_defconfig +++ b/buildroot/configs/acmesystems_acqua_a5_256mb_defconfig @@ -2,13 +2,15 @@ BR2_arm=y BR2_cortex_a5=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/acmesystems/acqua-a5/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/acmesystems/acqua-a5/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.107" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.30" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts" diff --git a/buildroot/configs/acmesystems_acqua_a5_512mb_defconfig b/buildroot/configs/acmesystems_acqua_a5_512mb_defconfig index e399d4a9ff..da54eaf620 100644 --- a/buildroot/configs/acmesystems_acqua_a5_512mb_defconfig +++ b/buildroot/configs/acmesystems_acqua_a5_512mb_defconfig @@ -2,13 +2,15 @@ BR2_arm=y BR2_cortex_a5=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/acmesystems/acqua-a5/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/acmesystems/acqua-a5/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.107" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.30" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts" diff --git a/buildroot/configs/acmesystems_aria_g25_128mb_defconfig b/buildroot/configs/acmesystems_aria_g25_128mb_defconfig index c428e318d2..0aff8f92e0 100644 --- a/buildroot/configs/acmesystems_aria_g25_128mb_defconfig +++ b/buildroot/configs/acmesystems_aria_g25_128mb_defconfig @@ -1,38 +1,26 @@ -# Architecture BR2_arm=y -BR2_arm926t=y - -# Kernel headers BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y - -# System configuration +BR2_GLOBAL_PATCH_DIR="board/acmesystems/aria-g25/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_ISSUE="Welcome to Aria-G25 Buildroot" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/acmesystems/aria-g25/genimage.cfg" - -# Kernel configuration BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.216" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.315" BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-ariag25" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Root filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y - -# AT91bootstrap bootloader BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.3" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="aria-128m" - -# Tools to build sdcard.img BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/acmesystems_aria_g25_256mb_defconfig b/buildroot/configs/acmesystems_aria_g25_256mb_defconfig index 83f7625dc7..e75ca9cf34 100644 --- a/buildroot/configs/acmesystems_aria_g25_256mb_defconfig +++ b/buildroot/configs/acmesystems_aria_g25_256mb_defconfig @@ -1,38 +1,26 @@ -# Architecture BR2_arm=y -BR2_arm926t=y - -# Kernel headers BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y - -# System configuration +BR2_GLOBAL_PATCH_DIR="board/acmesystems/aria-g25/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_ISSUE="Welcome to Aria-G25 Buildroot" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/acmesystems/aria-g25/genimage.cfg" - -# Kernel configuration BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.216" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.315" BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-ariag25" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Root filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y - -# AT91bootstrap bootloader BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.3" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="aria-256m" - -# Tools to build sdcard.img BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/acmesystems_arietta_g25_128mb_defconfig b/buildroot/configs/acmesystems_arietta_g25_128mb_defconfig index b882b2bdb2..788818c118 100644 --- a/buildroot/configs/acmesystems_arietta_g25_128mb_defconfig +++ b/buildroot/configs/acmesystems_arietta_g25_128mb_defconfig @@ -1,38 +1,26 @@ -# Architecture BR2_arm=y -BR2_arm926t=y - -# Kernel headers BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y - -# System configuration +BR2_GLOBAL_PATCH_DIR="board/acmesystems/arietta-g25/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_ISSUE="Welcome to Arietta-G25 Buildroot" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/acmesystems/arietta-g25/genimage.cfg" - -# Kernel configuration BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.216" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.315" BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-ariettag25" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Root filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y - -# AT91bootstrap bootloader BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.3" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="arietta-128m" - -# Tools to build sdcard.img BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/acmesystems_arietta_g25_256mb_defconfig b/buildroot/configs/acmesystems_arietta_g25_256mb_defconfig index 10501d462c..c483ae4c57 100644 --- a/buildroot/configs/acmesystems_arietta_g25_256mb_defconfig +++ b/buildroot/configs/acmesystems_arietta_g25_256mb_defconfig @@ -1,38 +1,26 @@ -# Architecture BR2_arm=y -BR2_arm926t=y - -# Kernel headers BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y - -# System configuration +BR2_GLOBAL_PATCH_DIR="board/acmesystems/arietta-g25/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_ISSUE="Welcome to Arietta-G25 Buildroot" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/acmesystems/arietta-g25/genimage.cfg" - -# Kernel configuration BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.216" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.315" BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-ariettag25" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Root filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y - -# AT91bootstrap bootloader BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.3" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="arietta-256m" - -# Tools to build sdcard.img BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/am574x_idk_defconfig b/buildroot/configs/am574x_idk_defconfig new file mode 100644 index 0000000000..5d3ec12ad6 --- /dev/null +++ b/buildroot/configs/am574x_idk_defconfig @@ -0,0 +1,30 @@ +BR2_arm=y +BR2_cortex_a15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am574x-idk/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am574x-idk/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.14" +BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/omap/am574x-idk" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am57xx_evm" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_IMG=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="MLO" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/amarula_a64_relic_defconfig b/buildroot/configs/amarula_a64_relic_defconfig deleted file mode 100644 index 304a3ef824..0000000000 --- a/buildroot/configs/amarula_a64_relic_defconfig +++ /dev/null @@ -1,63 +0,0 @@ -BR2_aarch64=y -BR2_cortex_a53=y -BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 4.17 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_17=y - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.07" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="amarula_a64_relic" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,amarula,linux-amarula,v1.0a)/linux-amarula_v1.0a.tar.gz" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-amarula-relic" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to Amarula A64-Relic" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_ANDROID_TOOLS=y -BR2_PACKAGE_HOST_ANDROID_TOOLS_FASTBOOT=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/amarula/a64-relic/genimage.cfg" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/amarula/a64-relic/post-build.sh" -BR2_ROOTFS_OVERLAY="board/amarula/a64-relic/rootfs_overlay" - -# wireless firmware -BR2_PACKAGE_LINUX_FIRMWARE=y -BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XX=y - -# wireless tools -BR2_PACKAGE_IW=y -BR2_PACKAGE_WPA_SUPPLICANT=y -BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y -BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y -BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y diff --git a/buildroot/configs/amarula_vyasa_rk3288_defconfig b/buildroot/configs/amarula_vyasa_rk3288_defconfig index ff96019e1e..f59d78a5b9 100644 --- a/buildroot/configs/amarula_vyasa_rk3288_defconfig +++ b/buildroot/configs/amarula_vyasa_rk3288_defconfig @@ -1,47 +1,38 @@ -# Architecture BR2_arm=y BR2_cortex_a17=y BR2_ARM_FPU_NEON_VFPV4=y - -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="vyasa-rk3288" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_NEEDS_OPENSSL=y -BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin tpl/u-boot-tpl.bin" - -# Kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_GLOBAL_PATCH_DIR="board/amarula/vyasa/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_TARGET_GENERIC_HOSTNAME="vyasa-rk3288" +BR2_TARGET_GENERIC_ISSUE="Welcome to VYASA RK3288!" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/amarula/vyasa/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/amarula/vyasa/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.91" BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/amarula/vyasa/linux_gmac.fragment" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x02000000" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="rk3288-vyasa" BR2_LINUX_KERNEL_INSTALL_TARGET=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/amarula/vyasa/linux_gmac.fragment" - -# Filesystem -BR2_TARGET_GENERIC_HOSTNAME="vyasa-rk3288" -BR2_TARGET_GENERIC_ISSUE="Welcome to VYASA RK3288!" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="512M" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="vyasa-rk3288" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin tpl/u-boot-tpl.bin" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/amarula/vyasa/genimage.cfg" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/amarula/vyasa/post-build.sh" diff --git a/buildroot/configs/andes_ae350_45_defconfig b/buildroot/configs/andes_ae350_45_defconfig new file mode 100644 index 0000000000..7b5a6f73c6 --- /dev/null +++ b/buildroot/configs/andes_ae350_45_defconfig @@ -0,0 +1,40 @@ +BR2_riscv=y +BR2_RISCV_ISA_RVC=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y +BR2_GLOBAL_PATCH_DIR="board/andes/ae350/patches" +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_ROOTFS_OVERLAY="board/andes/ae350/rootfs_overlay" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/andes/ae350/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/andes/ae350/genimage_sdcard.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,andestech,linux,v6.0.y_ae350-ax45mp)/linux-v6.0.y_ae350-ax45mp.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="ae350_ax45mp" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="andes/ae350_ax45mp" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_CUSTOM_TARBALL=y +BR2_TARGET_OPENSBI_CUSTOM_TARBALL_LOCATION="$(call github,riscv,opensbi,22f38ee6c658a660083aa45c4ec6c72f66a17260)/opensbi-22f38ee6c658a660083aa45c4ec6c72f66a17260.tar.gz" +BR2_TARGET_OPENSBI_PLAT="andes/ae350" +# BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,u-boot,u-boot,a5dfa3b8a0f7ad555495bad1386613d2de4ba619)/u-boot-a5dfa3b8a0f7ad555495bad1386613d2de4ba619.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="ae350_rv64_spl_xip" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/andes/ae350/uboot.config.fragment" +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" +BR2_TARGET_UBOOT_SPL=y +BR2_PACKAGE_HOST_ANDES_SPI_BURN=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/andes_ae3xx_defconfig b/buildroot/configs/andes_ae3xx_defconfig deleted file mode 100644 index 52634caa50..0000000000 --- a/buildroot/configs/andes_ae3xx_defconfig +++ /dev/null @@ -1,10 +0,0 @@ -BR2_nds32=y -BR2_GLOBAL_PATCH_DIR="board/andes/patches/" -BR2_TOOLCHAIN_EXTERNAL=y -BR2_TOOLCHAIN_EXTERNAL_ANDES_NDS32=y -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/andes/ae3xx/ae3xx.fragment" -BR2_TARGET_ROOTFS_INITRAMFS=y diff --git a/buildroot/configs/arcturus_ucls1012a_defconfig b/buildroot/configs/arcturus_ucls1012a_defconfig index fd33ebf1f6..72f308c86d 100644 --- a/buildroot/configs/arcturus_ucls1012a_defconfig +++ b/buildroot/configs/arcturus_ucls1012a_defconfig @@ -1,36 +1,23 @@ -# Architecture BR2_aarch64=y - -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y - -# System settings +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y BR2_TARGET_GENERIC_HOSTNAME="ucls1012a" BR2_TARGET_GENERIC_ISSUE="Welcome to uCLS1012A-SOM" BR2_SYSTEM_DHCP="eth0" -BR2_ROOTFS_OVERLAY="board/arcturus/aarch64-ucls1012a/rootfs_overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="board/arcturus/aarch64-ucls1012a/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/arcturus/aarch64-ucls1012a/post-image.sh" - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v.20.31)/linux-v.20.31.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v.22.06)/linux-v.22.06.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="ucls1012a" +BR2_LINUX_KERNEL_IMAGEGZ=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="arcturus/arc-ucls1012a" - -# Filesystem BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_CPIO_GZIP=y - -# U-boot BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v.20.31)/uboot-v.20.31.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v.22.06)/uboot-v.22.06.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="UCLS1012A_QSPI128" - -# Tools BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y diff --git a/buildroot/configs/arcturus_ucp1020_defconfig b/buildroot/configs/arcturus_ucp1020_defconfig index 8b90f44750..8e489f7f19 100644 --- a/buildroot/configs/arcturus_ucp1020_defconfig +++ b/buildroot/configs/arcturus_ucp1020_defconfig @@ -1,28 +1,17 @@ -# Architecture BR2_powerpc=y BR2_powerpc_8548=y - -# Linux headers same as kernel, a 4.4 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y - -# System settings BR2_TARGET_GENERIC_HOSTNAME="UCP1020" BR2_TARGET_GENERIC_ISSUE="Welcome to Arcturus uCP1020 System on Module" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_SYSTEM_DHCP="eth0" - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCP1020-kernel,v20190618)/linux-v20190618.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="ucp1020" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="ucp1020" - -# Filesystem BR2_TARGET_ROOTFS_JFFS2=y - -# U-boot BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y diff --git a/buildroot/configs/arm_foundationv8_defconfig b/buildroot/configs/arm_foundationv8_defconfig index 363f288b87..d4e7ca0dd4 100644 --- a/buildroot/configs/arm_foundationv8_defconfig +++ b/buildroot/configs/arm_foundationv8_defconfig @@ -1,15 +1,16 @@ BR2_aarch64=y -# Linux headers same as kernel, a 5.9 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_8=y +BR2_GLOBAL_PATCH_DIR="board/arm/foundation-v8/patches" BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.9.11" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.8.10" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="arm/foundation-v8-gicv3-psci" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_SIZE="128M" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_BOOT_WRAPPER_AARCH64=y BR2_TARGET_BOOT_WRAPPER_AARCH64_DTS="arm/foundation-v8-gicv3-psci" diff --git a/buildroot/configs/arm_fvp_ebbr_defconfig b/buildroot/configs/arm_fvp_ebbr_defconfig new file mode 100644 index 0000000000..5aa1727889 --- /dev/null +++ b/buildroot/configs/arm_fvp_ebbr_defconfig @@ -0,0 +1,42 @@ +BR2_aarch64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_10=y +BR2_GLOBAL_PATCH_DIR="board/arm/fvp-ebbr/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/arm/fvp-ebbr/post-image.sh support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/arm/fvp-ebbr/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.10.12" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_NEEDS_HOST_PYTHON3=y +BR2_PACKAGE_OPTEE_CLIENT=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="200M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.11" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="fvp" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_DTS_PATH="board/arm/fvp-ebbr/fvp-ebbr.dts" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="ARM_TSP_RAM_LOCATION=tdram FVP_DT_PREFIX=fvp-ebbr" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y +BR2_TARGET_GRUB2=y +BR2_TARGET_OPTEE_OS=y +BR2_TARGET_OPTEE_OS_NEEDS_DTC=y +BR2_TARGET_OPTEE_OS_PLATFORM="vexpress-fvp" +BR2_TARGET_OPTEE_OS_ADDITIONAL_VARIABLES="CFG_ARM_GICV3=y" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="vexpress_fvp" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/arm/fvp-ebbr/u-boot.fragment" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/arm_juno_defconfig b/buildroot/configs/arm_juno_defconfig deleted file mode 100644 index 5832986779..0000000000 --- a/buildroot/configs/arm_juno_defconfig +++ /dev/null @@ -1,23 +0,0 @@ -BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_6=y -BR2_TARGET_GENERIC_HOSTNAME="juno-buildroot" -BR2_TARGET_GENERIC_ISSUE="Welcome to SNPS Juno by Buildroot" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.6" -BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/arm/juno/linux-juno-defconfig" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="arm/juno arm/juno-r1 arm/juno-r2" -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.4" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="juno" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BOARDNAME="vexpress_aemv8a_juno" -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.03" -BR2_TARGET_VEXPRESS_FIRMWARE=y diff --git a/buildroot/configs/armadeus_apf27_defconfig b/buildroot/configs/armadeus_apf27_defconfig index 457a14b02d..1bb7c446ed 100644 --- a/buildroot/configs/armadeus_apf27_defconfig +++ b/buildroot/configs/armadeus_apf27_defconfig @@ -1,32 +1,22 @@ -# Architecture BR2_arm=y -BR2_arm926t=y - -# Linux headers same as kernel, a 4.12 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_12=y - -# System +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_GLOBAL_PATCH_DIR="board/armadeus/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_HOSTNAME="apf27" BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !" BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" - -# Filesystem -BR2_TARGET_ROOTFS_UBIFS=y -BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047 -BR2_TARGET_ROOTFS_UBI=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.215" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/armadeus/apf27/linux-4.12.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/armadeus/apf27/linux-5.10.config" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0xA0008000" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx27-apf27dev" - -# U-boot +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_UBI=y +BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047 BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y diff --git a/buildroot/configs/armadeus_apf28_defconfig b/buildroot/configs/armadeus_apf28_defconfig index 01e14e6618..4db1c558cc 100644 --- a/buildroot/configs/armadeus_apf28_defconfig +++ b/buildroot/configs/armadeus_apf28_defconfig @@ -1,28 +1,20 @@ -# Architecture BR2_arm=y -BR2_arm926t=y - -# Linux headers same as kernel, a 4.9 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y - -# System +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_GLOBAL_PATCH_DIR="board/armadeus/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_HOSTNAME="apf28" BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !" BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.289" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.215" BR2_LINUX_KERNEL_DEFCONFIG="mxs" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x40008000" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx28-apf28dev" - -# Filesystem -BR2_TARGET_ROOTFS_UBIFS=y -BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000 -BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=4227 +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_UBI=y BR2_TARGET_ROOTFS_UBI_SUBSIZE=0 +BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000 +BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=4227 diff --git a/buildroot/configs/armadeus_apf51_defconfig b/buildroot/configs/armadeus_apf51_defconfig index aa7c2f84ae..0d9d4f2bc6 100644 --- a/buildroot/configs/armadeus_apf51_defconfig +++ b/buildroot/configs/armadeus_apf51_defconfig @@ -1,27 +1,20 @@ -# Architecture BR2_arm=y BR2_cortex_a8=y - -# Linux headers same as kernel, a 4.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y - -# System +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_GLOBAL_PATCH_DIR="board/armadeus/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_HOSTNAME="apf51" BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !" BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2" - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.291" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.215" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/armadeus/apf51/linux-4.4.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/armadeus/apf51/linux-5.10.config" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x90008000" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx51-apf51dev" - -# Filesystem -BR2_TARGET_ROOTFS_UBIFS=y -BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=135301 +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_UBI=y +BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=135301 diff --git a/buildroot/configs/aspeed_ast2500evb_defconfig b/buildroot/configs/aspeed_ast2500evb_defconfig new file mode 100644 index 0000000000..2312242e64 --- /dev/null +++ b/buildroot/configs/aspeed_ast2500evb_defconfig @@ -0,0 +1,29 @@ +BR2_arm=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y +BR2_TARGET_GENERIC_HOSTNAME="aspeed-evb" +BR2_TARGET_GENERIC_ISSUE="Aspeed EVB" +BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/aspeed/common/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" +BR2_LINUX_KERNEL_DEFCONFIG="aspeed_g5" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/aspeed/ast2500-evb/linux.fragment" +BR2_LINUX_KERNEL_XZ=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="aspeed-ast2500-evb" +BR2_PACKAGE_MTD=y +BR2_TARGET_ROOTFS_CPIO=y +BR2_TARGET_ROOTFS_CPIO_XZ=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="evb-ast2500" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/aspeed/ast2500-evb/uboot.fragment" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=ast2500-evb" +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y diff --git a/buildroot/configs/aspeed_ast2600evb_defconfig b/buildroot/configs/aspeed_ast2600evb_defconfig new file mode 100644 index 0000000000..104f685200 --- /dev/null +++ b/buildroot/configs/aspeed_ast2600evb_defconfig @@ -0,0 +1,27 @@ +BR2_arm=y +BR2_cortex_a7=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y +BR2_TARGET_GENERIC_HOSTNAME="aspeed-evb" +BR2_TARGET_GENERIC_ISSUE="Aspeed EVB" +BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/aspeed/common/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" +BR2_LINUX_KERNEL_DEFCONFIG="aspeed_g5" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="aspeed-ast2600-evb" +BR2_PACKAGE_MTD=y +BR2_TARGET_ROOTFS_CPIO=y +BR2_TARGET_ROOTFS_CPIO_XZ=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_GIT=y +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/openbmc/u-boot.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="f2b82fa4ba17ed8091fe76c284220006645a293b" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="evb-ast2600" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=ast2600a1-evb" +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y diff --git a/buildroot/configs/asus_tinker-s_rk3288_defconfig b/buildroot/configs/asus_tinker-s_rk3288_defconfig new file mode 100644 index 0000000000..1027a65379 --- /dev/null +++ b/buildroot/configs/asus_tinker-s_rk3288_defconfig @@ -0,0 +1,34 @@ +BR2_arm=y +BR2_cortex_a17=y +BR2_ARM_FPU_NEON_VFPV4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_TARGET_GENERIC_HOSTNAME="tinker-rk3288-s" +BR2_TARGET_GENERIC_ISSUE="Welcome to TINKER S RK3288!" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/asus/tinker-s/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/asus/tinker/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.79" +BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rk3288-tinker-s" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="512M" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="tinker-s-rk3288" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin tpl/u-boot-tpl.bin" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/buildroot/configs/asus_tinker_rk3288_defconfig b/buildroot/configs/asus_tinker_rk3288_defconfig index 6963fa939f..f3a2c4d71d 100644 --- a/buildroot/configs/asus_tinker_rk3288_defconfig +++ b/buildroot/configs/asus_tinker_rk3288_defconfig @@ -1,47 +1,34 @@ -# Architecture BR2_arm=y BR2_cortex_a17=y BR2_ARM_FPU_NEON_VFPV4=y - -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="tinker-rk3288" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_NEEDS_OPENSSL=y -BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y -BR2_TARGET_UBOOT_FORMAT_DTB_BIN=y -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin" - -# Kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_TARGET_GENERIC_HOSTNAME="tinker-rk3288" +BR2_TARGET_GENERIC_ISSUE="Welcome to TINKER RK3288!" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/asus/tinker/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/asus/tinker/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" -BR2_LINUX_KERNEL_UIMAGE=y -BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x02000000" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="rk3288-tinker" BR2_LINUX_KERNEL_INSTALL_TARGET=y - -# Filesystem -BR2_TARGET_GENERIC_HOSTNAME="tinker-rk3288" -BR2_TARGET_GENERIC_ISSUE="Welcome to TINKER RK3288!" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="512M" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.07" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="tinker-rk3288" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin tpl/u-boot-tpl.bin" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/asus/tinker/genimage.cfg" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/asus/tinker/post-build.sh" diff --git a/buildroot/configs/at91sam9260eknf_defconfig b/buildroot/configs/at91sam9260eknf_defconfig index b795ad6eff..d505d5b212 100644 --- a/buildroot/configs/at91sam9260eknf_defconfig +++ b/buildroot/configs/at91sam9260eknf_defconfig @@ -1,23 +1,12 @@ -# Architecture BR2_arm=y -BR2_arm926t=y - -# Linux headers same as kernel, a 4.8 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.6" BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91sam9260ek" - -# Filesystem -BR2_TARGET_ROOTFS_UBIFS=y BR2_TARGET_ROOTFS_UBI=y - -# Bootloaders BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" @@ -28,6 +17,4 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="at91sam9260ek_nandflash" - -# Host packages BR2_PACKAGE_HOST_SAM_BA=y diff --git a/buildroot/configs/at91sam9g20dfc_defconfig b/buildroot/configs/at91sam9g20dfc_defconfig index 46626d857a..6a79c95682 100644 --- a/buildroot/configs/at91sam9g20dfc_defconfig +++ b/buildroot/configs/at91sam9g20dfc_defconfig @@ -1,29 +1,13 @@ -# Architecture BR2_arm=y -BR2_arm926t=y - -# Linux headers same as kernel, a 4.8 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.6" BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91sam9g20ek" - -# Filesystem -BR2_TARGET_ROOTFS_TAR=y BR2_TARGET_ROOTFS_UBI=y -BR2_TARGET_ROOTFS_UBI_PEBSIZE=0x20000 -BR2_TARGET_ROOTFS_UBI_SUBSIZE=512 -BR2_TARGET_ROOTFS_UBIFS=y -BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f800 -BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE=0x800 BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047 - -# Bootloaders BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" @@ -34,6 +18,4 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="at91sam9g20ek_nandflash" - -# Host packages BR2_PACKAGE_HOST_SAM_BA=y diff --git a/buildroot/configs/at91sam9g45m10ek_defconfig b/buildroot/configs/at91sam9g45m10ek_defconfig index bf0771bc14..7072e5a689 100644 --- a/buildroot/configs/at91sam9g45m10ek_defconfig +++ b/buildroot/configs/at91sam9g45m10ek_defconfig @@ -1,24 +1,13 @@ -# Architecture BR2_arm=y -BR2_arm926t=y - -# Linux headers same as kernel, a 4.8 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.6" BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91sam9m10g45ek" - -# Filesystem -BR2_TARGET_ROOTFS_UBIFS=y -BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047 BR2_TARGET_ROOTFS_UBI=y - -# Bootloaders +BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047 BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" @@ -29,6 +18,4 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="at91sam9m10g45ek_nandflash" - -# Host packages BR2_PACKAGE_HOST_SAM_BA=y diff --git a/buildroot/configs/at91sam9rlek_defconfig b/buildroot/configs/at91sam9rlek_defconfig index 5c0fdc5993..8a1cb46e16 100644 --- a/buildroot/configs/at91sam9rlek_defconfig +++ b/buildroot/configs/at91sam9rlek_defconfig @@ -1,24 +1,13 @@ -# Architecture BR2_arm=y -BR2_arm926t=y - -# Linux headers same as kernel, a 4.8 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.6" BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91sam9rlek" - -# Filesystem -BR2_TARGET_ROOTFS_UBIFS=y -BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047 BR2_TARGET_ROOTFS_UBI=y - -# Bootloaders +BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047 BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" @@ -29,6 +18,4 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="at91sam9rlek_nandflash" - -# Host packages BR2_PACKAGE_HOST_SAM_BA=y diff --git a/buildroot/configs/at91sam9x5ek_defconfig b/buildroot/configs/at91sam9x5ek_defconfig index 70e2d94826..775fcceae3 100644 --- a/buildroot/configs/at91sam9x5ek_defconfig +++ b/buildroot/configs/at91sam9x5ek_defconfig @@ -1,7 +1,7 @@ BR2_arm=y -BR2_arm926t=y -# Linux headers same as kernel, a 4.4 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +BR2_GLOBAL_PATCH_DIR="board/atmel/at91sam9x5ek/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_6.1)/linux-linux4sam_6.1.tar.gz" @@ -9,10 +9,9 @@ BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91sam9g15ek at91sam9g25ek at91sam9g35ek at91sam9x25ek at91sam9x35ek" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y -BR2_TARGET_ROOTFS_UBIFS=y -BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000 BR2_TARGET_ROOTFS_UBI=y BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 +BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000 BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" diff --git a/buildroot/configs/at91sam9x5ek_dev_defconfig b/buildroot/configs/at91sam9x5ek_dev_defconfig index bfa8e95941..0f29216736 100644 --- a/buildroot/configs/at91sam9x5ek_dev_defconfig +++ b/buildroot/configs/at91sam9x5ek_dev_defconfig @@ -1,21 +1,9 @@ -# Architecture BR2_arm=y -BR2_arm926t=y - -# Toolchain BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y -# Needed for some packages -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y -# Needed for gdb -BR2_PTHREAD_DEBUG=y -# Needed for some packages BR2_TOOLCHAIN_BUILDROOT_CXX=y - -# System Configuration -# Needed for usb-utils +BR2_GLOBAL_PATCH_DIR="board/atmel/at91sam9x5ek/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_6.1)/linux-linux4sam_6.1.tar.gz" @@ -23,8 +11,6 @@ BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91sam9g15ek at91sam9g25ek at91sam9g35ek at91sam9x25ek at91sam9x35ek" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Packages BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y BR2_PACKAGE_ALSA_UTILS=y BR2_PACKAGE_ALSA_UTILS_ALSACONF=y @@ -47,6 +33,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILC3000_FIRMWARE=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_I2C_TOOLS=y BR2_PACKAGE_SETSERIAL=y @@ -73,14 +60,9 @@ BR2_PACKAGE_WPA_SUPPLICANT=y BR2_PACKAGE_BASH=y BR2_PACKAGE_HTOP=y BR2_PACKAGE_VIM=y - -# Filesystem -BR2_TARGET_ROOTFS_UBIFS=y -BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000 BR2_TARGET_ROOTFS_UBI=y BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 - -# Bootloaders +BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000 BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" @@ -93,6 +75,4 @@ BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_6.1" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="at91sam9x5ek_nandflash" BR2_TARGET_UBOOT_NEEDS_DTC=y - -# Host packages BR2_PACKAGE_HOST_SAM_BA=y diff --git a/buildroot/configs/at91sam9x5ek_mmc_defconfig b/buildroot/configs/at91sam9x5ek_mmc_defconfig index 79a300a81b..a6fd7e05fc 100644 --- a/buildroot/configs/at91sam9x5ek_mmc_defconfig +++ b/buildroot/configs/at91sam9x5ek_mmc_defconfig @@ -1,15 +1,9 @@ -# Architecture BR2_arm=y -BR2_arm926t=y - -# Toolchain BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y - -# Creation of the SD card image +BR2_GLOBAL_PATCH_DIR="board/atmel/at91sam9x5ek/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/at91sam9x5ek_mmc/genimage.cfg" - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_6.1)/linux-linux4sam_6.1.tar.gz" @@ -17,12 +11,8 @@ BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91sam9g15ek at91sam9g25ek at91sam9g35ek at91sam9x25ek at91sam9x35ek" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y - -# Bootloaders BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" @@ -35,13 +25,10 @@ BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_6.1" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="at91sam9x5ek_mmc" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE=y BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE="board/atmel/at91sam9x5ek_mmc/uboot-env.txt" BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SIZE="0x4000" - -# Host packages -# Needed to generate the SD card image -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/at91sam9x5ek_mmc_dev_defconfig b/buildroot/configs/at91sam9x5ek_mmc_dev_defconfig index 2e1a5c7f59..344c6c2eae 100644 --- a/buildroot/configs/at91sam9x5ek_mmc_dev_defconfig +++ b/buildroot/configs/at91sam9x5ek_mmc_dev_defconfig @@ -1,24 +1,11 @@ -# Architecture BR2_arm=y -BR2_arm926t=y - -# Toolchain BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y -# Needed for some packages -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y -# Needed for gdb -BR2_PTHREAD_DEBUG=y -# Needed for some packages BR2_TOOLCHAIN_BUILDROOT_CXX=y - -# System Configuration -# Needed for usb-utils +BR2_GLOBAL_PATCH_DIR="board/atmel/at91sam9x5ek/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y -# Creation of the SD card image BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/at91sam9x5ek_mmc/genimage.cfg" - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_6.1)/linux-linux4sam_6.1.tar.gz" @@ -26,8 +13,6 @@ BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91sam9g15ek at91sam9g25ek at91sam9g35ek at91sam9x25ek at91sam9x35ek" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Packages BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y BR2_PACKAGE_ALSA_UTILS=y BR2_PACKAGE_ALSA_UTILS_ALSACONF=y @@ -50,6 +35,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILC3000_FIRMWARE=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_I2C_TOOLS=y BR2_PACKAGE_SETSERIAL=y @@ -76,13 +62,9 @@ BR2_PACKAGE_WPA_SUPPLICANT=y BR2_PACKAGE_BASH=y BR2_PACKAGE_HTOP=y BR2_PACKAGE_VIM=y - -# Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" - -# Bootloaders BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" @@ -95,13 +77,10 @@ BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_6.1" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="at91sam9x5ek_mmc" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE=y BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE="board/atmel/at91sam9x5ek_mmc/uboot-env.txt" BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SIZE="0x4000" - -# Host packages -# Needed to generate the SD card image -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig b/buildroot/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig index ba2fa46790..85ff29771a 100644 --- a/buildroot/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig +++ b/buildroot/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig @@ -4,8 +4,6 @@ BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y -BR2_PTHREAD_DEBUG=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" @@ -39,6 +37,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILC3000_FIRMWARE=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_I2C_TOOLS=y BR2_PACKAGE_RNG_TOOLS=y diff --git a/buildroot/configs/atmel_sama5d2_xplained_mmc_dev_defconfig b/buildroot/configs/atmel_sama5d2_xplained_mmc_dev_defconfig index a8b68ca0a2..8ae53ee71f 100644 --- a/buildroot/configs/atmel_sama5d2_xplained_mmc_dev_defconfig +++ b/buildroot/configs/atmel_sama5d2_xplained_mmc_dev_defconfig @@ -1,27 +1,13 @@ -# Architecture BR2_arm=y BR2_cortex_a5=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y - -# Toolchain BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y -# Needed for some packages -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y -# Needed for gdb -BR2_PTHREAD_DEBUG=y -# Needed for some packages BR2_TOOLCHAIN_BUILDROOT_CXX=y - -# System Configuration -# Needed for usb-utils BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y -# Creation of the SD card image BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d2_xplained_mmc/genimage.cfg" - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux4microchip-2021.10)/linux-linux4microchip-2021.10.tar.gz" @@ -29,8 +15,6 @@ BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d2_xplained" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Packages BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y BR2_PACKAGE_ALSA_UTILS=y BR2_PACKAGE_ALSA_UTILS_ALSACONF=y @@ -53,6 +37,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILC3000_FIRMWARE=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_I2C_TOOLS=y BR2_PACKAGE_SETSERIAL=y @@ -79,13 +64,9 @@ BR2_PACKAGE_WPA_SUPPLICANT=y BR2_PACKAGE_BASH=y BR2_PACKAGE_HTOP=y BR2_PACKAGE_VIM=y - -# Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" - -# Bootloaders BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v4.0.1)/at91bootstrap3-v4.0.1.tar.gz" @@ -96,9 +77,6 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,u-boot-at91,linux4sam_6.2)/u-boot-at91-linux4sam_6.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d2_xplained_mmc" BR2_TARGET_UBOOT_NEEDS_DTC=y - -# Host packages -# Needed to generate the SD card image BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/atmel_sama5d3_xplained_defconfig b/buildroot/configs/atmel_sama5d3_xplained_defconfig index 7ef45db469..969bbaaaab 100644 --- a/buildroot/configs/atmel_sama5d3_xplained_defconfig +++ b/buildroot/configs/atmel_sama5d3_xplained_defconfig @@ -10,10 +10,9 @@ BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d3_xplained" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y -BR2_TARGET_ROOTFS_UBIFS=y -BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000 BR2_TARGET_ROOTFS_UBI=y BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 +BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000 BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v4.0.1)/at91bootstrap3-v4.0.1.tar.gz" diff --git a/buildroot/configs/atmel_sama5d3_xplained_dev_defconfig b/buildroot/configs/atmel_sama5d3_xplained_dev_defconfig index cdfd9de17e..2cbbcdb816 100644 --- a/buildroot/configs/atmel_sama5d3_xplained_dev_defconfig +++ b/buildroot/configs/atmel_sama5d3_xplained_dev_defconfig @@ -1,23 +1,10 @@ -# Architecture BR2_arm=y BR2_cortex_a5=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y - -# Toolchain BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y -# Needed for some packages -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y -# Needed for gdb -BR2_PTHREAD_DEBUG=y -# Needed for some packages BR2_TOOLCHAIN_BUILDROOT_CXX=y - -# System Configuration -# Needed for usb-utils BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux4microchip-2021.10)/linux-linux4microchip-2021.10.tar.gz" @@ -25,8 +12,6 @@ BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d3_xplained" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Packages BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y BR2_PACKAGE_ALSA_UTILS=y BR2_PACKAGE_ALSA_UTILS_ALSACONF=y @@ -49,6 +34,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILC3000_FIRMWARE=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_I2C_TOOLS=y BR2_PACKAGE_SETSERIAL=y @@ -75,14 +61,9 @@ BR2_PACKAGE_WPA_SUPPLICANT=y BR2_PACKAGE_BASH=y BR2_PACKAGE_HTOP=y BR2_PACKAGE_VIM=y - -# Filesystem -BR2_TARGET_ROOTFS_UBIFS=y -BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000 BR2_TARGET_ROOTFS_UBI=y BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 - -# Bootloaders +BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000 BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v4.0.1)/at91bootstrap3-v4.0.1.tar.gz" @@ -93,6 +74,4 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,u-boot-at91,linux4sam_6.2)/u-boot-at91-linux4sam_6.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d3_xplained_nandflash" BR2_TARGET_UBOOT_NEEDS_DTC=y - -# Host packages BR2_PACKAGE_HOST_SAM_BA=y diff --git a/buildroot/configs/atmel_sama5d3_xplained_mmc_dev_defconfig b/buildroot/configs/atmel_sama5d3_xplained_mmc_dev_defconfig index a2205aeefa..bcf49340db 100644 --- a/buildroot/configs/atmel_sama5d3_xplained_mmc_dev_defconfig +++ b/buildroot/configs/atmel_sama5d3_xplained_mmc_dev_defconfig @@ -1,26 +1,12 @@ -# Architecture BR2_arm=y BR2_cortex_a5=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y - -# Toolchain BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y -# Needed for some packages -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y -# Needed for gdb -BR2_PTHREAD_DEBUG=y -# Needed for some packages BR2_TOOLCHAIN_BUILDROOT_CXX=y - -# System Configuration -# Needed for usb-utils BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y -# Creation of the SD card image BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d3_xplained_mmc/genimage.cfg" - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux4microchip-2021.10)/linux-linux4microchip-2021.10.tar.gz" @@ -28,8 +14,6 @@ BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d3_xplained" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Packages BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y BR2_PACKAGE_ALSA_UTILS=y BR2_PACKAGE_ALSA_UTILS_ALSACONF=y @@ -52,6 +36,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILC3000_FIRMWARE=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_I2C_TOOLS=y BR2_PACKAGE_SETSERIAL=y @@ -78,13 +63,9 @@ BR2_PACKAGE_WPA_SUPPLICANT=y BR2_PACKAGE_BASH=y BR2_PACKAGE_HTOP=y BR2_PACKAGE_VIM=y - -# Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" - -# Bootloaders BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v4.0.1)/at91bootstrap3-v4.0.1.tar.gz" @@ -95,9 +76,6 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,u-boot-at91,linux4sam_6.2)/u-boot-at91-linux4sam_6.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d3_xplained_mmc" BR2_TARGET_UBOOT_NEEDS_DTC=y - -# Host packages -# Needed to generate the SD card image BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/atmel_sama5d3xek_defconfig b/buildroot/configs/atmel_sama5d3xek_defconfig index f71e84bf0f..2fcd7e002b 100644 --- a/buildroot/configs/atmel_sama5d3xek_defconfig +++ b/buildroot/configs/atmel_sama5d3xek_defconfig @@ -1,27 +1,17 @@ -# Architecture BR2_arm=y BR2_cortex_a5=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y - -# Toolchain BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_5.8)/linux-linux4sam_5.8.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sama5d31ek sama5d33ek sama5d34ek sama5d35ek sama5d36ek" - -# Filesystem -BR2_TARGET_ROOTFS_UBIFS=y -BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000 BR2_TARGET_ROOTFS_UBI=y BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 - -# Bootloaders +BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000 BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.10.3)/at91bootstrap3-v3.10.3.tar.gz" @@ -33,6 +23,4 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,u-boot-at91,li BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d3xek_nandflash" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_SPL=y - -# Host packages BR2_PACKAGE_HOST_SAM_BA=y diff --git a/buildroot/configs/atmel_sama5d4_xplained_defconfig b/buildroot/configs/atmel_sama5d4_xplained_defconfig index c0b606bc9a..d04d84734f 100644 --- a/buildroot/configs/atmel_sama5d4_xplained_defconfig +++ b/buildroot/configs/atmel_sama5d4_xplained_defconfig @@ -11,13 +11,12 @@ BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d4_xplained" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y -BR2_TARGET_ROOTFS_UBIFS=y -BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x3e000 -BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE=0x1000 -BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2082 BR2_TARGET_ROOTFS_UBI=y BR2_TARGET_ROOTFS_UBI_PEBSIZE=0x40000 BR2_TARGET_ROOTFS_UBI_SUBSIZE=0 +BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x3e000 +BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE=0x1000 +BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2082 BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v4.0.1)/at91bootstrap3-v4.0.1.tar.gz" diff --git a/buildroot/configs/atmel_sama5d4_xplained_dev_defconfig b/buildroot/configs/atmel_sama5d4_xplained_dev_defconfig index f8783f5652..2aa3d8e535 100644 --- a/buildroot/configs/atmel_sama5d4_xplained_dev_defconfig +++ b/buildroot/configs/atmel_sama5d4_xplained_dev_defconfig @@ -1,24 +1,11 @@ -# Architecture BR2_arm=y BR2_cortex_a5=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y - -# Toolchain BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y -# Needed for some packages -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y -# Needed for gdb -BR2_PTHREAD_DEBUG=y -# Needed for some packages BR2_TOOLCHAIN_BUILDROOT_CXX=y - -# System Configuration -# Needed for usb-utils BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux4microchip-2021.10)/linux-linux4microchip-2021.10.tar.gz" @@ -26,8 +13,6 @@ BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d4_xplained" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Packages BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y BR2_PACKAGE_ALSA_UTILS=y BR2_PACKAGE_ALSA_UTILS_ALSACONF=y @@ -50,6 +35,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILC3000_FIRMWARE=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_I2C_TOOLS=y BR2_PACKAGE_SETSERIAL=y @@ -76,17 +62,12 @@ BR2_PACKAGE_WPA_SUPPLICANT=y BR2_PACKAGE_BASH=y BR2_PACKAGE_HTOP=y BR2_PACKAGE_VIM=y - -# Filesystem -BR2_TARGET_ROOTFS_UBIFS=y -BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x3e000 -BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE=0x1000 -BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2082 BR2_TARGET_ROOTFS_UBI=y BR2_TARGET_ROOTFS_UBI_PEBSIZE=0x40000 BR2_TARGET_ROOTFS_UBI_SUBSIZE=0 - -# Bootloaders +BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x3e000 +BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE=0x1000 +BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2082 BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v4.0.1)/at91bootstrap3-v4.0.1.tar.gz" @@ -97,6 +78,4 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,u-boot-at91,linux4sam_6.2)/u-boot-at91-linux4sam_6.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d4_xplained_nandflash" BR2_TARGET_UBOOT_NEEDS_DTC=y - -# Host packages BR2_PACKAGE_HOST_SAM_BA=y diff --git a/buildroot/configs/atmel_sama5d4_xplained_mmc_dev_defconfig b/buildroot/configs/atmel_sama5d4_xplained_mmc_dev_defconfig index b4e99f658a..9226ca560b 100644 --- a/buildroot/configs/atmel_sama5d4_xplained_mmc_dev_defconfig +++ b/buildroot/configs/atmel_sama5d4_xplained_mmc_dev_defconfig @@ -1,27 +1,13 @@ -# Architecture BR2_arm=y BR2_cortex_a5=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y - -# Toolchain BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y -# Needed for some packages -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y -# Needed for gdb -BR2_PTHREAD_DEBUG=y -# Needed for some packages BR2_TOOLCHAIN_BUILDROOT_CXX=y - -# System Configuration -# Needed for usb-utils BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y -# Creation of the SD card image BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d4_xplained_mmc/genimage.cfg" - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux4microchip-2021.10)/linux-linux4microchip-2021.10.tar.gz" @@ -29,8 +15,6 @@ BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d4_xplained" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Packages BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y BR2_PACKAGE_ALSA_UTILS=y BR2_PACKAGE_ALSA_UTILS_ALSACONF=y @@ -53,6 +37,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILC3000_FIRMWARE=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_I2C_TOOLS=y BR2_PACKAGE_SETSERIAL=y @@ -79,13 +64,9 @@ BR2_PACKAGE_WPA_SUPPLICANT=y BR2_PACKAGE_BASH=y BR2_PACKAGE_HTOP=y BR2_PACKAGE_VIM=y - -# Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" - -# Bootloaders BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v4.0.1)/at91bootstrap3-v4.0.1.tar.gz" @@ -96,9 +77,6 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,u-boot-at91,linux4sam_6.2)/u-boot-at91-linux4sam_6.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d4_xplained_mmc" BR2_TARGET_UBOOT_NEEDS_DTC=y - -# Host packages -# Needed to generate the SD card image BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/avenger96_defconfig b/buildroot/configs/avenger96_defconfig index d2c1b9013e..bfec6a5870 100644 --- a/buildroot/configs/avenger96_defconfig +++ b/buildroot/configs/avenger96_defconfig @@ -1,14 +1,14 @@ BR2_arm=y BR2_cortex_a7=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_ROOTFS_OVERLAY="board/arrow/avenger96/overlay/" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/stmicroelectronics/common/stm32mp157/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/stmicroelectronics/common/stm32mp1xx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.22" BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32mp157a-dhcor-avenger96" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="st/stm32mp157a-dhcor-avenger96" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y @@ -17,18 +17,24 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.2" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="lts-v2.8.16" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="stm32mp1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=sp_min DTB_FILE_NAME=stm32mp157a-avenger96.dtb" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_DEBUG=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="*.stm32" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE="u-boot-nodtb.bin" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=sp_min DTB_FILE_NAME=stm32mp157a-dhcor-avenger96.dtb BL33_CFG=$(BINARIES_DIR)/u-boot.dtb" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="fip.bin *.stm32" BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32mp15_trusted" +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set -BR2_TARGET_UBOOT_FORMAT_STM32=y +BR2_TARGET_UBOOT_FORMAT_DTB=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=stm32mp15xx-dhcor-avenger96" BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/buildroot/configs/avnet_rzboard_v2l_defconfig b/buildroot/configs/avnet_rzboard_v2l_defconfig new file mode 100644 index 0000000000..285aef39bc --- /dev/null +++ b/buildroot/configs/avnet_rzboard_v2l_defconfig @@ -0,0 +1,20 @@ +BR2_aarch64=y +BR2_cortex_a55=y +BR2_KERNEL_HEADERS_5_10=y +BR2_TARGET_GENERIC_HOSTNAME="rzboard_v2l" +BR2_TARGET_GENERIC_ISSUE="Welcome to the AVNET RZBoard V2L" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/avnet/rzboard_v2l/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/Avnet/renesas-linux-cip.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="c197622df526c82ae9e3674e06b4092dac33eafa" +BR2_LINUX_KERNEL_DEFCONFIG="rzboard" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="renesas/rzboard" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="64M" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/bananapi_m1_defconfig b/buildroot/configs/bananapi_m1_defconfig deleted file mode 100644 index 2d948ec223..0000000000 --- a/buildroot/configs/bananapi_m1_defconfig +++ /dev/null @@ -1,30 +0,0 @@ -BR2_arm=y -BR2_cortex_a7=y -BR2_ARM_FPU_NEON_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_18=y -BR2_TARGET_GENERIC_ISSUE="Welcome to Bananapi M1" -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/bananapi/bananapi-m1/genimage.cfg" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.18.12" -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-bananapi" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.07" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Bananapi" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/bananapi/bananapi-m1/boot.cmd" -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/bananapi_m1_plus_defconfig b/buildroot/configs/bananapi_m1_plus_defconfig deleted file mode 100644 index 271124f79a..0000000000 --- a/buildroot/configs/bananapi_m1_plus_defconfig +++ /dev/null @@ -1,45 +0,0 @@ -BR2_arm=y -BR2_cortex_a7=y -BR2_ARM_FPU_NEON_VFPV4=y -BR2_GLOBAL_PATCH_DIR="board/sinovoip/m1-plus/patches" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y -BR2_TARGET_GENERIC_HOSTNAME="bananapi" -BR2_TARGET_GENERIC_ISSUE="Welcome to Banana Pi!" -BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" -BR2_ROOTFS_OVERLAY="board/sinovoip/m1-plus/rootfs_overlay" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/sinovoip/m1-plus/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/sinovoip/m1-plus/genimage.cfg" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.3" -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/sinovoip/m1-plus/linux-wifi.fragment" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-bananapi-m1-plus" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y -BR2_PACKAGE_LINUX_FIRMWARE=y -BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=y -BR2_PACKAGE_IW=y -BR2_PACKAGE_WPA_SUPPLICANT=y -BR2_PACKAGE_WPA_SUPPLICANT_CLI=y -BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -# BR2_TARGET_ROOTFS_TAR is not set -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="bananapi_m1_plus" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/sinovoip/m1-plus/boot.cmd" diff --git a/buildroot/configs/bananapi_m2_berry_defconfig b/buildroot/configs/bananapi_m2_berry_defconfig new file mode 100644 index 0000000000..200257ac0d --- /dev/null +++ b/buildroot/configs/bananapi_m2_berry_defconfig @@ -0,0 +1,30 @@ +BR2_arm=y +BR2_cortex_a7=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TARGET_GENERIC_ISSUE="Welcome to Bananapi M2 Berry" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/bananapi/bananapi-m2-berry/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/bananapi/bananapi-m2-berry/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.57" +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-v40-bananapi-m2-berry" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="bananapi_m2_berry" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/bananapi_m2_plus_defconfig b/buildroot/configs/bananapi_m2_plus_defconfig deleted file mode 100644 index 77a403ce81..0000000000 --- a/buildroot/configs/bananapi_m2_plus_defconfig +++ /dev/null @@ -1,30 +0,0 @@ -BR2_arm=y -BR2_cortex_a7=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y -BR2_TARGET_GENERIC_ISSUE="Welcome to Bananapi M2 Plus" -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/sinovoip/m2-plus/genimage.cfg" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-bananapi-m2-plus" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -# BR2_TARGET_ROOTFS_TAR is not set -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Sinovoip_BPI_M2_Plus" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/sinovoip/m2-plus/boot.cmd" -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/bananapi_m2_ultra_defconfig b/buildroot/configs/bananapi_m2_ultra_defconfig index 2ec0e60e8d..b67a9d3f5d 100644 --- a/buildroot/configs/bananapi_m2_ultra_defconfig +++ b/buildroot/configs/bananapi_m2_ultra_defconfig @@ -1,25 +1,26 @@ BR2_arm=y BR2_cortex_a7=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_18=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TARGET_GENERIC_ISSUE="Welcome to Bananapi M2 Ultra" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/bananapi/bananapi-m2-ultra/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/bananapi/bananapi-m2-ultra/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.18.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.57" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-r40-bananapi-m2-ultra" +BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="bananapi_m2_berry" BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y @@ -27,6 +28,3 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/bananapi/bananapi-m2-ultra/boot.cmd" diff --git a/buildroot/configs/bananapi_m2_zero_defconfig b/buildroot/configs/bananapi_m2_zero_defconfig index e5c89fce40..9e395783e0 100644 --- a/buildroot/configs/bananapi_m2_zero_defconfig +++ b/buildroot/configs/bananapi_m2_zero_defconfig @@ -1,31 +1,31 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_8=y BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Bananapi M2 Zero" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/bananapi/bananapi-m2-zero/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.9.11" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.8.4" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-bananapi-m2-zero" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun8i-h2-plus-bananapi-m2-zero" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="bananapi_m2_zero" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.04" BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/bananapi/bananapi-m2-zero/boot.cmd" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/bananapi/bananapi-m2-zero/boot.cmd" diff --git a/buildroot/configs/bananapi_m64_defconfig b/buildroot/configs/bananapi_m64_defconfig deleted file mode 100644 index b93332ed21..0000000000 --- a/buildroot/configs/bananapi_m64_defconfig +++ /dev/null @@ -1,50 +0,0 @@ -BR2_aarch64=y -BR2_cortex_a53=y -BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 5.0 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="bananapi_m64" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/bananapi/bananapi-m64/boot.cmd" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-bananapi-m64" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to Bananapi M64" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/bananapi/bananapi-m64/genimage.cfg" diff --git a/buildroot/configs/bananapro_defconfig b/buildroot/configs/bananapro_defconfig index e87d9ba633..f733f8c0ca 100644 --- a/buildroot/configs/bananapro_defconfig +++ b/buildroot/configs/bananapro_defconfig @@ -1,74 +1,47 @@ -# Architecture BR2_arm=y BR2_cortex_a7=y -BR2_GLOBAL_PATCH_DIR="board/lemaker/bananapro/patches" -BR2_ARM_EABIHF=y BR2_ARM_FPU_NEON_VFPV4=y - -# Linux headers same as kernel, a 5.4 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y - -# Toolchain -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y - -# System configuration +BR2_GLOBAL_PATCH_DIR="board/lemaker/bananapro/patches" BR2_TARGET_GENERIC_HOSTNAME="bananapro" BR2_TARGET_GENERIC_ISSUE="Welcome to Banana Pro!" -BR2_TARGET_GENERIC_GETTY=y +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_ROOTFS_OVERLAY="board/lemaker/bananapro/rootfs_overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="board/lemaker/bananapro/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/lemaker/bananapro/post-image.sh" - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.7" -BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/lemaker/bananapro/linux-wifi.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-bananapro" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem +BR2_PACKAGE_ALSA_UTILS=y +# BR2_PACKAGE_ALSA_UTILS_ALSAMIXER is not set +BR2_PACKAGE_ALSA_UTILS_AMIXER=y +BR2_PACKAGE_ALSA_UTILS_APLAY=y +BR2_PACKAGE_LINUX_FIRMWARE=y +BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=y +BR2_PACKAGE_IW=y +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_PACKAGE_WPA_SUPPLICANT_CLI=y +BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set - -# Bootloaders BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Bananapro" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_FORMAT_BIN=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" - -# Wifi firmware for brcm43362 -BR2_PACKAGE_LINUX_FIRMWARE=y -BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=y - -# Audio -BR2_PACKAGE_ALSA_UTILS=y -# BR2_PACKAGE_ALSA_UTILS_ALSAMIXER is not set -BR2_PACKAGE_ALSA_UTILS_AMIXER=y -BR2_PACKAGE_ALSA_UTILS_APLAY=y - -# For automatic firmware loading -BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y - -# Wireless packages -BR2_PACKAGE_IW=y -BR2_PACKAGE_WPA_SUPPLICANT=y -BR2_PACKAGE_WPA_SUPPLICANT_CLI=y -BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y - -# Host tools BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/beagleboardx15_defconfig b/buildroot/configs/beagleboardx15_defconfig deleted file mode 100644 index 039a07b11e..0000000000 --- a/buildroot/configs/beagleboardx15_defconfig +++ /dev/null @@ -1,29 +0,0 @@ -BR2_arm=y -BR2_cortex_a15=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beagleboardx15/genimage.cfg" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9" -BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="am57xx-beagle-x15 am57xx-beagle-x15-revb1" -BR2_LINUX_KERNEL_INSTALL_TARGET=y -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.11" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am57xx_evm" -BR2_TARGET_UBOOT_NEEDS_DTC=y -# BR2_TARGET_UBOOT_FORMAT_BIN is not set -BR2_TARGET_UBOOT_FORMAT_IMG=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="spl/u-boot-spl.bin" -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="MLO" -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/beaglebone_defconfig b/buildroot/configs/beaglebone_defconfig index 06154d98b7..cad32e90b1 100644 --- a/buildroot/configs/beaglebone_defconfig +++ b/buildroot/configs/beaglebone_defconfig @@ -1,52 +1,39 @@ -# Architecture BR2_arm=y BR2_cortex_a8=y BR2_ARM_FPU_VFPV3=y - -# Patches -BR2_GLOBAL_PATCH_DIR="board/beaglebone/patches" - -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y - -# System +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/beagleboard/beaglebone/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y - -# Image -BR2_ROOTFS_POST_BUILD_SCRIPT="board/beaglebone/post-build.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/beagleboard/beaglebone/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beaglebone/genimage.cfg" - -# Kernel +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beagleboard/beaglebone/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,5.10.30-ti-r3)/linux-5.10.30-ti-r3.tar.gz" -BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,6.6.32-ti-arm32-r7)/linux-6.6.32-ti-arm32-r7.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="bb.org" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue am335x-boneblack-wireless" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/omap/am335x-evm ti/omap/am335x-bone ti/omap/am335x-boneblack ti/omap/am335x-bonegreen ti/omap/am335x-evmsk ti/omap/am335x-boneblue ti/omap/am335x-boneblack-wireless ti/omap/am335x-bonegreen-wireless" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_XZ=y +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_KMOD_TOOLS=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y - -# Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am335x_evm" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="MLO" - -# Required tools to create the SD image BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_KMOD_XZ=y BR2_PACKAGE_HOST_MTOOLS=y - -# Supporting host tools to build FIT image -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y diff --git a/buildroot/configs/beaglebone_qt5_defconfig b/buildroot/configs/beaglebone_qt5_defconfig index ff03a05a8e..5d06af3990 100644 --- a/buildroot/configs/beaglebone_qt5_defconfig +++ b/buildroot/configs/beaglebone_qt5_defconfig @@ -1,21 +1,21 @@ BR2_arm=y BR2_cortex_a8=y -BR2_GLOBAL_PATCH_DIR="board/beaglebone/patches" -BR2_TOOLCHAIN_BUILDROOT_GLIBC=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_TOOLCHAIN_BUILDROOT_CXX=y +BR2_GLOBAL_PATCH_DIR="board/beagleboard/beaglebone-qt5/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y -BR2_ROOTFS_OVERLAY="board/beaglebone/rootfs_overlay" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/beaglebone/post-build.sh" +BR2_ROOTFS_OVERLAY="board/beagleboard/beaglebone/rootfs_overlay" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/beagleboard/beaglebone/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beaglebone/genimage.cfg" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beagleboard/beaglebone/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,4.19.79-ti-r30)/linux-4.19.79-ti-r30.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,4.19.94-ti-r72)/linux-4.19.94-ti-r72.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/beaglebone/linux-sgx.fragment" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/beagleboard/beaglebone/linux-sgx.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue am335x-boneblack-wireless" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue am335x-boneblack-wireless am335x-bonegreen-wireless" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_FBV=y BR2_PACKAGE_QT5=y @@ -24,7 +24,6 @@ BR2_PACKAGE_QT5BASE_EGLFS=y BR2_PACKAGE_QT5BASE_DEFAULT_QPA="eglfs" BR2_PACKAGE_QT5QUICKCONTROLS=y BR2_PACKAGE_TI_SGX_DEMOS=y -BR2_PACKAGE_TI_SGX_KM=y BR2_PACKAGE_TI_SGX_UM=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y @@ -32,9 +31,10 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="250M" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am335x_evm" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y @@ -42,5 +42,3 @@ BR2_TARGET_UBOOT_SPL_NAME="MLO" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y diff --git a/buildroot/configs/beagleboneai64_defconfig b/buildroot/configs/beagleboneai64_defconfig new file mode 100644 index 0000000000..0429dd63e1 --- /dev/null +++ b/buildroot/configs/beagleboneai64_defconfig @@ -0,0 +1,48 @@ +BR2_aarch64=y +BR2_cortex_a72=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/beagleboard/beagleboneai64/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/beagleboard/beagleboneai64/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beagleboard/beagleboneai64/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.30" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-j721e-beagleboneai64" +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="256M" +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.10" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="generic" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y +BR2_TARGET_OPTEE_OS=y +BR2_TARGET_OPTEE_OS_PLATFORM="k3-j721e" +BR2_TARGET_TI_K3_R5_LOADER=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.04" +BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="j721e_beagleboneai64_r5" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.04" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="j721e_beagleboneai64_a72" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_USE_BINMAN=y +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_IMG=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="tispl.bin_unsigned" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="TEE=$(BINARIES_DIR)/tee-pager_v2.bin" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/beagleboneai_defconfig b/buildroot/configs/beagleboneai_defconfig index 586a75317e..38db184817 100644 --- a/buildroot/configs/beagleboneai_defconfig +++ b/buildroot/configs/beagleboneai_defconfig @@ -1,14 +1,15 @@ BR2_arm=y BR2_cortex_a15=y -BR2_GLOBAL_PATCH_DIR="board/beagleboneai/patches" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_GLOBAL_PATCH_DIR="board/beagleboard/beagleboneai/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_SYSTEM_DHCP="eth0" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/beagleboneai/post-build.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/beagleboard/beagleboneai/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beagleboneai/genimage.cfg" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beagleboard/beagleboneai/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.79" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.217" BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="am5729-beagleboneai" diff --git a/buildroot/configs/beagleplay_defconfig b/buildroot/configs/beagleplay_defconfig new file mode 100644 index 0000000000..42aa2fbd6e --- /dev/null +++ b/buildroot/configs/beagleplay_defconfig @@ -0,0 +1,55 @@ +BR2_aarch64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_10=y +BR2_GLOBAL_PATCH_DIR="board/beagleboard/beagleplay/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/beagleboard/beagleplay/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS="-c board/beagleboard/beagleplay/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.10" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-beagleplay" +BR2_PACKAGE_LINUX_FIRMWARE=y +BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y +BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILC3000_FIRMWARE=y +BR2_PACKAGE_WILINK_BT_FIRMWARE=y +BR2_TARGET_ROOTFS_CPIO=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="256M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.11" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y +BR2_TARGET_OPTEE_OS=y +BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" +BR2_TARGET_TI_K3_R5_LOADER=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.07" +BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_beagleplay_r5" +BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN="tiboot3-am62x-gp-evm.bin" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am62x_beagleplay_a53" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_USE_BINMAN=y +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_IMG=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.img_unsigned" +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="tispl.bin_unsigned" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="TEE=$(BINARIES_DIR)/tee-pager_v2.bin" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/beaglev_defconfig b/buildroot/configs/beaglev_defconfig deleted file mode 100644 index 79af8c2ece..0000000000 --- a/buildroot/configs/beaglev_defconfig +++ /dev/null @@ -1,41 +0,0 @@ -BR2_riscv=y -BR2_riscv_custom=y -BR2_RISCV_ISA_CUSTOM_RVM=y -BR2_RISCV_ISA_CUSTOM_RVF=y -BR2_RISCV_ISA_CUSTOM_RVD=y -BR2_RISCV_ISA_CUSTOM_RVC=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13=y -BR2_ROOTFS_POST_BUILD_SCRIPT="board/beaglev/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beaglev/genimage.cfg" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# tag buildroot-20210609 of the 5.13 branch (esmil_starlight) -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,starfive-tech,linux,83dba1f25dfc118cacec991c31a7a4cfa7405c89)/linux-83dba1f25dfc118cacec991c31a7a4cfa7405c89.tar.gz" -BR2_LINUX_KERNEL_DEFCONFIG="starlight" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="starfive/jh7100-beaglev-starlight" -BR2_LINUX_KERNEL_INSTALL_TARGET=y -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -# BR2_TARGET_ROOTFS_TAR is not set -BR2_TARGET_BEAGLEV_DDRINIT=y -BR2_TARGET_BEAGLEV_SECONDBOOT=y -BR2_TARGET_OPENSBI=y -BR2_TARGET_OPENSBI_CUSTOM_TARBALL=y -# upstream opensbi master branch -BR2_TARGET_OPENSBI_CUSTOM_TARBALL_LOCATION="$(call github,riscv,opensbi,79f9b4220ffa7f74356054be25d450d7958bf16c)/opensbi-79f9b4220ffa7f74356054be25d450d7958bf16c.tar.gz" -BR2_TARGET_OPENSBI_PLAT="generic" -# BR2_TARGET_OPENSBI_INSTALL_DYNAMIC_IMG is not set -# BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set -BR2_TARGET_OPENSBI_UBOOT_PAYLOAD=y -BR2_TARGET_OPENSBI_FW_FDT_PATH=y -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -# HEAD of the starfive-tech:Fedora_VIC_7100_2021.04 branch -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,starfive-tech,u-boot,64ead5b83959da8eb87b6963843addf5942e6ed4)/uboot-64ead5b83959da8eb87b6963843addf5942e6ed4.tar.gz" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="starfive_vic7100_beagle_v_smode" -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_JH71XX_TOOLS=y diff --git a/buildroot/configs/beaglev_fire_defconfig b/buildroot/configs/beaglev_fire_defconfig new file mode 100644 index 0000000000..1d26a78f07 --- /dev/null +++ b/buildroot/configs/beaglev_fire_defconfig @@ -0,0 +1,33 @@ +BR2_riscv=y +BR2_RISCV_ISA_RVC=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/beagleboard/beaglev_fire/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_OVERLAY="board/beagleboard/beaglev_fire/rootfs-overlay/" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/beagleboard/beaglev_fire/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux4microchip+fpga-2024.09.1)/linux-linux4microchip+fpga-2024.09.1.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="mpfs" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="microchip/mpfs-beaglev-fire" +BR2_PACKAGE_MTD=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,u-boot-mchp,linux4microchip+fpga-2024.09)/uboot-linux4microchip+fpga-2024.09.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="beaglev_fire" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/beagleboard/beaglev_fire/uboot-fragment.config" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MICROCHIP_HSS_PAYLOAD_GENERATOR=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/beagleboard/beaglev_fire/boot.cmd" diff --git a/buildroot/configs/beelink_gs1_defconfig b/buildroot/configs/beelink_gs1_defconfig index d4682d6b7c..19d66c14a4 100644 --- a/buildroot/configs/beelink_gs1_defconfig +++ b/buildroot/configs/beelink_gs1_defconfig @@ -1,16 +1,12 @@ -# Architecture BR2_aarch64=y BR2_ARM_FPU_VFPV4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_TARGET_GENERIC_ISSUE="Welcome to Beelink GS1" -# MDEV is required to autoload the ethernet driver module BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/beelink/gs1/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beelink/gs1/genimage.cfg" - -# Kernel Linux headers same as kernel, 5.15 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" @@ -20,23 +16,18 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h6-beelink-gs1" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y - -# Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_h6" - -# Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="beelink_gs1" BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_OPENSSL=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" diff --git a/buildroot/configs/broadcom_northstar_defconfig b/buildroot/configs/broadcom_northstar_defconfig new file mode 100644 index 0000000000..bbd368ac79 --- /dev/null +++ b/buildroot/configs/broadcom_northstar_defconfig @@ -0,0 +1,17 @@ +BR2_arm=y +BR2_cortex_a9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/broadcom/northstar/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.9" +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/broadcom/northstar/linux.config" +BR2_LINUX_KERNEL_APPENDED_ZIMAGE=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm4708-smartrg-sr400ac broadcom/bcm47094-luxul-xwr-3150-v1" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ROOTFS_UBI=y +BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 +BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000 +BR2_PACKAGE_HOST_FIRMWARE_UTILS=y +BR2_PACKAGE_HOST_LZMA_ALONE=y diff --git a/buildroot/configs/canaan_kd233_defconfig b/buildroot/configs/canaan_kd233_defconfig new file mode 100644 index 0000000000..491a834477 --- /dev/null +++ b/buildroot/configs/canaan_kd233_defconfig @@ -0,0 +1,22 @@ +BR2_riscv=y +BR2_riscv_custom=y +BR2_RISCV_ISA_RVM=y +BR2_RISCV_ISA_RVA=y +BR2_RISCV_ISA_RVF=y +BR2_RISCV_ISA_RVD=y +BR2_RISCV_ISA_RVC=y +# BR2_RISCV_USE_MMU is not set +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y +BR2_INIT_TINYINIT=y +# BR2_TARGET_ENABLE_ROOT_LOGIN is not set +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.19" +BR2_LINUX_KERNEL_DEFCONFIG="nommu_k210" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/canaan/kd233/linux-cpio.config" +BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y +BR2_LINUX_KERNEL_IMAGE_NAME="loader.bin" +BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/busybox-tiny.config" +# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set +BR2_TARGET_ROOTFS_INITRAMFS=y +BR2_PACKAGE_HOST_PYTHON_KFLASH=y diff --git a/buildroot/configs/chromebook_elm_defconfig b/buildroot/configs/chromebook_elm_defconfig index 827d929631..a43b620e1b 100644 --- a/buildroot/configs/chromebook_elm_defconfig +++ b/buildroot/configs/chromebook_elm_defconfig @@ -1,36 +1,21 @@ -# Architecture BR2_aarch64=y BR2_cortex_a72_a53=y - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y - -# Linux headers same as kernel (5.10 series) BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y - -# Kernel +BR2_GLOBAL_PATCH_DIR="board/chromebook/elm/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/chromebook/elm/sign.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/chromebook/mksd.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10" - -# Build Kernel with a Custom config. BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/chromebook/elm/linux.config" - -# DTS support BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="mediatek/mt8173-elm" - -# Package Firmware for WiFi chip. BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8797=y - -# Scripts to generate final images. -BR2_ROOTFS_POST_BUILD_SCRIPT="board/chromebook/elm/sign.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/chromebook/mksd.sh" - -# Supporting host tools to build / sign FIT Image. +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y BR2_PACKAGE_HOST_PARTED=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y diff --git a/buildroot/configs/chromebook_snow_defconfig b/buildroot/configs/chromebook_snow_defconfig index bcb94b716b..9a5bcce98b 100644 --- a/buildroot/configs/chromebook_snow_defconfig +++ b/buildroot/configs/chromebook_snow_defconfig @@ -1,6 +1,8 @@ BR2_arm=y BR2_cortex_a15=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y +BR2_GLOBAL_PATCH_DIR="board/chromebook/snow/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_TARGET_GENERIC_GETTY_TERM="linux" BR2_ROOTFS_POST_BUILD_SCRIPT="board/chromebook/snow/sign.sh" @@ -8,7 +10,6 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/chromebook/mksd.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15" -BR2_LINUX_KERNEL_PATCH="board/chromebook/snow/linux-4.15-dts-tpm.patch" BR2_LINUX_KERNEL_DEFCONFIG="exynos" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/chromebook/snow/linux-4.15.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/buildroot/configs/ci20_defconfig b/buildroot/configs/ci20_defconfig index 09eddc4e68..4a66e1ac33 100644 --- a/buildroot/configs/ci20_defconfig +++ b/buildroot/configs/ci20_defconfig @@ -1,37 +1,27 @@ -# architecture BR2_mipsel=y BR2_mips_xburst=y # BR2_MIPS_SOFT_FLOAT is not set -BR2_KERNEL_HEADERS_AS_KERNEL=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y - -# system +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS4" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y +BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ci20/genimage.cfg" - -# kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.81" BR2_LINUX_KERNEL_DEFCONFIG="ci20" BR2_LINUX_KERNEL_INSTALL_TARGET=y - -# u-boot +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="ci20_mmc" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE=y BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE="board/ci20/uboot-env.txt" BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SIZE="32768" - -# host -BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/buildroot/configs/csky_gx6605s_defconfig b/buildroot/configs/csky_gx6605s_defconfig deleted file mode 100644 index f1f9579dca..0000000000 --- a/buildroot/configs/csky_gx6605s_defconfig +++ /dev/null @@ -1,19 +0,0 @@ -# Architecture -BR2_csky=y -BR2_ck610=y - -# System -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# Linux headers same as kernel, a 5.0 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0.12" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/csky/linux-ck610.config.fragment" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/csky/gx6605s/gx6605s.dts" diff --git a/buildroot/configs/cubieboard1_defconfig b/buildroot/configs/cubieboard1_defconfig new file mode 100644 index 0000000000..c3dede47b8 --- /dev/null +++ b/buildroot/configs/cubieboard1_defconfig @@ -0,0 +1,28 @@ +BR2_arm=y +BR2_cortex_a8=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_11=y +BR2_GLOBAL_PATCH_DIR="board/cubietech/cubieboard1/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_ROOTFS_OVERLAY="board/cubietech/cubieboard1/rootfs_overlay" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/cubietech/cubieboard1/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.11.6" +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun4i-a10-cubieboard" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.10" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Cubieboard" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/buildroot/configs/cubieboard2_defconfig b/buildroot/configs/cubieboard2_defconfig index 18337fac72..14d080d2d4 100644 --- a/buildroot/configs/cubieboard2_defconfig +++ b/buildroot/configs/cubieboard2_defconfig @@ -1,42 +1,32 @@ -# Architecture BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y - -# Linux headers same as kernel, a 5.15 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# Kernel +BR2_TARGET_GENERIC_HOSTNAME="Cubieboard2" +BR2_TARGET_GENERIC_ISSUE="Welcome to Cubieboard2!" +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard2/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.11" BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-cubieboard2" - -# Bootloader +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Cubieboard2" BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/cubietech/cubieboard2/boot.cmd" - -# System -BR2_TARGET_GENERIC_HOSTNAME="Cubieboard2" -BR2_TARGET_GENERIC_ISSUE="Welcome to Cubieboard2!" -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard2/post-image.sh" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/cubietech/cubieboard2/boot.cmd" diff --git a/buildroot/configs/engicam_imx6qdl_icore_defconfig b/buildroot/configs/engicam_imx6qdl_icore_defconfig index d8a51c7ab1..2ac415e335 100644 --- a/buildroot/configs/engicam_imx6qdl_icore_defconfig +++ b/buildroot/configs/engicam_imx6qdl_icore_defconfig @@ -3,26 +3,11 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y - -# Linux headers same as kernel, a 5.0 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# System +BR2_TARGET_GENERIC_ISSUE="Welcome to Engicam i.CoreM6 Quad/Dual/DualLite/Solo" BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx6qdl_icore_mmc" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_OPENSSL=y -BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="SPL" - -# Kernel +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/engicam/icorem6/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" @@ -31,13 +16,18 @@ BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-icore imx6q-icore imx6q-icore-ofcap10 imx6q-icore-ofcap12" - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to Engicam i.CoreM6 Quad/Dual/DualLite/Solo" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx6qdl_icore_mmc" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="SPL" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/engicam/icorem6/genimage.cfg" diff --git a/buildroot/configs/engicam_imx6qdl_icore_qt5_defconfig b/buildroot/configs/engicam_imx6qdl_icore_qt5_defconfig index 2d213e4ab9..8b0c8bbe28 100644 --- a/buildroot/configs/engicam_imx6qdl_icore_qt5_defconfig +++ b/buildroot/configs/engicam_imx6qdl_icore_qt5_defconfig @@ -3,75 +3,23 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y - -# Linux headers same as kernel, a 4.13 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y - -# System -BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" +BR2_TOOLCHAIN_BUILDROOT_CXX=y +BR2_TARGET_GENERIC_ISSUE="Welcome to Engicam i.CoreM6 Quad/Dual/DualLite/Solo" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.07" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx6qdl_icore_mmc" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_OPENSSL=y -BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="SPL" - -# Kernel +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" +BR2_ROOTFS_OVERLAY="board/engicam/icorem6/rootfs_overlay" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/engicam/icorem6/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/engicam/icorem6/linux_qt5.fragment" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-icore imx6q-icore imx6q-icore-ofcap10 imx6q-icore-ofcap12" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/engicam/icorem6/linux_qt5.fragment" - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to Engicam i.CoreM6 Quad/Dual/DualLite/Solo" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="120M" -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/engicam/icorem6/genimage.cfg" -BR2_ROOTFS_OVERLAY="board/engicam/icorem6/rootfs_overlay" - -# qt5 dependencies -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y -BR2_TOOLCHAIN_BUILDROOT_CXX=y - -# qt5 -BR2_PACKAGE_QT5=y -BR2_PACKAGE_QT5BASE_OPENGL_LIB=y -BR2_PACKAGE_QT5BASE_LINUXFB=y -BR2_PACKAGE_QT5BASE_FONTCONFIG=y -BR2_PACKAGE_QT5BASE_GIF=y -BR2_PACKAGE_QT5BASE_JPEG=y - -# mesa3d -BR2_PACKAGE_MESA3D=y -BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV=y -BR2_PACKAGE_MESA3D_OPENGL_ES=y -BR2_PACKAGE_MESA3D_OPENGL_EGL=y - -# qt5 demo packages -BR2_PACKAGE_GLMARK2=y -BR2_PACKAGE_MESA3D_DEMOS=y -BR2_PACKAGE_KMSCUBE=y -BR2_PACKAGE_QT5CINEX=y -BR2_PACKAGE_QT5CINEX_HD=y - -# fonts BR2_PACKAGE_BITSTREAM_VERA=y BR2_PACKAGE_CANTARELL=y BR2_PACKAGE_DEJAVU=y @@ -79,3 +27,34 @@ BR2_PACKAGE_FONT_AWESOME=y BR2_PACKAGE_GHOSTSCRIPT_FONTS=y BR2_PACKAGE_INCONSOLATA=y BR2_PACKAGE_LIBERATION=y +BR2_PACKAGE_GLMARK2=y +BR2_PACKAGE_KMSCUBE=y +BR2_PACKAGE_MESA3D_DEMOS=y +BR2_PACKAGE_QT5CINEX=y +BR2_PACKAGE_QT5CINEX_HD=y +BR2_PACKAGE_MESA3D=y +BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV=y +BR2_PACKAGE_MESA3D_OPENGL_EGL=y +BR2_PACKAGE_MESA3D_OPENGL_ES=y +BR2_PACKAGE_QT5=y +BR2_PACKAGE_QT5BASE_OPENGL_LIB=y +BR2_PACKAGE_QT5BASE_LINUXFB=y +BR2_PACKAGE_QT5BASE_FONTCONFIG=y +BR2_PACKAGE_QT5BASE_GIF=y +BR2_PACKAGE_QT5BASE_JPEG=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.07" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx6qdl_icore_mmc" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="SPL" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/engicam_imx6qdl_icore_rqs_defconfig b/buildroot/configs/engicam_imx6qdl_icore_rqs_defconfig index 45ed67be07..7d4d4e3df4 100644 --- a/buildroot/configs/engicam_imx6qdl_icore_rqs_defconfig +++ b/buildroot/configs/engicam_imx6qdl_icore_rqs_defconfig @@ -3,26 +3,11 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y - -# Linux headers same as kernel, a 5.0 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# System +BR2_TARGET_GENERIC_ISSUE="Welcome to Engicam i.CoreM6 Quad/Dual/DualLite/Solo RQS Starter Kit" BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx6qdl_icore_rqs" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_OPENSSL=y -BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="SPL" - -# Kernel +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/engicam/icorem6_rqs/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" @@ -31,13 +16,18 @@ BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-icore-rqs imx6q-icore-rqs" - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to Engicam i.CoreM6 Quad/Dual/DualLite/Solo RQS Starter Kit" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx6qdl_icore_rqs" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="SPL" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/engicam/icorem6_rqs/genimage.cfg" diff --git a/buildroot/configs/engicam_imx6ul_geam_defconfig b/buildroot/configs/engicam_imx6ul_geam_defconfig index aac8432ef2..ed4b491ebe 100644 --- a/buildroot/configs/engicam_imx6ul_geam_defconfig +++ b/buildroot/configs/engicam_imx6ul_geam_defconfig @@ -3,26 +3,11 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y - -# Linux headers same as kernel, a 4.11 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y - -# System +BR2_TARGET_GENERIC_ISSUE="Welcome to Engicam GEAM6UL Starter Kit" BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.07-rc1" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx6ul_geam_mmc" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_OPENSSL=y -BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="SPL" - -# Kernel +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/engicam/geam6ul/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.5" @@ -31,13 +16,18 @@ BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x80008000" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-geam-kit" - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to Engicam GEAM6UL Starter Kit" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.07-rc1" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx6ul_geam_mmc" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="SPL" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/engicam/geam6ul/genimage.cfg" diff --git a/buildroot/configs/engicam_imx6ul_isiot_defconfig b/buildroot/configs/engicam_imx6ul_isiot_defconfig index 57a66dea34..1377022c30 100644 --- a/buildroot/configs/engicam_imx6ul_isiot_defconfig +++ b/buildroot/configs/engicam_imx6ul_isiot_defconfig @@ -3,26 +3,11 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y - -# Linux headers same as kernel, a 5.0 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# System +BR2_TARGET_GENERIC_ISSUE="Welcome to Engicam Is.IoT eMMC Starter Kit" BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx6ul_isiot_emmc" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_OPENSSL=y -BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="SPL" - -# Kernel +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/engicam/isiot/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" @@ -31,13 +16,18 @@ BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x80008000" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-isiot-emmc" - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to Engicam Is.IoT eMMC Starter Kit" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx6ul_isiot_emmc" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="SPL" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/engicam/isiot/genimage.cfg" diff --git a/buildroot/configs/freescale_imx28evk_defconfig b/buildroot/configs/freescale_imx28evk_defconfig index bd5b007ed1..8c428e3fec 100644 --- a/buildroot/configs/freescale_imx28evk_defconfig +++ b/buildroot/configs/freescale_imx28evk_defconfig @@ -1,34 +1,20 @@ -# architecture BR2_arm=y -BR2_arm926t=y - -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y - -# system +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" - -# kernel +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/mxs/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.42" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.26" BR2_LINUX_KERNEL_DEFCONFIG="mxs" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx28-evk" - -# bootloader +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/mxs/imx28-evk" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx28evk" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.04" BR2_TARGET_UBOOT_FORMAT_SD=y - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y - -# To generate SD Image BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/mxs/post-image.sh" diff --git a/buildroot/configs/freescale_imx6dlsabreauto_defconfig b/buildroot/configs/freescale_imx6dlsabreauto_defconfig index 8fe10f6275..02970a8c6d 100644 --- a/buildroot/configs/freescale_imx6dlsabreauto_defconfig +++ b/buildroot/configs/freescale_imx6dlsabreauto_defconfig @@ -1,44 +1,29 @@ -# architecture BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y - -# patches +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches" - -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y - -# system +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" - -# kernel +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-sabreauto" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6dl-sabreauto" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# filesystem -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y - -# required tools to create the microSD image -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y - -# bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6dlsabreauto" -BR2_TARGET_UBOOT_FORMAT_IMX=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_IMX=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/freescale_imx6dlsabresd_defconfig b/buildroot/configs/freescale_imx6dlsabresd_defconfig index 74debbfd46..daedb68e96 100644 --- a/buildroot/configs/freescale_imx6dlsabresd_defconfig +++ b/buildroot/configs/freescale_imx6dlsabresd_defconfig @@ -1,43 +1,28 @@ -# architecture BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y - -# patches +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches" - -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y - -# system +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" - -# kernel +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-sabresd" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6dl-sabresd" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# filesystem -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y - -# required tools to create the microSD image -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y - -# bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6dlsabresd" -BR2_TARGET_UBOOT_FORMAT_IMX=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_IMX=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/freescale_imx6qsabreauto_defconfig b/buildroot/configs/freescale_imx6qsabreauto_defconfig index 58b4a5f92d..9c95576758 100644 --- a/buildroot/configs/freescale_imx6qsabreauto_defconfig +++ b/buildroot/configs/freescale_imx6qsabreauto_defconfig @@ -1,44 +1,29 @@ -# architecture BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y - -# patches +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches" - -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y - -# system +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" - -# kernel +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabreauto" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6q-sabreauto" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# filesystem -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y - -# required tools to create the microSD image -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y - -# bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6qsabreauto" -BR2_TARGET_UBOOT_FORMAT_IMX=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_IMX=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/freescale_imx6qsabresd_defconfig b/buildroot/configs/freescale_imx6qsabresd_defconfig index f2ac993da0..54d0a6c3a8 100644 --- a/buildroot/configs/freescale_imx6qsabresd_defconfig +++ b/buildroot/configs/freescale_imx6qsabresd_defconfig @@ -1,44 +1,29 @@ -# architecture BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y - -# patches +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches" - -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y - -# system +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" - -# kernel +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6q-sabresd" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# filesystem -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y - -# required tools to create the microSD image -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y - -# bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6qsabresd" -BR2_TARGET_UBOOT_FORMAT_IMX=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_IMX=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/freescale_imx6sxsabresd_defconfig b/buildroot/configs/freescale_imx6sxsabresd_defconfig index 9f48ef2da5..1389629b85 100644 --- a/buildroot/configs/freescale_imx6sxsabresd_defconfig +++ b/buildroot/configs/freescale_imx6sxsabresd_defconfig @@ -1,43 +1,28 @@ -# architecture BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y - -# patches +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches" - -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y - -# system +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" - -# kernel +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sx-sdb" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6sx-sdb" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# filesystem -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y - -# required tools to create the microSD image -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y - -# bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6sxsabresd" -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" -BR2_TARGET_UBOOT_FORMAT_IMX=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_IMX=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/freescale_imx6ullevk_defconfig b/buildroot/configs/freescale_imx6ullevk_defconfig index 4c5c3b2524..e29a9898fc 100644 --- a/buildroot/configs/freescale_imx6ullevk_defconfig +++ b/buildroot/configs/freescale_imx6ullevk_defconfig @@ -1,24 +1,30 @@ BR2_arm=y BR2_cortex_a7=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/freescale/imx6ullevk/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/freescale/imx6ullevk/linux_sdma.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ull-14x14-evk" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6ull-14x14-evk" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6UL=y +BR2_PACKAGE_FIRMWARE_IMX=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6ull_14x14_evk" -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/buildroot/configs/freescale_imx7dsabresd_defconfig b/buildroot/configs/freescale_imx7dsabresd_defconfig index 5a9cff488d..a9df6671ce 100644 --- a/buildroot/configs/freescale_imx7dsabresd_defconfig +++ b/buildroot/configs/freescale_imx7dsabresd_defconfig @@ -1,38 +1,26 @@ -# architecture BR2_arm=y BR2_cortex_a7=y - -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y - -# system +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/freescale/imx7dsdb/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" - -# Kernel +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7d-sdb" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx7d-sdb" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y - -# bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx7dsabresd" -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" -BR2_TARGET_UBOOT_FORMAT_IMX=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y - -# required tools to create the microSD image +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" diff --git a/buildroot/configs/freescale_imx8dxlevk_defconfig b/buildroot/configs/freescale_imx8dxlevk_defconfig new file mode 100644 index 0000000000..1ee1413eb0 --- /dev/null +++ b/buildroot/configs/freescale_imx8dxlevk_defconfig @@ -0,0 +1,42 @@ +BR2_aarch64=y +BR2_cortex_a35=y +BR2_ARM_FPU_VFPV3=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/freescale/imx8dxlevk/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyLP0" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/fsl-imx8dxl-evk.dtb" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8dxl-evk" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8DXL=y +BR2_PACKAGE_FIRMWARE_IMX=y +BR2_PACKAGE_IMX_SC_FIRMWARE=y +BR2_PACKAGE_IMX_SECO=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.6.23-2.0.0)/imx-atf-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8dxl" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8dxl_evk" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_IMX_MKIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y diff --git a/buildroot/configs/freescale_imx8mmevk_defconfig b/buildroot/configs/freescale_imx8mmevk_defconfig index ae82f29158..b5b52c1f2d 100644 --- a/buildroot/configs/freescale_imx8mmevk_defconfig +++ b/buildroot/configs/freescale_imx8mmevk_defconfig @@ -1,13 +1,14 @@ BR2_aarch64=y BR2_ARM_FPU_VFPV3=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/freescale/imx8mmevk/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mm-evk.dtb" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-evk freescale/imx8mm-evk-revb-qca-wifi" @@ -19,18 +20,18 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.6.23-2.0.0)/imx-atf-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mm_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_SPL=y diff --git a/buildroot/configs/freescale_imx8mnevk_defconfig b/buildroot/configs/freescale_imx8mnevk_defconfig index b24eb1566b..fc601dd5fb 100644 --- a/buildroot/configs/freescale_imx8mnevk_defconfig +++ b/buildroot/configs/freescale_imx8mnevk_defconfig @@ -1,13 +1,14 @@ BR2_aarch64=y BR2_ARM_FPU_VFPV3=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/freescale/imx8mnevk/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mn-ddr4-evk.dtb" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mn-ddr4-evk" @@ -20,18 +21,17 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.6.23-2.0.0)/imx-atf-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mn" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mn_ddr4_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_SPL=y diff --git a/buildroot/configs/freescale_imx8mpevk_defconfig b/buildroot/configs/freescale_imx8mpevk_defconfig index 8d0e6e0f3e..cb9f896a7a 100644 --- a/buildroot/configs/freescale_imx8mpevk_defconfig +++ b/buildroot/configs/freescale_imx8mpevk_defconfig @@ -1,13 +1,14 @@ BR2_aarch64=y BR2_ARM_FPU_VFPV3=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/freescale/imx8mpevk/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mp-evk.dtb" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mp-evk" @@ -19,18 +20,20 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.6.23-2.0.0)/imx-atf-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mp_evk" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/freescale/imx8mpevk/uboot-fragment.config" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_SPL=y diff --git a/buildroot/configs/freescale_imx8mqevk_defconfig b/buildroot/configs/freescale_imx8mqevk_defconfig index 7f5dd87b5f..4d8a3f1ea2 100644 --- a/buildroot/configs/freescale_imx8mqevk_defconfig +++ b/buildroot/configs/freescale_imx8mqevk_defconfig @@ -1,13 +1,14 @@ BR2_aarch64=y BR2_ARM_FPU_VFPV3=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/freescale/imx8mqevk/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mq-evk.dtb" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mq-evk" @@ -19,18 +20,18 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.6.23-2.0.0)/imx-atf-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mq" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mq_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_SPL=y diff --git a/buildroot/configs/freescale_imx8qmmek_defconfig b/buildroot/configs/freescale_imx8qmmek_defconfig index 8a0e866cee..6fb3a54df1 100644 --- a/buildroot/configs/freescale_imx8qmmek_defconfig +++ b/buildroot/configs/freescale_imx8qmmek_defconfig @@ -1,12 +1,13 @@ BR2_aarch64=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/freescale/imx8qmmek/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/fsl-imx8qm-mek.dtb" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8qm-mek" @@ -20,18 +21,17 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.6.23-2.0.0)/imx-atf-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8qm" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8qm_mek" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_IMX_MKIMAGE=y diff --git a/buildroot/configs/freescale_imx8qxpmek_defconfig b/buildroot/configs/freescale_imx8qxpmek_defconfig index 1ffbd123e0..3ff476e992 100644 --- a/buildroot/configs/freescale_imx8qxpmek_defconfig +++ b/buildroot/configs/freescale_imx8qxpmek_defconfig @@ -1,14 +1,15 @@ BR2_aarch64=y BR2_cortex_a35=y BR2_ARM_FPU_VFPV3=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/freescale/imx8qxpmek/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttyLP0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/fsl-imx8qxp-mek.dtb" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8qxp-mek" @@ -22,18 +23,17 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.6.23-2.0.0)/imx-atf-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8qx" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8qxp_mek" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_IMX_MKIMAGE=y diff --git a/buildroot/configs/freescale_imx93evk_defconfig b/buildroot/configs/freescale_imx93evk_defconfig new file mode 100644 index 0000000000..b244ba9684 --- /dev/null +++ b/buildroot/configs/freescale_imx93evk_defconfig @@ -0,0 +1,41 @@ +BR2_aarch64=y +BR2_cortex_a55=y +BR2_ARM_FPU_VFPV4D16=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/freescale/imx93evk/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyLP0" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx9-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx93-11x11-evk" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93=y +BR2_PACKAGE_FIRMWARE_ELE_IMX=y +BR2_PACKAGE_FIRMWARE_IMX=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.6.23-2.0.0)/imx-atf-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx93" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx93_11x11_evk" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +BR2_TARGET_UBOOT_SPL=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_IMX_MKIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/buildroot/configs/freescale_p1025twr_defconfig b/buildroot/configs/freescale_p1025twr_defconfig index f476d92706..72374ae7a1 100644 --- a/buildroot/configs/freescale_p1025twr_defconfig +++ b/buildroot/configs/freescale_p1025twr_defconfig @@ -1,14 +1,7 @@ -# Architecture BR2_powerpc=y BR2_powerpc_8548=y - -# Linux headers same as kernel, a 4.15 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y - -# Serial port config BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15.7" @@ -16,8 +9,6 @@ BR2_LINUX_KERNEL_DEFCONFIG="mpc85xx_smp" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="fsl/p1025twr" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_CPIO_GZIP=y BR2_TARGET_ROOTFS_CPIO_UIMAGE=y diff --git a/buildroot/configs/freescale_t1040d4rdb_defconfig b/buildroot/configs/freescale_t1040d4rdb_defconfig index df44046ef5..ad231e7f1e 100644 --- a/buildroot/configs/freescale_t1040d4rdb_defconfig +++ b/buildroot/configs/freescale_t1040d4rdb_defconfig @@ -1,14 +1,7 @@ -# Architecture BR2_powerpc64=y BR2_powerpc_e5500=y - -# Linux headers same as kernel, a 4.15 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y - -# Serial port config BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15.7" @@ -16,8 +9,6 @@ BR2_LINUX_KERNEL_DEFCONFIG="corenet64_smp" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="fsl/t1040d4rdb" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_CPIO_GZIP=y BR2_TARGET_ROOTFS_CPIO_UIMAGE=y diff --git a/buildroot/configs/freescale_t2080_qds_rdb_defconfig b/buildroot/configs/freescale_t2080_qds_rdb_defconfig index 3d03c32f7e..0004c87110 100644 --- a/buildroot/configs/freescale_t2080_qds_rdb_defconfig +++ b/buildroot/configs/freescale_t2080_qds_rdb_defconfig @@ -1,14 +1,7 @@ -# Architecture BR2_powerpc64=y BR2_powerpc_e6500=y - -# Linux headers same as kernel BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_17=y - -# Serial port config BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.14" @@ -16,10 +9,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="corenet64_smp" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="fsl/t2080qds fsl/t2080rdb" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_CPIO_GZIP=y BR2_TARGET_ROOTFS_CPIO_UIMAGE=y # BR2_TARGET_ROOTFS_TAR is not set - diff --git a/buildroot/configs/friendlyarm_nanopc_t4_defconfig b/buildroot/configs/friendlyarm_nanopc_t4_defconfig deleted file mode 100644 index 2f7c53904e..0000000000 --- a/buildroot/configs/friendlyarm_nanopc_t4_defconfig +++ /dev/null @@ -1,53 +0,0 @@ -# Architecture -BR2_aarch64=y -BR2_cortex_a72_a53=y - -# Linux headers same as kernel, a 5.8 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="11a0a46a899fcc3b1fdb214b382f3d7495d88eca" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3399" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopc-t4-rk3399" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="idbloader.img" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.2" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3399-nanopc-t4" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_HOSTNAME="nanopc-t4" -BR2_TARGET_GENERIC_ISSUE="Welcome to NanoPC-T4" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopc-t4/genimage.cfg" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopc-t4/post-build.sh" diff --git a/buildroot/configs/friendlyarm_nanopi_a64_defconfig b/buildroot/configs/friendlyarm_nanopi_a64_defconfig deleted file mode 100644 index 4df22b2a2f..0000000000 --- a/buildroot/configs/friendlyarm_nanopi_a64_defconfig +++ /dev/null @@ -1,50 +0,0 @@ -BR2_aarch64=y -BR2_cortex_a53=y -BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 5.0 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_a64" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/friendlyarm/nanopi-a64/boot.cmd" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-nanopi-a64" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM Nanopi A64" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-a64/genimage.cfg" diff --git a/buildroot/configs/friendlyarm_nanopi_m1_defconfig b/buildroot/configs/friendlyarm_nanopi_m1_defconfig deleted file mode 100644 index 18cfcb261e..0000000000 --- a/buildroot/configs/friendlyarm_nanopi_m1_defconfig +++ /dev/null @@ -1,45 +0,0 @@ -# Architecture -BR2_arm=y -BR2_cortex_a7=y -BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 5.0 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# System configuration -BR2_TARGET_GENERIC_HOSTNAME="nanopi-m1" -BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the NanoPi M1" - -# Bootloaders -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_m1" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/friendlyarm/nanopi-m1/boot.cmd" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-nanopi-m1" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-m1/genimage.cfg" -# BR2_TARGET_ROOTFS_TAR is not set - -# Additional tools -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/friendlyarm_nanopi_m1_plus_defconfig b/buildroot/configs/friendlyarm_nanopi_m1_plus_defconfig deleted file mode 100644 index 06adc54b15..0000000000 --- a/buildroot/configs/friendlyarm_nanopi_m1_plus_defconfig +++ /dev/null @@ -1,45 +0,0 @@ -# Architecture -BR2_arm=y -BR2_cortex_a7=y -BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 5.0 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# System configuration -BR2_TARGET_GENERIC_HOSTNAME="nanopi-m1-plus" -BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the NanoPi M1 Plus" - -# Bootloaders -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_m1_plus" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/friendlyarm/nanopi-m1-plus/boot.cmd" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-nanopi-m1-plus" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-m1-plus/genimage.cfg" -# BR2_TARGET_ROOTFS_TAR is not set - -# Additional tools -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/friendlyarm_nanopi_m4_defconfig b/buildroot/configs/friendlyarm_nanopi_m4_defconfig deleted file mode 100644 index 9c3f58f200..0000000000 --- a/buildroot/configs/friendlyarm_nanopi_m4_defconfig +++ /dev/null @@ -1,53 +0,0 @@ -# Architecture -BR2_aarch64=y -BR2_cortex_a72_a53=y - -# Linux headers same as kernel, a 5.8 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="11a0a46a899fcc3b1fdb214b382f3d7495d88eca" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3399" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi-m4-rk3399" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="idbloader.img" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.2" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3399-nanopi-m4" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_HOSTNAME="nanopi-m4" -BR2_TARGET_GENERIC_ISSUE="Welcome to NANOPI-M4" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-m4/genimage.cfg" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-m4/post-build.sh" diff --git a/buildroot/configs/friendlyarm_nanopi_neo2_defconfig b/buildroot/configs/friendlyarm_nanopi_neo2_defconfig deleted file mode 100644 index 9262737b88..0000000000 --- a/buildroot/configs/friendlyarm_nanopi_neo2_defconfig +++ /dev/null @@ -1,50 +0,0 @@ -BR2_aarch64=y -BR2_cortex_a53=y -BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 5.0 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f" -R2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_neo2" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/friendlyarm/nanopi-neo2/boot.cmd" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-nanopi-neo2" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM Nanopi NEO2" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo2/genimage.cfg" diff --git a/buildroot/configs/friendlyarm_nanopi_neo4_defconfig b/buildroot/configs/friendlyarm_nanopi_neo4_defconfig deleted file mode 100644 index a11872ef2a..0000000000 --- a/buildroot/configs/friendlyarm_nanopi_neo4_defconfig +++ /dev/null @@ -1,55 +0,0 @@ -# Architecture -BR2_aarch64=y -BR2_cortex_a72_a53=y - -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="11a0a46a899fcc3b1fdb214b382f3d7495d88eca" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3399" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi-neo4-rk3399" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="idbloader.img" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.18" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3399-nanopi-neo4" -BR2_LINUX_KERNEL_INSTALL_TARGET=y -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_HOSTNAME="NanoPi Neo4" -BR2_TARGET_GENERIC_ISSUE="Welcome to NanoPi Neo4!" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="70M" -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo4/genimage.cfg" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-neo4/post-build.sh" diff --git a/buildroot/configs/friendlyarm_nanopi_neo_defconfig b/buildroot/configs/friendlyarm_nanopi_neo_defconfig index 1519d828d6..9aed25b30c 100644 --- a/buildroot/configs/friendlyarm_nanopi_neo_defconfig +++ b/buildroot/configs/friendlyarm_nanopi_neo_defconfig @@ -1,43 +1,31 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y - +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/friendlyarm/nanopi-neo/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_HOSTNAME="nanopi-neo" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the NanoPi NEO" - -# Linux headers same as kernel, a 5.3 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y - -# Use a -rc kernel to get the DTS +BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-neo/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.44" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-nanopi-neo" - -# Use an -rc tag because the defconfig is very recent +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun8i-h3-nanopi-neo" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_neo" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/friendlyarm/nanopi-neo/boot.cmd" - -# Build an sdcard image -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo/genimage.cfg" -# BR2_TARGET_ROOTFS_TAR is not set - -# Additional tools -BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/friendlyarm_nanopi_neo_plus2_defconfig b/buildroot/configs/friendlyarm_nanopi_neo_plus2_defconfig deleted file mode 100644 index 461e468cb6..0000000000 --- a/buildroot/configs/friendlyarm_nanopi_neo_plus2_defconfig +++ /dev/null @@ -1,62 +0,0 @@ -BR2_aarch64=y -BR2_cortex_a53=y -BR2_ARM_FPU_VFPV4=y - -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y -BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y -BR2_ROOTFS_OVERLAY="board/friendlyarm/nanopi-neo-plus2/rootfs_overlay" - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f" -R2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_neo_plus2" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.4" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-nanopi-neo-plus2" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/friendlyarm/nanopi-neo-plus2/linux-extras.config" - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM Nanopi NEO Plus2" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo-plus2/genimage.cfg" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-neo-plus2/post-build.sh" - -# wireless firmware -BR2_PACKAGE_LINUX_FIRMWARE=y -BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=y - -# wireless tools -BR2_PACKAGE_IW=y -BR2_PACKAGE_WIRELESS_TOOLS=y -BR2_PACKAGE_WIRELESS_TOOLS_LIB=y -BR2_PACKAGE_WPA_SUPPLICANT=y -BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y -BR2_PACKAGE_WPA_SUPPLICANT_CLI=y diff --git a/buildroot/configs/friendlyarm_nanopi_r1_defconfig b/buildroot/configs/friendlyarm_nanopi_r1_defconfig deleted file mode 100644 index 8b03f6dd00..0000000000 --- a/buildroot/configs/friendlyarm_nanopi_r1_defconfig +++ /dev/null @@ -1,49 +0,0 @@ -# Architecture -BR2_arm=y -BR2_cortex_a7=y -BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 5.0 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# System configuration -BR2_TARGET_GENERIC_HOSTNAME="nanopi-r1" -BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the NanoPi R1" - -# Bootloaders -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_CUSTOM_DTS_PATH="board/friendlyarm/nanopi-r1/uboot/sun8i-h3-nanopi-r1.dts" -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" -BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y -BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="board/friendlyarm/nanopi-r1/uboot/nanopi_r1_defconfig" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/friendlyarm/nanopi-r1/boot.cmd" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/friendlyarm/nanopi-r1/kernel/linux-extras.config" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/friendlyarm/nanopi-r1/kernel/sun8i-h3-nanopi-r1.dts" -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-nanopi-r1" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-r1/genimage.cfg" -# BR2_TARGET_ROOTFS_TAR is not set - -# Additional tools -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/friendlyarm_nanopi_r2s_defconfig b/buildroot/configs/friendlyarm_nanopi_r2s_defconfig index ce252a5d76..c190de35f8 100644 --- a/buildroot/configs/friendlyarm_nanopi_r2s_defconfig +++ b/buildroot/configs/friendlyarm_nanopi_r2s_defconfig @@ -1,6 +1,6 @@ BR2_aarch64=y -BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y BR2_TARGET_GENERIC_HOSTNAME="rk3328-nanopi-r2s" BR2_TARGET_GENERIC_ISSUE="Welcome to Nanopi R2S RK3328" BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-r2s/post-build.sh" diff --git a/buildroot/configs/galileo_defconfig b/buildroot/configs/galileo_defconfig index a8fd0a6dcc..59dd2dec9a 100644 --- a/buildroot/configs/galileo_defconfig +++ b/buildroot/configs/galileo_defconfig @@ -1,9 +1,6 @@ BR2_x86_x1000=y -BR2_GLOBAL_PATCH_DIR=board/intel/galileo/patches -# Needed for TARGET_GRUB2 -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y -# Linux headers same as kernel, a 3.14 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=y +BR2_GLOBAL_PATCH_DIR="board/intel/galileo/patches" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS1" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y diff --git a/buildroot/configs/globalscale_espressobin_defconfig b/buildroot/configs/globalscale_espressobin_defconfig index 8d44b25ae7..562e646b70 100644 --- a/buildroot/configs/globalscale_espressobin_defconfig +++ b/buildroot/configs/globalscale_espressobin_defconfig @@ -1,11 +1,9 @@ BR2_aarch64=y -BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 5.15 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# Kernel +BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Marvell ESPRESSObin" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/globalscale/espressobin/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.1" @@ -15,13 +13,8 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="marvell/armada-3720-espressobin marvell/armada-3720-espressobin-emmc marvell/armada-3720-espressobin-v7 marvell/armada-3720-espressobin-v7-emmc marvell/armada-3720-espressobin-ultra" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Marvell ESPRESSObin" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ROOTFS_TAR_GZIP=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/globalscale/espressobin/genimage.cfg" diff --git a/buildroot/configs/grinn_chiliboard_defconfig b/buildroot/configs/grinn_chiliboard_defconfig index 80f3077b76..a5a8f7a65f 100644 --- a/buildroot/configs/grinn_chiliboard_defconfig +++ b/buildroot/configs/grinn_chiliboard_defconfig @@ -1,12 +1,12 @@ BR2_arm=y BR2_cortex_a8=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/grinn/chiliboard/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.4" BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-chiliboard" @@ -16,8 +16,9 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="chiliboard" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="spl/u-boot-spl.bin" diff --git a/buildroot/configs/grinn_liteboard_defconfig b/buildroot/configs/grinn_liteboard_defconfig index 9cad66e15a..3ae4a2a0b5 100644 --- a/buildroot/configs/grinn_liteboard_defconfig +++ b/buildroot/configs/grinn_liteboard_defconfig @@ -1,12 +1,12 @@ BR2_arm=y BR2_cortex_a7=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/grinn/liteboard/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.4" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-liteboard" @@ -16,7 +16,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="liteboard" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMG=y diff --git a/buildroot/configs/hifive_unleashed_defconfig b/buildroot/configs/hifive_unleashed_defconfig index 0b87f2588f..cb217a5af1 100644 --- a/buildroot/configs/hifive_unleashed_defconfig +++ b/buildroot/configs/hifive_unleashed_defconfig @@ -1,54 +1,43 @@ -# Architecture BR2_riscv=y BR2_riscv_custom=y -BR2_RISCV_ISA_CUSTOM_RVM=y -BR2_RISCV_ISA_CUSTOM_RVF=y -BR2_RISCV_ISA_CUSTOM_RVD=y -BR2_RISCV_ISA_CUSTOM_RVC=y -BR2_RISCV_64=y -BR2_RISCV_ABI_LP64D=y - -# System -BR2_SYSTEM_DHCP="eth0" -BR2_TARGET_GENERIC_GETTY=y +BR2_RISCV_ISA_RVM=y +BR2_RISCV_ISA_RVA=y +BR2_RISCV_ISA_RVF=y +BR2_RISCV_ISA_RVD=y +BR2_RISCV_ISA_RVC=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_TARGET_GENERIC_GETTY_PORT="ttySIF0" +BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/sifive/hifive-unleashed/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/sifive/hifive-unleashed/genimage_sdcard.cfg" - -# Filesystem -BR2_TARGET_ROOTFS_CPIO=y -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y - -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.190" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/sifive/hifive-unleashed/linux.config.fragment" -BR2_LINUX_KERNEL_IMAGE=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sifive/hifive-unleashed-a00" BR2_LINUX_KERNEL_INSTALL_TARGET=y - -# Bootloader +BR2_TARGET_ROOTFS_CPIO=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.2" BR2_TARGET_OPENSBI_PLAT="generic" BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.01" BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sifive_fu540" +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.04" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sifive_unleashed" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_OPENSBI=y -BR2_TARGET_UBOOT_FORMAT_ITB=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" BR2_TARGET_UBOOT_SPL=y - -# Host tools BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y diff --git a/buildroot/configs/icnova-a20-adb4006_defconfig b/buildroot/configs/icnova-a20-adb4006_defconfig new file mode 100644 index 0000000000..01f4abe215 --- /dev/null +++ b/buildroot/configs/icnova-a20-adb4006_defconfig @@ -0,0 +1,41 @@ +BR2_arm=y +BR2_cortex_a7=y +BR2_ARM_FPU_NEON_VFPV4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/in-circuit/icnova-a20-adb4006/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_TARGET_GENERIC_HOSTNAME="ICnova A20 ADB4006" +BR2_TARGET_GENERIC_ISSUE="Welcome to ICnova A20 ADB4006!" +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/in-circuit/icnova-a20-adb4006/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.56" +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/in-circuit/icnova-a20-adb4006/linux.fragment" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun7i-a20-icnova-a20-adb4006" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="128M" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.10" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="icnova-a20-adb4006" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/in-circuit/icnova-a20-adb4006/boot.cmd" diff --git a/buildroot/configs/imx23evk_defconfig b/buildroot/configs/imx23evk_defconfig index 94d159cf9e..330d5c4502 100644 --- a/buildroot/configs/imx23evk_defconfig +++ b/buildroot/configs/imx23evk_defconfig @@ -1,34 +1,20 @@ -# architecture BR2_arm=y -BR2_arm926t=y - -# Linux headers same as kernel, a 4.8 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y - -# system +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" - -# kernel +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/mxs/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.6" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.21" BR2_LINUX_KERNEL_DEFCONFIG="mxs" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx23-evk" - -# bootloader +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/mxs/imx23-evk" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx23evk" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_FORMAT_SD=y - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y - -# To generate SD card image BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/mxs/post-image.sh" diff --git a/buildroot/configs/imx6-sabreauto_defconfig b/buildroot/configs/imx6-sabreauto_defconfig index 24b3fd387f..0683a01ff6 100644 --- a/buildroot/configs/imx6-sabreauto_defconfig +++ b/buildroot/configs/imx6-sabreauto_defconfig @@ -3,39 +3,27 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y - -# Linux headers same as kernel, a 5.15 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# System +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" - -# required tools to create the SD card image -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y - -# Filesystem BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.47" +BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6q-sabreauto nxp/imx/imx6dl-sabreauto nxp/imx/imx6qp-sabreauto" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y - -# Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6sabreauto" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_LZOP=y BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" -BR2_TARGET_UBOOT_NEEDS_OPENSSL=y - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.1" -BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabreauto imx6dl-sabreauto imx6qp-sabreauto" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/imx6-sabresd_defconfig b/buildroot/configs/imx6-sabresd_defconfig index 19986f2cbb..bb281e16b8 100644 --- a/buildroot/configs/imx6-sabresd_defconfig +++ b/buildroot/configs/imx6-sabresd_defconfig @@ -3,38 +3,26 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y - -# Linux headers same as kernel, a 5.15 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# System +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" - -# required tools to create the SD card image -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y - -# Filesystem BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.47" +BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6q-sabresd nxp/imx/imx6dl-sabresd nxp/imx/imx6qp-sabresd" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y - -# Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6sabresd" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" -BR2_TARGET_UBOOT_NEEDS_OPENSSL=y - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.12" -BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd imx6dl-sabresd imx6qp-sabresd" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/imx6-sabresd_qt5_defconfig b/buildroot/configs/imx6-sabresd_qt5_defconfig index 38a86131dd..d3151819fb 100644 --- a/buildroot/configs/imx6-sabresd_qt5_defconfig +++ b/buildroot/configs/imx6-sabresd_qt5_defconfig @@ -3,56 +3,28 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y - -# Linux headers same as kernel, a 5.15 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# Additional features needed for packages -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_TOOLCHAIN_BUILDROOT_CXX=y - -# System +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" - -# required tools to create the SD card image -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y - -# Filesystem -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="320M" BR2_ROOTFS_OVERLAY="board/freescale/imx6-sabresd/rootfs_overlay" - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BOARDNAME="mx6sabresd" -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" -BR2_TARGET_UBOOT_FORMAT_IMG=y -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="SPL" -BR2_TARGET_UBOOT_NEEDS_OPENSSL=y - -# Kernel +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.47" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd imx6dl-sabresd imx6qp-sabresd" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/freescale/imx6-sabresd/linux_qt5.fragment" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6q-sabresd nxp/imx/imx6dl-sabresd nxp/imx/imx6qp-sabresd" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# GL driver -BR2_PACKAGE_MESA3D=y -BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV=y -BR2_PACKAGE_MESA3D_OPENGL_ES=y -BR2_PACKAGE_MESA3D_OPENGL_EGL=y - -# Fonts +BR2_PACKAGE_GSTREAMER1=y +BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC=y +BR2_PACKAGE_GST1_PLUGINS_GOOD=y +BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2=y +BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2_PROBE=y +BR2_PACKAGE_GST1_PLUGINS_BAD=y +BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOPARSERS=y +BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_KMS=y BR2_PACKAGE_BITSTREAM_VERA=y BR2_PACKAGE_CANTARELL=y BR2_PACKAGE_DEJAVU=y @@ -60,41 +32,38 @@ BR2_PACKAGE_FONT_AWESOME=y BR2_PACKAGE_GHOSTSCRIPT_FONTS=y BR2_PACKAGE_INCONSOLATA=y BR2_PACKAGE_LIBERATION=y - -# GL demos BR2_PACKAGE_GLMARK2=y BR2_PACKAGE_KMSCUBE=y -BR2_PACKAGE_LIBV4L=y -BR2_PACKAGE_LIBV4L_UTILS=y BR2_PACKAGE_MESA3D_DEMOS=y - -# Qt5 +BR2_PACKAGE_QT5CINEX=y +BR2_PACKAGE_QT5CINEX_HD=y +BR2_PACKAGE_MESA3D=y +BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV=y +BR2_PACKAGE_MESA3D_OPENGL_EGL=y +BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_QT5=y BR2_PACKAGE_QT5BASE_OPENGL_LIB=y BR2_PACKAGE_QT5BASE_LINUXFB=y BR2_PACKAGE_QT5BASE_FONTCONFIG=y BR2_PACKAGE_QT5BASE_GIF=y BR2_PACKAGE_QT5BASE_JPEG=y -BR2_PACKAGE_QT5CINEX=y -BR2_PACKAGE_QT5CINEX_HD=y - -# NXP firmware package BR2_PACKAGE_FREESCALE_IMX=y BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q=y BR2_PACKAGE_FIRMWARE_IMX=y - -# libdrm tests BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y - -# gstreamer-1.0 -BR2_PACKAGE_GSTREAMER1=y -BR2_PACKAGE_GST1_PLUGINS_GOOD=y -BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2=y -BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2_PROBE=y -BR2_PACKAGE_GST1_PLUGINS_BAD=y -BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOPARSERS=y -BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_KMS=y -BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC=y - -# For automatic kernel module loading -BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y +BR2_PACKAGE_LIBV4L=y +BR2_PACKAGE_LIBV4L_UTILS=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="320M" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BOARDNAME="mx6sabresd" +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_IMG=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="SPL" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/imx6slevk_defconfig b/buildroot/configs/imx6slevk_defconfig index 9448267e2b..f64b5fa41b 100644 --- a/buildroot/configs/imx6slevk_defconfig +++ b/buildroot/configs/imx6slevk_defconfig @@ -3,9 +3,15 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 5.15 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.51" +BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6sl-evk" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y @@ -14,14 +20,6 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMX=y -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.11" -BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sl-evk" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" -# required tools to create the SD card image BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/imx6sx-sdb_defconfig b/buildroot/configs/imx6sx-sdb_defconfig index c36520a165..5dc3f87171 100644 --- a/buildroot/configs/imx6sx-sdb_defconfig +++ b/buildroot/configs/imx6sx-sdb_defconfig @@ -3,25 +3,23 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 5.15 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.46" +BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6sx-sdb nxp/imx/imx6sx-sdb-reva" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6sxsabresd" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" -BR2_TARGET_UBOOT_FORMAT_IMX=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.11" -BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sx-sdb imx6sx-sdb-reva" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" -# required tools to create the SD card image +BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/imx6ulevk_defconfig b/buildroot/configs/imx6ulevk_defconfig index 22b5a45480..e20d452b66 100644 --- a/buildroot/configs/imx6ulevk_defconfig +++ b/buildroot/configs/imx6ulevk_defconfig @@ -1,40 +1,27 @@ -# architecture BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y - -# Linux headers same as kernel, a 5.15 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# system +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" - -# kernel +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.11" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.48" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-14x14-evk" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6ul-14x14-evk" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# bootloader +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6ul_14x14_evk" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" +BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" -BR2_TARGET_UBOOT_NEEDS_DTC=y - -# required tools to create the SD card image BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y - -# filesystem / image -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y diff --git a/buildroot/configs/imx6ullevk_defconfig b/buildroot/configs/imx6ullevk_defconfig index c6e2981697..38ea8f6940 100644 --- a/buildroot/configs/imx6ullevk_defconfig +++ b/buildroot/configs/imx6ullevk_defconfig @@ -1,38 +1,29 @@ -# architecture BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y - -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y - -# system +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" - -# kernel +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.4" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ull-14x14-evk" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6ull-14x14-evk" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# bootloader +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6UL=y +BR2_PACKAGE_FIRMWARE_IMX=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6ull_14x14_evk" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" -BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y - -# required tools to create the SD card image +BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y - -# filesystem / image -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y diff --git a/buildroot/configs/imx6ulpico_defconfig b/buildroot/configs/imx6ulpico_defconfig index e406d9938b..b8d713c4de 100644 --- a/buildroot/configs/imx6ulpico_defconfig +++ b/buildroot/configs/imx6ulpico_defconfig @@ -1,55 +1,35 @@ -# architecture BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y - -# Linux headers same as kernel, a 5.15 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# system +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc5" - -# rootfs overlay BR2_ROOTFS_OVERLAY="board/technexion/imx6ulpico/rootfs_overlay" - -# kernel +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.11" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.48" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-pico-pi imx6ul-pico-hobbit imx6ul-pico-dwarf" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6ul-pico-pi nxp/imx/imx6ul-pico-hobbit nxp/imx/imx6ul-pico-dwarf" BR2_LINUX_KERNEL_INSTALL_TARGET=y - -# wifi firmware for brcm4339 +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_LINUX_FIRMWARE=y +BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_10K_QCA9377=y BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XX=y - -# For automatic firmware loading -BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y - -# wireless packages BR2_PACKAGE_WIRELESS_TOOLS=y BR2_PACKAGE_WPA_SUPPLICANT=y BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y - -# bootloader +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="SPL" -BR2_TARGET_UBOOT_BOARDNAME="pico-imx6ul" +BR2_TARGET_UBOOT_BOARDNAME="pico-pi-imx6ul" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y - -# required tools to create the eMMC image +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="SPL" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y - -# filesystem / image -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y diff --git a/buildroot/configs/imx6ulz_bsh_smm_m2_defconfig b/buildroot/configs/imx6ulz_bsh_smm_m2_defconfig new file mode 100644 index 0000000000..29177c4756 --- /dev/null +++ b/buildroot/configs/imx6ulz_bsh_smm_m2_defconfig @@ -0,0 +1,42 @@ +BR2_arm=y +BR2_cortex_a7=y +BR2_ARM_FPU_VFPV3=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_GLOBAL_PATCH_DIR="board/bsh/imx6ulz-bsh-smm-m2/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/bsh/imx6ulz-bsh-smm-m2/post-build.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.68" +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/bsh/imx6ulz-bsh-smm-m2/linux.config" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ulz-bsh-smm-m2" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6UL=y +BR2_PACKAGE_FIRMWARE_IMX=y +BR2_PACKAGE_BLUEZ_TOOLS=y +BR2_PACKAGE_BLUEZ5_UTILS=y +BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y +BR2_PACKAGE_IW=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ROOTFS_UBIFS=y +BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000 +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx6ulz_smm_m2" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-spl.imx" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_E2FSPROGS=y +BR2_PACKAGE_HOST_ENVIRONMENT_SETUP=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/imx7d-sdb_defconfig b/buildroot/configs/imx7d-sdb_defconfig index 8ee5e1fc40..541a689ddc 100644 --- a/buildroot/configs/imx7d-sdb_defconfig +++ b/buildroot/configs/imx7d-sdb_defconfig @@ -1,38 +1,25 @@ -# architecture BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y - -# Linux headers same as kernel, a 5.13 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13=y - -# system +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" - -# Kernel +BR2_ROOTFS_OVERLAY="board/freescale/imx7dsdb/rootfs_overlay" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.21" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7d-sdb" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx7d-sdb" BR2_LINUX_KERNEL_INSTALL_TARGET=y - -# U-Boot +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx7dsabresd" BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.07" BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y - -# Filesystem -BR2_ROOTFS_OVERLAY="board/freescale/imx7dsdb/rootfs_overlay" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y - -# required tools to create the eMMC image BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/imx7dpico_defconfig b/buildroot/configs/imx7dpico_defconfig index c6ea04b683..3fbdb898a1 100644 --- a/buildroot/configs/imx7dpico_defconfig +++ b/buildroot/configs/imx7dpico_defconfig @@ -1,50 +1,32 @@ -# architecture BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y - -# Linux headers same as kernel, a 5.13 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13=y - -# system +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc4" - -# kernel +BR2_ROOTFS_OVERLAY="board/technexion/imx7dpico/rootfs_overlay" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.48" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7d-pico-pi" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx7d-pico-pi" BR2_LINUX_KERNEL_INSTALL_TARGET=y - -# bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="SPL" -BR2_TARGET_UBOOT_BOARDNAME="pico-pi-imx7d" -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.07" -BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y - -# wifi firmware for brcm43439 +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XX=y - -# For automatic firmware loading -BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y - -# wireless packages BR2_PACKAGE_WIRELESS_TOOLS=y BR2_PACKAGE_WPA_SUPPLICANT=y BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y - -# required tools to create the eMMC image -BR2_PACKAGE_HOST_GENIMAGE=y - -# filesystem / image -BR2_ROOTFS_OVERLAY="board/technexion/imx7dpico/rootfs_overlay" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BOARDNAME="pico-pi-imx7d" +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="SPL" +BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/buildroot/configs/imx8mmpico_defconfig b/buildroot/configs/imx8mmpico_defconfig index f04946a8d1..d1836db61a 100644 --- a/buildroot/configs/imx8mmpico_defconfig +++ b/buildroot/configs/imx8mmpico_defconfig @@ -1,13 +1,16 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_GLOBAL_PATCH_DIR="board/technexion/imx8mmpico/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mm-pico-pi.dtb" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,TechNexion,linux,9146d4dcb2dda0c7614f74f824cfb20d29bd85f8)/linux-9146d4dcb2dda0c7614f74f824cfb20d29bd85f8.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,TechNexion,linux-tn-imx,tn-mickledore_6.1.55-2.2.0_20240417)/linux-tn-imx-tn-mickledore_6.1.55-2.2.0_20240417.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="tn_imx8" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-pico-pi freescale/imx8mm-pico-pi-ili9881c freescale/imx8mm-pico-pi-sn65dsi84-hj070na" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-pico-pi freescale/imx8mm-pico-pi-ili9881c" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_FREESCALE_IMX=y BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y BR2_PACKAGE_FIRMWARE_IMX=y @@ -16,17 +19,17 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="rel_imx_4.14.98_2.0.0_ga" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.1.55-2.2.0)/imx-atf-lf-6.1.55-2.2.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,TechNexion,u-boot-edm,9a070a5b4460124054bc459edfc9d1b43e5403bb)/u-boot-edm-9a070a5b4460124054bc459edfc9d1b43e5403bb.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,TechNexion,u-boot-tn-imx,tn-mickledore_6.1.55-2.2.0_20240417)/u-boot-tn-imx-tn-mickledore_6.1.55-2.2.0_20240417.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="pico-imx8mm" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_SPL=y diff --git a/buildroot/configs/imx8mn_bsh_smm_s2_defconfig b/buildroot/configs/imx8mn_bsh_smm_s2_defconfig new file mode 100644 index 0000000000..2b358cf57b --- /dev/null +++ b/buildroot/configs/imx8mn_bsh_smm_s2_defconfig @@ -0,0 +1,42 @@ +BR2_aarch64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_10=y +BR2_GLOBAL_PATCH_DIR="board/bsh/common/imx8mn-bsh-smm-s2/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/bsh/imx8mn-bsh-smm-s2/post-build.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.10" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/bsh/common/imx8mn-bsh-smm-s2/linux.fragment" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mn-bsh-smm-s2" +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y +BR2_PACKAGE_FIRMWARE_IMX=y +BR2_PACKAGE_FIRMWARE_IMX_DDR3=y +BR2_TARGET_ROOTFS_UBIFS=y +BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000 +BR2_TARGET_ROOTFS_UBIFS_RT_NONE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.10" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mn" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30a60000" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_DEBUG=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mn_bsh_smm_s2" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" +BR2_TARGET_UBOOT_SPL=y +BR2_PACKAGE_HOST_UUU=y diff --git a/buildroot/configs/imx8mn_bsh_smm_s2_pro_defconfig b/buildroot/configs/imx8mn_bsh_smm_s2_pro_defconfig new file mode 100644 index 0000000000..e903cbf314 --- /dev/null +++ b/buildroot/configs/imx8mn_bsh_smm_s2_pro_defconfig @@ -0,0 +1,44 @@ +BR2_aarch64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_10=y +BR2_GLOBAL_PATCH_DIR="board/bsh/common/imx8mn-bsh-smm-s2/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/bsh/imx8mn-bsh-smm-s2-pro/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/bsh/imx8mn-bsh-smm-s2-pro/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.10" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/bsh/common/imx8mn-bsh-smm-s2/linux.fragment" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mn-bsh-smm-s2pro" +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y +BR2_PACKAGE_FIRMWARE_IMX=y +BR2_PACKAGE_FIRMWARE_IMX_DDR3=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.10" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mn" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30a60000" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mn_bsh_smm_s2pro" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" +BR2_TARGET_UBOOT_SPL=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_UUU=y diff --git a/buildroot/configs/imx8mpico_defconfig b/buildroot/configs/imx8mpico_defconfig deleted file mode 100644 index 5478f267fc..0000000000 --- a/buildroot/configs/imx8mpico_defconfig +++ /dev/null @@ -1,38 +0,0 @@ -BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mq-pico-pi.dtb" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,TechNexion,linux,9146d4dcb2dda0c7614f74f824cfb20d29bd85f8)/linux-9146d4dcb2dda0c7614f74f824cfb20d29bd85f8.tar.gz" -BR2_LINUX_KERNEL_DEFCONFIG="tn_imx8" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mq-pico-pi freescale/imx8mq-pico-pi-dcss-ili9881c" -BR2_PACKAGE_FREESCALE_IMX=y -BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y -BR2_PACKAGE_FIRMWARE_IMX=y -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="120M" -# BR2_TARGET_ROOTFS_TAR is not set -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="rel_imx_4.14.98_2.0.0_ga" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mq" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,TechNexion,u-boot-edm,9a070a5b4460124054bc459edfc9d1b43e5403bb)/u-boot-edm-9a070a5b4460124054bc459edfc9d1b43e5403bb.tar.gz" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="pico-imx8mq" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" -BR2_TARGET_UBOOT_SPL=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_IMX_MKIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y diff --git a/buildroot/configs/imx8mqevk_defconfig b/buildroot/configs/imx8mqevk_defconfig index 73f3f3dcc5..bac68f40a6 100644 --- a/buildroot/configs/imx8mqevk_defconfig +++ b/buildroot/configs/imx8mqevk_defconfig @@ -1,12 +1,12 @@ BR2_aarch64=y BR2_ARM_FPU_VFPV3=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mq-evk.dtb" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.48" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mq-evk" @@ -18,18 +18,18 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.6.23-2.0.0)/imx-atf-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mq" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mq_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_SPL=y diff --git a/buildroot/configs/imxrt1050-evk_defconfig b/buildroot/configs/imxrt1050-evk_defconfig new file mode 100644 index 0000000000..8a515a9260 --- /dev/null +++ b/buildroot/configs/imxrt1050-evk_defconfig @@ -0,0 +1,27 @@ +BR2_arm=y +BR2_cortex_m7=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_7=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/freescale/imxrt1050evk/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.7" +BR2_LINUX_KERNEL_DEFCONFIG="imxrt" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imxrt1050-evk" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="16M" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imxrt1050-evk" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/freescale/imxrt1050evk/uboot.fragment" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_IMG=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="SPL" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/khadas_vim3_defconfig b/buildroot/configs/khadas_vim3_defconfig new file mode 100644 index 0000000000..21a16cc1b0 --- /dev/null +++ b/buildroot/configs/khadas_vim3_defconfig @@ -0,0 +1,27 @@ +BR2_aarch64=y +BR2_cortex_a73_a53=y +BR2_ARM_FPU_VFPV4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_3=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/khadas/vim3/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/khadas/vim3/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.3" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="amlogic/meson-g12b-a311d-khadas-vim3" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_PACKAGE_DOSFSTOOLS=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="128M" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.04" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="khadas-vim3" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_PACKAGE_HOST_AMLOGIC_BOOT_FIP=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/kontron_bl_imx8mm_defconfig b/buildroot/configs/kontron_bl_imx8mm_defconfig index 2b7e121e25..ba3c58693b 100644 --- a/buildroot/configs/kontron_bl_imx8mm_defconfig +++ b/buildroot/configs/kontron_bl_imx8mm_defconfig @@ -1,14 +1,10 @@ -# Architecture BR2_aarch64=y -BR2_cortex_a53=y BR2_ARM_FPU_VFPV3=y - -BR2_GLOBAL_PATCH_DIR="board/kontron/bl-imx8mm/patches" - -# System +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2" - -# Kernel +BR2_ROOTFS_POST_BUILD_SCRIPT="board/kontron/bl-imx8mm/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" @@ -18,43 +14,30 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-kontron-n801x-s" BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y - BR2_PACKAGE_FREESCALE_IMX=y BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y BR2_PACKAGE_FIRMWARE_IMX=y - -# Filesystem / image BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" - -# Bootloader BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30880000" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="kontron-sl-mx8mm" BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN=y BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" BR2_TARGET_UBOOT_SPL=y - -# Required host tools to create the SD/eMMC image -BR2_ROOTFS_POST_BUILD_SCRIPT="board/kontron/bl-imx8mm/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/buildroot/configs/kontron_pitx_imx8m_defconfig b/buildroot/configs/kontron_pitx_imx8m_defconfig index 8f756f5246..47d33f11ed 100644 --- a/buildroot/configs/kontron_pitx_imx8m_defconfig +++ b/buildroot/configs/kontron_pitx_imx8m_defconfig @@ -1,51 +1,44 @@ -# Architecture BR2_aarch64=y - -# System +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y +BR2_GLOBAL_PATCH_DIR="board/kontron/pitx-imx8m/patches" BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/kontron/pitx-imx8m/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/kontron/pitx-imx8m/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/pitx-imx8mq.dtb" - -# Kernel +BR2_ROOTFS_POST_BUILD_SCRIPT="board/kontron/pitx-imx8m/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.1" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mq-kontron-pitx-imx8m" BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y - BR2_PACKAGE_FREESCALE_IMX=y BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y BR2_PACKAGE_FIRMWARE_IMX=y - -# Filesystem / image BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" - -# Bootloader BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mq" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://gitlab.kontron.com/imx/u-boot-imx/-/archive/PITX-IMX8M-R12/u-boot-imx-PITX-IMX8M-R12.tar.gz" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="pitx-imx8m" +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.04" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="kontron_pitx_imx8m" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" BR2_TARGET_UBOOT_SPL=y - -# Required host tools to create the SD/eMMC image BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_IMX_MKIMAGE=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/buildroot/configs/kontron_smarc_sal28_defconfig b/buildroot/configs/kontron_smarc_sal28_defconfig index 37e415cf32..efd4bd41e6 100644 --- a/buildroot/configs/kontron_smarc_sal28_defconfig +++ b/buildroot/configs/kontron_smarc_sal28_defconfig @@ -1,7 +1,6 @@ BR2_aarch64=y BR2_cortex_a72=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_OVERLAY="board/kontron/smarc-sal28/rootfs_overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="board/kontron/smarc-sal28/post-build.sh" @@ -23,11 +22,13 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="128M" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="kontron_sl28" BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.rom" diff --git a/buildroot/configs/lafrite_defconfig b/buildroot/configs/lafrite_defconfig index b3326f6b49..5f70706fa0 100644 --- a/buildroot/configs/lafrite_defconfig +++ b/buildroot/configs/lafrite_defconfig @@ -1,6 +1,7 @@ BR2_aarch64=y -BR2_cortex_a53=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/librecomputer/lafrite/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/librecomputer/lafrite/overlay/" @@ -8,7 +9,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/librecomputer/lafrite/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.9" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.22" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="amlogic/meson-gxl-s805x-libretech-ac" diff --git a/buildroot/configs/lego_ev3_defconfig b/buildroot/configs/lego_ev3_defconfig index 555a63e36c..8de65aae02 100644 --- a/buildroot/configs/lego_ev3_defconfig +++ b/buildroot/configs/lego_ev3_defconfig @@ -1,52 +1,35 @@ -# architecture BR2_arm=y -BR2_arm926t=y - -# Toolchain -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y - -# system -BR2_TARGET_GENERIC_GETTY=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS1" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +BR2_GLOBAL_PATCH_DIR="board/lego/ev3/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS1" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/lego/ev3/post-image.sh" -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.315" BR2_LINUX_KERNEL_DEFCONFIG="davinci_all" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/lego/ev3/linux.fragment" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0xc0008000" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="da850-lego-ev3" - -# Target packages BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/lego/ev3/busybox.fragment" -BR2_PACKAGE_BLUEZ5_UTILS=y -BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y -BR2_PACKAGE_BRICKD=y BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_TI_CC2560=y - -# filesystem +BR2_PACKAGE_BRICKD=y +BR2_PACKAGE_BLUEZ5_UTILS=y +BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_SQUASHFS=y BR2_TARGET_ROOTFS_SQUASHFS4_XZ=y # BR2_TARGET_ROOTFS_TAR is not set - -# U-Boot BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="legoev3" - -# host BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/licheepi_zero_defconfig b/buildroot/configs/licheepi_zero_defconfig deleted file mode 100644 index 2e1a413988..0000000000 --- a/buildroot/configs/licheepi_zero_defconfig +++ /dev/null @@ -1,52 +0,0 @@ -# Target options -BR2_arm=y -BR2_cortex_a7=y -BR2_ARM_FPU_VFPV4=y - -# Toolchain -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y - -# System configuration -BR2_TARGET_GENERIC_HOSTNAME="licheepi-zero" -BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the LicheePi Zero" -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" -BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/licheepi/genimage.cfg" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.5" -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-v3s-licheepi-zero sun8i-v3s-licheepi-zero-dock" - -BR2_PACKAGE_LINUX_FIRMWARE=y -BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y - -BR2_PACKAGE_WPA_SUPPLICANT=y -BR2_PACKAGE_WPA_SUPPLICANT_AUTOSCAN=y - -# Filesystem images -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y - -# Bootloaders -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="LicheePi_Zero" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/licheepi/boot.cmd" - -# Required host utilities for building an SDCard image -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/linksprite_pcduino_defconfig b/buildroot/configs/linksprite_pcduino_defconfig index b58f970493..69663e0c3e 100644 --- a/buildroot/configs/linksprite_pcduino_defconfig +++ b/buildroot/configs/linksprite_pcduino_defconfig @@ -1,65 +1,39 @@ -# Architecture BR2_arm=y BR2_cortex_a8=y - -# System settings +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_TARGET_GENERIC_HOSTNAME="pcduino" BR2_TARGET_GENERIC_ISSUE="pcDuino buildroot is ready" - -# Serial port config -BR2_TARGET_GENERIC_GETTY=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# SD image scripts -BR2_ROOTFS_POST_BUILD_SCRIPT="board/linksprite/pcduino/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/linksprite/pcduino/post-image.sh" - -# For kernel modules autoloading BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y - -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y - -# Kernel +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.10" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.3" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun4i-a10-pcduino" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/linksprite/pcduino/linux-extras.config" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun4i-a10-pcduino" +BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem +BR2_PACKAGE_LINUX_FIRMWARE=y +BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y +BR2_PACKAGE_IW=y +BR2_PACKAGE_WIRELESS_TOOLS=y +BR2_PACKAGE_WIRELESS_TOOLS_LIB=y +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_PACKAGE_WPA_SUPPLICANT_CLI=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y - -# U-Boot BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" -BR2_TARGET_UBOOT_USE_DEFCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Linksprite_pcDuino" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y -BR2_TARGET_UBOOT_FORMAT_BIN=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" - -# Host packages -BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y - -# Target packages: wireless support for pcduino-lite-wifi -BR2_PACKAGE_IW=y -BR2_PACKAGE_WIRELESS_TOOLS=y -BR2_PACKAGE_WIRELESS_TOOLS_LIB=y -BR2_PACKAGE_WPA_SUPPLICANT=y -BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y -BR2_PACKAGE_WPA_SUPPLICANT_CLI=y -BR2_PACKAGE_LINUX_FIRMWARE=y -BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y diff --git a/buildroot/configs/ls1028ardb_defconfig b/buildroot/configs/ls1028ardb_defconfig new file mode 100644 index 0000000000..0d1843bf5f --- /dev/null +++ b/buildroot/configs/ls1028ardb_defconfig @@ -0,0 +1,43 @@ +BR2_aarch64=y +BR2_cortex_a72=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/freescale/ls1028ardb/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_TARGET_GENERIC_HOSTNAME="ls1028a" +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_SYSTEM_DHCP="eno0" +BR2_ROOTFS_OVERLAY="board/freescale/ls1028ardb/rootfs_overlay" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/freescale/ls1028ardb/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,linux,lf-6.6.23-2.0.0)/linux-lf-6.6.23-2.0.0.tar.gz" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(LINUX_DIR)/arch/arm64/configs/lsdk.config" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/fsl-ls1028a-rdb" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_PACKAGE_QORIQ_CADENCE_DP_FIRMWARE=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="128M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,atf,lf-6.6.23-2.0.0)/atf-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="ls1028ardb" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_RCW=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="BOOT_MODE=sd" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="fip.bin bl2_sd.pbl" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,u-boot,lf-6.6.23-2.0.0)/u-boot-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="ls1028ardb_tfa" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_QORIQ_RCW=y +BR2_PACKAGE_HOST_QORIQ_RCW_INTREE="ls1028ardb/R_SQPP_0x85bb/rcw_1300_sdboot.bin" diff --git a/buildroot/configs/ls1046a-frwy_defconfig b/buildroot/configs/ls1046a-frwy_defconfig new file mode 100644 index 0000000000..2cf0f9c8bc --- /dev/null +++ b/buildroot/configs/ls1046a-frwy_defconfig @@ -0,0 +1,43 @@ +BR2_aarch64=y +BR2_cortex_a72=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/freescale/ls1046a-frwy/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_TARGET_GENERIC_HOSTNAME="ls1046afrwy" +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_OVERLAY="board/freescale/ls1046a-frwy/rootfs_overlay" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/freescale/ls1046a-frwy/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,linux,lf-6.6.23-2.0.0)/linux-lf-6.6.23-2.0.0.tar.gz" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(LINUX_DIR)/arch/arm64/configs/lsdk.config" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/fsl-ls1046a-frwy freescale/fsl-ls1046a-frwy-sdk" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_PACKAGE_QORIQ_FM_UCODE=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="128M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,atf,lf-6.6.23-2.0.0)/atf-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="ls1046afrwy" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_RCW=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="BOOT_MODE=sd" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="fip.bin bl2_sd.pbl" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,u-boot,lf-6.6.23-2.0.0)/u-boot-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="ls1046afrwy_tfa" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_QORIQ_RCW=y +BR2_PACKAGE_HOST_QORIQ_RCW_INTREE="ls1046afrwy/NN_NNQNNPNP_3040_0506/rcw_1600_sdboot.bin" diff --git a/buildroot/configs/mangopi_mq1rdw2_defconfig b/buildroot/configs/mangopi_mq1rdw2_defconfig new file mode 100644 index 0000000000..2249fa4be5 --- /dev/null +++ b/buildroot/configs/mangopi_mq1rdw2_defconfig @@ -0,0 +1,41 @@ +BR2_arm=y +BR2_cortex_a7=y +BR2_ARM_FPU_VFPV4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_TARGET_GENERIC_HOSTNAME="mangopi-mq1rdw2" +BR2_TARGET_GENERIC_ISSUE="Welcome to MangoPI MQ1RDW2" +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS3" +BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_OVERLAY="board/mangopi/mq1rdw2/rootfs_overlay" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/mangopi/mq1rdw2/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.5" +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun8i-t113s-mangopi-mq-r-t113" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_RTL8723DS=y +BR2_PACKAGE_WIRELESS_TOOLS=y +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_PACKAGE_WPA_SUPPLICANT_AUTOSCAN=y +BR2_PACKAGE_WPA_SUPPLICANT_CLI=y +BR2_PACKAGE_WPA_SUPPLICANT_WPA_CLIENT_SO=y +BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01-rc4" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="mangopi_mq_r" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/buildroot/configs/mender_x86_64_efi_defconfig b/buildroot/configs/mender_x86_64_efi_defconfig new file mode 100644 index 0000000000..d0e0d8a364 --- /dev/null +++ b/buildroot/configs/mender_x86_64_efi_defconfig @@ -0,0 +1,54 @@ +BR2_x86_64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_INIT_SYSV=y +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_ROOTFS_OVERLAY="board/mender/x86_64/overlay" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/mender/x86_64/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/mender/x86_64/post-image-efi.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="--data-part-size=32M --device-type=buildroot-x86_64 --artifact-name=1.0" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.49" +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/mender/x86_64/linux.config" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y +BR2_PACKAGE_LINUX_FIRMWARE=y +BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9170=y +BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9271=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3168=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_5000=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6000G2A=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6000G2B=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7260=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7265D=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8000C=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8265=y +BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y +BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y +BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y +BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y +BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y +BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y +BR2_PACKAGE_ACPID=y +BR2_PACKAGE_CONNMAN=y +BR2_PACKAGE_CONNMAN_WIFI=y +BR2_PACKAGE_CONNMAN_CLIENT=y +BR2_PACKAGE_MENDER=y +BR2_PACKAGE_MENDER_GRUBENV=y +BR2_PACKAGE_MENDER_GRUBENV_DEFINES="board/mender/x86_64/mender_grubenv_defines" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="128M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_GRUB2=y +BR2_TARGET_GRUB2_X86_64_EFI=y +BR2_TARGET_GRUB2_BUILTIN_MODULES_EFI="boot linux ext2 fat squash4 part_msdos part_gpt normal efi_gop loadenv hashsum echo halt gcry_sha256 test regexp sleep" +BR2_TARGET_GRUB2_INSTALL_TOOLS=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MENDER_ARTIFACT=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/microchip_mpfs_icicle_defconfig b/buildroot/configs/microchip_mpfs_icicle_defconfig new file mode 100644 index 0000000000..4337ac34b4 --- /dev/null +++ b/buildroot/configs/microchip_mpfs_icicle_defconfig @@ -0,0 +1,31 @@ +BR2_riscv=y +BR2_RISCV_ISA_RVC=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/microchip/mpfs_icicle/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_TARGET_GENERIC_HOSTNAME="mpfs_icicle" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/microchip/mpfs_icicle/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux4microchip+fpga-2024.06)/linux-linux4microchip+fpga-2024.06.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="mpfs" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/microchip/mpfs_icicle/linux.fragment" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="microchip/mpfs-icicle-kit" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,u-boot-mchp,linux4microchip+fpga-2024.06)/uboot-linux4microchip+fpga-2024.06.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="microchip_mpfs_icicle" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/microchip/mpfs_icicle/uboot-fragment-rootfs.config" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MICROCHIP_HSS_PAYLOAD_GENERATOR=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/microchip/mpfs_icicle/uboot-env.txt" diff --git a/buildroot/configs/microchip_sam9x60ek_mmc_dev_defconfig b/buildroot/configs/microchip_sam9x60ek_mmc_dev_defconfig index 06e03967c4..4c842f2bb0 100644 --- a/buildroot/configs/microchip_sam9x60ek_mmc_dev_defconfig +++ b/buildroot/configs/microchip_sam9x60ek_mmc_dev_defconfig @@ -1,7 +1,5 @@ BR2_arm=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y -BR2_PTHREAD_DEBUG=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_TARGET_GENERIC_HOSTNAME="sam9x60ek" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y @@ -36,6 +34,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILC3000_FIRMWARE=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_I2C_TOOLS=y BR2_PACKAGE_SETSERIAL=y @@ -46,7 +45,6 @@ BR2_PACKAGE_LIBDRM=y BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y BR2_PACKAGE_DTC=y BR2_PACKAGE_DTC_PROGRAMS=y -BR2_PACKAGE_ARGP_STANDALONE=y BR2_PACKAGE_BLUEZ5_UTILS=y BR2_PACKAGE_BRIDGE_UTILS=y BR2_PACKAGE_CAN_UTILS=y diff --git a/buildroot/configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig b/buildroot/configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig index 3bcd5f0200..5f6eba482c 100644 --- a/buildroot/configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig +++ b/buildroot/configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig @@ -4,8 +4,6 @@ BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y -BR2_PTHREAD_DEBUG=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" @@ -39,6 +37,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILC3000_FIRMWARE=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_I2C_TOOLS=y BR2_PACKAGE_SETSERIAL=y @@ -49,7 +48,6 @@ BR2_PACKAGE_LIBDRM=y BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y BR2_PACKAGE_DTC=y BR2_PACKAGE_DTC_PROGRAMS=y -BR2_PACKAGE_ARGP_STANDALONE=y BR2_PACKAGE_BLUEZ5_UTILS=y BR2_PACKAGE_BRIDGE_UTILS=y BR2_PACKAGE_CAN_UTILS=y diff --git a/buildroot/configs/microchip_sama5d2_icp_mmc_dev_defconfig b/buildroot/configs/microchip_sama5d2_icp_mmc_dev_defconfig index 27d1d3409d..64df7b4d13 100644 --- a/buildroot/configs/microchip_sama5d2_icp_mmc_dev_defconfig +++ b/buildroot/configs/microchip_sama5d2_icp_mmc_dev_defconfig @@ -4,8 +4,6 @@ BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y -BR2_PTHREAD_DEBUG=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" @@ -32,6 +30,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILC3000_FIRMWARE=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_SETSERIAL=y BR2_PACKAGE_SPI_TOOLS=y @@ -41,7 +40,6 @@ BR2_PACKAGE_LIBDRM=y BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y BR2_PACKAGE_DTC=y BR2_PACKAGE_DTC_PROGRAMS=y -BR2_PACKAGE_ARGP_STANDALONE=y BR2_PACKAGE_BLUEZ5_UTILS=y BR2_PACKAGE_BRIDGE_UTILS=y BR2_PACKAGE_CAN_UTILS=y diff --git a/buildroot/configs/microchip_sama7g5ek_mmc_dev_defconfig b/buildroot/configs/microchip_sama7g5ek_mmc_dev_defconfig index 6eb6c282e0..2fca9873a6 100644 --- a/buildroot/configs/microchip_sama7g5ek_mmc_dev_defconfig +++ b/buildroot/configs/microchip_sama7g5ek_mmc_dev_defconfig @@ -2,8 +2,6 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y -BR2_PTHREAD_DEBUG=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" @@ -30,6 +28,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILC3000_FIRMWARE=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_RNG_TOOLS=y # BR2_PACKAGE_RNG_TOOLS_JITTERENTROPY_LIBRARY is not set @@ -41,7 +40,6 @@ BR2_PACKAGE_LIBDRM=y BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y BR2_PACKAGE_DTC=y BR2_PACKAGE_DTC_PROGRAMS=y -BR2_PACKAGE_ARGP_STANDALONE=y BR2_PACKAGE_BLUEZ5_UTILS=y BR2_PACKAGE_BRIDGE_UTILS=y BR2_PACKAGE_CAN_UTILS=y diff --git a/buildroot/configs/minnowboard_max-graphical_defconfig b/buildroot/configs/minnowboard_max-graphical_defconfig deleted file mode 100644 index 051c7584dc..0000000000 --- a/buildroot/configs/minnowboard_max-graphical_defconfig +++ /dev/null @@ -1,75 +0,0 @@ -# Architecture -BR2_x86_64=y -BR2_x86_silvermont=y - -# Toolchain -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y -BR2_TOOLCHAIN_BUILDROOT_LOCALE=y -BR2_TOOLCHAIN_BUILDROOT_CXX=y -# needed for TARGET_GRUB2 -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y - -# System configuration -BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y -BR2_ROOTFS_OVERLAY="board/minnowboard/fs-overlay-graphical" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/minnowboard/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/minnowboard/genimage.cfg" - -# Host packages -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y - -# Linux -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.11" -BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/minnowboard/linux.config" - -# Bootloader -BR2_TARGET_GRUB2=y -BR2_TARGET_GRUB2_X86_64_EFI=y - -# ALSA -BR2_PACKAGE_ALSA_UTILS=y -BR2_PACKAGE_ALSA_UTILS_APLAY=y - -# OpenGL -BR2_PACKAGE_GLMARK2=y -BR2_PACKAGE_MESA3D_DEMOS=y -BR2_PACKAGE_MESA3D=y -BR2_PACKAGE_MESA3D_DRI_DRIVER_I965=y -BR2_PACKAGE_MESA3D_OPENGL_GLX=y - -# Framebuffer (just for testing purposes) -BR2_PACKAGE_FB_TEST_APP=y - -# X -BR2_PACKAGE_XORG7=y -BR2_PACKAGE_XSERVER_XORG_SERVER=y -BR2_PACKAGE_XAPP_XRANDR=y -BR2_PACKAGE_XDRIVER_XF86_INPUT_EVDEV=y -BR2_PACKAGE_XDRIVER_XF86_INPUT_KEYBOARD=y -BR2_PACKAGE_XDRIVER_XF86_INPUT_MOUSE=y -BR2_PACKAGE_XDRIVER_XF86_VIDEO_INTEL=y -BR2_PACKAGE_NODM=y -BR2_PACKAGE_XTERM=y -BR2_PACKAGE_OPENBOX=y - -# Firmware -BR2_PACKAGE_LINUX_FIRMWARE=y -BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y - -# Libraries -BR2_PACKAGE_IMLIB2=y -BR2_PACKAGE_IMLIB2_JPEG=y -BR2_PACKAGE_IMLIB2_PNG=y -BR2_PACKAGE_STARTUP_NOTIFICATION=y - -# Filesystem image -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="120M" -# BR2_TARGET_ROOTFS_TAR is not set diff --git a/buildroot/configs/minnowboard_max_defconfig b/buildroot/configs/minnowboard_max_defconfig index 1270f23953..f370edbaa1 100644 --- a/buildroot/configs/minnowboard_max_defconfig +++ b/buildroot/configs/minnowboard_max_defconfig @@ -1,38 +1,22 @@ -# Architecture BR2_x86_64=y BR2_x86_silvermont=y - -# Misc +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/minnowboard/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/minnowboard/genimage.cfg" - -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y -# Needed for grub2 -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y - -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y - -# Needed for ethernet -BR2_PACKAGE_LINUX_FIRMWARE=y -BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y - -# Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/minnowboard/linux.config" - -# Bootloader -BR2_TARGET_GRUB2=y -BR2_TARGET_GRUB2_X86_64_EFI=y - -# Filesystem image +BR2_PACKAGE_LINUX_FIRMWARE=y +BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_GRUB2=y +BR2_TARGET_GRUB2_X86_64_EFI=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/mx25pdk_defconfig b/buildroot/configs/mx25pdk_defconfig deleted file mode 100644 index ec4f8b8289..0000000000 --- a/buildroot/configs/mx25pdk_defconfig +++ /dev/null @@ -1,35 +0,0 @@ -# Architecture -BR2_arm=y -BR2_arm926t=y - -# Linux headers same as kernel, a 4.15 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y - -# System -BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" - -# required tools to create the SD card image -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y - -# Filesystem -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BOARDNAME="mx25pdk" -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.01" -BR2_TARGET_UBOOT_FORMAT_IMX=y - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15.7" -BR2_LINUX_KERNEL_DEFCONFIG="imx_v4_v5" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx25-pdk" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/buildroot/configs/mx51evk_defconfig b/buildroot/configs/mx51evk_defconfig index a4bebdec97..e8c3af149b 100644 --- a/buildroot/configs/mx51evk_defconfig +++ b/buildroot/configs/mx51evk_defconfig @@ -1,35 +1,24 @@ -# Architecture BR2_arm=y BR2_cortex_a8=y - -# Linux headers same as kernel, a 5.10 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y - -# System +BR2_GLOBAL_PATCH_DIR="board/freescale/imx51evk/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" - -# required tools to create the SD card image -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y - -# Filesystem BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.218" +BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx51-babbage" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y - -# Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx51evk" BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.01" BR2_TARGET_UBOOT_FORMAT_IMX=y - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.9" -BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx51-babbage" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/mx53loco_defconfig b/buildroot/configs/mx53loco_defconfig index 18785aa0c8..004a0f1c19 100644 --- a/buildroot/configs/mx53loco_defconfig +++ b/buildroot/configs/mx53loco_defconfig @@ -1,35 +1,23 @@ -# Architecture BR2_arm=y BR2_cortex_a8=y - -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y - -# System +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" - -# required tools to create the SD card image -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y - -# Filesystem BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BOARDNAME="mx53loco" -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.01" -BR2_TARGET_UBOOT_FORMAT_IMX=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.9" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.20" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx53-qsb imx53-qsrb" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BOARDNAME="mx53loco" +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_IMX=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/mx6cubox_defconfig b/buildroot/configs/mx6cubox_defconfig index 6ea4f6e416..f2359a4b0c 100644 --- a/buildroot/configs/mx6cubox_defconfig +++ b/buildroot/configs/mx6cubox_defconfig @@ -1,47 +1,34 @@ -# Architecture BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y - -# Toolchain -# Linux headers same as kernel, a 5.15 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# System configuration +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/solidrun/mx6cubox/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_OVERLAY="board/solidrun/mx6cubox/rootfs_overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.27" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-cubox-i imx6dl-cubox-i-emmc-som-v15 imx6dl-cubox-i-som-v15 imx6dl-hummingboard imx6dl-hummingboard-emmc-som-v15 imx6dl-hummingboard-som-v15 imx6q-cubox-i imx6q-cubox-i-emmc-som-v15 imx6q-cubox-i-som-v15 imx6q-hummingboard imx6q-hummingboard-emmc-som-v15 imx6q-hummingboard-som-v15" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6dl-cubox-i nxp/imx/imx6dl-cubox-i-emmc-som-v15 nxp/imx/imx6dl-cubox-i-som-v15 nxp/imx/imx6dl-hummingboard nxp/imx/imx6dl-hummingboard-emmc-som-v15 nxp/imx/imx6dl-hummingboard-som-v15 nxp/imx/imx6q-cubox-i nxp/imx/imx6q-cubox-i-emmc-som-v15 nxp/imx/imx6q-cubox-i-som-v15 nxp/imx/imx6q-hummingboard nxp/imx/imx6q-hummingboard-emmc-som-v15 nxp/imx/imx6q-hummingboard-som-v15" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem images BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y - -# Bootloaders BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="mx6cuboxi" -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" -BR2_TARGET_UBOOT_NEEDS_OPENSSL=y - -# required tools to create the SD card image BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/mx6sx_udoo_neo_defconfig b/buildroot/configs/mx6sx_udoo_neo_defconfig index 793d992ce7..0c8c4d228c 100644 --- a/buildroot/configs/mx6sx_udoo_neo_defconfig +++ b/buildroot/configs/mx6sx_udoo_neo_defconfig @@ -3,10 +3,19 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 5.15 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/udoo/neo/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/udoo/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.43" +BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6sx-udoo-neo-basic nxp/imx/imx6sx-udoo-neo-full nxp/imx/imx6sx-udoo-neo-extended" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y @@ -17,15 +26,6 @@ BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.13" -BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sx-udoo-neo-basic imx6sx-udoo-neo-full imx6sx-udoo-neo-extended" -BR2_LINUX_KERNEL_INSTALL_TARGET=y -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y -# required tools to create the SD card image BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/mx6udoo_defconfig b/buildroot/configs/mx6udoo_defconfig index 5092ef0fd1..d139d8e3e2 100644 --- a/buildroot/configs/mx6udoo_defconfig +++ b/buildroot/configs/mx6udoo_defconfig @@ -3,33 +3,29 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -BR2_GLOBAL_PATCH_DIR="board/udoo/mx6qdl/patches" -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_10=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/udoo/common/post-build.sh" +BR2_ROOTFS_OVERLAY="board/udoo/mx6qdl/rootfs_overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.10.6" +BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6q-udoo nxp/imx/imx6dl-udoo" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="udoo" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.84" -BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-udoo imx6dl-udoo" -BR2_LINUX_KERNEL_INSTALL_TARGET=y -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y -# required tools to create the SD card image BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/udoo/common/boot.scr.txt" diff --git a/buildroot/configs/nexbox_a95x_defconfig b/buildroot/configs/nexbox_a95x_defconfig index 69f8b9078f..2c7ddd98b6 100644 --- a/buildroot/configs/nexbox_a95x_defconfig +++ b/buildroot/configs/nexbox_a95x_defconfig @@ -1,5 +1,4 @@ BR2_aarch64=y -BR2_cortex_a53=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_SYSTEM_DHCP="eth0" diff --git a/buildroot/configs/nezha_defconfig b/buildroot/configs/nezha_defconfig index 2d66d6cb4a..c234b3e243 100644 --- a/buildroot/configs/nezha_defconfig +++ b/buildroot/configs/nezha_defconfig @@ -1,13 +1,17 @@ BR2_riscv=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/nezha/patches" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y +BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/nezha/overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/nezha/genimage.cfg" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,smaeul,linux,012f5a3d01be6d44e32c74bb3637ec281790b297)/linux-012f5a3d01be6d44e32c74bb3637ec281790b297.tar.gz" -BR2_LINUX_KERNEL_DEFCONFIG="nezha" +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.22" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/nezha/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun20i-d1-nezha" BR2_LINUX_KERNEL_INSTALL_TARGET=y @@ -15,22 +19,20 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_OPENSBI=y -BR2_TARGET_OPENSBI_CUSTOM_TARBALL=y -BR2_TARGET_OPENSBI_CUSTOM_TARBALL_LOCATION="$(call github,smaeul,opensbi,b9125c6f8909d1cc0417795737fc13cb6297ff11)/opensbi-b9125c6f8909d1cc0417795737fc13cb6297ff11.tar.gz" +BR2_TARGET_OPENSBI_CUSTOM_VERSION=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.4" BR2_TARGET_OPENSBI_PLAT="generic" # BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set -BR2_TARGET_SUN20I_D1_SPL=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,smaeul,u-boot,62392d3b8a624a80646c1876533336f90140088d)/uboot-62392d3b8a624a80646c1876533336f90140088d.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,smaeul,u-boot,2e89b706f5c956a70c989cd31665f1429e9a0b48)/uboot-2e89b706f5c956a70c989cd31665f1429e9a0b48.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nezha" BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_OPENSBI=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.toc1" +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/buildroot/configs/nitrogen6sx_defconfig b/buildroot/configs/nitrogen6sx_defconfig index 3c2fe0cc7b..03103567e9 100644 --- a/buildroot/configs/nitrogen6sx_defconfig +++ b/buildroot/configs/nitrogen6sx_defconfig @@ -1,44 +1,30 @@ -# architecture BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y - -# system -BR2_TARGET_GENERIC_GETTY=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/boundarydevices/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/boundarydevices/common/post-image.sh" -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y - -# filesystem +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/4470b050.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="boundary" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sx-nitrogen6sx imx6sx-nitrogen6sx-m4" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y - -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y - -# bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_v2020.10 -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/f2c92d83.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/7e7eff74.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen6sx" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMX=y +BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/boot.cmd" - -# kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_5.10.x_2.0.0 -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/950d5f1b.tar.gz" -BR2_LINUX_KERNEL_DEFCONFIG="boundary" -BR2_LINUX_KERNEL_INSTALL_TARGET=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sx-nitrogen6sx imx6sx-nitrogen6sx-m4" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/buildroot/configs/nitrogen6x_defconfig b/buildroot/configs/nitrogen6x_defconfig index 9e1d3ae1bc..4d5408a474 100644 --- a/buildroot/configs/nitrogen6x_defconfig +++ b/buildroot/configs/nitrogen6x_defconfig @@ -1,43 +1,30 @@ -# architecture BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y - -# system -BR2_TARGET_GENERIC_GETTY=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" BR2_ROOTFS_POST_BUILD_SCRIPT="board/boundarydevices/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/boundarydevices/common/post-image.sh" -BR2_PACKAGE_HOST_GENIMAGE=y - -# filesystem +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/4470b050.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="boundary" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-nit6xlite imx6dl-nitrogen6_vm imx6dl-nitrogen6x imx6q-nitrogen6x imx6dl-nitrogen6_som2 imx6q-nitrogen6_som2 imx6qp-nitrogen6_som2 imx6q-nitrogen6_max imx6qp-nitrogen6_max imx6q-sabrelite" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y - -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y - -# bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_v2020.10 -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/f2c92d83.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/7e7eff74.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen6q" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMX=y +BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/boot.cmd" - -# kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_5.10.x_2.0.0 -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/950d5f1b.tar.gz" -BR2_LINUX_KERNEL_DEFCONFIG="boundary" -BR2_LINUX_KERNEL_INSTALL_TARGET=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-nit6xlite imx6dl-nitrogen6_vm imx6dl-nitrogen6x imx6q-nitrogen6x imx6dl-nitrogen6_som2 imx6q-nitrogen6_som2 imx6qp-nitrogen6_som2 imx6q-nitrogen6_max imx6qp-nitrogen6_max imx6q-sabrelite" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/buildroot/configs/nitrogen7_defconfig b/buildroot/configs/nitrogen7_defconfig index 0dbced86e9..65aff36860 100644 --- a/buildroot/configs/nitrogen7_defconfig +++ b/buildroot/configs/nitrogen7_defconfig @@ -1,43 +1,29 @@ -# architecture BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y - -# system -BR2_TARGET_GENERIC_GETTY=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/boundarydevices/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/boundarydevices/common/post-image.sh" -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y - -# filesystem -# BR2_TARGET_ROOTFS_TAR is not set +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/4470b050.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="boundary" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7d-nitrogen7 imx7d-nitrogen7-m4" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y - -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y - -# bootloader +# BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_v2020.10 -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/f2c92d83.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/7e7eff74.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen7" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMX=y +BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/boot.cmd" - -# kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_5.10.x_2.0.0 -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/950d5f1b.tar.gz" -BR2_LINUX_KERNEL_DEFCONFIG="boundary" -BR2_LINUX_KERNEL_INSTALL_TARGET=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7d-nitrogen7 imx7d-nitrogen7-m4" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/buildroot/configs/nitrogen8m_defconfig b/buildroot/configs/nitrogen8m_defconfig index a41e5f04d8..9a90cdae54 100644 --- a/buildroot/configs/nitrogen8m_defconfig +++ b/buildroot/configs/nitrogen8m_defconfig @@ -1,58 +1,40 @@ -# Architecture BR2_aarch64=y -BR2_cortex_a53=y - -# System -BR2_TARGET_GENERIC_GETTY=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/boundarydevices/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/boundarydevices/common/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mq-nitrogen8m.dtb" -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_IMX_MKIMAGE=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y - -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y - -# DDR training binaries +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/4470b050.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="boundary" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mq-nitrogen8m freescale/imx8mq-nitrogen8m-m4 freescale/imx8mq-nitrogen8m_som freescale/imx8mq-nitrogen8m_som-m4" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_FREESCALE_IMX=y BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y BR2_PACKAGE_FIRMWARE_IMX=y - -# ARM Trusted Firmware +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_5.4.70_2.3.0 -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/9f6114fd.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/7e3484cc.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mq" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y - -# Bootloader BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen8m" BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_v2020.10 -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/f2c92d83.tar.gz" -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/7e7eff74.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen8m" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_SPL=y - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_5.10.x_2.0.0 -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/950d5f1b.tar.gz" -BR2_LINUX_KERNEL_DEFCONFIG="boundary" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INSTALL_TARGET=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mq-nitrogen8m freescale/imx8mq-nitrogen8m-m4 freescale/imx8mq-nitrogen8m_som freescale/imx8mq-nitrogen8m_som-m4" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_IMX_MKIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y diff --git a/buildroot/configs/nitrogen8mm_defconfig b/buildroot/configs/nitrogen8mm_defconfig index a635f8012b..db4af070a8 100644 --- a/buildroot/configs/nitrogen8mm_defconfig +++ b/buildroot/configs/nitrogen8mm_defconfig @@ -1,58 +1,40 @@ -# Architecture BR2_aarch64=y -BR2_cortex_a53=y - -# System -BR2_TARGET_GENERIC_GETTY=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" BR2_ROOTFS_POST_BUILD_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/boundarydevices/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/boundarydevices/common/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mm-nitrogen8mm.dtb" -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_IMX_MKIMAGE=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y - -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y - -# DDR training binaries +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/4470b050.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="boundary" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-nitrogen8mm freescale/imx8mm-nitrogen8mm-m4 freescale/imx8mm-nitrogen8mm_rev2 freescale/imx8mm-nitrogen8mm_rev2-m4 freescale/imx8mm-nitrogen8mm_som freescale/imx8mm-nitrogen8mm_som-m4" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_FREESCALE_IMX=y BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y BR2_PACKAGE_FIRMWARE_IMX=y - -# ARM Trusted Firmware +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_5.4.70_2.3.0 -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/9f6114fd.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/7e3484cc.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y - -# Bootloader BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen8mm_2g" BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_v2020.10 -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/f2c92d83.tar.gz" -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/7e7eff74.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen8mm_2g" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_SPL=y - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_5.10.x_2.0.0 -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/950d5f1b.tar.gz" -BR2_LINUX_KERNEL_DEFCONFIG="boundary" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INSTALL_TARGET=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-nitrogen8mm freescale/imx8mm-nitrogen8mm-m4 freescale/imx8mm-nitrogen8mm_rev2 freescale/imx8mm-nitrogen8mm_rev2-m4 freescale/imx8mm-nitrogen8mm_som freescale/imx8mm-nitrogen8mm_som-m4" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_IMX_MKIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y diff --git a/buildroot/configs/nitrogen8mn_defconfig b/buildroot/configs/nitrogen8mn_defconfig index 5c2101441d..dc54d24008 100644 --- a/buildroot/configs/nitrogen8mn_defconfig +++ b/buildroot/configs/nitrogen8mn_defconfig @@ -1,58 +1,40 @@ -# Architecture BR2_aarch64=y -BR2_cortex_a53=y - -# System -BR2_TARGET_GENERIC_GETTY=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" BR2_ROOTFS_POST_BUILD_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/boundarydevices/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/boundarydevices/common/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mn-nitrogen8_nano.dtb" -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_IMX_MKIMAGE=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y - -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y - -# DDR training binaries +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/4470b050.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="boundary" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mn-nitrogen8_nano freescale/imx8mn-nitrogen8mn freescale/imx8mn-nitrogen8mn_som" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_FREESCALE_IMX=y BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y BR2_PACKAGE_FIRMWARE_IMX=y - -# ARM Trusted Firmware +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_5.4.70_2.3.0 -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/9f6114fd.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/7e3484cc.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mn" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y - -# Bootloader BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen8_nano_8mn1gr0" BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_v2020.10 -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/f2c92d83.tar.gz" -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/7e7eff74.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen8_nano_8mn1gr0" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_SPL=y - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_5.10.x_2.0.0 -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/950d5f1b.tar.gz" -BR2_LINUX_KERNEL_DEFCONFIG="boundary" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INSTALL_TARGET=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mn-nitrogen8_nano freescale/imx8mn-nitrogen8mn freescale/imx8mn-nitrogen8mn_som" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_IMX_MKIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y diff --git a/buildroot/configs/nitrogen8mp_defconfig b/buildroot/configs/nitrogen8mp_defconfig index dc7427c856..72884d97fd 100644 --- a/buildroot/configs/nitrogen8mp_defconfig +++ b/buildroot/configs/nitrogen8mp_defconfig @@ -1,58 +1,40 @@ -# Architecture BR2_aarch64=y -BR2_cortex_a53=y - -# System -BR2_TARGET_GENERIC_GETTY=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" BR2_ROOTFS_POST_BUILD_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/boundarydevices/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/boundarydevices/common/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mp-nitrogen8mp.dtb" -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_IMX_MKIMAGE=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y - -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y - -# DDR training binaries +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/4470b050.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="boundary" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mp-nitrogen_smarc freescale/imx8mp-nitrogen8mp freescale/imx8mp-nitrogen8mp-m4 freescale/imx8mp-nitrogen8mp-enc freescale/imx8mp-nitrogen8mp-enc-tc358743" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_FREESCALE_IMX=y BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP=y BR2_PACKAGE_FIRMWARE_IMX=y - -# ARM Trusted Firmware +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_5.4.70_2.3.0 -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/9f6114fd.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/7e3484cc.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y - -# Bootloader BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen8mp_2gr0" BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_v2020.10 -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/f2c92d83.tar.gz" -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/7e7eff74.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen8mp_2gr0" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_SPL=y - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_5.10.x_2.0.0 -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/950d5f1b.tar.gz" -BR2_LINUX_KERNEL_DEFCONFIG="boundary" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INSTALL_TARGET=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mp-nitrogen8mp freescale/imx8mp-nitrogen8mp-m4 freescale/imx8mp-nitrogen8mp-enc freescale/imx8mp-nitrogen8mp-enc-tc358743" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_IMX_MKIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y diff --git a/buildroot/configs/nvidia_bf3_defconfig b/buildroot/configs/nvidia_bf3_defconfig new file mode 100644 index 0000000000..3f958c0062 --- /dev/null +++ b/buildroot/configs/nvidia_bf3_defconfig @@ -0,0 +1,12 @@ +BR2_aarch64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_11=y +BR2_GLOBAL_PATCH_DIR="board/nvidia/bf3/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.11.6" +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/nvidia/bf3/linux.config" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_INITRAMFS=y +# BR2_TARGET_ROOTFS_TAR is not set diff --git a/buildroot/configs/octavo_osd32mp1_brk_defconfig b/buildroot/configs/octavo_osd32mp1_brk_defconfig new file mode 100644 index 0000000000..92848f62b5 --- /dev/null +++ b/buildroot/configs/octavo_osd32mp1_brk_defconfig @@ -0,0 +1,44 @@ +BR2_arm=y +BR2_cortex_a7=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_GLOBAL_PATCH_DIR="board/octavo/osd32mp1-brk/patches" +BR2_ROOTFS_OVERLAY="board/octavo/osd32mp1-brk/overlay/" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/octavo/osd32mp1-brk/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/STMicroelectronics/linux.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.10-stm32mp-r2.1" +BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(LINUX_DIR)/arch/arm/configs/fragment-01-multiv7_cleanup.config $(LINUX_DIR)/arch/arm/configs/fragment-02-multiv7_addons.config" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32mp157c-osd32mp1-brk" +BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/octavo/osd32mp1-brk/linux-dts/*" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/STMicroelectronics/arm-trusted-firmware.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.4-stm32mp-r1" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="stm32mp1" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_DTS_PATH="board/octavo/osd32mp1-brk/tfa-dts/*" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE="u-boot-nodtb.bin" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=sp_min DTB_FILE_NAME=stm32mp157c-osd32mp1-brk.dtb STM32MP_USB_PROGRAMMER=1 BL33_CFG=$(BINARIES_DIR)/u-boot.dtb" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="*.stm32 fip.bin" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_GIT=y +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/STMicroelectronics/u-boot.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2020.10-stm32mp-r2.1" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="osd32mp1_brk_trusted" +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin u-boot.dtb" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=stm32mp157c-osd32mp1-brk" +BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/buildroot/configs/octavo_osd32mp1_red_defconfig b/buildroot/configs/octavo_osd32mp1_red_defconfig new file mode 100644 index 0000000000..4372b4f8ae --- /dev/null +++ b/buildroot/configs/octavo_osd32mp1_red_defconfig @@ -0,0 +1,44 @@ +BR2_arm=y +BR2_cortex_a7=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_GLOBAL_PATCH_DIR="board/octavo/osd32mp1-red/patches" +BR2_ROOTFS_OVERLAY="board/octavo/osd32mp1-red/overlay/" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/octavo/osd32mp1-red/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/STMicroelectronics/linux.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.10-stm32mp-r2.1" +BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(LINUX_DIR)/arch/arm/configs/fragment-01-multiv7_cleanup.config $(LINUX_DIR)/arch/arm/configs/fragment-02-multiv7_addons.config" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32mp157c-osd32mp1-red" +BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/octavo/osd32mp1-red/linux-dts/*" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/STMicroelectronics/arm-trusted-firmware.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.4-stm32mp-r1" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="stm32mp1" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_DTS_PATH="board/octavo/osd32mp1-red/tfa-dts/*" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE="u-boot-nodtb.bin" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=sp_min DTB_FILE_NAME=stm32mp157c-osd32mp1-red.dtb STM32MP_USB_PROGRAMMER=1 BL33_CFG=$(BINARIES_DIR)/u-boot.dtb" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="*.stm32 fip.bin" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_GIT=y +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/STMicroelectronics/u-boot.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2020.10-stm32mp-r2.1" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32mp15_trusted" +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin u-boot.dtb" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=stm32mp157c-osd32mp1-red" +BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/buildroot/configs/odroidc2_defconfig b/buildroot/configs/odroidc2_defconfig index 5f97fc3dd8..acb6a03bf0 100644 --- a/buildroot/configs/odroidc2_defconfig +++ b/buildroot/configs/odroidc2_defconfig @@ -1,42 +1,28 @@ -# Architecture BR2_aarch64=y - -# Linux headers same as kernel, a 5.7 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7=y - -# System BR2_TARGET_GENERIC_HOSTNAME="odroidc2" BR2_TARGET_GENERIC_GETTY_PORT="ttyAML0" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y BR2_ROOTFS_OVERLAY="board/hardkernel/odroidc2/rootfs_overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/hardkernel/odroidc2/post-image.sh" - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.7" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="amlogic/meson-gxbb-odroidc2" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y - -# U-Boot +BR2_PACKAGE_ODROIDC2_FIRMWARE=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY=y BR2_TARGET_UBOOT_BOARDNAME="odroid-c2" BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07" BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/hardkernel/odroidc2/boot.cmd" - -# Firmware -BR2_PACKAGE_ODROIDC2_FIRMWARE=y - -# Required tools to create the SD image BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MESON_TOOLS=y BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/hardkernel/odroidc2/boot.cmd" diff --git a/buildroot/configs/odroidxu4_defconfig b/buildroot/configs/odroidxu4_defconfig index 69958e1387..ab819efa23 100644 --- a/buildroot/configs/odroidxu4_defconfig +++ b/buildroot/configs/odroidxu4_defconfig @@ -1,7 +1,7 @@ BR2_arm=y BR2_cortex_a7=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/hardkernel/odroidxu4/post-image.sh" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/hardkernel/odroidxu4/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/hardkernel/linux.git" diff --git a/buildroot/configs/olimex_a10_olinuxino_lime_defconfig b/buildroot/configs/olimex_a10_olinuxino_lime_defconfig index d0e00301f7..101796cc12 100644 --- a/buildroot/configs/olimex_a10_olinuxino_lime_defconfig +++ b/buildroot/configs/olimex_a10_olinuxino_lime_defconfig @@ -1,50 +1,33 @@ -# Architecture BR2_arm=y BR2_cortex_a8=y - -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y - -# System configuration +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TARGET_GENERIC_HOSTNAME="a10-olinuxino" BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!" -BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/olimex/a10_olinuxino/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a10_olinuxino/genimage.cfg" - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" -BR2_LINUX_KERNEL_USE_DEFCONFIG=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun4i-a10-olinuxino-lime" BR2_LINUX_KERNEL_INSTALL_TARGET=y - -# Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set - -# Bootloaders BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A10-OLinuXino-Lime" BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y -BR2_TARGET_UBOOT_FORMAT_BIN=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/olimex/a10_olinuxino/boot.cmd" - -# Additional tools -BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/buildroot/configs/olimex_a13_olinuxino_defconfig b/buildroot/configs/olimex_a13_olinuxino_defconfig index 6d25d7d0a1..219fe19ba0 100644 --- a/buildroot/configs/olimex_a13_olinuxino_defconfig +++ b/buildroot/configs/olimex_a13_olinuxino_defconfig @@ -1,49 +1,32 @@ -# Architecture BR2_arm=y BR2_cortex_a8=y - -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y - -# System configuration +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TARGET_GENERIC_HOSTNAME="a13-olinuxino" BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!" -BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# Bootloaders +BR2_ROOTFS_POST_BUILD_SCRIPT="board/olimex/a13_olinuxino/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a13_olinuxino/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun5i-a13-olinuxino" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A13-OLinuXino" BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y -BR2_TARGET_UBOOT_FORMAT_BIN=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" -BR2_LINUX_KERNEL_USE_DEFCONFIG=y -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun5i-a13-olinuxino" -BR2_LINUX_KERNEL_INSTALL_TARGET=y - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_ROOTFS_POST_BUILD_SCRIPT="board/olimex/a13_olinuxino/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a13_olinuxino/genimage.cfg" - -# Additional tools BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/buildroot/configs/olimex_a20_olinuxino_lime2_defconfig b/buildroot/configs/olimex_a20_olinuxino_lime2_defconfig index b46cf37433..efa2b6a249 100644 --- a/buildroot/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/buildroot/configs/olimex_a20_olinuxino_lime2_defconfig @@ -1,60 +1,38 @@ -# Architecture BR2_arm=y BR2_cortex_a7=y -BR2_ARM_EABIHF=y -BR2_ARM_FPU_NEON_VFPV4=y - -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y - -# Toolchain -# glibc is needed for sunxi-mali-utgard package. -BR2_TOOLCHAIN_BUILDROOT_GLIBC=y - -# System configuration +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/olimex/a20_olinuxino/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino" BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!" -BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/olimex/a20_olinuxino/rootfs_overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" -BR2_LINUX_KERNEL_USE_DEFCONFIG=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.54" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/a20_olinuxino/linux-disable-lima.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-olinuxino-lime2" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun7i-a20-olinuxino-lime2" BR2_LINUX_KERNEL_INSTALL_TARGET=y - -# sunxi packages BR2_PACKAGE_SUNXI_TOOLS=y BR2_PACKAGE_SUNXI_MALI_UTGARD=y -BR2_PACKAGE_SUNXI_MALI_UTGARD_DRIVER=y - -# Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set - -# Bootloaders BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime2" BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y -BR2_TARGET_UBOOT_FORMAT_BIN=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y - -# Additional tools BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/buildroot/configs/olimex_a20_olinuxino_lime_defconfig b/buildroot/configs/olimex_a20_olinuxino_lime_defconfig index 698137e46c..f376c6cd3c 100644 --- a/buildroot/configs/olimex_a20_olinuxino_lime_defconfig +++ b/buildroot/configs/olimex_a20_olinuxino_lime_defconfig @@ -1,60 +1,38 @@ -# Architecture BR2_arm=y BR2_cortex_a7=y -BR2_ARM_EABIHF=y -BR2_ARM_FPU_NEON_VFPV4=y - -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y - -# Toolchain -# glibc is needed for sunxi-mali-utgard package. -BR2_TOOLCHAIN_BUILDROOT_GLIBC=y - -# System configuration +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/olimex/a20_olinuxino/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino" BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!" -BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/olimex/a20_olinuxino/rootfs_overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" -BR2_LINUX_KERNEL_USE_DEFCONFIG=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.54" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/a20_olinuxino/linux-disable-lima.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-olinuxino-lime" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun7i-a20-olinuxino-lime" BR2_LINUX_KERNEL_INSTALL_TARGET=y - -# sunxi packages BR2_PACKAGE_SUNXI_TOOLS=y BR2_PACKAGE_SUNXI_MALI_UTGARD=y -BR2_PACKAGE_SUNXI_MALI_UTGARD_DRIVER=y - -# Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set - -# Bootloaders BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime" BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y -BR2_TARGET_UBOOT_FORMAT_BIN=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y - -# Additional tools BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/buildroot/configs/olimex_a20_olinuxino_micro_defconfig b/buildroot/configs/olimex_a20_olinuxino_micro_defconfig index 1394c0b8b8..a1d23952d7 100644 --- a/buildroot/configs/olimex_a20_olinuxino_micro_defconfig +++ b/buildroot/configs/olimex_a20_olinuxino_micro_defconfig @@ -1,12 +1,7 @@ -# Architecture BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y - -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y - -# System configuration +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino" BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" @@ -14,36 +9,27 @@ BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/olimex/a20_olinuxino/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-olinuxino-micro" BR2_LINUX_KERNEL_INSTALL_TARGET=y - -# Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set - -# Bootloaders BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino_MICRO" BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/olimex/a20_olinuxino/boot.cmd" - -# Additional tools -BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/buildroot/configs/olimex_a33_olinuxino_defconfig b/buildroot/configs/olimex_a33_olinuxino_defconfig index 27924b9e92..8c053ef3d6 100644 --- a/buildroot/configs/olimex_a33_olinuxino_defconfig +++ b/buildroot/configs/olimex_a33_olinuxino_defconfig @@ -1,53 +1,34 @@ -# Architecture BR2_arm=y BR2_cortex_a7=y -BR2_ARM_FPU_NEON_VFPV4=y - -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y - -# System configuration +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TARGET_GENERIC_HOSTNAME="A33-olinuxino" BR2_TARGET_GENERIC_ISSUE="Welcome to A33 OLinuXino!" -BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# Bootloaders +BR2_ROOTFS_POST_BUILD_SCRIPT="board/olimex/a33_olinuxino/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a33_olinuxino/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-a33-olinuxino" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A33-OLinuXino" BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y -BR2_TARGET_UBOOT_FORMAT_BIN=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/olimex/a33_olinuxino/boot.cmd" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" -BR2_LINUX_KERNEL_USE_DEFCONFIG=y -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-a33-olinuxino" -BR2_LINUX_KERNEL_INSTALL_TARGET=y - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_ROOTFS_POST_BUILD_SCRIPT="board/olimex/a33_olinuxino/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a33_olinuxino/genimage.cfg" - -# Additional tools BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/olimex/a33_olinuxino/boot.cmd" diff --git a/buildroot/configs/olimex_a64_olinuxino_defconfig b/buildroot/configs/olimex_a64_olinuxino_defconfig index 53e8c2ece5..ad446ea18c 100644 --- a/buildroot/configs/olimex_a64_olinuxino_defconfig +++ b/buildroot/configs/olimex_a64_olinuxino_defconfig @@ -1,50 +1,38 @@ BR2_aarch64=y -BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 5.15 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# Firmware +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_TARGET_GENERIC_ISSUE="Welcome to Olimex A64-OLinuXino" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a64-olinuxino/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-olinuxino" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.8" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y - -# Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="a64-olinuxino" BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/olimex/a64-olinuxino/boot.cmd" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.7" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-olinuxino" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to Olimex A64-OLinuXino" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a64-olinuxino/genimage.cfg" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/olimex/a64-olinuxino/boot.cmd" diff --git a/buildroot/configs/olimex_imx233_olinuxino_defconfig b/buildroot/configs/olimex_imx233_olinuxino_defconfig index 275dd98afe..7f3a039200 100644 --- a/buildroot/configs/olimex_imx233_olinuxino_defconfig +++ b/buildroot/configs/olimex_imx233_olinuxino_defconfig @@ -1,28 +1,20 @@ -# Architecture BR2_arm=y -BR2_arm926t=y - -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y - -# System -BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" - -# For automatic firmware loading +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_GLOBAL_PATCH_DIR="board/olimex/imx233_olinuxino/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y - -# Kernel +BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" +BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/mxs/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.83" BR2_LINUX_KERNEL_DEFCONFIG="mxs" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/imx233_olinuxino/linux-wifi.fragment" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx23-olinuxino" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x42000000" - -# Firmware for WiFi +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx23-olinuxino" BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_7010=y BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9271=y @@ -30,23 +22,15 @@ BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y BR2_PACKAGE_ZD1211_FIRMWARE=y - -# Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set - -# U-Boot BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="mx23_olinuxino" BR2_TARGET_UBOOT_FORMAT_SD=y - -# To generate SD Image BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/mxs/post-image.sh" - diff --git a/buildroot/configs/olimex_stmp157_olinuxino_lime_defconfig b/buildroot/configs/olimex_stmp157_olinuxino_lime_defconfig index 74e7f9ba67..b1f9b7645a 100644 --- a/buildroot/configs/olimex_stmp157_olinuxino_lime_defconfig +++ b/buildroot/configs/olimex_stmp157_olinuxino_lime_defconfig @@ -1,47 +1,36 @@ -# Architecture BR2_arm=y BR2_cortex_a7=y - -# Linux headers same as kernel, a 5.10 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y - -# System configuration +BR2_GLOBAL_PATCH_DIR="board/olimex/stmp1_olinuxino/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_HOSTNAME="stmp1-olinuxino" BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!" +BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/olimex/stmp1_olinuxino/rootfs_overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/stmp1_olinuxino/genimage.cfg" - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/OLIMEX/linux-olimex.git" -# branch release-20210821-v5.10.60 -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="081be4c4c634cf9345b8bf59fe141a0236383ae4" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="fc74113e14d76aea9482264ff42e07397b94553d" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/olimex/stmp1_olinuxino/linux.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32mp1xx-olinuxino-lime" BR2_LINUX_KERNEL_INSTALL_TARGET=y - -# Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set - -# Bootloaders BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/OLIMEX/u-boot-olinuxino.git" -# release-20211130, based on 2021.04 -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="1c29714bc643c299e2ed4ba870be8d4538124144" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="efadf793a0a5924e2c96362dc1df3e56622ebb97" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="STM32-OLinuXino-LIME" # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_FORMAT_STM32=y +BR2_TARGET_UBOOT_BUILD_FORMAT_STM32_LEGACY=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl.stm32" - -# Additional tools BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/buildroot/configs/openblocks_a6_defconfig b/buildroot/configs/openblocks_a6_defconfig index 2238c0940c..754ec53937 100644 --- a/buildroot/configs/openblocks_a6_defconfig +++ b/buildroot/configs/openblocks_a6_defconfig @@ -1,24 +1,16 @@ -# Architecture BR2_arm=y -BR2_arm926t=y - -# system +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +BR2_GLOBAL_PATCH_DIR="board/openblocks/a6/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_HOSTNAME="openblocks-a6" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_SYSTEM_DHCP="eth0" - -# filesystem -BR2_TARGET_ROOTFS_JFFS2=y -BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_16K=y - -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y - -# kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.253" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.336" BR2_LINUX_KERNEL_DEFCONFIG="mvebu_v5" BR2_LINUX_KERNEL_APPENDED_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" BR2_LINUX_KERNEL_INTREE_DTS_NAME="kirkwood-openblocks_a6" +BR2_TARGET_ROOTFS_JFFS2=y +BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_16K=y diff --git a/buildroot/configs/orangepi_lite2_defconfig b/buildroot/configs/orangepi_lite2_defconfig index c6be1c46b4..ad847a8205 100644 --- a/buildroot/configs/orangepi_lite2_defconfig +++ b/buildroot/configs/orangepi_lite2_defconfig @@ -1,19 +1,32 @@ BR2_aarch64=y -BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 4.19 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y - -# Firmware +BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Lite2" +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y +BR2_ROOTFS_OVERLAY="board/orangepi/orangepi-lite2/rootfs_overlay" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/orangepi-lite2/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-lite2/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,amarula,linux-amarula,h6-v1.0b)/linux-amarula_h6-v1.0b.tar.gz" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h6-orangepi-lite2" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_LINUX_FIRMWARE=y +BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=y +BR2_PACKAGE_IW=y +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y +BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.0" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_h6" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y - -# Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y @@ -25,36 +38,6 @@ BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,amarula,linux-amarula,h6-v1.0b)/linux-amarula_h6-v1.0b.tar.gz" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h6-orangepi-lite2" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Lite2" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-lite2/genimage.cfg" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/orangepi-lite2/post-build.sh" -BR2_ROOTFS_OVERLAY="board/orangepi/orangepi-lite2/rootfs_overlay" - -# wireless firmware -BR2_PACKAGE_LINUX_FIRMWARE=y -BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=y - -# wireless tools -BR2_PACKAGE_IW=y -BR2_PACKAGE_WPA_SUPPLICANT=y -BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y -BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y -BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y diff --git a/buildroot/configs/orangepi_lite_defconfig b/buildroot/configs/orangepi_lite_defconfig index e834816456..f1c63f9b1d 100644 --- a/buildroot/configs/orangepi_lite_defconfig +++ b/buildroot/configs/orangepi_lite_defconfig @@ -1,16 +1,22 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-lite/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Lite" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Lite" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.1" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.16" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-lite/linux-extras.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-lite" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun8i-h3-orangepi-lite" +BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_RTL8189FS=y BR2_PACKAGE_WIRELESS_TOOLS=y @@ -22,18 +28,11 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_lite" BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-lite/boot.cmd" -BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-lite/genimage.cfg" diff --git a/buildroot/configs/orangepi_one_defconfig b/buildroot/configs/orangepi_one_defconfig index 1a2772a307..167527235e 100644 --- a/buildroot/configs/orangepi_one_defconfig +++ b/buildroot/configs/orangepi_one_defconfig @@ -1,16 +1,20 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_One" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi One" BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.2" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.3" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-one" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun8i-h3-orangepi-one" +BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y @@ -18,18 +22,11 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_one" BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-one/boot.cmd" -BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-one/genimage.cfg" diff --git a/buildroot/configs/orangepi_one_plus_defconfig b/buildroot/configs/orangepi_one_plus_defconfig index 1084d42233..8de158b0b1 100644 --- a/buildroot/configs/orangepi_one_plus_defconfig +++ b/buildroot/configs/orangepi_one_plus_defconfig @@ -1,19 +1,24 @@ BR2_aarch64=y -BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 4.19 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y - -# Firmware +BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi One+" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/orangepi-one-plus/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-one-plus/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,amarula,linux-amarula,h6-v1.0b)/linux-amarula_h6-v1.0b.tar.gz" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h6-orangepi-one-plus" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.0" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_h6" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y - -# Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y @@ -24,23 +29,6 @@ BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,amarula,linux-amarula,h6-v1.0b)/linux-amarula_h6-v1.0b.tar.gz" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h6-orangepi-one-plus" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi One+" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-one-plus/genimage.cfg" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/orangepi-one-plus/post-build.sh" diff --git a/buildroot/configs/orangepi_pc2_defconfig b/buildroot/configs/orangepi_pc2_defconfig index c7e17c8eb1..46d04b34c8 100644 --- a/buildroot/configs/orangepi_pc2_defconfig +++ b/buildroot/configs/orangepi_pc2_defconfig @@ -1,50 +1,37 @@ BR2_aarch64=y -BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 5.0 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# Firmware +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi PC2" +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.45" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-pc2" +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="128M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y - -# Bootloader +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.9" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_pc2" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-pc2/boot.cmd" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-pc2" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi PC2" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-pc2/genimage.cfg" diff --git a/buildroot/configs/orangepi_pc_defconfig b/buildroot/configs/orangepi_pc_defconfig index 44ea9b95c4..2b3099db7f 100644 --- a/buildroot/configs/orangepi_pc_defconfig +++ b/buildroot/configs/orangepi_pc_defconfig @@ -1,35 +1,34 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-pc/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_PC" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi PC" BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-pc/genimage.cfg" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.9" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.91" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-pc/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-pc" +BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_pc" BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-pc/boot.cmd" -BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/buildroot/configs/orangepi_pc_plus_defconfig b/buildroot/configs/orangepi_pc_plus_defconfig index c3ff8bc417..1eb54cb43e 100644 --- a/buildroot/configs/orangepi_pc_plus_defconfig +++ b/buildroot/configs/orangepi_pc_plus_defconfig @@ -1,50 +1,42 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y -BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_PC_Plus" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi PC Plus" +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.2" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.3" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-pc-plus" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-pc-plus/linux-extras.config" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun8i-h3-orangepi-pc-plus" +BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_LINUX_FIRMWARE=y +BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y +BR2_PACKAGE_RTL8189FS=y +BR2_PACKAGE_IW=y +BR2_PACKAGE_WIRELESS_TOOLS=y +BR2_PACKAGE_WIRELESS_TOOLS_LIB=y +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_PACKAGE_WPA_SUPPLICANT_CLI=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_pc_plus" BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-pc-plus/boot.cmd" -BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-pc-plus/genimage.cfg" - -# wireless driver and firmware -BR2_PACKAGE_RTL8189FS=y -BR2_PACKAGE_LINUX_FIRMWARE=y -BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y - -# wireless tools -BR2_PACKAGE_IW=y -BR2_PACKAGE_WIRELESS_TOOLS=y -BR2_PACKAGE_WIRELESS_TOOLS_LIB=y -BR2_PACKAGE_WPA_SUPPLICANT=y -BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y -BR2_PACKAGE_WPA_SUPPLICANT_CLI=y diff --git a/buildroot/configs/orangepi_plus_defconfig b/buildroot/configs/orangepi_plus_defconfig deleted file mode 100644 index 11d7486486..0000000000 --- a/buildroot/configs/orangepi_plus_defconfig +++ /dev/null @@ -1,44 +0,0 @@ -# Architecture -BR2_arm=y -BR2_cortex_a7=y -BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 5.0 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# System configuration -BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Plus" -BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Plus" - -# Bootloaders -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_plus" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-plus/boot.cmd" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-plus" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-plus/genimage.cfg" - -# Additional tools -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/orangepi_prime_defconfig b/buildroot/configs/orangepi_prime_defconfig deleted file mode 100644 index f8f958c67b..0000000000 --- a/buildroot/configs/orangepi_prime_defconfig +++ /dev/null @@ -1,50 +0,0 @@ -BR2_aarch64=y -BR2_cortex_a53=y -BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 5.0 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_prime" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-prime/boot.cmd" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-prime" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Prime" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-prime/genimage.cfg" diff --git a/buildroot/configs/orangepi_r1_defconfig b/buildroot/configs/orangepi_r1_defconfig index bad1f9400c..baf9788568 100644 --- a/buildroot/configs/orangepi_r1_defconfig +++ b/buildroot/configs/orangepi_r1_defconfig @@ -1,40 +1,39 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-r1/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_R1" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi R1" BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-r1/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.10" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.31" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-r1" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-r1/linux-extras.config" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun8i-h2-plus-orangepi-r1" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_MTD=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_r1" BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-r1/boot.cmd" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-r1/genimage.cfg" - -# spi flash support -BR2_PACKAGE_MTD=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-r1/boot.cmd" diff --git a/buildroot/configs/orangepi_rk3399_defconfig b/buildroot/configs/orangepi_rk3399_defconfig deleted file mode 100644 index bcce35febd..0000000000 --- a/buildroot/configs/orangepi_rk3399_defconfig +++ /dev/null @@ -1,53 +0,0 @@ -# Architecture -BR2_aarch64=y -BR2_cortex_a72_a53=y - -# Linux headers same as kernel, a 5.8 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="11a0a46a899fcc3b1fdb214b382f3d7495d88eca" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3399" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi-rk3399" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="idbloader.img" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.2" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3399-orangepi" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_HOSTNAME="orangepi-rk3399" -BR2_TARGET_GENERIC_ISSUE="Welcome to ORANGEPI-RK3399" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-rk3399/genimage.cfg" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/orangepi-rk3399/post-build.sh" diff --git a/buildroot/configs/orangepi_win_defconfig b/buildroot/configs/orangepi_win_defconfig deleted file mode 100644 index 715ff3b711..0000000000 --- a/buildroot/configs/orangepi_win_defconfig +++ /dev/null @@ -1,48 +0,0 @@ -BR2_aarch64=y -BR2_cortex_a53=y -BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_win" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-win/boot.cmd" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-orangepi-win" - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Win/Win Plus" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-win/genimage.cfg" diff --git a/buildroot/configs/orangepi_zero2w_defconfig b/buildroot/configs/orangepi_zero2w_defconfig new file mode 100644 index 0000000000..9da9c94754 --- /dev/null +++ b/buildroot/configs/orangepi_zero2w_defconfig @@ -0,0 +1,41 @@ +BR2_aarch64=y +BR2_ARM_FPU_VFPV4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_8=y +BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero2w/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Zero2W" +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.8.6" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h618-orangepi-zero2w" +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="256M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.10" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_h616" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.04" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero2w" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/buildroot/configs/orangepi_zero3_defconfig b/buildroot/configs/orangepi_zero3_defconfig new file mode 100644 index 0000000000..b42cd370f6 --- /dev/null +++ b/buildroot/configs/orangepi_zero3_defconfig @@ -0,0 +1,40 @@ +BR2_aarch64=y +BR2_ARM_FPU_VFPV4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_7=y +BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Zero3" +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y +BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.7" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h618-orangepi-zero3" +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.10" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_h616" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero3" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/buildroot/configs/orangepi_zero_defconfig b/buildroot/configs/orangepi_zero_defconfig index 464e075e5c..b48c28102e 100644 --- a/buildroot/configs/orangepi_zero_defconfig +++ b/buildroot/configs/orangepi_zero_defconfig @@ -1,64 +1,44 @@ -# Architecture BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y - -# System +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches" BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" -BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_SYSTEM_DHCP="eth0" - -# Kernel +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.3" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.fragment" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun8i-h2-plus-orangepi-zero" BR2_LINUX_KERNEL_INSTALL_TARGET=y - -# Filesystem +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_MTD=y +BR2_PACKAGE_ARMBIAN_FIRMWARE=y +BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819=y +BR2_PACKAGE_XR819_XRADIO=y +BR2_PACKAGE_IW=y +BR2_PACKAGE_WIRELESS_TOOLS=y +BR2_PACKAGE_WIRELESS_TOOLS_LIB=y +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_PACKAGE_WPA_SUPPLICANT_CLI=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set - -# Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero" BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" - -# Required tools to create the SD image BR2_PACKAGE_HOST_GENIMAGE=y - -# Image -BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" - -# Wireless driver and firmware -BR2_PACKAGE_XR819_XRADIO=y -BR2_PACKAGE_ARMBIAN_FIRMWARE=y -BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819=y - -# Wireless support -BR2_PACKAGE_IW=y -BR2_PACKAGE_WIRELESS_TOOLS=y -BR2_PACKAGE_WIRELESS_TOOLS_LIB=y -BR2_PACKAGE_WPA_SUPPLICANT=y -BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y -BR2_PACKAGE_WPA_SUPPLICANT_CLI=y - -# Spi flash support -BR2_PACKAGE_MTD=y diff --git a/buildroot/configs/orangepi_zero_plus2_defconfig b/buildroot/configs/orangepi_zero_plus2_defconfig index 9d88b37ac9..84227cb392 100644 --- a/buildroot/configs/orangepi_zero_plus2_defconfig +++ b/buildroot/configs/orangepi_zero_plus2_defconfig @@ -1,65 +1,46 @@ BR2_aarch64=y -BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y - -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Zero Plus2" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_ROOTFS_OVERLAY="board/orangepi/orangepi-zero-plus2/rootfs_overlay" - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero_plus2" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_OPENSSL=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero-plus2/boot.cmd" - -# Kernel +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.1" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.3" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero-plus2/linux-extras.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-zero-plus2" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero-plus2/linux-extras.config" +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# wireless firmware BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=y - -# wireless tools BR2_PACKAGE_IW=y BR2_PACKAGE_WIRELESS_TOOLS=y BR2_PACKAGE_WIRELESS_TOOLS_LIB=y BR2_PACKAGE_WPA_SUPPLICANT=y -BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y BR2_PACKAGE_WPA_SUPPLICANT_CLI=y - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Zero Plus2" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="120M" -BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_TARGET_ROOTFS_EXT2_SIZE="128M" +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.9" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero_plus2" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-zero-plus2/genimage.cfg" diff --git a/buildroot/configs/orangepi_zero_plus_defconfig b/buildroot/configs/orangepi_zero_plus_defconfig index cf82f8b3cc..48c8e993f0 100644 --- a/buildroot/configs/orangepi_zero_plus_defconfig +++ b/buildroot/configs/orangepi_zero_plus_defconfig @@ -1,52 +1,38 @@ BR2_aarch64=y -BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y - -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Zero Plus" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_SYSTEM_DHCP="eth0" - -# Firmware +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.53" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-zero-plus" +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y - -# Bootloader +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.9" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.07.02" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero_plus" BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero-plus/boot.cmd" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.7.19" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-zero-plus" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Zero Plus" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-zero-plus/genimage.cfg" diff --git a/buildroot/configs/pandaboard_defconfig b/buildroot/configs/pandaboard_defconfig deleted file mode 100644 index 376ecfe504..0000000000 --- a/buildroot/configs/pandaboard_defconfig +++ /dev/null @@ -1,48 +0,0 @@ -# Architecture -BR2_arm=y -BR2_cortex_a9=y -BR2_ARM_ENABLE_NEON=y -BR2_ARM_ENABLE_VFP=y -BR2_ARM_FPU_VFPV3=y - -# Linux headers same as kernel, a 5.12 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y - -# System -BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS2" -BR2_SYSTEM_DHCP="eth0" - -# Image -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/pandaboard/genimage.cfg" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.2" -BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="omap4-panda-es omap4-panda omap4-panda-a4" -BR2_LINUX_KERNEL_INSTALL_TARGET=y -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -# BR2_TARGET_ROOTFS_TAR is not set - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="omap4_panda" -BR2_TARGET_UBOOT_FORMAT_IMG=y -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="MLO" - -# Required tools to create the SD card image -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/pc_x86_64_bios_defconfig b/buildroot/configs/pc_x86_64_bios_defconfig index df5988d75e..3617d3a85f 100644 --- a/buildroot/configs/pc_x86_64_bios_defconfig +++ b/buildroot/configs/pc_x86_64_bios_defconfig @@ -1,42 +1,18 @@ -# Architecture BR2_x86_64=y - -# Toolchain, required for eudev (to autoload drivers) -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y - -# System -BR2_TARGET_GENERIC_GETTY_PORT="tty1" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y - -# Required tools to create bootable media -BR2_PACKAGE_HOST_GENIMAGE=y - -# Bootloader -BR2_TARGET_GRUB2=y -BR2_TARGET_GRUB2_INSTALL_TOOLS=y - -# Filesystem / image -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="120M" -# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_ROOTFS_POST_BUILD_SCRIPT="board/pc/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/pc/genimage-bios.cfg" - -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.204" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.24" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/pc/linux.config" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Firmware +BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9170=y BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9271=y @@ -51,16 +27,19 @@ BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8000C=y BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8265=y BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y -BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y - -# Packages -# -# Use connman so that networking setup is simpler, via connmanctl tool -# acpid is for seamless power button support +BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y BR2_PACKAGE_ACPID=y BR2_PACKAGE_CONNMAN=y -BR2_PACKAGE_CONNMAN_CLIENT=y BR2_PACKAGE_CONNMAN_WIFI=y +BR2_PACKAGE_CONNMAN_CLIENT=y +BR2_PACKAGE_WIRELESS_REGDB=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_GRUB2=y +BR2_TARGET_GRUB2_INSTALL_TOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/buildroot/configs/pc_x86_64_efi_defconfig b/buildroot/configs/pc_x86_64_efi_defconfig index 18d2c477d5..45d895889b 100644 --- a/buildroot/configs/pc_x86_64_efi_defconfig +++ b/buildroot/configs/pc_x86_64_efi_defconfig @@ -1,43 +1,17 @@ -# Architecture BR2_x86_64=y - -# Toolchain, required for eudev (to autoload drivers) -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y - -# System -BR2_TARGET_GENERIC_GETTY_PORT="tty1" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y - -# Required tools to create bootable media -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y - -# Bootloader -BR2_TARGET_GRUB2=y -BR2_TARGET_GRUB2_X86_64_EFI=y - -# Filesystem / image -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="120M" -# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_ROOTFS_POST_BUILD_SCRIPT="board/pc/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/pc/post-image-efi.sh" - -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.204" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.24" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/pc/linux.config" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Firmware +BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9170=y BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9271=y @@ -52,16 +26,21 @@ BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8000C=y BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8265=y BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y -BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y - -# Packages -# -# Use connman so that networking setup is simpler, via connmanctl tool -# acpid is for seamless power button support +BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y BR2_PACKAGE_ACPID=y BR2_PACKAGE_CONNMAN=y -BR2_PACKAGE_CONNMAN_CLIENT=y BR2_PACKAGE_CONNMAN_WIFI=y +BR2_PACKAGE_CONNMAN_CLIENT=y +BR2_PACKAGE_WIRELESS_REGDB=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_GRUB2=y +BR2_TARGET_GRUB2_X86_64_EFI=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/pcengines_apu2_defconfig b/buildroot/configs/pcengines_apu2_defconfig index a85808554c..b55d55fe2e 100644 --- a/buildroot/configs/pcengines_apu2_defconfig +++ b/buildroot/configs/pcengines_apu2_defconfig @@ -1,28 +1,17 @@ -# Architecture BR2_x86_64=y - -# Kernel BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y +BR2_TARGET_GENERIC_HOSTNAME="apu2" +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_SYSTEM_DHCP="eth0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/pcengines/apu2/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y - -# Default hostname and TTY -BR2_TARGET_GENERIC_HOSTNAME="apu2" -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# Networking -BR2_SYSTEM_DHCP="eth0" - -# Rootfs BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_ISO9660=y BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU="board/pcengines/apu2/isolinux.cfg" BR2_TARGET_ROOTFS_ISO9660_HYBRID=y # BR2_TARGET_ROOTFS_TAR is not set - -# Bootloader BR2_TARGET_SYSLINUX=y diff --git a/buildroot/configs/pine64_defconfig b/buildroot/configs/pine64_defconfig index 2bdb6f6ae1..8975f3b1a2 100644 --- a/buildroot/configs/pine64_defconfig +++ b/buildroot/configs/pine64_defconfig @@ -1,50 +1,38 @@ BR2_aarch64=y -BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 5.0 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# Firmware +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_TARGET_GENERIC_ISSUE="Welcome to PINE64" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/pine64/pine64/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.48" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-pine64" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y - -# Bootloader +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="lts-v2.10.5" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="pine64_plus" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/pine64/pine64/boot.cmd" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-pine64" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to PINE64" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/pine64/pine64/genimage.cfg" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/pine64/pine64/boot.cmd" diff --git a/buildroot/configs/pine64_pinecube_defconfig b/buildroot/configs/pine64_pinecube_defconfig new file mode 100644 index 0000000000..3f88ca0822 --- /dev/null +++ b/buildroot/configs/pine64_pinecube_defconfig @@ -0,0 +1,32 @@ +BR2_arm=y +BR2_cortex_a7=y +BR2_ARM_FPU_VFPV4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_TARGET_GENERIC_HOSTNAME="pinecube" +BR2_TARGET_GENERIC_ISSUE="Welcome to Pine64 Pinecube" +BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/pine64/pinecube/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/pine64/pinecube/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.60" +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-s3-pinecube" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="pinecube" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/pine64_sopine_defconfig b/buildroot/configs/pine64_sopine_defconfig index 6fa511477c..845775338b 100644 --- a/buildroot/configs/pine64_sopine_defconfig +++ b/buildroot/configs/pine64_sopine_defconfig @@ -1,19 +1,22 @@ BR2_aarch64=y -BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 5.0 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# Firmware +BR2_TARGET_GENERIC_ISSUE="Welcome to PINE64 SOPINE" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/pine64/sopine/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-sopine-baseboard" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y - -# Bootloader +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y @@ -26,25 +29,9 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/pine64/sopine/boot.cmd" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-sopine-baseboard" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to PINE64 SOPINE" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/pine64/sopine/genimage.cfg" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/pine64/sopine/boot.cmd" diff --git a/buildroot/configs/pine64_star64_defconfig b/buildroot/configs/pine64_star64_defconfig new file mode 100644 index 0000000000..33c5826a4a --- /dev/null +++ b/buildroot/configs/pine64_star64_defconfig @@ -0,0 +1,31 @@ +BR2_riscv=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_ROOTFS_OVERLAY="board/pine64/star64/overlay/" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/pine64/star64/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/pine64/star64/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Fishwaldo,Star64_linux,1456c984f15e21e28fb8a9ce96d0ca10e61a71c4)/linux-1456c984f15e21e28fb8a9ce96d0ca10e61a71c4.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="pine64_star64" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="starfive/jh7110-pine64-star64" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="100M" +BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_PLAT="generic" +BR2_TARGET_OPENSBI_UBOOT_PAYLOAD=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Fishwaldo,u-boot,172b47f62039605d6806fa96bd403c21cda28996)/u-boot-172b47f62039605d6806fa96bd403c21cda28996.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="pine64_star64" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_SPL=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_STARFIVE_SPLTOOL=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y diff --git a/buildroot/configs/qemu_aarch64_ebbr_defconfig b/buildroot/configs/qemu_aarch64_ebbr_defconfig new file mode 100644 index 0000000000..cb6a06653c --- /dev/null +++ b/buildroot/configs/qemu_aarch64_ebbr_defconfig @@ -0,0 +1,39 @@ +BR2_aarch64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/aarch64-ebbr/post-image.sh support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/aarch64-ebbr/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_OPTEE_CLIENT=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="200M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.10" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="qemu" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y +BR2_TARGET_GRUB2=y +BR2_TARGET_OPTEE_OS=y +BR2_TARGET_OPTEE_OS_NEEDS_DTC=y +BR2_TARGET_OPTEE_OS_PLATFORM="vexpress-qemu_armv8a" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="qemu_arm64" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/qemu/aarch64-ebbr/u-boot.fragment" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_aarch64_sbsa_defconfig b/buildroot/configs/qemu_aarch64_sbsa_defconfig index 2d6134e78c..6df2b2e273 100644 --- a/buildroot/configs/qemu_aarch64_sbsa_defconfig +++ b/buildroot/configs/qemu_aarch64_sbsa_defconfig @@ -1,53 +1,31 @@ -# Architecture BR2_aarch64=y -BR2_cortex_a57=y - -# Toolchain -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y - -# System -BR2_SYSTEM_DHCP="eth0" +BR2_neoverse_n1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -# BR2_TARGET_ROOTFS_TAR is not set -BR2_TARGET_ROOTFS_EXT2_SIZE="128M" - -# Image +BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/aarch64-sbsa/assemble-flash-images support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/aarch64-sbsa/genimage.cfg" - -# Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# UEFI firmware -BR2_TARGET_EDK2=y -BR2_TARGET_EDK2_PLATFORM_QEMU_SBSA=y -BR2_TARGET_GRUB2=y -BR2_TARGET_GRUB2_ARM64_EFI=y - -# ARM Trusted Firmware +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="128M" +# BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.4" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.11" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="qemu_sbsa" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y - -# Host tools for genimage -BR2_PACKAGE_HOST_GENIMAGE=y +BR2_TARGET_EDK2=y +BR2_TARGET_EDK2_PLATFORM_QEMU_SBSA=y +BR2_TARGET_GRUB2=y BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y - -# host-qemu for gitlab testing BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_aarch64_virt_defconfig b/buildroot/configs/qemu_aarch64_virt_defconfig index 03df0ad9e2..6c206cea93 100644 --- a/buildroot/configs/qemu_aarch64_virt_defconfig +++ b/buildroot/configs/qemu_aarch64_virt_defconfig @@ -1,30 +1,18 @@ -# Architecture BR2_aarch64=y -BR2_cortex_a53=y - -# System +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_SYSTEM_DHCP="eth0" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -# BR2_TARGET_ROOTFS_TAR is not set - -# Image BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - -# Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_arm_ebbr_defconfig b/buildroot/configs/qemu_arm_ebbr_defconfig new file mode 100644 index 0000000000..2cc222e2a4 --- /dev/null +++ b/buildroot/configs/qemu_arm_ebbr_defconfig @@ -0,0 +1,43 @@ +BR2_arm=y +BR2_cortex_a15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/arm-ebbr/post-image.sh support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/arm-ebbr/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-ebbr/linux.fragment" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_OPTEE_CLIENT=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="200M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.10" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="qemu" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="BL32_RAM_LOCATION=tdram" +BR2_TARGET_GRUB2=y +BR2_TARGET_GRUB2_ARM_EFI=y +BR2_TARGET_OPTEE_OS=y +BR2_TARGET_OPTEE_OS_NEEDS_DTC=y +BR2_TARGET_OPTEE_OS_PLATFORM="vexpress-qemu_virt" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="qemu_arm" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/qemu/arm-ebbr/u-boot.fragment" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_arm_versatile_defconfig b/buildroot/configs/qemu_arm_versatile_defconfig index 4f43273a82..e22ef33c06 100644 --- a/buildroot/configs/qemu_arm_versatile_defconfig +++ b/buildroot/configs/qemu_arm_versatile_defconfig @@ -1,31 +1,19 @@ -# Architecture BR2_arm=y -BR2_arm926t=y - -# System -BR2_SYSTEM_DHCP="eth0" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -# BR2_TARGET_ROOTFS_TAR is not set - -# Image +BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - -# Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_DEFCONFIG="versatile" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-versatile/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="versatile-pb" - -# host-qemu for gitlab testing +BR2_LINUX_KERNEL_INTREE_DTS_NAME="arm/versatile-pb" +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_arm_versatile_nommu_defconfig b/buildroot/configs/qemu_arm_versatile_nommu_defconfig deleted file mode 100644 index 0c49d1b67d..0000000000 --- a/buildroot/configs/qemu_arm_versatile_nommu_defconfig +++ /dev/null @@ -1,42 +0,0 @@ -# Architecture -BR2_arm=y -BR2_arm926t=y - -# Toolchain -BR2_PACKAGE_HOST_ELF2FLT=y -# BR2_USE_MMU is not set - -# Patches -BR2_GLOBAL_PATCH_DIR="board/qemu/arm-versatile/patches" - -# Busybox with hush -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" - -# System -BR2_SYSTEM_DHCP="eth0" -BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" - -# Filesystem -# BR2_TARGET_ROOTFS_EXT2 is not set -# BR2_TARGET_ROOTFS_TAR is not set -BR2_TARGET_ROOTFS_INITRAMFS=y - -# Image -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - -# Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" -BR2_LINUX_KERNEL_DEFCONFIG="versatile" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-versatile/linux-nommu.fragment" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="versatile-pb" - -# host-qemu for gitlab testing -BR2_PACKAGE_HOST_QEMU=y -BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_arm_vexpress_defconfig b/buildroot/configs/qemu_arm_vexpress_defconfig index 2c813456f4..84be67045f 100644 --- a/buildroot/configs/qemu_arm_vexpress_defconfig +++ b/buildroot/configs/qemu_arm_vexpress_defconfig @@ -1,35 +1,22 @@ -# Architecture BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y -BR2_ARM_FPU_VFPV3D16=y - -# System -BR2_SYSTEM_DHCP="eth0" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -# BR2_TARGET_ROOTFS_TAR is not set - -# Image +BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Qemu >= 5.1 requires an SD card size to be a power of 2, e.g. 64 MiB. -BR2_TARGET_ROOTFS_EXT2_SIZE="64M" - -# Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" - -# host-qemu for gitlab testing +BR2_LINUX_KERNEL_INTREE_DTS_NAME="arm/vexpress-v2p-ca9" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_SIZE="64M" +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_arm_vexpress_tz_defconfig b/buildroot/configs/qemu_arm_vexpress_tz_defconfig index def11721ae..1c2da47282 100644 --- a/buildroot/configs/qemu_arm_vexpress_tz_defconfig +++ b/buildroot/configs/qemu_arm_vexpress_tz_defconfig @@ -1,64 +1,42 @@ -# Architecture BR2_arm=y BR2_cortex_a15=y BR2_ARM_FPU_VFPV3D16=y - -# System +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/arm-vexpress-tz/post-build.sh" - -# optee-test needs toolchain C++ -BR2_TOOLCHAIN_BUILDROOT_CXX=y - -# Filesystem -BR2_TARGET_ROOTFS_CPIO=y -BR2_TARGET_ROOTFS_CPIO_GZIP=y -BR2_TARGET_ROOTFS_CPIO_UIMAGE=y -# BR2_TARGET_ROOTFS_TAR is not set - -# Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# Kernel +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-vexpress-tz/linux.fragment" - -# TF-A for booting OP-TEE secure and uboot/linux non secure +BR2_PACKAGE_OPENSSL=y +BR2_PACKAGE_OPTEE_EXAMPLES=y +BR2_PACKAGE_OPTEE_TEST=y +BR2_TARGET_ROOTFS_CPIO=y +BR2_TARGET_ROOTFS_CPIO_GZIP=y +BR2_TARGET_ROOTFS_CPIO_UIMAGE=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.4" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="qemu" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="BL32_RAM_LOCATION=tdram" - -# OP-TEE components BR2_TARGET_OPTEE_OS=y +BR2_TARGET_OPTEE_OS_NEEDS_DTC=y BR2_TARGET_OPTEE_OS_PLATFORM="vexpress-qemu_virt" -BR2_PACKAGE_OPTEE_BENCHMARK=y -BR2_PACKAGE_OPTEE_EXAMPLES=y -BR2_PACKAGE_OPTEE_TEST=y - -# Enable OpenSSL library for some optee-test tests -BR2_PACKAGE_OPENSSL=y -BR2_PACKAGE_LIBOPENSSL=y - -# Image -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - -# U-boot for booting the dear Linux kernel BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="qemu_arm" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/qemu/arm-vexpress-tz/u-boot.config" - -# host-qemu for gitlab testing BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_m68k_mcf5208_defconfig b/buildroot/configs/qemu_m68k_mcf5208_defconfig index 0490b9e29e..feb96bb533 100644 --- a/buildroot/configs/qemu_m68k_mcf5208_defconfig +++ b/buildroot/configs/qemu_m68k_mcf5208_defconfig @@ -1,36 +1,18 @@ -# Architecture BR2_m68k=y BR2_m68k_cf5208=y - -# System +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_SYSTEM_DHCP="eth0" - -# Filesystem -BR2_TARGET_ROOTFS_INITRAMFS=y -# BR2_TARGET_ROOTFS_TAR is not set - -# Image BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - -# Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-mcf5208/linux.config" -BR2_LINUX_KERNEL_VMLINUX=y - -# Serial port config -BR2_TARGET_GENERIC_GETTY=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# use minimal busybox with hush and networking tools -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_INITRAMFS=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_m68k_q800_defconfig b/buildroot/configs/qemu_m68k_q800_defconfig index 30d8982db3..689da54892 100644 --- a/buildroot/configs/qemu_m68k_q800_defconfig +++ b/buildroot/configs/qemu_m68k_q800_defconfig @@ -1,33 +1,17 @@ -# Architecture BR2_m68k=y -BR2_m68k_68040=y - -# System +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_SYSTEM_DHCP="eth0" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -# BR2_TARGET_ROOTFS_TAR is not set - -# Image BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - -# Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-q800/linux.config" -BR2_LINUX_KERNEL_VMLINUX=y - -# Serial port config -BR2_TARGET_GENERIC_GETTY=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_microblazebe_mmu_defconfig b/buildroot/configs/qemu_microblazebe_mmu_defconfig index 7bd2ae53b8..572f7c125f 100644 --- a/buildroot/configs/qemu_microblazebe_mmu_defconfig +++ b/buildroot/configs/qemu_microblazebe_mmu_defconfig @@ -1,31 +1,18 @@ -# Architecture -BR2_microblaze=y BR2_microblazebe=y - -# System -BR2_SYSTEM_DHCP="eth0" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttyUL0" - -# Filesystem -# BR2_TARGET_ROOTFS_TAR is not set -BR2_TARGET_ROOTFS_INITRAMFS=y - -# Image +BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - -# Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y -BR2_LINUX_KERNEL_PATCH="board/qemu/microblazebe-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch" - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_INITRAMFS=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_microblazeel_mmu_defconfig b/buildroot/configs/qemu_microblazeel_mmu_defconfig index cd8c5a3cb2..03c80919dc 100644 --- a/buildroot/configs/qemu_microblazeel_mmu_defconfig +++ b/buildroot/configs/qemu_microblazeel_mmu_defconfig @@ -1,31 +1,18 @@ -# Architecture -BR2_microblaze=y BR2_microblazeel=y - -# System -BR2_SYSTEM_DHCP="eth0" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttyUL0" - -# Filesystem -# BR2_TARGET_ROOTFS_TAR is not set -BR2_TARGET_ROOTFS_INITRAMFS=y - -# Image +BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - -# Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y -BR2_LINUX_KERNEL_PATCH="board/qemu/microblazeel-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch" - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_INITRAMFS=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_mips32r2_malta_defconfig b/buildroot/configs/qemu_mips32r2_malta_defconfig index 49d84c308b..ceb5f91b20 100644 --- a/buildroot/configs/qemu_mips32r2_malta_defconfig +++ b/buildroot/configs/qemu_mips32r2_malta_defconfig @@ -1,33 +1,19 @@ -# Architecture BR2_mips=y BR2_mips_32r2=y - -# System +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_SYSTEM_DHCP="eth0" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -# BR2_TARGET_ROOTFS_TAR is not set - -# Image BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - -# Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y - -# Serial port config -BR2_TARGET_GENERIC_GETTY=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_mips32r2el_malta_defconfig b/buildroot/configs/qemu_mips32r2el_malta_defconfig index 5363018c47..e5ce0c660b 100644 --- a/buildroot/configs/qemu_mips32r2el_malta_defconfig +++ b/buildroot/configs/qemu_mips32r2el_malta_defconfig @@ -1,33 +1,19 @@ -# Architecture BR2_mipsel=y BR2_mips_32r2=y - -# System +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_SYSTEM_DHCP="eth0" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -# BR2_TARGET_ROOTFS_TAR is not set - -# Image BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - -# Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y - -# Serial port config -BR2_TARGET_GENERIC_GETTY=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_mips32r6_malta_defconfig b/buildroot/configs/qemu_mips32r6_malta_defconfig index f77feb9b6d..d8f3455b27 100644 --- a/buildroot/configs/qemu_mips32r6_malta_defconfig +++ b/buildroot/configs/qemu_mips32r6_malta_defconfig @@ -1,33 +1,19 @@ -# Architecture BR2_mips=y BR2_mips_32r6=y - -# System +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_SYSTEM_DHCP="eth0" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -# BR2_TARGET_ROOTFS_TAR is not set - -# Image BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - -# Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y - -# Serial port config -BR2_TARGET_GENERIC_GETTY=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_mips32r6el_malta_defconfig b/buildroot/configs/qemu_mips32r6el_malta_defconfig index 575034441a..89231a2c4f 100644 --- a/buildroot/configs/qemu_mips32r6el_malta_defconfig +++ b/buildroot/configs/qemu_mips32r6el_malta_defconfig @@ -1,33 +1,19 @@ -# Architecture BR2_mipsel=y BR2_mips_32r6=y - -# System +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_SYSTEM_DHCP="eth0" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -# BR2_TARGET_ROOTFS_TAR is not set - -# Image BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - -# Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y - -# Serial port config -BR2_TARGET_GENERIC_GETTY=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_mips64_malta_defconfig b/buildroot/configs/qemu_mips64_malta_defconfig index e9438fda1e..de0ba6d959 100644 --- a/buildroot/configs/qemu_mips64_malta_defconfig +++ b/buildroot/configs/qemu_mips64_malta_defconfig @@ -1,33 +1,18 @@ -# Architecture BR2_mips64=y BR2_MIPS_NABI64=y - -# System +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_SYSTEM_DHCP="eth0" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -# BR2_TARGET_ROOTFS_TAR is not set - -# Image BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - -# Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y - -# Serial port config -BR2_TARGET_GENERIC_GETTY=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y -BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_mips64el_malta_defconfig b/buildroot/configs/qemu_mips64el_malta_defconfig index 4b1c8e22af..e8d4b4093d 100644 --- a/buildroot/configs/qemu_mips64el_malta_defconfig +++ b/buildroot/configs/qemu_mips64el_malta_defconfig @@ -1,33 +1,18 @@ -# Architecture BR2_mips64el=y BR2_MIPS_NABI64=y - -# System +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_SYSTEM_DHCP="eth0" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -# BR2_TARGET_ROOTFS_TAR is not set - -# Image BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - -# Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y - -# Serial port config -BR2_TARGET_GENERIC_GETTY=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y -BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_mips64r6_malta_defconfig b/buildroot/configs/qemu_mips64r6_malta_defconfig index 87ef7902af..06530044e1 100644 --- a/buildroot/configs/qemu_mips64r6_malta_defconfig +++ b/buildroot/configs/qemu_mips64r6_malta_defconfig @@ -1,34 +1,19 @@ -# Architecture BR2_mips64=y BR2_mips_64r6=y BR2_MIPS_NABI64=y - -# System +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_SYSTEM_DHCP="eth0" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -# BR2_TARGET_ROOTFS_TAR is not set - -# Image BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - -# Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y - -# Serial port config -BR2_TARGET_GENERIC_GETTY=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y -BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_mips64r6el_malta_defconfig b/buildroot/configs/qemu_mips64r6el_malta_defconfig index 5774207f65..d2e0bb7157 100644 --- a/buildroot/configs/qemu_mips64r6el_malta_defconfig +++ b/buildroot/configs/qemu_mips64r6el_malta_defconfig @@ -1,34 +1,19 @@ -# Architecture BR2_mips64el=y BR2_mips_64r6=y BR2_MIPS_NABI64=y - -# System +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_SYSTEM_DHCP="eth0" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -# BR2_TARGET_ROOTFS_TAR is not set - -# Image BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - -# Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y - -# Serial port config -BR2_TARGET_GENERIC_GETTY=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y -BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_nios2_10m50_defconfig b/buildroot/configs/qemu_nios2_10m50_defconfig deleted file mode 100644 index 4b9c53e8de..0000000000 --- a/buildroot/configs/qemu_nios2_10m50_defconfig +++ /dev/null @@ -1,21 +0,0 @@ -BR2_nios2=y -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" -BR2_LINUX_KERNEL_DEFCONFIG="10m50" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/nios2-10m50/linux.fragment" -BR2_TARGET_ROOTFS_INITRAMFS=y - -# Image -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - -# Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# Kernel needs mkimage -BR2_PACKAGE_HOST_UBOOT_TOOLS=y - -# host-qemu for gitlab testing -BR2_PACKAGE_HOST_QEMU=y -BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_or1k_defconfig b/buildroot/configs/qemu_or1k_defconfig index b3d9d79156..02c3882ed6 100644 --- a/buildroot/configs/qemu_or1k_defconfig +++ b/buildroot/configs/qemu_or1k_defconfig @@ -1,24 +1,16 @@ -# Architecture BR2_or1k=y - -# Filesystem -# BR2_TARGET_ROOTFS_TAR is not set -BR2_TARGET_ROOTFS_INITRAMFS=y - -# Image +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - -# Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/or1k/linux.config" - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_INITRAMFS=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_ppc64_e5500_defconfig b/buildroot/configs/qemu_ppc64_e5500_defconfig index 072240c99c..dd778e7868 100644 --- a/buildroot/configs/qemu_ppc64_e5500_defconfig +++ b/buildroot/configs/qemu_ppc64_e5500_defconfig @@ -1,30 +1,19 @@ -# Architecture BR2_powerpc64=y BR2_powerpc_e5500=y - -# System -BR2_SYSTEM_DHCP="eth0" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# Image +BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - -# Linux headers same as the kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_DEFCONFIG="corenet64_smp" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc64-e5500/linux.fragment" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set - -# host-qemu for gitlab testing BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_ppc64_pseries_defconfig b/buildroot/configs/qemu_ppc64_pseries_defconfig index ad523ec2ef..d006bee7a4 100644 --- a/buildroot/configs/qemu_ppc64_pseries_defconfig +++ b/buildroot/configs/qemu_ppc64_pseries_defconfig @@ -1,29 +1,20 @@ -# Architecture BR2_powerpc64=y BR2_powerpc_power7=y - -# System -BR2_SYSTEM_DHCP="eth0" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="hvc0" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -# BR2_TARGET_ROOTFS_TAR is not set - -# Image +BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - -# Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_DEFCONFIG="pseries" BR2_LINUX_KERNEL_VMLINUX=y - -# host-qemu for gitlab testing +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_ppc64le_powernv8_defconfig b/buildroot/configs/qemu_ppc64le_powernv8_defconfig index a784695ddf..d20a21618a 100644 --- a/buildroot/configs/qemu_ppc64le_powernv8_defconfig +++ b/buildroot/configs/qemu_ppc64le_powernv8_defconfig @@ -1,29 +1,18 @@ -# Architecture BR2_powerpc64le=y -BR2_powerpc_power8=y - -# System +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="hvc0" BR2_SYSTEM_DHCP="eth0" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -# BR2_TARGET_ROOTFS_TAR is not set - -# Image BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - -# Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_DEFCONFIG="powernv" BR2_LINUX_KERNEL_VMLINUX=y - -# host-qemu for gitlab testing +BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_ppc64le_pseries_defconfig b/buildroot/configs/qemu_ppc64le_pseries_defconfig index f10b0fdf40..5cbacd3f17 100644 --- a/buildroot/configs/qemu_ppc64le_pseries_defconfig +++ b/buildroot/configs/qemu_ppc64le_pseries_defconfig @@ -1,29 +1,19 @@ -# Architecture BR2_powerpc64le=y -BR2_powerpc_power8=y - -# System +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="hvc0" BR2_SYSTEM_DHCP="eth0" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -# BR2_TARGET_ROOTFS_TAR is not set - -# Image BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - -# Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_DEFCONFIG="pseries_le" BR2_LINUX_KERNEL_VMLINUX=y - -# host-qemu for gitlab testing +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_ppc_bamboo_defconfig b/buildroot/configs/qemu_ppc_bamboo_defconfig index 6129c4a663..bb7dca6930 100644 --- a/buildroot/configs/qemu_ppc_bamboo_defconfig +++ b/buildroot/configs/qemu_ppc_bamboo_defconfig @@ -1,36 +1,20 @@ -# Architecture BR2_powerpc=y BR2_powerpc_440fp=y - -# System +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_SYSTEM_DHCP="eth0" - -# Filesystem -# BR2_TARGET_ROOTFS_TAR is not set -BR2_TARGET_ROOTFS_INITRAMFS=y - -# Image BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - -# Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_DEFCONFIG="44x/bamboo" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-bamboo/linux.fragment" BR2_LINUX_KERNEL_VMLINUX=y - -# Serial port config -BR2_TARGET_GENERIC_GETTY=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# Kernel needs mkimage -BR2_PACKAGE_HOST_UBOOT_TOOLS=y - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_INITRAMFS=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/buildroot/configs/qemu_ppc_e500mc_defconfig b/buildroot/configs/qemu_ppc_e500mc_defconfig index 1853e538bb..eccf86f6a3 100644 --- a/buildroot/configs/qemu_ppc_e500mc_defconfig +++ b/buildroot/configs/qemu_ppc_e500mc_defconfig @@ -1,30 +1,19 @@ -# Architecture BR2_powerpc=y BR2_powerpc_e500mc=y - -# System -BR2_SYSTEM_DHCP="eth0" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# Image +BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - -# Linux headers same as the kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_DEFCONFIG="corenet32_smp" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-e500mc/linux.fragment" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set - -# host-qemu for gitlab testing BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_ppc_g3beige_defconfig b/buildroot/configs/qemu_ppc_g3beige_defconfig index 9bbebede1b..f35c8557b1 100644 --- a/buildroot/configs/qemu_ppc_g3beige_defconfig +++ b/buildroot/configs/qemu_ppc_g3beige_defconfig @@ -1,33 +1,19 @@ -# Architecture BR2_powerpc=y BR2_powerpc_750=y - -# System +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_SYSTEM_DHCP="eth0" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -# BR2_TARGET_ROOTFS_TAR is not set - -# Image BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - -# Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-g3beige/linux.config" BR2_LINUX_KERNEL_VMLINUX=y - -# Serial port config -BR2_TARGET_GENERIC_GETTY=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_ppc_mac99_defconfig b/buildroot/configs/qemu_ppc_mac99_defconfig index e9629ff233..13d9aba0b0 100644 --- a/buildroot/configs/qemu_ppc_mac99_defconfig +++ b/buildroot/configs/qemu_ppc_mac99_defconfig @@ -1,34 +1,21 @@ -# Architecture BR2_powerpc=y BR2_powerpc_7400=y - -# System +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_SYSTEM_DHCP="eth0" - -# Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# Kernel +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_DEFCONFIG="pmac32" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-mac99/linux.fragment" BR2_LINUX_KERNEL_VMLINUX=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Serial port config -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# Filesystem BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set - -# Image -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - -# host-qemu for gitlab testing BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_ppc_mpc8544ds_defconfig b/buildroot/configs/qemu_ppc_mpc8544ds_defconfig index 2b51573da9..8da2a0472c 100644 --- a/buildroot/configs/qemu_ppc_mpc8544ds_defconfig +++ b/buildroot/configs/qemu_ppc_mpc8544ds_defconfig @@ -1,37 +1,20 @@ -# Architecture BR2_powerpc=y BR2_powerpc_8548=y - -# System -BR2_GLOBAL_PATCH_DIR="board/qemu/ppc-mpc8544ds/patches" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_SYSTEM_DHCP="eth0" - -# Filesystem -# BR2_TARGET_ROOTFS_TAR is not set -BR2_TARGET_ROOTFS_INITRAMFS=y - -# Image BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - -# Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-mpc8544ds/linux.config" BR2_LINUX_KERNEL_VMLINUX=y - -# Serial port config -BR2_TARGET_GENERIC_GETTY=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# Kernel needs mkimage -BR2_PACKAGE_HOST_UBOOT_TOOLS=y - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_INITRAMFS=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/buildroot/configs/qemu_riscv32_nommu_virt_defconfig b/buildroot/configs/qemu_riscv32_nommu_virt_defconfig new file mode 100644 index 0000000000..49580716bb --- /dev/null +++ b/buildroot/configs/qemu_riscv32_nommu_virt_defconfig @@ -0,0 +1,17 @@ +BR2_riscv=y +BR2_RISCV_32=y +# BR2_RISCV_USE_MMU is not set +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/riscv32-virt/linux-nommu.config" +BR2_TARGET_ROOTFS_EXT2=y +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_riscv32_virt_defconfig b/buildroot/configs/qemu_riscv32_virt_defconfig index dff87ef342..6064dd66c3 100644 --- a/buildroot/configs/qemu_riscv32_virt_defconfig +++ b/buildroot/configs/qemu_riscv32_virt_defconfig @@ -1,32 +1,19 @@ -# Architecture BR2_riscv=y BR2_RISCV_32=y - -# System +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_SYSTEM_DHCP="eth0" -BR2_TARGET_GENERIC_GETTY=y - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y - -# Image BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - -# Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_DEFCONFIG="rv32" -BR2_LINUX_KERNEL_IMAGE=y - -# Bootloader +BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.2" BR2_TARGET_OPENSBI_PLAT="generic" - -# host-qemu for gitlab testing BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_riscv64_nommu_virt_defconfig b/buildroot/configs/qemu_riscv64_nommu_virt_defconfig new file mode 100644 index 0000000000..bb3fb2c5cb --- /dev/null +++ b/buildroot/configs/qemu_riscv64_nommu_virt_defconfig @@ -0,0 +1,16 @@ +BR2_riscv=y +# BR2_RISCV_USE_MMU is not set +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/riscv64-virt/linux-nommu.config" +BR2_TARGET_ROOTFS_EXT2=y +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_riscv64_virt_defconfig b/buildroot/configs/qemu_riscv64_virt_defconfig index d67d070185..575e367af8 100644 --- a/buildroot/configs/qemu_riscv64_virt_defconfig +++ b/buildroot/configs/qemu_riscv64_virt_defconfig @@ -1,32 +1,18 @@ -# Architecture BR2_riscv=y -BR2_RISCV_64=y - -# System +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_SYSTEM_DHCP="eth0" -BR2_TARGET_GENERIC_GETTY=y - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y - -# Image BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - -# Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_IMAGE=y - -# Bootloader +BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.2" BR2_TARGET_OPENSBI_PLAT="generic" - -# host-qemu for gitlab testing BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_riscv64_virt_efi_defconfig b/buildroot/configs/qemu_riscv64_virt_efi_defconfig new file mode 100644 index 0000000000..66a05d59e5 --- /dev/null +++ b/buildroot/configs/qemu_riscv64_virt_efi_defconfig @@ -0,0 +1,21 @@ +BR2_riscv=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/riscv64-virt-efi/assemble-flash-images support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/riscv64-virt-efi/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_EDK2=y +BR2_TARGET_GRUB2=y +BR2_TARGET_GRUB2_RISCV64_EFI=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_s390x_defconfig b/buildroot/configs/qemu_s390x_defconfig index 346df04ada..975633e3ab 100644 --- a/buildroot/configs/qemu_s390x_defconfig +++ b/buildroot/configs/qemu_s390x_defconfig @@ -1,26 +1,18 @@ -# Architecture BR2_s390x=y - -# System +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_SYSTEM_DHCP="eth0" - -# Filesystem BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -BR2_TARGET_ROOTFS_EXT2=y -# BR2_TARGET_ROOTFS_TAR is not set - -# Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_sh4_r2d_defconfig b/buildroot/configs/qemu_sh4_r2d_defconfig index 0f12b7dfe9..4b06017aec 100644 --- a/buildroot/configs/qemu_sh4_r2d_defconfig +++ b/buildroot/configs/qemu_sh4_r2d_defconfig @@ -1,30 +1,18 @@ -# Architecture BR2_sh=y -BR2_sh4=y - -# System -BR2_SYSTEM_DHCP="eth0" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttySC1" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -# BR2_TARGET_ROOTFS_TAR is not set - -# Image +BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - -# Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux.config" BR2_LINUX_KERNEL_ZIMAGE=y - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_INITRAMFS=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_sh4eb_r2d_defconfig b/buildroot/configs/qemu_sh4eb_r2d_defconfig index d5ee371e79..9a80bb1065 100644 --- a/buildroot/configs/qemu_sh4eb_r2d_defconfig +++ b/buildroot/configs/qemu_sh4eb_r2d_defconfig @@ -1,29 +1,18 @@ -# Architecture BR2_sh=y BR2_sh4eb=y - -# System +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttySC1" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -# BR2_TARGET_ROOTFS_TAR is not set - -# Image BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - -# Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4eb-r2d/linux.config" BR2_LINUX_KERNEL_ZIMAGE=y - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_INITRAMFS=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_sparc64_sun4u_defconfig b/buildroot/configs/qemu_sparc64_sun4u_defconfig index 485b497e71..d409a9ff47 100644 --- a/buildroot/configs/qemu_sparc64_sun4u_defconfig +++ b/buildroot/configs/qemu_sparc64_sun4u_defconfig @@ -1,28 +1,16 @@ -# Architecture BR2_sparc64=y -BR2_sparc_v9=y - -# System +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_SYSTEM_DHCP="eth0" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -# BR2_TARGET_ROOTFS_TAR is not set - -# Image BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - -# Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc64-sun4u/linux.config" - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_sparc_ss10_defconfig b/buildroot/configs/qemu_sparc_ss10_defconfig index 2ba04c0864..63ca7330b9 100644 --- a/buildroot/configs/qemu_sparc_ss10_defconfig +++ b/buildroot/configs/qemu_sparc_ss10_defconfig @@ -1,28 +1,16 @@ -# Architecture BR2_sparc=y -BR2_sparc_v8=y - -# System +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_SYSTEM_DHCP="eth0" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -# BR2_TARGET_ROOTFS_TAR is not set - -# Image BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - -# Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc-ss10/linux.config" - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_x86_64_defconfig b/buildroot/configs/qemu_x86_64_defconfig index cc505a8540..8022e43a20 100644 --- a/buildroot/configs/qemu_x86_64_defconfig +++ b/buildroot/configs/qemu_x86_64_defconfig @@ -1,31 +1,18 @@ -# Architecture BR2_x86_64=y - -# System +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_SYSTEM_DHCP="eth0" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -# BR2_TARGET_ROOTFS_TAR is not set - -# Image BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh" - -# Image BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - -# Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_x86_defconfig b/buildroot/configs/qemu_x86_defconfig index 34b7e2d292..e4ff52a3d5 100644 --- a/buildroot/configs/qemu_x86_defconfig +++ b/buildroot/configs/qemu_x86_defconfig @@ -1,31 +1,17 @@ -# Architecture -BR2_i386=y BR2_x86_pentiumpro=y - -# System +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_SYSTEM_DHCP="eth0" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -# BR2_TARGET_ROOTFS_TAR is not set - -# Image BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86/po