len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-10 13:45:10 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

as3525v2: build normal firmware properly (Clipv2/+)

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24840 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Rafaël Carré 2010-02-22 02:42:58 +00:00
parent 054253ab33
commit 31eda59720
8 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/debug_menu.c
View file

@ -104,7 +104,7 @@
#if CONFIG_CPU == DM320 || CONFIG_CPU == S3C2440 || CONFIG_CPU == TCC7801 \ #if CONFIG_CPU == DM320 || CONFIG_CPU == S3C2440 || CONFIG_CPU == TCC7801 \
|| CONFIG_CPU == IMX31L || CONFIG_CPU == AS3525 || CONFIG_CPU == JZ4732 \ || CONFIG_CPU == IMX31L || CONFIG_CPU == AS3525 || CONFIG_CPU == JZ4732 \
|| defined(CPU_S5L870X) || defined(CPU_S5L870X) || CONFIG_CPU == AS3525v2
#include "debug-target.h" #include "debug-target.h"
#endif #endif

4
apps/plugins/plugin.lds
View file

@ -65,7 +65,7 @@ OUTPUT_FORMAT(elf32-littlemips)
#include "cpu.h" #include "cpu.h"
#define DRAMSIZE (MEMORYSIZE * 0x100000) - STUBOFFSET - PLUGIN_BUFFER_SIZE - CODEC_SIZE - TTB_SIZE #define DRAMSIZE (MEMORYSIZE * 0x100000) - STUBOFFSET - PLUGIN_BUFFER_SIZE - CODEC_SIZE - TTB_SIZE
#elif CONFIG_CPU==AS3525 #elif CONFIG_CPU==AS3525 || CONFIG_CPU==AS3525v2
#include "cpu.h" #include "cpu.h"
#define DRAMORIG DRAM_ORIG #define DRAMORIG DRAM_ORIG
#ifdef AMS_LOWMEM #ifdef AMS_LOWMEM
@ -130,7 +130,7 @@ OUTPUT_FORMAT(elf32-littlemips)
#define IRAM DRAM #define IRAM DRAM
#define IRAMSIZE 0 #define IRAMSIZE 0
#elif CONFIG_CPU==AS3525 #elif CONFIG_CPU==AS3525 || CONFIG_CPU==AS3525v2
#ifdef AMS_LOWMEM #ifdef AMS_LOWMEM
#define IRAMSIZE 0 /* simulates no IRAM since codec is already entirely in IRAM */ #define IRAMSIZE 0 /* simulates no IRAM since codec is already entirely in IRAM */
#define CODEC_ORIGIN (IRAM_ORIG + IRAM_SIZE - CODEC_SIZE) #define CODEC_ORIGIN (IRAM_ORIG + IRAM_SIZE - CODEC_SIZE)

2
firmware/SOURCES
View file

@ -423,7 +423,9 @@ drivers/generic_i2c.c
target/arm/adc-as3514.c target/arm/adc-as3514.c
target/arm/as3525/audio-as3525.c target/arm/as3525/audio-as3525.c
target/arm/as3525/debug-as3525.c target/arm/as3525/debug-as3525.c
#if CONFIG_TUNER
target/arm/as3525/fmradio-i2c-as3525.c target/arm/as3525/fmradio-i2c-as3525.c
#endif /* CONFIG_TUNER */
target/arm/as3525/i2s-as3525.c target/arm/as3525/i2s-as3525.c
target/arm/as3525/pcm-as3525.c target/arm/as3525/pcm-as3525.c
#endif /* BOOTLOADER */ #endif /* BOOTLOADER */

4
firmware/export/config/sansaclipplus.h
View file

@ -24,7 +24,7 @@
/* Define bitmask of input sources - recordable bitmask can be defined /* Define bitmask of input sources - recordable bitmask can be defined
explicitly if different */ explicitly if different */
#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) #define INPUT_SRC_CAPS (SRC_CAP_MIC /*| SRC_CAP_FMRADIO*/)
/* define this if you have a bitmap LCD display */ /* define this if you have a bitmap LCD display */
#define HAVE_LCD_BITMAP #define HAVE_LCD_BITMAP
@ -119,7 +119,7 @@
#define AB_REPEAT_ENABLE 1 #define AB_REPEAT_ENABLE 1
/* FM Tuner */ /* FM Tuner */
#define CONFIG_TUNER SI4700 /* in fact SI4702 */ //#define CONFIG_TUNER SI4700 /* in fact SI4702 */
//#define HAVE_TUNER_PWR_CTRL //#define HAVE_TUNER_PWR_CTRL
/* Define this for LCD backlight available */ /* Define this for LCD backlight available */

