[prev in list] [next in list] [prev in thread] [next in thread] 

List:       rockbox-cvs
Subject:    imx233: don't compile fm tuner code in bootloader
From:       gerrit () rockbox ! org
Date:       2013-12-02 19:10:19
Message-ID: 201312021910.rB2JAJnl002551 () giant ! haxx ! se
[Download RAW message or body]

commit 23c6421f38eb2c47b725a3b8f57f8e74eaff2fd6
Author: Amaury Pouly <amaury.pouly@gmail.com>
Date:   Mon Dec 2 20:09:56 2013 +0100

    imx233: don't compile fm tuner code in bootloader
    
    Change-Id: Icd36e6b03965272eb169a19630b720f38bac6d9e

diff --git a/firmware/SOURCES b/firmware/SOURCES
index 8429b7e..843e5cc 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -1165,7 +1165,9 @@ target/arm/tms320dm320/creative-zvm/usb-creativezvm.c
 
 #if defined(CREATIVE_ZEN) || defined(CREATIVE_ZENXFI) || defined(CREATIVE_ZENMOZAIC) \
     || defined(CREATIVE_ZENV)
+    #ifndef BOOTLOADER
 target/arm/imx233/fmradio-imx233.c
+#endif
 target/arm/imx233/creative-zen/backlight-zen.c
 # if defined(CREATIVE_ZEN) || defined(CREATIVE_ZENXFI)
 target/arm/imx233/creative-zen/lcd-zen.c
@@ -1182,7 +1184,9 @@ target/arm/imx233/button-lradc-imx233.c
 #endif
 
 #ifdef CREATIVE_ZENXFI2
+#ifndef BOOTLOADER
 target/arm/imx233/fmradio-imx233.c
+#endif
 target/arm/imx233/creative-zenxfi2/backlight-zenxfi2.c
 target/arm/imx233/creative-zenxfi2/lcd-zenxfi2.c
 target/arm/imx233/creative-zenxfi2/button-zenxfi2.c
@@ -1192,7 +1196,9 @@ target/arm/imx233/creative-zenxfi2/powermgmt-zenxfi2.c
 
 #ifdef CREATIVE_ZENXFI3
 drivers/mpr121.c
+#ifndef BOOTLOADER
 target/arm/imx233/fmradio-imx233.c
+#endif
 target/arm/imx233/creative-zenxfi3/backlight-zenxfi3.c
 target/arm/imx233/creative-zenxfi3/lcd-zenxfi3.c
 target/arm/imx233/creative-zenxfi3/button-zenxfi3.c
@@ -1202,7 +1208,9 @@ target/arm/imx233/creative-zenxfi3/powermgmt-zenxfi3.c
 
 #if defined(SONY_NWZE360) || defined(SONY_NWZE370)
 target/arm/imx233/button-lradc-imx233.c
+#ifndef BOOTLOADER
 target/arm/imx233/fmradio-imx233.c
+#endif
 target/arm/imx233/sony-nwz/backlight-nwz.c
 target/arm/imx233/sony-nwz/button-nwz.c
 target/arm/imx233/sony-nwz/debug-nwz.c
@@ -1423,8 +1431,10 @@ target/arm/as3525/lcd-as-e200v2-fuze-fuzev2.S
 
 #ifdef SANSA_FUZEPLUS
 drivers/synaptics-rmi.c
+#ifndef BOOTLOADER
 drivers/generic_i2c.c
 target/arm/imx233/fmradio-imx233.c
+#endif
 target/arm/imx233/sansa-fuzeplus/fmradio-i2c-fuzeplus.c
 target/arm/imx233/sansa-fuzeplus/backlight-fuzeplus.c
 target/arm/imx233/sansa-fuzeplus/lcd-fuzeplus.c
diff --git a/firmware/target/arm/imx233/system-imx233.c b/firmware/target/arm/imx233/system-imx233.c
index 4223af2..b25ccb5 100644
--- a/firmware/target/arm/imx233/system-imx233.c
+++ b/firmware/target/arm/imx233/system-imx233.c
@@ -142,7 +142,7 @@ void system_init(void)
 
     cpu_frequency = imx233_clkctrl_get_freq(CLK_CPU);
 
-#if CONFIG_TUNER
+#if !defined(BOOTLOADER) && CONFIG_TUNER != 0
     fmradio_i2c_init();
 #endif
 }
_______________________________________________
rockbox-cvs mailing list
rockbox-cvs@cool.haxx.se
http://cool.haxx.se/cgi-bin/mailman/listinfo/rockbox-cvs
[prev in list] [next in list] [prev in thread] [next in thread]