diff options
Diffstat (limited to 'firmware/export')
-rw-r--r-- | firmware/export/config.h | 10 | ||||
-rw-r--r-- | firmware/export/config/sansaclipplus.h | 2 | ||||
-rw-r--r-- | firmware/export/config/sansaclipv2.h | 2 | ||||
-rw-r--r-- | firmware/export/config/sansafuzev2.h | 2 |
4 files changed, 9 insertions, 7 deletions
diff --git a/firmware/export/config.h b/firmware/export/config.h index 5bff51fbef..04bf15faaf 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h | |||
@@ -719,8 +719,8 @@ Lyre prototype 1 */ | |||
719 | defined(CPU_COLDFIRE) || /* Coldfire: core, plugins, codecs */ \ | 719 | defined(CPU_COLDFIRE) || /* Coldfire: core, plugins, codecs */ \ |
720 | defined(CPU_PP) || /* PortalPlayer: core, plugins, codecs */ \ | 720 | defined(CPU_PP) || /* PortalPlayer: core, plugins, codecs */ \ |
721 | (CONFIG_CPU == AS3525 && MEMORYSIZE > 2) || /* AS3525 +2MB: core, plugins, codecs */ \ | 721 | (CONFIG_CPU == AS3525 && MEMORYSIZE > 2) || /* AS3525 +2MB: core, plugins, codecs */ \ |
722 | (CONFIG_CPU == AS3525v2) || /* AS3525v2: core, plugins, codecs */ \ | 722 | (CONFIG_CPU == AS3525 && MEMORYSIZE <= 2 && !defined(PLUGIN) && !defined(CODEC)) || /* AS3525 2MB: core only */ \ |
723 | (CONFIG_CPU == AS3525 && MEMORYSIZE <= 2 && !defined(PLUGIN) && !defined(CODEC)) || /* AS3525 2MB:core only */ \ | 723 | (CONFIG_CPU == AS3525v2 && !defined(PLUGIN) && !defined(CODEC)) || /* AS3525v2: core only */ \ |
724 | (CONFIG_CPU == PNX0101) || \ | 724 | (CONFIG_CPU == PNX0101) || \ |
725 | defined(CPU_S5L870X)) || /* Samsung S5L8700: core, plugins, codecs */ \ | 725 | defined(CPU_S5L870X)) || /* Samsung S5L8700: core, plugins, codecs */ \ |
726 | (CONFIG_CPU == JZ4732 && !defined(PLUGIN) && !defined(CODEC)) /* Jz4740: core only */ | 726 | (CONFIG_CPU == JZ4732 && !defined(PLUGIN) && !defined(CODEC)) /* Jz4740: core only */ |
@@ -729,7 +729,8 @@ Lyre prototype 1 */ | |||
729 | #define IDATA_ATTR __attribute__ ((section(".idata"))) | 729 | #define IDATA_ATTR __attribute__ ((section(".idata"))) |
730 | #define IBSS_ATTR __attribute__ ((section(".ibss"))) | 730 | #define IBSS_ATTR __attribute__ ((section(".ibss"))) |
731 | #define USE_IRAM | 731 | #define USE_IRAM |
732 | #if CONFIG_CPU != SH7034 && (CONFIG_CPU != AS3525 || MEMORYSIZE > 2) && CONFIG_CPU != JZ4732 | 732 | #if CONFIG_CPU != SH7034 && (CONFIG_CPU != AS3525 || MEMORYSIZE > 2) \ |
733 | && CONFIG_CPU != JZ4732 | ||
733 | #define PLUGIN_USE_IRAM | 734 | #define PLUGIN_USE_IRAM |
734 | #endif | 735 | #endif |
735 | #if defined(CPU_ARM) | 736 | #if defined(CPU_ARM) |
@@ -747,7 +748,8 @@ Lyre prototype 1 */ | |||
747 | #define IBSS_ATTR | 748 | #define IBSS_ATTR |
748 | #define STATICIRAM static | 749 | #define STATICIRAM static |
749 | #endif | 750 | #endif |
750 | #if (defined(CPU_PP) || (CONFIG_CPU == AS3525)) && !defined(SIMULATOR) && !defined(BOOTLOADER) | 751 | #if (defined(CPU_PP) || (CONFIG_CPU == AS3525)) \ |
752 | && !defined(SIMULATOR) && !defined(BOOTLOADER) | ||
751 | /* Functions that have INIT_ATTR attached are NOT guaranteed to survive after | 753 | /* Functions that have INIT_ATTR attached are NOT guaranteed to survive after |
752 | * root_menu() has been called. Their code may be overwritten by other data or | 754 | * root_menu() has been called. Their code may be overwritten by other data or |
753 | * code in order to save RAM, and references to them might point into | 755 | * code in order to save RAM, and references to them might point into |
diff --git a/firmware/export/config/sansaclipplus.h b/firmware/export/config/sansaclipplus.h index c5e6aa5c34..ed8c7bb685 100644 --- a/firmware/export/config/sansaclipplus.h +++ b/firmware/export/config/sansaclipplus.h | |||
@@ -112,7 +112,7 @@ | |||
112 | #define HAVE_FAT16SUPPORT | 112 | #define HAVE_FAT16SUPPORT |
113 | 113 | ||
114 | /* The number of bytes reserved for loadable codecs */ | 114 | /* The number of bytes reserved for loadable codecs */ |
115 | #define CODEC_SIZE 0x100000 | 115 | #define CODEC_SIZE (0x100000-0x8000) |
116 | 116 | ||
117 | /* The number of bytes reserved for loadable plugins */ | 117 | /* The number of bytes reserved for loadable plugins */ |
118 | #define PLUGIN_BUFFER_SIZE 0x80000 | 118 | #define PLUGIN_BUFFER_SIZE 0x80000 |
diff --git a/firmware/export/config/sansaclipv2.h b/firmware/export/config/sansaclipv2.h index 8ac90ddcde..876d95ac22 100644 --- a/firmware/export/config/sansaclipv2.h +++ b/firmware/export/config/sansaclipv2.h | |||
@@ -108,7 +108,7 @@ | |||
108 | #define HAVE_FAT16SUPPORT | 108 | #define HAVE_FAT16SUPPORT |
109 | 109 | ||
110 | /* The number of bytes reserved for loadable codecs */ | 110 | /* The number of bytes reserved for loadable codecs */ |
111 | #define CODEC_SIZE 0x100000 | 111 | #define CODEC_SIZE (0x100000-0x8000) |
112 | 112 | ||
113 | /* The number of bytes reserved for loadable plugins */ | 113 | /* The number of bytes reserved for loadable plugins */ |
114 | #define PLUGIN_BUFFER_SIZE 0x80000 | 114 | #define PLUGIN_BUFFER_SIZE 0x80000 |
diff --git a/firmware/export/config/sansafuzev2.h b/firmware/export/config/sansafuzev2.h index 73ac7ce17a..71d76f4725 100644 --- a/firmware/export/config/sansafuzev2.h +++ b/firmware/export/config/sansafuzev2.h | |||
@@ -100,7 +100,7 @@ | |||
100 | #define HAVE_FAT16SUPPORT | 100 | #define HAVE_FAT16SUPPORT |
101 | 101 | ||
102 | /* The number of bytes reserved for loadable codecs */ | 102 | /* The number of bytes reserved for loadable codecs */ |
103 | #define CODEC_SIZE 0x100000 | 103 | #define CODEC_SIZE (0x100000-0x8000) |
104 | 104 | ||
105 | /* The number of bytes reserved for loadable plugins */ | 105 | /* The number of bytes reserved for loadable plugins */ |
106 | #define PLUGIN_BUFFER_SIZE 0x80000 | 106 | #define PLUGIN_BUFFER_SIZE 0x80000 |