3 files changed, 56 insertions, 3 deletions

diff --git a/tools/buildzip.pl b/tools/buildzip.pl
index ed937d42e4..e17c2f0712 100755
--- a/tools/buildzip.pl
+++ b/tools/buildzip.pl
@@ -201,7 +201,7 @@ sub make_install {
     @files = readdir(DIR);
     closedir(DIR);
 
-    foreach my $file (grep (/[a-zA-Z]+\.(txt|config|ignnore)/,@files)) {
+    foreach my $file (grep (/[a-zA-Z]+\.(txt|config|ignore|sh)/,@files)) {
         glob_install("$src/$file", "$userdir/");
     }
     return 1;
@@ -423,6 +423,11 @@ sub buildzip {
     # create the file so the database does not try indexing a folder
     open(IGNORE, ">$temp_dir/database.ignore")  || die "can't open database.ignore";
     close(IGNORE);
+
+    # the samsung ypr0 has a loader script that's needed in the zip
+    if ($modelname =~ /samsungypr0/) {
+        glob_copy("$ROOT/utils/ypr0tools/rockbox.sh", "$temp_dir/");
+    }
     
     glob_mkdir("$temp_dir/langs");
     glob_mkdir("$temp_dir/rocks");
diff --git a/tools/configure b/tools/configure
index 895aca8025..1cb4c5b240 100755
--- a/tools/configure
+++ b/tools/configure
@@ -647,6 +647,26 @@ pandoracc () {
  GCCOPTS="$GCCOPTS -ffast-math -fsingle-precision-constant"
 }
 
+ypr0cc () {
+
+ GCCOPTS=`echo $CCOPTS | sed -e s/-ffreestanding// -e s/-nostdlib//`
+ GCCOPTIMIZE=''
+ LDOPTS="-lasound -lpthread -lm -ldl -lrt $LDOPTS"
+ GLOBAL_LDOPTS="$GLOBAL_LDOPTS -Wl,-z,defs"
+ SHARED_LDFLAG="-shared"
+ SHARED_CFLAGS=''
+ endian="little"
+ thread_support="HAVE_SIGALTSTACK_THREADS"
+ app_type="ypr0"
+
+ # Include path
+ GCCOPTS="$GCCOPTS  -D_GNU_SOURCE=1 -U_FORTIFY_SOURCE -D_REENTRANT"
+
+ # Set up compiler
+ gccchoice="4.4.6"
+ prefixtools "arm-ypr0-linux-gnueabi-"
+}
+
 androidcc () {
     if [ -z "$ANDROID_SDK_PATH" ]; then
         echo "ERROR: You need the Android SDK installed and have the ANDROID_SDK_PATH"
@@ -1290,7 +1310,7 @@ cat <<EOF
  202) Nokia N8xx                                 131) Mini2440
  203) Nokia N900          ==ROCKCHIP==           ==HiFiMAN==
  204) Pandora             180) rk27xx generic    190) HM-60x
-                                                 191) HM-801
+ 205) Samsung YP-R0                              191) HM-801
 
 EOF
 
@@ -3228,6 +3248,30 @@ fi
     t_model="app"
     ;;
 
+   205|samsungypr0)
+    application="yes"
+    target_id=78
+    modelname="samsungypr0"
+    target="SAMSUNG_YPR0"
+    app_set_lcd_size 240 320
+    memory=32
+    uname=`uname`
+    ypr0cc
+    tool="cp "
+    boottool="cp "
+    bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
+    bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
+    output="rockbox"
+    bootoutput="rockbox"
+    appextra="recorder:gui:radio"
+    plugins="yes"
+    swcodec="yes"
+    # architecture, manufacturer and model for the target-tree build
+    t_cpu="hosted"
+    t_manufacturer="ypr0"
+    t_model="app"
+    ;;
+
    *)
     echo "Please select a supported target platform!"
     exit 7
@@ -3473,7 +3517,7 @@ gccver=`$CC -dumpversion`;
 if [ $uname = "Darwin" ]; then
  ldver=`$LD -v 2>&1 | sed -e 's/[^0-9.-]//g'`
 else
- ldver=`$LD --version | head -n 1 | sed -e 's/[^0-9.]//g'`
+ ldver=`$LD --version | head -n 1 | sed -e 's/\ /\n/g' | tail -n 1`
 fi
 
 if [ -z "$gccver" ]; then
diff --git a/tools/root.make b/tools/root.make
index f97588f158..dd827d6d3f 100644
--- a/tools/root.make
+++ b/tools/root.make
@@ -102,6 +102,10 @@ else
     include $(ROOTDIR)/uisimulator/uisimulator.make
   endif
 
+  ifneq (,$(findstring ypr0,$(APP_TYPE)))
+    include $(ROOTDIR)/firmware/target/hosted/ypr0/ypr0.make
+  endif
+
   ifneq (,$(findstring android, $(APP_TYPE)))
         include $(ROOTDIR)/android/android.make
   endif