summaryrefslogtreecommitdiffstats
path: root/bootloader/SOURCES
diff options
context:
space:
mode:
authorWill Robertson <aliask@rockbox.org>2007-09-21 15:51:53 +0000
committerWill Robertson <aliask@rockbox.org>2007-09-21 15:51:53 +0000
commit590501cfe404b5463adecc70628e5bc7c8f142a2 (patch)
tree3b038f90c9c3bbef8cf0b84f5a4ea338f9599851 /bootloader/SOURCES
parenta26110c52dff9bc15d20146462d52d07f61bd238 (diff)
downloadrockbox-590501cfe404b5463adecc70628e5bc7c8f142a2.tar.gz
rockbox-590501cfe404b5463adecc70628e5bc7c8f142a2.tar.bz2
rockbox-590501cfe404b5463adecc70628e5bc7c8f142a2.zip
Merge the Gigabeat S branch back into trunk. Fingers crossed nothing breaks.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14805 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'bootloader/SOURCES')
-rw-r--r--bootloader/SOURCES3
1 files changed, 3 insertions, 0 deletions
diff --git a/bootloader/SOURCES b/bootloader/SOURCES
index 2b499c1944..919e002f1b 100644
--- a/bootloader/SOURCES
+++ b/bootloader/SOURCES
@@ -4,6 +4,9 @@ common.c
ipod.c
#elif defined(GIGABEAT_F)
gigabeat.c
+#elif defined(GIGABEAT_S)
+gigabeat-s.c
+../firmware/target/arm/imx31/gigabeat-s/mmu-imx31.c
#elif defined(IRIVER_H10) || defined(IRIVER_H10_5GB) || \
defined(SANSA_E200) || defined(SANSA_C200)
#ifdef E200R_INSTALLER