Skip to content

Commit 823f19f

Browse files
committed
Initial rewrite of elf-loader to use mostly code on EE
1 parent 4c0214b commit 823f19f

File tree

12 files changed

+822
-450
lines changed

12 files changed

+822
-450
lines changed

ee/elf-loader-nocolour/Makefile

+1-1
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 ee/elf-loader-nocolour/src/ldrsrc/Makefile

+5-7
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

+9-9
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
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 = elf.o ldrsrc.o
1010

1111
include $(PS2SDKSRC)/Defs.make
1212
include $(PS2SDKSRC)/ee/Rules.lib.make
@@ -16,19 +16,19 @@ include $(PS2SDKSRC)/ee/Rules.release
1616
$(PS2SDKSRC)/tools/bin2c/bin/bin2c: $(PS2SDKSRC)/tools/bin2c
1717
$(MAKEREC) $<
1818

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

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

25-
$(EE_OBJS_DIR)loader.o: $(EE_OBJS_DIR)loader.c
25+
$(EE_OBJS_DIR)ldrsrc.o: $(EE_OBJS_DIR)ldrsrc.c
2626
$(DIR_GUARD)
2727
$(EE_C_COMPILE) $< -c -o $@
2828

2929
clean::
30-
$(MAKEREC) src/loader clean
30+
$(MAKEREC) src/ldrsrc clean
3131

3232
.NOTPARALLEL:: \
3333
$(PS2SDKSRC)/tools/bin2c/bin/bin2c \
34-
src/loader/bin/loader.elf
34+
src/ldrsrc/bin/ldrsrc.bin

0 commit comments

Comments
 (0)