| Index: apps/installer-nano2g/Makefile |
| — | — | @@ -26,7 +26,7 @@ |
| 27 | 27 | COMPILECONFIG := python $(ILOADERDIR)/tools/compileconfig.py
|
| 28 | 28 | EMBIOSBOOTCFG := python $(EMBIOSDIR)/tools/embiosbootcfg.py
|
| 29 | 29 | EMBIOSEMBEDAPP := python $(EMBIOSDIR)/tools/embiosembedapp.py
|
| 30 | | -CRYPTFW := python $(EMBIOSDIR)/tools/ipodcrypt.py nano2g-cryptfirmware
|
| | 30 | +CRYPTFW := python $(EMBIOSDIR)/tools/ipodcrypt.py s5l8701-cryptfirmware
|
| 31 | 31 | GENNOTE := python $(NOTEBOOTDIR)/gennote.py
|
| 32 | 32 | SCRAMBLE := python $(TOOLSDIR)/scramble.py
|
| 33 | 33 |
|
| Index: embios/trunk/tools/ipodcrypt.py |
| — | — | @@ -31,10 +31,10 @@ |
| 32 | 32 | print "Please provide a command and (if needed) parameters as command line arguments"
|
| 33 | 33 | print ""
|
| 34 | 34 | print "Available commands:"
|
| 35 | | - print " nano2g-cryptdfu <infile> <outfile>"
|
| 36 | | - print " nano2g-decryptdfu <infile> <outfile>"
|
| 37 | | - print " nano2g-cryptfirmware <infile> <outfile>"
|
| 38 | | - print " nano2g-decryptfirmware <infile> <outfile>"
|
| | 35 | + print " s5l8701-cryptdfu <infile> <outfile>"
|
| | 36 | + print " s5l8701-decryptdfu <infile> <outfile>"
|
| | 37 | + print " s5l8701-cryptfirmware <infile> <outfile>"
|
| | 38 | + print " s5l8701-decryptfirmware <infile> <outfile>"
|
| 39 | 39 | exit(2)
|
| 40 | 40 |
|
| 41 | 41 |
|
| — | — | @@ -41,17 +41,17 @@ |
| 42 | 42 | def parsecommand(argv):
|
| 43 | 43 | if len(argv) != 4: usage()
|
| 44 | 44 |
|
| 45 | | - elif argv[1] == "nano2g-cryptdfu":
|
| 46 | | - libipodcrypto.nano2gcryptdfufile(argv[2], argv[3])
|
| | 45 | + elif argv[1] == "s5l8701-cryptdfu":
|
| | 46 | + libipodcrypto.s5l8701cryptdfufile(argv[2], argv[3])
|
| 47 | 47 |
|
| 48 | | - elif argv[1] == "nano2g-decryptdfu":
|
| 49 | | - libipodcrypto.nano2gdecryptdfufile(argv[2], argv[3])
|
| | 48 | + elif argv[1] == "s5l8701-decryptdfu":
|
| | 49 | + libipodcrypto.s5l8701decryptdfufile(argv[2], argv[3])
|
| 50 | 50 |
|
| 51 | | - elif argv[1] == "nano2g-cryptfirmware":
|
| 52 | | - libipodcrypto.nano2gcryptfirmwarefile(argv[2], argv[3])
|
| | 51 | + elif argv[1] == "s5l8701-cryptfirmware":
|
| | 52 | + libipodcrypto.s5l8701cryptfirmwarefile(argv[2], argv[3])
|
| 53 | 53 |
|
| 54 | | - elif argv[1] == "nano2g-decryptfirmware":
|
| 55 | | - libipodcrypto.nano2gdecryptfirmwarefile(argv[2], argv[3])
|
| | 54 | + elif argv[1] == "s5l8701-decryptfirmware":
|
| | 55 | + libipodcrypto.s5l8701decryptfirmwarefile(argv[2], argv[3])
|
| 56 | 56 |
|
| 57 | 57 | else: usage()
|
| 58 | 58 |
|
| Index: embios/trunk/tools/libipodcrypto.py |
| — | — | @@ -30,7 +30,7 @@ |
| 31 | 31 | import libembiosdata
|
| 32 | 32 |
|
| 33 | 33 |
|
| 34 | | -def nano2gcryptdfu(data):
|
| | 34 | +def s5l8701cryptdfu(data):
|
| 35 | 35 | data = data.ljust((len(data) + 0x3f) & ~0x3f, "\0")
|
| 36 | 36 | header = "87011.0\0\0\x08\0\0" + struct.pack("<I", len(data))
|
| 37 | 37 | embios = libembios.Embios()
|
| — | — | @@ -42,7 +42,7 @@ |
| 43 | 43 | return embios.read(0x08000000, len(data) + 0x800)
|
| 44 | 44 |
|
| 45 | 45 |
|
| 46 | | -def nano2gdecryptdfu(data):
|
| | 46 | +def s5l8701decryptdfu(data):
|
| 47 | 47 | embios = libembios.Embios()
|
| 48 | 48 | embios.write(0x08000000, data)
|
| 49 | 49 | embios.lib.dev.timeout = 20000
|
| — | — | @@ -50,7 +50,7 @@ |
| 51 | 51 | return embios.read(0x08000800, len(data) - 0x800)
|
| 52 | 52 |
|
| 53 | 53 |
|
| 54 | | -def nano2gcryptfirmware(data):
|
| | 54 | +def s5l8701cryptfirmware(data):
|
| 55 | 55 | data = data.ljust((len(data) + 0x3f) & ~0x3f, "\0")
|
| 56 | 56 | header = "\0\0\0\0\x02\0\0\0\x01\0\0\0\x40\0\0\0\0\0\0\0" + struct.pack("<I", len(data))
|
| 57 | 57 | embios = libembios.Embios()
|
| — | — | @@ -62,7 +62,7 @@ |
| 63 | 63 | return embios.read(0x08000000, len(data) + 0x800)
|
| 64 | 64 |
|
| 65 | 65 |
|
| 66 | | -def nano2gdecryptfirmware(data):
|
| | 66 | +def s5l8701decryptfirmware(data):
|
| 67 | 67 | embios = libembios.Embios()
|
| 68 | 68 | embios.write(0x08000000, data)
|
| 69 | 69 | embios.lib.dev.timeout = 20000
|
| — | — | @@ -70,34 +70,34 @@ |
| 71 | 71 | return embios.read(0x08000800, len(data) - 0x800)
|
| 72 | 72 |
|
| 73 | 73 |
|
| 74 | | -def nano2gcryptdfufile(infile, outfile):
|
| | 74 | +def s5l8701cryptdfufile(infile, outfile):
|
| 75 | 75 | print(outfile)
|
| 76 | 76 | infile = open(infile, "rb")
|
| 77 | 77 | outfile = open(outfile, "wb")
|
| 78 | | - outfile.write(nano2gcryptdfu(infile.read()))
|
| | 78 | + outfile.write(s5l8701cryptdfu(infile.read()))
|
| 79 | 79 | infile.close()
|
| 80 | 80 | outfile.close()
|
| 81 | 81 |
|
| 82 | 82 |
|
| 83 | | -def nano2gdecryptdfufile(infile, outfile):
|
| | 83 | +def s5l8701decryptdfufile(infile, outfile):
|
| 84 | 84 | infile = open(infile, "rb")
|
| 85 | 85 | outfile = open(outfile, "wb")
|
| 86 | | - outfile.write(nano2gdecryptdfu(infile.read()))
|
| | 86 | + outfile.write(s5l8701decryptdfu(infile.read()))
|
| 87 | 87 | infile.close()
|
| 88 | 88 | outfile.close()
|
| 89 | 89 |
|
| 90 | 90 |
|
| 91 | | -def nano2gcryptfirmwarefile(infile, outfile):
|
| | 91 | +def s5l8701cryptfirmwarefile(infile, outfile):
|
| 92 | 92 | infile = open(infile, "rb")
|
| 93 | 93 | outfile = open(outfile, "wb")
|
| 94 | | - outfile.write(nano2gcryptfirmware(infile.read()))
|
| | 94 | + outfile.write(s5l8701cryptfirmware(infile.read()))
|
| 95 | 95 | infile.close()
|
| 96 | 96 | outfile.close()
|
| 97 | 97 |
|
| 98 | 98 |
|
| 99 | | -def nano2gdecryptfirmwarefile(infile, outfile):
|
| | 99 | +def s5l8701decryptfirmwarefile(infile, outfile):
|
| 100 | 100 | infile = open(infile, "rb")
|
| 101 | 101 | outfile = open(outfile, "wb")
|
| 102 | | - outfile.write(nano2gdecryptfirmware(infile.read()))
|
| | 102 | + outfile.write(s5l8701decryptfirmware(infile.read()))
|
| 103 | 103 | infile.close()
|
| 104 | 104 | outfile.close()
|
| Index: embios/trunk/loader/ipodnano2g/Makefile |
| — | — | @@ -8,7 +8,7 @@ |
| 9 | 9 | LD := $(CROSS)ld
|
| 10 | 10 | OBJCOPY := $(CROSS)objcopy
|
| 11 | 11 | UCLPACK := ucl2e10singleblk
|
| 12 | | -CRYPTDFU := python $(EMBIOSDIR)/tools/ipodcrypt.py nano2g-cryptdfu
|
| | 12 | +CRYPTDFU := python $(EMBIOSDIR)/tools/ipodcrypt.py s5l8701-cryptdfu
|
| 13 | 13 |
|
| 14 | 14 | CFLAGS += -Os -fno-pie -fno-stack-protector -fomit-frame-pointer -I. -ffunction-sections -fdata-sections -mcpu=arm940t
|
| 15 | 15 | LDFLAGS += "$(shell $(CC) -print-libgcc-file-name)" --gc-sections
|
