Skip to content

Commit

Permalink
serial: nsim: Fix impossible-to-enable CONFIG_UART_NSIM
Browse files Browse the repository at this point in the history
CONFIG_UART_NSIM depends on CONFIG_NSIM, which was removed in commit
9bc69a4 ("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 <Ulf.Magnusson@nordicsemi.no>
  • Loading branch information
ulfalizer authored and nashif committed May 24, 2018
1 parent a85c546 commit 45221a9
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion drivers/serial/Kconfig.nsim
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion include/arch/arc/v2/linker.ld
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include <autoconf.h>
#include <linker/sections.h>

#if defined(CONFIG_NSIM)
#if defined(CONFIG_UART_NSIM)
EXTERN(_VectorTable)
#endif

Expand Down
1 change: 0 additions & 1 deletion tests/drivers/build_all/testcase.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 45221a9

Please sign in to comment.