From e2341adc6a5ac1e48504c05610cbca2e29f56661 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 24 Jun 2018 18:46:15 +0200 Subject: arc: more symbol rename fixes --- target/config/Config.in.runtime | 3 +-- target/waldux/Config.in.kernelcfg | 4 ++-- target/waldux/config/Config.in.serial | 6 ++---- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index 6a60ca7c9..6d5a460ab 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 dbcbf7a66..48d098254 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 8ab2148fa..8534a19be 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. -- cgit v1.2.3