diff --git a/debian/changelog b/debian/changelog index 0f598d7..e53a998 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +th1520-boot-firmware (2025.05.10+sdk2.0.2) unstable; urgency=medium + + * Add debian prebuilt opensbi + * remove vendor opensbi + * mainline opensbi commit: 140844b3bd4a6f2919ccd2ff5e93c6222a4f71fb + * mainline opensbi-h commit: 83f3e406cf48a0228c0e0738758d48ccfcbb6ae9 + + -- Han Gao Sat, 10 May 2025 12:57:34 +0000 + th1520-boot-firmware (2025.02.17+sdk2.0.2) unstable; urgency=medium * mainline opensbi commit: 8fdf3013d08ed646c04d2ba4e32e7bcd7aefb9e7 diff --git a/debian/control b/debian/control index 785e4d4..add5522 100644 --- a/debian/control +++ b/debian/control @@ -8,29 +8,29 @@ Rules-Requires-Root: no Package: th1520-boot-firmware Architecture: riscv64 -Depends: th1520-vendor-opensbi | th1520-mainline-opensbi | th1520-mainline-opensbi-h, ${misc:Depends} +Depends: th1520-debian-opensbi | th1520-mainline-opensbi | th1520-mainline-opensbi-h, ${misc:Depends} Description: th1520 boot firmware addons of the RevyOS -Package: th1520-vendor-opensbi +Package: th1520-debian-opensbi Architecture: riscv64 Depends: ${misc:Depends} Conflicts: th1520-mainline-opensbi,th1520-mainline-opensbi-h -Breaks: th1520-boot-firmware (<< 2024.01.12+sdk1.4.2) -Description: th1520 vendor opensbi of the RevyOS - https://github.com/revyos/thead-opensbi/tree/lpi4a +Breaks: th1520-boot-firmware (<< 2025.02.17+sdk2.0.2) +Description: th1520 debian opensbi of the RevyOS + https://tracker.debian.org/pkg/opensbi Package: th1520-mainline-opensbi Architecture: riscv64 -Conflicts: th1520-vendor-opensbi,th1520-mainline-opensbi-h -Breaks: th1520-boot-firmware (<< 2024.01.12+sdk1.4.2) +Conflicts: th1520-debian-opensbi,th1520-mainline-opensbi-h +Breaks: th1520-boot-firmware (<< 2025.02.17+sdk2.0.2) Depends: ${misc:Depends} Description: th1520 mainline opensbi of the RevyOS https://github.com/revyos/opensbi/tree/th1520-v1.6 Package: th1520-mainline-opensbi-h Architecture: riscv64 -Conflicts: th1520-vendor-opensbi,th1520-mainline-opensbi -Breaks: th1520-boot-firmware (<< 2024.01.12+sdk1.4.2) +Conflicts: th1520-debian-opensbi,th1520-mainline-opensbi +Breaks: th1520-boot-firmware (<< 2025.02.17+sdk2.0.2) Depends: ${misc:Depends} Description: th1520 mainline opensbi of the RevyOS https://github.com/revyos/opensbi/tree/th1520-v1.6-h diff --git a/debian/rules b/debian/rules index 34350ae..ef9c7fd 100755 --- a/debian/rules +++ b/debian/rules @@ -2,9 +2,9 @@ export DH_VERBOSE = 1 export DEB_BUILD_OPTIONS += nostrip export BOOT_DESTDIR = debian/th1520-boot-firmware -export VENDOR_DESTDIR = debian/th1520-vendor-opensbi export MAINLINE_DESTDIR = debian/th1520-mainline-opensbi export MAINLINE_H_DESTDIR = debian/th1520-mainline-opensbi-h +export DEBIAN_DESTDIR = debian/th1520-debian-opensbi %: dh $@ @@ -12,12 +12,12 @@ export MAINLINE_H_DESTDIR = debian/th1520-mainline-opensbi-h override_dh_install: mkdir -p $(CURDIR)/$(BOOT_DESTDIR)$(PREFIX)/ cp -avpr $(CURDIR)/addons/* $(CURDIR)/$(BOOT_DESTDIR)$(PREFIX)/ - mkdir -p $(CURDIR)/$(VENDOR_DESTDIR)$(PREFIX)/boot - cp -avpr $(CURDIR)/opensbi/fw_dynamic.bin.vendor $(CURDIR)/$(VENDOR_DESTDIR)$(PREFIX)/boot/fw_dynamic.bin mkdir -p $(CURDIR)/$(MAINLINE_DESTDIR)$(PREFIX)/boot cp -avpr $(CURDIR)/opensbi/fw_dynamic.bin.mainline $(CURDIR)/$(MAINLINE_DESTDIR)$(PREFIX)/boot/fw_dynamic.bin mkdir -p $(CURDIR)/$(MAINLINE_H_DESTDIR)$(PREFIX)/boot cp -avpr $(CURDIR)/opensbi/fw_dynamic.bin.h $(CURDIR)/$(MAINLINE_H_DESTDIR)$(PREFIX)/boot/fw_dynamic.bin + mkdir -p $(CURDIR)/$(DEBIAN_DESTDIR)$(PREFIX)/boot + cp -avpr $(CURDIR)/opensbi/fw_dynamic.bin.debian $(CURDIR)/$(DEBIAN_DESTDIR)$(PREFIX)/boot/fw_dynamic.bin override_dh_clean: echo "None" diff --git a/debian/th1520-boot-firmware.install b/debian/th1520-boot-firmware.install deleted file mode 100644 index cd8d879..0000000 --- a/debian/th1520-boot-firmware.install +++ /dev/null @@ -1,3 +0,0 @@ -boot/light_aon_fpga.bin -boot/light_c906_audio.bin -boot/str.bin diff --git a/debian/th1520-mainline-opensbi.install b/debian/th1520-mainline-opensbi.install deleted file mode 100644 index 8769b7f..0000000 --- a/debian/th1520-mainline-opensbi.install +++ /dev/null @@ -1 +0,0 @@ -boot/fw_dynamic.bin diff --git a/debian/th1520-vendor-opensbi.install b/debian/th1520-vendor-opensbi.install deleted file mode 100644 index 8769b7f..0000000 --- a/debian/th1520-vendor-opensbi.install +++ /dev/null @@ -1 +0,0 @@ -boot/fw_dynamic.bin diff --git a/opensbi/fw_dynamic.bin.debian b/opensbi/fw_dynamic.bin.debian new file mode 100644 index 0000000..8dce01b Binary files /dev/null and b/opensbi/fw_dynamic.bin.debian differ diff --git a/opensbi/fw_dynamic.bin.h b/opensbi/fw_dynamic.bin.h index 0ac651c..47505a0 100644 Binary files a/opensbi/fw_dynamic.bin.h and b/opensbi/fw_dynamic.bin.h differ diff --git a/opensbi/fw_dynamic.bin.mainline b/opensbi/fw_dynamic.bin.mainline index 8f5d109..b35f4cc 100644 Binary files a/opensbi/fw_dynamic.bin.mainline and b/opensbi/fw_dynamic.bin.mainline differ diff --git a/opensbi/fw_dynamic.bin.vendor b/opensbi/fw_dynamic.bin.vendor deleted file mode 100644 index 6c6abb8..0000000 Binary files a/opensbi/fw_dynamic.bin.vendor and /dev/null differ