From a4fdf038273a741897866ea911298789e549bdf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Sat, 17 Sep 2022 14:29:58 +0100 Subject: [PATCH] Rename kaem-minimal->kame-optional to be consistent with bootstrap seeds. --- Development/Makefile | 4 ++-- Development/{kaem-minimal.c => kaem-optional.c} | 0 amd64/Development/Makefile | 2 +- amd64/Development/{kaem-minimal.M1 => kaem-optional.M1} | 0 amd64/Development/{kaem-minimal.S => kaem-optional.S} | 0 amd64/Development/{kaem-minimal.hex2 => kaem-optional.hex2} | 0 amd64/{kaem-minimal.hex0 => kaem-optional.hex0} | 0 amd64/mescc-tools-seed-kaem.kaem | 2 +- 8 files changed, 4 insertions(+), 4 deletions(-) rename Development/{kaem-minimal.c => kaem-optional.c} (100%) rename amd64/Development/{kaem-minimal.M1 => kaem-optional.M1} (100%) rename amd64/Development/{kaem-minimal.S => kaem-optional.S} (100%) rename amd64/Development/{kaem-minimal.hex2 => kaem-optional.hex2} (100%) rename amd64/{kaem-minimal.hex0 => kaem-optional.hex0} (100%) diff --git a/Development/Makefile b/Development/Makefile index d8577a1..6e8a15b 100644 --- a/Development/Makefile +++ b/Development/Makefile @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -targets = kaem-minimal hex0 hex2 +targets = kaem-optional hex0 hex2 ESP_SIZE_MIB = 50 QEMU = qemu-system-x86_64 @@ -59,7 +59,7 @@ rootfs: $(targets2) $(sources) cp -R rootfs $(build_dir) mkdir -p $(rootfs_dir)/EFI/BOOT/ cp $^ $(rootfs_dir)/EFI/BOOT/ - mv $(rootfs_dir)/EFI/BOOT/kaem-minimal.efi $(rootfs_dir)/EFI/BOOT/BOOTX64.EFI + mv $(rootfs_dir)/EFI/BOOT/kaem-optional.efi $(rootfs_dir)/EFI/BOOT/BOOTX64.EFI cp ../amd64/hex0.hex0 $(rootfs_dir)/hex0_amd64.hex0 clean: diff --git a/Development/kaem-minimal.c b/Development/kaem-optional.c similarity index 100% rename from Development/kaem-minimal.c rename to Development/kaem-optional.c diff --git a/amd64/Development/Makefile b/amd64/Development/Makefile index f09c175..1693eeb 100644 --- a/amd64/Development/Makefile +++ b/amd64/Development/Makefile @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -targets = kaem-minimal hex0 hex1 hex2 catm +targets = kaem-optional hex0 hex1 hex2 catm cc = clang cflags = -ffreestanding -MMD -mno-red-zone -std=c11 -target x86_64-unknown-windows -masm=intel diff --git a/amd64/Development/kaem-minimal.M1 b/amd64/Development/kaem-optional.M1 similarity index 100% rename from amd64/Development/kaem-minimal.M1 rename to amd64/Development/kaem-optional.M1 diff --git a/amd64/Development/kaem-minimal.S b/amd64/Development/kaem-optional.S similarity index 100% rename from amd64/Development/kaem-minimal.S rename to amd64/Development/kaem-optional.S diff --git a/amd64/Development/kaem-minimal.hex2 b/amd64/Development/kaem-optional.hex2 similarity index 100% rename from amd64/Development/kaem-minimal.hex2 rename to amd64/Development/kaem-optional.hex2 diff --git a/amd64/kaem-minimal.hex0 b/amd64/kaem-optional.hex0 similarity index 100% rename from amd64/kaem-minimal.hex0 rename to amd64/kaem-optional.hex0 diff --git a/amd64/mescc-tools-seed-kaem.kaem b/amd64/mescc-tools-seed-kaem.kaem index 38219a9..86804bd 100644 --- a/amd64/mescc-tools-seed-kaem.kaem +++ b/amd64/mescc-tools-seed-kaem.kaem @@ -12,5 +12,5 @@ bootstrap-seeds\UEFI\amd64\hex0-seed.efi amd64\hex0.hex0 amd64\artifact\hex0.efi ######################################### # Phase-0b Build minimal kaem from hex0 # ######################################### -amd64\artifact\hex0.efi amd64\kaem-minimal.hex0 amd64\artifact\kaem-0.efi +amd64\artifact\hex0.efi amd64\kaem-optional.hex0 amd64\artifact\kaem-0.efi # for checksum validation reasons