summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarianne Arnold <pixelma@rockbox.org>2009-05-29 13:36:12 +0000
committerMarianne Arnold <pixelma@rockbox.org>2009-05-29 13:36:12 +0000
commit74a22ff1a3908a11750524569584c52d38422e88 (patch)
treed54993f29f0f3b1d02d322dc90bc9974015c3770
parentb41208fffdc98787e52890499f6cb3b2c2eba2bc (diff)
downloadrockbox-74a22ff1a3908a11750524569584c52d38422e88.tar.gz
rockbox-74a22ff1a3908a11750524569584c52d38422e88.zip
Make 'Backlight mod' an Advanced build option for the Ondios (largely inspired by the RTC mod related changes in r12555). Remove the defines in the config files as you won't need to 'hack' them anymore, just chose the right options while running 'configure'.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21128 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/export/config-ondiofm.h3
-rw-r--r--firmware/export/config-ondiosp.h3
-rwxr-xr-xtools/configure15
3 files changed, 15 insertions, 6 deletions
diff --git a/firmware/export/config-ondiofm.h b/firmware/export/config-ondiofm.h
index e36eff8757..a43810e3ff 100644
--- a/firmware/export/config-ondiofm.h
+++ b/firmware/export/config-ondiofm.h
@@ -59,9 +59,6 @@
59/* Define this if you have a MAS3587F */ 59/* Define this if you have a MAS3587F */
60#define CONFIG_CODEC MAS3587F 60#define CONFIG_CODEC MAS3587F
61 61
62/* Enable this if you have done the backlight mod */
63//#define HAVE_BACKLIGHT
64
65/* define this if you have a flash memory storage */ 62/* define this if you have a flash memory storage */
66#define HAVE_FLASH_STORAGE 63#define HAVE_FLASH_STORAGE
67 64
diff --git a/firmware/export/config-ondiosp.h b/firmware/export/config-ondiosp.h
index cf69bae619..1fcf45b200 100644
--- a/firmware/export/config-ondiosp.h
+++ b/firmware/export/config-ondiosp.h
@@ -46,9 +46,6 @@
46/* Define this if you have a MAS3539F */ 46/* Define this if you have a MAS3539F */
47#define CONFIG_CODEC MAS3539F 47#define CONFIG_CODEC MAS3539F
48 48
49/* Enable this if you have done the backlight mod */
50//#define HAVE_BACKLIGHT
51
52/* define this if you have a flash memory storage */ 49/* define this if you have a flash memory storage */
53#define HAVE_FLASH_STORAGE 50#define HAVE_FLASH_STORAGE
54 51
diff --git a/tools/configure b/tools/configure
index 3814d7583a..75908fe60c 100755
--- a/tools/configure
+++ b/tools/configure
@@ -324,6 +324,9 @@ whichadvanced () {
324 if [ "$modelname" = "h120" ]; then 324 if [ "$modelname" = "h120" ]; then
325 printf ", (R)TC MOD" 325 printf ", (R)TC MOD"
326 fi 326 fi
327 if [ "$t_model" = "ondio" ]; then
328 printf ", (B)acklight MOD"
329 fi
327 echo "" 330 echo ""
328 331
329 cont=1 332 cont=1
@@ -378,6 +381,14 @@ whichadvanced () {
378 cont=0 381 cont=0
379 fi 382 fi
380 ;; 383 ;;
384 [Bb])
385 if [ "$t_model" = "ondio" ]; then
386 have_backlight="#define HAVE_BACKLIGHT"
387 echo "Backlight functions enabled"
388 else
389 cont=0
390 fi
391 ;;
381 *) 392 *)
382 cont=0 393 cont=0
383 ;; 394 ;;
@@ -2503,6 +2514,7 @@ sed > autoconf.h \
2503 -e "s,@config_rtc@,$config_rtc,g" \ 2514 -e "s,@config_rtc@,$config_rtc,g" \
2504 -e "s,@have_rtc_alarm@,$have_rtc_alarm,g" \ 2515 -e "s,@have_rtc_alarm@,$have_rtc_alarm,g" \
2505 -e "s,@RBDIR@,${rbdir},g" \ 2516 -e "s,@RBDIR@,${rbdir},g" \
2517 -e "s,@have_backlight@,$have_backlight,g" \
2506<<EOF 2518<<EOF
2507/* This header was made by configure */ 2519/* This header was made by configure */
2508#ifndef __BUILD_AUTOCONF_H 2520#ifndef __BUILD_AUTOCONF_H
@@ -2518,6 +2530,9 @@ sed > autoconf.h \
2518@config_rtc@ 2530@config_rtc@
2519@have_rtc_alarm@ 2531@have_rtc_alarm@
2520 2532
2533/* optional define for a backlight modded Ondio */
2534@have_backlight@
2535
2521/* root of Rockbox */ 2536/* root of Rockbox */
2522#define ROCKBOX_DIR "/@RBDIR@" 2537#define ROCKBOX_DIR "/@RBDIR@"
2523 2538