summaryrefslogtreecommitdiff
path: root/firmware/export/config
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/export/config')
-rw-r--r--firmware/export/config/cowond2.h3
-rw-r--r--firmware/export/config/creativezen.h1
-rw-r--r--firmware/export/config/creativezenxfi.h1
-rw-r--r--firmware/export/config/creativezenxfi2.h1
-rw-r--r--firmware/export/config/creativezenxfi3.h1
-rw-r--r--firmware/export/config/erosqnative.h2
-rw-r--r--firmware/export/config/fiiom3k.h2
-rw-r--r--firmware/export/config/ihifi760.h3
-rw-r--r--firmware/export/config/ihifi770.h7
-rw-r--r--firmware/export/config/ihifi770c.h7
-rw-r--r--firmware/export/config/ihifi800.h7
-rw-r--r--firmware/export/config/ihifi960.h2
-rw-r--r--firmware/export/config/mini2440.h3
-rw-r--r--firmware/export/config/ondavx747.h4
-rw-r--r--firmware/export/config/ondavx777.h4
-rw-r--r--firmware/export/config/rk27generic.h2
-rw-r--r--firmware/export/config/sansae200.h1
-rw-r--r--firmware/export/config/shanlingq1.h2
-rw-r--r--firmware/export/config/xduoox3.h4
19 files changed, 18 insertions, 39 deletions
diff --git a/firmware/export/config/cowond2.h b/firmware/export/config/cowond2.h
index 5912fb63eb..fbfcc2c089 100644
--- a/firmware/export/config/cowond2.h
+++ b/firmware/export/config/cowond2.h
@@ -61,9 +61,8 @@
61/* NAND is broken. */ 61/* NAND is broken. */
62//#define CONFIG_STORAGE (STORAGE_NAND | STORAGE_SD) 62//#define CONFIG_STORAGE (STORAGE_NAND | STORAGE_SD)
63#define CONFIG_STORAGE STORAGE_SD 63#define CONFIG_STORAGE STORAGE_SD
64#define HAVE_MULTIDRIVE 64#define HAVE_MULTIVOLUME
65#define HAVE_HOTSWAP 65#define HAVE_HOTSWAP
66#define NUM_DRIVES 1
67 66
68#define CONFIG_NAND NAND_TCC 67#define CONFIG_NAND NAND_TCC
69 68
diff --git a/firmware/export/config/creativezen.h b/firmware/export/config/creativezen.h
index b1f438c354..d70749e59f 100644
--- a/firmware/export/config/creativezen.h
+++ b/firmware/export/config/creativezen.h
@@ -133,7 +133,6 @@
133#define CONFIG_STORAGE STORAGE_SD 133#define CONFIG_STORAGE STORAGE_SD
134#define NUM_DRIVES 2 134#define NUM_DRIVES 2
135#define HAVE_MULTIDRIVE 135#define HAVE_MULTIDRIVE
136#define HAVE_MULTIVOLUME
137#define HAVE_HOTSWAP 136#define HAVE_HOTSWAP
138 137
139/* todo */ 138/* todo */
diff --git a/firmware/export/config/creativezenxfi.h b/firmware/export/config/creativezenxfi.h
index 34cde37d9a..489dea80b7 100644
--- a/firmware/export/config/creativezenxfi.h
+++ b/firmware/export/config/creativezenxfi.h
@@ -138,7 +138,6 @@
138#define CONFIG_STORAGE STORAGE_SD 138#define CONFIG_STORAGE STORAGE_SD
139#define NUM_DRIVES 2 139#define NUM_DRIVES 2
140#define HAVE_MULTIDRIVE 140#define HAVE_MULTIDRIVE
141#define HAVE_MULTIVOLUME
142#define HAVE_HOTSWAP 141#define HAVE_HOTSWAP
143 142
144/* todo */ 143/* todo */
diff --git a/firmware/export/config/creativezenxfi2.h b/firmware/export/config/creativezenxfi2.h
index 47a600e8f5..5db228e559 100644
--- a/firmware/export/config/creativezenxfi2.h
+++ b/firmware/export/config/creativezenxfi2.h
@@ -140,7 +140,6 @@
140#define CONFIG_STORAGE (/*STORAGE_NAND |*/ STORAGE_SD) 140#define CONFIG_STORAGE (/*STORAGE_NAND |*/ STORAGE_SD)
141#define NUM_DRIVES 2 141#define NUM_DRIVES 2
142#define HAVE_MULTIDRIVE 142#define HAVE_MULTIDRIVE
143#define HAVE_MULTIVOLUME
144#define HAVE_HOTSWAP_STORAGE_AS_MAIN 143#define HAVE_HOTSWAP_STORAGE_AS_MAIN
145#define HAVE_HOTSWAP 144#define HAVE_HOTSWAP
146#define CONFIG_NAND NAND_IMX233 145#define CONFIG_NAND NAND_IMX233
diff --git a/firmware/export/config/creativezenxfi3.h b/firmware/export/config/creativezenxfi3.h
index a558c2a7df..5ff5d889c7 100644
--- a/firmware/export/config/creativezenxfi3.h
+++ b/firmware/export/config/creativezenxfi3.h
@@ -144,7 +144,6 @@
144#define CONFIG_STORAGE STORAGE_SD 144#define CONFIG_STORAGE STORAGE_SD
145#define NUM_DRIVES 2 145#define NUM_DRIVES 2
146#define HAVE_MULTIDRIVE 146#define HAVE_MULTIDRIVE
147#define HAVE_MULTIVOLUME
148#define HAVE_HOTSWAP 147#define HAVE_HOTSWAP
149 148
150/* Extra threads: touchpad */ 149/* Extra threads: touchpad */
diff --git a/firmware/export/config/erosqnative.h b/firmware/export/config/erosqnative.h
index f6e5b0d55e..26073a5f34 100644
--- a/firmware/export/config/erosqnative.h
+++ b/firmware/export/config/erosqnative.h
@@ -77,9 +77,7 @@
77#define CONFIG_STORAGE STORAGE_SD 77#define CONFIG_STORAGE STORAGE_SD
78#define HAVE_HOTSWAP 78#define HAVE_HOTSWAP
79#define HAVE_HOTSWAP_STORAGE_AS_MAIN 79#define HAVE_HOTSWAP_STORAGE_AS_MAIN
80#define HAVE_MULTIDRIVE
81#define HAVE_MULTIVOLUME 80#define HAVE_MULTIVOLUME
82#define NUM_DRIVES 1
83#define STORAGE_WANTS_ALIGN 81#define STORAGE_WANTS_ALIGN
84#define STORAGE_NEEDS_BOUNCE_BUFFER 82#define STORAGE_NEEDS_BOUNCE_BUFFER
85 83
diff --git a/firmware/export/config/fiiom3k.h b/firmware/export/config/fiiom3k.h
index cf8509405f..a5e32af2a0 100644
--- a/firmware/export/config/fiiom3k.h
+++ b/firmware/export/config/fiiom3k.h
@@ -81,9 +81,7 @@
81#define CONFIG_STORAGE STORAGE_SD 81#define CONFIG_STORAGE STORAGE_SD
82#define HAVE_HOTSWAP 82#define HAVE_HOTSWAP
83#define HAVE_HOTSWAP_STORAGE_AS_MAIN 83#define HAVE_HOTSWAP_STORAGE_AS_MAIN
84#define HAVE_MULTIDRIVE
85#define HAVE_MULTIVOLUME 84#define HAVE_MULTIVOLUME
86#define NUM_DRIVES 1
87#define STORAGE_WANTS_ALIGN 85#define STORAGE_WANTS_ALIGN
88#define STORAGE_NEEDS_BOUNCE_BUFFER 86#define STORAGE_NEEDS_BOUNCE_BUFFER
89 87
diff --git a/firmware/export/config/ihifi760.h b/firmware/export/config/ihifi760.h
index cc4152f5d8..ca62948bd2 100644
--- a/firmware/export/config/ihifi760.h
+++ b/firmware/export/config/ihifi760.h
@@ -49,6 +49,7 @@
49#define HAVE_FLASH_STORAGE 49#define HAVE_FLASH_STORAGE
50 50
51#define CONFIG_STORAGE (STORAGE_SD | STORAGE_NAND) 51#define CONFIG_STORAGE (STORAGE_SD | STORAGE_NAND)
52#define NUM_DRIVES 1 /* NAND doesn't work yet */
52 53
53#define CONFIG_NAND NAND_RK27XX 54#define CONFIG_NAND NAND_RK27XX
54#define HAVE_SW_TONE_CONTROLS 55#define HAVE_SW_TONE_CONTROLS
@@ -57,8 +58,6 @@
57 58
58/* commented for now */ 59/* commented for now */
59/* #define HAVE_HOTSWAP */ 60/* #define HAVE_HOTSWAP */
60
61#define NUM_DRIVES 1
62#define SECTOR_SIZE 512 61#define SECTOR_SIZE 512
63 62
64/* for small(ish) SD cards */ 63/* for small(ish) SD cards */
diff --git a/firmware/export/config/ihifi770.h b/firmware/export/config/ihifi770.h
index 74b12de994..68f6c71b90 100644
--- a/firmware/export/config/ihifi770.h
+++ b/firmware/export/config/ihifi770.h
@@ -50,13 +50,13 @@
50#define HAVE_FLASH_STORAGE 50#define HAVE_FLASH_STORAGE
51 51
52#define CONFIG_STORAGE (STORAGE_SD | STORAGE_NAND) 52#define CONFIG_STORAGE (STORAGE_SD | STORAGE_NAND)
53#define NUM_DRIVES 1 /* NAND doesn't work yet */
53 54
54#define CONFIG_NAND NAND_RK27XX 55#define CONFIG_NAND NAND_RK27XX
55#define HAVE_SW_TONE_CONTROLS 56#define HAVE_SW_TONE_CONTROLS
56 57
57#define HAVE_HOTSWAP 58// #define HAVE_HOTSWAP
58 59
59#define NUM_DRIVES 1
60#define SECTOR_SIZE 512 60#define SECTOR_SIZE 512
61 61
62/* for small(ish) SD cards */ 62/* for small(ish) SD cards */
@@ -183,7 +183,4 @@
183#define BOOTFILE "rockbox." BOOTFILE_EXT 183#define BOOTFILE "rockbox." BOOTFILE_EXT
184#define BOOTDIR "/.rockbox" 184#define BOOTDIR "/.rockbox"
185 185
186/* disabled for now */
187#undef HAVE_HOTSWAP
188
189#endif /* SIMULATOR */ 186#endif /* SIMULATOR */
diff --git a/firmware/export/config/ihifi770c.h b/firmware/export/config/ihifi770c.h
index 8224e2f368..a34d1b85c2 100644
--- a/firmware/export/config/ihifi770c.h
+++ b/firmware/export/config/ihifi770c.h
@@ -50,13 +50,13 @@
50#define HAVE_FLASH_STORAGE 50#define HAVE_FLASH_STORAGE
51 51
52#define CONFIG_STORAGE (STORAGE_SD | STORAGE_NAND) 52#define CONFIG_STORAGE (STORAGE_SD | STORAGE_NAND)
53#define NUM_DRIVES 1 /* NAND doesn't work yet */
53 54
54#define CONFIG_NAND NAND_RK27XX 55#define CONFIG_NAND NAND_RK27XX
55#define HAVE_SW_TONE_CONTROLS 56#define HAVE_SW_TONE_CONTROLS
56 57
57#define HAVE_HOTSWAP 58// #define HAVE_HOTSWAP
58 59
59#define NUM_DRIVES 1
60#define SECTOR_SIZE 512 60#define SECTOR_SIZE 512
61 61
62/* for small(ish) SD cards */ 62/* for small(ish) SD cards */
@@ -183,7 +183,4 @@
183#define BOOTFILE "rockbox." BOOTFILE_EXT 183#define BOOTFILE "rockbox." BOOTFILE_EXT
184#define BOOTDIR "/.rockbox" 184#define BOOTDIR "/.rockbox"
185 185
186/* disabled for now */
187#undef HAVE_HOTSWAP
188
189#endif /* SIMULATOR */ 186#endif /* SIMULATOR */
diff --git a/firmware/export/config/ihifi800.h b/firmware/export/config/ihifi800.h
index 91981682c1..e0cd1e1161 100644
--- a/firmware/export/config/ihifi800.h
+++ b/firmware/export/config/ihifi800.h
@@ -50,13 +50,13 @@
50#define HAVE_FLASH_STORAGE 50#define HAVE_FLASH_STORAGE
51 51
52#define CONFIG_STORAGE (STORAGE_SD | STORAGE_NAND) 52#define CONFIG_STORAGE (STORAGE_SD | STORAGE_NAND)
53#define NUM_DRIVES 1 /* NAND doesn't work yet */
53 54
54#define CONFIG_NAND NAND_RK27XX 55#define CONFIG_NAND NAND_RK27XX
55#define HAVE_SW_TONE_CONTROLS 56#define HAVE_SW_TONE_CONTROLS
56 57
57#define HAVE_HOTSWAP 58//#define HAVE_HOTSWAP
58 59
59#define NUM_DRIVES 1
60#define SECTOR_SIZE 512 60#define SECTOR_SIZE 512
61 61
62/* for small(ish) SD cards */ 62/* for small(ish) SD cards */
@@ -184,7 +184,4 @@
184#define BOOTFILE "rockbox." BOOTFILE_EXT 184#define BOOTFILE "rockbox." BOOTFILE_EXT
185#define BOOTDIR "/.rockbox" 185#define BOOTDIR "/.rockbox"
186 186
187/* disabled for now */
188#undef HAVE_HOTSWAP
189
190#endif /* SIMULATOR */ 187#endif /* SIMULATOR */
diff --git a/firmware/export/config/ihifi960.h b/firmware/export/config/ihifi960.h
index 64c6c90874..c0af676f28 100644
--- a/firmware/export/config/ihifi960.h
+++ b/firmware/export/config/ihifi960.h
@@ -49,6 +49,7 @@
49#define HAVE_FLASH_STORAGE 49#define HAVE_FLASH_STORAGE
50 50
51#define CONFIG_STORAGE (STORAGE_SD | STORAGE_NAND) 51#define CONFIG_STORAGE (STORAGE_SD | STORAGE_NAND)
52#define NUM_DRIVES 1 /* NAND doesn't work yet */
52 53
53#define CONFIG_NAND NAND_RK27XX 54#define CONFIG_NAND NAND_RK27XX
54#define HAVE_SW_TONE_CONTROLS 55#define HAVE_SW_TONE_CONTROLS
@@ -58,7 +59,6 @@
58/* commented for now */ 59/* commented for now */
59/* #define HAVE_HOTSWAP */ 60/* #define HAVE_HOTSWAP */
60 61
61#define NUM_DRIVES 1
62#define SECTOR_SIZE 512 62#define SECTOR_SIZE 512
63 63
64/* for small(ish) SD cards */ 64/* for small(ish) SD cards */
diff --git a/firmware/export/config/mini2440.h b/firmware/export/config/mini2440.h
index 4fc483b324..4149835eec 100644
--- a/firmware/export/config/mini2440.h
+++ b/firmware/export/config/mini2440.h
@@ -38,8 +38,7 @@
38/* define the storage type */ 38/* define the storage type */
39#define CONFIG_STORAGE STORAGE_SD 39#define CONFIG_STORAGE STORAGE_SD
40 40
41#define HAVE_MULTIDRIVE 41#define HAVE_MULTIVOLUME
42#define NUM_DRIVES 1 // no access to NAND yet
43#define HAVE_HOTSWAP 42#define HAVE_HOTSWAP
44#define HAVE_HOTSWAP_STORAGE_AS_MAIN 43#define HAVE_HOTSWAP_STORAGE_AS_MAIN
45#define INCLUDE_TIMEOUT_API 44#define INCLUDE_TIMEOUT_API
diff --git a/firmware/export/config/ondavx747.h b/firmware/export/config/ondavx747.h
index 7f4f1ea843..a9d4f0fecf 100644
--- a/firmware/export/config/ondavx747.h
+++ b/firmware/export/config/ondavx747.h
@@ -161,11 +161,11 @@
161No access to the NAND yet.. 161No access to the NAND yet..
162 162
163#define CONFIG_STORAGE (STORAGE_NAND | STORAGE_SD) 163#define CONFIG_STORAGE (STORAGE_NAND | STORAGE_SD)
164#define HAVE_MULTIDRIVE
164#define NUM_DRIVES 2 165#define NUM_DRIVES 2
165*/ 166*/
166#define CONFIG_STORAGE (STORAGE_SD) 167#define CONFIG_STORAGE (STORAGE_SD)
167#define HAVE_MULTIDRIVE 168#define HAVE_MULTIVOLUME
168#define NUM_DRIVES 1
169#define HAVE_HOTSWAP_STORAGE_AS_MAIN 169#define HAVE_HOTSWAP_STORAGE_AS_MAIN
170#define INCLUDE_TIMEOUT_API 170#define INCLUDE_TIMEOUT_API
171 171
diff --git a/firmware/export/config/ondavx777.h b/firmware/export/config/ondavx777.h
index ceea151d8c..1387898eff 100644
--- a/firmware/export/config/ondavx777.h
+++ b/firmware/export/config/ondavx777.h
@@ -152,11 +152,11 @@
152No access to the NAND yet.. 152No access to the NAND yet..
153 153
154#define CONFIG_STORAGE (STORAGE_NAND | STORAGE_SD) 154#define CONFIG_STORAGE (STORAGE_NAND | STORAGE_SD)
155#define HAVE_MULTIDRIVE
155#define NUM_DRIVES 2 156#define NUM_DRIVES 2
156*/ 157*/
157#define CONFIG_STORAGE (STORAGE_SD) 158#define CONFIG_STORAGE (STORAGE_SD)
158#define HAVE_MULTIDRIVE 159#define HAVE_MULTIVOLUME
159#define NUM_DRIVES 1
160#define HAVE_HOTSWAP_STORAGE_AS_MAIN 160#define HAVE_HOTSWAP_STORAGE_AS_MAIN
161#define INCLUDE_TIMEOUT_API 161#define INCLUDE_TIMEOUT_API
162 162
diff --git a/firmware/export/config/rk27generic.h b/firmware/export/config/rk27generic.h
index 967fc6d8ff..23768c1d2e 100644
--- a/firmware/export/config/rk27generic.h
+++ b/firmware/export/config/rk27generic.h
@@ -56,6 +56,7 @@
56#define HAVE_FLASH_STORAGE 56#define HAVE_FLASH_STORAGE
57 57
58#define CONFIG_STORAGE (STORAGE_SD | STORAGE_NAND) 58#define CONFIG_STORAGE (STORAGE_SD | STORAGE_NAND)
59#define NUM_DRIVES 1 /* NAND doesn't work yet */
59 60
60#define CONFIG_NAND NAND_RK27XX 61#define CONFIG_NAND NAND_RK27XX
61#define HAVE_SW_TONE_CONTROLS 62#define HAVE_SW_TONE_CONTROLS
@@ -63,7 +64,6 @@
63/* commented for now */ 64/* commented for now */
64/* #define HAVE_HOTSWAP */ 65/* #define HAVE_HOTSWAP */
65 66
66#define NUM_DRIVES 1
67#define SECTOR_SIZE 512 67#define SECTOR_SIZE 512
68 68
69/* for small(ish) SD cards */ 69/* for small(ish) SD cards */
diff --git a/firmware/export/config/sansae200.h b/firmware/export/config/sansae200.h
index 1c10f74845..70782aa147 100644
--- a/firmware/export/config/sansae200.h
+++ b/firmware/export/config/sansae200.h
@@ -181,7 +181,6 @@
181#define CONFIG_LCD LCD_X5 181#define CONFIG_LCD LCD_X5
182 182
183#define HAVE_MULTIDRIVE 183#define HAVE_MULTIDRIVE
184//#define HAVE_MULTIVOLUME
185#define NUM_DRIVES 2 184#define NUM_DRIVES 2
186#define HAVE_HOTSWAP /* required to access sd from bootloader */ 185#define HAVE_HOTSWAP /* required to access sd from bootloader */
187 186
diff --git a/firmware/export/config/shanlingq1.h b/firmware/export/config/shanlingq1.h
index a708cfc2a9..4e74f9e33c 100644
--- a/firmware/export/config/shanlingq1.h
+++ b/firmware/export/config/shanlingq1.h
@@ -64,9 +64,7 @@
64#define CONFIG_STORAGE STORAGE_SD 64#define CONFIG_STORAGE STORAGE_SD
65#define HAVE_HOTSWAP 65#define HAVE_HOTSWAP
66#define HAVE_HOTSWAP_STORAGE_AS_MAIN 66#define HAVE_HOTSWAP_STORAGE_AS_MAIN
67#define HAVE_MULTIDRIVE
68#define HAVE_MULTIVOLUME 67#define HAVE_MULTIVOLUME
69#define NUM_DRIVES 1
70#define STORAGE_WANTS_ALIGN 68#define STORAGE_WANTS_ALIGN
71#define STORAGE_NEEDS_BOUNCE_BUFFER 69#define STORAGE_NEEDS_BOUNCE_BUFFER
72 70
diff --git a/firmware/export/config/xduoox3.h b/firmware/export/config/xduoox3.h
index 46e1a61712..0d413ad372 100644
--- a/firmware/export/config/xduoox3.h
+++ b/firmware/export/config/xduoox3.h
@@ -174,6 +174,7 @@
174/* Type of LCD */ 174/* Type of LCD */
175#define CONFIG_LCD LCD_XDUOOX3 175#define CONFIG_LCD LCD_XDUOOX3
176 176
177#ifndef BOOTLOADER
177/* USB On-the-go */ 178/* USB On-the-go */
178#define CONFIG_USBOTG USBOTG_JZ4760 179#define CONFIG_USBOTG USBOTG_JZ4760
179 180
@@ -189,6 +190,7 @@
189 190
190#define USB_NUM_ENDPOINTS 3 191#define USB_NUM_ENDPOINTS 3
191#define USB_DEVBSS_ATTR IBSS_ATTR 192#define USB_DEVBSS_ATTR IBSS_ATTR
193#endif /* !BOOTLOADER */
192 194
193#define BOOTFILE_EXT "x3" 195#define BOOTFILE_EXT "x3"
194#define BOOTFILE "rockbox." BOOTFILE_EXT 196#define BOOTFILE "rockbox." BOOTFILE_EXT
@@ -198,7 +200,7 @@
198 200
199#define ICODE_ATTR_TREMOR_NOT_MDCT 201#define ICODE_ATTR_TREMOR_NOT_MDCT
200 202
201#endif /* SIMULATOR */ 203#endif /* !SIMULATOR */
202 204
203/** Port-specific settings **/ 205/** Port-specific settings **/
204 206