NuKVM/memtest86plus
3
0
Fork 0
mirror of https://github.com/memtest86plus/memtest86plus.git synced 2024-11-23 08:26:23 -06:00
Code Issues Packages Projects Releases Wiki Activity

Move x86/x86-64-specific files to build32/x86, build64/x86 and system/x86; adjust Github workflows accordingly.

Browse Source
This commit is contained in:
Lionel Debroux 2024-09-29 22:16:55 +02:00
parent 5a046291fa
commit 055fddbac3
29 changed files with 91 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/Linux.yml vendored
View File

@ -45,9 +45,9 @@ jobs:
working-directory: ./
run: |
if [ ${{ matrix.arch }} == 'i386' ]; then
cd build32
cd build32/x86
elif [ ${{ matrix.arch }} == 'x86_64' ]; then
cd build64
cd build64/x86
elif [ ${{ matrix.arch }} == 'la64' ]; then
cd build64/la64
fi
@ -57,9 +57,9 @@ jobs:
working-directory: ./
run: |
if [ ${{ matrix.arch }} == 'i386' ]; then
cd build32
cd build32/x86
elif [ ${{ matrix.arch }} == 'x86_64' ]; then
cd build64
cd build64/x86
elif [ ${{ matrix.arch }} == 'la64' ]; then
export PATH=/opt/LoongArch_Toolchains/cross-tools/bin/:$PATH
cd build64/la64

0
app/interrupt.c → app/x86/interrupt.c
View File

0
boot/startup32.S → boot/x86/startup32.S
View File

0
boot/startup64.S → boot/x86/startup64.S
View File

78
build32/Makefile → build32/x86/Makefile
View File

