diff options
| -rw-r--r-- | mk/image.mk | 1 | ||||
| -rwxr-xr-x | scripts/nsim.sh | 4 | ||||
| -rw-r--r-- | target/config/Config.in.runtime | 2 | ||||
| -rw-r--r-- | target/linux/Config.in.kernelcfg | 2 | ||||
| -rw-r--r-- | target/linux/Config.in.kernelversion | 1 | ||||
| -rw-r--r-- | target/linux/config/Config.in.arc | 2 | ||||
| -rw-r--r-- | target/linux/config/Config.in.serial | 8 |
7 files changed, 12 insertions, 8 deletions
diff --git a/mk/image.mk b/mk/image.mk index 34822895c..85a83ad60 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -247,6 +247,7 @@ ifeq ($(ADK_LINUX_KERNEL_COMP_XZ),y) echo "CONFIG_XZ_DEC_ARMTHUMB=n" >> ${LINUX_DIR}/.config echo "CONFIG_XZ_DEC_SPARC=n" >> ${LINUX_DIR}/.config echo "CONFIG_XZ_DEC_TEST=n" >> ${LINUX_DIR}/.config + echo "CONFIG_XZ_DEC_MICROLZMA=n" >> ${LINUX_DIR}/.config endif ifeq ($(ADK_LINUX_KERNEL_COMP_LZ4),y) echo "CONFIG_RD_XZ=n" >> ${LINUX_DIR}/.config diff --git a/scripts/nsim.sh b/scripts/nsim.sh index 04877b9e1..acd9ad272 100755 --- a/scripts/nsim.sh +++ b/scripts/nsim.sh @@ -12,11 +12,11 @@ if [ "$arch" = "arcv1" ]; then nsimdrv -prop=nsim_isa_family=a700 -prop=nsim_isa_atomic_option=1 -prop=nsim_mmu=3 -prop=icache=32768,64,2,0 -prop=dcache=32768,64,4,0 -prop=nsim_isa_dpfp=none -prop=nsim_isa_shift_option=2 -prop=nsim_isa_swap_option=1 -prop=nsim_isa_bitscan_option=1 -prop=nsim_isa_sat=1 -prop=nsim_isa_mpy32=1 -prop=nsim_isa_enable_timer_0=1 -prop=nsim_isa_enable_timer_1=1 -prop=nsim_mem-dev=uart0 $kernel fi if [ "$arch" = "arcv2" ]; then - nsimdrv -prop=nsim_isa_family=av2hs -prop=nsim_isa_core=1 -prop=chipid=0xffff -prop=nsim_isa_atomic_option=1 -prop=nsim_isa_ll64_option=1 -prop=nsim_mmu=4 -prop=mmu_pagesize=8192 -prop=mmu_super_pagesize=2097152 -prop=mmu_stlb_entries=16 -prop=mmu_ntlb_ways=4 -prop=mmu_ntlb_sets=128 -prop=icache=32768,64,4,0 -prop=dcache=16384,64,2,0 -prop=nsim_isa_shift_option=2 -prop=nsim_isa_swap_option=1 -prop=nsim_isa_bitscan_option=1 -prop=nsim_isa_sat=1 -prop=nsim_isa_div_rem_option=1 -prop=nsim_isa_mpy_option=9 -prop=nsim_isa_enable_timer_0=1 -prop=nsim_isa_enable_timer_1=1 -prop=nsim_isa_number_of_interrupts=32 -prop=nsim_isa_number_of_external_interrupts=32 -prop=isa_counters=1 -prop=nsim_isa_pct_counters=8 -prop=nsim_isa_pct_size=48 -prop=nsim_isa_pct_interrupt=0 -prop=nsim_mem-dev=uart0,base=0xc0fc1000,irq=24 -prop=nsim_isa_aps_feature=1 -prop=nsim_isa_num_actionpoints=4 $kernel + nsimdrv -prop=nsim_isa_family=av2hs -prop=nsim_isa_core=1 -prop=chipid=0xffff -prop=nsim_isa_atomic_option=1 -prop=nsim_isa_ll64_option=1 -prop=nsim_mmu=4 -prop=mmu_pagesize=8192 -prop=mmu_super_pagesize=2097152 -prop=mmu_stlb_entries=16 -prop=mmu_ntlb_ways=4 -prop=mmu_ntlb_sets=128 -prop=icache=32768,64,4,0 -prop=dcache=16384,64,2,0 -prop=nsim_isa_shift_option=2 -prop=nsim_isa_swap_option=1 -prop=nsim_isa_bitscan_option=1 -prop=nsim_isa_sat=1 -prop=nsim_isa_div_rem_option=1 -prop=nsim_isa_mpy_option=9 -prop=nsim_isa_enable_timer_0=1 -prop=nsim_isa_enable_timer_1=1 -prop=nsim_isa_number_of_interrupts=32 -prop=nsim_isa_number_of_external_interrupts=32 -prop=isa_counters=1 -prop=nsim_isa_pct_counters=8 -prop=nsim_isa_pct_size=48 -prop=nsim_isa_pct_interrupt=0 -prop=nsim_mem-dev=uart0,kind=dwuart,base=0xf0000000,irq=24 -prop=nsim_isa_aps_feature=1 -prop=nsim_isa_num_actionpoints=4 $kernel fi if [ "$arch" = "arcv1-be" ]; then nsimdrv -prop=nsim_isa_big_endian=1 -prop=nsim_isa_family=a700 -prop=nsim_isa_atomic_option=1 -prop=nsim_mmu=3 -prop=icache=32768,64,2,0 -prop=dcache=32768,64,4,0 -prop=nsim_isa_dpfp=none -prop=nsim_isa_shift_option=2 -prop=nsim_isa_swap_option=1 -prop=nsim_isa_bitscan_option=1 -prop=nsim_isa_sat=1 -prop=nsim_isa_mpy32=1 -prop=nsim_isa_enable_timer_0=1 -prop=nsim_isa_enable_timer_1=1 -prop=nsim_mem-dev=uart0 $kernel fi if [ "$arch" = "arcv2-be" ]; then - nsimdrv -prop=nsim_isa_big_endian=1 -prop=nsim_isa_family=av2hs -prop=nsim_isa_core=1 -prop=chipid=0xffff -prop=nsim_isa_atomic_option=1 -prop=nsim_isa_ll64_option=1 -prop=nsim_mmu=4 -prop=mmu_pagesize=8192 -prop=mmu_super_pagesize=2097152 -prop=mmu_stlb_entries=16 -prop=mmu_ntlb_ways=4 -prop=mmu_ntlb_sets=128 -prop=icache=32768,64,4,0 -prop=dcache=16384,64,2,0 -prop=nsim_isa_shift_option=2 -prop=nsim_isa_swap_option=1 -prop=nsim_isa_bitscan_option=1 -prop=nsim_isa_sat=1 -prop=nsim_isa_div_rem_option=1 -prop=nsim_isa_mpy_option=9 -prop=nsim_isa_enable_timer_0=1 -prop=nsim_isa_enable_timer_1=1 -prop=nsim_isa_number_of_interrupts=32 -prop=nsim_isa_number_of_external_interrupts=32 -prop=isa_counters=1 -prop=nsim_isa_pct_counters=8 -prop=nsim_isa_pct_size=48 -prop=nsim_isa_pct_interrupt=0 -prop=nsim_mem-dev=uart0,base=0xc0fc1000,irq=24 -prop=nsim_isa_aps_feature=1 -prop=nsim_isa_num_actionpoints=4 $kernel + nsimdrv -prop=nsim_isa_big_endian=1 -prop=nsim_isa_family=av2hs -prop=nsim_isa_core=1 -prop=chipid=0xffff -prop=nsim_isa_atomic_option=1 -prop=nsim_isa_ll64_option=1 -prop=nsim_mmu=4 -prop=mmu_pagesize=8192 -prop=mmu_super_pagesize=2097152 -prop=mmu_stlb_entries=16 -prop=mmu_ntlb_ways=4 -prop=mmu_ntlb_sets=128 -prop=icache=32768,64,4,0 -prop=dcache=16384,64,2,0 -prop=nsim_isa_shift_option=2 -prop=nsim_isa_swap_option=1 -prop=nsim_isa_bitscan_option=1 -prop=nsim_isa_sat=1 -prop=nsim_isa_div_rem_option=1 -prop=nsim_isa_mpy_option=9 -prop=nsim_isa_enable_timer_0=1 -prop=nsim_isa_enable_timer_1=1 -prop=nsim_isa_number_of_interrupts=32 -prop=nsim_isa_number_of_external_interrupts=32 -prop=isa_counters=1 -prop=nsim_isa_pct_counters=8 -prop=nsim_isa_pct_size=48 -prop=nsim_isa_pct_interrupt=0 -prop=nsim_mem-dev=uart0,kind=dwuart,base=0xf0000000,irq=24 -prop=nsim_isa_aps_feature=1 -prop=nsim_isa_num_actionpoints=4 $kernel fi diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index 0ca806995..1564c3b3a 100644 --- a/target/config/Config.in.runtime +++ b/target/config/Config.in.runtime @@ -354,7 +354,7 @@ config ADK_RUNTIME_CONSOLE_SERIAL_DEVICE || 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 "ttyARC0" if ADK_TARGET_SYSTEM_SYNOPSYS_NSIM && ADK_TARGET_CPU_ARC_ARC700 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/linux/Config.in.kernelcfg b/target/linux/Config.in.kernelcfg index 7e04336a8..171e11c0a 100644 --- a/target/linux/Config.in.kernelcfg +++ b/target/linux/Config.in.kernelcfg @@ -36,7 +36,7 @@ config ADK_TARGET_LINUX_KERNEL_DEFCONFIG 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_CPU_ARC_ARC700 && ADK_TARGET_SYSTEM_SYNOPSYS_NSIM - default "nsim_hs_defconfig" if ADK_TARGET_CPU_ARC_ARCHS && ADK_TARGET_SYSTEM_SYNOPSYS_NSIM + default "haps_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/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion index 5f05f0e18..40d1cc61c 100644 --- a/target/linux/Config.in.kernelversion +++ b/target/linux/Config.in.kernelversion @@ -20,7 +20,6 @@ default ADK_TARGET_LINUX_KERNEL_VERSION_4_9 if ADK_TARGET_ARCH_FRV default ADK_TARGET_LINUX_KERNEL_VERSION_4_9 if ADK_TARGET_SYSTEM_ST_STM32F429 default ADK_TARGET_LINUX_KERNEL_VERSION_4_9 if ADK_TARGET_SYSTEM_ST_STM32F769 default ADK_TARGET_LINUX_KERNEL_VERSION_4_9 if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB -default ADK_TARGET_LINUX_KERNEL_VERSION_4_19 if ADK_TARGET_ARCH_ARC default ADK_TARGET_LINUX_KERNEL_VERSION_5_4 if ADK_TARGET_ARCH_C6X default ADK_TARGET_LINUX_KERNEL_VERSION_5_15 diff --git a/target/linux/config/Config.in.arc b/target/linux/config/Config.in.arc index ead549b73..4edd670d0 100644 --- a/target/linux/config/Config.in.arc +++ b/target/linux/config/Config.in.arc @@ -20,7 +20,7 @@ config ADK_LINUX_KERNEL_ARC_BUILTIN_DTB_NAME string depends on ADK_TARGET_ARCH_ARC default "hsdk" if ADK_TARGET_CPU_ARC_ARCHS && ADK_TARGET_SYSTEM_SYNOPSYS_HSDK - default "nsim_hs" if ADK_TARGET_CPU_ARC_ARCHS && ADK_TARGET_SYSTEM_SYNOPSYS_NSIM + default "haps_hs" if ADK_TARGET_CPU_ARC_ARCHS && ADK_TARGET_SYSTEM_SYNOPSYS_NSIM default "nsim_700" if ADK_TARGET_CPU_ARC_ARC700 && ADK_TARGET_SYSTEM_SYNOPSYS_NSIM diff --git a/target/linux/config/Config.in.serial b/target/linux/config/Config.in.serial index d9f904184..e23b040e1 100644 --- a/target/linux/config/Config.in.serial +++ b/target/linux/config/Config.in.serial @@ -90,6 +90,8 @@ config ADK_LINUX_KERNEL_SERIAL_BFIN config ADK_LINUX_KERNEL_SERIAL_8250 bool "8250 serial driver" select ADK_LINUX_KERNEL_SERIAL_8250_CONSOLE + select ADK_LINUX_KERNEL_SERIAL_OF_PLATFORM if ADK_TARGET_CPU_ARC_ARCHS && ADK_TARGET_SYSTEM_SYNOPSYS_NSIM + select ADK_LINUX_KERNEL_SERIAL_8250_DW if ADK_TARGET_CPU_ARC_ARCHS && ADK_TARGET_SYSTEM_SYNOPSYS_NSIM select ADK_LINUX_KERNEL_SERIAL_OF_PLATFORM if ADK_TARGET_SYSTEM_XILINX_KINTEX7 \ || ADK_TARGET_SYSTEM_IMGTEC_CI20 \ || ADK_TARGET_SYSTEM_QEMU_CSKY \ @@ -140,6 +142,7 @@ config ADK_LINUX_KERNEL_SERIAL_8250 || ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG \ || ADK_TARGET_SYSTEM_ORANGE_PI0 \ || ADK_TARGET_SYSTEM_SYNOPSYS_HSDK \ + || ADK_TARGET_CPU_ARC_ARCHS \ || ADK_TARGET_SYSTEM_SOM_C6745 \ || ADK_TARGET_SYSTEM_ROCKPI4_PLUS default y if ADK_TARGET_SYSTEM_XILINX_KINTEX7 @@ -171,6 +174,7 @@ config ADK_LINUX_KERNEL_SERIAL_8250 default y if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG default y if ADK_TARGET_SYSTEM_ORANGE_PI0 default y if ADK_TARGET_SYSTEM_SYNOPSYS_HSDK + default y if ADK_TARGET_CPU_ARC_ARCHS default y if ADK_TARGET_SYSTEM_SOM_C6745 default y if ADK_TARGET_SYSTEM_ROCKPI4_PLUS default n @@ -208,8 +212,8 @@ config ADK_LINUX_KERNEL_SERIAL_ETRAXFS config ADK_LINUX_KERNEL_SERIAL_ARC bool "ARC serial driver" select ADK_LINUX_KERNEL_SERIAL_ARC_CONSOLE - depends on ADK_TARGET_SYSTEM_SYNOPSYS_NSIM - default y if ADK_TARGET_SYSTEM_SYNOPSYS_NSIM + depends on ADK_TARGET_SYSTEM_SYNOPSYS_NSIM && ADK_TARGET_CPU_ARC_ARC700 + default y if ADK_TARGET_SYSTEM_SYNOPSYS_NSIM && ADK_TARGET_CPU_ARC_ARC700 default n help Serial driver for nSIM ARC simulator. |