From 2351a77e822035ec90d08549d2be5f50b0335f24 Mon Sep 17 00:00:00 2001 From: kugel Date: Mon, 5 Apr 2010 12:17:11 +0000 Subject: [PATCH] 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 --- firmware/SOURCES | 12 ++++++------ firmware/target/arm/as3525/lcd-ssd1303.c | 5 +++++ firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c | 5 +++++ firmware/target/arm/as3525/sansa-fuze/lcd-fuze.c | 5 +++++ 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 a61331f8f..cfd6db372 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES @@ -1211,12 +1211,12 @@ target/arm/tcc77x/c100/audio-c100.c #ifndef SIMULATOR target/arm/as3525/lcd-ssd1303.c target/arm/as3525/sansa-clipplus/lcd-clip-plus.c -target/arm/as3525/sansa-clipplus/lcd-as-clip-plus.S target/arm/as3525/sansa-clipplus/button-clip.c target/arm/as3525/sansa-clipplus/backlight-clip.c #ifndef BOOTLOADER target/arm/powermgmt-ascodec.c target/arm/as3525/sansa-clip/powermgmt-clip.c +target/arm/as3525/sansa-clipplus/lcd-as-clip-plus.S #endif /* !BOOTLOADER */ #endif /* !SIMULATOR */ #endif /* SANSA_CLIPPLUS */ @@ -1225,12 +1225,12 @@ target/arm/as3525/sansa-clip/powermgmt-clip.c #ifndef SIMULATOR target/arm/as3525/lcd-ssd1303.c target/arm/as3525/sansa-clipv2/lcd-clipv2.c -target/arm/as3525/sansa-clipv2/lcd-as-clipv2.S target/arm/as3525/sansa-clipv2/button-clip.c target/arm/as3525/sansa-clipv2/backlight-clipv2.c #ifndef BOOTLOADER target/arm/powermgmt-ascodec.c target/arm/as3525/sansa-clip/powermgmt-clip.c +target/arm/as3525/sansa-clipv2/lcd-as-clipv2.S #endif /* !BOOTLOADER */ #endif /* !SIMULATOR */ #endif /* SANSA_CLIPV2 */ @@ -1239,12 +1239,12 @@ target/arm/as3525/sansa-clip/powermgmt-clip.c #ifndef SIMULATOR target/arm/as3525/lcd-ssd1303.c target/arm/as3525/sansa-clip/lcd-clip.c -target/arm/as3525/sansa-clip/lcd-as-clip.S target/arm/as3525/sansa-clip/button-clip.c target/arm/as3525/sansa-clip/backlight-clip.c #ifndef BOOTLOADER target/arm/powermgmt-ascodec.c target/arm/as3525/sansa-clip/powermgmt-clip.c +target/arm/as3525/sansa-clip/lcd-as-clip.S #endif /* !BOOTLOADER */ #endif /* !SIMULATOR */ #endif /* SANSA_CLIP */ @@ -1252,13 +1252,13 @@ target/arm/as3525/sansa-clip/powermgmt-clip.c #ifdef SANSA_E200V2 #ifndef SIMULATOR target/arm/as3525/sansa-e200v2/lcd-e200v2.c -target/arm/as3525/lcd-as-e200v2-fuze-fuzev2.S target/arm/as3525/button-e200v2-fuze.c target/arm/as3525/backlight-e200v2-fuze.c target/arm/as3525/dbop-as3525.c #ifndef BOOTLOADER target/arm/powermgmt-ascodec.c target/arm/as3525/sansa-e200v2/powermgmt-e200v2.c +target/arm/as3525/lcd-as-e200v2-fuze-fuzev2.S #endif /* !BOOTLOADER */ #endif /* !SIMULATOR */ #endif /* SANSA_E200V2 */ @@ -1290,12 +1290,12 @@ target/arm/as3525/sansa-m200v4/powermgmt-m200v4.c #ifndef SIMULATOR target/arm/as3525/button-e200v2-fuze.c target/arm/as3525/sansa-fuze/lcd-fuze.c -target/arm/as3525/lcd-as-e200v2-fuze-fuzev2.S target/arm/as3525/backlight-e200v2-fuze.c target/arm/as3525/dbop-as3525.c #ifndef BOOTLOADER target/arm/powermgmt-ascodec.c target/arm/as3525/sansa-fuze/powermgmt-fuze.c +target/arm/as3525/lcd-as-e200v2-fuze-fuzev2.S #endif /* !BOOTLOADER */ #endif /* !SIMULATOR */ #endif /* SANSA_FUZE */ @@ -1303,13 +1303,13 @@ target/arm/as3525/sansa-fuze/powermgmt-fuze.c #ifdef SANSA_FUZEV2 #ifndef SIMULATOR target/arm/as3525/sansa-fuzev2/lcd-fuzev2.c -target/arm/as3525/lcd-as-e200v2-fuze-fuzev2.S target/arm/as3525/sansa-fuzev2/backlight-fuzev2.c target/arm/as3525/sansa-fuzev2/button-fuzev2.c target/arm/as3525/dbop-as3525.c #ifndef BOOTLOADER target/arm/powermgmt-ascodec.c target/arm/as3525/sansa-fuzev2/powermgmt-fuzev2.c +target/arm/as3525/lcd-as-e200v2-fuze-fuzev2.S #endif /* !BOOTLOADER */ #endif /* !SIMULATOR */ #endif /* SANSA_FUZEV2 */ diff --git a/firmware/target/arm/as3525/lcd-ssd1303.c b/firmware/target/arm/as3525/lcd-ssd1303.c index e4437e70c..09f2638ff 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, } } + +#ifndef BOOTLOADER /* Helper function for lcd_grey_phase_blit(). */ void lcd_grey_data(unsigned char *values, unsigned char *phases, int count); @@ -242,6 +244,9 @@ void lcd_blit_grey_phase(unsigned char *values, unsigned char *phases, } } +#endif + + /* Update the display. This must be called after all other LCD functions that change the display. */ 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 5c3e92bb1..2808d60f4 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) } } + +#ifndef BOOTLOADER /* Line write helper function for lcd_yuv_blit. Write two lines of yuv420. */ extern void lcd_write_yuv420_lines(unsigned char const * const src[3], int width, @@ -434,6 +436,9 @@ void lcd_blit_yuv(unsigned char * const src[3], } } +#endif + + /* Update the display. This must be called after all other LCD functions that change the display. */ 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 bdf1c704e..54d4d7318 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) lcd_yuv_options = options; } + +#ifndef BOOTLOADER /* Line write helper function for lcd_yuv_blit. Write two lines of yuv420. */ extern void lcd_write_yuv420_lines(unsigned char const * const src[3], int width, @@ -380,6 +382,9 @@ void lcd_blit_yuv(unsigned char * const src[3], } } +#endif + + /* Update the display. This must be called after all other LCD functions that change the display. */ 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 d17149ee9..f3fa8e320 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) lcd_yuv_options = options; } + +#ifndef BOOTLOADER /* Line write helper function for lcd_yuv_blit. Write two lines of yuv420. */ extern void lcd_write_yuv420_lines(unsigned char const * const src[3], int width, @@ -375,6 +377,9 @@ void lcd_blit_yuv(unsigned char * const src[3], } } +#endif + + /* Update the display. This must be called after all other LCD functions that change the display. */ void lcd_update(void) -- 2.11.4.GIT