Skip to contentSkip to conversation

Move device tree files in a subdir in pc-bios

PATCH In review BALATON Zoltan 4 participants 14 messages Apr 23, 2025 – Apr 25, 2025 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#1 lore raw

PATCH v2 1/2 system/datadir: Add new type constant for DTB files

In reply to BALATON Zoltan

Currently DTB files are mixed with ROMs under BIOS type. Separate them under a new type constant and turn defines into an enum while at it.

---
 hw/microblaze/boot.c   |  2 +-
 hw/ppc/ppc440_bamboo.c |  2 +-
 hw/ppc/sam460ex.c      |  2 +-
 hw/ppc/virtex_ml507.c  |  2 +-
 include/qemu/datadir.h | 11 ++++++++---
 system/datadir.c       |  3 ++-
 6 files changed, 14 insertions(+), 8 deletions(-)
hw/microblaze/boot.c +1 -1
index 60b4ef0abe..4a9c9df318 100644
@@ -130,7 +130,7 @@ void microblaze_load_kernel(MicroBlazeCPU *cpu, bool is_little_endian,
     dtb_arg = current_machine->dtb;
     /* default to pcbios dtb as passed by machine_init */
     if (!dtb_arg && dtb_filename) {
-        filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, dtb_filename);
+        filename = qemu_find_file(QEMU_FILE_TYPE_DTB, dtb_filename);
     }
 
     boot_info.machine_cpu_reset = machine_cpu_reset;
hw/ppc/ppc440_bamboo.c +1 -1
index 099fda3909..6fff0d8afb 100644
@@ -64,7 +64,7 @@ static int bamboo_load_device_tree(MachineState *machine,
     uint32_t tb_freq = 400000000;
     uint32_t clock_freq = 400000000;
 
-    filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, BINARY_DEVICE_TREE_FILE);
+    filename = qemu_find_file(QEMU_FILE_TYPE_DTB, BINARY_DEVICE_TREE_FILE);
     if (!filename) {
         return -1;
     }
