From c12c16659203d677618871f660c1499152a555a8 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Thu, 12 Jul 2018 22:08:22 +0800 Subject: rmc: remove It's not being maintained anymore and the scripts have not been kept in sync with upstream for quite some time. Signed-off-by: Anuj Mittal --- .../rmc/boards/MinnowboardTurbot/KBOOTPARAM | 1 - .../boards/MinnowboardTurbot/minnowboardturbot.fp | Bin 154 -> 0 bytes recipes-bsp/rmc/boards/NUC5i5RYB/BOOTENTRY.CONFIG | 2 - recipes-bsp/rmc/boards/NUC5i5RYB/INSTALLER.CONFIG | 2 - recipes-bsp/rmc/boards/NUC5i5RYB/POSTINSTALL.sh | 2 - recipes-bsp/rmc/boards/NUC5i5RYB/boot.conf | 4 - recipes-bsp/rmc/boards/NUC5i5RYB/install.conf | 4 - recipes-bsp/rmc/boards/NUC5i5RYB/nuc5i5.fp | Bin 149 -> 0 bytes recipes-bsp/rmc/boards/T100-32bit/BOOTENTRY.CONFIG | 2 - recipes-bsp/rmc/boards/T100-32bit/T100-32bit.fp | Bin 116 -> 0 bytes recipes-bsp/rmc/boards/T100-32bit/boot.conf | 4 - recipes-bsp/rmc/boards/T100-32bit/install.conf | 4 - recipes-bsp/rmc/boards/broxton-m/BOOTENTRY.CONFIG | 2 - recipes-bsp/rmc/boards/broxton-m/INSTALLER.CONFIG | 3 - recipes-bsp/rmc/boards/broxton-m/KBOOTPARAM | 1 - recipes-bsp/rmc/boards/broxton-m/POSTINSTALL.sh | 2 - recipes-bsp/rmc/boards/broxton-m/bm-1F1.fp | Bin 83 -> 0 bytes recipes-bsp/rmc/boards/broxton-m/bm.fp | Bin 83 -> 0 bytes recipes-bsp/rmc/boards/broxton-m/boot.conf | 4 - recipes-bsp/rmc/boards/broxton-m/install.conf | 4 - recipes-bsp/rmc/boards/broxton-m/joule-1F1.fp | Bin 122 -> 0 bytes recipes-bsp/rmc/boards/minnowmax/BOOTENTRY.CONFIG | 2 - recipes-bsp/rmc/boards/minnowmax/boot.conf | 4 - recipes-bsp/rmc/boards/minnowmax/install.conf | 4 - recipes-bsp/rmc/boards/minnowmax/minnowmax.fp | Bin 143 -> 0 bytes .../rmc/boards/minnowmaxB3/BOOTENTRY.CONFIG | 2 - recipes-bsp/rmc/boards/minnowmaxB3/boot.conf | 4 - recipes-bsp/rmc/boards/minnowmaxB3/install.conf | 4 - recipes-bsp/rmc/boards/minnowmaxB3/minnowmaxB3.fp | Bin 148 -> 0 bytes recipes-bsp/rmc/boards/mohonpeak/BOOTENTRY.CONFIG | 2 - recipes-bsp/rmc/boards/mohonpeak/INSTALLER.CONFIG | 3 - recipes-bsp/rmc/boards/mohonpeak/KBOOTPARAM | 1 - recipes-bsp/rmc/boards/mohonpeak/POSTINSTALL.sh | 3 - recipes-bsp/rmc/boards/mohonpeak/boot.conf | 4 - recipes-bsp/rmc/boards/mohonpeak/install.conf | 4 - recipes-bsp/rmc/boards/mohonpeak/mohonpeak.fp | Bin 121 -> 0 bytes recipes-bsp/rmc/boards/nucgen6/BOOTENTRY.CONFIG | 2 - recipes-bsp/rmc/boards/nucgen6/INSTALLER.CONFIG | 6 - recipes-bsp/rmc/boards/nucgen6/KBOOTPARAM | 1 - recipes-bsp/rmc/boards/nucgen6/POSTINSTALL.sh | 7 - recipes-bsp/rmc/boards/nucgen6/boot.conf | 4 - recipes-bsp/rmc/boards/nucgen6/install.conf | 4 - recipes-bsp/rmc/boards/nucgen6/mylib.conf | 7 - recipes-bsp/rmc/boards/nucgen6/nuc6.fp | Bin 149 -> 0 bytes recipes-bsp/rmc/boards/qemu-2.6/KBOOTPARAM | 1 - recipes-bsp/rmc/boards/qemu-2.6/qemu-2.6.fp | Bin 113 -> 0 bytes recipes-bsp/rmc/boards/qemu-2.8/KBOOTPARAM | 1 - recipes-bsp/rmc/boards/qemu-2.8/qemu-2.8.fp | Bin 113 -> 0 bytes recipes-bsp/rmc/rmc-db.bb | 62 ----- recipes-bsp/rmc/rmc-efi.bb | 40 ---- recipes-bsp/rmc/rmc.bb | 46 ---- ...evert-sd-boot-stub-Obtain-PE-section-offs.patch | 46 ---- ...-RMC-compatibility-with-systemd-boot-and-.patch | 62 ----- ...d-board-specific-boot-entries-from-RMC-da.patch | 252 --------------------- ...pport-global-kernel-command-line-fragment.patch | 67 ------ ...port-global-kernel-command-line-in-EFI-st.patch | 82 ------- recipes-bsp/systemd-boot/systemd-boot/rmc-boot.inc | 30 --- recipes-bsp/systemd-boot/systemd-boot_%.bbappend | 3 - 58 files changed, 801 deletions(-) delete mode 100644 recipes-bsp/rmc/boards/MinnowboardTurbot/KBOOTPARAM delete mode 100644 recipes-bsp/rmc/boards/MinnowboardTurbot/minnowboardturbot.fp delete mode 100644 recipes-bsp/rmc/boards/NUC5i5RYB/BOOTENTRY.CONFIG delete mode 100644 recipes-bsp/rmc/boards/NUC5i5RYB/INSTALLER.CONFIG delete mode 100644 recipes-bsp/rmc/boards/NUC5i5RYB/POSTINSTALL.sh delete mode 100644 recipes-bsp/rmc/boards/NUC5i5RYB/boot.conf delete mode 100644 recipes-bsp/rmc/boards/NUC5i5RYB/install.conf delete mode 100644 recipes-bsp/rmc/boards/NUC5i5RYB/nuc5i5.fp delete mode 100644 recipes-bsp/rmc/boards/T100-32bit/BOOTENTRY.CONFIG delete mode 100644 recipes-bsp/rmc/boards/T100-32bit/T100-32bit.fp delete mode 100644 recipes-bsp/rmc/boards/T100-32bit/boot.conf delete mode 100644 recipes-bsp/rmc/boards/T100-32bit/install.conf delete mode 100644 recipes-bsp/rmc/boards/broxton-m/BOOTENTRY.CONFIG delete mode 100644 recipes-bsp/rmc/boards/broxton-m/INSTALLER.CONFIG delete mode 100644 recipes-bsp/rmc/boards/broxton-m/KBOOTPARAM delete mode 100644 recipes-bsp/rmc/boards/broxton-m/POSTINSTALL.sh delete mode 100755 recipes-bsp/rmc/boards/broxton-m/bm-1F1.fp delete mode 100755 recipes-bsp/rmc/boards/broxton-m/bm.fp delete mode 100644 recipes-bsp/rmc/boards/broxton-m/boot.conf delete mode 100644 recipes-bsp/rmc/boards/broxton-m/install.conf delete mode 100644 recipes-bsp/rmc/boards/broxton-m/joule-1F1.fp delete mode 100644 recipes-bsp/rmc/boards/minnowmax/BOOTENTRY.CONFIG delete mode 100644 recipes-bsp/rmc/boards/minnowmax/boot.conf delete mode 100644 recipes-bsp/rmc/boards/minnowmax/install.conf delete mode 100644 recipes-bsp/rmc/boards/minnowmax/minnowmax.fp delete mode 100644 recipes-bsp/rmc/boards/minnowmaxB3/BOOTENTRY.CONFIG delete mode 100644 recipes-bsp/rmc/boards/minnowmaxB3/boot.conf delete mode 100644 recipes-bsp/rmc/boards/minnowmaxB3/install.conf delete mode 100644 recipes-bsp/rmc/boards/minnowmaxB3/minnowmaxB3.fp delete mode 100644 recipes-bsp/rmc/boards/mohonpeak/BOOTENTRY.CONFIG delete mode 100644 recipes-bsp/rmc/boards/mohonpeak/INSTALLER.CONFIG delete mode 100644 recipes-bsp/rmc/boards/mohonpeak/KBOOTPARAM delete mode 100644 recipes-bsp/rmc/boards/mohonpeak/POSTINSTALL.sh delete mode 100644 recipes-bsp/rmc/boards/mohonpeak/boot.conf delete mode 100644 recipes-bsp/rmc/boards/mohonpeak/install.conf delete mode 100644 recipes-bsp/rmc/boards/mohonpeak/mohonpeak.fp delete mode 100644 recipes-bsp/rmc/boards/nucgen6/BOOTENTRY.CONFIG delete mode 100644 recipes-bsp/rmc/boards/nucgen6/INSTALLER.CONFIG delete mode 100644 recipes-bsp/rmc/boards/nucgen6/KBOOTPARAM delete mode 100644 recipes-bsp/rmc/boards/nucgen6/POSTINSTALL.sh delete mode 100644 recipes-bsp/rmc/boards/nucgen6/boot.conf delete mode 100644 recipes-bsp/rmc/boards/nucgen6/install.conf delete mode 100644 recipes-bsp/rmc/boards/nucgen6/mylib.conf delete mode 100644 recipes-bsp/rmc/boards/nucgen6/nuc6.fp delete mode 100644 recipes-bsp/rmc/boards/qemu-2.6/KBOOTPARAM delete mode 100644 recipes-bsp/rmc/boards/qemu-2.6/qemu-2.6.fp delete mode 100644 recipes-bsp/rmc/boards/qemu-2.8/KBOOTPARAM delete mode 100644 recipes-bsp/rmc/boards/qemu-2.8/qemu-2.8.fp delete mode 100644 recipes-bsp/rmc/rmc-db.bb delete mode 100644 recipes-bsp/rmc/rmc-efi.bb delete mode 100644 recipes-bsp/rmc/rmc.bb delete mode 100644 recipes-bsp/systemd-boot/systemd-boot/0001-partially-revert-sd-boot-stub-Obtain-PE-section-offs.patch delete mode 100644 recipes-bsp/systemd-boot/systemd-boot/0002-sd-boot-fix-RMC-compatibility-with-systemd-boot-and-.patch delete mode 100644 recipes-bsp/systemd-boot/systemd-boot/0003-sd-boot-Load-board-specific-boot-entries-from-RMC-da.patch delete mode 100644 recipes-bsp/systemd-boot/systemd-boot/0004-sd-boot-Support-global-kernel-command-line-fragment.patch delete mode 100644 recipes-bsp/systemd-boot/systemd-boot/0005-sd-boot-support-global-kernel-command-line-in-EFI-st.patch delete mode 100644 recipes-bsp/systemd-boot/systemd-boot/rmc-boot.inc (limited to 'recipes-bsp') diff --git a/recipes-bsp/rmc/boards/MinnowboardTurbot/KBOOTPARAM b/recipes-bsp/rmc/boards/MinnowboardTurbot/KBOOTPARAM deleted file mode 100644 index 476b1fbe..00000000 --- a/recipes-bsp/rmc/boards/MinnowboardTurbot/KBOOTPARAM +++ /dev/null @@ -1 +0,0 @@ -console=ttyS0,115200 diff --git a/recipes-bsp/rmc/boards/MinnowboardTurbot/minnowboardturbot.fp b/recipes-bsp/rmc/boards/MinnowboardTurbot/minnowboardturbot.fp deleted file mode 100644 index 9aa145f3..00000000 Binary files a/recipes-bsp/rmc/boards/MinnowboardTurbot/minnowboardturbot.fp and /dev/null differ diff --git a/recipes-bsp/rmc/boards/NUC5i5RYB/BOOTENTRY.CONFIG b/recipes-bsp/rmc/boards/NUC5i5RYB/BOOTENTRY.CONFIG deleted file mode 100644 index b2fabe82..00000000 --- a/recipes-bsp/rmc/boards/NUC5i5RYB/BOOTENTRY.CONFIG +++ /dev/null @@ -1,2 +0,0 @@ -boot.conf -install.conf diff --git a/recipes-bsp/rmc/boards/NUC5i5RYB/INSTALLER.CONFIG b/recipes-bsp/rmc/boards/NUC5i5RYB/INSTALLER.CONFIG deleted file mode 100644 index ca5f04b9..00000000 --- a/recipes-bsp/rmc/boards/NUC5i5RYB/INSTALLER.CONFIG +++ /dev/null @@ -1,2 +0,0 @@ -efi_entry_dir:root:disk:770:/boot/loader/entries/ -boot.conf:root:disk:770:/boot/loader/entries/rmcboot.conf diff --git a/recipes-bsp/rmc/boards/NUC5i5RYB/POSTINSTALL.sh b/recipes-bsp/rmc/boards/NUC5i5RYB/POSTINSTALL.sh deleted file mode 100644 index 6694261b..00000000 --- a/recipes-bsp/rmc/boards/NUC5i5RYB/POSTINSTALL.sh +++ /dev/null @@ -1,2 +0,0 @@ -# There is no tty device on this board. -sed -i '/start_getty.\+ttyS.*/d' /tgt_root/etc/inittab diff --git a/recipes-bsp/rmc/boards/NUC5i5RYB/boot.conf b/recipes-bsp/rmc/boards/NUC5i5RYB/boot.conf deleted file mode 100644 index b29fa45e..00000000 --- a/recipes-bsp/rmc/boards/NUC5i5RYB/boot.conf +++ /dev/null @@ -1,4 +0,0 @@ -title NUC5i5RYB boot -linux /vmlinuz -initrd /initrd -options LABEL=boot rootwait diff --git a/recipes-bsp/rmc/boards/NUC5i5RYB/install.conf b/recipes-bsp/rmc/boards/NUC5i5RYB/install.conf deleted file mode 100644 index 0dca3cae..00000000 --- a/recipes-bsp/rmc/boards/NUC5i5RYB/install.conf +++ /dev/null @@ -1,4 +0,0 @@ -title NUC5i5RYB install -linux /vmlinuz -initrd /initrd -options LABEL=install-efi rootwait diff --git a/recipes-bsp/rmc/boards/NUC5i5RYB/nuc5i5.fp b/recipes-bsp/rmc/boards/NUC5i5RYB/nuc5i5.fp deleted file mode 100644 index 57374779..00000000 Binary files a/recipes-bsp/rmc/boards/NUC5i5RYB/nuc5i5.fp and /dev/null differ diff --git a/recipes-bsp/rmc/boards/T100-32bit/BOOTENTRY.CONFIG b/recipes-bsp/rmc/boards/T100-32bit/BOOTENTRY.CONFIG deleted file mode 100644 index b2fabe82..00000000 --- a/recipes-bsp/rmc/boards/T100-32bit/BOOTENTRY.CONFIG +++ /dev/null @@ -1,2 +0,0 @@ -boot.conf -install.conf diff --git a/recipes-bsp/rmc/boards/T100-32bit/T100-32bit.fp b/recipes-bsp/rmc/boards/T100-32bit/T100-32bit.fp deleted file mode 100644 index 86ecea73..00000000 Binary files a/recipes-bsp/rmc/boards/T100-32bit/T100-32bit.fp and /dev/null differ diff --git a/recipes-bsp/rmc/boards/T100-32bit/boot.conf b/recipes-bsp/rmc/boards/T100-32bit/boot.conf deleted file mode 100644 index f1578e0f..00000000 --- a/recipes-bsp/rmc/boards/T100-32bit/boot.conf +++ /dev/null @@ -1,4 +0,0 @@ -title T100T(32bit) boot -linux /vmlinuz -initrd /initrd -options LABEL=boot loglevel=8 diff --git a/recipes-bsp/rmc/boards/T100-32bit/install.conf b/recipes-bsp/rmc/boards/T100-32bit/install.conf deleted file mode 100644 index 67e7eb18..00000000 --- a/recipes-bsp/rmc/boards/T100-32bit/install.conf +++ /dev/null @@ -1,4 +0,0 @@ -title T100T(32bit) install -linux /vmlinuz -initrd /initrd -options LABEL=install-efi diff --git a/recipes-bsp/rmc/boards/broxton-m/BOOTENTRY.CONFIG b/recipes-bsp/rmc/boards/broxton-m/BOOTENTRY.CONFIG deleted file mode 100644 index b2fabe82..00000000 --- a/recipes-bsp/rmc/boards/broxton-m/BOOTENTRY.CONFIG +++ /dev/null @@ -1,2 +0,0 @@ -boot.conf -install.conf diff --git a/recipes-bsp/rmc/boards/broxton-m/INSTALLER.CONFIG b/recipes-bsp/rmc/boards/broxton-m/INSTALLER.CONFIG deleted file mode 100644 index ecd20609..00000000 --- a/recipes-bsp/rmc/boards/broxton-m/INSTALLER.CONFIG +++ /dev/null @@ -1,3 +0,0 @@ -# Keep rmc Joule boot.conf instead of meta-intel default -efi_entry_dir:root:disk:770:/boot/loader/entries/ -boot.conf:root:disk:770:/boot/loader/entries/boot.conf diff --git a/recipes-bsp/rmc/boards/broxton-m/KBOOTPARAM b/recipes-bsp/rmc/boards/broxton-m/KBOOTPARAM deleted file mode 100644 index 08be5dfb..00000000 --- a/recipes-bsp/rmc/boards/broxton-m/KBOOTPARAM +++ /dev/null @@ -1 +0,0 @@ -video=efifb maxcpus=4 reboot=efi kmemleak=off console=tty0 console=ttyS2,115200 diff --git a/recipes-bsp/rmc/boards/broxton-m/POSTINSTALL.sh b/recipes-bsp/rmc/boards/broxton-m/POSTINSTALL.sh deleted file mode 100644 index 30bbd28e..00000000 --- a/recipes-bsp/rmc/boards/broxton-m/POSTINSTALL.sh +++ /dev/null @@ -1,2 +0,0 @@ -# Joule uses only S2 for serial, so remove S0 -sed -i '/start_getty.\+ttyS0/d' /tgt_root/etc/inittab diff --git a/recipes-bsp/rmc/boards/broxton-m/bm-1F1.fp b/recipes-bsp/rmc/boards/broxton-m/bm-1F1.fp deleted file mode 100755 index 1a150280..00000000 Binary files a/recipes-bsp/rmc/boards/broxton-m/bm-1F1.fp and /dev/null differ diff --git a/recipes-bsp/rmc/boards/broxton-m/bm.fp b/recipes-bsp/rmc/boards/broxton-m/bm.fp deleted file mode 100755 index 135a7a5d..00000000 Binary files a/recipes-bsp/rmc/boards/broxton-m/bm.fp and /dev/null differ diff --git a/recipes-bsp/rmc/boards/broxton-m/boot.conf b/recipes-bsp/rmc/boards/broxton-m/boot.conf deleted file mode 100644 index caa00c50..00000000 --- a/recipes-bsp/rmc/boards/broxton-m/boot.conf +++ /dev/null @@ -1,4 +0,0 @@ -title Joule / Broxton-m -linux /vmlinuz -initrd /initrd -options LABEL=boot diff --git a/recipes-bsp/rmc/boards/broxton-m/install.conf b/recipes-bsp/rmc/boards/broxton-m/install.conf deleted file mode 100644 index 9cdd86b7..00000000 --- a/recipes-bsp/rmc/boards/broxton-m/install.conf +++ /dev/null @@ -1,4 +0,0 @@ -title Joule / Broxton-m Install -linux /vmlinuz -initrd /initrd -options LABEL=install-efi rootwait diff --git a/recipes-bsp/rmc/boards/broxton-m/joule-1F1.fp b/recipes-bsp/rmc/boards/broxton-m/joule-1F1.fp deleted file mode 100644 index d757614f..00000000 Binary files a/recipes-bsp/rmc/boards/broxton-m/joule-1F1.fp and /dev/null differ diff --git a/recipes-bsp/rmc/boards/minnowmax/BOOTENTRY.CONFIG b/recipes-bsp/rmc/boards/minnowmax/BOOTENTRY.CONFIG deleted file mode 100644 index b2fabe82..00000000 --- a/recipes-bsp/rmc/boards/minnowmax/BOOTENTRY.CONFIG +++ /dev/null @@ -1,2 +0,0 @@ -boot.conf -install.conf diff --git a/recipes-bsp/rmc/boards/minnowmax/boot.conf b/recipes-bsp/rmc/boards/minnowmax/boot.conf deleted file mode 100644 index 6e789cd8..00000000 --- a/recipes-bsp/rmc/boards/minnowmax/boot.conf +++ /dev/null @@ -1,4 +0,0 @@ -title Minnow Max boot -linux /vmlinuz -initrd /initrd -options LABEL=boot console=ttyS0,115200n8 diff --git a/recipes-bsp/rmc/boards/minnowmax/install.conf b/recipes-bsp/rmc/boards/minnowmax/install.conf deleted file mode 100644 index 1a493aec..00000000 --- a/recipes-bsp/rmc/boards/minnowmax/install.conf +++ /dev/null @@ -1,4 +0,0 @@ -title Minnow Max install -linux /vmlinuz -initrd /initrd -options LABEL=install-efi console=ttyS0,115200n8 diff --git a/recipes-bsp/rmc/boards/minnowmax/minnowmax.fp b/recipes-bsp/rmc/boards/minnowmax/minnowmax.fp deleted file mode 100644 index 3c5a286f..00000000 Binary files a/recipes-bsp/rmc/boards/minnowmax/minnowmax.fp and /dev/null differ diff --git a/recipes-bsp/rmc/boards/minnowmaxB3/BOOTENTRY.CONFIG b/recipes-bsp/rmc/boards/minnowmaxB3/BOOTENTRY.CONFIG deleted file mode 100644 index b2fabe82..00000000 --- a/recipes-bsp/rmc/boards/minnowmaxB3/BOOTENTRY.CONFIG +++ /dev/null @@ -1,2 +0,0 @@ -boot.conf -install.conf diff --git a/recipes-bsp/rmc/boards/minnowmaxB3/boot.conf b/recipes-bsp/rmc/boards/minnowmaxB3/boot.conf deleted file mode 100644 index 577e5d6a..00000000 --- a/recipes-bsp/rmc/boards/minnowmaxB3/boot.conf +++ /dev/null @@ -1,4 +0,0 @@ -title Minnow Max B3 boot -linux /vmlinuz -initrd /initrd -options LABEL=boot console=ttyS0,115200n8 diff --git a/recipes-bsp/rmc/boards/minnowmaxB3/install.conf b/recipes-bsp/rmc/boards/minnowmaxB3/install.conf deleted file mode 100644 index cf500d6c..00000000 --- a/recipes-bsp/rmc/boards/minnowmaxB3/install.conf +++ /dev/null @@ -1,4 +0,0 @@ -title Minnow Max B3 install -linux /vmlinuz -initrd /initrd -options LABEL=install-efi console=ttyS0,115200n8 diff --git a/recipes-bsp/rmc/boards/minnowmaxB3/minnowmaxB3.fp b/recipes-bsp/rmc/boards/minnowmaxB3/minnowmaxB3.fp deleted file mode 100644 index ad3f0d6d..00000000 Binary files a/recipes-bsp/rmc/boards/minnowmaxB3/minnowmaxB3.fp and /dev/null differ diff --git a/recipes-bsp/rmc/boards/mohonpeak/BOOTENTRY.CONFIG b/recipes-bsp/rmc/boards/mohonpeak/BOOTENTRY.CONFIG deleted file mode 100644 index b2fabe82..00000000 --- a/recipes-bsp/rmc/boards/mohonpeak/BOOTENTRY.CONFIG +++ /dev/null @@ -1,2 +0,0 @@ -boot.conf -install.conf diff --git a/recipes-bsp/rmc/boards/mohonpeak/INSTALLER.CONFIG b/recipes-bsp/rmc/boards/mohonpeak/INSTALLER.CONFIG deleted file mode 100644 index 8c5a7678..00000000 --- a/recipes-bsp/rmc/boards/mohonpeak/INSTALLER.CONFIG +++ /dev/null @@ -1,3 +0,0 @@ -# Keep rmc Mohonpeak boot.conf instead of meta-intel default -efi_entry_dir:root:disk:770:/boot/loader/entries/ -boot.conf:root:disk:770:/boot/loader/entries/boot.conf diff --git a/recipes-bsp/rmc/boards/mohonpeak/KBOOTPARAM b/recipes-bsp/rmc/boards/mohonpeak/KBOOTPARAM deleted file mode 100644 index 169056ee..00000000 --- a/recipes-bsp/rmc/boards/mohonpeak/KBOOTPARAM +++ /dev/null @@ -1 +0,0 @@ -console=ttyS1,115200 console=tty1 diff --git a/recipes-bsp/rmc/boards/mohonpeak/POSTINSTALL.sh b/recipes-bsp/rmc/boards/mohonpeak/POSTINSTALL.sh deleted file mode 100644 index 5f440c38..00000000 --- a/recipes-bsp/rmc/boards/mohonpeak/POSTINSTALL.sh +++ /dev/null @@ -1,3 +0,0 @@ -# Mohonpeak uses only S1 for serial, so remove S0 and S2 -sed -i '/start_getty.\+ttyS0/d' /tgt_root/etc/inittab -sed -i '/start_getty.\+ttyS2/d' /tgt_root/etc/inittab diff --git a/recipes-bsp/rmc/boards/mohonpeak/boot.conf b/recipes-bsp/rmc/boards/mohonpeak/boot.conf deleted file mode 100644 index 5b7a0f63..00000000 --- a/recipes-bsp/rmc/boards/mohonpeak/boot.conf +++ /dev/null @@ -1,4 +0,0 @@ -title Mohon Peak boot -linux /vmlinuz -initrd /initrd -options LABEL=boot diff --git a/recipes-bsp/rmc/boards/mohonpeak/install.conf b/recipes-bsp/rmc/boards/mohonpeak/install.conf deleted file mode 100644 index dde3497d..00000000 --- a/recipes-bsp/rmc/boards/mohonpeak/install.conf +++ /dev/null @@ -1,4 +0,0 @@ -title Mohon Peak Install -linux /vmlinuz -initrd /initrd -options LABEL=install-efi rootwait diff --git a/recipes-bsp/rmc/boards/mohonpeak/mohonpeak.fp b/recipes-bsp/rmc/boards/mohonpeak/mohonpeak.fp deleted file mode 100644 index bc4bdae4..00000000 Binary files a/recipes-bsp/rmc/boards/mohonpeak/mohonpeak.fp and /dev/null differ diff --git a/recipes-bsp/rmc/boards/nucgen6/BOOTENTRY.CONFIG b/recipes-bsp/rmc/boards/nucgen6/BOOTENTRY.CONFIG deleted file mode 100644 index b2fabe82..00000000 --- a/recipes-bsp/rmc/boards/nucgen6/BOOTENTRY.CONFIG +++ /dev/null @@ -1,2 +0,0 @@ -boot.conf -install.conf diff --git a/recipes-bsp/rmc/boards/nucgen6/INSTALLER.CONFIG b/recipes-bsp/rmc/boards/nucgen6/INSTALLER.CONFIG deleted file mode 100644 index 7d5378b2..00000000 --- a/recipes-bsp/rmc/boards/nucgen6/INSTALLER.CONFIG +++ /dev/null @@ -1,6 +0,0 @@ -# This file specifies which file or dir RMC will install onto target. -# Note the absolute path is referred from mount points in installation. -efi_entry_dir:root:disk:770:/boot/loader/entries/ -boot.conf:root:disk:770:/boot/loader/entries/rmcboot.conf -mylibdir:root:root:770:/tgt_root/etc/mylib/ -mylib.conf:root:root:660:/tgt_root/etc/mylib/mylib.conf diff --git a/recipes-bsp/rmc/boards/nucgen6/KBOOTPARAM b/recipes-bsp/rmc/boards/nucgen6/KBOOTPARAM deleted file mode 100644 index 27943b49..00000000 --- a/recipes-bsp/rmc/boards/nucgen6/KBOOTPARAM +++ /dev/null @@ -1 +0,0 @@ -i915.preliminary_hw_support=1 diff --git a/recipes-bsp/rmc/boards/nucgen6/POSTINSTALL.sh b/recipes-bsp/rmc/boards/nucgen6/POSTINSTALL.sh deleted file mode 100644 index bec3be42..00000000 --- a/recipes-bsp/rmc/boards/nucgen6/POSTINSTALL.sh +++ /dev/null @@ -1,7 +0,0 @@ -# NUC Gen 6 specific retouch after RMC deployment - -# The generated inittab from OE build causes error messages: -# "auth.err getty[615]: tcgetattr: Input/output error" -# in /var/log/messages because NUC Gen 6 doesn't have any -# serial tty. We delete line(s) here on target. -sed -i '/start_getty.\+ttyS.*/d' /tgt_root/etc/inittab diff --git a/recipes-bsp/rmc/boards/nucgen6/boot.conf b/recipes-bsp/rmc/boards/nucgen6/boot.conf deleted file mode 100644 index e6ecb029..00000000 --- a/recipes-bsp/rmc/boards/nucgen6/boot.conf +++ /dev/null @@ -1,4 +0,0 @@ -title NUC Gen6 boot -linux /vmlinuz -initrd /initrd -options LABEL=boot diff --git a/recipes-bsp/rmc/boards/nucgen6/install.conf b/recipes-bsp/rmc/boards/nucgen6/install.conf deleted file mode 100644 index 916bb04b..00000000 --- a/recipes-bsp/rmc/boards/nucgen6/install.conf +++ /dev/null @@ -1,4 +0,0 @@ -title NUC Gen6 install -linux /vmlinuz -initrd /initrd -options LABEL=install-efi diff --git a/recipes-bsp/rmc/boards/nucgen6/mylib.conf b/recipes-bsp/rmc/boards/nucgen6/mylib.conf deleted file mode 100644 index fd8357c2..00000000 --- a/recipes-bsp/rmc/boards/nucgen6/mylib.conf +++ /dev/null @@ -1,7 +0,0 @@ -# This is a demo conf file read by an imagined program or library -# which reads this file at runtime to customize its behavior. -# rmc will deploy it to the location specified in INSTALLER.CONFIG. - -lib.info = "V1.0 for rmc demo" -lib.board = "NUC gen 6" -prog.ui.layout = "minimal" diff --git a/recipes-bsp/rmc/boards/nucgen6/nuc6.fp b/recipes-bsp/rmc/boards/nucgen6/nuc6.fp deleted file mode 100644 index 834f800b..00000000 Binary files a/recipes-bsp/rmc/boards/nucgen6/nuc6.fp and /dev/null differ diff --git a/recipes-bsp/rmc/boards/qemu-2.6/KBOOTPARAM b/recipes-bsp/rmc/boards/qemu-2.6/KBOOTPARAM deleted file mode 100644 index 476b1fbe..00000000 --- a/recipes-bsp/rmc/boards/qemu-2.6/KBOOTPARAM +++ /dev/null @@ -1 +0,0 @@ -console=ttyS0,115200 diff --git a/recipes-bsp/rmc/boards/qemu-2.6/qemu-2.6.fp b/recipes-bsp/rmc/boards/qemu-2.6/qemu-2.6.fp deleted file mode 100644 index e4c41657..00000000 Binary files a/recipes-bsp/rmc/boards/qemu-2.6/qemu-2.6.fp and /dev/null differ diff --git a/recipes-bsp/rmc/boards/qemu-2.8/KBOOTPARAM b/recipes-bsp/rmc/boards/qemu-2.8/KBOOTPARAM deleted file mode 100644 index 476b1fbe..00000000 --- a/recipes-bsp/rmc/boards/qemu-2.8/KBOOTPARAM +++ /dev/null @@ -1 +0,0 @@ -console=ttyS0,115200 diff --git a/recipes-bsp/rmc/boards/qemu-2.8/qemu-2.8.fp b/recipes-bsp/rmc/boards/qemu-2.8/qemu-2.8.fp deleted file mode 100644 index 7f28f37c..00000000 Binary files a/recipes-bsp/rmc/boards/qemu-2.8/qemu-2.8.fp and /dev/null differ diff --git a/recipes-bsp/rmc/rmc-db.bb b/recipes-bsp/rmc/rmc-db.bb deleted file mode 100644 index 7ec824a8..00000000 --- a/recipes-bsp/rmc/rmc-db.bb +++ /dev/null @@ -1,62 +0,0 @@ -SUMMARY = "Central RMC Database" -DESCRIPTION = "Generate a centralized RMC database for RMC feature. \ -Fingerprints and data for all boards supported are specified by variable \ -RMC_BOARD_DATA_DIRS which is a list of top directories that contains \ -subdirectories for boards. Developers can add their top directories by appending \ -them to this variable in a rmc-db.bbappend.Refer to rmc-db bbclass for more \ -information." - -LICENSE = "MIT" - -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - -S = "${WORKDIR}" - -inherit rmc-db - -RMC_BOARD_DATA_DIRS ?= "${THISDIR}/boards/" -RMC_DB_DIR = "${WORKDIR}/db" - -FILES_${PN} = "/boot/rmc.db" - -# Let sstate be aware of change in any added board directories -do_generate_rmc_db[file-checksums] = "${@get_rmc_top_dirs_list(d)}" - -# derived from get_lic_checksum_file_list(d) in base.bbclass in OE -def get_rmc_top_dirs_list(d): - dirlist = [] - dirs = d.getVar("RMC_BOARD_DATA_DIRS", True) or '' - topdirs = dirs.split() - for each in topdirs: - dirlist.append(each + ":" + str(os.path.exists(each))) - return " ".join(dirlist) - -do_generate_rmc_db () { - rmc_generate_db "${RMC_BOARD_DATA_DIRS}" "${RMC_DB_DIR}"/rmc.db -} - -addtask generate_rmc_db after do_compile - -inherit deploy - -do_deploy () { - if [ -f ${RMC_DB_DIR}/rmc.db ]; then - install -m 0400 ${RMC_DB_DIR}/rmc.db ${DEPLOYDIR} - else - rm -f ${DEPLOYDIR}/rmc.db - echo "Warning: no RMC central database found, skip deployment." - fi -} - -do_install () { - install -d ${D}/boot - if [ -f ${RMC_DB_DIR}/rmc.db ]; then - install -m 0400 ${RMC_DB_DIR}/rmc.db ${D}/boot/ - else - rm -f ${D}/rmc.db - echo "Warning: no RMC central database found, skip installation." - fi -} -do_install[depends] += "${PN}:do_generate_rmc_db" - -addtask deploy after do_generate_rmc_db diff --git a/recipes-bsp/rmc/rmc-efi.bb b/recipes-bsp/rmc/rmc-efi.bb deleted file mode 100644 index 2a1c9a98..00000000 --- a/recipes-bsp/rmc/rmc-efi.bb +++ /dev/null @@ -1,40 +0,0 @@ -SUMMARY = "RMC (Runtime Machine Configuration) EFI library" - -DESCRIPTION = "The RMC EFI library adds RMC support to existing EFI bootloaders" - -LICENSE = "MIT" - -LIC_FILES_CHKSUM = "file://COPYING;md5=ade413c694d3aaefc9554b24a8814ee8" - -SRC_URI = "git://git.yoctoproject.org/rmc" - -SRCREV = "027ac76f642dcab1a9f237a00f03a3a714bd04b9" - -S = "${WORKDIR}/git" - -COMPATIBLE_HOST = "(x86_64.*|i.86.*)-linux*" - -TARGET_CFLAGS +="-Wl,--hash-style=both" - -EXTRA_OEMAKE = "RMC_INSTALL_PREFIX=${D}/${prefix} \ - RMC_INSTALL_LIB_PATH=${D}${libdir} \ - RMC_INSTALL_HEADER_PATH=${D}${includedir}/rmc" - -SECURITY_CFLAGS_remove_class-target = "-fstack-protector-strong" -SECURITY_CFLAGS_append_class-target = " -fno-stack-protector" - -python () { - ccargs = d.getVar('TUNE_CCARGS').split() - if '-mx32' in ccargs: - ccargs.remove('-mx32') - ccargs.append('-m64') - d.setVar('TUNE_CCARGS', ' '.join(ccargs)) -} - -do_compile() { - oe_runmake -f Makefile.efi -} - -do_install() { - oe_runmake -f Makefile.efi install -} diff --git a/recipes-bsp/rmc/rmc.bb b/recipes-bsp/rmc/rmc.bb deleted file mode 100644 index 8797644b..00000000 --- a/recipes-bsp/rmc/rmc.bb +++ /dev/null @@ -1,46 +0,0 @@ -SUMMARY = "RMC (Runtime Machine Configuration)" - -DESCRIPTION = "RMC project provides a tool and libraries to identify types \ -of hardware boards and access any file-based data specific to the board's \ -type at runtime in a centralized way. Software (clients) can have a generic \ -logic to query board-specific data from RMC without knowing the type of board. \ -This make it possible to have a generic software work running on boards which \ -require any quirks or customizations at a board or product level. \ -" - -LICENSE = "MIT" - -LIC_FILES_CHKSUM = "file://COPYING;md5=ade413c694d3aaefc9554b24a8814ee8" - -SRC_URI = "git://git.yoctoproject.org/rmc" - -SRCREV = "027ac76f642dcab1a9f237a00f03a3a714bd04b9" - -S = "${WORKDIR}/git" - -COMPATIBLE_HOST = "(x86_64.*|i.86.*)-linux*" - -TARGET_CFLAGS +="-Wl,--hash-style=both" - -EXTRA_OEMAKE = "RMC_INSTALL_PREFIX=${D}/${prefix} \ - RMC_INSTALL_BIN_PATH=${D}${bindir} \ - RMC_INSTALL_LIB_PATH=${D}${libdir} \ - RMC_INSTALL_HEADER_PATH=${D}${includedir}/rmc" - -SECURITY_CFLAGS_remove_class-target = "-fstack-protector-strong" -SECURITY_CFLAGS_append_class-target = " -fno-stack-protector" - -do_compile_class-target() { - oe_runmake -} - -do_install() { - oe_runmake install -} - -do_install_class-native() { - install -d ${D}${STAGING_BINDIR_NATIVE} - install -m 0755 ${S}/src/rmc ${D}${STAGING_BINDIR_NATIVE} -} - -BBCLASSEXTEND = "native" diff --git a/recipes-bsp/systemd-boot/systemd-boot/0001-partially-revert-sd-boot-stub-Obtain-PE-section-offs.patch b/recipes-bsp/systemd-boot/systemd-boot/0001-partially-revert-sd-boot-stub-Obtain-PE-section-offs.patch deleted file mode 100644 index 6d7b144d..00000000 --- a/recipes-bsp/systemd-boot/systemd-boot/0001-partially-revert-sd-boot-stub-Obtain-PE-section-offs.patch +++ /dev/null @@ -1,46 +0,0 @@ -From beb095f41d458b7d684c0cd6cac1749e2fc3f29b Mon Sep 17 00:00:00 2001 -From: California Sullivan -Date: Wed, 21 Mar 2018 13:01:26 -0700 -Subject: [PATCH 1/5] partially revert "sd-boot: stub: Obtain PE section - offsets from RAM, not disk (#6250)" - -Only revert the section for finding the root_dir, as RMC needs this to -find its database file. - -Upstream-Status: Inappropriate [upstream doesn't need the root_dir]. - -Signed-off-by: California Sullivan ---- - src/boot/efi/stub.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/src/boot/efi/stub.c b/src/boot/efi/stub.c -index ff45cebd4..540ca5985 100644 ---- a/src/boot/efi/stub.c -+++ b/src/boot/efi/stub.c -@@ -30,6 +30,8 @@ static const EFI_GUID global_guid = EFI_GLOBAL_VARIABLE; - - EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *sys_table) { - EFI_LOADED_IMAGE *loaded_image; -+ EFI_FILE *root_dir; -+ CHAR16 *loaded_image_path; - CHAR8 *b; - UINTN size; - BOOLEAN secure = FALSE; -@@ -58,6 +60,13 @@ EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *sys_table) { - return err; - } - -+ root_dir = LibOpenRoot(loaded_image->DeviceHandle); -+ if (!root_dir) { -+ Print(L"Unable to open root directory: %r ", err); -+ uefi_call_wrapper(BS->Stall, 1, 3 * 1000 * 1000); -+ return EFI_LOAD_ERROR; -+ } -+ - if (efivar_get_raw(&global_guid, L"SecureBoot", &b, &size) == EFI_SUCCESS) { - if (*b > 0) - secure = TRUE; --- -2.14.3 - diff --git a/recipes-bsp/systemd-boot/systemd-boot/0002-sd-boot-fix-RMC-compatibility-with-systemd-boot-and-.patch b/recipes-bsp/systemd-boot/systemd-boot/0002-sd-boot-fix-RMC-compatibility-with-systemd-boot-and-.patch deleted file mode 100644 index a3e496f5..00000000 --- a/recipes-bsp/systemd-boot/systemd-boot/0002-sd-boot-fix-RMC-compatibility-with-systemd-boot-and-.patch +++ /dev/null @@ -1,62 +0,0 @@ -From af977853ab722194c4754e6693f430f50a42190f Mon Sep 17 00:00:00 2001 -From: California Sullivan -Date: Tue, 20 Mar 2018 10:08:14 -0700 -Subject: [PATCH 2/5] sd-boot: fix RMC compatibility with systemd-boot and - meson - -With autotools swapped out for meson a number of things need to be -changed. - -Upstream-Status: Pending - -Signed-off-by: California Sullivan ---- - meson_options.txt | 2 ++ - src/boot/efi/meson.build | 4 +++- - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/meson_options.txt b/meson_options.txt -index 39822d6cd..d8a480401 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -279,6 +279,8 @@ option('efi-ldsdir', type : 'string', - description : 'path to the EFI lds directory') - option('efi-includedir', type : 'string', value : '/usr/include/efi', - description : 'path to the EFI header directory') -+option('rmc-includedir', type : 'string', value : '/usr/include/rmc', -+ description : 'path to the RMC header directory') - option('tpm-pcrindex', type : 'string', value : '8', - description : 'TPM PCR register number to use') - -diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build -index 9f9ec4911..266ff928f 100644 ---- a/src/boot/efi/meson.build -+++ b/src/boot/efi/meson.build -@@ -83,6 +83,7 @@ if have_gnu_efi - efi_conf.set_quoted('EFI_MACHINE_TYPE_NAME', EFI_MACHINE_TYPE_NAME) - efi_conf.set10('ENABLE_TPM', get_option('tpm')) - efi_conf.set('SD_TPM_PCR', get_option('tpm-pcrindex')) -+ efi_conf.set('RMC_EFI', 'true') - - efi_config_h = configure_file( - output : 'efi_config.h', -@@ -121,6 +122,7 @@ if have_gnu_efi - '-Wsign-compare', - '-Wno-missing-field-initializers', - '-isystem', efi_incdir, -+ '-isystem', get_option('rmc-includedir'), - '-isystem', join_paths(efi_incdir, gnu_efi_arch), - '-include', efi_config_h] - if efi_arch == 'x86_64' -@@ -191,7 +193,7 @@ if have_gnu_efi - output : tuple[0], - command : efi_ld.split() + ['-o', '@OUTPUT@'] + - efi_ldflags + tuple[2] + -- ['-lefi', '-lgnuefi', libgcc_file_name]) -+ ['-lefi', '-lgnuefi', '-lrmcefi', libgcc_file_name]) - - test('no-undefined-symbols-' + tuple[0], - no_undefined_symbols, --- -2.14.3 - diff --git a/recipes-bsp/systemd-boot/systemd-boot/0003-sd-boot-Load-board-specific-boot-entries-from-RMC-da.patch b/recipes-bsp/systemd-boot/systemd-boot/0003-sd-boot-Load-board-specific-boot-entries-from-RMC-da.patch deleted file mode 100644 index cef934ce..00000000 --- a/recipes-bsp/systemd-boot/systemd-boot/0003-sd-boot-Load-board-specific-boot-entries-from-RMC-da.patch +++ /dev/null @@ -1,252 +0,0 @@ -From b780c67c780bae2f834d73017044680fabca4268 Mon Sep 17 00:00:00 2001 -From: Jianxun Zhang -Date: Wed, 1 Jun 2016 16:32:22 -0700 -Subject: [PATCH 3/5] sd-boot: Load board-specific boot entries from RMC - database - -RMC provides a centralized database file on ESP. The DB contains -fingerprints and any file blobs associated to physical boards. -Callers can fetch board-specific data with fingerprint info -collected from board at runtime if there is any record matched -board's fingerprint. - -To let bootloader know which file blob in RMC should be queried, -a special config file BOOTENTRY.CONFIG is defined as: - -boot.conf -install.conf - -Bootloader calls RMC APIs and other functions to perform these -tasks before it shows boot menu to user: - -(1) Load RMC database file from ESP -(2) Collect fingerprint data from board -(3) Query BOOTENTRY.CONFIG from RMC DB with fingerprint -(4) Parse BOOTENTRY.CONFIG to know names of boot entry files -(5) Query boot entry files one by one from RMC DB, and add - them into sd-boot config data. - -The final effect is that bootloader will show board-specific -boot entries in boot menu to user. User then can choose one -of them to boot system with the selected configuration. - -If any of these steps fails, bootloader simply skips loading -RMC configs or any entry file not successfully fetched from -RMC DB. Once any entry is loaded successfully from RMC DB, -bootloader skips loading any boot entries from ESP. - -Upstream-Status: Pending - -Signed-off-by: Jianxun Zhang -Signed-off-by: California Sullivan ---- - src/boot/efi/boot.c | 148 +++++++++++++++++++++++++++++++++++++++++++++++++++- - 1 file changed, 146 insertions(+), 2 deletions(-) - -diff --git a/src/boot/efi/boot.c b/src/boot/efi/boot.c -index b9c7c8394..93cfaf193 100644 ---- a/src/boot/efi/boot.c -+++ b/src/boot/efi/boot.c -@@ -16,6 +16,7 @@ - - #include - #include -+#include - - #include "console.h" - #include "disk.h" -@@ -35,6 +36,9 @@ static const char __attribute__((used)) magic[] = "#### LoaderInfo: systemd-boot - - static const EFI_GUID global_guid = EFI_GLOBAL_VARIABLE; - -+static CHAR8* rmc_db; -+static rmc_fingerprint_t *rmc_fp; -+ - enum loader_type { - LOADER_UNDEFINED, - LOADER_EFI, -@@ -1684,6 +1688,136 @@ static VOID config_free(Config *config) { - FreePool(config->entry_oneshot); - } - -+/* Derived from line_get_key_value(), we could consolidate two functions later */ -+static CHAR8 *get_line(CHAR8 *content, UINT64 *pos) { -+ CHAR8 *line; -+ UINT64 linelen; -+ -+skip: -+ line = content + *pos; -+ if (*line == '\0') -+ return NULL; -+ -+ linelen = 0; -+ while (line[linelen] && !strchra((CHAR8 *)"\n\r", line[linelen])) -+ linelen++; -+ -+ /* move pos to next line */ -+ *pos += linelen; -+ if (content[*pos]) -+ (*pos)++; -+ -+ /* empty line */ -+ if (linelen == 0) -+ goto skip; -+ -+ /* terminate line */ -+ line[linelen] = '\0'; -+ -+ /* remove leading whitespace */ -+ while (strchra((CHAR8 *)" \t", *line)) { -+ line++; -+ linelen--; -+ } -+ -+ /* remove trailing whitespace */ -+ while (linelen > 0 && strchra((CHAR8 *)" \t", line[linelen-1])) -+ linelen--; -+ line[linelen] = '\0'; -+ -+ if (*line == '#') -+ goto skip; -+ -+ return line; -+} -+ -+/* load rmc database file from ESP and try to get fingerprint. These -+ * are essential information indicating we could query rmc data for -+ * this board at least -+ * return 0 if both database file and fingerprint can be obtained, otherwise -+ * non-zero value is returned. -+ * -+ * Note: db and fp hold valid values only when this function returns 0. -+ * Caller is responsible to free allocated memory pointed by *db and *fp when -+ * this function returns 0. -+ */ -+ -+static UINTN rmc_initialize(EFI_FILE *root_dir, EFI_SYSTEM_TABLE *sys_table, CHAR8 **db, rmc_fingerprint_t **fp) { -+ UINTN len; -+ UINTN ret = 1; -+ -+ if (!db || !fp) -+ return ret; -+ -+ *db = NULL; -+ *fp = NULL; -+ -+ /* load rmc database */ -+ len = file_read(root_dir, L"\\rmc.db", 0, 0, db); -+ -+ if (len <= 0) -+ goto done; -+ -+ *fp = AllocateZeroPool(sizeof(rmc_fingerprint_t)); -+ /* call rmc to get fingerprint. We will use single-action rmc APIs to query multiple files. -+ * This should bring a better performance than calling double-action rmc API every time. -+ */ -+ if (rmc_get_fingerprint(sys_table, *fp)) -+ goto done; -+ -+ ret = 0; -+done: -+ if (ret) { -+ FreePool(*db); -+ FreePool(*fp); -+ } -+ -+ return ret; -+} -+ -+/* load RMC entries -+ * return TRUE when at least one entry is loaded, otherwise, return FALSE -+ */ -+static BOOLEAN config_load_rmc_entries(Config *config, EFI_HANDLE *device, CHAR16 *loaded_image_path, CHAR8 *db, rmc_fingerprint_t *fp) { -+ CHAR8 *boot_entry = NULL; -+ CHAR8 *boot_config = NULL; -+ rmc_file_t rp; -+ CHAR8 *line; -+ UINT64 pos = 0; -+ BOOLEAN ret = FALSE; -+ -+ if (!db || !fp) -+ return ret; -+ -+ /* query boot entry config file */ -+ if (rmc_query_file_by_fp(fp, db, "BOOTENTRY.CONFIG", &rp)) -+ return ret; -+ -+ /* file blob read from rmc db is not necessarily null-terminated, and we -+ * should keep mem where rmc db lives from change during parsing -+ */ -+ boot_config = AllocatePool(rp.blob_len * sizeof(CHAR8) + 1); -+ CopyMem(boot_config, rp.blob, rp.blob_len); -+ boot_config[rp.blob_len] = '\0'; -+ /* parse boot entry config */ -+ while ((line = get_line(boot_config, &pos))) { -+ if (rmc_query_file_by_fp(fp, db, (char *)line, &rp)) -+ continue; -+ if (rp.blob_len > 0) { -+ boot_entry = AllocatePool(rp.blob_len * sizeof(CHAR8) + 1); -+ CopyMem(boot_entry, rp.blob, rp.blob_len); -+ boot_entry[rp.blob_len] = '\0'; -+ config_entry_add_from_file(config, device, -+ stra_to_str(line), boot_entry, -+ loaded_image_path); -+ /* tell caller success when a RMC entry is loaded */ -+ ret = TRUE; -+ } -+ } -+ -+ return ret; -+} -+ - EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *sys_table) { - CHAR16 *s; - CHAR8 *b; -@@ -1696,6 +1830,7 @@ EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *sys_table) { - UINT64 init_usec; - BOOLEAN menu = FALSE; - CHAR16 uuid[37]; -+ BOOLEAN rmc_entry = FALSE; - - InitializeLib(image, sys_table); - init_usec = time_usec(); -@@ -1736,6 +1871,9 @@ EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *sys_table) { - } - } - -+ /* Initialize rmc before loading any config */ -+ rmc_initialize(root_dir, sys_table, &rmc_db, &rmc_fp); -+ - /* the filesystem path to this image, to prevent adding ourselves to the menu */ - loaded_image_path = DevicePathToStr(loaded_image->FilePath); - efivar_set(L"LoaderImageIdentifier", loaded_image_path, FALSE); -@@ -1743,11 +1881,15 @@ EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *sys_table) { - ZeroMem(&config, sizeof(Config)); - config_load_defaults(&config, root_dir); - -+ if (rmc_db && rmc_fp) -+ rmc_entry = config_load_rmc_entries(&config, loaded_image->DeviceHandle, loaded_image_path, rmc_db, rmc_fp); -+ - /* scan /EFI/Linux/ directory */ - config_entry_add_linux(&config, loaded_image, root_dir); - -- /* scan /loader/entries/\*.conf files */ -- config_load_entries(&config, loaded_image->DeviceHandle, root_dir, loaded_image_path); -+ /* scan /loader/entries/\*.conf files only when no RMC entry is loaded */ -+ if (rmc_entry == FALSE) -+ config_load_entries(&config, loaded_image->DeviceHandle, root_dir, loaded_image_path); - - /* sort entries after version number */ - config_sort_entries(&config); -@@ -1841,6 +1983,8 @@ EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *sys_table) { - out: - FreePool(loaded_image_path); - config_free(&config); -+ FreePool(rmc_db); -+ FreePool(rmc_fp); - uefi_call_wrapper(root_dir->Close, 1, root_dir); - uefi_call_wrapper(BS->CloseProtocol, 4, image, &LoadedImageProtocol, image, NULL); - return err; --- -2.14.3 - diff --git a/recipes-bsp/systemd-boot/systemd-boot/0004-sd-boot-Support-global-kernel-command-line-fragment.patch b/recipes-bsp/systemd-boot/systemd-boot/0004-sd-boot-Support-global-kernel-command-line-fragment.patch deleted file mode 100644 index b4dd9c42..00000000 --- a/recipes-bsp/systemd-boot/systemd-boot/0004-sd-boot-Support-global-kernel-command-line-fragment.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 159c8c54f92fb44d8abd2919fa83ad1cb640fac3 Mon Sep 17 00:00:00 2001 -From: Jianxun Zhang -Date: Mon, 20 Jun 2016 13:08:20 -0700 -Subject: [PATCH 4/5] sd-boot: Support global kernel command line fragment - -Query file blob KBOOTPARAM from RMC. If it exists, we append -it to the new linux boot entry's cmdline. A boot entry could -be read from a .conf file on ESP, RMC database, or embedded -linux image. content in KBOOTPARAM is effective in all of -these cases. - -Upstream-Status: Pending - -Signed-off-by: Jianxun Zhang -Signed-off-by: California Sullivan ---- - src/boot/efi/boot.c | 34 ++++++++++++++++++++++++++++++++++ - 1 file changed, 34 insertions(+) - -diff --git a/src/boot/efi/boot.c b/src/boot/efi/boot.c -index 93cfaf193..2f400db3c 100644 ---- a/src/boot/efi/boot.c -+++ b/src/boot/efi/boot.c -@@ -851,6 +851,40 @@ static VOID config_add_entry(Config *config, ConfigEntry *entry) { - config->entries = ReallocatePool(config->entries, - sizeof(VOID *) * config->entry_count, sizeof(VOID *) * i); - } -+ -+ /* rmc: a linux entry could be added from .conf file or an embedded linux image -+ * we put appending global command line here to cover both of two cases. -+ */ -+ if (entry->type == LOADER_LINUX && rmc_db && rmc_fp) { -+ rmc_file_t rmc_kp; -+ -+ if (!rmc_query_file_by_fp(rmc_fp, rmc_db, "KBOOTPARAM", &rmc_kp)) { -+ CHAR8 *cmdline; -+ CHAR16 *s; -+ CHAR16 *t; -+ CHAR16 *p; -+ -+ cmdline = AllocatePool(rmc_kp.blob_len * sizeof(CHAR8) + 1); -+ CopyMem(cmdline, rmc_kp.blob, rmc_kp.blob_len); -+ cmdline[rmc_kp.blob_len] = '\0'; -+ p = stra_to_str(cmdline); -+ t = p; -+ -+ while (*t) { -+ if (*t == '\n') -+ *t = '\0'; -+ t++; -+ } -+ -+ s = PoolPrint(L"%s %s", entry->options, p); -+ FreePool(entry->options); -+ FreePool(p); -+ FreePool(cmdline); -+ -+ entry->options = s; -+ } -+ } -+ - config->entries[config->entry_count++] = entry; - } - --- -2.14.3 - diff --git a/recipes-bsp/systemd-boot/systemd-boot/0005-sd-boot-support-global-kernel-command-line-in-EFI-st.patch b/recipes-bsp/systemd-boot/systemd-boot/0005-sd-boot-support-global-kernel-command-line-in-EFI-st.patch deleted file mode 100644 index 60e93ca8..00000000 --- a/recipes-bsp/systemd-boot/systemd-boot/0005-sd-boot-support-global-kernel-command-line-in-EFI-st.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 405a77233dde990fa7815d1546dc5a6b5a608479 Mon Sep 17 00:00:00 2001 -From: Mikko Ylinen -Date: Fri, 27 Jan 2017 13:31:45 +0200 -Subject: [PATCH 5/5] sd-boot: support global kernel command line in EFI stub - -This change integrates rmc into EFI stub and supports a -global fragment (RMC KBOOTPARAM) that is appended to the -cmdline at boot. - -The fragment is board-specific and read from the database. - -Implements [YOCTO #10924]. - -Upstream-status: Pending - -Signed-off-by: Mikko Ylinen -Signed-off-by: California Sullivan ---- - src/boot/efi/stub.c | 33 +++++++++++++++++++++++++++++++++ - 1 file changed, 33 insertions(+) - -diff --git a/src/boot/efi/stub.c b/src/boot/efi/stub.c -index 540ca5985..11047477b 100644 ---- a/src/boot/efi/stub.c -+++ b/src/boot/efi/stub.c -@@ -14,6 +14,7 @@ - - #include - #include -+#include - - #include "disk.h" - #include "graphics.h" -@@ -49,6 +50,9 @@ EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *sys_table) { - UINTN cmdline_len; - CHAR16 uuid[37]; - EFI_STATUS err; -+ INTN len; -+ CHAR8 *rmc_db = NULL; -+ rmc_file_t rmc_file; - - InitializeLib(image, sys_table); - -@@ -109,6 +113,35 @@ EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *sys_table) { - #endif - } - -+ len = file_read(root_dir, L"\\rmc.db", 0, 0, &rmc_db); -+ if (len <= 0) -+ rmc_db = NULL; -+ -+ /* If the board has a fragment in rmc database, append it to the cmdline */ -+ if (rmc_db && !rmc_gimme_file(sys_table, rmc_db, "KBOOTPARAM", &rmc_file)) { -+ CHAR8 *line; -+ UINTN i = 0; -+ UINTN j; -+ -+ line = AllocatePool(rmc_file.blob_len + cmdline_len + 2); -+ -+ while (i < cmdline_len && cmdline[i] != '\0') { -+ line[i] = cmdline[i]; -+ i++; -+ } -+ -+ line[i++] = ' '; -+ -+ for (j=0; j < rmc_file.blob_len; j++) -+ line[i+j] = rmc_file.blob[j]; -+ line[i+j] = '\0'; -+ -+ cmdline = line; -+ cmdline_len = i + j; -+ -+ FreePool(rmc_db); -+ } -+ - /* export the device path this image is started from */ - if (disk_get_part_uuid(loaded_image->DeviceHandle, uuid) == EFI_SUCCESS) - efivar_set(L"LoaderDevicePartUUID", uuid, FALSE); --- -2.14.3 - diff --git a/recipes-bsp/systemd-boot/systemd-boot/rmc-boot.inc b/recipes-bsp/systemd-boot/systemd-boot/rmc-boot.inc deleted file mode 100644 index bbe3aea2..00000000 --- a/recipes-bsp/systemd-boot/systemd-boot/rmc-boot.inc +++ /dev/null @@ -1,30 +0,0 @@ -# This patchset contains hooks that allows systemd-boot to use RMC capablilities. -python __anonymous () { - import re - target = d.getVar('TARGET_ARCH') - prefix = "" if d.getVar('EFI_PROVIDER') == "rmc-boot" else "systemd-" - if target == "x86_64": - systemdimage = prefix + "bootx64.efi" - else: - systemdimage = prefix + "bootia32.efi" - d.setVar("SYSTEMD_BOOT_IMAGE", systemdimage) - prefix = "systemd-" if prefix == "" else "" - d.setVar("SYSTEMD_BOOT_IMAGE_PREFIX", prefix) -} - -DEPENDS_append_intel-x86-common = " rmc rmc-efi" -RDEPENDS_${PN}_append_intel-x86-common = " rmc-db" - -EXTRA_OEMESON_append_intel-x86-common = ' \ - -Drmc-includedir="${STAGING_INCDIR}/rmc" \ - ' - -SRC_URI_append_intel-x86-common = " \ - file://0001-partially-revert-sd-boot-stub-Obtain-PE-section-offs.patch \ - file://0002-sd-boot-fix-RMC-compatibility-with-systemd-boot-and-.patch \ - file://0003-sd-boot-Load-board-specific-boot-entries-from-RMC-da.patch \ - file://0004-sd-boot-Support-global-kernel-command-line-fragment.patch \ - file://0005-sd-boot-support-global-kernel-command-line-in-EFI-st.patch \ - " - -RPROVIDES_${PN} += "rmc-boot" diff --git a/recipes-bsp/systemd-boot/systemd-boot_%.bbappend b/recipes-bsp/systemd-boot/systemd-boot_%.bbappend index 46dd8a44..d46ef410 100644 --- a/recipes-bsp/systemd-boot/systemd-boot_%.bbappend +++ b/recipes-bsp/systemd-boot/systemd-boot_%.bbappend @@ -13,6 +13,3 @@ do_compile_append_intel-x86-common() { do_deploy_append_intel-x86-common() { install ${B}/src/boot/efi/linux*.efi.stub ${DEPLOYDIR} } - -# includes rmc-boot.inc if rmc-boot is the EFI_PROVIDER -include systemd-boot/${EFI_PROVIDER}.inc -- cgit v1.2.3-54-g00ecf