FreeCalypso > hg > fc-magnetite

changeset 587:36eb33f1d45a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
config system: RVTMUX_ON_MODEM and UI_CONFIG moved into targets/*.conf
author Mychaela Falconia <falcon@freecalypso.org>
date Wed, 13 Mar 2019 16:52:48 +0000
parents 64fba3fc09c6
children f2e752052db5
files configure.sh targets/c11x.conf targets/c139.conf targets/c155.conf
diffstat 4 files changed, 6 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/configure.sh	Mon Mar 11 02:13:04 2019 +0000
+++ b/configure.sh	Wed Mar 13 16:52:48 2019 +0000
@@ -51,6 +51,8 @@
 DSP=36
 RF=12
 DISABLE_SLEEP=0
+RVTMUX_ON_MODEM=0
+UI_CONFIG=bigcolor
 
 . "targets/$TARGET.conf"
 
@@ -83,17 +85,6 @@
 		exit 1
 esac
 
-# UI and RVTMUX config default based on target
-
-if [ "$TARGET" = c11x -o "$TARGET" = c139 -o "$TARGET" = c155 ]
-then
-	UI_CONFIG=84x48
-	RVTMUX_ON_MODEM=1
-else
-	UI_CONFIG=bigcolor
-	RVTMUX_ON_MODEM=0
-fi
-
 # display driver configuration
 
 DSAMPLE_FULL_COLOR=1
--- a/targets/c11x.conf	Mon Mar 11 02:13:04 2019 +0000
+++ b/targets/c11x.conf	Wed Mar 13 16:52:48 2019 +0000
@@ -4,3 +4,4 @@
 TPUDRV_blob=
 FLASH_BASE_ADDR=0x10000
 FLASH_SECTOR_SIZE=0x10000
+RVTMUX_ON_MODEM=1
--- a/targets/c139.conf	Mon Mar 11 02:13:04 2019 +0000
+++ b/targets/c139.conf	Wed Mar 13 16:52:48 2019 +0000
@@ -4,3 +4,5 @@
 TPUDRV_blob=
 FLASH_BASE_ADDR=0x10000
 FLASH_SECTOR_SIZE=0x10000
+RVTMUX_ON_MODEM=1
+UI_CONFIG=84x48
--- a/targets/c155.conf	Mon Mar 11 02:13:04 2019 +0000
+++ b/targets/c155.conf	Wed Mar 13 16:52:48 2019 +0000
@@ -4,3 +4,4 @@
 TPUDRV_blob=
 FLASH_BASE_ADDR=0x20000
 FLASH_SECTOR_SIZE=0x10000
+RVTMUX_ON_MODEM=1