From 45221a97064d2735a63a9375e56e5d2f863bdb67 Mon Sep 17 00:00:00 2001 From: Ulf Magnusson Date: Thu, 24 May 2018 13:28:10 +0200 Subject: [PATCH] serial: nsim: Fix impossible-to-enable CONFIG_UART_NSIM CONFIG_UART_NSIM depends on CONFIG_NSIM, which was removed in commit 9bc69a46fa09 ("boards: Update arc em_starterkit support from 2.2 to 2.3"). Remove the dependency, and also remove the CONFIG_NSIM=y setting from the test_nsim test (which should now work). Also change the condition for EXTERN()ing _VectorTable in include/arch/arc/v2/linker.ld to check CONFIG_UART_NSIM instead of CONFIG_NSIM. I'm guessing the EXTERN() is there to make the symbol visible to nSIM, though I don't know anything about it. Signed-off-by: Ulf Magnusson --- drivers/serial/Kconfig.nsim | 2 +- include/arch/arc/v2/linker.ld | 2 +- tests/drivers/build_all/testcase.yaml | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/serial/Kconfig.nsim b/drivers/serial/Kconfig.nsim index 1a9dec32559..936331cad66 100644 --- a/drivers/serial/Kconfig.nsim +++ b/drivers/serial/Kconfig.nsim @@ -2,7 +2,7 @@ config UART_NSIM bool "UART driver for MetaWare nSim" default n select SERIAL_HAS_DRIVER - depends on NSIM && SERIAL + depends on SERIAL help This enables the UART driver for the MetaWare nSim simulator. diff --git a/include/arch/arc/v2/linker.ld b/include/arch/arc/v2/linker.ld index 09333a45316..ff00f865961 100644 --- a/include/arch/arc/v2/linker.ld +++ b/include/arch/arc/v2/linker.ld @@ -14,7 +14,7 @@ #include #include -#if defined(CONFIG_NSIM) +#if defined(CONFIG_UART_NSIM) EXTERN(_VectorTable) #endif diff --git a/tests/drivers/build_all/testcase.yaml b/tests/drivers/build_all/testcase.yaml index 9fa4aa4bc73..bd184f1900e 100644 --- a/tests/drivers/build_all/testcase.yaml +++ b/tests/drivers/build_all/testcase.yaml @@ -43,7 +43,6 @@ tests: build_only: true platform_whitelist: em_starterkit extra_configs: - - CONFIG_NSIM=y - CONFIG_UART_NSIM=y test_clock: build_only: true