4
firmware/export/config/sansaclipv2.h
View file

@ -24,7 +24,7 @@
/* Define bitmask of input sources - recordable bitmask can be defined /* Define bitmask of input sources - recordable bitmask can be defined
explicitly if different */ explicitly if different */
#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) #define INPUT_SRC_CAPS (SRC_CAP_MIC /*| SRC_CAP_FMRADIO*/)
/* define this if you have a bitmap LCD display */ /* define this if you have a bitmap LCD display */
#define HAVE_LCD_BITMAP #define HAVE_LCD_BITMAP
@ -122,7 +122,7 @@
#define AB_REPEAT_ENABLE 1 #define AB_REPEAT_ENABLE 1
/* FM Tuner */ /* FM Tuner */
#define CONFIG_TUNER SI4700 /* in fact SI4702 */ //#define CONFIG_TUNER SI4700 /* in fact SI4702 */
//#define HAVE_TUNER_PWR_CTRL //#define HAVE_TUNER_PWR_CTRL
/* Define this for LCD backlight available */ /* Define this for LCD backlight available */

7
firmware/target/arm/as3525/audio-as3525.c
View file

@ -47,7 +47,9 @@ void audio_input_mux(int source, unsigned flags)
case AUDIO_SRC_PLAYBACK: case AUDIO_SRC_PLAYBACK:
if (source != last_source) if (source != last_source)
{ {
#if defined(HAVE_RECORDING) || defined(HAVE_FMRADIO_IN)
audiohw_set_monitor(false); audiohw_set_monitor(false);
#endif
#ifdef HAVE_RECORDING #ifdef HAVE_RECORDING
audiohw_disable_recording(); audiohw_disable_recording();
#endif #endif
@ -64,6 +66,8 @@ void audio_input_mux(int source, unsigned flags)
break; break;
#endif #endif
#if (INPUT_SRC_CAPS & SRC_CAP_FMRADIO)
case AUDIO_SRC_FMRADIO: /* recording and playback */ case AUDIO_SRC_FMRADIO: /* recording and playback */
if (source == last_source if (source == last_source
#ifdef HAVE_RECORDING #ifdef HAVE_RECORDING
@ -86,9 +90,12 @@ void audio_input_mux(int source, unsigned flags)
#ifdef HAVE_RECORDING #ifdef HAVE_RECORDING
audiohw_disable_recording(); audiohw_disable_recording();
#endif #endif
#if defined(HAVE_RECORDING) || defined(HAVE_FMRADIO_IN)
audiohw_set_monitor(true); /* line 2 analog audio path */ audiohw_set_monitor(true); /* line 2 analog audio path */
#endif
} }
break; break;
#endif /* (INPUT_SRC_CAPS & SRC_CAP_FMRADIO) */
} }
last_source = source; last_source = source;

2
firmware/target/arm/as3525/sd-as3525v2.c
View file

@ -191,7 +191,7 @@ static const char sd_thread_name[] = "ata/sd";
static struct mutex sd_mtx SHAREDBSS_ATTR; static struct mutex sd_mtx SHAREDBSS_ATTR;
static struct event_queue sd_queue; static struct event_queue sd_queue;
#ifndef BOOTLOADER #ifndef BOOTLOADER
static bool sd_enabled = false; bool sd_enabled = false;
#endif #endif
static struct wakeup transfer_completion_signal; static struct wakeup transfer_completion_signal;

2
firmware/target/arm/as3525/system-as3525.c
View file

@ -336,7 +336,7 @@ void system_init(void)
#ifndef BOOTLOADER #ifndef BOOTLOADER
/* Initialize power management settings */ /* Initialize power management settings */
ascodec_write(AS3514_CVDD_DCDC3, AS314_CP_DCDC3_SETTING); ascodec_write(AS3514_CVDD_DCDC3, AS314_CP_DCDC3_SETTING);
#ifdef CONFIG_TUNER #if CONFIG_TUNER
fmradio_i2c_init(); fmradio_i2c_init();
#endif #endif
#endif /* !BOOTLOADER */ #endif /* !BOOTLOADER */