hrev52229 adds 2 changesets to branch 'master'
old head: a6cb002e99924f51b179bf0d8f19e2b872712573
new head: 9ae04563d61cd856d8a61c775e421de8b3a0056d
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=9ae04563d61c+%5Ea6cb002e9992
----------------------------------------------------------------------------
b795602253f7: boot/mmu: Fix hrev52228. No returns from mmu_identity_map.
* Pretty sure Jam didn't compile the changes to this file.
Change-Id: I9dccd24e523d5bd575565f1768314a9d8f2be1ab
9ae04563d61c: framebuffer/bcm2835: Check for available mailbox
Change-Id: I6f158335c4bdda108c13c26f62bfd8d814ea1b3f
[ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 6 insertions(+), 3 deletions(-)
src/system/boot/arch/arm/arch_framebuffer_bcm2835.cpp | 5 +++++
src/system/boot/arch/arm/arch_mmu.cpp | 4 +---
############################################################################
Commit: b795602253f7e431cffd220bae9fcbedacc860a3
URL: https://git.haiku-os.org/haiku/commit/?id=b795602253f7
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Tue Aug 14 21:26:51 2018 UTC
boot/mmu: Fix hrev52228. No returns from mmu_identity_map.
* Pretty sure Jam didn't compile the changes to this file.
Change-Id: I9dccd24e523d5bd575565f1768314a9d8f2be1ab
----------------------------------------------------------------------------
diff --git a/src/system/boot/arch/arm/arch_mmu.cpp
b/src/system/boot/arch/arm/arch_mmu.cpp
index d49de968cd..7da9a269e6 100644
--- a/src/system/boot/arch/arm/arch_mmu.cpp
+++ b/src/system/boot/arch/arm/arch_mmu.cpp
@@ -409,9 +409,7 @@ fdt_map_memory_ranges(const char* path, bool physical =
false)
return B_ERROR;
}
} else {
- if (mmu_map_identity(base, base + size,
ARM_MMU_L2_FLAG_B)) {
- dprintf("cannot identity map memory range!");
- return B_ERROR;
+ mmu_map_identity(base, base + size, ARM_MMU_L2_FLAG_B);
}
}
############################################################################
Revision: hrev52229
Commit: 9ae04563d61cd856d8a61c775e421de8b3a0056d
URL: https://git.haiku-os.org/haiku/commit/?id=9ae04563d61c
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Tue Aug 14 21:58:17 2018 UTC
framebuffer/bcm2835: Check for available mailbox
Change-Id: I6f158335c4bdda108c13c26f62bfd8d814ea1b3f
----------------------------------------------------------------------------
diff --git a/src/system/boot/arch/arm/arch_framebuffer_bcm2835.cpp
b/src/system/boot/arch/arm/arch_framebuffer_bcm2835.cpp
index dcbc48c1a3..47ff79c451 100644
--- a/src/system/boot/arch/arm/arch_framebuffer_bcm2835.cpp
+++ b/src/system/boot/arch/arm/arch_framebuffer_bcm2835.cpp
@@ -77,6 +77,11 @@ arch_get_fb_arm_bcm2835(addr_t base)
status_t
ArchFBArmBCM2835::Init()
{
+ if (gMailbox == NULL) {
+ dprintf("ERROR: Broadcom mailbox is unavailable!");
+ return B_ERROR;
+ }
+
gKernelArgs.frame_buffer.enabled = true;
return B_OK;
}
