| Index: apps/installer-nano2g/bootstub/bootstub.S |
| — | — | @@ -320,15 +320,17 @@ |
| 321 | 321 | orr r0, r0, #5
|
| 322 | 322 | orr r0, r0, #0x1000
|
| 323 | 323 | mcr p15, 0, r0,c1,c0 @ Re-enable the Protection Unit and caches
|
| | 324 | + ldr r1, _stubend + 4
|
| 324 | 325 | ldr r0, _stubend
|
| 325 | | - ldr r1, _stubend + 4
|
| 326 | | - add r1, r1, r0
|
| | 326 | + add r0, r1, r0
|
| 327 | 327 | mov r2, #0x08000000
|
| 328 | 328 | movepayloadloop:
|
| 329 | | - cmp r1, r0
|
| 330 | | - ldrhi r3, [r0], #4
|
| | 329 | + cmp r0, r1
|
| | 330 | + ldrhi r3, [r1], #4
|
| 331 | 331 | strhi r3, [r2], #4
|
| 332 | 332 | bhi movepayloadloop
|
| | 333 | + bl flushcache
|
| | 334 | + mcr p15, 0, r0,c7,c5
|
| 333 | 335 | mov pc, #0x08000000
|
| 334 | 336 |
|
| 335 | 337 |
|
| — | — | @@ -906,7 +908,4 @@ |
| 907 | 909 | bmi sleepmsloop
|
| 908 | 910 | mov pc, lr
|
| 909 | 911 |
|
| 910 | | - nop
|
| 911 | | - nop
|
| 912 | | -
|
| 913 | 912 | _stubend: |
| \ No newline at end of file |
| Index: apps/installer-nano2g/Makefile |
| — | — | @@ -61,9 +61,9 @@ |
| 62 | 62 |
|
| 63 | 63 | build/$(NAME).integrated.bin: $(EMBIOSDIR)/build/ipodnano2g/embios.bin build/$(NAME).embiosapp
|
| 64 | 64 | @echo [EMBAPP] $@
|
| 65 | | - @$(EMBIOSEMBEDAPP) $^ $@ --run-from=08000000
|
| | 65 | + @$(EMBIOSEMBEDAPP) $^ $@ --run-from=0x08000000
|
| 66 | 66 |
|
| 67 | | -build/$(NAME).embiosapp: build/$(NAME).plain.embiosapp $(BITMAPS)
|
| | 67 | +build/$(NAME).embiosapp: build/$(NAME).plain.embiosapp $(BITMAPS) flashfiles.built
|
| 68 | 68 | @echo [GENINS] $<
|
| 69 | 69 | @$(GENINSTALLER) $< $@
|
| 70 | 70 |
|
| — | — | @@ -151,6 +151,7 @@ |
| 152 | 152 | endif
|
| 153 | 153 |
|
| 154 | 154 | flashfiles: $(FLASHFILES)
|
| | 155 | + @touch flashfiles.built
|
| 155 | 156 |
|
| 156 | 157 | flashfiles/uninstaller-nano2g.embiosapp.ucl: $(UNINSTDIR)/build/uninstaller-nano2g.embiosapp.ucl uninstaller-nano2g
|
| 157 | 158 | @echo [CP] $@
|
| — | — | @@ -178,11 +179,11 @@ |
| 179 | 180 |
|
| 180 | 181 | flashfiles/embios-ipodnano2g.bin: $(EMBIOSDIR)/build/ipodnano2g/embios.bin embios
|
| 181 | 182 | @echo [EMBCFG] $@
|
| 182 | | - @$(EMBIOSBOOTCFG) $< $@ --file=/iLoader/boot.embiosapp --file-compressed --file-run-from=08000000 \
|
| 183 | | - --flash="iloader " --flash-compressed --flash-run-from=09e00000
|
| | 183 | + @$(EMBIOSBOOTCFG) $< $@ --file=/iLoader/boot.embiosapp --file-compressed --file-run-from=0x08000000 \
|
| | 184 | + --flash=iloader --flash-compressed --flash-run-from=0x09e00000
|
| 184 | 185 |
|
| 185 | 186 | embios:
|
| 186 | | - @make -C $(EMBIOSDIR)
|
| | 187 | + @make -C $(EMBIOSDIR) ipodnano2g
|
| 187 | 188 |
|
| 188 | 189 | embiosldr-ipodnano2g:
|
| 189 | 190 | @make -C $(EMBIOSDIR)/loader/ipodnano2g
|
| Index: embios/trunk/tools/libembiosbootcfg.py |
| — | — | @@ -48,30 +48,30 @@ |
| 49 | 49 | if "tryfile" in args: tryfile = 1 if args["tryfile"] else 0
|
| 50 | 50 | if "filename" in args: filename = args["filename"].ljust(256, "\0")
|
| 51 | 51 | if "filecomp" in args:
|
| 52 | | - if args["filecomp"]: fileflags = fileflags | 2
|
| | 52 | + if args["filecomp"]: fileflags = fileflags | 1
|
| | 53 | + else: fileflags = fileflags & ~1
|
| | 54 | + if "filecopy" in args:
|
| | 55 | + if args["filecopy"]: fileflags = fileflags | 2
|
| 53 | 56 | else: fileflags = fileflags & ~2
|
| 54 | | - if "filecopy" in args:
|
| 55 | | - if args["filecopy"]: fileflags = fileflags | 1
|
| 56 | | - else: fileflags = fileflags & ~1
|
| 57 | 57 | if "filedest" in args: filedest = args["filedest"]
|
| 58 | 58 | if "tryflash" in args: tryflash = 1 if args["tryflash"] else 0
|
| 59 | 59 | if "flashname" in args: flashname = args["flashname"].ljust(8)
|
| 60 | 60 | if "flashcomp" in args:
|
| 61 | | - if args["flashcomp"]: flashflags = flashflags | 2
|
| | 61 | + if args["flashcomp"]: flashflags = flashflags | 1
|
| | 62 | + else: flashflags = flashflags & ~1
|
| | 63 | + if "flashcopy" in args:
|
| | 64 | + if args["flashcopy"]: flashflags = flashflags | 2
|
| 62 | 65 | else: flashflags = flashflags & ~2
|
| 63 | | - if "flashcopy" in args:
|
| 64 | | - if args["flashcopy"]: flashflags = flashflags | 1
|
| 65 | | - else: flashflags = flashflags & ~1
|
| 66 | 66 | if "flashdest" in args: flashdest = args["flashdest"]
|
| 67 | 67 | if "trymmap" in args: trymmap = 1 if args["trymmap"] else 0
|
| 68 | 68 | if "mmapaddr" in args: mmapaddr = args["mmapaddr"]
|
| 69 | 69 | if "mmapsize" in args: mmapsize = args["mmapsize"]
|
| 70 | 70 | if "mmapcomp" in args:
|
| 71 | | - if args["mmapcomp"]: mmapflags = mmapflags | 2
|
| | 71 | + if args["mmapcomp"]: mmapflags = mmapflags | 1
|
| | 72 | + else: mmapflags = mmapflags & ~1
|
| | 73 | + if "mmapcopy" in args:
|
| | 74 | + if args["mmapcopy"]: mmapflags = mmapflags | 2
|
| 72 | 75 | else: mmapflags = mmapflags & ~2
|
| 73 | | - if "mmapcopy" in args:
|
| 74 | | - if args["mmapcopy"]: mmapflags = mmapflags | 1
|
| 75 | | - else: mmapflags = mmapflags & ~1
|
| 76 | 76 | if "mmapdest" in args: mmapdest = args["mmapdest"]
|
| 77 | 77 | data = struct.pack("<I256sIII8sIIIIIII", tryfile, filename, fileflags, filedest,
|
| 78 | 78 | tryflash, flashname, flashflags, flashdest,
|
| Index: embios/trunk/loader/ipodnano2g/version.h |
| — | — | @@ -25,7 +25,7 @@ |
| 26 | 26 | #define __VERSION_H__
|
| 27 | 27 |
|
| 28 | 28 |
|
| 29 | | -#define VERSION "0.0.1pre"
|
| | 29 | +#define VERSION "0.0.1"
|
| 30 | 30 | #define VERSION_MAJOR 0
|
| 31 | 31 | #define VERSION_MINOR 0
|
| 32 | 32 | #define VERSION_PATCH 1
|
