diff --git a/.github/generate_CODEOWNERS.sh b/.github/generate_CODEOWNERS.sh
index 66930a68a..4e81c1ad0 100755
--- a/.github/generate_CODEOWNERS.sh
+++ b/.github/generate_CODEOWNERS.sh
@@ -35,6 +35,7 @@ function generate_for_board() {
 
 				[[ -z $LINUXCONFIG ]] && LINUXCONFIG="linux-${LINUXFAMILY}-${BRANCH}"
 				[[ -z $KERNELPATCHDIR ]] && KERNELPATCHDIR="archive/${LINUXFAMILY}-${KERNEL_MAJOR_MINOR}"
+				[[ -z $BOOTPATCHDIR ]] && BOOTPATCHDIR="u-boot-${LINUXFAMILY}"
 
 				cat <<-EOF
 					config/boards/${board_config}			${maintainers}
@@ -48,6 +49,12 @@ function generate_for_board() {
 					patch_archive="${patch_archive%/}"
 					echo "patch/kernel/${patch_archive%-*}-*/	${maintainers}"
 				fi
+
+				if [[ -n "${BOOTCONFIG}" && "${BOOTCONFIG}" != "none" ]]; then
+					while read -r d; do
+						echo "patch/u-boot/${d}/		${maintainers}"
+					done < <(echo "${BOOTPATCHDIR}" | xargs -n1)
+				fi
 			)
 		done < <(echo "${KERNEL_TARGET}" | tr ',' '\n')
 	)