Integrate sockeye with hake

Signed-off-by: Daniel Schwyn <schwyda@student.ethz.ch>

diff --git a/hake/RuleDefs.hs b/hake/RuleDefs.hs
index 8f2a4ae..6e5e283 100644 (file)
--- a/hake/RuleDefs.hs
+++ b/hake/RuleDefs.hs
@@ -780,6 +780,18 @@ skateGenSchemas opts schema =
       ]]
 
 
+--
+-- Build SKB facts from Sockeye file
+--
+sockeyeProgLoc = In InstallTree "tools" "/bin/sockeye"
+sockeyeSpecFileLoc d = In SrcTree "src" ("/socs" </> (d ++ ".soc"))
+sockeyeFactFilePath d = "/sockeyefacts" </> (d ++ ".pl")
+
+sockeye :: String -> HRule
+sockeye net = Rule [ sockeyeProgLoc,
+                     sockeyeSpecFileLoc net,
+                     Str "-o", Out "" (sockeyeFactFilePath net)
+                   ]
 
 --
 -- Build a Fugu library

diff --git a/socs/Hakefile b/socs/Hakefile
new file mode 100644 (file)
index 0000000..3303211
--- /dev/null
+++ b/socs/Hakefile
@@ -0,0 +1,17 @@
+--------------------------------------------------------------------------
+-- Copyright (c) 2017, ETH Zurich.
+-- All rights reserved.
+--
+-- This file is distributed under the terms in the attached LICENSE file.
+-- If you do not find this file, copies can be found by writing to:
+-- ETH Zurich D-INFK, Haldeneggsteig 4, CH-8092 Zurich. Attn: Systems Group.
+--
+-- Hakefile for devices/
+--
+--------------------------------------------------------------------------
+
+[ sockeye f
+  | f <- [ "omap4460",
+           "overlayFail"
+         ]
+]

diff --git a/tools/sockeye/omap4460.soc b/socs/omap4460.soc
similarity index 98%
rename from tools/sockeye/omap4460.soc
rename to socs/omap4460.soc
index 8da44bc..cfdcc96 100644 (file)
--- a/tools/sockeye/omap4460.soc
+++ b/socs/omap4460.soc
@@ -13,7 +13,7 @@
 
 ram is accept [0x80000000/30]
 
-gptimer5 is accept [0x0/12]
+gptimer5 is accept [0x1/12]
 
 l3 is accept [0-0x40000000]
       map [

diff --git a/usr/skb/Hakefile b/usr/skb/Hakefile
index d2a3dd1..837a6f8 100644 (file)
--- a/usr/skb/Hakefile
+++ b/usr/skb/Hakefile
@@ -12,6 +12,7 @@
 
 let ramfs_files = find inDir "programs" ".pl" ++
                   find inDir ("programs" </> "platforms") ".pl"
+    sockeyeFiles = [ "omap4460" ]
     ramdisk = "/skb_ramfs.cpio.gz"
     args arch = application {
                         target = "skb",
@@ -37,5 +38,6 @@ in
     Rule ( [ Str "bash",
              In SrcTree "src" "skripts/mkcpio",
              NoDep SrcTree "src" "", Out "root" ramdisk]
-             ++ [ In SrcTree "src" f | f <- ramfs_files ] )
+             ++ [ In SrcTree "src" f | f <- ramfs_files ]
+             ++ [ In BuildTree "" (sockeyeFactFilePath f) | f <- sockeyeFiles ] )
   ]