summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2018-06-24 16:46:15 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2018-06-24 16:46:15 (GMT)
commite2341adc6a5ac1e48504c05610cbca2e29f56661 (patch)
treea765783159a9455d78898594976d8135d29ad207
parenta392f73234fcf6e7875797f6830478b581cd4a3a (diff)
arc: more symbol rename fixes
-rw-r--r--target/config/Config.in.runtime3
-rw-r--r--target/waldux/Config.in.kernelcfg4
-rw-r--r--target/waldux/config/Config.in.serial6
3 files changed, 5 insertions, 8 deletions
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index 6a60ca7..6d5a460 100644
--- a/target/config/Config.in.runtime
+++ b/target/config/Config.in.runtime
@@ -378,12 +378,11 @@ config ADK_RUNTIME_CONSOLE_SERIAL_DEVICE
default "ttyBF0" if ADK_TARGET_ARCH_BFIN
default "ttyUL0" if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800 \
|| ADK_TARGET_SYSTEM_NUMATO_MIMASV2
- default "ttyARC0" if ADK_TARGET_SYSTEM_NSIM_ARCV1 \
- || ADK_TARGET_SYSTEM_NSIM_ARCV2
default "ttyAMA0" if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB \
|| ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE \
|| ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9 \
|| ADK_TARGET_SYSTEM_QEMU_AARCH64
+ default "ttyARC0" if ADK_TARGET_SYSTEM_SYNOPSYS_NSIM
default "ttySC1" if ADK_TARGET_SYSTEM_QEMU_SH
default "ttySC0" if ADK_TARGET_SYSTEM_SIM_H8300H
default "ttySC2" if ADK_TARGET_SYSTEM_HITACHI_EDOSK2674
diff --git a/target/waldux/Config.in.kernelcfg b/target/waldux/Config.in.kernelcfg
index dbcbf7a..48d0982 100644
--- a/target/waldux/Config.in.kernelcfg
+++ b/target/waldux/Config.in.kernelcfg
@@ -29,8 +29,8 @@ config ADK_TARGET_WALDUX_KERNEL_DEFCONFIG
default "twr-k70f120m_defconfig" if ADK_TARGET_SYSTEM_KINETIS_K70
default "imx_v6_v7_defconfig" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
default "mvebu_defconfig" if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG
- default "nsim_700_defconfig" if ADK_TARGET_SYSTEM_NSIM_ARCV1
- default "nsim_hs_defconfig" if ADK_TARGET_SYSTEM_NSIM_ARCV2
+ default "nsim_700_defconfig" if ADK_TARGET_CPU_ARC_ARC700 && ADK_TARGET_SYSTEM_SYNOPSYS_NSIM
+ default "nsim_hs_defconfig" if ADK_TARGET_CPU_ARC_ARCHS && ADK_TARGET_SYSTEM_SYNOPSYS_NSIM
default "10m50_defconfig" if ADK_TARGET_SYSTEM_QEMU_NIOS2
default "ag101p_defconfig" if ADK_TARGET_SYSTEM_ANDES_AG101P
default "bb.org_defconfig" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
diff --git a/target/waldux/config/Config.in.serial b/target/waldux/config/Config.in.serial
index 8ab2148..8534a19 100644
--- a/target/waldux/config/Config.in.serial
+++ b/target/waldux/config/Config.in.serial
@@ -203,10 +203,8 @@ config ADK_WALDUX_KERNEL_SERIAL_ETRAXFS
config ADK_WALDUX_KERNEL_SERIAL_ARC
bool "ARC serial driver"
select ADK_WALDUX_KERNEL_SERIAL_ARC_CONSOLE
- depends on ADK_TARGET_SYSTEM_NSIM_ARCV1 \
- || ADK_TARGET_SYSTEM_NSIM_ARCV2
- default y if ADK_TARGET_SYSTEM_NSIM_ARCV1
- default y if ADK_TARGET_SYSTEM_NSIM_ARCV2
+ depends on ADK_TARGET_SYSTEM_SYNOPSYS_NSIM
+ default y if ADK_TARGET_SYSTEM_SYNOPSYS_NSIM
default n
help
Serial driver for nSIM ARC simulator.