The-Homebrew-Cloud
/
hbc
mirror of https://github.com/fail0verflow/hbc.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

s/devkitfail/devkitppc/g

This commit is contained in:
Hector Martin 2018-06-28 18:07:34 +09:00
parent 2fb61e432e
commit bccf0fcbee
14 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
channel/channelapp/Makefile
View File

@ -111,7 +111,7 @@ $(TARGET_APP)_nopax.elf: $(FILES_SRC_OBJ) newrvl.ld
@$(CC) $(FILES_SRC_OBJ) $(LDFLAGS_APP) -o $@
$(TARGET_APP).elf: $(TARGET_APP)_nopax.elf
@$(WIIPAX) -s devkitfail $< $@
@$(WIIPAX) -s devkitppc $< $@
$(TARGET_CHAN).elf: $(TARGET_APP)_nopax.elf
@echo $(@F)

4
wiipax/client/Makefile
View File

@ -2,8 +2,8 @@ CFLAGS = -Wall -W -Os -g
TARGET = wiipax
OBJS = LzFind.o LzmaEnc.o LzmaDec.o lzma.o main.o
OBJS += stub_mini.o stub_mini_debug.o
OBJS += stub_dkf.o stub_dkf_debug.o
OBJS += stub_dkfc.o stub_dkfc_debug.o
OBJS += stub_dkp.o stub_dkp_debug.o
OBJS += stub_dkpc.o stub_dkpc_debug.o
NOMAPFILE = 1

24
wiipax/client/main.c
View File

