shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 11:50:43 +09:00
Code Issues Packages Projects Releases Wiki Activity

Kconfig: fix errorly select meson8b for ARMv8 AARCH32 [1/1]

Browse Source 
PD#SWPL-4320

Problem:
The meson8b and arm64_a32 are both selected in Kconfig,
which is quite misleading

Solution:
Disable meson8b when arm64_a32 is selected

Verify:
Locally passed for Ampere

Change-Id: I93f55239ea90bf8cf6b96e108b6fd4a239de32b4
Signed-off-by: Jiamin Ma <jiamin.ma@amlogic.com>
This commit is contained in:
Jiamin Ma
2019-01-17 19:42:45 +08:00
committed by Luke Go
parent d93c1770d3
commit c85ded4f0e
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/boot/Makefile
View File

@@ -21,6 +21,10 @@ ifeq ($(CONFIG_MACH_MESON8B),y)
include $(srctree)/arch/arm/mach-meson/Makefile.boot
endif
ifeq ($(CONFIG_ARM64_A32),y)
include $(srctree)/arch/arm/mach-meson/Makefile.boot
endif
include $(srctree)/arch/arm/boot/dts/Makefile
# Note: the following conditions must always be true:

6
arch/arm/mach-meson/Kconfig
View File

@@ -12,17 +12,17 @@ if ARCH_MESON
config MACH_MESON6
bool "Amlogic Meson6 (8726MX) SoCs support"
default ARCH_MESON
default !ARM64_A32
select MESON6_TIMER
config MACH_MESON8
bool "Amlogic Meson8 SoCs support"
default ARCH_MESON
default !ARM64_A32
select MESON6_TIMER
config MACH_MESON8B
bool "Amlogic Meson8b SoCs support"
default ARCH_MESON
default !ARM64_A32
config ARM64_A32
tristate "ARMV8 Run in A32"