Skip to content

Commit

Permalink
Configure with Trusty config fragment if Trusty is enabled
Browse files Browse the repository at this point in the history
  • Loading branch information
Gulshan Singh authored and gsingh93 committed Apr 9, 2024
1 parent 234dfce commit 112f824
Showing 1 changed file with 13 additions and 3 deletions.
16 changes: 13 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,11 @@ LINUX_OUT_MODULES_DEP := $(LINUX_OUT)/modules_install.stamp
LINUX_MODULES_INSTALL_PATH := $(LINUX_OUT)/modules_install
LINUX_CONFIG := $(LINUX_OUT)/.config

LINUX_CONFIG_FRAGMENTS := $(LINUX_CONFIG_FRAGMENT)
ifeq ($(TRUSTY),1)
LINUX_CONFIG_FRAGMENTS += $(TRUSTY_LINUX_CONFIG_FRAGMENT)
endif

ifeq ($(ARCH),x86_64)
TARGET := x86_64-pc-linux-gnu
KERNEL_IMAGE := $(LINUX_OUT)/arch/$(ARCH)/boot/bzImage
Expand Down Expand Up @@ -194,9 +199,14 @@ linux_defconfig $(LINUX_CONFIG): $(LINUX_CONFIG_FRAGMENT) | $(CLANG_DIR)
$(LINUX_SRC)/scripts/kconfig/merge_config.sh \
-m \
$(LINUX_CONFIG) \
$(LINUX_CONFIG_FRAGMENT)
+ $(LINUX_MAKE) olddefconfig
$(SCRIPT_DIR)/check_merged_config.sh $(LINUX_CONFIG) $(LINUX_CONFIG_FRAGMENT)
$(LINUX_CONFIG_FRAGMENTS)

+ $(LINUX_MAKE) olddefconfig

for fragment in $(LINUX_CONFIG_FRAGMENTS); do \
$(SCRIPT_DIR)/check_merged_config.sh $(LINUX_CONFIG) $$fragment ; \
done


.PHONY: linux_menuconfig
linux_menuconfig:
Expand Down

0 comments on commit 112f824

Please sign in to comment.