From 36a81eb9b98ac7b1dff0d6658dba0255dd579f5f Mon Sep 17 00:00:00 2001 From: Björn Stenberg Date: Mon, 7 Dec 2009 09:17:48 +0000 Subject: Reverted r23881 mistakenly committed to branch. git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_4@23882 a1c6a512-1295-4272-9138-f99709370657 --- rbutil/ipodpatcher/Makefile | 12 ++++++------ rbutil/ipodpatcher/ipodpatcher.c | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'rbutil/ipodpatcher') diff --git a/rbutil/ipodpatcher/Makefile b/rbutil/ipodpatcher/Makefile index 4970445773..9c32587fa1 100644 --- a/rbutil/ipodpatcher/Makefile +++ b/rbutil/ipodpatcher/Makefile @@ -1,13 +1,13 @@ CFLAGS=-Wall -W -BOOT_H = ipod1g2g.h ipod3g.h ipod4g.h ipodcolor.h ipodmini1g.h ipodmini2g.h ipodnano1g.h ipodvideo.h +BOOT_H = ipod1g2g.h ipod3g.h ipod4g.h ipodcolor.h ipodmini.h ipodmini2g.h ipodnano.h ipodvideo.h # Uncomment the next two lines to build with embedded bootloaders and the # --install option and interactive mode. You need the full set of Rockbox # bootloaders in this directory - download them from # http://download.rockbox.org/bootloader/ipod/bootloaders.zip -#BOOTSRC = ipod1g2g.c ipod3g.c ipod4g.c ipodcolor.c ipodmini1g.c ipodmini2g.c ipodnano1g.c ipodvideo.c +#BOOTSRC = ipod1g2g.c ipod3g.c ipod4g.c ipodcolor.c ipodmini.c ipodmini2g.c ipodnano.c ipodvideo.c #CFLAGS += -DWITH_BOOTOBJS ifeq ($(findstring CYGWIN,$(shell uname)),CYGWIN) @@ -69,14 +69,14 @@ ipod4g.c: bootloader-ipod4g.ipod ipod2c ipodcolor.c: bootloader-ipodcolor.ipod ipod2c ./ipod2c bootloader-ipodcolor.ipod ipodcolor -ipodmini1g.c: bootloader-ipodmini1g.ipod ipod2c - ./ipod2c bootloader-ipodmini1g.ipod ipodmini1g +ipodmini.c: bootloader-ipodmini.ipod ipod2c + ./ipod2c bootloader-ipodmini.ipod ipodmini ipodmini2g.c: bootloader-ipodmini2g.ipod ipod2c ./ipod2c bootloader-ipodmini2g.ipod ipodmini2g -ipodnano1g.c: bootloader-ipodnano1g.ipod ipod2c - ./ipod2c bootloader-ipodnano1g.ipod ipodnano1g +ipodnano.c: bootloader-ipodnano.ipod ipod2c + ./ipod2c bootloader-ipodnano.ipod ipodnano ipodvideo.c: bootloader-ipodvideo.ipod ipod2c ./ipod2c bootloader-ipodvideo.ipod ipodvideo diff --git a/rbutil/ipodpatcher/ipodpatcher.c b/rbutil/ipodpatcher/ipodpatcher.c index 361232cd27..1a5268bb6d 100644 --- a/rbutil/ipodpatcher/ipodpatcher.c +++ b/rbutil/ipodpatcher/ipodpatcher.c @@ -37,10 +37,10 @@ #include "ipod1g2g.h" #include "ipod3g.h" #include "ipod4g.h" -#include "ipodmini1g.h" +#include "ipodmini.h" #include "ipodmini2g.h" #include "ipodcolor.h" -#include "ipodnano1g.h" +#include "ipodnano.h" #include "ipodvideo.h" #endif @@ -1224,7 +1224,7 @@ int getmodel(struct ipod_t* ipod, int ipod_version) ipod->modelstr="1st Generation Nano"; ipod->modelnum = 4; ipod->modelname = "nano"; - ipod->targetname = "ipodnano1g"; + ipod->targetname = "ipodnano"; #ifdef WITH_BOOTOBJS ipod->bootloader = ipodnano; ipod->bootloader_len = LEN_ipodnano; -- cgit v1.2.3