Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/delebile/arm9loaderhax in…
Browse files Browse the repository at this point in the history
…to bootloader
  • Loading branch information
Hartie95 committed Mar 9, 2016
2 parents e02cd92 + 91c4193 commit bcb377c
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ data_output
**/data
**/obj

*.bat
*.bat
5 changes: 5 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ stage2:
@cp payload_stage2/payload_stage2.bin $(OUTDIR)/stage0x5C000.bin

installer:
@mkdir payload_installer/brahma2/data/
@cp $(OUTDIR)/sector.bin payload_installer/brahma2/data/sector.bin
@cp $(OUTDIR)/firm0.bin payload_installer/brahma2/data/firm0.bin
@cp $(OUTDIR)/firm1.bin payload_installer/brahma2/data/firm1.bin
Expand All @@ -58,3 +59,7 @@ clean:
@$(MAKE) -C payload_stage2 clean
@$(MAKE) -C payload_installer clean TARGET=../$(TARGET)
@$(MAKE) -C bootloader clean
rm -rf data_output

purge: clean
rm -rf data_input/otp.bin
17 changes: 6 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@ It loads an **arm9loaderhax.bin** arm9 payload from the root of the sdcard at ad

This means that it offers a BRAHMA-like setup, and as such has compatibility with every payload BRAHMA can run; you can also perform a firmlaunch by writing the ARM11 kernel entrypoint at address 0x1FFFFFF8.

The problem here is that it doesn't still initialize the screens, that has still to be achieved, though i was able to load an external patched firmware and make boot the console without any problem while testing.
Screen initialization was implemented by [**dark-samus**' pull request](https://github.com/delebile/arm9loaderhax/pull/9) (thanks!).

## How do I update it?

An updater is currently in developement. You can test [**dark-samus' one**](https://gbatemp.net/attachments/installer-zip.40329/), but it's currently unfinished and unstable.

## Installation

Expand Down Expand Up @@ -67,7 +71,7 @@ sdmmc.c & sdmmc.h originally written by Normatt
Licensed under GPLv2 or any later version, refer to the license.txt file included.

* Smealum and contributors for libctru
* Normatt for sdmmc.c and .h, and also for .ld files and the log from 3dmoo9 that provided us with some of the information needed to get screen init
* Normmatt for sdmmc.c and .h, and also for .ld files and the log from XDS by ichfly that provided us some of the information needed to get screen init
* Christophe Devine for the SHA codes
* Archshift for i2c.c and .h
* Megazig for crypto.c and .h
Expand All @@ -77,12 +81,3 @@ Licensed under GPLv2 or any later version, refer to the license.txt file include
* [3dbrew community](http://3dbrew.org/)
* bilis/b1l1s for his screen init code, and work on inegrating it into stage 2
* dark_samus for work on integrating screen init into stage 2









1 change: 1 addition & 0 deletions payload_installer/brahma2/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ $(BUILD):
clean:
@echo clean ...
@rm -fr $(BUILD) $(TARGET).3dsx $(OUTPUT).smdh $(TARGET).elf
@rm -fr data


#---------------------------------------------------------------------------------
Expand Down
Empty file.

0 comments on commit bcb377c

Please sign in to comment.