arm: qemu: rework Kconfig

Message ID 20181019085734.18067-1-takahiro.akashi@linaro.org
State New
Headers show
Series
  • arm: qemu: rework Kconfig
Related show

Commit Message

AKASHI Takahiro Oct. 19, 2018, 8:57 a.m.
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/Kconfig                 |  1 +
 arch/arm/mach-qemu/Kconfig       | 18 ++++++++++--------
 board/emulation/qemu-arm/Kconfig |  9 +++++++++
 3 files changed, 20 insertions(+), 8 deletions(-)
 create mode 100644 board/emulation/qemu-arm/Kconfig

Comments

Bin Meng Oct. 19, 2018, 10:16 a.m. | #1
Hi,

On Fri, Oct 19, 2018 at 4:55 PM AKASHI Takahiro
<takahiro.akashi@linaro.org> wrote:
>
> 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/Kconfig                 |  1 +
>  arch/arm/mach-qemu/Kconfig       | 18 ++++++++++--------
>  board/emulation/qemu-arm/Kconfig |  9 +++++++++
>  3 files changed, 20 insertions(+), 8 deletions(-)
>  create mode 100644 board/emulation/qemu-arm/Kconfig
>

Please rebase your changes on top of http://patchwork.ozlabs.org/patch/984021/

Regards,
Bin
AKASHI Takahiro Oct. 22, 2018, 4:37 a.m. | #2
On Fri, Oct 19, 2018 at 06:16:30PM +0800, Bin Meng wrote:
> Hi,
> 
> On Fri, Oct 19, 2018 at 4:55 PM AKASHI Takahiro
> <takahiro.akashi@linaro.org> wrote:
> >
> > 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/Kconfig                 |  1 +
> >  arch/arm/mach-qemu/Kconfig       | 18 ++++++++++--------
> >  board/emulation/qemu-arm/Kconfig |  9 +++++++++
> >  3 files changed, 20 insertions(+), 8 deletions(-)
> >  create mode 100644 board/emulation/qemu-arm/Kconfig
> >
> 
> Please rebase your changes on top of http://patchwork.ozlabs.org/patch/984021/

OK, but has this patch already acked?
Anyway, I will include this patch in my patch set of "efi_loader: improve
boot sequence in distro_bootcmd."

Thanks,
-Takahiro Akashi


> Regards,
> Bin
Bin Meng Oct. 22, 2018, 5:05 a.m. | #3
Hi Takahiro,

On Mon, Oct 22, 2018 at 12:35 PM AKASHI Takahiro
<takahiro.akashi@linaro.org> wrote:
>
> On Fri, Oct 19, 2018 at 06:16:30PM +0800, Bin Meng wrote:
> > Hi,
> >
> > On Fri, Oct 19, 2018 at 4:55 PM AKASHI Takahiro
> > <takahiro.akashi@linaro.org> wrote:
> > >
> > > 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/Kconfig                 |  1 +
> > >  arch/arm/mach-qemu/Kconfig       | 18 ++++++++++--------
> > >  board/emulation/qemu-arm/Kconfig |  9 +++++++++
> > >  3 files changed, 20 insertions(+), 8 deletions(-)
> > >  create mode 100644 board/emulation/qemu-arm/Kconfig
> > >
> >
> > Please rebase your changes on top of http://patchwork.ozlabs.org/patch/984021/
>
> OK, but has this patch already acked?

Yes, it's in Simon's DM tree (guess it targets to next release)

> Anyway, I will include this patch in my patch set of "efi_loader: improve
> boot sequence in distro_bootcmd."
>

Regards,
Bin

Patch

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index b39d08539aee..6dadf5a56f0c 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1474,6 +1474,7 @@  source "board/broadcom/bcmns2/Kconfig"
 source "board/cavium/thunderx/Kconfig"
 source "board/cirrus/edb93xx/Kconfig"
 source "board/eets/pdu001/Kconfig"
+source "board/emulation/qemu-arm/Kconfig"
 source "board/freescale/ls2080a/Kconfig"
 source "board/freescale/ls2080aqds/Kconfig"
 source "board/freescale/ls2080ardb/Kconfig"
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
new file mode 100644
index 000000000000..db8b2a4dfae2
--- /dev/null
+++ b/board/emulation/qemu-arm/Kconfig
@@ -0,0 +1,9 @@ 
+if TARGET_QEMU_ARM_32BIT || TARGET_QEMU_ARM_64BIT
+
+config SYS_BOARD
+	default "qemu-arm"
+
+config SYS_CONFIG_NAME
+	default "qemu-arm"
+
+endif