[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 135/142] meson: replace mostly useless pc-bios/Makefile
From: |
Paolo Bonzini |
Subject: |
[PATCH 135/142] meson: replace mostly useless pc-bios/Makefile |
Date: |
Tue, 28 Jan 2020 18:53:35 +0100 |
From: Marc-André Lureau <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
---
pc-bios/Makefile | 19 -------------------
pc-bios/meson.build | 12 ++++++++++++
2 files changed, 12 insertions(+), 19 deletions(-)
delete mode 100644 pc-bios/Makefile
diff --git a/pc-bios/Makefile b/pc-bios/Makefile
deleted file mode 100644
index 315288df84..0000000000
--- a/pc-bios/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# NOTE: only compilable with x86 cross compile tools
-#
-include ../config-host.mak
-
-DEFINES=
-
-TARGETS=
-
-all: $(TARGETS)
-
-%.o: %.S
- $(CC) $(DEFINES) -c -o $@ $<
-
-%.dtb: %.dts
- dtc -I dts -O dtb -o $@ $<
-
-clean:
- rm -f $(TARGETS) *.o *~
diff --git a/pc-bios/meson.build b/pc-bios/meson.build
index 4d99511a5c..62183506f7 100644
--- a/pc-bios/meson.build
+++ b/pc-bios/meson.build
@@ -89,3 +89,15 @@ blobs = files(
if install_blobs
install_data(blobs, install_dir: config_host['qemu_datadir'])
endif
+
+dtc = find_program('dtc', required: false)
+if dtc.found()
+ t = []
+ foreach f: ['bamboo.dts', 'canyonlands.dts']
+ t += custom_target(f,
+ input: f,
+ output: '@BASENAME@' + '.dtb',
+ command: [dtc, '-I', 'dts', '-O', 'dtb', '-o',
'@OUTPUT@', '@INPUT@'])
+ endforeach
+ alias_target('update-dtb', t)
+endif
--
2.21.0
- [PATCH 127/142] meson: install some scripts, (continued)
- [PATCH 127/142] meson: install some scripts, Paolo Bonzini, 2020/01/28
- [PATCH 128/142] meson: install edk2, Paolo Bonzini, 2020/01/28
- [PATCH 130/142] meson: install edk2 json descriptors, Paolo Bonzini, 2020/01/28
- [PATCH 129/142] meson: install blobs, Paolo Bonzini, 2020/01/28
- [PATCH 132/142] meson: install desktop file, Paolo Bonzini, 2020/01/28
- [PATCH 131/142] meson: install icons, Paolo Bonzini, 2020/01/28
- [PATCH 133/142] meson: convert pc-bios/keymaps/Makefile, Paolo Bonzini, 2020/01/28
- [PATCH 134/142] meson: convert po/, Paolo Bonzini, 2020/01/28
- [PATCH 137/142] meson: convert pc-bios/optionrom, Paolo Bonzini, 2020/01/28
- [PATCH 136/142] meson: convert pc-bios/s390-ccw, Paolo Bonzini, 2020/01/28
- [PATCH 135/142] meson: replace mostly useless pc-bios/Makefile,
Paolo Bonzini <=
- [PATCH 138/142] rules.mak: drop unneeded macros, Paolo Bonzini, 2020/01/28
- [PATCH 139/142] meson: convert check-block, Paolo Bonzini, 2020/01/28
- [PATCH 140/142] meson: convert check-decodetree, Paolo Bonzini, 2020/01/28
- [PATCH 142/142] meson: convert check-qapi-schema, Paolo Bonzini, 2020/01/28
- [PATCH 141/142] meson: convert tests/fp and check-softfloat, Paolo Bonzini, 2020/01/28