diff options
| author | Nico Huber <nico.h@gmx.de> | 2017-08-14 01:58:28 +0200 |
|---|---|---|
| committer | Nico Huber <nico.h@gmx.de> | 2017-08-20 20:46:25 +0000 |
| commit | 4ff449272dcbd09a0cad5f64e1e01021ad091a01 (patch) | |
| tree | 7bcf414313415ba03c8d33c4fc81d518ea23631d | |
| parent | 1b04aa25917e4bad63f1befa378660f01af1b811 (diff) | |
| download | coreboot-4ff449272dcbd09a0cad5f64e1e01021ad091a01.tar.xz | |
payloads/external/GRUB2: Only rebuild on config changes
Change-Id: I376eea9a3e02b03010fc5c5a05199ea7b2813220
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/20991
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Martin Roth <martinroth@google.com>
| -rw-r--r-- | payloads/external/GRUB2/Makefile | 4 | ||||
| -rw-r--r-- | payloads/external/Makefile.inc | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/payloads/external/GRUB2/Makefile b/payloads/external/GRUB2/Makefile index dee7f6973b..4a0a49106a 100644 --- a/payloads/external/GRUB2/Makefile +++ b/payloads/external/GRUB2/Makefile @@ -22,7 +22,7 @@ checkout: git branch -f $(NAME-y) $(TAG-y) && \ git checkout $(NAME-y) || true -config: checkout +grub2/build/config.h: $(CONFIG_DEP) | checkout echo " CONFIG GRUB2 $(NAME-y)" rm -rf grub2/build mkdir grub2/build @@ -32,6 +32,8 @@ config: checkout CFLAGS=-O2 TARGET_CFLAGS=-Os \ --with-platform=coreboot --enable-boot-time --disable-werror +config: grub2/build/config.h checkout + grub2: config echo " MAKE GRUB2 $(NAME-y)" $(MAKE) -C grub2/build diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index fb50604c75..0a9b3d6844 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -152,11 +152,12 @@ payloads/external/FILO/filo/build/version.h: filo # Grub -grub2: +grub2: $(obj)/config.h $(MAKE) -C payloads/external/GRUB2 \ HOSTCC="$(HOSTCC)" \ CC="$(CC_x86_32)" LD="$(LD_x86_32)" \ OBJCOPY="$(OBJCOPY_x86_32)" STRIP="$(STRIP_x86_32)" \ + CONFIG_DEP="$(abspath $(obj)/config.h)" \ CONFIG_GRUB2_MASTER=$(CONFIG_GRUB2_MASTER) \ CONFIG_GRUB2_REVISION=$(CONFIG_GRUB2_REVISION) \ CONFIG_GRUB2_REVISION_ID=$(CONFIG_GRUB2_REVISION_ID) \ |