summaryrefslogtreecommitdiff
path: root/src/base/loader/object_file.cc
diff options
context:
space:
mode:
authorAnthony Gutierrez <atgutier@umich.edu>2013-02-15 18:48:59 -0500
committerAnthony Gutierrez <atgutier@umich.edu>2013-02-15 18:48:59 -0500
commitf7107fb7954b45547ab792493e86760cf6fe33ed (patch)
tree3beddab45393dc5dd5799c6f5346e73fa8a5b52e /src/base/loader/object_file.cc
parentba983f9387a703f3be8149382d4f0dcfb2009b6c (diff)
downloadgem5-f7107fb7954b45547ab792493e86760cf6fe33ed.tar.xz
loader: add a flattened device tree blob (dtb) object
this adds a dtb_object so the loader can load in the dtb file for linux/android ARM kernels.
Diffstat (limited to 'src/base/loader/object_file.cc')
-rw-r--r--src/base/loader/object_file.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/base/loader/object_file.cc b/src/base/loader/object_file.cc
index 80fc9c2f9..b9f84283b 100644
--- a/src/base/loader/object_file.cc
+++ b/src/base/loader/object_file.cc
@@ -39,6 +39,7 @@
#include <string>
#include "base/loader/aout_object.hh"
+#include "base/loader/dtb_object.hh"
#include "base/loader/ecoff_object.hh"
#include "base/loader/elf_object.hh"
#include "base/loader/object_file.hh"
@@ -140,6 +141,10 @@ createObjectFile(const string &fname, bool raw)
return fileObj;
}
+ if ((fileObj = DtbObject::tryFile(fname, fd, len, fileData)) != NULL) {
+ return fileObj;
+ }
+
if (raw)
return RawObject::tryFile(fname, fd, len, fileData);