GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Makefile: Include $(top) in DOTCONFIG definition to allow override 

Including $(top) in the DOTCONFIG definition allows getting rid of the
$(top) prefix in payloads, which in turns allows providing a full path
for DOTCONFIG via the command line.

Change-Id: I7546a12cf4a2a146e32fef81121f45f83ba67ac8
Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
Reviewed-on: https://review.coreboot.org/15826
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
Paul Kocialkowski 2016-07-24 12:25:07 +02:00 committed by Stefan Reinauer
parent aad4587c03
commit fde3275fb4
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -65,7 +65,7 @@ TOPLEVEL := .
CONFIG_SHELL := sh CONFIG_SHELL := sh
KBUILD_DEFCONFIG := configs/defconfig KBUILD_DEFCONFIG := configs/defconfig
UNAME_RELEASE := $(shell uname -r) UNAME_RELEASE := $(shell uname -r)
DOTCONFIG ?= .config DOTCONFIG ?= $(top)/.config
KCONFIG_CONFIG = $(DOTCONFIG) KCONFIG_CONFIG = $(DOTCONFIG)
export KCONFIG_CONFIG export KCONFIG_CONFIG
HAVE_DOTCONFIG := $(wildcard $(DOTCONFIG)) HAVE_DOTCONFIG := $(wildcard $(DOTCONFIG))

10
payloads/external/Makefile.inc vendored
View File

@ -61,7 +61,7 @@ payload_revision-file := $(PAYLOAD_VERSION)
payload_revision-type := raw payload_revision-type := raw
SEABIOS_CC_OFFSET=$(if $(filter %ccache,$(HOSTCC)),2,1) SEABIOS_CC_OFFSET=$(if $(filter %ccache,$(HOSTCC)),2,1)
payloads/external/SeaBIOS/seabios/out/bios.bin.elf seabios: $(top)/$(DOTCONFIG) payloads/external/SeaBIOS/seabios/out/bios.bin.elf seabios: $(DOTCONFIG)
$(MAKE) -C payloads/external/SeaBIOS \ $(MAKE) -C payloads/external/SeaBIOS \
HOSTCC="$(HOSTCC)" \ HOSTCC="$(HOSTCC)" \
CC=$(word $(SEABIOS_CC_OFFSET),$(CC_x86_32)) \ CC=$(word $(SEABIOS_CC_OFFSET),$(CC_x86_32)) \
@ -92,7 +92,7 @@ bootorder-file := $(strip $(CONFIG_SEABIOS_BOOTORDER_FILE))
bootorder-type := raw bootorder-type := raw
endif endif
payloads/external/depthcharge/depthcharge/build/depthcharge.elf depthcharge: $(top)/$(DOTCONFIG) $(CBFSTOOL) payloads/external/depthcharge/depthcharge/build/depthcharge.elf depthcharge: $(DOTCONFIG) $(CBFSTOOL)
$(MAKE) -C payloads/external/depthcharge \ $(MAKE) -C payloads/external/depthcharge \
BOARD=$(call ws_to_under,$(call strip_quotes,$(call tolower,$(CONFIG_MAINBOARD_PART_NUMBER)))) \ BOARD=$(call ws_to_under,$(call strip_quotes,$(call tolower,$(CONFIG_MAINBOARD_PART_NUMBER)))) \
MFLAGS= MAKEFLAGS= MFLAGS= MAKEFLAGS=
@ -119,7 +119,7 @@ grub2:
payloads/external/GRUB2/grub2/build/default_payload.elf: grub2 payloads/external/GRUB2/grub2/build/default_payload.elf: grub2
payloads/external/U-Boot/u-boot/u-boot-dtb.bin u-boot: $(top)/$(DOTCONFIG) payloads/external/U-Boot/u-boot/u-boot-dtb.bin u-boot: $(DOTCONFIG)
$(MAKE) -C payloads/external/U-Boot \ $(MAKE) -C payloads/external/U-Boot \
CONFIG_UBOOT_MASTER=$(CONFIG_UBOOT_MASTER) \ CONFIG_UBOOT_MASTER=$(CONFIG_UBOOT_MASTER) \
CONFIG_UBOOT_STABLE=$(CONFIG_UBOOT_STABLE) CONFIG_UBOOT_STABLE=$(CONFIG_UBOOT_STABLE)
@ -141,7 +141,7 @@ cbfs-files-$(CONFIG_TINT_SECONDARY_PAYLOAD) += img/tint
img/tint-file := payloads/external/tint/tint/tint.elf img/tint-file := payloads/external/tint/tint/tint.elf
img/tint-type := payload img/tint-type := payload
payloads/external/Memtest86Plus/memtest86plus/memtest: $(top)/$(DOTCONFIG) payloads/external/Memtest86Plus/memtest86plus/memtest: $(DOTCONFIG)
$(MAKE) -C payloads/external/Memtest86Plus all \ $(MAKE) -C payloads/external/Memtest86Plus all \
CC="$(CC_x86_32)" \ CC="$(CC_x86_32)" \
LD="$(LD_x86_32)" \ LD="$(LD_x86_32)" \
@ -169,7 +169,7 @@ cbfs-files-$(CONFIG_PXE_ROM)$(CONFIG_BUILD_IPXE) += pci$(CONFIG_PXE_ROM_ID).rom
pci$(CONFIG_PXE_ROM_ID).rom-file := $(PXE_ROM_FILE) pci$(CONFIG_PXE_ROM_ID).rom-file := $(PXE_ROM_FILE)
pci$(CONFIG_PXE_ROM_ID).rom-type := raw pci$(CONFIG_PXE_ROM_ID).rom-type := raw
payloads/external/iPXE/ipxe/ipxe.rom ipxe: $(top)/$(DOTCONFIG) payloads/external/iPXE/ipxe/ipxe.rom ipxe: $(DOTCONFIG)
$(MAKE) -C payloads/external/iPXE all \ $(MAKE) -C payloads/external/iPXE all \
CROSS_COMPILE="$(CROSS_COMPILE_$(ARCH-ramstage-y))" \ CROSS_COMPILE="$(CROSS_COMPILE_$(ARCH-ramstage-y))" \
PXE_ROM_PCI_ID=$(PXE_ROM_PCI_ID) \ PXE_ROM_PCI_ID=$(PXE_ROM_PCI_ID) \