diff mbox series

[04/13] s390x: select correct components for no-board build

Message ID 20240509170044.190795-5-pbonzini@redhat.com (mailing list archive)
State New, archived
Headers show
Series fix --without-default-devices build and (mostly) tests | expand

Commit Message

Paolo Bonzini May 9, 2024, 5 p.m. UTC 
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 .gitlab-ci.d/buildtest.yml | 4 ++--
 target/s390x/Kconfig       | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

Comments

Thomas Huth May 10, 2024, 5:11 a.m. UTC | #1 
On 09/05/2024 19.00, Paolo Bonzini wrote:
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>   .gitlab-ci.d/buildtest.yml | 4 ++--
>   target/s390x/Kconfig       | 2 ++
>   2 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml
> index 13afd0df1f0..f8502905203 100644
> --- a/.gitlab-ci.d/buildtest.yml
> +++ b/.gitlab-ci.d/buildtest.yml
> @@ -650,7 +650,7 @@ build-tci:
>   # Check our reduced build configurations
>   # requires libfdt: aarch64, arm, i386, loongarch64, microblaze, microblazeel,
>   #   mips64el, or1k, ppc, ppc64, riscv32, riscv64, rx, x86_64
> -# does not build without boards: i386, s390x, x86_64
> +# does not build without boards: i386, x86_64
>   build-without-defaults:
>     extends: .native_build_job_template
>     needs:
> @@ -666,7 +666,7 @@ build-without-defaults:
>         --disable-strip
>       TARGETS: alpha-softmmu avr-softmmu cris-softmmu hppa-softmmu m68k-softmmu
>         mips-softmmu mips64-softmmu mipsel-softmmu
> -      sh4-softmmu sh4eb-softmmu sparc-softmmu
> +      s390x-softmmu sh4-softmmu sh4eb-softmmu sparc-softmmu
>         sparc64-softmmu tricore-softmmu xtensa-softmmu xtensaeb-softmmu
>         hexagon-linux-user i386-linux-user s390x-linux-user
>       MAKE_CHECK_ARGS: check
> diff --git a/target/s390x/Kconfig b/target/s390x/Kconfig
> index 72da48136c6..d886be48b47 100644
> --- a/target/s390x/Kconfig
> +++ b/target/s390x/Kconfig
> @@ -1,2 +1,4 @@
>   config S390X
>       bool
> +    select PCI
> +    select S390_FLIC

Reviewed-by: Thomas Huth <thuth@redhat.com>
diff mbox series

Patch

diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml
index 13afd0df1f0..f8502905203 100644
--- a/.gitlab-ci.d/buildtest.yml
+++ b/.gitlab-ci.d/buildtest.yml
@@ -650,7 +650,7 @@  build-tci:
 # Check our reduced build configurations
 # requires libfdt: aarch64, arm, i386, loongarch64, microblaze, microblazeel,
 #   mips64el, or1k, ppc, ppc64, riscv32, riscv64, rx, x86_64
-# does not build without boards: i386, s390x, x86_64
+# does not build without boards: i386, x86_64
 build-without-defaults:
   extends: .native_build_job_template
   needs:
@@ -666,7 +666,7 @@  build-without-defaults:
       --disable-strip
     TARGETS: alpha-softmmu avr-softmmu cris-softmmu hppa-softmmu m68k-softmmu
       mips-softmmu mips64-softmmu mipsel-softmmu
-      sh4-softmmu sh4eb-softmmu sparc-softmmu
+      s390x-softmmu sh4-softmmu sh4eb-softmmu sparc-softmmu
       sparc64-softmmu tricore-softmmu xtensa-softmmu xtensaeb-softmmu
       hexagon-linux-user i386-linux-user s390x-linux-user
     MAKE_CHECK_ARGS: check
diff --git a/target/s390x/Kconfig b/target/s390x/Kconfig
index 72da48136c6..d886be48b47 100644
--- a/target/s390x/Kconfig
+++ b/target/s390x/Kconfig
@@ -1,2 +1,4 @@ 
 config S390X
     bool
+    select PCI
+    select S390_FLIC