diff options
author | Dave Chapman <dave@dchapman.com> | 2009-12-09 13:13:58 +0000 |
---|---|---|
committer | Dave Chapman <dave@dchapman.com> | 2009-12-09 13:13:58 +0000 |
commit | 5742f89394d4c4ef45e5d09006e4a37f6428ada0 (patch) | |
tree | b7570eada9d513faa32b909f4dde651b4dbb6e3e /rbutil/ipodpatcher | |
parent | dd9fbbf7c8128d48f5060e62b0af9dcea43ca317 (diff) | |
download | rockbox-5742f89394d4c4ef45e5d09006e4a37f6428ada0.tar.gz rockbox-5742f89394d4c4ef45e5d09006e4a37f6428ada0.zip |
Fix ipodpatcher to work with new target names introduced in r23883
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23906 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil/ipodpatcher')
-rw-r--r-- | rbutil/ipodpatcher/Makefile | 4 | ||||
-rw-r--r-- | rbutil/ipodpatcher/ipodpatcher.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/rbutil/ipodpatcher/Makefile b/rbutil/ipodpatcher/Makefile index 908cc110f2..df2838bf3c 100644 --- a/rbutil/ipodpatcher/Makefile +++ b/rbutil/ipodpatcher/Makefile | |||
@@ -1,6 +1,6 @@ | |||
1 | CFLAGS=-Wall -W | 1 | CFLAGS=-Wall -W |
2 | 2 | ||
3 | BOOT_H = ipod1g2g.h ipod3g.h ipod4g.h ipodcolor.h ipodmini.h ipodmini2g.h ipodnano.h ipodvideo.h | 3 | BOOT_H = ipod1g2g.h ipod3g.h ipod4g.h ipodcolor.h ipodmini1g.h ipodmini2g.h ipodnano1g.h ipodvideo.h |
4 | 4 | ||
5 | # Enable the next two lines to build with embedded bootloaders and the | 5 | # Enable the next two lines to build with embedded bootloaders and the |
6 | # --install option and interactive mode. You need the full set of Rockbox | 6 | # --install option and interactive mode. You need the full set of Rockbox |
@@ -13,7 +13,7 @@ BOOTOBJS=1 | |||
13 | endif | 13 | endif |
14 | 14 | ||
15 | ifdef BOOTOBJS | 15 | ifdef BOOTOBJS |
16 | BOOTSRC = ipod1g2g.c ipod3g.c ipod4g.c ipodcolor.c ipodmini.c ipodmini2g.c ipodnano.c ipodvideo.c ipodnano2g.c | 16 | BOOTSRC = ipod1g2g.c ipod3g.c ipod4g.c ipodcolor.c ipodmini1g.c ipodmini2g.c ipodnano1g.c ipodvideo.c ipodnano2g.c |
17 | CFLAGS += -DWITH_BOOTOBJS | 17 | CFLAGS += -DWITH_BOOTOBJS |
18 | endif | 18 | endif |
19 | 19 | ||
diff --git a/rbutil/ipodpatcher/ipodpatcher.c b/rbutil/ipodpatcher/ipodpatcher.c index 26202fb253..b2f01b8223 100644 --- a/rbutil/ipodpatcher/ipodpatcher.c +++ b/rbutil/ipodpatcher/ipodpatcher.c | |||
@@ -1648,8 +1648,8 @@ int getmodel(struct ipod_t* ipod, int ipod_version) | |||
1648 | ipod->modelname = "mini"; | 1648 | ipod->modelname = "mini"; |
1649 | ipod->targetname = "ipodmini1g"; | 1649 | ipod->targetname = "ipodmini1g"; |
1650 | #ifdef WITH_BOOTOBJS | 1650 | #ifdef WITH_BOOTOBJS |
1651 | ipod->bootloader = ipodmini; | 1651 | ipod->bootloader = ipodmini1g; |
1652 | ipod->bootloader_len = LEN_ipodmini; | 1652 | ipod->bootloader_len = LEN_ipodmini1g; |
1653 | #endif | 1653 | #endif |
1654 | break; | 1654 | break; |
1655 | case 0x50: | 1655 | case 0x50: |
@@ -1688,8 +1688,8 @@ int getmodel(struct ipod_t* ipod, int ipod_version) | |||
1688 | ipod->modelname = "nano"; | 1688 | ipod->modelname = "nano"; |
1689 | ipod->targetname = "ipodnano1g"; | 1689 | ipod->targetname = "ipodnano1g"; |
1690 | #ifdef WITH_BOOTOBJS | 1690 | #ifdef WITH_BOOTOBJS |
1691 | ipod->bootloader = ipodnano; | 1691 | ipod->bootloader = ipodnano1g; |
1692 | ipod->bootloader_len = LEN_ipodnano; | 1692 | ipod->bootloader_len = LEN_ipodnano1g; |
1693 | #endif | 1693 | #endif |
1694 | break; | 1694 | break; |
1695 | case 0xb0: | 1695 | case 0xb0: |