From c8ed34075b7785c91cfb1c8556357b2e70cf765d Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Wed, 16 Mar 2016 10:39:30 -0600 Subject: payloads/external: Rename Makefile.inc to Makefile These makefiles are not included by anything, so they shouldn't be named Makefile.inc. Also, having them all be named 'Makefile' makes some other consolidation work I'm doing much easier. Change-Id: I1234539ba6a0a6f47d2eb0c21de3da3607c6b8de Signed-off-by: Martin Roth Reviewed-on: https://review.coreboot.org/14130 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- payloads/external/FILO/Makefile | 49 +++++++++++++++++++++++++++++++++++++ payloads/external/FILO/Makefile.inc | 49 ------------------------------------- 2 files changed, 49 insertions(+), 49 deletions(-) create mode 100644 payloads/external/FILO/Makefile delete mode 100644 payloads/external/FILO/Makefile.inc (limited to 'payloads/external/FILO') diff --git a/payloads/external/FILO/Makefile b/payloads/external/FILO/Makefile new file mode 100644 index 0000000000..6a96a22455 --- /dev/null +++ b/payloads/external/FILO/Makefile @@ -0,0 +1,49 @@ +TAG-$(CONFIG_FILO_MASTER)=origin/master +NAME-$(CONFIG_FILO_MASTER)=MASTER +TAG-$(CONFIG_FILO_STABLE)=4dbb31a64fe5b1c7e3025ab34619220609897646 +NAME-$(CONFIG_FILO_STABLE)=STABLE + +unexport KCONFIG_AUTOHEADER +unexport KCONFIG_AUTOCONFIG +unexport KCONFIG_DEPENDENCIES +unexport KCONFIG_SPLITCONFIG +unexport KCONFIG_TRISTATE +unexport KCONFIG_NEGATIVES + +all: filo + +checkout: + echo " GIT FILO $(NAME-y)" + test -d filo || \ + git clone http://review.coreboot.org/p/filo.git + cd filo && \ + git checkout master && \ + git remote update && \ + test -n $(TAG-y) && \ + git branch -f $(NAME-y) $(TAG-y) && \ + git checkout $(NAME-y) + +config: libpayload + echo " CONFIG FILO $(NAME-y)" + $(MAKE) -C filo defconfig LIBCONFIG_PATH=../../../libpayload + # This shows how to force a previously unset .config option *on* + #echo "CONFIG_VGAHOOKS=y" >> filo/.config + # This shows how to force a previously set .config option *off* + #echo "# CONFIG_SMBIOS is not set" >> filo/.config + $(MAKE) -C filo oldconfig LIBCONFIG_PATH=../../../libpayload + +filo: config + echo " MAKE FILO $(NAME-y)" + $(MAKE) -C filo + +libpayload: checkout + cd ../../libpayload && $(MAKE) defconfig && \ + $(MAKE) && $(MAKE) DESTDIR=../external/FILO/filo/build install + +clean: + test -d filo && $(MAKE) -C filo clean || exit 0 + +distclean: + rm -rf filo + +.PHONY: checkout config filo clean distclean diff --git a/payloads/external/FILO/Makefile.inc b/payloads/external/FILO/Makefile.inc deleted file mode 100644 index 6a96a22455..0000000000 --- a/payloads/external/FILO/Makefile.inc +++ /dev/null @@ -1,49 +0,0 @@ -TAG-$(CONFIG_FILO_MASTER)=origin/master -NAME-$(CONFIG_FILO_MASTER)=MASTER -TAG-$(CONFIG_FILO_STABLE)=4dbb31a64fe5b1c7e3025ab34619220609897646 -NAME-$(CONFIG_FILO_STABLE)=STABLE - -unexport KCONFIG_AUTOHEADER -unexport KCONFIG_AUTOCONFIG -unexport KCONFIG_DEPENDENCIES -unexport KCONFIG_SPLITCONFIG -unexport KCONFIG_TRISTATE -unexport KCONFIG_NEGATIVES - -all: filo - -checkout: - echo " GIT FILO $(NAME-y)" - test -d filo || \ - git clone http://review.coreboot.org/p/filo.git - cd filo && \ - git checkout master && \ - git remote update && \ - test -n $(TAG-y) && \ - git branch -f $(NAME-y) $(TAG-y) && \ - git checkout $(NAME-y) - -config: libpayload - echo " CONFIG FILO $(NAME-y)" - $(MAKE) -C filo defconfig LIBCONFIG_PATH=../../../libpayload - # This shows how to force a previously unset .config option *on* - #echo "CONFIG_VGAHOOKS=y" >> filo/.config - # This shows how to force a previously set .config option *off* - #echo "# CONFIG_SMBIOS is not set" >> filo/.config - $(MAKE) -C filo oldconfig LIBCONFIG_PATH=../../../libpayload - -filo: config - echo " MAKE FILO $(NAME-y)" - $(MAKE) -C filo - -libpayload: checkout - cd ../../libpayload && $(MAKE) defconfig && \ - $(MAKE) && $(MAKE) DESTDIR=../external/FILO/filo/build install - -clean: - test -d filo && $(MAKE) -C filo clean || exit 0 - -distclean: - rm -rf filo - -.PHONY: checkout config filo clean distclean -- cgit v1.2.3