Skip to content

Commit 6aeb535

Browse files
committed
Initial rewrite of elf-loader to use mostly code on EE
1 parent 16cae0e commit 6aeb535

File tree

15 files changed

+1047
-445
lines changed

15 files changed

+1047
-445
lines changed

ee/elf-loader-nocolour/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# ____| | ____| | | |____|
33
# | ___| |____ ___| ____| | \ PS2DEV Open Source Project.
44
#-----------------------------------------------------------------------
5-
# Copyright 2001-2004, ps2dev - http://www.ps2dev.org
5+
# Copyright ps2dev - http://www.ps2dev.org
66
# Licenced under Academic Free License version 2.0
77
# Review ps2sdk README & LICENSE files for further details.
88

ee/elf-loader-nocolour/src/loader/Makefile renamed to ee/elf-loader-nocolour/src/ldrsrc/Makefile

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,15 @@
22
# ____| | ____| | | |____|
33
# | ___| |____ ___| ____| | \ PS2DEV Open Source Project.
44
#-----------------------------------------------------------------------
5-
# Copyright 2001-2004, ps2dev - http://www.ps2dev.org
5+
# Copyright ps2dev - http://www.ps2dev.org
66
# Licenced under Academic Free License version 2.0
77
# Review ps2sdk README & LICENSE files for further details.
88

9-
EE_SRC_DIR = $(PS2SDKSRC)/ee/elf-loader/src/loader/src/
10-
EE_INC_DIR = $(PS2SDKSRC)/ee/elf-loader/src/loader/include/
9+
EE_SRC_DIR = $(PS2SDKSRC)/ee/elf-loader/src/ldrsrc/src/
10+
EE_INC_DIR = $(PS2SDKSRC)/ee/elf-loader/src/ldrsrc/include/
1111

1212
LOADER_ENABLE_DEBUG_COLORS ?= 0
1313

14-
EE_LINKFILE ?= $(PS2SDKSRC)/ee/elf-loader/src/loader/linkfile
14+
EE_LINKFILE ?= $(PS2SDKSRC)/ee/elf-loader/src/ldrsrc/linkfile
1515

16-
EE_BIN ?= loader.elf
17-
18-
include $(PS2SDKSRC)/ee/elf-loader/src/loader/Makefile
16+
include $(PS2SDKSRC)/ee/elf-loader/src/ldrsrc/Makefile

ee/elf-loader/Makefile

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,16 @@
22
# ____| | ____| | | |____|
33
# | ___| |____ ___| ____| | \ PS2DEV Open Source Project.
44
#-----------------------------------------------------------------------
5-
# (c) 2020 Francisco Javier Trujillo Mata <[email protected]>
5+
# Copyright ps2dev - http://www.ps2dev.org
66
# Licenced under Academic Free License version 2.0
77
# Review ps2sdk README & LICENSE files for further details.
88

9-
EE_OBJS = elf.o loader.o
9+
EE_OBJS = \
10+
elf.o \
11+
elf_loader_compat.o \
12+
elf_loader_reader.o \
13+
elf_loader_stdio.o \
14+
ldrsrc.o
1015

1116
include $(PS2SDKSRC)/Defs.make
1217
include $(PS2SDKSRC)/ee/Rules.lib.make
@@ -16,19 +21,19 @@ include $(PS2SDKSRC)/ee/Rules.release
1621
$(PS2SDKSRC)/tools/bin2c/bin/bin2c: $(PS2SDKSRC)/tools/bin2c
1722
$(MAKEREC) $<
1823

19-
src/loader/bin/loader.elf:
20-
$(MAKEREC) src/loader
24+
src/ldrsrc/bin/ldrsrc.bin:
25+
$(MAKEREC) src/ldrsrc
2126

22-
$(EE_OBJS_DIR)loader.c: src/loader/bin/loader.elf $(PS2SDKSRC)/tools/bin2c/bin/bin2c
23-
$(PS2SDKSRC)/tools/bin2c/bin/bin2c $< $@ loader_elf
27+
$(EE_OBJS_DIR)ldrsrc.c: src/ldrsrc/bin/ldrsrc.bin $(PS2SDKSRC)/tools/bin2c/bin/bin2c
28+
$(PS2SDKSRC)/tools/bin2c/bin/bin2c $< $@ ldrsrc
2429

25-
$(EE_OBJS_DIR)loader.o: $(EE_OBJS_DIR)loader.c
30+
$(EE_OBJS_DIR)ldrsrc.o: $(EE_OBJS_DIR)ldrsrc.c
2631
$(DIR_GUARD)
2732
$(EE_C_COMPILE) $< -c -o $@
2833

2934
clean::
30-
$(MAKEREC) src/loader clean
35+
$(MAKEREC) src/ldrsrc clean
3136

3237
.NOTPARALLEL:: \
3338
$(PS2SDKSRC)/tools/bin2c/bin/bin2c \
34-
src/loader/bin/loader.elf
39+
src/ldrsrc/bin/ldrsrc.bin

0 commit comments

Comments
 (0)