Skip to content

Commit

Permalink
remove mini_b9s_installer and update u-otherapp
Browse files Browse the repository at this point in the history
This is to prepare for boot9strap 1.4 and any future versions. SafeB9Sinstaller is loaded as default now. Mini b9s was okay but maintainability is more important these days.
  • Loading branch information
zoogie committed May 23, 2022
1 parent c563a78 commit 50eb3ac
Show file tree
Hide file tree
Showing 48 changed files with 16 additions and 28,019 deletions.
4 changes: 2 additions & 2 deletions Makefile
Expand Up @@ -4,7 +4,7 @@

NAME := $(notdir $(CURDIR))

SUBFOLDERS := stage1 stage2 stage3_universal_otherapp mini_b9s_installer bb3_installer bb3_installer/payload bb3_installer/payload/otherapp_template
SUBFOLDERS := stage1 stage2 stage3_universal_otherapp bb3_installer bb3_installer/payload bb3_installer/payload/otherapp_template
MAKEOPTS :=

.PHONY: all release clean $(SUBFOLDERS) slotTool
Expand All @@ -28,4 +28,4 @@ slotTool: $(SUBFOLDERS)
$(SUBFOLDERS):
@$(MAKE) -C $@ $(MAKEOPTS) all

stage3_universal_otherapp: MAKEOPTS += DEFAULT_PAYLOAD_FILE_OFFSET=0x10000 DEFAULT_PAYLOAD_FILE_NAME="usm.bin" MEMCHUNKHAX_ONLY=1
stage3_universal_otherapp: MAKEOPTS += MEMCHUNKHAX_ONLY=1
8 changes: 4 additions & 4 deletions bb3_installer/payload/otherapp_template/source/main.c
Expand Up @@ -12,9 +12,9 @@
#define HID_PAD (*(vu32*)0x1000001C)
#define GSPGPU_FlushDataCache 0x0013e46c
#define GSPGPU_SERVHANDLEADR 0x002993c4
#define VRAM ((u32)0x31000000)
#define workbuf (u8*)0x00690000
#define slot1 (u8*)(0x00682000+0x1F000)
u32 VRAM=(u32)0x31000000;
u8 *workbuf;
u8 *slot1=(u8*)(0x00682000+0x1F000);
#define cfgHandle (u32*)0x00600000
#define HAXX 0x58584148
#define CLEAR (PAD_L | PAD_R | PAD_Y | PAD_LEFT) //combo for deleting all wifi slots
Expand Down Expand Up @@ -404,7 +404,7 @@ Result confirm(int y){

int main(int loaderparam, char** argv)
{
//u8 *workbuf=(u8*)0x00690000;
workbuf=(u8*)0x00690000;
//u8 *slot1=(u8*)(0x00682000+0x1F000);
Handle cptr;
Handle nptr;
Expand Down
16 changes: 8 additions & 8 deletions build_payload.py
Expand Up @@ -25,13 +25,13 @@
if(len(code) > 0x8000):
print("Error: codebin too large")
sys.exit(0)

'''
with open("mini_b9s_installer/mini_b9s_installer.bin","rb") as f:
b9s=f.read()
if(len(b9s) > 0xF000):
print("Error: b9s_installer too large")
sys.exit(0)

'''
with open("usm.bin","wb+") as f:
f.write(payload)
f.seek(0x0)
Expand All @@ -42,11 +42,11 @@
f.write(bb3_code)
f.seek(0x8000)
f.write(code)
f.seek(0x10000)
f.write(b9s)
#f.seek(0x10000)
#f.write(b9s)
f.seek(0x1F000)
f.write(slot1)
f.seek(0x10000)
crc=binascii.crc32(f.read(0x10000-4)) & 0xffffffff
f.seek(0x20000-4)
f.write(struct.pack("<I",crc))
#f.seek(0x10000)
#crc=binascii.crc32(f.read(0x10000-4)) & 0xffffffff
#f.seek(0x20000-4)
#f.write(struct.pack("<I",crc))
154 changes: 0 additions & 154 deletions mini_b9s_installer/Makefile

This file was deleted.

Binary file removed mini_b9s_installer/boot9strap
Binary file not shown.
21 changes: 0 additions & 21 deletions mini_b9s_installer/linker.ld

This file was deleted.

4 changes: 0 additions & 4 deletions mini_b9s_installer/linker.specs

This file was deleted.

0 comments on commit 50eb3ac

Please sign in to comment.