Define a missing CONFIG_SYS_SOC and move some CONFIG_SYS_* to a more canonical place (i.e. under board).
Signed-off-by: AKASHI Takahiro takahiro.akashi@linaro.org --- arch/arm/mach-qemu/Kconfig | 18 ++++++++++-------- board/emulation/qemu-arm/Kconfig | 6 ++++++ 2 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/arch/arm/mach-qemu/Kconfig b/arch/arm/mach-qemu/Kconfig index a2e4b98b8887..d75a95183a75 100644 --- a/arch/arm/mach-qemu/Kconfig +++ b/arch/arm/mach-qemu/Kconfig @@ -3,22 +3,24 @@ if ARCH_QEMU config SYS_VENDOR default "emulation"
-config SYS_BOARD - default "qemu-arm" +config SYS_SOC + default "qemu"
-config SYS_CONFIG_NAME - default "qemu-arm" - -endif +choice + prompt "QEMU cpu type"
config TARGET_QEMU_ARM_32BIT - bool "Support qemu_arm" + bool "Arm" depends on ARCH_QEMU select ARCH_SUPPORT_PSCI select CPU_V7A select SYS_ARCH_TIMER
config TARGET_QEMU_ARM_64BIT - bool "Support qemu_arm64" + bool "AArch64" depends on ARCH_QEMU select ARM64 + +endchoice + +endif diff --git a/board/emulation/qemu-arm/Kconfig b/board/emulation/qemu-arm/Kconfig index d1c08c2f6a80..ef49e4e85f04 100644 --- a/board/emulation/qemu-arm/Kconfig +++ b/board/emulation/qemu-arm/Kconfig @@ -1,5 +1,11 @@ if TARGET_QEMU_ARM_32BIT || TARGET_QEMU_ARM_64BIT
+config SYS_BOARD + default "qemu-arm" + +config SYS_CONFIG_NAME + default "qemu-arm" + config SYS_TEXT_BASE default 0x00000000