diff options
| author | Adrian Herrera <adrian.herrera@arm.com> | 2019-11-14 09:57:13 +0000 |
|---|---|---|
| committer | Giacomo Travaglini <giacomo.travaglini@arm.com> | 2019-12-16 10:33:56 +0000 |
| commit | 0e8ce8b12e614925fdbbf306522e24aa8b05ac91 (patch) | |
| tree | 3f9565dddfd6386308877a39e768ff4ce6ef16c1 | |
| parent | 55c5b66ae48a3a20cf55bbe41048c0c2d217488c (diff) | |
| download | gem5-0e8ce8b12e614925fdbbf306522e24aa8b05ac91.tar.xz | |
sim: kernelExtras if no kernel provided
kernelExtras facilitates a way for users to provide additional
blobs to load into memory. As of now, the creation of the extra
images is done independently of the kernel being provided, but
the loading is only done if the kernel is present.
This patch refactors the loading of extra images to be committed
if no kernel is present.
Change-Id: I900542e1034ade8d757d01823cfd4a30f0b36734
Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/22850
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Gabe Black <gabeblack@google.com>
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Jason Lowe-Power <jason@lowepower.com>
| -rw-r--r-- | src/sim/system.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sim/system.cc b/src/sim/system.cc index 0e7db5964..8c438086b 100644 --- a/src/sim/system.cc +++ b/src/sim/system.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2014,2017-2018 ARM Limited + * Copyright (c) 2011-2014,2017-2019 ARM Limited * All rights reserved * * The license below extends only to copyright in the software and shall @@ -354,14 +354,14 @@ System::initState() } // Load program sections into memory kernelImage.write(physProxy); - for (const auto &extra_kernel : kernelExtras) - extra_kernel->buildImage().move(mapper).write(physProxy); DPRINTF(Loader, "Kernel start = %#x\n", kernelStart); DPRINTF(Loader, "Kernel end = %#x\n", kernelEnd); DPRINTF(Loader, "Kernel entry = %#x\n", kernelEntry); DPRINTF(Loader, "Kernel loaded...\n"); } + for (const auto &extra_kernel : kernelExtras) + extra_kernel->buildImage().move(mapper).write(physProxy); } } |