Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41e0254d authored by Kevin Hilman's avatar Kevin Hilman Committed by Greg Kroah-Hartman
Browse files

ARC: change defconfig defaults to ARCv2 



commit b7cc40c32a8bfa6f2581a71747f6a7d491fe43ba upstream.

Change the default defconfig (used with 'make defconfig') to the ARCv2
nsim_hs_defconfig, and also switch the default Kconfig ISA selection to
ARCv2.

This allows several default defconfigs (e.g. make defconfig, make
allnoconfig, make tinyconfig) to all work with ARCv2 by default.

Note since we change default architecture from ARCompact to ARCv2
it's required to explicitly mention architecture type in ARCompact
defconfigs otherwise ARCv2 will be implied and binaries will be
generated for ARCv2.

Cc: <stable@vger.kernel.org> # 4.4.x
Signed-off-by: default avatarKevin Hilman <khilman@baylibre.com>
Signed-off-by: default avatarAlexey Brodkin <abrodkin@synopsys.com>
Signed-off-by: default avatarVineet Gupta <vgupta@synopsys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b0234f15

arch/arc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ endmenu 


choice

	prompt "ARC Instruction Set"

	default ISA_ARCOMPACT

	default ISA_ARCV2



config ISA_ARCOMPACT

	bool "ARCompact ISA"

arch/arc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
# published by the Free Software Foundation.

#



KBUILD_DEFCONFIG := nsim_700_defconfig

KBUILD_DEFCONFIG := nsim_hs_defconfig



cflags-y	+= -fno-common -pipe -fno-builtin -mmedium-calls -D__linux__

cflags-$(CONFIG_ISA_ARCOMPACT)	+= -mA7

arch/arc/configs/axs101_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ CONFIG_PERF_EVENTS=y 
# CONFIG_VM_EVENT_COUNTERS is not set

# CONFIG_SLUB_DEBUG is not set

# CONFIG_COMPAT_BRK is not set

CONFIG_ISA_ARCOMPACT=y

CONFIG_MODULES=y

CONFIG_MODULE_FORCE_LOAD=y

CONFIG_MODULE_UNLOAD=y

arch/arc/configs/nps_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ CONFIG_SYSCTL_SYSCALL=y 
CONFIG_EMBEDDED=y

CONFIG_PERF_EVENTS=y

# CONFIG_COMPAT_BRK is not set

CONFIG_ISA_ARCOMPACT=y

CONFIG_KPROBES=y

CONFIG_MODULES=y

CONFIG_MODULE_FORCE_LOAD=y

arch/arc/configs/nsim_700_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ CONFIG_EMBEDDED=y 
CONFIG_PERF_EVENTS=y

# CONFIG_SLUB_DEBUG is not set

# CONFIG_COMPAT_BRK is not set

CONFIG_ISA_ARCOMPACT=y

CONFIG_KPROBES=y

CONFIG_MODULES=y

# CONFIG_LBDAF is not set