options: add command line option for dtb file

diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py
index fb3a5408f715539e57efbf865a3c659f604c6037..99b5c7967ef739d542e9d34bdf8a1421073a2d97 100644 (file)
--- a/configs/common/FSConfig.py
+++ b/configs/common/FSConfig.py
@@ -227,7 +227,8 @@ def makeSparcSystem(mem_mode, mdesc = None):
 
     return self
 
-def makeArmSystem(mem_mode, machine_type, mdesc = None, bare_metal=False):
+def makeArmSystem(mem_mode, machine_type, mdesc = None, dtb_filename = None,
+                  bare_metal=False):
     assert machine_type
 
     if bare_metal:
@@ -279,6 +280,8 @@ def makeArmSystem(mem_mode, machine_type, mdesc = None, bare_metal=False):
         self.mem_ranges = [self.physmem.range]
     else:
         self.kernel = binary('vmlinux.arm.smp.fb.2.6.38.8')
+        if dtb_filename is not None:
+            self.dtb_filename = dtb_filename
         self.machine_type = machine_type
         if convert.toMemorySize(mdesc.mem()) > int(self.realview.max_mem_size):
             print "The currently selected ARM platforms doesn't support"

diff --git a/configs/common/Options.py b/configs/common/Options.py
index 63951950f9a24e66b9eb1a3b0957b547f40c744a..bdc0a8c304163d3edbf99e67106cdade14ce26c7 100644 (file)
--- a/configs/common/Options.py
+++ b/configs/common/Options.py
@@ -173,6 +173,9 @@ def addFSOptions(parser):
                    help="Provide the raw system without the linux specific bits")
         parser.add_option("--machine-type", action="store", type="choice",
                 choices=ArmMachineType.map.keys(), default="RealView_PBX")
+        parser.add_option("--dtb-filename", action="store", type="string",
+              help="Specifies device tree blob file to use with device-tree-"\
+              "enabled kernels")
     # Benchmark options
     parser.add_option("--dual", action="store_true",
                       help="Simulate two systems attached with an ethernet link")

diff --git a/configs/example/fs.py b/configs/example/fs.py
index b938cb96c74a6e0c87609ca009a2a8a3a6d74751..73b0acbfb29cd7c3934b518f55bdc465c9be651d 100644 (file)
--- a/configs/example/fs.py
+++ b/configs/example/fs.py
@@ -101,9 +101,8 @@ elif buildEnv['TARGET_ISA'] == "sparc":
 elif buildEnv['TARGET_ISA'] == "x86":
     test_sys = makeLinuxX86System(test_mem_mode, options.num_cpus, bm[0])
 elif buildEnv['TARGET_ISA'] == "arm":
-    test_sys = makeArmSystem(test_mem_mode,
-            options.machine_type, bm[0],
-            bare_metal=options.bare_metal)
+    test_sys = makeArmSystem(test_mem_mode, options.machine_type, bm[0],
+            options.dtb_filename, bare_metal=options.bare_metal)
 else:
     fatal("Incapable of building %s full system!", buildEnv['TARGET_ISA'])