From 41958943e808ee49a60ecc0b301e6bd5ec69e951 Mon Sep 17 00:00:00 2001 From: mariogamer2 Date: Thu, 3 Mar 2016 14:19:11 -0500 Subject: [PATCH 1/9] Update README.md --- README.md | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index f59fd09..e2da847 100644 --- a/README.md +++ b/README.md @@ -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_init was implemented by [**dark-samus** pull request](https://github.com/delebile/arm9loaderhax/pull/9) (thank!). + +## How do I update it? + +An updater is in developement.You can test [**dark-samus one**](https://github.com/delebile/arm9loaderhax/issues/10#issuecomment-189914031),but it is unstable. ## Installation @@ -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 @@ -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 - - - - - - - - - From 5c2b3456e0ca5da36bcb4587c6c9f3b48b46ea65 Mon Sep 17 00:00:00 2001 From: mariogamer2 Date: Thu, 3 Mar 2016 14:24:48 -0500 Subject: [PATCH 2/9] Update gitigniore --- .gitignore | 12 ++++++++++-- payload_installer/brahma2/data/.place_here | 0 2 files changed, 10 insertions(+), 2 deletions(-) delete mode 100644 payload_installer/brahma2/data/.place_here diff --git a/.gitignore b/.gitignore index a38760d..6d34de9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,16 @@ .idea CMakeLists.txt -data_output data_input/*.bin data_input/*.firm +playload_installer/brahma2/data + +# Output +data_output +*.3dsx +*.elf +*.o +*.bin +build -*.bat \ No newline at end of file +*.bat diff --git a/payload_installer/brahma2/data/.place_here b/payload_installer/brahma2/data/.place_here deleted file mode 100644 index e69de29..0000000 From fa4f0818cd5b097b20fd5f1470037375834b8725 Mon Sep 17 00:00:00 2001 From: mariogamer2 Date: Thu, 3 Mar 2016 14:29:46 -0500 Subject: [PATCH 3/9] Remove data_output and otp when running make clean --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index b8bbb48..5428272 100644 --- a/Makefile +++ b/Makefile @@ -50,3 +50,5 @@ clean: @$(MAKE) -C screen_init clean @$(MAKE) -C payload_stage2 clean @$(MAKE) -C payload_installer clean TARGET=../$(TARGET) + rm -rf data_output + rm -rf data_input/otp.bin From 94dac287eab983a5b58c17d5a7762eeb86f4eaf4 Mon Sep 17 00:00:00 2001 From: mariogamer2 Date: Thu, 3 Mar 2016 15:54:59 -0500 Subject: [PATCH 4/9] Update Makefile --- payload_installer/brahma2/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/payload_installer/brahma2/Makefile b/payload_installer/brahma2/Makefile index c8c7f63..a570afc 100644 --- a/payload_installer/brahma2/Makefile +++ b/payload_installer/brahma2/Makefile @@ -124,6 +124,7 @@ endif all: $(BUILD) $(BUILD): + mkdir data @echo $(SFILES) @[ -d $@ ] || mkdir -p $@ @make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile From 00fca351f4376db396c99671762b1b639b2cf4b1 Mon Sep 17 00:00:00 2001 From: mariogamer2 Date: Thu, 3 Mar 2016 16:02:02 -0500 Subject: [PATCH 5/9] Create data folder before making --- Makefile | 1 + payload_installer/brahma2/Makefile | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5428272..fddbd05 100644 --- a/Makefile +++ b/Makefile @@ -37,6 +37,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 diff --git a/payload_installer/brahma2/Makefile b/payload_installer/brahma2/Makefile index a570afc..c8c7f63 100644 --- a/payload_installer/brahma2/Makefile +++ b/payload_installer/brahma2/Makefile @@ -124,7 +124,6 @@ endif all: $(BUILD) $(BUILD): - mkdir data @echo $(SFILES) @[ -d $@ ] || mkdir -p $@ @make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile From 9eaa7afa6d245d0232cb7292cfeed538e0496ffb Mon Sep 17 00:00:00 2001 From: mariogamer2 Date: Fri, 4 Mar 2016 18:09:28 -0500 Subject: [PATCH 6/9] Remove data folder when running make clean --- payload_installer/brahma2/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/payload_installer/brahma2/Makefile b/payload_installer/brahma2/Makefile index c8c7f63..9f12d5b 100644 --- a/payload_installer/brahma2/Makefile +++ b/payload_installer/brahma2/Makefile @@ -132,6 +132,7 @@ $(BUILD): clean: @echo clean ... @rm -fr $(BUILD) $(TARGET).3dsx $(OUTPUT).smdh $(TARGET).elf + @rm -fr data #--------------------------------------------------------------------------------- From b0429eeb397e4958f973372792785e55c487ae22 Mon Sep 17 00:00:00 2001 From: Mrrraou Date: Mon, 7 Mar 2016 21:02:16 +0100 Subject: [PATCH 7/9] Fixed .gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 6d34de9..072be65 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ CMakeLists.txt data_input/*.bin data_input/*.firm -playload_installer/brahma2/data +payload_installer/brahma2/data # Output data_output From 928d1ed428e2f9a360fa26330a9efb7380749e1f Mon Sep 17 00:00:00 2001 From: Mrrraou Date: Mon, 7 Mar 2016 21:05:58 +0100 Subject: [PATCH 8/9] Fixed readme.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e2da847..435c1fb 100644 --- a/README.md +++ b/README.md @@ -14,11 +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. -Screen_init was implemented by [**dark-samus** pull request](https://github.com/delebile/arm9loaderhax/pull/9) (thank!). +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 in developement.You can test [**dark-samus one**](https://github.com/delebile/arm9loaderhax/issues/10#issuecomment-189914031),but it is unstable. +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 From 55ca86b50a3b7d7014929cfdffc8d4d6a3558289 Mon Sep 17 00:00:00 2001 From: Mrrraou Date: Mon, 7 Mar 2016 21:13:04 +0100 Subject: [PATCH 9/9] Make Makefile more convenient for development Use "make purge" to clean and remove otp.bin now. --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index fddbd05..55c3e21 100644 --- a/Makefile +++ b/Makefile @@ -52,4 +52,6 @@ clean: @$(MAKE) -C payload_stage2 clean @$(MAKE) -C payload_installer clean TARGET=../$(TARGET) rm -rf data_output + +purge: clean rm -rf data_input/otp.bin