diff options
author | José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-04-11 10:41:07 +0300 |
---|---|---|
committer | José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-04-13 08:17:18 +0300 |
commit | e09b41010ba33a20a87472ee821fa407a5b8da36 (patch) | |
tree | d10dc367189862e7ca5c592f033dc3726e1df4e3 /kernel/arch/arc/plat-sim | |
parent | f93b97fd65072de626c074dbe099a1fff05ce060 (diff) |
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
are taken from kernel.org, and rt patch from the rt wiki download page.
During the rebasing, the following patch collided:
Force tick interrupt and get rid of softirq magic(I70131fb85).
Collisions have been removed because its logic was found on the
source already.
Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769
Signed-off-by: José Pekkarinen <jose.pekkarinen@nokia.com>
Diffstat (limited to 'kernel/arch/arc/plat-sim')
-rw-r--r-- | kernel/arch/arc/plat-sim/Kconfig | 14 | ||||
-rw-r--r-- | kernel/arch/arc/plat-sim/Makefile | 9 | ||||
-rw-r--r-- | kernel/arch/arc/plat-sim/platform.c | 32 |
3 files changed, 55 insertions, 0 deletions
diff --git a/kernel/arch/arc/plat-sim/Kconfig b/kernel/arch/arc/plat-sim/Kconfig new file mode 100644 index 000000000..18e39fcc4 --- /dev/null +++ b/kernel/arch/arc/plat-sim/Kconfig @@ -0,0 +1,14 @@ +# +# Copyright (C) 2007-2010, 2011-2012 Synopsys, Inc. (www.synopsys.com) +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation. +# + +menuconfig ARC_PLAT_SIM + bool "ARC nSIM based simulation virtual platforms" + select ARC_HAS_COH_CACHES if SMP + help + Support for nSIM based ARC simulation platforms + This includes the standalone nSIM (uart only) vs. System C OSCI VP diff --git a/kernel/arch/arc/plat-sim/Makefile b/kernel/arch/arc/plat-sim/Makefile new file mode 100644 index 000000000..00b1a958c --- /dev/null +++ b/kernel/arch/arc/plat-sim/Makefile @@ -0,0 +1,9 @@ +# +# Copyright (C) 2011-2012 Synopsys, Inc. (www.synopsys.com) +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation. +# + +obj-y := platform.o diff --git a/kernel/arch/arc/plat-sim/platform.c b/kernel/arch/arc/plat-sim/platform.c new file mode 100644 index 000000000..e4fe51456 --- /dev/null +++ b/kernel/arch/arc/plat-sim/platform.c @@ -0,0 +1,32 @@ +/* + * ARC simulation Platform support code + * + * Copyright (C) 2012 Synopsys, Inc. (www.synopsys.com) + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include <linux/init.h> +#include <asm/mach_desc.h> + +/*----------------------- Machine Descriptions ------------------------------ + * + * Machine description is simply a set of platform/board specific callbacks + * This is not directly related to DeviceTree based dynamic device creation, + * however as part of early device tree scan, we also select the right + * callback set, by matching the DT compatible name. + */ + +static const char *simulation_compat[] __initconst = { + "snps,nsim", + "snps,nsim_hs", + "snps,nsimosci", + "snps,nsimosci_hs", + NULL, +}; + +MACHINE_START(SIMULATION, "simulation") + .dt_compat = simulation_compat, +MACHINE_END |