@ -25,38 +25,38 @@ else
MS_LDS=ldscripts/memtest_shared.lds
endif
INC_DIRS = -I../boot -I../system -I../lib -I../tests -I../app -Iapp
INC_DIRS = -I../../boot -I../../system -I../../system/imc -I../../system/x86 -I../../lib -I../../tests -I../../app -Iapp
SYS_OBJS = system/acpi.o \
system/cpuid.o \
system/cpuinfo.o \
system/cpulocal.o \
system/ehci.o \
system/font.o \
system/heap.o \
system/hwctrl.o \
system/hwquirks.o \
system/keyboard.o \
system/ohci.o \
system/memctrl.o \
system/pci.o \
system/pmem.o \
system/reloc.o \
system/screen.o \
system/serial.o \
system/smbios.o \
system/i2c_x86.o \
system/spd.o \
system/smp.o \
system/temperature.o \
system/timers.o \
system/uhci.o \
system/usbhcd.o \
system/vmem.o \
system/xhci.o
system/xhci.o \
system/x86/cpuid.o \
system/x86/cpuinfo.o \
system/x86/hwctrl.o \
system/x86/i2c.o \
system/x86/memctrl.o \
system/x86/temperature.o \
system/x86/vmem.o
IMC_SRCS = $(wildcard ../system/imc/*.c)
IMC_OBJS = $(subst ../,,$(IMC_SRCS:.c=.o))
IMC_SRCS = $(wildcard ../../system/imc/x86/*.c)
IMC_OBJS = $(subst ../../,,$(IMC_SRCS:.c=.o))
LIB_OBJS = lib/barrier.o \
lib/div64.o \
@ -80,10 +80,10 @@ APP_OBJS = app/badram.o \
app/config.o \
app/display.o \
app/error.o \
app/interrupt.o \
app/main.o
app/main.o \
app/x86/interrupt.o
OBJS = boot/startup.o boot/efisetup.o $(SYS_OBJS) $(IMC_OBJS) $(LIB_OBJS) $(TST_OBJS) $(APP_OBJS)
OBJS = boot/x86/startup.o boot/efisetup.o $(SYS_OBJS) $(IMC_OBJS) $(LIB_OBJS) $(TST_OBJS) $(APP_OBJS)
all: memtest.bin memtest.efi
@ -102,49 +102,57 @@ debug: check memtest.debug memtest.efi
-include $(subst .o,.d,$(TST_OBJS))
-include $(subst .o,.d,$(APP_OBJS))
boot/header.o : | ../boot/sbat.csv
boot/header.o : | ../../boot/sbat.csv
boot/startup.o: ../boot/startup32.S ../boot/boot.h
boot/x86/startup.o: ../../boot/x86/startup32.S ../../boot/boot.h
@mkdir -p boot/x86
$(CC) -m32 -x assembler-with-cpp -c -I../../boot -o $@ $<
boot/%.o: ../../boot/%.S ../../boot/boot.h app/build_version.h
@mkdir -p boot
$(CC) -m32 -x assembler-with-cpp -c -I../boot -o $@ $<
$(CC) -m32 -x assembler-with-cpp -c -I../../boot -Iapp -o $@ $<
boot/%.o: ../boot/%.S ../boot/boot.h app/build_version.h
@mkdir -p boot
$(CC) -m32 -x assembler-with-cpp -c -I../boot -Iapp -o $@ $<
boot/efisetup.o: ../boot/efisetup.c
boot/efisetup.o: ../../boot/efisetup.c
@mkdir -p boot
$(CC) -c $(CFLAGS) $(OPT_SMALL) $(INC_DIRS) -o $@ $< -MMD -MP -MT $@ -MF $(@:.o=.d)
system/reloc.o: ../system/reloc32.c
system/reloc.o: ../../system/reloc32.c
@mkdir -p system
$(CC) -c $(CFLAGS) -fno-strict-aliasing $(OPT_SMALL) $(INC_DIRS) -o $@ $< -MMD -MP -MT $@ -MF $(@:.o=.d)
system/%.o: ../system/%.c
system/%.o: ../../system/%.c
@mkdir -p system
$(CC) -c $(CFLAGS) $(OPT_SMALL) $(INC_DIRS) -o $@ $< -MMD -MP -MT $@ -MF $(@:.o=.d)
system/imc/%.o: ../system/imc/%.c
@mkdir -p system/imc
system/imc/x86/%.o: ../../system/imc/x86/%.c
@mkdir -p system/imc/x86
$(CC) -c $(CFLAGS) $(OPT_SMALL) $(INC_DIRS) -o $@ $< -MMD -MP -MT $@ -MF $(@:.o=.d)
lib/%.o: ../lib/%.c
system/x86/%.o: ../../system/x86/%.c
@mkdir -p system/x86
$(CC) -c $(CFLAGS) $(OPT_SMALL) $(INC_DIRS) -o $@ $< -MMD -MP -MT $@ -MF $(@:.o=.d)
lib/%.o: ../../lib/%.c
@mkdir -p lib
$(CC) -c $(CFLAGS) $(OPT_SMALL) $(INC_DIRS) -o $@ $< -MMD -MP -MT $@ -MF $(@:.o=.d)
tests/%.o: ../tests/%.c
tests/%.o: ../../tests/%.c
@mkdir -p tests
$(CC) -c $(CFLAGS) $(OPT_FAST) $(INC_DIRS) -o $@ $< -MMD -MP -MT $@ -MF $(@:.o=.d)
app/%.o: ../app/%.c app/build_version.h
app/%.o: ../../app/%.c app/build_version.h
@mkdir -p app
$(CC) -c $(CFLAGS) $(OPT_SMALL) $(INC_DIRS) -o $@ $< -MMD -MP -MT $@ -MF $(@:.o=.d)
app/x86/%.o: ../../app/x86/%.c app/build_version.h
@mkdir -p app/x86
$(CC) -c $(CFLAGS) $(OPT_SMALL) $(INC_DIRS) -o $@ $< -MMD -MP -MT $@ -MF $(@:.o=.d)
app/build_version.h: FORCE
@mkdir -p app
@( \
cp -f ../app/version.h $@.tmp; \
if $(GIT_AVAILABLE) && test -d ../.git ; then \
cp -f ../../app/version.h $@.tmp; \
if $(GIT_AVAILABLE) && test -d ../../.git ; then \
hash=`git rev-parse HEAD | cut -c1-7`; \
sed -i 's/GIT_HASH\s\".*"/GIT_HASH "'$$hash'"/' $@.tmp; \
else \
@ -239,22 +247,22 @@ grub-eltorito.img:
grub-bootia32.efi:
$(GRUB_MKIMAGE) --output $@ --prefix /EFI/BOOT/grub --format i386-efi $(GRUB_MODULES)
grub-esp.img: memtest.efi grub-bootia32.efi ../grub/${GRUB_CFG}-efi.cfg
grub-esp.img: memtest.efi grub-bootia32.efi ../../grub/${GRUB_CFG}-efi.cfg
@mkdir -p grub-iso/EFI/BOOT/grub/i386-efi grub-iso/EFI/BOOT/grub/fonts
cp memtest.efi grub-iso/EFI/BOOT/memtest
cp grub-bootia32.efi grub-iso/EFI/BOOT/bootia32.efi
cp ../grub/${GRUB_CFG}-efi.cfg grub-iso/EFI/BOOT/grub/grub.cfg
cp ../../grub/${GRUB_CFG}-efi.cfg grub-iso/EFI/BOOT/grub/grub.cfg
cp $(GRUB_FONT_DIR)/unicode.pf2 grub-iso/EFI/BOOT/grub/fonts/
cp $(GRUB_LIB_DIR)/i386-efi/*.mod grub-iso/EFI/BOOT/grub/i386-efi/
@rm -f grub-esp.img
/sbin/mkdosfs -n MT86P_ESP -F12 -C grub-esp.img 8192
mcopy -s -i grub-esp.img grub-iso/EFI ::
grub-memtest.iso: memtest.bin grub-eltorito.img ../grub/${GRUB_CFG}-legacy.cfg grub-esp.img
grub-memtest.iso: memtest.bin grub-eltorito.img ../../grub/${GRUB_CFG}-legacy.cfg grub-esp.img
@mkdir -p grub-iso/boot/grub/i386-pc grub-iso/boot/grub/fonts
cp memtest.bin grub-iso/boot/memtest
cp grub-eltorito.img grub-iso/boot/eltorito.img
cp ../grub/${GRUB_CFG}-legacy.cfg grub-iso/boot/grub/grub.cfg
cp ../../grub/${GRUB_CFG}-legacy.cfg grub-iso/boot/grub/grub.cfg
cp $(GRUB_FONT_DIR)/unicode.pf2 grub-iso/boot/grub/fonts/
cp $(GRUB_LIB_DIR)/i386-pc/*.mod grub-iso/boot/grub/i386-pc/
xorrisofs -pad -R -J -volid MT86PLUS_32 -graft-points -hide-rr-moved \

0
build32/ldscripts/memtest_bin.lds → build32/x86/ldscripts/memtest_bin.lds
View File

0
build32/ldscripts/memtest_efi.lds → build32/x86/ldscripts/memtest_efi.lds
View File

0
build32/ldscripts/memtest_mbr.lds → build32/x86/ldscripts/memtest_mbr.lds
View File

0
build32/ldscripts/memtest_shared.lds → build32/x86/ldscripts/memtest_shared.lds
View File

2
build64/la64/Makefile
View File

@ -24,7 +24,7 @@ else
MS_LDS=ldscripts/memtest_shared.lds
endif
INC_DIRS = -I../../boot -I../../system -I../../system/loongarch -I../../lib -I../../tests -I../../app -Iapp
INC_DIRS = -I../../boot -I../../system -I ../../system/imc -I../../system/loongarch -I../../lib -I../../tests -I../../app -Iapp
SYS_OBJS = system/acpi.o \
system/cpulocal.o \

78
build64/Makefile → build64/x86/Makefile
View File

@ -25,38 +25,38 @@ else
MS_LDS=ldscripts/memtest_shared.lds
endif
INC_DIRS = -I../boot -I../system -I../lib -I../tests -I../app -Iapp
INC_DIRS = -I../../boot -I../../system -I../../system/imc -I../../system/x86 -I../../lib -I../../tests -I../../app -Iapp
SYS_OBJS = system/acpi.o \
system/cpuid.o \
system/cpuinfo.o \
system/cpulocal.o \
system/ehci.o \
system/font.o \
system/hwctrl.o \
system/heap.o \
system/hwquirks.o \
system/keyboard.o \
system/ohci.o \
system/memctrl.o \
system/pci.o \
system/pmem.o \
system/reloc.o \
system/screen.o \
system/serial.o \
system/smbios.o \
system/i2c_x86.o \
system/spd.o \
system/smp.o \
system/temperature.o \
system/timers.o \
system/uhci.o \
system/usbhcd.o \
system/vmem.o \
system/xhci.o
system/xhci.o \
system/x86/cpuid.o \
system/x86/cpuinfo.o \
system/x86/hwctrl.o \
system/x86/i2c.o \
system/x86/memctrl.o \
system/x86/temperature.o \
system/x86/vmem.o
IMC_SRCS = $(wildcard ../system/imc/*.c)
IMC_OBJS = $(subst ../,,$(IMC_SRCS:.c=.o))
IMC_SRCS = $(wildcard ../../system/imc/x86/*.c)
IMC_OBJS = $(subst ../../,,$(IMC_SRCS:.c=.o))
LIB_OBJS = lib/barrier.o \
lib/print.o \
@ -79,10 +79,10 @@ APP_OBJS = app/badram.o \
app/config.o \
app/display.o \
app/error.o \
app/interrupt.o \
app/main.o
app/main.o \
app/x86/interrupt.o
OBJS = boot/startup.o boot/efisetup.o $(SYS_OBJS) $(IMC_OBJS) $(LIB_OBJS) $(TST_OBJS) $(APP_OBJS)
OBJS = boot/x86/startup.o boot/efisetup.o $(SYS_OBJS) $(IMC_OBJS) $(LIB_OBJS) $(TST_OBJS) $(APP_OBJS)
all: memtest.bin memtest.efi
@ -101,49 +101,57 @@ debug: check memtest.debug memtest.efi
-include $(subst .o,.d,$(TST_OBJS))
-include $(subst .o,.d,$(APP_OBJS))
boot/header.o : | ../boot/sbat.csv
boot/header.o : | ../../boot/sbat.csv
boot/startup.o: ../boot/startup64.S ../boot/boot.h
boot/x86/startup.o: ../../boot/x86/startup64.S ../../boot/boot.h
@mkdir -p boot/x86
$(CC) -m64 -x assembler-with-cpp -c -I../../boot -o $@ $<
boot/%.o: ../../boot/%.S ../../boot/boot.h app/build_version.h
@mkdir -p boot
$(CC) -m64 -x assembler-with-cpp -c -I../boot -o $@ $<
$(CC) -m64 -x assembler-with-cpp -c -I../../boot -Iapp -o $@ $<
boot/%.o: ../boot/%.S ../boot/boot.h app/build_version.h
@mkdir -p boot
$(CC) -m64 -x assembler-with-cpp -c -I../boot -Iapp -o $@ $<
boot/efisetup.o: ../boot/efisetup.c
boot/efisetup.o: ../../boot/efisetup.c
@mkdir -p boot
$(CC) -c $(CFLAGS) $(OPT_SMALL) $(INC_DIRS) -o $@ $< -MMD -MP -MT $@ -MF $(@:.o=.d)
system/reloc.o: ../system/reloc64.c
system/reloc.o: ../../system/reloc64.c
@mkdir -p system
$(CC) -c $(CFLAGS) -fno-strict-aliasing $(OPT_SMALL) $(INC_DIRS) -o $@ $< -MMD -MP -MT $@ -MF $(@:.o=.d)
system/%.o: ../system/%.c
system/%.o: ../../system/%.c
@mkdir -p system
$(CC) -c $(CFLAGS) $(OPT_SMALL) $(INC_DIRS) -o $@ $< -MMD -MP -MT $@ -MF $(@:.o=.d)
system/imc/%.o: ../system/imc/%.c
@mkdir -p system/imc
system/imc/x86/%.o: ../../system/imc/x86/%.c
@mkdir -p system/imc/x86
$(CC) -c $(CFLAGS) $(OPT_SMALL) $(INC_DIRS) -o $@ $< -MMD -MP -MT $@ -MF $(@:.o=.d)
lib/%.o: ../lib/%.c
system/x86/%.o: ../../system/x86/%.c
@mkdir -p system/x86
$(CC) -c $(CFLAGS) $(OPT_SMALL) $(INC_DIRS) -o $@ $< -MMD -MP -MT $@ -MF $(@:.o=.d)
lib/%.o: ../../lib/%.c
@mkdir -p lib
$(CC) -c $(CFLAGS) $(OPT_SMALL) $(INC_DIRS) -o $@ $< -MMD -MP -MT $@ -MF $(@:.o=.d)
tests/%.o: ../tests/%.c
tests/%.o: ../../tests/%.c
@mkdir -p tests
$(CC) -c $(CFLAGS) $(OPT_FAST) $(INC_DIRS) -o $@ $< -MMD -MP -MT $@ -MF $(@:.o=.d)
app/%.o: ../app/%.c app/build_version.h
app/%.o: ../../app/%.c app/build_version.h
@mkdir -p app
$(CC) -c $(CFLAGS) $(OPT_SMALL) $(INC_DIRS) -o $@ $< -MMD -MP -MT $@ -MF $(@:.o=.d)
app/x86/%.o: ../../app/x86/%.c app/build_version.h
@mkdir -p app/x86
$(CC) -c $(CFLAGS) $(OPT_SMALL) $(INC_DIRS) -o $@ $< -MMD -MP -MT $@ -MF $(@:.o=.d)
app/build_version.h: FORCE
@mkdir -p app
@( \
cp -f ../app/version.h $@.tmp; \
if $(GIT_AVAILABLE) && test -d ../.git ; then \
cp -f ../../app/version.h $@.tmp; \
if $(GIT_AVAILABLE) && test -d ../../.git ; then \
hash=`git rev-parse HEAD | cut -c1-7`; \
sed -i 's/GIT_HASH\s\".*"/GIT_HASH "'$$hash'"/' $@.tmp; \
else \
@ -238,22 +246,22 @@ grub-eltorito.img:
grub-bootx64.efi:
$(GRUB_MKIMAGE) --output $@ --prefix /EFI/BOOT/grub --format x86_64-efi $(GRUB_MODULES)
grub-esp.img: memtest.efi grub-bootx64.efi ../grub/${GRUB_CFG}-efi.cfg
grub-esp.img: memtest.efi grub-bootx64.efi ../../grub/${GRUB_CFG}-efi.cfg
@mkdir -p grub-iso/EFI/BOOT/grub/x86_64-efi grub-iso/EFI/BOOT/grub/fonts
cp memtest.efi grub-iso/EFI/BOOT/memtest
cp grub-bootx64.efi grub-iso/EFI/BOOT/bootx64.efi
cp ../grub/${GRUB_CFG}-efi.cfg grub-iso/EFI/BOOT/grub/grub.cfg
cp ../../grub/${GRUB_CFG}-efi.cfg grub-iso/EFI/BOOT/grub/grub.cfg
cp $(GRUB_FONT_DIR)/unicode.pf2 grub-iso/EFI/BOOT/grub/fonts/
cp $(GRUB_LIB_DIR)/x86_64-efi/*.mod grub-iso/EFI/BOOT/grub/x86_64-efi/
@rm -f grub-esp.img
/sbin/mkdosfs -n MT86P_ESP -F12 -C grub-esp.img 8192
mcopy -s -i grub-esp.img grub-iso/EFI ::
grub-memtest.iso: memtest.bin grub-eltorito.img ../grub/${GRUB_CFG}-legacy.cfg grub-esp.img
grub-memtest.iso: memtest.bin grub-eltorito.img ../../grub/${GRUB_CFG}-legacy.cfg grub-esp.img
@mkdir -p grub-iso/boot/grub/i386-pc grub-iso/boot/grub/fonts
cp memtest.bin grub-iso/boot/memtest
cp grub-eltorito.img grub-iso/boot/eltorito.img
cp ../grub/${GRUB_CFG}-legacy.cfg grub-iso/boot/grub/grub.cfg
cp ../../grub/${GRUB_CFG}-legacy.cfg grub-iso/boot/grub/grub.cfg
cp $(GRUB_FONT_DIR)/unicode.pf2 grub-iso/boot/grub/fonts/
cp $(GRUB_LIB_DIR)/i386-pc/*.mod grub-iso/boot/grub/i386-pc/
xorrisofs -pad -R -J -volid MT86PLUS_64 -graft-points -hide-rr-moved \

0
build64/ldscripts/memtest_bin.lds → build64/x86/ldscripts/memtest_bin.lds
View File

0
build64/ldscripts/memtest_efi.lds → build64/x86/ldscripts/memtest_efi.lds
View File

0
build64/ldscripts/memtest_mbr.lds → build64/x86/ldscripts/memtest_mbr.lds
View File

0
build64/ldscripts/memtest_shared.lds → build64/x86/ldscripts/memtest_shared.lds
View File

0
system/imc/amd_zen.c → system/imc/x86/amd_zen.c
View File

0
system/imc/intel_adl.c → system/imc/x86/intel_adl.c
View File

0
system/imc/intel_hsw.c → system/imc/x86/intel_hsw.c
View File

0
system/imc/intel_icl.c → system/imc/x86/intel_icl.c
View File

0
system/imc/intel_mtl.c → system/imc/x86/intel_mtl.c
View File

0
system/imc/intel_skl.c → system/imc/x86/intel_skl.c
View File

0
system/imc/intel_snb.c → system/imc/x86/intel_snb.c
View File

0
system/cpuid.c → system/x86/cpuid.c
View File

0
system/cpuinfo.c → system/x86/cpuinfo.c
View File

0
system/hwctrl.c → system/x86/hwctrl.c
View File

0
system/i2c_x86.c → system/x86/i2c.c
View File

0
system/memctrl.c → system/x86/memctrl.c
View File

0
system/temperature.c → system/x86/temperature.c
View File

0
system/vmem.c → system/x86/vmem.c
View File