From ff6b0425e438add8d12393f90fdbfe93e1fb4746 Mon Sep 17 00:00:00 2001 From: Rafaël Carré Date: Mon, 24 May 2010 10:06:52 +0000 Subject: mkamsboot/rbutil/amsinfo : do not try to detect the model of a given Sansa AMS OF The field we thought was representative of the model is not, it has changed in the past for fuzev1 and fuzev2. For example the value 0x23 is found in 2 old fuzev1 OF versions, and in the c200v2 OF The only reliable way to detect the model of a given OF is by using the built-in list of md5sums. Modify mkamsboot and rbutilqt to load the rockbox bootloader first, and then check if the model in the bootloader corresponds to the model of the known md5sum of the given OF. That way we can continue to present the user with a list of known OF versions in case the OF is unknown to mkamsboot Also explicit the dependency of main.c on mkamsboot.h in case the prototypes change Correct the header's description not updated in r21648 git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26248 a1c6a512-1295-4272-9138-f99709370657 --- rbutil/mkamsboot/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'rbutil/mkamsboot/Makefile') diff --git a/rbutil/mkamsboot/Makefile b/rbutil/mkamsboot/Makefile index 60e1ea8af8..8a9a4d3852 100644 --- a/rbutil/mkamsboot/Makefile +++ b/rbutil/mkamsboot/Makefile @@ -47,9 +47,9 @@ OBJS := $(patsubst %.c,%.o,$(addprefix $(OBJDIR),$(SOURCES))) LIBOBJS := $(patsubst %.c,%.o,$(addprefix $(OBJDIR),$(LIBSOURCES))) EXTRADEPS := $(LIBUCL) -# explicit dependencies on dualboot.{c,h} -$(OBJDIR)mkamsboot.o: dualboot.h dualboot.c mkamsboot.c -$(OBJDIR)main.o: dualboot.h dualboot.c main.c +# explicit dependencies on dualboot.{c,h} and mkamsboot.h +$(OBJDIR)mkamsboot.o: dualboot.h dualboot.c mkamsboot.c mkamsboot.h +$(OBJDIR)main.o: dualboot.h dualboot.c main.c mkamsboot.h $(OBJDIR)%.o: %.c @echo CC $< $ -- cgit v1.2.3