first-boot-wizard.sh: Removed second 800MHz profile (not needed anymore).

Signed-off-by: Michael Mrozek <EvilDragon@openpandora.org>

diff --git a/recipes/pandora-system/pandora-first-run-wizard.bb b/recipes/pandora-system/pandora-first-run-wizard.bb
index abbbd30..1ff6c50 100755 (executable)
--- a/recipes/pandora-system/pandora-first-run-wizard.bb
+++ b/recipes/pandora-system/pandora-first-run-wizard.bb
@@ -6,7 +6,7 @@ RDEPENDS = "hsetroot zenity dbus pandora-wallpaper-official tslib tslib-calibrat
 
 COMPATIBLE_MACHINE = "omap3-pandora"
 
 
 COMPATIBLE_MACHINE = "omap3-pandora"
 

-PR = "r41"
+PR = "r42"

 
 SRC_URI = " \
           file://first-run-wizard.sh \
 
 SRC_URI = " \
           file://first-run-wizard.sh \

diff --git a/recipes/pandora-system/pandora-first-run-wizard/first-run-wizard.sh b/recipes/pandora-system/pandora-first-run-wizard/first-run-wizard.sh
index 3ae54c3..77273d2 100755 (executable)
--- a/recipes/pandora-system/pandora-first-run-wizard/first-run-wizard.sh
+++ b/recipes/pandora-system/pandora-first-run-wizard/first-run-wizard.sh
@@ -221,7 +221,7 @@ hwclock -u -w
 
 
 #Let's ask the user about clockspeed
 
 
 #Let's ask the user about clockspeed

-while ! cpusel=$(zenity --title="Optional settings" --width="400" --height="350" --list --column "id" --column "Please select" --hide-column=1 --text="The CPU of the Pandora supports different speed settings.\nHigher speeds might make some units unstable and decrease the lifetime of your CPU.\n\nBelow are some quick profiles which will help you to configure your system the way you like it.\n" "1100" "Clockspeed: 1,1Ghz, OPP5 (should be stable on 1GHz units)" "1000" "Clockspeed: 1GHz, OPP5 (most probably unstable on 600Mhz units)" "8003" "Clockspeed: 800MHz, OPP3 (Stable on 1GHz units, probably unstable on 600MHz units)" "800" "Clockspeed: 800MHz, OPP5 (600MHz units only, should be stable on all units)" "600" "Clockspeed: 600MHz, OPP3 (600 MHz units only)" --ok-label="Select CPU Profile" ); do
+while ! cpusel=$(zenity --title="Optional settings" --width="400" --height="350" --list --column "id" --column "Please select" --hide-column=1 --text="The CPU of the Pandora supports different speed settings.\nHigher speeds might make some units unstable and decrease the lifetime of your CPU.\n\nBelow are some quick profiles which will help you to configure your system the way you like it.\n" "1100" "Clockspeed: 1,1Ghz, OPP5 (should be stable on 1GHz units)" "1000" "Clockspeed: 1GHz, OPP5 (most probably unstable on 600Mhz units)" "800" "Clockspeed: 800MHz, OPP5 (should be stable on all units)" "600" "Clockspeed: 600MHz, OPP3 (600 MHz units only)" --ok-label="Select CPU Profile" ); do

     zenity --title="Error" --error --text="Please select your desired CPU Speed profile." --timeout=6
 done
 
     zenity --title="Error" --error --text="Please select your desired CPU Speed profile." --timeout=6
 done
 


@@ -253,15 +253,6 @@ case $cpusel in
   default_cpu=800
   ;;
 
   default_cpu=800
   ;;
 

-  "8003")
-  echo 3 > /proc/pandora/cpu_opp_max
-  sed -i "s/.*maxopp.*/maxopp:3/g" /etc/pandora/conf/cpu.conf
-  sed -i "s/.*max:.*/max:900/g" /etc/pandora/conf/cpu.conf
-  sed -i "s/.*default.*/default:800/g" /etc/pandora/conf/cpu.conf
-  sed -i "s/.*safe.*/safe:800/g" /etc/pandora/conf/cpu.conf
-  /usr/pandora/scripts/op_cpuspeed.sh -n 800
-  zenity --info --title="CPU Speed set" --text "The maximum CPU Speed has been set to 800MHz." --timeout 6
-  ;;

 
 
   "600")
 
 
   "600")