We'll start using these fragments inside Kbuild too for merged defconfigs
to cut down on defconfigs that are largely duplicated, but differ only
in a few options. To share such configs between architectures, we add
common/boards/configs as a common fragment directory here and
standardize on using .config as extension.
No functional change.
Signed-off-by: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx>
---
.github/workflows/build-defconfigs.yml | 8 +++++---
.github/workflows/test-labgrid-pytest.yml | 6 ++++--
.../base.cfg => common/boards/configs/base.config | 0
.../boards/configs/disable_size_check.config | 0
.../boards/configs/disable_target_tools.config | 0
.../boards/configs/enable_self_test.config | 0
.../boards/configs/enable_werror.config | 0
.../full.cfg => common/boards/configs/full.config | 0
.../boards/configs/virtio-pci.config | 0
scripts/container.sh | 2 +-
test/emulate.pl | 10 +++++-----
test/x86/virtio@efi_defconfig.yaml | 2 +-
12 files changed, 16 insertions(+), 12 deletions(-)
rename test/kconfig/base.cfg => common/boards/configs/base.config (100%)
rename test/kconfig/disable_size_check.kconf => common/boards/configs/disable_size_check.config (100%)
rename test/kconfig/disable_target_tools.kconf => common/boards/configs/disable_target_tools.config (100%)
rename test/kconfig/enable_self_test.kconf => common/boards/configs/enable_self_test.config (100%)
rename test/kconfig/enable_werror.kconf => common/boards/configs/enable_werror.config (100%)
rename test/kconfig/full.cfg => common/boards/configs/full.config (100%)
rename test/kconfig/virtio-pci.cfg => common/boards/configs/virtio-pci.config (100%)
diff --git a/.github/workflows/build-defconfigs.yml b/.github/workflows/build-defconfigs.yml
index 012852053e87..6690b9db25b8 100644
--- a/.github/workflows/build-defconfigs.yml
+++ b/.github/workflows/build-defconfigs.yml
@@ -39,6 +39,8 @@ jobs:
./test/generate-dummy-fw.sh
- ./MAKEALL -O build-${{matrix.arch}} -k test/kconfig/disable_size_check.kconf \
- -k test/kconfig/disable_target_tools.kconf \
- -k test/kconfig/enable_werror.kconf '${{matrix.config}}'
+ ./MAKEALL -O build-${{matrix.arch}} \
+ -k common/boards/configs/disable_size_check.config \
+ -k common/boards/configs/disable_target_tools.config \
+ -k common/boards/configs/enable_werror.config \
+ '${{matrix.config}}'
diff --git a/.github/workflows/test-labgrid-pytest.yml b/.github/workflows/test-labgrid-pytest.yml
index 6eb38cc03e6b..21d189880941 100644
--- a/.github/workflows/test-labgrid-pytest.yml
+++ b/.github/workflows/test-labgrid-pytest.yml
@@ -55,8 +55,10 @@ jobs:
run: |
export ARCH=${{matrix.arch}}
- ./MAKEALL -O build-${{matrix.arch}} -k test/kconfig/enable_self_test.kconf \
- -k test/kconfig/disable_target_tools.kconf ${{matrix.defconfig}}
+ ./MAKEALL -O build-${{matrix.arch}} \
+ -k common/boards/configs/enable_self_test.config \
+ -k common/boards/configs/disable_target_tools.config \
+ ${{matrix.defconfig}}
if [ ${{matrix.arch}} = "riscv" ]; then
cp /usr/share/qemu/opensbi-riscv32-generic-fw_dynamic.bin build-${{matrix.arch}}
diff --git a/test/kconfig/base.cfg b/common/boards/configs/base.config
similarity index 100%
rename from test/kconfig/base.cfg
rename to common/boards/configs/base.config
diff --git a/test/kconfig/disable_size_check.kconf b/common/boards/configs/disable_size_check.config
similarity index 100%
rename from test/kconfig/disable_size_check.kconf
rename to common/boards/configs/disable_size_check.config
diff --git a/test/kconfig/disable_target_tools.kconf b/common/boards/configs/disable_target_tools.config
similarity index 100%
rename from test/kconfig/disable_target_tools.kconf
rename to common/boards/configs/disable_target_tools.config
diff --git a/test/kconfig/enable_self_test.kconf b/common/boards/configs/enable_self_test.config
similarity index 100%
rename from test/kconfig/enable_self_test.kconf
rename to common/boards/configs/enable_self_test.config
diff --git a/test/kconfig/enable_werror.kconf b/common/boards/configs/enable_werror.config
similarity index 100%
rename from test/kconfig/enable_werror.kconf
rename to common/boards/configs/enable_werror.config
diff --git a/test/kconfig/full.cfg b/common/boards/configs/full.config
similarity index 100%
rename from test/kconfig/full.cfg
rename to common/boards/configs/full.config
diff --git a/test/kconfig/virtio-pci.cfg b/common/boards/configs/virtio-pci.config
similarity index 100%
rename from test/kconfig/virtio-pci.cfg
rename to common/boards/configs/virtio-pci.config
diff --git a/scripts/container.sh b/scripts/container.sh
index dff6546c2cf6..6bfb070692f5 100755
--- a/scripts/container.sh
+++ b/scripts/container.sh
@@ -2,7 +2,7 @@
# SPDX-License-Identifier: GPL-2.0-only
CONTAINER=${CONTAINER:-ghcr.io/barebox/barebox/barebox-ci:latest}
-export KCONFIG_ADD="test/kconfig/disable_target_tools.kconf $KCONFIG_ADD"
+export KCONFIG_ADD="common/boards/configs/disable_target_tools.config $KCONFIG_ADD"
while getopts "c:uh" opt; do
case "$opt" in
diff --git a/test/emulate.pl b/test/emulate.pl
index a4ca6b7aee6e..086fae0f7708 100755
--- a/test/emulate.pl
+++ b/test/emulate.pl
@@ -201,8 +201,8 @@ sub build {
}
}
- push @TUXMAKE_ARGS, "--kconfig-add=test/kconfig/base.cfg" if $kconfig_base || $kconfig_full;
- push @TUXMAKE_ARGS, "--kconfig-add=test/kconfig/full.cfg" if $kconfig_full;
+ push @TUXMAKE_ARGS, "--kconfig-add=common/boards/configs/base.config" if $kconfig_base || $kconfig_full;
+ push @TUXMAKE_ARGS, "--kconfig-add=common/boards/configs/full.config" if $kconfig_full;
for (@kconfig_add) {
push @TUXMAKE_ARGS, "--kconfig-add=$_";
@@ -511,19 +511,19 @@ Supported: null, podman-local, podman, docker, docker-local.
=item B<--no-kconfig-base>
-Don't apply test/kconfig/base.cfg. This may lead to more tests being
+Don't apply common/boards/configs/base.config. This may lead to more tests being
skipped.
=item B<--kconfig-full>
-Applies test/kconfig/full.cfg on top of base.cfg. This enables as much as
+Applies common/boards/configs/full.config on top of base.config. This enables as much as
possible to avoid skipping tests for disabled functionality.
=item B<--kconfig-add>=%s, B<-K>=%s
Extra kconfig fragments, merged on top of the defconfig and Kconfig
fragments described by the YAML. In tree configuration fragment
-(e.g. `test/kconfig/virtio-pci.config`), path to local file, URL,
+(e.g. `common/boards/configs/virtio-pci.config`), path to local file, URL,
`CONFIG_*=[y|m|n]`, or `# CONFIG_* is not set` are supported.
Can be specified multiple times, and will be merged in the order given.
diff --git a/test/x86/virtio@efi_defconfig.yaml b/test/x86/virtio@efi_defconfig.yaml
index 83340d19ddef..9ff4ff5a4e5a 100644
--- a/test/x86/virtio@efi_defconfig.yaml
+++ b/test/x86/virtio@efi_defconfig.yaml
@@ -17,7 +17,7 @@ targets:
runner:
tuxmake_arch: x86_64
kconfig_add:
- - test/kconfig/virtio-pci.cfg
+ - common/boards/configs/virtio-pci.config
- CONFIG_DRIVER_SERIAL_NS16550=y
- CONFIG_CONSOLE_ACTIVATE_FIRST=y # avoid duplicate output
images:
--
2.39.2
