diff options
author | Thomas Martitz <kugel@rockbox.org> | 2010-04-05 12:17:11 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2010-04-05 12:17:11 +0000 |
commit | ae69e92008046b447833dde37e1fbc55c229cdcf (patch) | |
tree | 67dd52b6016f8f50e613b7f4dc0af4fe61e0d8bb | |
parent | 20003ec1c080f683f5c3b76537a419a231f6cf14 (diff) | |
download | rockbox-ae69e92008046b447833dde37e1fbc55c229cdcf.tar.gz rockbox-ae69e92008046b447833dde37e1fbc55c229cdcf.zip |
as2525(v2): We don't need yuv blitting/greylib support in the bootloader so don't compile it.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25483 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/SOURCES | 12 | ||||
-rw-r--r-- | firmware/target/arm/as3525/lcd-ssd1303.c | 5 | ||||
-rw-r--r-- | firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c | 5 | ||||
-rw-r--r-- | firmware/target/arm/as3525/sansa-fuze/lcd-fuze.c | 5 | ||||
-rw-r--r-- | firmware/target/arm/as3525/sansa-fuzev2/lcd-fuzev2.c | 5 |
5 files changed, 26 insertions, 6 deletions
diff --git a/firmware/SOURCES b/firmware/SOURCES index a61331f8f0..cfd6db372d 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES | |||
@@ -1211,12 +1211,12 @@ target/arm/tcc77x/c100/audio-c100.c | |||
1211 | #ifndef SIMULATOR | 1211 | #ifndef SIMULATOR |
1212 | target/arm/as3525/lcd-ssd1303.c | 1212 | target/arm/as3525/lcd-ssd1303.c |
1213 | target/arm/as3525/sansa-clipplus/lcd-clip-plus.c | 1213 | target/arm/as3525/sansa-clipplus/lcd-clip-plus.c |
1214 | target/arm/as3525/sansa-clipplus/lcd-as-clip-plus.S | ||
1215 | target/arm/as3525/sansa-clipplus/button-clip.c | 1214 | target/arm/as3525/sansa-clipplus/button-clip.c |
1216 | target/arm/as3525/sansa-clipplus/backlight-clip.c | 1215 | target/arm/as3525/sansa-clipplus/backlight-clip.c |
1217 | #ifndef BOOTLOADER | 1216 | #ifndef BOOTLOADER |
1218 | target/arm/powermgmt-ascodec.c | 1217 | target/arm/powermgmt-ascodec.c |
1219 | target/arm/as3525/sansa-clip/powermgmt-clip.c | 1218 | target/arm/as3525/sansa-clip/powermgmt-clip.c |
1219 | target/arm/as3525/sansa-clipplus/lcd-as-clip-plus.S | ||
1220 | #endif /* !BOOTLOADER */ | 1220 | #endif /* !BOOTLOADER */ |
1221 | #endif /* !SIMULATOR */ | 1221 | #endif /* !SIMULATOR */ |
1222 | #endif /* SANSA_CLIPPLUS */ | 1222 | #endif /* SANSA_CLIPPLUS */ |
@@ -1225,12 +1225,12 @@ target/arm/as3525/sansa-clip/powermgmt-clip.c | |||
1225 | #ifndef SIMULATOR | 1225 | #ifndef SIMULATOR |
1226 | target/arm/as3525/lcd-ssd1303.c | 1226 | target/arm/as3525/lcd-ssd1303.c |
1227 | target/arm/as3525/sansa-clipv2/lcd-clipv2.c | 1227 | target/arm/as3525/sansa-clipv2/lcd-clipv2.c |
1228 | target/arm/as3525/sansa-clipv2/lcd-as-clipv2.S | ||
1229 | target/arm/as3525/sansa-clipv2/button-clip.c | 1228 | target/arm/as3525/sansa-clipv2/button-clip.c |
1230 | target/arm/as3525/sansa-clipv2/backlight-clipv2.c | 1229 | target/arm/as3525/sansa-clipv2/backlight-clipv2.c |
1231 | #ifndef BOOTLOADER | 1230 | #ifndef BOOTLOADER |
1232 | target/arm/powermgmt-ascodec.c | 1231 | target/arm/powermgmt-ascodec.c |
1233 | target/arm/as3525/sansa-clip/powermgmt-clip.c | 1232 | target/arm/as3525/sansa-clip/powermgmt-clip.c |
1233 | target/arm/as3525/sansa-clipv2/lcd-as-clipv2.S | ||
1234 | #endif /* !BOOTLOADER */ | 1234 | #endif /* !BOOTLOADER */ |
1235 | #endif /* !SIMULATOR */ | 1235 | #endif /* !SIMULATOR */ |
1236 | #endif /* SANSA_CLIPV2 */ | 1236 | #endif /* SANSA_CLIPV2 */ |
@@ -1239,12 +1239,12 @@ target/arm/as3525/sansa-clip/powermgmt-clip.c | |||
1239 | #ifndef SIMULATOR | 1239 | #ifndef SIMULATOR |
1240 | target/arm/as3525/lcd-ssd1303.c | 1240 | target/arm/as3525/lcd-ssd1303.c |
1241 | target/arm/as3525/sansa-clip/lcd-clip.c | 1241 | target/arm/as3525/sansa-clip/lcd-clip.c |
1242 | target/arm/as3525/sansa-clip/lcd-as-clip.S | ||
1243 | target/arm/as3525/sansa-clip/button-clip.c | 1242 | target/arm/as3525/sansa-clip/button-clip.c |
1244 | target/arm/as3525/sansa-clip/backlight-clip.c | 1243 | target/arm/as3525/sansa-clip/backlight-clip.c |
1245 | #ifndef BOOTLOADER | 1244 | #ifndef BOOTLOADER |
1246 | target/arm/powermgmt-ascodec.c | 1245 | target/arm/powermgmt-ascodec.c |
1247 | target/arm/as3525/sansa-clip/powermgmt-clip.c | 1246 | target/arm/as3525/sansa-clip/powermgmt-clip.c |
1247 | target/arm/as3525/sansa-clip/lcd-as-clip.S | ||
1248 | #endif /* !BOOTLOADER */ | 1248 | #endif /* !BOOTLOADER */ |
1249 | #endif /* !SIMULATOR */ | 1249 | #endif /* !SIMULATOR */ |
1250 | #endif /* SANSA_CLIP */ | 1250 | #endif /* SANSA_CLIP */ |
@@ -1252,13 +1252,13 @@ target/arm/as3525/sansa-clip/powermgmt-clip.c | |||
1252 | #ifdef SANSA_E200V2 | 1252 | #ifdef SANSA_E200V2 |
1253 | #ifndef SIMULATOR | 1253 | #ifndef SIMULATOR |
1254 | target/arm/as3525/sansa-e200v2/lcd-e200v2.c | 1254 | target/arm/as3525/sansa-e200v2/lcd-e200v2.c |
1255 | target/arm/as3525/lcd-as-e200v2-fuze-fuzev2.S | ||
1256 | target/arm/as3525/button-e200v2-fuze.c | 1255 | target/arm/as3525/button-e200v2-fuze.c |
1257 | target/arm/as3525/backlight-e200v2-fuze.c | 1256 | target/arm/as3525/backlight-e200v2-fuze.c |
1258 | target/arm/as3525/dbop-as3525.c | 1257 | target/arm/as3525/dbop-as3525.c |
1259 | #ifndef BOOTLOADER | 1258 | #ifndef BOOTLOADER |
1260 | target/arm/powermgmt-ascodec.c | 1259 | target/arm/powermgmt-ascodec.c |
1261 | target/arm/as3525/sansa-e200v2/powermgmt-e200v2.c | 1260 | target/arm/as3525/sansa-e200v2/powermgmt-e200v2.c |
1261 | target/arm/as3525/lcd-as-e200v2-fuze-fuzev2.S | ||
1262 | #endif /* !BOOTLOADER */ | 1262 | #endif /* !BOOTLOADER */ |
1263 | #endif /* !SIMULATOR */ | 1263 | #endif /* !SIMULATOR */ |
1264 | #endif /* SANSA_E200V2 */ | 1264 | #endif /* SANSA_E200V2 */ |
@@ -1290,12 +1290,12 @@ target/arm/as3525/sansa-m200v4/powermgmt-m200v4.c | |||
1290 | #ifndef SIMULATOR | 1290 | #ifndef SIMULATOR |
1291 | target/arm/as3525/button-e200v2-fuze.c | 1291 | target/arm/as3525/button-e200v2-fuze.c |
1292 | target/arm/as3525/sansa-fuze/lcd-fuze.c | 1292 | target/arm/as3525/sansa-fuze/lcd-fuze.c |
1293 | target/arm/as3525/lcd-as-e200v2-fuze-fuzev2.S | ||
1294 | target/arm/as3525/backlight-e200v2-fuze.c | 1293 | target/arm/as3525/backlight-e200v2-fuze.c |
1295 | target/arm/as3525/dbop-as3525.c | 1294 | target/arm/as3525/dbop-as3525.c |
1296 | #ifndef BOOTLOADER | 1295 | #ifndef BOOTLOADER |
1297 | target/arm/powermgmt-ascodec.c | 1296 | target/arm/powermgmt-ascodec.c |
1298 | target/arm/as3525/sansa-fuze/powermgmt-fuze.c | 1297 | target/arm/as3525/sansa-fuze/powermgmt-fuze.c |
1298 | target/arm/as3525/lcd-as-e200v2-fuze-fuzev2.S | ||
1299 | #endif /* !BOOTLOADER */ | 1299 | #endif /* !BOOTLOADER */ |
1300 | #endif /* !SIMULATOR */ | 1300 | #endif /* !SIMULATOR */ |
1301 | #endif /* SANSA_FUZE */ | 1301 | #endif /* SANSA_FUZE */ |
@@ -1303,13 +1303,13 @@ target/arm/as3525/sansa-fuze/powermgmt-fuze.c | |||
1303 | #ifdef SANSA_FUZEV2 | 1303 | #ifdef SANSA_FUZEV2 |
1304 | #ifndef SIMULATOR | 1304 | #ifndef SIMULATOR |
1305 | target/arm/as3525/sansa-fuzev2/lcd-fuzev2.c | 1305 | target/arm/as3525/sansa-fuzev2/lcd-fuzev2.c |
1306 | target/arm/as3525/lcd-as-e200v2-fuze-fuzev2.S | ||
1307 | target/arm/as3525/sansa-fuzev2/backlight-fuzev2.c | 1306 | target/arm/as3525/sansa-fuzev2/backlight-fuzev2.c |
1308 | target/arm/as3525/sansa-fuzev2/button-fuzev2.c | 1307 | target/arm/as3525/sansa-fuzev2/button-fuzev2.c |
1309 | target/arm/as3525/dbop-as3525.c | 1308 | target/arm/as3525/dbop-as3525.c |
1310 | #ifndef BOOTLOADER | 1309 | #ifndef BOOTLOADER |
1311 | target/arm/powermgmt-ascodec.c | 1310 | target/arm/powermgmt-ascodec.c |
1312 | target/arm/as3525/sansa-fuzev2/powermgmt-fuzev2.c | 1311 | target/arm/as3525/sansa-fuzev2/powermgmt-fuzev2.c |
1312 | target/arm/as3525/lcd-as-e200v2-fuze-fuzev2.S | ||
1313 | #endif /* !BOOTLOADER */ | 1313 | #endif /* !BOOTLOADER */ |
1314 | #endif /* !SIMULATOR */ | 1314 | #endif /* !SIMULATOR */ |
1315 | #endif /* SANSA_FUZEV2 */ | 1315 | #endif /* SANSA_FUZEV2 */ |
diff --git a/firmware/target/arm/as3525/lcd-ssd1303.c b/firmware/target/arm/as3525/lcd-ssd1303.c index e4437e70ca..09f2638ff7 100644 --- a/firmware/target/arm/as3525/lcd-ssd1303.c +++ b/firmware/target/arm/as3525/lcd-ssd1303.c | |||
@@ -216,6 +216,8 @@ void lcd_blit_mono(const unsigned char *data, int x, int by, int width, | |||
216 | } | 216 | } |
217 | } | 217 | } |
218 | 218 | ||
219 | |||
220 | #ifndef BOOTLOADER | ||
219 | /* Helper function for lcd_grey_phase_blit(). */ | 221 | /* Helper function for lcd_grey_phase_blit(). */ |
220 | void lcd_grey_data(unsigned char *values, unsigned char *phases, int count); | 222 | void lcd_grey_data(unsigned char *values, unsigned char *phases, int count); |
221 | 223 | ||
@@ -242,6 +244,9 @@ void lcd_blit_grey_phase(unsigned char *values, unsigned char *phases, | |||
242 | } | 244 | } |
243 | } | 245 | } |
244 | 246 | ||
247 | #endif | ||
248 | |||
249 | |||
245 | /* Update the display. | 250 | /* Update the display. |
246 | This must be called after all other LCD functions that change the display. */ | 251 | This must be called after all other LCD functions that change the display. */ |
247 | void lcd_update(void) ICODE_ATTR; | 252 | void lcd_update(void) ICODE_ATTR; |
diff --git a/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c b/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c index 5c3e92bb1a..2808d60f46 100644 --- a/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c +++ b/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c | |||
@@ -366,6 +366,8 @@ static void lcd_window_blit(int xmin, int ymin, int xmax, int ymax) | |||
366 | } | 366 | } |
367 | } | 367 | } |
368 | 368 | ||
369 | |||
370 | #ifndef BOOTLOADER | ||
369 | /* Line write helper function for lcd_yuv_blit. Write two lines of yuv420. */ | 371 | /* Line write helper function for lcd_yuv_blit. Write two lines of yuv420. */ |
370 | extern void lcd_write_yuv420_lines(unsigned char const * const src[3], | 372 | extern void lcd_write_yuv420_lines(unsigned char const * const src[3], |
371 | int width, | 373 | int width, |
@@ -434,6 +436,9 @@ void lcd_blit_yuv(unsigned char * const src[3], | |||
434 | } | 436 | } |
435 | } | 437 | } |
436 | 438 | ||
439 | #endif | ||
440 | |||
441 | |||
437 | /* Update the display. | 442 | /* Update the display. |
438 | This must be called after all other LCD functions that change the display. */ | 443 | This must be called after all other LCD functions that change the display. */ |
439 | void lcd_update(void) | 444 | void lcd_update(void) |
diff --git a/firmware/target/arm/as3525/sansa-fuze/lcd-fuze.c b/firmware/target/arm/as3525/sansa-fuze/lcd-fuze.c index bdf1c704e0..54d4d73183 100644 --- a/firmware/target/arm/as3525/sansa-fuze/lcd-fuze.c +++ b/firmware/target/arm/as3525/sansa-fuze/lcd-fuze.c | |||
@@ -306,6 +306,8 @@ void lcd_yuv_set_options(unsigned options) | |||
306 | lcd_yuv_options = options; | 306 | lcd_yuv_options = options; |
307 | } | 307 | } |
308 | 308 | ||
309 | |||
310 | #ifndef BOOTLOADER | ||
309 | /* Line write helper function for lcd_yuv_blit. Write two lines of yuv420. */ | 311 | /* Line write helper function for lcd_yuv_blit. Write two lines of yuv420. */ |
310 | extern void lcd_write_yuv420_lines(unsigned char const * const src[3], | 312 | extern void lcd_write_yuv420_lines(unsigned char const * const src[3], |
311 | int width, | 313 | int width, |
@@ -380,6 +382,9 @@ void lcd_blit_yuv(unsigned char * const src[3], | |||
380 | } | 382 | } |
381 | } | 383 | } |
382 | 384 | ||
385 | #endif | ||
386 | |||
387 | |||
383 | /* Update the display. | 388 | /* Update the display. |
384 | This must be called after all other LCD functions that change the display. */ | 389 | This must be called after all other LCD functions that change the display. */ |
385 | void lcd_update(void) | 390 | void lcd_update(void) |
diff --git a/firmware/target/arm/as3525/sansa-fuzev2/lcd-fuzev2.c b/firmware/target/arm/as3525/sansa-fuzev2/lcd-fuzev2.c index d17149ee95..f3fa8e3205 100644 --- a/firmware/target/arm/as3525/sansa-fuzev2/lcd-fuzev2.c +++ b/firmware/target/arm/as3525/sansa-fuzev2/lcd-fuzev2.c | |||
@@ -303,6 +303,8 @@ void lcd_yuv_set_options(unsigned options) | |||
303 | lcd_yuv_options = options; | 303 | lcd_yuv_options = options; |
304 | } | 304 | } |
305 | 305 | ||
306 | |||
307 | #ifndef BOOTLOADER | ||
306 | /* Line write helper function for lcd_yuv_blit. Write two lines of yuv420. */ | 308 | /* Line write helper function for lcd_yuv_blit. Write two lines of yuv420. */ |
307 | extern void lcd_write_yuv420_lines(unsigned char const * const src[3], | 309 | extern void lcd_write_yuv420_lines(unsigned char const * const src[3], |
308 | int width, | 310 | int width, |
@@ -375,6 +377,9 @@ void lcd_blit_yuv(unsigned char * const src[3], | |||
375 | } | 377 | } |
376 | } | 378 | } |
377 | 379 | ||
380 | #endif | ||
381 | |||
382 | |||
378 | /* Update the display. | 383 | /* Update the display. |
379 | This must be called after all other LCD functions that change the display. */ | 384 | This must be called after all other LCD functions that change the display. */ |
380 | void lcd_update(void) | 385 | void lcd_update(void) |