--- a/gsm-fw/Makefile	Mon Apr 06 02:32:04 2015 +0000
+++ b/gsm-fw/Makefile	Sat Apr 18 22:47:59 2015 +0000
@@ -13,8 +13,8 @@
 
 build.conf:
 	@echo 'Configuration is required before the build.'
-	@echo 'Please create a valid build.conf file by running config.sh'
-	@echo 'or copying an existing configuration file into place.'
+	@echo 'Please copy one of the configuration files under configs/'
+	@echo 'to build.conf, optionally edit it to taste, and then run make.'
 	@false
 
 clean: FRC

--- a/gsm-fw/config.sh	Mon Apr 06 02:32:04 2015 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-#!/bin/sh
-# This shell script is meant to be invoked directly by users; no Makefile
-# or other script invokes it.  The purpose of this script to hand-hold
-# the user through creating a minimal valid build.conf file (without the
-# user having some existing one) to allow the build to proceed.
-
-echo 'Please select the target you wish to build the firmware for:'
-echo
-echo '1: Openmoko GTA01/02 GSM modem'
-echo '2: Pirelli DP-L10 feature phone'
-echo
-echo -n 'Please make your selection: '
-read userinput
-
-case "$userinput" in
-	1)
-		TARGET=gtamodem
-		;;
-	2)
-		TARGET=pirelli
-		;;
-	*)
-		echo 'Invalid selection'
-		exit 1;
-		;;
-esac
-
-echo
-echo "target $TARGET" > build.conf
-echo "build.conf created; you can now run 'make'"
-exit 0

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gsm-fw/configs/gtamodem-gsm	Sat Apr 18 22:47:59 2015 +0000
@@ -0,0 +1,8 @@
+# This configuration will eventually become a firmware image for the gtamodem
+# target that provides actual GSM functionality.
+
+target	gtamodem
+feature	gsm
+
+feature	etm
+feature	tmffs2