hw/ppc/sam460ex.c +1 -1
index 7dc3b309c8..327fac440f 100644
@@ -142,7 +142,7 @@ static int sam460ex_load_device_tree(MachineState *machine,
     uint32_t clock_freq = CPU_FREQ;
     int offset;
 
-    filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, BINARY_DEVICE_TREE_FILE);
+    filename = qemu_find_file(QEMU_FILE_TYPE_DTB, BINARY_DEVICE_TREE_FILE);
     if (!filename) {
         error_report("Couldn't find dtb file `%s'", BINARY_DEVICE_TREE_FILE);
         exit(1);
hw/ppc/virtex_ml507.c +1 -1
index 17115be74d..c9969ae48a 100644
@@ -146,7 +146,7 @@ static int xilinx_load_device_tree(MachineState *machine,
         /* Try the local "ppc.dtb" override.  */
         fdt = load_device_tree("ppc.dtb", &fdt_size);
         if (!fdt) {
-            path = qemu_find_file(QEMU_FILE_TYPE_BIOS, BINARY_DEVICE_TREE_FILE);
+            path = qemu_find_file(QEMU_FILE_TYPE_DTB, BINARY_DEVICE_TREE_FILE);
             if (path) {
                 fdt = load_device_tree(path, &fdt_size);
                 g_free(path);
include/qemu/datadir.h +8 -3
index 21f9097f58..cca32af300 100644
@@ -1,11 +1,16 @@
 #ifndef QEMU_DATADIR_H
 #define QEMU_DATADIR_H
 
-#define QEMU_FILE_TYPE_BIOS   0
-#define QEMU_FILE_TYPE_KEYMAP 1
+typedef enum {
+    QEMU_FILE_TYPE_BIOS,
+    QEMU_FILE_TYPE_DTB,
+    QEMU_FILE_TYPE_KEYMAP,
+} QemuFileType;
+
 /**
  * qemu_find_file:
  * @type: QEMU_FILE_TYPE_BIOS (for BIOS, VGA BIOS)
+ *        QEMU_FILE_TYPE_DTB (for device tree blobs)
  *        or QEMU_FILE_TYPE_KEYMAP (for keymaps).
  * @name: Relative or absolute file name
  *
@@ -20,7 +25,7 @@
  *
  * Returns: a path that can access @name, or NULL if no matching file exists.
  */
-char *qemu_find_file(int type, const char *name);
+char *qemu_find_file(QemuFileType type, const char *name);
 void qemu_add_default_firmwarepath(void);
 void qemu_add_data_dir(char *path);
 void qemu_list_data_dirs(void);
system/datadir.c +2 -1
index c9237cb5d4..e450b84ce9 100644
@@ -30,7 +30,7 @@
 static const char *data_dir[16];
 static int data_dir_idx;
 
-char *qemu_find_file(int type, const char *name)
+char *qemu_find_file(QemuFileType type, const char *name)
 {
     int i;
     const char *subdir;
@@ -44,6 +44,7 @@ char *qemu_find_file(int type, const char *name)
 
     switch (type) {
     case QEMU_FILE_TYPE_BIOS:
+    case QEMU_FILE_TYPE_DTB:
         subdir = "";
         break;
     case QEMU_FILE_TYPE_KEYMAP:
Signature · 1 line
2.41.3
#3 lore raw

PATCH v2 2/2 pc-bios: Move device tree files in their own subdir

In reply to BALATON Zoltan

We have several device tree files already and may have more in the future so add a new dtb subdirectory and move device tree files there so they are not mixed with ROM binaries.

---
 MAINTAINERS                                |   2 +-
 pc-bios/{ => dtb}/bamboo.dtb               | Bin
 pc-bios/{ => dtb}/bamboo.dts               |   0
 pc-bios/{ => dtb}/canyonlands.dtb          | Bin
 pc-bios/{ => dtb}/canyonlands.dts          |   0
 pc-bios/dtb/meson.build                    |  23 +++++++++++++++++++++
 pc-bios/{ => dtb}/petalogix-ml605.dtb      | Bin
 pc-bios/{ => dtb}/petalogix-ml605.dts      |   0
 pc-bios/{ => dtb}/petalogix-s3adsp1800.dtb | Bin
 pc-bios/{ => dtb}/petalogix-s3adsp1800.dts |   0
 pc-bios/meson.build                        |  23 +--------------------
 qemu.nsi                                   |   2 +-
 system/datadir.c                           |   4 +++-
 13 files changed, 29 insertions(+), 25 deletions(-)
 rename pc-bios/{ => dtb}/bamboo.dtb (100%)
 rename pc-bios/{ => dtb}/bamboo.dts (100%)
 rename pc-bios/{ => dtb}/canyonlands.dtb (100%)
 rename pc-bios/{ => dtb}/canyonlands.dts (100%)
 create mode 100644 pc-bios/dtb/meson.build
 rename pc-bios/{ => dtb}/petalogix-ml605.dtb (100%)
 rename pc-bios/{ => dtb}/petalogix-ml605.dts (100%)
 rename pc-bios/{ => dtb}/petalogix-s3adsp1800.dtb (100%)
 rename pc-bios/{ => dtb}/petalogix-s3adsp1800.dts (100%)
MAINTAINERS +1 -1
index d54b5578f8..9349950527 100644
@@ -1569,7 +1569,7 @@ F: hw/pci-host/ppc440_pcix.c
 F: hw/display/sm501*
 F: hw/ide/sii3112.c
 F: hw/rtc/m41t80.c
-F: pc-bios/canyonlands.dt[sb]
+F: pc-bios/dtb/canyonlands.dt[sb]
 F: pc-bios/u-boot-sam460ex-20100605.bin
 F: roms/u-boot-sam460ex
 F: docs/system/ppc/amigang.rst
pc-bios/dtb/bamboo.dtb renamed from pc-bios/bamboo.dtb +0 -0
similarity index 100%
rename from pc-bios/bamboo.dtb
rename to pc-bios/dtb/bamboo.dtb
pc-bios/dtb/bamboo.dts renamed from pc-bios/bamboo.dts +0 -0
similarity index 100%
rename from pc-bios/bamboo.dts
rename to pc-bios/dtb/bamboo.dts
pc-bios/dtb/canyonlands.dtb renamed from pc-bios/canyonlands.dtb +0 -0
similarity index 100%
rename from pc-bios/canyonlands.dtb
rename to pc-bios/dtb/canyonlands.dtb
pc-bios/dtb/canyonlands.dts renamed from pc-bios/canyonlands.dts +0 -0
similarity index 100%
rename from pc-bios/canyonlands.dts
rename to pc-bios/dtb/canyonlands.dts
pc-bios/dtb/meson.build new file +23 -0
new file mode 100644
index 0000000000..7a71835bca
@@ -0,0 +1,23 @@
+dtbs = [
+  'bamboo.dtb',
+  'canyonlands.dtb',
+  'petalogix-ml605.dtb',
+  'petalogix-s3adsp1800.dtb',
+]
+
+dtc = find_program('dtc', required: false)
+if dtc.found()
+  foreach out : dtbs
+    f = fs.replace_suffix(out, '.dts')
+    custom_target(f,
+        build_by_default: have_system,
+        input: files(f),
+        output: out,
+        install: get_option('install_blobs'),
+        install_dir: qemu_datadir / 'dtb',
+        command: [ dtc, '-q', '-I', 'dts', '-O', 'dtb',
+                        '-o', '@OUTPUT@', '@INPUT0@' ])
+  endforeach
+else
+    install_data(dtbs, install_dir: qemu_datadir / 'dtb')
+endif
pc-bios/dtb/petalogix-ml605.dtb renamed from pc-bios/petalogix-ml605.dtb +0 -0
similarity index 100%
rename from pc-bios/petalogix-ml605.dtb
rename to pc-bios/dtb/petalogix-ml605.dtb
pc-bios/dtb/petalogix-ml605.dts renamed from pc-bios/petalogix-ml605.dts +0 -0
similarity index 100%
rename from pc-bios/petalogix-ml605.dts
rename to pc-bios/dtb/petalogix-ml605.dts
pc-bios/dtb/petalogix-s3adsp1800.dtb renamed from pc-bios/petalogix-s3adsp1800.dtb +0 -0
similarity index 100%
rename from pc-bios/petalogix-s3adsp1800.dtb
rename to pc-bios/dtb/petalogix-s3adsp1800.dtb
pc-bios/dtb/petalogix-s3adsp1800.dts renamed from pc-bios/petalogix-s3adsp1800.dts +0 -0
similarity index 100%
rename from pc-bios/petalogix-s3adsp1800.dts
rename to pc-bios/dtb/petalogix-s3adsp1800.dts
pc-bios/meson.build +1 -22
index 34d6616c32..34d8cc4f33 100644
@@ -86,31 +86,10 @@ blobs = [
   'vof-nvram.bin',
 ]
 
-dtc = find_program('dtc', required: false)
-foreach f : [
-  'bamboo.dts',
-  'canyonlands.dts',
-  'petalogix-s3adsp1800.dts',
-  'petalogix-ml605.dts',
-]
-  out = fs.replace_suffix(f, '.dtb')
-  if dtc.found()
-    custom_target(f,
-        build_by_default: have_system,
-        input: files(f),
-        output: out,
-        install: get_option('install_blobs'),
-        install_dir: qemu_datadir,
-        command: [ dtc, '-q', '-I', 'dts', '-O', 'dtb',
-                        '-o', '@OUTPUT@', '@INPUT0@' ])
-  else
-    blobs += out
-  endif
-endforeach
-
 if get_option('install_blobs')
   install_data(blobs, install_dir: qemu_datadir)
 endif
 
 subdir('descriptors')
+subdir('dtb')
 subdir('keymaps')
qemu.nsi +1 -1
index b186f223e1..d419986ca0 100644
@@ -204,7 +204,6 @@ Section "Uninstall"
     Delete "$INSTDIR\*.bmp"
     Delete "$INSTDIR\*.bin"
     Delete "$INSTDIR\*.dll"
-    Delete "$INSTDIR\*.dtb"
     Delete "$INSTDIR\*.fd"
     Delete "$INSTDIR\*.img"
     Delete "$INSTDIR\*.lid"
@@ -215,6 +214,7 @@ Section "Uninstall"
     Delete "$INSTDIR\qemu-io.exe"
     Delete "$INSTDIR\qemu.exe"
     Delete "$INSTDIR\qemu-system-*.exe"
+    RMDir /r "$INSTDIR\dtb"
     RMDir /r "$INSTDIR\doc"
     RMDir /r "$INSTDIR\share"
     ; Remove generated files
system/datadir.c +3 -1
index e450b84ce9..f96f8fc264 100644
@@ -44,9 +44,11 @@ char *qemu_find_file(QemuFileType type, const char *name)
 
     switch (type) {
     case QEMU_FILE_TYPE_BIOS:
-    case QEMU_FILE_TYPE_DTB:
         subdir = "";
         break;
+    case QEMU_FILE_TYPE_DTB:
+        subdir = "dtb/";
+        break;
     case QEMU_FILE_TYPE_KEYMAP:
         subdir = "keymaps/";
         break;
Signature · 1 line
2.41.3
#0 lore raw

v2 cover Move device tree files in a subdir in pc-bios

Simple series doing what the subject says.

v2:
- Added changes to qemu.nsi (Philippe)
- Changed order of enum to keep it sorted. This changes value of existing define but the value is not relevant, always used by name.

BALATON Zoltan (2):
system/datadir: Add new type constant for DTB files
pc-bios: Move device tree files in their own subdir

 MAINTAINERS                                |   2 +-
 hw/microblaze/boot.c                       |   2 +-
 hw/ppc/ppc440_bamboo.c                     |   2 +-
 hw/ppc/sam460ex.c                          |   2 +-
 hw/ppc/virtex_ml507.c                      |   2 +-
 include/qemu/datadir.h                     |  11 +++++++---
 pc-bios/{ => dtb}/bamboo.dtb               | Bin
 pc-bios/{ => dtb}/bamboo.dts               |   0
 pc-bios/{ => dtb}/canyonlands.dtb          | Bin
 pc-bios/{ => dtb}/canyonlands.dts          |   0
 pc-bios/dtb/meson.build                    |  23 +++++++++++++++++++++
 pc-bios/{ => dtb}/petalogix-ml605.dtb      | Bin
 pc-bios/{ => dtb}/petalogix-ml605.dts      |   0
 pc-bios/{ => dtb}/petalogix-s3adsp1800.dtb | Bin
 pc-bios/{ => dtb}/petalogix-s3adsp1800.dts |   0
 pc-bios/meson.build                        |  23 +--------------------
 qemu.nsi                                   |   2 +-
 system/datadir.c                           |   5 ++++-
 18 files changed, 42 insertions(+), 32 deletions(-)
 rename pc-bios/{ => dtb}/bamboo.dtb (100%)
 rename pc-bios/{ => dtb}/bamboo.dts (100%)
 rename pc-bios/{ => dtb}/canyonlands.dtb (100%)
 rename pc-bios/{ => dtb}/canyonlands.dts (100%)
 create mode 100644 pc-bios/dtb/meson.build
 rename pc-bios/{ => dtb}/petalogix-ml605.dtb (100%)
 rename pc-bios/{ => dtb}/petalogix-ml605.dts (100%)
 rename pc-bios/{ => dtb}/petalogix-s3adsp1800.dtb (100%)
 rename pc-bios/{ => dtb}/petalogix-s3adsp1800.dts (100%)
Signature · 1 line
2.41.3
#5 lore raw
Quoted 30 lines · BALATON Zoltan

Simple series doing what the subject says.

v2:
- Added changes to qemu.nsi (Philippe)
- Changed order of enum to keep it sorted. This changes value of existing define but the value is not relevant, always used by name.

BALATON Zoltan (2):
system/datadir: Add new type constant for DTB files
pc-bios: Move device tree files in their own subdir

  MAINTAINERS                                |   2 +-
  hw/microblaze/boot.c                       |   2 +-
  hw/ppc/ppc440_bamboo.c                     |   2 +-
  hw/ppc/sam460ex.c                          |   2 +-
  hw/ppc/virtex_ml507.c                      |   2 +-
  include/qemu/datadir.h                     |  11 +++++++---
  pc-bios/{ => dtb}/bamboo.dtb               | Bin
  pc-bios/{ => dtb}/bamboo.dts               |   0
  pc-bios/{ => dtb}/canyonlands.dtb          | Bin
  pc-bios/{ => dtb}/canyonlands.dts          |   0
  pc-bios/dtb/meson.build                    |  23 +++++++++++++++++++++
  pc-bios/{ => dtb}/petalogix-ml605.dtb      | Bin
  pc-bios/{ => dtb}/petalogix-ml605.dts      |   0
  pc-bios/{ => dtb}/petalogix-s3adsp1800.dtb | Bin
  pc-bios/{ => dtb}/petalogix-s3adsp1800.dts |   0
  pc-bios/meson.build                        |  23 +--------------------
  qemu.nsi                                   |   2 +-
  system/datadir.c                           |   5 ++++-
  18 files changed, 42 insertions(+), 32 deletions(-)
Quoted 9 lines

rename pc-bios/{ => dtb}/bamboo.dtb (100%) rename pc-bios/{ => dtb}/bamboo.dts (100%) rename pc-bios/{ => dtb}/canyonlands.dtb (100%) rename pc-bios/{ => dtb}/canyonlands.dts (100%) create mode 100644 pc-bios/dtb/meson.build rename pc-bios/{ => dtb}/petalogix-ml605.dtb (100%) rename pc-bios/{ => dtb}/petalogix-ml605.dts (100%) rename pc-bios/{ => dtb}/petalogix-s3adsp1800.dtb (100%) rename pc-bios/{ => dtb}/petalogix-s3adsp1800.dts (100%)

In previous discussions we've had around what to do with pc-bios, wasn't the consensus that we should aim towards dividing up the directory on a per-target basis? I'm wondering if this is going in right direction, as I can certainly see that a per-target split would be more useful to packagers.

ATB,

Mark.

Reviewed-by on v2 1/2
#2 lore raw

Re: [PATCH v2 1/2] system/datadir: Add new type constant for DTB files

In reply to BALATON Zoltan
Quoted 4 lines · BALATON Zoltan

Currently DTB files are mixed with ROMs under BIOS type. Separate them under a new type constant and turn defines into an enum while at it.

Quoted 8 lines
---
  hw/microblaze/boot.c   |  2 +-
  hw/ppc/ppc440_bamboo.c |  2 +-
  hw/ppc/sam460ex.c      |  2 +-
  hw/ppc/virtex_ml507.c  |  2 +-
  include/qemu/datadir.h | 11 ++++++++---
  system/datadir.c       |  3 ++-
  6 files changed, 14 insertions(+), 8 deletions(-)
Reviewed-by on v2 2/2
#4 lore raw

Re: [PATCH v2 2/2] pc-bios: Move device tree files in their own subdir

In reply to BALATON Zoltan
Quoted 20 lines · BALATON Zoltan

We have several device tree files already and may have more in the future so add a new dtb subdirectory and move device tree files there so they are not mixed with ROM binaries.

---
  MAINTAINERS                                |   2 +-
  pc-bios/{ => dtb}/bamboo.dtb               | Bin
  pc-bios/{ => dtb}/bamboo.dts               |   0
  pc-bios/{ => dtb}/canyonlands.dtb          | Bin
  pc-bios/{ => dtb}/canyonlands.dts          |   0
  pc-bios/dtb/meson.build                    |  23 +++++++++++++++++++++
  pc-bios/{ => dtb}/petalogix-ml605.dtb      | Bin
  pc-bios/{ => dtb}/petalogix-ml605.dts      |   0
  pc-bios/{ => dtb}/petalogix-s3adsp1800.dtb | Bin
  pc-bios/{ => dtb}/petalogix-s3adsp1800.dts |   0
  pc-bios/meson.build                        |  23 +--------------------
  qemu.nsi                                   |   2 +-
  system/datadir.c                           |   4 +++-
  13 files changed, 29 insertions(+), 25 deletions(-)
Quoted 9 lines

rename pc-bios/{ => dtb}/bamboo.dtb (100%) rename pc-bios/{ => dtb}/bamboo.dts (100%) rename pc-bios/{ => dtb}/canyonlands.dtb (100%) rename pc-bios/{ => dtb}/canyonlands.dts (100%) create mode 100644 pc-bios/dtb/meson.build rename pc-bios/{ => dtb}/petalogix-ml605.dtb (100%) rename pc-bios/{ => dtb}/petalogix-ml605.dts (100%) rename pc-bios/{ => dtb}/petalogix-s3adsp1800.dtb (100%) rename pc-bios/{ => dtb}/petalogix-s3adsp1800.dts (100%)

#6 lore raw
In reply to Mark Cave-Ayland

Hi Mark,

Quoted 42 lines · Mark Cave-Ayland
Quoted 30 lines · BALATON Zoltan

Simple series doing what the subject says.

v2:
- Added changes to qemu.nsi (Philippe)
- Changed order of enum to keep it sorted. This changes value of existing define but the value is not relevant, always used by name.

BALATON Zoltan (2):
   system/datadir: Add new type constant for DTB files
   pc-bios: Move device tree files in their own subdir

  MAINTAINERS                                |   2 +- hw/microblaze/boot.c                       |   2 +- hw/ppc/ppc440_bamboo.c                     |   2 +- hw/ppc/sam460ex.c                          |   2 +- hw/ppc/virtex_ml507.c                      |   2 +- include/qemu/datadir.h                     |  11 +++++++--- pc-bios/{ => dtb}/bamboo.dtb               | Bin
  pc-bios/{ => dtb}/bamboo.dts               |   0
  pc-bios/{ => dtb}/canyonlands.dtb          | Bin
  pc-bios/{ => dtb}/canyonlands.dts          |   0 pc-bios/dtb/meson.build                    |  23 +++++++++++++++++++++ pc-bios/{ => dtb}/petalogix-ml605.dtb      | Bin
  pc-bios/{ => dtb}/petalogix-ml605.dts      |   0
  pc-bios/{ => dtb}/petalogix-s3adsp1800.dtb | Bin
  pc-bios/{ => dtb}/petalogix-s3adsp1800.dts |   0 pc-bios/meson.build                        |  23 +-------------------- qemu.nsi                                   |   2 +- system/datadir.c                           |   5 ++++-

  18 files changed, 42 insertions(+), 32 deletions(-)
Quoted 9 lines

  rename pc-bios/{ => dtb}/bamboo.dtb (100%) rename pc-bios/{ => dtb}/bamboo.dts (100%) rename pc-bios/{ => dtb}/canyonlands.dtb (100%) rename pc-bios/{ => dtb}/canyonlands.dts (100%) create mode 100644 pc-bios/dtb/meson.build rename pc-bios/{ => dtb}/petalogix-ml605.dtb (100%) rename pc-bios/{ => dtb}/petalogix-ml605.dts (100%) rename pc-bios/{ => dtb}/petalogix-s3adsp1800.dtb (100%) rename pc-bios/{ => dtb}/petalogix-s3adsp1800.dts (100%)

Quoted 1 line

In previous discussions we've had around what to do with pc-bios, wasn't the consensus that we should aim towards dividing up the directory on a per-target basis? I'm wondering if this is going in right direction, as I can certainly see that a per-target split would be more useful to packagers.

pc-bios/ is already a mess, packagers usually take it as a whole. This series isn't making the current situation worse.

I don't recall a per-target split discussion, but one moving firmware blobs out of tree in a more adapted storage like git-lfs.

My 2 cents...

Regards,

Phil.

#7 lore raw
Quoted 51 lines · Philippe Mathieu-Daudé

Hi Mark,

Quoted 42 lines · Mark Cave-Ayland
Quoted 30 lines · BALATON Zoltan

Simple series doing what the subject says.

v2:
- Added changes to qemu.nsi (Philippe)
- Changed order of enum to keep it sorted. This changes value of existing define but the value is not relevant, always used by name.

BALATON Zoltan (2):
   system/datadir: Add new type constant for DTB files
   pc-bios: Move device tree files in their own subdir

  MAINTAINERS                                |   2 +- hw/microblaze/boot.c                       |   2 +- hw/ppc/ppc440_bamboo.c                     |   2 +- hw/ppc/sam460ex.c                          |   2 +- hw/ppc/virtex_ml507.c                      |   2 +- include/qemu/datadir.h                     |  11 +++++++--- pc-bios/{ => dtb}/bamboo.dtb               | Bin
  pc-bios/{ => dtb}/bamboo.dts               |   0
  pc-bios/{ => dtb}/canyonlands.dtb          | Bin
  pc-bios/{ => dtb}/canyonlands.dts          |   0 pc-bios/dtb/meson.build                    |  23 +++++++++++++++++++++ pc-bios/{ => dtb}/petalogix-ml605.dtb      | Bin
  pc-bios/{ => dtb}/petalogix-ml605.dts      |   0
  pc-bios/{ => dtb}/petalogix-s3adsp1800.dtb | Bin
  pc-bios/{ => dtb}/petalogix-s3adsp1800.dts |   0 pc-bios/meson.build                        |  23 +-------------------- qemu.nsi                                   |   2 +- system/datadir.c                           |   5 ++++-

  18 files changed, 42 insertions(+), 32 deletions(-)
Quoted 9 lines

  rename pc-bios/{ => dtb}/bamboo.dtb (100%) rename pc-bios/{ => dtb}/bamboo.dts (100%) rename pc-bios/{ => dtb}/canyonlands.dtb (100%) rename pc-bios/{ => dtb}/canyonlands.dts (100%) create mode 100644 pc-bios/dtb/meson.build rename pc-bios/{ => dtb}/petalogix-ml605.dtb (100%) rename pc-bios/{ => dtb}/petalogix-ml605.dts (100%) rename pc-bios/{ => dtb}/petalogix-s3adsp1800.dtb (100%) rename pc-bios/{ => dtb}/petalogix-s3adsp1800.dts (100%)

Quoted 5 lines

In previous discussions we've had around what to do with pc-bios, wasn't the consensus that we should aim towards dividing up the directory on a per-target basis? I'm wondering if this is going in right direction, as I can certainly see that a per-target split would be more useful to packagers.

Quoted 5 lines

pc-bios/ is already a mess, packagers usually take it as a whole. This series isn't making the current situation worse.

I don't recall a per-target split discussion, but one moving firmware blobs out of tree in a more adapted storage like git-lfs.

Talking about the pc-bios dir in general is a bit of a can of worms and we never make concrete progress historically :-(

Probably best to split up the problem to some extent.

The device tree files are conceptually quite different from the 3rd party pre-built firmware images, which are diffferent from the keymaps.

IIUC, device tree files are tied to specific machine types, so I wonder if they should not simply live alongside their machine type .c impl file, completely outside of pc-bios ?

eg

petalogix-ml605.{dts,dtb} live alongside hw/microblaze/petalogix_ml605_mmu.c babmboo.{dts,dtb} live alongside ./hw/ppc/ppc440_bamboo.c

For the keymaps it feels like an probable easy win to move them to a ui/keymaps/ directory instead.

ie in general try to get 'pc-bios' to contain only 3rd party pre-built binaries, as a first goal. A second goal might be merging pc-bios/ into roms/, and a final goal could be spinning off pre-built ROMs into a separate release tarball, and/or separate git repos.

With regards,
Daniel

Signature · 3 lines
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
#8 lore raw
Quoted 46 lines · Daniel P. Berrangé
Quoted 45 lines · Philippe Mathieu-Daudé

Hi Mark,

Quoted 42 lines · Mark Cave-Ayland
Quoted 39 lines · BALATON Zoltan

Simple series doing what the subject says.

v2:
- Added changes to qemu.nsi (Philippe)
- Changed order of enum to keep it sorted. This changes value of existing define but the value is not relevant, always used by name.

BALATON Zoltan (2):
   system/datadir: Add new type constant for DTB files
   pc-bios: Move device tree files in their own subdir

  MAINTAINERS                                |   2 +- hw/microblaze/boot.c                       |   2 +- hw/ppc/ppc440_bamboo.c                     |   2 +- hw/ppc/sam460ex.c                          |   2 +- hw/ppc/virtex_ml507.c                      |   2 +- include/qemu/datadir.h                     |  11 +++++++--- pc-bios/{ => dtb}/bamboo.dtb               | Bin
  pc-bios/{ => dtb}/bamboo.dts               |   0
  pc-bios/{ => dtb}/canyonlands.dtb          | Bin
  pc-bios/{ => dtb}/canyonlands.dts          |   0 pc-bios/dtb/meson.build                    |  23 +++++++++++++++++++++ pc-bios/{ => dtb}/petalogix-ml605.dtb      | Bin
  pc-bios/{ => dtb}/petalogix-ml605.dts      |   0
  pc-bios/{ => dtb}/petalogix-s3adsp1800.dtb | Bin
  pc-bios/{ => dtb}/petalogix-s3adsp1800.dts |   0 pc-bios/meson.build                        |  23 +-------------------- qemu.nsi                                   |   2 +- system/datadir.c                           |   5 ++++-

  18 files changed, 42 insertions(+), 32 deletions(-)

  rename pc-bios/{ => dtb}/bamboo.dtb (100%) rename pc-bios/{ => dtb}/bamboo.dts (100%) rename pc-bios/{ => dtb}/canyonlands.dtb (100%) rename pc-bios/{ => dtb}/canyonlands.dts (100%) create mode 100644 pc-bios/dtb/meson.build rename pc-bios/{ => dtb}/petalogix-ml605.dtb (100%) rename pc-bios/{ => dtb}/petalogix-ml605.dts (100%) rename pc-bios/{ => dtb}/petalogix-s3adsp1800.dtb (100%) rename pc-bios/{ => dtb}/petalogix-s3adsp1800.dts (100%)

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines

In previous discussions we've had around what to do with pc-bios, wasn't the consensus that we should aim towards dividing up the directory on a per-target basis? I'm wondering if this is going in right direction, as I can certainly see that a per-target split would be more useful to packagers.

One problem is that pc-bios doesn't only contain machine firmware but also card ROMs which would belong to more targets (or archs) as e.g. PCI cards work on multiple archs. So it's not trivial to split by target, you'd still have a lot of files not easily assigned to any target.

This series is in preparation for another that will add a dtb for pegasos2 and I did not want to increase the mess and took the opportunity to try to tidy it a bit. I don't intend to do any major refactoring of the pc-bios dir, that's out of scope of these patches.

Quoted 15 lines
Quoted 5 lines

pc-bios/ is already a mess, packagers usually take it as a whole. This series isn't making the current situation worse.

I don't recall a per-target split discussion, but one moving firmware blobs out of tree in a more adapted storage like git-lfs.

Talking about the pc-bios dir in general is a bit of a can of worms and we never make concrete progress historically :-(

Probably best to split up the problem to some extent.

The device tree files are conceptually quite different from the 3rd party pre-built firmware images, which are diffferent from the keymaps.

Quoted 8 lines

IIUC, device tree files are tied to specific machine types, so I wonder if they should not simply live alongside their machine type .c impl file, completely outside of pc-bios ?

eg

petalogix-ml605.{dts,dtb} live alongside hw/microblaze/petalogix_ml605_mmu.c babmboo.{dts,dtb} live alongside ./hw/ppc/ppc440_bamboo.c

You need the dtbs at run time and the dir where we can look files up is the pc-bios. So these need to be installed there at the end. We could scatter them around in the source to put them next their machines but that would make installation of them more difficult than having it in one dir.

Quoted 2 lines

For the keymaps it feels like an probable easy win to move them to a ui/keymaps/ directory instead.

Currently you can run a git build directly from build dir and it will find the roms/dtbs/keymaps. You can also run a binary copied elsewhere if you pass -L path/to/pc-bios. Moving things out of it would break this and may cause more problems than it would solve.

Quoted 4 lines

ie in general try to get 'pc-bios' to contain only 3rd party pre-built binaries, as a first goal. A second goal might be merging pc-bios/ into roms/, and a final goal could be spinning off pre-built ROMs into a separate release tarball, and/or separate git repos.

Maybe a less ambitious way could be just to tag files in pc-bios in some way so it's known which machines or devices need them then you could make a script or something to pick only the files that you need for the installed machines or config. That seems less work then moving everything off from pc-bios which I don't see how would work with the runtime search path which would still expect all of these to be at one place. Maybe this could be done in Kconfig?

But all that is beyond this series which just wanted to put the dtb files separate from roms like was already done for keymaps just to make it easier to edit them in the source at one place.

Regards,
BALATON Zoltan

#9 lore raw
Quoted 92 lines · BALATON Zoltan
Quoted 46 lines · Daniel P. Berrangé
Quoted 45 lines · Philippe Mathieu-Daudé

Hi Mark,

Quoted 42 lines · Mark Cave-Ayland
Quoted 39 lines · BALATON Zoltan

Simple series doing what the subject says.

v2:
- Added changes to qemu.nsi (Philippe)
- Changed order of enum to keep it sorted. This changes value of existing define but the value is not relevant, always used by name.

BALATON Zoltan (2):
   system/datadir: Add new type constant for DTB files
   pc-bios: Move device tree files in their own subdir

  MAINTAINERS                                |   2 +- hw/microblaze/boot.c                       |   2 +- hw/ppc/ppc440_bamboo.c                     |   2 +- hw/ppc/sam460ex.c                          |   2 +- hw/ppc/virtex_ml507.c                      |   2 +- include/qemu/datadir.h                     |  11 +++++++--- pc-bios/{ => dtb}/bamboo.dtb               | Bin
  pc-bios/{ => dtb}/bamboo.dts               |   0
  pc-bios/{ => dtb}/canyonlands.dtb          | Bin
  pc-bios/{ => dtb}/canyonlands.dts          |   0 pc-bios/dtb/meson.build                    |  23 +++++++++++++++++++++ pc-bios/{ => dtb}/petalogix-ml605.dtb      | Bin
  pc-bios/{ => dtb}/petalogix-ml605.dts      |   0
  pc-bios/{ => dtb}/petalogix-s3adsp1800.dtb | Bin
  pc-bios/{ => dtb}/petalogix-s3adsp1800.dts |   0 pc-bios/meson.build                        |  23 +-------------------- qemu.nsi                                   |   2 +- system/datadir.c                           |   5 ++++-

  18 files changed, 42 insertions(+), 32 deletions(-)

  rename pc-bios/{ => dtb}/bamboo.dtb (100%) rename pc-bios/{ => dtb}/bamboo.dts (100%) rename pc-bios/{ => dtb}/canyonlands.dtb (100%) rename pc-bios/{ => dtb}/canyonlands.dts (100%) create mode 100644 pc-bios/dtb/meson.build rename pc-bios/{ => dtb}/petalogix-ml605.dtb (100%) rename pc-bios/{ => dtb}/petalogix-ml605.dts (100%) rename pc-bios/{ => dtb}/petalogix-s3adsp1800.dtb (100%) rename pc-bios/{ => dtb}/petalogix-s3adsp1800.dts (100%)

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines

In previous discussions we've had around what to do with pc-bios, wasn't the consensus that we should aim towards dividing up the directory on a per-target basis? I'm wondering if this is going in right direction, as I can certainly see that a per-target split would be more useful to packagers.

One problem is that pc-bios doesn't only contain machine firmware but also card ROMs which would belong to more targets (or archs) as e.g. PCI cards work on multiple archs. So it's not trivial to split by target, you'd still have a lot of files not easily assigned to any target.

This series is in preparation for another that will add a dtb for pegasos2 and I did not want to increase the mess and took the opportunity to try to tidy it a bit. I don't intend to do any major refactoring of the pc-bios dir, that's out of scope of these patches.

Quoted 15 lines
Quoted 5 lines

pc-bios/ is already a mess, packagers usually take it as a whole. This series isn't making the current situation worse.

I don't recall a per-target split discussion, but one moving firmware blobs out of tree in a more adapted storage like git-lfs.

Talking about the pc-bios dir in general is a bit of a can of worms and we never make concrete progress historically :-(

Probably best to split up the problem to some extent.

The device tree files are conceptually quite different from the 3rd party pre-built firmware images, which are diffferent from the keymaps.

Quoted 8 lines

IIUC, device tree files are tied to specific machine types, so I wonder if they should not simply live alongside their machine type .c impl file, completely outside of pc-bios ?

eg

petalogix-ml605.{dts,dtb} live alongside hw/microblaze/petalogix_ml605_mmu.c babmboo.{dts,dtb} live alongside ./hw/ppc/ppc440_bamboo.c

You need the dtbs at run time and the dir where we can look files up is the pc-bios. So these need to be installed there at the end. We could scatter them around in the source to put them next their machines but that would make installation of them more difficult than having it in one dir.

Quoted 7 lines
Quoted 2 lines

For the keymaps it feels like an probable easy win to move them to a ui/keymaps/ directory instead.

Currently you can run a git build directly from build dir and it will find the roms/dtbs/keymaps. You can also run a binary copied elsewhere if you pass -L path/to/pc-bios. Moving things out of it would break this and may cause more problems than it would solve.

This is just describing a limitation of the current resource locating implementation. For running in tree there's no reason why we can't look in a different directory for keymaps/dtbs - we just took the lazy option historically of putting them alongside firmware. That can be fixed.

With regards,
Daniel

Signature · 3 lines
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
#10 lore raw
Quoted 102 lines · Daniel P. Berrangé
Quoted 92 lines · BALATON Zoltan
Quoted 46 lines · Daniel P. Berrangé
Quoted 45 lines · Philippe Mathieu-Daudé

Hi Mark,

Quoted 42 lines · Mark Cave-Ayland
Quoted 39 lines · BALATON Zoltan

Simple series doing what the subject says.

v2:
- Added changes to qemu.nsi (Philippe)
- Changed order of enum to keep it sorted. This changes value of existing define but the value is not relevant, always used by name.

BALATON Zoltan (2):
   system/datadir: Add new type constant for DTB files
   pc-bios: Move device tree files in their own subdir

  MAINTAINERS                                |   2 +- hw/microblaze/boot.c                       |   2 +- hw/ppc/ppc440_bamboo.c                     |   2 +- hw/ppc/sam460ex.c                          |   2 +- hw/ppc/virtex_ml507.c                      |   2 +- include/qemu/datadir.h                     |  11 +++++++--- pc-bios/{ => dtb}/bamboo.dtb               | Bin
  pc-bios/{ => dtb}/bamboo.dts               |   0
  pc-bios/{ => dtb}/canyonlands.dtb          | Bin
  pc-bios/{ => dtb}/canyonlands.dts          |   0 pc-bios/dtb/meson.build                    |  23 +++++++++++++++++++++ pc-bios/{ => dtb}/petalogix-ml605.dtb      | Bin
  pc-bios/{ => dtb}/petalogix-ml605.dts      |   0
  pc-bios/{ => dtb}/petalogix-s3adsp1800.dtb | Bin
  pc-bios/{ => dtb}/petalogix-s3adsp1800.dts |   0 pc-bios/meson.build                        |  23 +-------------------- qemu.nsi                                   |   2 +- system/datadir.c                           |   5 ++++-

  18 files changed, 42 insertions(+), 32 deletions(-)

  rename pc-bios/{ => dtb}/bamboo.dtb (100%) rename pc-bios/{ => dtb}/bamboo.dts (100%) rename pc-bios/{ => dtb}/canyonlands.dtb (100%) rename pc-bios/{ => dtb}/canyonlands.dts (100%) create mode 100644 pc-bios/dtb/meson.build rename pc-bios/{ => dtb}/petalogix-ml605.dtb (100%) rename pc-bios/{ => dtb}/petalogix-ml605.dts (100%) rename pc-bios/{ => dtb}/petalogix-s3adsp1800.dtb (100%) rename pc-bios/{ => dtb}/petalogix-s3adsp1800.dts (100%)

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines

In previous discussions we've had around what to do with pc-bios, wasn't the consensus that we should aim towards dividing up the directory on a per-target basis? I'm wondering if this is going in right direction, as I can certainly see that a per-target split would be more useful to packagers.

One problem is that pc-bios doesn't only contain machine firmware but also card ROMs which would belong to more targets (or archs) as e.g. PCI cards work on multiple archs. So it's not trivial to split by target, you'd still have a lot of files not easily assigned to any target.

This series is in preparation for another that will add a dtb for pegasos2 and I did not want to increase the mess and took the opportunity to try to tidy it a bit. I don't intend to do any major refactoring of the pc-bios dir, that's out of scope of these patches.

Quoted 15 lines
Quoted 5 lines

pc-bios/ is already a mess, packagers usually take it as a whole. This series isn't making the current situation worse.

I don't recall a per-target split discussion, but one moving firmware blobs out of tree in a more adapted storage like git-lfs.

Talking about the pc-bios dir in general is a bit of a can of worms and we never make concrete progress historically :-(

Probably best to split up the problem to some extent.

The device tree files are conceptually quite different from the 3rd party pre-built firmware images, which are diffferent from the keymaps.

Quoted 8 lines

IIUC, device tree files are tied to specific machine types, so I wonder if they should not simply live alongside their machine type .c impl file, completely outside of pc-bios ?

eg

petalogix-ml605.{dts,dtb} live alongside hw/microblaze/petalogix_ml605_mmu.c babmboo.{dts,dtb} live alongside ./hw/ppc/ppc440_bamboo.c

You need the dtbs at run time and the dir where we can look files up is the pc-bios. So these need to be installed there at the end. We could scatter them around in the source to put them next their machines but that would make installation of them more difficult than having it in one dir.

Quoted 7 lines
Quoted 2 lines

For the keymaps it feels like an probable easy win to move them to a ui/keymaps/ directory instead.

Currently you can run a git build directly from build dir and it will find the roms/dtbs/keymaps. You can also run a binary copied elsewhere if you pass -L path/to/pc-bios. Moving things out of it would break this and may cause more problems than it would solve.

Quoted 5 lines

This is just describing a limitation of the current resource locating implementation. For running in tree there's no reason why we can't look in a different directory for keymaps/dtbs - we just took the lazy option historically of putting them alongside firmware. That can be fixed.

Yes but then you would need either two or more options for copied binary to point it to different directories for rom/dtb/keymap or make -L take a search path and list multiple directories. That's not too convenient for users.

Regards,
BALATON Zoltan

#11 lore raw
Quoted 109 lines · BALATON Zoltan
Quoted 102 lines · Daniel P. Berrangé
Quoted 92 lines · BALATON Zoltan
Quoted 46 lines · Daniel P. Berrangé
Quoted 45 lines · Philippe Mathieu-Daudé

Hi Mark,

Quoted 42 lines · Mark Cave-Ayland
Quoted 39 lines · BALATON Zoltan

Simple series doing what the subject says.

v2:
- Added changes to qemu.nsi (Philippe)
- Changed order of enum to keep it sorted. This changes value of existing define but the value is not relevant, always used by name.

BALATON Zoltan (2):
   system/datadir: Add new type constant for DTB files
   pc-bios: Move device tree files in their own subdir

  MAINTAINERS                                |   2 +- hw/microblaze/boot.c                       |   2 +- hw/ppc/ppc440_bamboo.c                     |   2 +- hw/ppc/sam460ex.c                          |   2 +- hw/ppc/virtex_ml507.c                      |   2 +- include/qemu/datadir.h                     |  11 +++++++--- pc-bios/{ => dtb}/bamboo.dtb               | Bin
  pc-bios/{ => dtb}/bamboo.dts               |   0
  pc-bios/{ => dtb}/canyonlands.dtb          | Bin
  pc-bios/{ => dtb}/canyonlands.dts          |   0 pc-bios/dtb/meson.build                    |  23 +++++++++++++++++++++ pc-bios/{ => dtb}/petalogix-ml605.dtb      | Bin
  pc-bios/{ => dtb}/petalogix-ml605.dts      |   0
  pc-bios/{ => dtb}/petalogix-s3adsp1800.dtb | Bin
  pc-bios/{ => dtb}/petalogix-s3adsp1800.dts |   0 pc-bios/meson.build                        |  23 +-------------------- qemu.nsi                                   |   2 +- system/datadir.c                           |   5 ++++-

  18 files changed, 42 insertions(+), 32 deletions(-)

  rename pc-bios/{ => dtb}/bamboo.dtb (100%) rename pc-bios/{ => dtb}/bamboo.dts (100%) rename pc-bios/{ => dtb}/canyonlands.dtb (100%) rename pc-bios/{ => dtb}/canyonlands.dts (100%) create mode 100644 pc-bios/dtb/meson.build rename pc-bios/{ => dtb}/petalogix-ml605.dtb (100%) rename pc-bios/{ => dtb}/petalogix-ml605.dts (100%) rename pc-bios/{ => dtb}/petalogix-s3adsp1800.dtb (100%) rename pc-bios/{ => dtb}/petalogix-s3adsp1800.dts (100%)

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines

In previous discussions we've had around what to do with pc-bios, wasn't the consensus that we should aim towards dividing up the directory on a per-target basis? I'm wondering if this is going in right direction, as I can certainly see that a per-target split would be more useful to packagers.

One problem is that pc-bios doesn't only contain machine firmware but also card ROMs which would belong to more targets (or archs) as e.g. PCI cards work on multiple archs. So it's not trivial to split by target, you'd still have a lot of files not easily assigned to any target.

This series is in preparation for another that will add a dtb for pegasos2 and I did not want to increase the mess and took the opportunity to try to tidy it a bit. I don't intend to do any major refactoring of the pc-bios dir, that's out of scope of these patches.

Quoted 15 lines
Quoted 5 lines

pc-bios/ is already a mess, packagers usually take it as a whole. This series isn't making the current situation worse.

I don't recall a per-target split discussion, but one moving firmware blobs out of tree in a more adapted storage like git-lfs.

Talking about the pc-bios dir in general is a bit of a can of worms and we never make concrete progress historically :-(

Probably best to split up the problem to some extent.

The device tree files are conceptually quite different from the 3rd party pre-built firmware images, which are diffferent from the keymaps.

Quoted 8 lines

IIUC, device tree files are tied to specific machine types, so I wonder if they should not simply live alongside their machine type .c impl file, completely outside of pc-bios ?

eg

petalogix-ml605.{dts,dtb} live alongside hw/microblaze/petalogix_ml605_mmu.c babmboo.{dts,dtb} live alongside ./hw/ppc/ppc440_bamboo.c

You need the dtbs at run time and the dir where we can look files up is the pc-bios. So these need to be installed there at the end. We could scatter them around in the source to put them next their machines but that would make installation of them more difficult than having it in one dir.

Quoted 7 lines
Quoted 2 lines

For the keymaps it feels like an probable easy win to move them to a ui/keymaps/ directory instead.

Currently you can run a git build directly from build dir and it will find the roms/dtbs/keymaps. You can also run a binary copied elsewhere if you pass -L path/to/pc-bios. Moving things out of it would break this and may cause more problems than it would solve.

Quoted 5 lines

This is just describing a limitation of the current resource locating implementation. For running in tree there's no reason why we can't look in a different directory for keymaps/dtbs - we just took the lazy option historically of putting them alongside firmware. That can be fixed.

Quoted 4 lines

Yes but then you would need either two or more options for copied binary to point it to different directories for rom/dtb/keymap or make -L take a search path and list multiple directories. That's not too convenient for users.

I was only refering to changing the source tree location, which QEMU can auto-detect relative to the binary being executed, and should need to involve changes to -L.

With regards,
Daniel

Signature · 3 lines
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
#12 lore raw
Quoted 110 lines · Daniel P. Berrangé
Quoted 109 lines · BALATON Zoltan
Quoted 107 lines · Daniel P. Berrangé
Quoted 92 lines · BALATON Zoltan
Quoted 46 lines · Daniel P. Berrangé
Quoted 45 lines · Philippe Mathieu-Daudé

Hi Mark,

Quoted 42 lines · Mark Cave-Ayland
Quoted 39 lines · BALATON Zoltan

Simple series doing what the subject says.

v2:
- Added changes to qemu.nsi (Philippe)
- Changed order of enum to keep it sorted. This changes value of existing define but the value is not relevant, always used by name.

BALATON Zoltan (2):
   system/datadir: Add new type constant for DTB files
   pc-bios: Move device tree files in their own subdir

  MAINTAINERS                                |   2 +- hw/microblaze/boot.c                       |   2 +- hw/ppc/ppc440_bamboo.c                     |   2 +- hw/ppc/sam460ex.c                          |   2 +- hw/ppc/virtex_ml507.c                      |   2 +- include/qemu/datadir.h                     |  11 +++++++--- pc-bios/{ => dtb}/bamboo.dtb               | Bin
  pc-bios/{ => dtb}/bamboo.dts               |   0
  pc-bios/{ => dtb}/canyonlands.dtb          | Bin
  pc-bios/{ => dtb}/canyonlands.dts          |   0 pc-bios/dtb/meson.build                    |  23 +++++++++++++++++++++ pc-bios/{ => dtb}/petalogix-ml605.dtb      | Bin
  pc-bios/{ => dtb}/petalogix-ml605.dts      |   0
  pc-bios/{ => dtb}/petalogix-s3adsp1800.dtb | Bin
  pc-bios/{ => dtb}/petalogix-s3adsp1800.dts |   0 pc-bios/meson.build                        |  23 +-------------------- qemu.nsi                                   |   2 +- system/datadir.c                           |   5 ++++-

  18 files changed, 42 insertions(+), 32 deletions(-)

  rename pc-bios/{ => dtb}/bamboo.dtb (100%) rename pc-bios/{ => dtb}/bamboo.dts (100%) rename pc-bios/{ => dtb}/canyonlands.dtb (100%) rename pc-bios/{ => dtb}/canyonlands.dts (100%) create mode 100644 pc-bios/dtb/meson.build rename pc-bios/{ => dtb}/petalogix-ml605.dtb (100%) rename pc-bios/{ => dtb}/petalogix-ml605.dts (100%) rename pc-bios/{ => dtb}/petalogix-s3adsp1800.dtb (100%) rename pc-bios/{ => dtb}/petalogix-s3adsp1800.dts (100%)

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines

In previous discussions we've had around what to do with pc-bios, wasn't the consensus that we should aim towards dividing up the directory on a per-target basis? I'm wondering if this is going in right direction, as I can certainly see that a per-target split would be more useful to packagers.

One problem is that pc-bios doesn't only contain machine firmware but also card ROMs which would belong to more targets (or archs) as e.g. PCI cards work on multiple archs. So it's not trivial to split by target, you'd still have a lot of files not easily assigned to any target.

This series is in preparation for another that will add a dtb for pegasos2 and I did not want to increase the mess and took the opportunity to try to tidy it a bit. I don't intend to do any major refactoring of the pc-bios dir, that's out of scope of these patches.

Quoted 15 lines
Quoted 5 lines

pc-bios/ is already a mess, packagers usually take it as a whole. This series isn't making the current situation worse.

I don't recall a per-target split discussion, but one moving firmware blobs out of tree in a more adapted storage like git-lfs.

Talking about the pc-bios dir in general is a bit of a can of worms and we never make concrete progress historically :-(

Probably best to split up the problem to some extent.

The device tree files are conceptually quite different from the 3rd party pre-built firmware images, which are diffferent from the keymaps.

Quoted 8 lines

IIUC, device tree files are tied to specific machine types, so I wonder if they should not simply live alongside their machine type .c impl file, completely outside of pc-bios ?

eg

petalogix-ml605.{dts,dtb} live alongside hw/microblaze/petalogix_ml605_mmu.c babmboo.{dts,dtb} live alongside ./hw/ppc/ppc440_bamboo.c

You need the dtbs at run time and the dir where we can look files up is the pc-bios. So these need to be installed there at the end. We could scatter them around in the source to put them next their machines but that would make installation of them more difficult than having it in one dir.

Quoted 7 lines
Quoted 2 lines

For the keymaps it feels like an probable easy win to move them to a ui/keymaps/ directory instead.

Currently you can run a git build directly from build dir and it will find the roms/dtbs/keymaps. You can also run a binary copied elsewhere if you pass -L path/to/pc-bios. Moving things out of it would break this and may cause more problems than it would solve.

This is just describing a limitation of the current resource locating implementation. For running in tree there's no reason why we can't look in a different directory for keymaps/dtbs - we just took the lazy option historically of putting them alongside firmware. That can be fixed.

Quoted 8 lines
Quoted 4 lines

Yes but then you would need either two or more options for copied binary to point it to different directories for rom/dtb/keymap or make -L take a search path and list multiple directories. That's not too convenient for users.

I was only refering to changing the source tree location, which QEMU can auto-detect relative to the binary being executed, and should need to involve changes to -L.

OK that implies they would still need to be installed in build/pc-bios/dtb or build/pc-bios/keymaps at the end from wherever they live in the source tree. I find having dts and dtb files in pc-bios/dtb better than having them mixed with C files in hw/ppc and installing them is also easier this way (or maybe it's not that difficult to install but I have no idea about Meson). Still it looks tidier to gather dtbs at one place.

Regards,
BALATON Zoltan

#13 lore raw
In reply to Daniel P. Berrangé
Quoted 102 lines · Daniel P. Berrangé
Quoted 92 lines · BALATON Zoltan
Quoted 46 lines · Daniel P. Berrangé
Quoted 45 lines · Philippe Mathieu-Daudé

Hi Mark,

Quoted 42 lines · Mark Cave-Ayland
Quoted 39 lines · BALATON Zoltan

Simple series doing what the subject says.

v2:
- Added changes to qemu.nsi (Philippe)
- Changed order of enum to keep it sorted. This changes value of existing define but the value is not relevant, always used by name.

BALATON Zoltan (2):
   system/datadir: Add new type constant for DTB files
   pc-bios: Move device tree files in their own subdir

   MAINTAINERS                                |   2 +-
   hw/microblaze/boot.c                       |   2 +-
   hw/ppc/ppc440_bamboo.c                     |   2 +-
   hw/ppc/sam460ex.c                          |   2 +-
   hw/ppc/virtex_ml507.c                      |   2 +-
   include/qemu/datadir.h                     |  11 +++++++---
   pc-bios/{ => dtb}/bamboo.dtb               | Bin
   pc-bios/{ => dtb}/bamboo.dts               |   0
   pc-bios/{ => dtb}/canyonlands.dtb          | Bin
   pc-bios/{ => dtb}/canyonlands.dts          |   0
   pc-bios/dtb/meson.build                    |  23 +++++++++++++++++++++
   pc-bios/{ => dtb}/petalogix-ml605.dtb      | Bin
   pc-bios/{ => dtb}/petalogix-ml605.dts      |   0
   pc-bios/{ => dtb}/petalogix-s3adsp1800.dtb | Bin
   pc-bios/{ => dtb}/petalogix-s3adsp1800.dts |   0
   pc-bios/meson.build                        |  23 +--------------------
   qemu.nsi                                   |   2 +-
   system/datadir.c                           |   5 ++++-
   18 files changed, 42 insertions(+), 32 deletions(-)

  rename pc-bios/{ => dtb}/bamboo.dtb (100%) rename pc-bios/{ => dtb}/bamboo.dts (100%) rename pc-bios/{ => dtb}/canyonlands.dtb (100%) rename pc-bios/{ => dtb}/canyonlands.dts (100%) create mode 100644 pc-bios/dtb/meson.build rename pc-bios/{ => dtb}/petalogix-ml605.dtb (100%) rename pc-bios/{ => dtb}/petalogix-ml605.dts (100%) rename pc-bios/{ => dtb}/petalogix-s3adsp1800.dtb (100%) rename pc-bios/{ => dtb}/petalogix-s3adsp1800.dts (100%)

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines

In previous discussions we've had around what to do with pc-bios, wasn't the consensus that we should aim towards dividing up the directory on a per-target basis? I'm wondering if this is going in right direction, as I can certainly see that a per-target split would be more useful to packagers.

One problem is that pc-bios doesn't only contain machine firmware but also card ROMs which would belong to more targets (or archs) as e.g. PCI cards work on multiple archs. So it's not trivial to split by target, you'd still have a lot of files not easily assigned to any target.

This series is in preparation for another that will add a dtb for pegasos2 and I did not want to increase the mess and took the opportunity to try to tidy it a bit. I don't intend to do any major refactoring of the pc-bios dir, that's out of scope of these patches.

Quoted 15 lines
Quoted 5 lines

pc-bios/ is already a mess, packagers usually take it as a whole. This series isn't making the current situation worse.

I don't recall a per-target split discussion, but one moving firmware blobs out of tree in a more adapted storage like git-lfs.

Talking about the pc-bios dir in general is a bit of a can of worms and we never make concrete progress historically :-(

Probably best to split up the problem to some extent.

The device tree files are conceptually quite different from the 3rd party pre-built firmware images, which are diffferent from the keymaps.

Quoted 8 lines

IIUC, device tree files are tied to specific machine types, so I wonder if they should not simply live alongside their machine type .c impl file, completely outside of pc-bios ?

eg

petalogix-ml605.{dts,dtb} live alongside hw/microblaze/petalogix_ml605_mmu.c babmboo.{dts,dtb} live alongside ./hw/ppc/ppc440_bamboo.c

You need the dtbs at run time and the dir where we can look files up is the pc-bios. So these need to be installed there at the end. We could scatter them around in the source to put them next their machines but that would make installation of them more difficult than having it in one dir.

Quoted 7 lines
Quoted 2 lines

For the keymaps it feels like an probable easy win to move them to a ui/keymaps/ directory instead.

Currently you can run a git build directly from build dir and it will find the roms/dtbs/keymaps. You can also run a binary copied elsewhere if you pass -L path/to/pc-bios. Moving things out of it would break this and may cause more problems than it would solve.

Quoted 5 lines

This is just describing a limitation of the current resource locating implementation. For running in tree there's no reason why we can't look in a different directory for keymaps/dtbs - we just took the lazy option historically of putting them alongside firmware. That can be fixed.

That can still be fixed later ;) I'm queuing this series as it tidies a bit the pc-bios/ directory.

Regards,

Phil.