From 705f5dd1639eb869ac0d00063a3b4956577f4522 Mon Sep 17 00:00:00 2001 From: Daniel Skinstad Drabitzius Date: Mon, 16 Dec 2024 11:27:54 +0100 Subject: [PATCH 1/2] chore: reorganize config whiles which are meant to be sourced Move `configs/raspberrypi/uboot/raspberrypi*` to `configs/raspberrypi/uboot/include/`, as these files are meant to be sourced, not used directly Ticket: MEN-7857 Signed-off-by: Daniel Skinstad Drabitzius --- .../raspberrypi/uboot/debian/raspberrypi3_bookworm_32bit_config | 2 +- .../raspberrypi/uboot/debian/raspberrypi3_bookworm_64bit_config | 2 +- .../raspberrypi/uboot/debian/raspberrypi3_bullseye_32bit_config | 2 +- .../raspberrypi/uboot/debian/raspberrypi3_bullseye_64bit_config | 2 +- .../raspberrypi/uboot/debian/raspberrypi4_bookworm_32bit_config | 2 +- .../raspberrypi/uboot/debian/raspberrypi4_bookworm_64bit_config | 2 +- .../raspberrypi/uboot/debian/raspberrypi4_bullseye_32bit_config | 2 +- .../raspberrypi/uboot/debian/raspberrypi4_bullseye_64bit_config | 2 +- .../raspberrypi/uboot/debian/raspberrypi5_bookworm_64bit_config | 2 +- configs/raspberrypi/uboot/{ => include}/raspberrypi3_64_config | 0 configs/raspberrypi/uboot/{ => include}/raspberrypi3_config | 0 configs/raspberrypi/uboot/{ => include}/raspberrypi4_64_config | 0 configs/raspberrypi/uboot/{ => include}/raspberrypi4_config | 0 configs/raspberrypi/uboot/{ => include}/raspberrypi5_64_config | 0 14 files changed, 9 insertions(+), 9 deletions(-) rename configs/raspberrypi/uboot/{ => include}/raspberrypi3_64_config (100%) rename configs/raspberrypi/uboot/{ => include}/raspberrypi3_config (100%) rename configs/raspberrypi/uboot/{ => include}/raspberrypi4_64_config (100%) rename configs/raspberrypi/uboot/{ => include}/raspberrypi4_config (100%) rename configs/raspberrypi/uboot/{ => include}/raspberrypi5_64_config (100%) diff --git a/configs/raspberrypi/uboot/debian/raspberrypi3_bookworm_32bit_config b/configs/raspberrypi/uboot/debian/raspberrypi3_bookworm_32bit_config index eff365a336..00be838acd 100644 --- a/configs/raspberrypi/uboot/debian/raspberrypi3_bookworm_32bit_config +++ b/configs/raspberrypi/uboot/debian/raspberrypi3_bookworm_32bit_config @@ -1,2 +1,2 @@ source configs/raspberrypi/uboot/include/bookworm_config -source configs/raspberrypi/uboot/raspberrypi3_config +source configs/raspberrypi/uboot/include/raspberrypi3_config diff --git a/configs/raspberrypi/uboot/debian/raspberrypi3_bookworm_64bit_config b/configs/raspberrypi/uboot/debian/raspberrypi3_bookworm_64bit_config index 6c9843a04f..5a0d1437e3 100644 --- a/configs/raspberrypi/uboot/debian/raspberrypi3_bookworm_64bit_config +++ b/configs/raspberrypi/uboot/debian/raspberrypi3_bookworm_64bit_config @@ -1,2 +1,2 @@ source configs/raspberrypi/uboot/include/bookworm_config -source configs/raspberrypi/uboot/raspberrypi3_64_config +source configs/raspberrypi/uboot/include/raspberrypi3_64_config diff --git a/configs/raspberrypi/uboot/debian/raspberrypi3_bullseye_32bit_config b/configs/raspberrypi/uboot/debian/raspberrypi3_bullseye_32bit_config index b10b6f9ac6..6160431641 100644 --- a/configs/raspberrypi/uboot/debian/raspberrypi3_bullseye_32bit_config +++ b/configs/raspberrypi/uboot/debian/raspberrypi3_bullseye_32bit_config @@ -1,2 +1,2 @@ source configs/raspberrypi/include/pre_bookworm_config -source configs/raspberrypi/uboot/raspberrypi3_config +source configs/raspberrypi/uboot/include/raspberrypi3_config diff --git a/configs/raspberrypi/uboot/debian/raspberrypi3_bullseye_64bit_config b/configs/raspberrypi/uboot/debian/raspberrypi3_bullseye_64bit_config index b5490fe97d..cbd99f3ec4 100644 --- a/configs/raspberrypi/uboot/debian/raspberrypi3_bullseye_64bit_config +++ b/configs/raspberrypi/uboot/debian/raspberrypi3_bullseye_64bit_config @@ -1,2 +1,2 @@ source configs/raspberrypi/include/pre_bookworm_config -source configs/raspberrypi/uboot/raspberrypi3_64_config +source configs/raspberrypi/uboot/include/raspberrypi3_64_config diff --git a/configs/raspberrypi/uboot/debian/raspberrypi4_bookworm_32bit_config b/configs/raspberrypi/uboot/debian/raspberrypi4_bookworm_32bit_config index 28a19f18bc..bc776a5949 100644 --- a/configs/raspberrypi/uboot/debian/raspberrypi4_bookworm_32bit_config +++ b/configs/raspberrypi/uboot/debian/raspberrypi4_bookworm_32bit_config @@ -1,2 +1,2 @@ source configs/raspberrypi/uboot/include/bookworm_config -source configs/raspberrypi/uboot/raspberrypi4_config +source configs/raspberrypi/uboot/include/raspberrypi4_config diff --git a/configs/raspberrypi/uboot/debian/raspberrypi4_bookworm_64bit_config b/configs/raspberrypi/uboot/debian/raspberrypi4_bookworm_64bit_config index 286c837516..c3f32cf138 100644 --- a/configs/raspberrypi/uboot/debian/raspberrypi4_bookworm_64bit_config +++ b/configs/raspberrypi/uboot/debian/raspberrypi4_bookworm_64bit_config @@ -1,2 +1,2 @@ source configs/raspberrypi/uboot/include/bookworm_config -source configs/raspberrypi/uboot/raspberrypi4_64_config +source configs/raspberrypi/uboot/include/raspberrypi4_64_config diff --git a/configs/raspberrypi/uboot/debian/raspberrypi4_bullseye_32bit_config b/configs/raspberrypi/uboot/debian/raspberrypi4_bullseye_32bit_config index 2533242d91..975433f7e8 100644 --- a/configs/raspberrypi/uboot/debian/raspberrypi4_bullseye_32bit_config +++ b/configs/raspberrypi/uboot/debian/raspberrypi4_bullseye_32bit_config @@ -1,2 +1,2 @@ source configs/raspberrypi/include/pre_bookworm_config -source configs/raspberrypi/uboot/raspberrypi4_config +source configs/raspberrypi/uboot/include/raspberrypi4_config diff --git a/configs/raspberrypi/uboot/debian/raspberrypi4_bullseye_64bit_config b/configs/raspberrypi/uboot/debian/raspberrypi4_bullseye_64bit_config index f82caa087a..2660fcf920 100644 --- a/configs/raspberrypi/uboot/debian/raspberrypi4_bullseye_64bit_config +++ b/configs/raspberrypi/uboot/debian/raspberrypi4_bullseye_64bit_config @@ -1,2 +1,2 @@ source configs/raspberrypi/include/pre_bookworm_config -source configs/raspberrypi/uboot/raspberrypi4_64_config +source configs/raspberrypi/uboot/include/raspberrypi4_64_config diff --git a/configs/raspberrypi/uboot/debian/raspberrypi5_bookworm_64bit_config b/configs/raspberrypi/uboot/debian/raspberrypi5_bookworm_64bit_config index 834c09f69b..3a6c4afcc0 100644 --- a/configs/raspberrypi/uboot/debian/raspberrypi5_bookworm_64bit_config +++ b/configs/raspberrypi/uboot/debian/raspberrypi5_bookworm_64bit_config @@ -1,2 +1,2 @@ source configs/raspberrypi/uboot/include/bookworm_config -source configs/raspberrypi/uboot/raspberrypi5_64_config +source configs/raspberrypi/uboot/include/raspberrypi5_64_config diff --git a/configs/raspberrypi/uboot/raspberrypi3_64_config b/configs/raspberrypi/uboot/include/raspberrypi3_64_config similarity index 100% rename from configs/raspberrypi/uboot/raspberrypi3_64_config rename to configs/raspberrypi/uboot/include/raspberrypi3_64_config diff --git a/configs/raspberrypi/uboot/raspberrypi3_config b/configs/raspberrypi/uboot/include/raspberrypi3_config similarity index 100% rename from configs/raspberrypi/uboot/raspberrypi3_config rename to configs/raspberrypi/uboot/include/raspberrypi3_config diff --git a/configs/raspberrypi/uboot/raspberrypi4_64_config b/configs/raspberrypi/uboot/include/raspberrypi4_64_config similarity index 100% rename from configs/raspberrypi/uboot/raspberrypi4_64_config rename to configs/raspberrypi/uboot/include/raspberrypi4_64_config diff --git a/configs/raspberrypi/uboot/raspberrypi4_config b/configs/raspberrypi/uboot/include/raspberrypi4_config similarity index 100% rename from configs/raspberrypi/uboot/raspberrypi4_config rename to configs/raspberrypi/uboot/include/raspberrypi4_config diff --git a/configs/raspberrypi/uboot/raspberrypi5_64_config b/configs/raspberrypi/uboot/include/raspberrypi5_64_config similarity index 100% rename from configs/raspberrypi/uboot/raspberrypi5_64_config rename to configs/raspberrypi/uboot/include/raspberrypi5_64_config From 51dbf08c76ae401c05127c0b0ccf52d2857b25a5 Mon Sep 17 00:00:00 2001 From: Daniel Skinstad Drabitzius Date: Mon, 16 Dec 2024 11:27:56 +0100 Subject: [PATCH 2/2] chore: point to correct config in README `generic_x86-64_config` is called `generic_x86-64_hdd_config` Signed-off-by: Daniel Skinstad Drabitzius --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5327b87078..3c80351a09 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ These configurations are officially supported. | Configuration | Supported OS / hardware | | :------------ | :---------------------- | -| generic_x86-64_config | Generic x86, 64bit distribution *use this as a starting point only!* | +| generic_x86-64_hdd_config | Generic x86, 64bit distribution *use this as a starting point only!* | | raspberrypi/uboot/raspberrypi0w_config | RaspberryPi 0w, Raspbian 32bit | | raspberrypi/uboot/debian/raspberrypi3_bookworm_64bit_config | RaspberryPi 3, Raspberry Pi OS "bookworm" 64bit | | raspberrypi/uboot/debian/raspberrypi4_bookworm_64bit_config | RaspberryPi 4, Raspberry Pi OS "bookworm" 64bit |