i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM: u-boot: fixup FDT handling

Browse Source 
If we find an FDT (either from uImage or otherwise) we make sure
we map it after mmu_init() and use kernel_args to pass it to the
kernel (so it is available at all times there).
This commit is contained in:
Ithamar R. Adema
2014-10-31 11:21:38 +01:00
parent b794d1f947
commit 1628632584
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/boot/platform/u-boot/start.cpp
+10 -12
View File
@@ -98,10 +98,11 @@ platform_start_kernel(void)
addr_t stackTop addr_t stackTop
= gKernelArgs.cpu_kstack[0].start + gKernelArgs.cpu_kstack[0].size; = gKernelArgs.cpu_kstack[0].start + gKernelArgs.cpu_kstack[0].size;
// clone the Flattened Device Tree blob into the kernel args if we've got it
if (gFDT) { if (gFDT) {
// clone the Flattened Device Tree blob size_t fdtSize = fdt_totalsize(gFDT);
gKernelArgs.platform_args.fdt = kernel_args_malloc(fdt_totalsize(gFDT)); gKernelArgs.platform_args.fdt = kernel_args_malloc(fdtSize);
memcpy(gKernelArgs.platform_args.fdt, gFDT, fdt_totalsize(gFDT)); memcpy(gKernelArgs.platform_args.fdt, gFDT, fdtSize);
} }
// smp_init_other_cpus(); // smp_init_other_cpus();
@@ -203,15 +204,6 @@ start_raw(int argc, const char **argv)
cpu_init(); cpu_init();
if (args.platform.fdt_data) {
dprintf("Found FDT from uimage @ %p, %" B_PRIu32 " bytes\n",
args.platform.fdt_data, args.platform.fdt_size);
} else if (gFDT) {
/* Fixup args so we can pass the gFDT on to the kernel */
args.platform.fdt_data = gFDT;
args.platform.fdt_size = fdt_totalsize(gFDT);
}
// if we get passed an FDT, check /chosen for initrd and bootargs // if we get passed an FDT, check /chosen for initrd and bootargs
if (gFDT != NULL) { if (gFDT != NULL) {
int node = fdt_path_offset(gFDT, "/chosen"); int node = fdt_path_offset(gFDT, "/chosen");
@@ -277,6 +269,9 @@ start_raw(int argc, const char **argv)
// ARMv5 targets have very little by default. TODO get from FDT! // ARMv5 targets have very little by default. TODO get from FDT!
insert_physical_memory_range(SDRAM_BASE, 32 * 1024 * 1024); insert_physical_memory_range(SDRAM_BASE, 32 * 1024 * 1024);
// save the size of the FDT so we can map it easily after mmu_init
size_t fdtSize = gFDT ? fdt_totalsize(gFDT) : 0;
mmu_init(); mmu_init();
// Handle our tarFS post-mmu // Handle our tarFS post-mmu
@@ -285,6 +280,9 @@ start_raw(int argc, const char **argv)
args.platform.boot_tgz_data, args.platform.boot_tgz_size, args.platform.boot_tgz_data, args.platform.boot_tgz_size,
kDefaultPageFlags); kDefaultPageFlags);
} }
// .. and our FDT
if (gFDT != NULL)
gFDT = (void*)mmu_map_physical_memory((addr_t)gFDT, fdtSize, kDefaultPageFlags);
// wait a bit to give the user the opportunity to press a key // wait a bit to give the user the opportunity to press a key
// spin(750000); // spin(750000);