3 files changed, 37 insertions, 2 deletions

diff --git a/tools/builds.pm b/tools/builds.pm
index d46aa83495..6f0c4d0445 100644
--- a/tools/builds.pm
+++ b/tools/builds.pm
@@ -444,6 +444,10 @@ $releasenotes="/wiki/ReleaseNotes315";
         name => 'xDuoo X20',
         status => 2,
     },
+    'fiiom3k' => {
+        name => 'FiiO M3K',
+        status => 1,
+    },
     'ihifi770' => {
         name => 'Xuelin iHIFI 770',
         status => 2,
@@ -671,5 +675,4 @@ sub voicesforlang($) {
     return @list;
 }
 
-
 1;
diff --git a/tools/configure b/tools/configure
index 9e29d84ed8..f5fb6351c0 100755
--- a/tools/configure
+++ b/tools/configure
@@ -1588,7 +1588,8 @@ cat <<EOF
                           251) 770               226) NWZ-A10 series
  ==AgpTek==               252) 800               227) NW-A20 series
  240) Rocker                                     228) NWZ-A860 series
-                                                 229) NWZ-S750 series
+                          ==FiiO==               229) NWZ-S750 series
+                          244) M3K
 
 EOF
 
@@ -4055,6 +4056,7 @@ fi
     t_cpu="hosted"
     t_manufacturer="xduoo"
     t_model="xduoo_x3ii"
+#    sysfont="20-Terminus-Bold"
     ;;
 
     243|xduoox20)
@@ -4077,6 +4079,30 @@ fi
     t_cpu="hosted"
     t_manufacturer="xduoo"
     t_model="xduoo_x20"
+#    sysfont="20-Terminus-Bold"
+    ;;
+
+    244|fiiom3k)
+    application="yes"
+    app_type="fiio"
+    target_id=112
+    modelname="fiiom3k"
+    target="FIIO_M3K"
+    memory=16 # XXX Can probably go over 32?
+    tool="cp "
+    boottool="cp "
+    bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
+    bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
+    output="rockbox.m3k"
+    bootoutput="bootloader.m3k"
+    appextra="recorder:gui:hosted"
+    plugins="yes"
+    # architecture, manufacturer and model for the target-tree build
+    t_cpu="hosted"
+    t_manufacturer="fiio"
+    t_model="m3k"
+    mipsellinuxcc
+#    sysfont="20-Terminus-Bold"
     ;;
 
    250|ihifi770c)
diff --git a/tools/root.make b/tools/root.make
index b588e0f8b1..fd42f9b6b2 100644
--- a/tools/root.make
+++ b/tools/root.make
@@ -104,6 +104,8 @@ ifneq (,$(findstring bootloader,$(APPSDIR)))
     include $(ROOTDIR)/firmware/target/hosted/agptek/rocker.make
   else ifneq (,$(findstring xduoo,$(APP_TYPE)))
     include $(ROOTDIR)/firmware/target/hosted/xduoo/xduoo.make
+  else ifneq (,$(findstring fiio,$(APP_TYPE)))
+    include $(ROOTDIR)/firmware/target/hosted/fiio/fiio.make
   else
     include $(APPSDIR)/bootloader.make
   endif
@@ -150,6 +152,10 @@ else # core
     include $(ROOTDIR)/firmware/target/hosted/xduoo/xduoo.make
   endif
 
+  ifneq (,$(findstring fiio,$(APP_TYPE)))
+    include $(ROOTDIR)/firmware/target/hosted/fiio/fiio.make
+  endif
+
   ifneq (,$(findstring android_ndk, $(APP_TYPE)))
     include $(ROOTDIR)/firmware/target/hosted/ibasso/android_ndk.make
   else