system.cc (10037:5cac77888310) system.cc (10508:aa46a8ae3487)
1/*
2 * Copyright (c) 2010-2013 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

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

170 warn("couldn't append bootargs to DTB file: %s\n",
171 params()->dtb_filename);
172 }
173 } else {
174 warn("dtb_file cast failed; couldn't append bootargs "
175 "to DTB file: %s\n", params()->dtb_filename);
176 }
177
1/*
2 * Copyright (c) 2010-2013 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

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

170 warn("couldn't append bootargs to DTB file: %s\n",
171 params()->dtb_filename);
172 }
173 } else {
174 warn("dtb_file cast failed; couldn't append bootargs "
175 "to DTB file: %s\n", params()->dtb_filename);
176 }
177
178 Addr ra = _dtb_file->findReleaseAddr();
179 if (ra)
180 bootReleaseAddr = ra & ~ULL(0x7F);
181
178 dtb_file->setTextBase(params()->atags_addr + loadAddrOffset);
179 dtb_file->loadSections(physProxy);
180 delete dtb_file;
181 } else {
182 // Using ATAGS
183 // Warn if the kernel supports FDT and we haven't specified one
184 if (kernel_has_fdt_support) {
185 assert(!dtb_file_specified);

--- 164 unchanged lines hidden --- 		182 dtb_file->setTextBase(params()->atags_addr + loadAddrOffset);
183 dtb_file->loadSections(physProxy);
184 delete dtb_file;
185 } else {
186 // Using ATAGS
187 // Warn if the kernel supports FDT and we haven't specified one
188 if (kernel_has_fdt_support) {
189 assert(!dtb_file_specified);

--- 164 unchanged lines hidden ---