From 5742f89394d4c4ef45e5d09006e4a37f6428ada0 Mon Sep 17 00:00:00 2001 From: Dave Chapman Date: Wed, 9 Dec 2009 13:13:58 +0000 Subject: 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 --- rbutil/ipodpatcher/Makefile | 4 ++-- 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 @@ CFLAGS=-Wall -W -BOOT_H = ipod1g2g.h ipod3g.h ipod4g.h ipodcolor.h ipodmini.h ipodmini2g.h ipodnano.h ipodvideo.h +BOOT_H = ipod1g2g.h ipod3g.h ipod4g.h ipodcolor.h ipodmini1g.h ipodmini2g.h ipodnano1g.h ipodvideo.h # Enable the next two lines to build with embedded bootloaders and the # --install option and interactive mode. You need the full set of Rockbox @@ -13,7 +13,7 @@ BOOTOBJS=1 endif ifdef BOOTOBJS -BOOTSRC = ipod1g2g.c ipod3g.c ipod4g.c ipodcolor.c ipodmini.c ipodmini2g.c ipodnano.c ipodvideo.c ipodnano2g.c +BOOTSRC = ipod1g2g.c ipod3g.c ipod4g.c ipodcolor.c ipodmini1g.c ipodmini2g.c ipodnano1g.c ipodvideo.c ipodnano2g.c CFLAGS += -DWITH_BOOTOBJS endif 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) ipod->modelname = "mini"; ipod->targetname = "ipodmini1g"; #ifdef WITH_BOOTOBJS - ipod->bootloader = ipodmini; - ipod->bootloader_len = LEN_ipodmini; + ipod->bootloader = ipodmini1g; + ipod->bootloader_len = LEN_ipodmini1g; #endif break; case 0x50: @@ -1688,8 +1688,8 @@ int getmodel(struct ipod_t* ipod, int ipod_version) ipod->modelname = "nano"; ipod->targetname = "ipodnano1g"; #ifdef WITH_BOOTOBJS - ipod->bootloader = ipodnano; - ipod->bootloader_len = LEN_ipodnano; + ipod->bootloader = ipodnano1g; + ipod->bootloader_len = LEN_ipodnano1g; #endif break; case 0xb0: -- cgit v1.2.3