system.cc (9405:c0a0593510db) system.cc (9538:182d67b5b57a)
1/*
2 * Copyright (c) 2010-2012 ARM Limited
3 * All rights reserved
4 *
5 * The license below extends only to copyright in the software and shall
6 * not be construed as granting a license to any other intellectual
7 * property including but not limited to intellectual property relating
8 * to a hardware implementation of the functionality of the software

--- 31 unchanged lines hidden (view full) ---

40 * Authors: Ali Saidi
41 */
42
43#include "arch/arm/linux/atag.hh"
44#include "arch/arm/linux/system.hh"
45#include "arch/arm/isa_traits.hh"
46#include "arch/arm/utility.hh"
47#include "arch/generic/linux/threadinfo.hh"
1/*
2 * Copyright (c) 2010-2012 ARM Limited
3 * All rights reserved
4 *
5 * The license below extends only to copyright in the software and shall
6 * not be construed as granting a license to any other intellectual
7 * property including but not limited to intellectual property relating
8 * to a hardware implementation of the functionality of the software

--- 31 unchanged lines hidden (view full) ---

40 * Authors: Ali Saidi
41 */
42
43#include "arch/arm/linux/atag.hh"
44#include "arch/arm/linux/system.hh"
45#include "arch/arm/isa_traits.hh"
46#include "arch/arm/utility.hh"
47#include "arch/generic/linux/threadinfo.hh"
48#include "base/loader/dtb_object.hh"
48#include "base/loader/object_file.hh"
49#include "base/loader/symtab.hh"
50#include "cpu/base.hh"
51#include "cpu/pc_event.hh"
52#include "cpu/thread_context.hh"
53#include "debug/Loader.hh"
54#include "kern/linux/events.hh"
55#include "mem/fs_translating_port_proxy.hh"

--- 82 unchanged lines hidden (view full) ---

138 // Kernel supports flattened device tree and dtb file specified.
139 // Using Device Tree Blob to describe system configuration.
140 inform("Loading DTB file: %s\n", params()->dtb_filename);
141
142 ObjectFile *dtb_file = createObjectFile(params()->dtb_filename, true);
143 if (!dtb_file) {
144 fatal("couldn't load DTB file: %s\n", params()->dtb_filename);
145 }
49#include "base/loader/object_file.hh"
50#include "base/loader/symtab.hh"
51#include "cpu/base.hh"
52#include "cpu/pc_event.hh"
53#include "cpu/thread_context.hh"
54#include "debug/Loader.hh"
55#include "kern/linux/events.hh"
56#include "mem/fs_translating_port_proxy.hh"

--- 82 unchanged lines hidden (view full) ---

139 // Kernel supports flattened device tree and dtb file specified.
140 // Using Device Tree Blob to describe system configuration.
141 inform("Loading DTB file: %s\n", params()->dtb_filename);
142
143 ObjectFile *dtb_file = createObjectFile(params()->dtb_filename, true);
144 if (!dtb_file) {
145 fatal("couldn't load DTB file: %s\n", params()->dtb_filename);
146 }
147
148 DtbObject *_dtb_file = dynamic_cast<DtbObject*>(dtb_file);
149
150 if (_dtb_file) {
151 if (!_dtb_file->addBootCmdLine(params()->boot_osflags.c_str(),
152 params()->boot_osflags.size())) {
153 warn("couldn't append bootargs to DTB file: %s\n",
154 params()->dtb_filename);
155 }
156 } else {
157 warn("dtb_file cast failed; couldn't append bootargs "
158 "to DTB file: %s\n", params()->dtb_filename);
159 }
160
146 dtb_file->setTextBase(params()->atags_addr);
147 dtb_file->loadSections(physProxy);
148 delete dtb_file;
149 } else {
150 // Using ATAGS
151 // Warn if the kernel supports FDT and we haven't specified one
152 if (kernel_has_fdt_support) {
153 assert(!dtb_file_specified);

--- 162 unchanged lines hidden --- 		161 dtb_file->setTextBase(params()->atags_addr);
162 dtb_file->loadSections(physProxy);
163 delete dtb_file;
164 } else {
165 // Using ATAGS
166 // Warn if the kernel supports FDT and we haven't specified one
167 if (kernel_has_fdt_support) {
168 assert(!dtb_file_specified);

--- 162 unchanged lines hidden ---