diff --git a/.clang-format b/.clang-format
index 48405c54ef2..e86a17da147 100644
--- a/.clang-format
+++ b/.clang-format
@@ -748,6 +748,57 @@ ForEachMacros:
   - 'ynl_attr_for_each_nested'
   - 'ynl_attr_for_each_payload'
   - 'zorro_for_each_dev'
+  # U-Boot specific
+  - '__for_each_child_of_node'
+  - '__usbhs_for_each_pipe'
+  - '__usbhsg_for_each_uep'
+  - '_for_each_zynqmp_part'
+  - 'alist_for_each'
+  - 'alist_for_each_filter'
+  - 'cvmx_coremask_for_each_core'
+  - 'cvmx_coremask_for_each_node'
+  - 'dev_for_each_property'
+  - 'dev_for_each_subnode'
+  - 'expr_list_for_each_sym'
+  - 'fdt_for_each_node_by_compatible'
+  - 'fdt_for_each_property_offset'
+  - 'fdt_for_each_subnode'
+  - 'for_each_bin_hdr_v0'
+  - 'for_each_bl_params_node'
+  - 'for_each_child_withdel'
+  - 'for_each_console_dev'
+  - 'for_each_ext_hdr_v0'
+  - 'for_each_label'
+  - 'for_each_label_withdel'
+  - 'for_each_marker'
+  - 'for_each_marker_of_type'
+  - 'for_each_memory_map_entry_reversed'
+  - 'for_each_mmc_mode_by_pref'
+  - 'for_each_opt_hdr_v1'
+  - 'for_each_property_withdel'
+  - 'for_each_sd_mode_by_pref'
+  - 'for_each_supported_width'
+  - 'for_each_tpm_device'
+  - 'for_each_w1_device'
+  - 'for_each_zynqmp_image'
+  - 'for_each_zynqmp_part'
+  - 'for_each_zynqmp_part_in_image'
+  - 'mtd_for_each_device'
+  - 'ofnode_for_each_compatible_node'
+  - 'ofnode_for_each_prop'
+  - 'ofnode_for_each_subnode'
+  - 'pko_for_each_port'
+  - 'sfi_for_each_mentry'
+  - 'ubi_for_each_free_peb'
+  - 'ubi_for_each_protected_peb'
+  - 'ubi_for_each_scrub_peb'
+  - 'ubi_for_each_used_peb'
+  - 'ubi_rb_for_each_entry'
+  - 'usbhs_for_each_dfifo'
+  - 'usbhs_for_each_pipe'
+  - 'usbhs_for_each_pipe_with_dcp'
+  - 'usbhsg_for_each_uep'
+  - 'usbhsg_for_each_uep_with_dcp'
 
 IncludeBlocks: Preserve
 IncludeCategories: