From 590501cfe404b5463adecc70628e5bc7c8f142a2 Mon Sep 17 00:00:00 2001 From: Will Robertson Date: Fri, 21 Sep 2007 15:51:53 +0000 Subject: 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 --- firmware/SOURCES | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'firmware/SOURCES') diff --git a/firmware/SOURCES b/firmware/SOURCES index 3a606e5bfd..92e2c1d8c5 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES @@ -588,6 +588,31 @@ target/arm/s3c2440/gigabeat-fx/pcm-meg-fx.c #endif /* SIMULATOR */ #endif /* GIGABEAT_F */ +#ifdef GIGABEAT_S +#ifndef SIMULATOR +target/arm/imx31/gigabeat-s/adc-imx31.c +target/arm/imx31/gigabeat-s/ata-imx31.c +target/arm/imx31/gigabeat-s/backlight-imx31.c +target/arm/imx31/gigabeat-s/button-imx31.c +target/arm/imx31/gigabeat-s/i2c-imx31.c +target/arm/imx31/gigabeat-s/i2s-imx31.c +target/arm/imx31/gigabeat-s/lcd-as-imx31.S +target/arm/imx31/gigabeat-s/lcd-imx31.c +target/arm/imx31/gigabeat-s/power-imx31.c +target/arm/imx31/gigabeat-s/powermgmt-imx31.c +target/arm/imx31/gigabeat-s/usb-imx31.c +target/arm/imx31/gigabeat-s/wmcodec-imx31.c +target/arm/imx31/gigabeat-s/dma_start.c +target/arm/imx31/gigabeat-s/system-imx31.c +target/arm/imx31/gigabeat-s/mmu-imx31.c +target/arm/imx31/gigabeat-s/avic-imx31.c +target/arm/imx31/gigabeat-s/spi-imx31.c +#ifndef BOOTLOADER +target/arm/imx31/gigabeat-fx/pcm-imx31.c +#endif +#endif /* SIMULATOR */ +#endif /* GIGABEAT_S */ + #ifdef MROBE_500 #ifndef SIMULATOR target/arm/olympus/mrobe-500/adc-mr500.c -- cgit v1.2.3