From 3d41ac370d5e869bbd984ad2104a1de448df76ed Mon Sep 17 00:00:00 2001 From: Maximilian Brune Date: Fri, 17 Oct 2025 00:35:15 +0200 Subject: [PATCH] payloads/external/U-Boot/Makefile: Remove conditional Apparently no one ever build this using UBOOT_MASTER, because it is missing the "cd $(project_dir)" before git fetch. I have also no idea what the git show was originally supposed to do. So just remove them both and move on. Signed-off-by: Maximilian Brune Change-Id: I2f26660131ce91420a951fb33ac0eef89371745d Reviewed-on: https://review.coreboot.org/c/coreboot/+/89615 Reviewed-by: Paul Menzel Tested-by: build bot (Jenkins) Reviewed-by: Marc Jones --- payloads/external/U-Boot/Makefile | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/payloads/external/U-Boot/Makefile b/payloads/external/U-Boot/Makefile index ea850b31ee..c588025616 100644 --- a/payloads/external/U-Boot/Makefile +++ b/payloads/external/U-Boot/Makefile @@ -26,17 +26,8 @@ $(project_dir): git clone $(project_git_repo) -b $(TAG-y) $(project_dir) fetch: $(project_dir) -ifeq ($(CONFIG_UBOOT_MASTER),y) echo " Fetching new commits from the $(project_name) git repo" - git fetch - - #master doesn't get a file, so it's continuously updated - rm -f $(STABLE_COMMIT_ID) -else - cd $(project_dir); git show $(TAG-y) >/dev/null 2>&1 ; if [ $$? -ne 0 ]; \ - then echo " Fetching new commits from the $(project_name) git repo"; git fetch; fi - touch $(STABLE_COMMIT_ID) -endif + cd $(project_dir) && git fetch checkout: fetch echo " Checking out $(project_name) revision $(TAG-y)"