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

arm/mailbox: Load mailbox base from FDT in loader

Browse Source
This commit is contained in:
Alexander von Gluck IV
2015-03-28 16:56:50 -05:00
parent f5e61f7174
commit 115ac6bcae
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/boot/platform/u-boot/arch/arm/Jamfile
+1
View File
@@ -4,6 +4,7 @@ SubDirHdrs $(HAIKU_TOP) src system boot platform $(TARGET_BOOT_PLATFORM) ;
SubDirHdrs $(HAIKU_TOP) src system boot arch $(TARGET_KERNEL_ARCH) ; SubDirHdrs $(HAIKU_TOP) src system boot arch $(TARGET_KERNEL_ARCH) ;
UsePrivateSystemHeaders ; UsePrivateSystemHeaders ;
UsePrivateHeaders kernel [ FDirName kernel platform u-boot ] ;
UsePrivateHeaders kernel [ FDirName kernel arch $(TARGET_KERNEL_ARCH) ] UsePrivateHeaders kernel [ FDirName kernel arch $(TARGET_KERNEL_ARCH) ]
[ FDirName kernel boot platform $(HAIKU_BOOT_PLATFORM) ] ; [ FDirName kernel boot platform $(HAIKU_BOOT_PLATFORM) ] ;
UsePrivateHeaders [ FDirName kernel arch $(TARGET_KERNEL_ARCH) board $(TARGET_BOOT_BOARD) ] ; UsePrivateHeaders [ FDirName kernel arch $(TARGET_KERNEL_ARCH) board $(TARGET_BOOT_BOARD) ] ;
src/system/boot/platform/u-boot/arch/arm/arch_mailbox.cpp
+6 -2
View File
@@ -11,16 +11,20 @@
#include <board_config.h> #include <board_config.h>
#include "fdt_support.h"
ArchMailbox *gMailbox = NULL; ArchMailbox *gMailbox = NULL;
extern void* gFDT;
extern "C" status_t extern "C" status_t
arch_mailbox_init() arch_mailbox_init()
{ {
#if defined(BOARD_CPU_BCM2835) || defined(BOARD_CPU_BCM2836) #if defined(BOARD_CPU_BCM2835) || defined(BOARD_CPU_BCM2836)
extern ArchMailbox *arch_get_mailbox_arm_bcm2835(addr_t base); extern ArchMailbox *arch_get_mailbox_arm_bcm2835(addr_t base);
gMailbox = arch_get_mailbox_arm_bcm2835(DEVICE_BASE + ARM_CTRL_0_MAILBOX_BASE); phys_addr_t mboxBase = fdt_get_device_reg_byname(gFDT, "/axi/mbox");
if (mboxBase) {
gMailbox = arch_get_mailbox_arm_bcm2835(mboxBase);
}
#endif #endif
return B_OK; return B_OK;
} }
src/system/boot/platform/u-boot/start.cpp
+9 -6
View File
@@ -217,16 +217,17 @@ start_gen(int argc, const char **argv, struct image_header *uimage, void *fdt)
// We have to cpu_init *before* calling FDT functions // We have to cpu_init *before* calling FDT functions
cpu_init(); cpu_init();
serial_init(gFDT);
#if defined(__ARM__) #if defined(__ARM__)
arch_mailbox_init(); arch_mailbox_init();
#endif #endif
console_init();
serial_init(gFDT);
// initialize the OpenFirmware wrapper // initialize the OpenFirmware wrapper
of_init(NULL); of_init(NULL);
console_init();
// 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");
@@ -267,9 +268,10 @@ start_gen(int argc, const char **argv, struct image_header *uimage, void *fdt)
dprintf("argv[%d] @%lx = '%s'\n", i, (uint32)argv[i], argv[i]); dprintf("argv[%d] @%lx = '%s'\n", i, (uint32)argv[i], argv[i]);
dprintf("os: %d\n", (int)gUBootOS); dprintf("os: %d\n", (int)gUBootOS);
dprintf("gd @ %p\n", gUBootGlobalData); dprintf("gd @ %p\n", gUBootGlobalData);
if (gUBootGlobalData) if (gUBootGlobalData) {
dprintf("gd->bd @ %p\n", gUBootGlobalData->bd); dprintf("gd->bd @ %p\n", gUBootGlobalData->bd);
//dprintf("fb_base %p\n", (void*)gUBootGlobalData->fb_base); dprintf("gd->fb_base @ %p\n", (void*)gUBootGlobalData->fb_base);
}
if (gUImage) if (gUImage)
dump_uimage(gUImage); dump_uimage(gUImage);
if (gFDT) if (gFDT)
@@ -283,6 +285,7 @@ start_gen(int argc, const char **argv, struct image_header *uimage, void *fdt)
// save the size of the FDT so we can map it easily after mmu_init // save the size of the FDT so we can map it easily after mmu_init
size_t fdtSize = gFDT ? fdt_totalsize(gFDT) : 0; size_t fdtSize = gFDT ? fdt_totalsize(gFDT) : 0;
dprintf("fdtSize: 0x%" B_PRIxSIZE "\n", fdtSize);
mmu_init(); mmu_init();
@@ -314,7 +317,7 @@ start_gen(int argc, const char **argv, struct image_header *uimage, void *fdt)
args.arguments_count = 1; args.arguments_count = 1;
} }
} }
dprintf("args.arguments_count = %d\n", args.arguments_count); dprintf("args.arguments_count = %" B_PRId32 "\n", args.arguments_count);
for (int i = 0; i < args.arguments_count; i++) for (int i = 0; i < args.arguments_count; i++)
dprintf("args.arguments[%d] @%lx = '%s'\n", i, dprintf("args.arguments[%d] @%lx = '%s'\n", i,
(uint32)args.arguments[i], args.arguments[i]); (uint32)args.arguments[i], args.arguments[i]);