mirror of
https://github.com/fail0verflow/mini.git
synced 2024-11-06 03:35:13 +01:00
Revert "thumb mode for mini"
This reverts commit 189d9559aee8881aeb3df34817c28690bfaf5970. Loading mini from the installer makes mini panic, lets reintroduce a working version after the initial release.
This commit is contained in:
parent
e06fbf3b1e
commit
cce6145e15
17
Makefile
17
Makefile
@ -1,8 +1,7 @@
|
|||||||
include ../../starlet.mk
|
include ../../starlet.mk
|
||||||
|
|
||||||
ASFLAGS += -D_LANGUAGE_ASSEMBLY
|
ASFLAGS += -D_LANGUAGE_ASSEMBLY
|
||||||
CFLAGS += -DCAN_HAZ_IRQ -DCAN_HAZ_IPC -mthumb-interwork
|
CFLAGS += -DCAN_HAZ_IRQ -DCAN_HAZ_IPC
|
||||||
THUMBFLAGS = -mthumb
|
|
||||||
LDSCRIPT = mini.ld
|
LDSCRIPT = mini.ld
|
||||||
LIBS = -lgcc
|
LIBS = -lgcc
|
||||||
|
|
||||||
@ -11,11 +10,10 @@ MAKEBIN = python ../makebin.py
|
|||||||
|
|
||||||
TARGET = armboot.elf
|
TARGET = armboot.elf
|
||||||
TARGET_BIN = armboot.bin
|
TARGET_BIN = armboot.bin
|
||||||
OBJS = start.o memory.o memory_asm.o utils_asm.o panic.o irq_asm.o ipc.o \
|
OBJS = start.o main.o ipc.o vsprintf.o string.o gecko.o memory.o memory_asm.o \
|
||||||
exception_asm.o nand.o exception.o ldhack.o
|
utils_asm.o utils.o ff.o diskio.o sdhc.o powerpc_elf.o powerpc.o panic.o \
|
||||||
THUMB_OBJS = sdmmc.o sdhc.o boot2.o powerpc.o powerpc_elf.o diskio.o ff.o \
|
irq.o irq_asm.o exception.o exception_asm.o seeprom.o crypto.o nand.o \
|
||||||
crypto.o seeprom.o utils.o main.o vsprintf.o string.o \
|
boot2.o ldhack.o sdmmc.o
|
||||||
gecko.o irq.o
|
|
||||||
|
|
||||||
include ../../common.mk
|
include ../../common.mk
|
||||||
|
|
||||||
@ -23,11 +21,6 @@ all: $(TARGET_BIN)
|
|||||||
|
|
||||||
main.o: main.c git_version.h
|
main.o: main.c git_version.h
|
||||||
|
|
||||||
$(THUMB_OBJS): %.o : %.c
|
|
||||||
@echo " COMPILE[T] $<"
|
|
||||||
@mkdir -p $(DEPDIR)
|
|
||||||
@$(CC) $(CFLAGS) $(THUMBFLAGS) $(DEFINES) -Wp,-MMD,$(DEPDIR)/$(*F).d,-MQ,"$@",-MP -c $< -o $@
|
|
||||||
|
|
||||||
$(TARGET_BIN): $(TARGET) $(ELFLOADER)
|
$(TARGET_BIN): $(TARGET) $(ELFLOADER)
|
||||||
@echo "MAKEBIN $@"
|
@echo "MAKEBIN $@"
|
||||||
@$(MAKEBIN) $(ELFLOADER) $< $@
|
@$(MAKEBIN) $(ELFLOADER) $< $@
|
||||||
|
3
start.S
3
start.S
@ -104,8 +104,7 @@ done_bss2:
|
|||||||
bl debug_output
|
bl debug_output
|
||||||
@ take the plunge
|
@ take the plunge
|
||||||
mov r0, r4
|
mov r0, r4
|
||||||
ldr r4, =(_main+1)
|
bl _main
|
||||||
blx r4
|
|
||||||
@ _main returned! Go to whatever address it returned...
|
@ _main returned! Go to whatever address it returned...
|
||||||
mov pc, r0
|
mov pc, r0
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user