@ -17,14 +17,14 @@ extern int stub_mini_elf_len;
extern char stub_mini_elf[];
extern int stub_mini_debug_elf_len;
extern char stub_mini_debug_elf[];
extern int stub_dkf_elf_len;
extern char stub_dkf_elf[];
extern int stub_dkf_debug_elf_len;
extern char stub_dkf_debug_elf[];
extern int stub_dkfc_elf_len;
extern char stub_dkfc_elf[];
extern int stub_dkfc_debug_elf_len;
extern char stub_dkfc_debug_elf[];
extern int stub_dkp_elf_len;
extern char stub_dkp_elf[];
extern int stub_dkp_debug_elf_len;
extern char stub_dkp_debug_elf[];
extern int stub_dkpc_elf_len;
extern char stub_dkpc_elf[];
extern int stub_dkpc_debug_elf_len;
extern char stub_dkpc_debug_elf[];
typedef struct {
const char *name;
@ -35,10 +35,10 @@ typedef struct {
static const stub_t stubs[] = {
{ "mini", &stub_mini_elf_len, (u8 *) stub_mini_elf },
{ "mini_debug", &stub_mini_debug_elf_len, (u8 *) stub_mini_debug_elf },
{ "devkitfail", &stub_dkf_elf_len, (u8 *) stub_dkf_elf },
{ "devkitfail_debug", &stub_dkf_debug_elf_len, (u8 *) stub_dkf_debug_elf },
{ "dkfailchannel", &stub_dkfc_elf_len, (u8 *) stub_dkfc_elf },
{ "dkfailchannel_debug", &stub_dkfc_debug_elf_len, (u8 *) stub_dkfc_debug_elf },
{ "devkitppc", &stub_dkp_elf_len, (u8 *) stub_dkp_elf },
{ "devkitppc_debug", &stub_dkp_debug_elf_len, (u8 *) stub_dkp_debug_elf },
{ "dkppcchannel", &stub_dkpc_elf_len, (u8 *) stub_dkpc_elf },
{ "dkppcchannel_debug", &stub_dkpc_debug_elf_len, (u8 *) stub_dkpc_debug_elf },
{ NULL, NULL, NULL }
};

1
wiipax/client/stub_dkf.c
View File

@ -1 +0,0 @@
../stub/stub_dkf.c

1
wiipax/client/stub_dkf_debug.c
View File

@ -1 +0,0 @@
../stub/stub_dkf_debug.c

1
wiipax/client/stub_dkfc.c
View File

@ -1 +0,0 @@
../stub/stub_dkfc.c

1
wiipax/client/stub_dkfc_debug.c
View File

@ -1 +0,0 @@
../stub/stub_dkfc_debug.c

1
wiipax/client/stub_dkp.c Symbolic link
View File

@ -0,0 +1 @@
../stub/stub_dkp.c

1
wiipax/client/stub_dkp_debug.c Symbolic link
View File

@ -0,0 +1 @@
../stub/stub_dkp_debug.c

1
wiipax/client/stub_dkpc.c Symbolic link
View File

@ -0,0 +1 @@
../stub/stub_dkpc.c

1
wiipax/client/stub_dkpc_debug.c Symbolic link
View File

@ -0,0 +1 @@
../stub/stub_dkpc_debug.c

30
wiipax/stub/Makefile
View File

@ -8,17 +8,17 @@ LDFLAGS += -nostartfiles -nodefaultlibs
OBJS_COMMON = crt0.o main.o string.o sync.o elf.o time.o LzmaDec.o
TARGET_ID =
ifeq ($(DEVKITFAIL),1)
DEFINES += -DDEVKITFAIL
ifeq ($(DKPPC),1)
DEFINES += -DDKPPC
OBJS = $(OBJS_COMMON)
LDSCRIPT = devkitfail.ld
TARGET_ID = _dkf
LDSCRIPT = devkitppc.ld
TARGET_ID = _dkp
else
ifeq ($(DKFAILCHANNEL),1)
DEFINES += -DDEVKITFAIL
ifeq ($(DKPPCCHANNEL),1)
DEFINES += -DDKPPC
OBJS = realmode.o $(OBJS_COMMON)
LDSCRIPT = channel.ld
TARGET_ID = _dkfc
TARGET_ID = _dkpc
else
OBJS = realmode.o plunge.o $(OBJS_COMMON)
LDSCRIPT = realmode.ld
@ -53,14 +53,14 @@ release:
$(Q)$(MAKE) clean
$(Q)$(MAKE) NDEBUG=1
$(Q)$(MAKE) NDEBUG=1 clean
$(Q)$(MAKE) DEVKITFAIL=1
$(Q)$(MAKE) DEVKITFAIL=1 clean
$(Q)$(MAKE) DEVKITFAIL=1 NDEBUG=1
$(Q)$(MAKE) DEVKITFAIL=1 NDEBUG=1 clean
$(Q)$(MAKE) DKFAILCHANNEL=1
$(Q)$(MAKE) DKFAILCHANNEL=1 clean
$(Q)$(MAKE) DKFAILCHANNEL=1 NDEBUG=1
$(Q)$(MAKE) DKFAILCHANNEL=1 NDEBUG=1 clean
$(Q)$(MAKE) DKPPC=1
$(Q)$(MAKE) DKPPC=1 clean
$(Q)$(MAKE) DKPPC=1 NDEBUG=1
$(Q)$(MAKE) DKPPC=1 NDEBUG=1 clean
$(Q)$(MAKE) DKPPCCHANNEL=1
$(Q)$(MAKE) DKPPCCHANNEL=1 clean
$(Q)$(MAKE) DKPPCCHANNEL=1 NDEBUG=1
$(Q)$(MAKE) DKPPCCHANNEL=1 NDEBUG=1 clean
.PHONY: release

0
wiipax/stub/devkitfail.ld → wiipax/stub/devkitppc.ld
View File

4
wiipax/stub/main.c
View File

@ -68,7 +68,7 @@ void stubmain(void) {
write32(0x0c003004, 0);
#ifndef NDEBUG
#ifndef DEVKITFAIL
#ifndef DKPPC
udelay(500 * 1000); // wait for mini - avoid EXI battle
#endif
gecko_init();
@ -86,7 +86,7 @@ void stubmain(void) {
write32(0x0c003000, 0xffffffff);
printf("Branching to 0x%08x\n", entry);
#ifndef DEVKITFAIL
#ifndef DKPPC
// detect failkit apps packed with the mini stub
if (entry & 0xc0000000) {
void (*ep)() = (void (*)()) entry;