From c520385a398b74fe1e126e068419653e7e8d9675 Mon Sep 17 00:00:00 2001 From: Ioannis Glaropoulos Date: Mon, 7 Dec 2020 18:42:52 +0100 Subject: [PATCH] Kconfig.zephyr: allow override default values in module Kconfig files Allow Kconfig to override default values of Kconfig symbols defined in modules' Kconfig files. For that, the .defonfig files need to be source'd before the modules' Kconfig files. Signed-off-by: Ioannis Glaropoulos --- Kconfig.zephyr | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Kconfig.zephyr b/Kconfig.zephyr index 8f646446be0..2f5093bed4d 100644 --- a/Kconfig.zephyr +++ b/Kconfig.zephyr @@ -4,12 +4,6 @@ # Copyright (c) 2016 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -menu "Modules" - -source "$(KCONFIG_BINARY_DIR)/Kconfig.modules" -source "modules/Kconfig" - -endmenu # Include Kconfig.defconfig files first so that they can override defaults and # other symbol/choice properties by adding extra symbol/choice definitions. @@ -24,6 +18,13 @@ source "$(KCONFIG_BINARY_DIR)/Kconfig.shield.defconfig" source "$(BOARD_DIR)/Kconfig.defconfig" source "$(KCONFIG_BINARY_DIR)/Kconfig.soc.defconfig" +menu "Modules" + +source "$(KCONFIG_BINARY_DIR)/Kconfig.modules" +source "modules/Kconfig" + +endmenu + source "boards/Kconfig" source "soc/Kconfig" source "arch/Kconfig"