summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBarry Wardell <rockbox@barrywardell.net>2006-12-18 02:58:23 +0000
committerBarry Wardell <rockbox@barrywardell.net>2006-12-18 02:58:23 +0000
commit1cf6cdf6ac97cf9d48f3d7d7ce8f59507a386912 (patch)
treebb1d001387e0f61d1396114bce4c72fa498ddc9d
parentf2c03e827e6f6e83f1816039d01ff7ca2d55d0ad (diff)
downloadrockbox-1cf6cdf6ac97cf9d48f3d7d7ce8f59507a386912.zip
rockbox-1cf6cdf6ac97cf9d48f3d7d7ce8f59507a386912.tar.gz
rockbox-1cf6cdf6ac97cf9d48f3d7d7ce8f59507a386912.tar.bz2
rockbox-1cf6cdf6ac97cf9d48f3d7d7ce8f59507a386912.tar.xz
Fix more warnings. Don't compile PortalPlayer pcm code in bootloader builds.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11799 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/SOURCES2
-rw-r--r--firmware/target/arm/pcm-pp.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/firmware/SOURCES b/firmware/SOURCES
index 11242a0..f83abdb 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -262,8 +262,10 @@ drivers/i2c-pnx0101.c
/* no i2c driver yet */
#endif
#if defined(CPU_PP)
+#ifndef BOOTLOADER
target/arm/pcm-pp.c
target/arm/audio-pp.c
+#endif
target/arm/crt0-pp.S
#elif defined(CPU_ARM)
target/arm/crt0.S
diff --git a/firmware/target/arm/pcm-pp.c b/firmware/target/arm/pcm-pp.c
index d05884e..f6f71d7 100644
--- a/firmware/target/arm/pcm-pp.c
+++ b/firmware/target/arm/pcm-pp.c
@@ -25,7 +25,7 @@
#include "wm8975.h"
#elif defined(HAVE_WM8758)
#include "wm8758.h"
-#elif defined(HAVE_WM8731)
+#elif defined(HAVE_WM8731) || defined(HAVE_WM8721)
#include "wm8731l.h"
#endif