From 4a2b227bcc23b5858a12225eb824bb0120e2956c Mon Sep 17 00:00:00 2001 From: Andrei Emeltchenko Date: Fri, 18 Aug 2023 13:55:07 +0300 Subject: [PATCH] boards: intel_adl: Move ACPI specific configuration to Kconfig Move ACPI specific configuration to Kconfig.defconfig from the board defconfigs. (cherry picked from commit 192fa65a8ed775d4dbfce5ab79c9f6e6e89eb929) Original-Signed-off-by: Andrei Emeltchenko GitOrigin-RevId: 192fa65a8ed775d4dbfce5ab79c9f6e6e89eb929 Change-Id: I5201aa292866900db231d1307015e89f9a2b9332 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/zephyr/+/4797702 Commit-Queue: Fabio Baltieri Tested-by: ChromeOS Prod (Robot) Tested-by: Fabio Baltieri Reviewed-by: Fabio Baltieri --- boards/x86/intel_adl/Kconfig.defconfig | 12 ++++++++++++ boards/x86/intel_adl/intel_adl_crb_defconfig | 2 -- boards/x86/intel_adl/intel_adl_rvp_defconfig | 2 -- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/boards/x86/intel_adl/Kconfig.defconfig b/boards/x86/intel_adl/Kconfig.defconfig index 39ef7ac9a9a..0bc114e4693 100644 --- a/boards/x86/intel_adl/Kconfig.defconfig +++ b/boards/x86/intel_adl/Kconfig.defconfig @@ -31,6 +31,18 @@ endif config ACPI default y +if ACPI +config HEAP_MEM_POOL_SIZE + default 64000000 +config MAIN_STACK_SIZE + default 320000 + +if SHELL +config SHELL_STACK_SIZE + default 320000 +endif # SHELL +endif # ACPI + endif # BOARD_INTEL_ADL_CRB || BOARD_INTEL_ADL_RVP if BOARD_INTEL_ADL_RVP diff --git a/boards/x86/intel_adl/intel_adl_crb_defconfig b/boards/x86/intel_adl/intel_adl_crb_defconfig index 767f5e5e84b..c2c1a37850d 100644 --- a/boards/x86/intel_adl/intel_adl_crb_defconfig +++ b/boards/x86/intel_adl/intel_adl_crb_defconfig @@ -12,6 +12,4 @@ CONFIG_X2APIC=y CONFIG_SMP=y CONFIG_BUILD_OUTPUT_EFI=y CONFIG_BUILD_NO_GAP_FILL=y -CONFIG_HEAP_MEM_POOL_SIZE=64000000 -CONFIG_MAIN_STACK_SIZE=320000 CONFIG_UART_NS16550_PARENT_INIT_LEVEL=y diff --git a/boards/x86/intel_adl/intel_adl_rvp_defconfig b/boards/x86/intel_adl/intel_adl_rvp_defconfig index 490b390f356..41260a3b233 100644 --- a/boards/x86/intel_adl/intel_adl_rvp_defconfig +++ b/boards/x86/intel_adl/intel_adl_rvp_defconfig @@ -12,6 +12,4 @@ CONFIG_X2APIC=y CONFIG_SMP=y CONFIG_BUILD_OUTPUT_EFI=y CONFIG_BUILD_NO_GAP_FILL=y -CONFIG_HEAP_MEM_POOL_SIZE=64000000 -CONFIG_MAIN_STACK_SIZE=320000 CONFIG_UART_NS16550_PARENT_INIT_LEVEL=y