diff options
author | Daniel Stenberg <daniel@haxx.se> | 2005-05-07 22:41:17 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2005-05-07 22:41:17 +0000 |
commit | b8a23f9e4980e6a041d750c325ab2845aea8488a (patch) | |
tree | d10400e99208595638f13e7fe3b279274a173e56 /firmware | |
parent | d23afcd4f4ad72b1c2c087055a9ba4457f2646cd (diff) | |
download | rockbox-b8a23f9e4980e6a041d750c325ab2845aea8488a.tar.gz rockbox-b8a23f9e4980e6a041d750c325ab2845aea8488a.zip |
Fixed makefiles for autoconf.g include.
Fixed build output look in several Makefiles
Fixed code to include autoconf.h
Fixed code to use ROCKBOX_*_ENDIAN instead of previous attempts.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6421 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/Makefile | 19 | ||||
-rw-r--r-- | firmware/export/config.h | 2 | ||||
-rw-r--r-- | firmware/export/system.h | 2 |
3 files changed, 11 insertions, 12 deletions
diff --git a/firmware/Makefile b/firmware/Makefile index a858edfe7c..7211b3775f 100644 --- a/firmware/Makefile +++ b/firmware/Makefile | |||
@@ -7,7 +7,7 @@ | |||
7 | # $Id$ | 7 | # $Id$ |
8 | # | 8 | # |
9 | 9 | ||
10 | INCLUDES=-Iinclude -I$(FIRMDIR) -Iexport -Icommon -Idrivers | 10 | INCLUDES=-Iinclude -I$(FIRMDIR) -Iexport -Icommon -Idrivers -I$(BUILDDIR) |
11 | 11 | ||
12 | CFLAGS = $(GCCOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} | 12 | CFLAGS = $(GCCOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} |
13 | 13 | ||
@@ -18,18 +18,15 @@ SOURCES = $(SRC) | |||
18 | OBJS2 := $(patsubst %.c, $(OBJDIR)/%.o, $(SRC)) $(OBJDIR)/sysfont.o | 18 | OBJS2 := $(patsubst %.c, $(OBJDIR)/%.o, $(SRC)) $(OBJDIR)/sysfont.o |
19 | OBJS = $(patsubst %.S, $(OBJDIR)/%.o, $(OBJS2)) | 19 | OBJS = $(patsubst %.S, $(OBJDIR)/%.o, $(OBJS2)) |
20 | DIRS:=. drivers common | 20 | DIRS:=. drivers common |
21 | OUTPUT = $(OBJDIR)/librockbox.a | 21 | OUTPUT = $(BUILDDIR)/librockbox.a |
22 | DEPFILE = $(OBJDIR)/dep-firmware | 22 | DEPFILE = $(OBJDIR)/dep-firmware |
23 | 23 | ||
24 | all: $(TOOLSDIR)/convbdf $(OUTPUT) $(EXTRA_TARGETS) | 24 | all: $(OUTPUT) $(EXTRA_TARGETS) |
25 | 25 | ||
26 | dep: $(DEPFILE) | 26 | dep: $(DEPFILE) |
27 | 27 | ||
28 | $(TOOLSDIR)/convbdf: | ||
29 | $(MAKE) CC=gcc LD=ld -C $(TOOLSDIR) | ||
30 | |||
31 | $(OUTPUT): $(OBJS) $(DEPFILE) | 28 | $(OUTPUT): $(OBJS) $(DEPFILE) |
32 | @echo "AR $@" | 29 | @echo "AR+RANLIB $@" |
33 | @$(AR) ruv $@ $(OBJS) >/dev/null 2>&1 | 30 | @$(AR) ruv $@ $(OBJS) >/dev/null 2>&1 |
34 | @$(RANLIB) $@ | 31 | @$(RANLIB) $@ |
35 | 32 | ||
@@ -42,13 +39,13 @@ clean: | |||
42 | 39 | ||
43 | # Special targets | 40 | # Special targets |
44 | $(OBJDIR)/thread.o: thread.c export/thread.h | 41 | $(OBJDIR)/thread.o: thread.c export/thread.h |
45 | @echo "CC thread.c" | 42 | $(SILENT)echo "CC thread.c" |
46 | @$(CC) -c -O -fomit-frame-pointer $(CFLAGS) $< -o $@ | 43 | $(SILENT)$(CC) -c -O -fomit-frame-pointer $(CFLAGS) $< -o $@ |
47 | 44 | ||
48 | $(OBJDIR)/sysfont.o: fonts/clR6x8.bdf | 45 | $(OBJDIR)/sysfont.o: fonts/clR6x8.bdf |
49 | @echo "CONVBDF" | 46 | @echo "CONVBDF" |
50 | @$(TOOLSDIR)/convbdf -c -o $(OBJDIR)/sysfont.c $< | 47 | $(SILENT)$(TOOLSDIR)/convbdf -c -o $(OBJDIR)/sysfont.c $< |
51 | @echo "CC sysfont.c" | 48 | @echo "CC sysfont.c" |
52 | @$(CC) $(CFLAGS) -c $(OBJDIR)/sysfont.c -o $@ | 49 | $(SILENT)$(CC) $(CFLAGS) -c $(OBJDIR)/sysfont.c -o $@ |
53 | 50 | ||
54 | -include $(DEPFILE) | 51 | -include $(DEPFILE) |
diff --git a/firmware/export/config.h b/firmware/export/config.h index a47581afc7..a7ef70f24d 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h | |||
@@ -20,6 +20,8 @@ | |||
20 | #ifndef __CONFIG_H__ | 20 | #ifndef __CONFIG_H__ |
21 | #define __CONFIG_H__ | 21 | #define __CONFIG_H__ |
22 | 22 | ||
23 | #include "autoconf.h" | ||
24 | |||
23 | /* symbolic names for multiple choice configurations: */ | 25 | /* symbolic names for multiple choice configurations: */ |
24 | 26 | ||
25 | /* CONFIG_TUNER (note these are combineable bit-flags) */ | 27 | /* CONFIG_TUNER (note these are combineable bit-flags) */ |
diff --git a/firmware/export/system.h b/firmware/export/system.h index 1876bc3aaa..bc54be3e1c 100644 --- a/firmware/export/system.h +++ b/firmware/export/system.h | |||
@@ -51,7 +51,7 @@ void cpu_boost(bool on_off); | |||
51 | #define MAX(a, b) (((a)>(b))?(a):(b)) | 51 | #define MAX(a, b) (((a)>(b))?(a):(b)) |
52 | #endif | 52 | #endif |
53 | 53 | ||
54 | #ifdef LITTLE_ENDIAN | 54 | #ifdef ROCKBOX_LITTLE_ENDIAN |
55 | #define SWAB16(x) (x) | 55 | #define SWAB16(x) (x) |
56 | #define SWAB32(x) (x) | 56 | #define SWAB32(x) (x) |
57 | #endif | 57 | #endif |