[haiku-commits] haiku: hrev47436 - in src/system/boot/platform/u-boot: . arch/arm
- From: ithamar@xxxxxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 27 Jun 2014 21:41:53 +0200 (CEST)
hrev47436 adds 2 changesets to branch 'master'
old head: 3eadb2cc1d8b5b797574924ba0046dc223bfa40e
new head: 6f742d85f9f907e6c2f69fffca89d029e3fc247b
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=6f742d8+%5E3eadb2c
----------------------------------------------------------------------------
cf0ba49: Move stack to SDRAM as specified in memory map.
* After initializing the page table and enabling MMU,
the pre-MMU stack becomes invalid leading to a fault.
This was fixed by moving the stack to SDRAM as specified
in LOADER_MEMORYMAP before ARM entry point start_netbsd.
Signed-off-by: Ithamar R. Adema <ithamar@xxxxxxxxxxxxxxxxxxx>
6f742d8: Corrected check to ensure that command line options are indeed passed.
* Currently, no command line options are being passed via u-boot
to haiku. However, the comparison doesn't ensure that cmdline
is not an empty string - it merely ensures cmdline is not null.
Signed-off-by: Ithamar R. Adema <ithamar@xxxxxxxxxxxxxxxxxxx>
[ Arvind S Raj <sraj.arvind@xxxxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 4 insertions(+), 1 deletion(-)
src/system/boot/platform/u-boot/arch/arm/shell.S | 2 ++
src/system/boot/platform/u-boot/start.cpp | 3 ++-
############################################################################
Commit: cf0ba4901dae2b632b8aac9623db663d8ae4869b
URL: http://cgit.haiku-os.org/haiku/commit/?id=cf0ba49
Author: Arvind S Raj <sraj.arvind@xxxxxxxxx>
Date: Fri Jun 27 06:37:41 2014 UTC
Committer: Ithamar R. Adema <ithamar@xxxxxxxxxxxxxxxxxxx>
Commit-Date: Fri Jun 27 19:20:16 2014 UTC
Move stack to SDRAM as specified in memory map.
* After initializing the page table and enabling MMU,
the pre-MMU stack becomes invalid leading to a fault.
This was fixed by moving the stack to SDRAM as specified
in LOADER_MEMORYMAP before ARM entry point start_netbsd.
Signed-off-by: Ithamar R. Adema <ithamar@xxxxxxxxxxxxxxxxxxx>
----------------------------------------------------------------------------
diff --git a/src/system/boot/platform/u-boot/arch/arm/shell.S
b/src/system/boot/platform/u-boot/arch/arm/shell.S
index 660fe2b..69b1ff3 100644
--- a/src/system/boot/platform/u-boot/arch/arm/shell.S
+++ b/src/system/boot/platform/u-boot/arch/arm/shell.S
@@ -2,6 +2,7 @@
#include <asm_defs.h>
+#include <board_config.h>
.text
@@ -61,6 +62,7 @@ SYMBOL(_start_common):
+ ldr sp,=SDRAM_BASE + 0x2000000
ldrb r4,gUBootOS
cmp r4,#0
beq start_raw
############################################################################
Revision: hrev47436
Commit: 6f742d85f9f907e6c2f69fffca89d029e3fc247b
URL: http://cgit.haiku-os.org/haiku/commit/?id=6f742d8
Author: Arvind S Raj <sraj.arvind@xxxxxxxxx>
Date: Fri Jun 27 12:37:40 2014 UTC
Committer: Ithamar R. Adema <ithamar@xxxxxxxxxxxxxxxxxxx>
Commit-Date: Fri Jun 27 19:20:22 2014 UTC
Corrected check to ensure that command line options are indeed passed.
* Currently, no command line options are being passed via u-boot
to haiku. However, the comparison doesn't ensure that cmdline
is not an empty string - it merely ensures cmdline is not null.
Signed-off-by: Ithamar R. Adema <ithamar@xxxxxxxxxxxxxxxxxxx>
----------------------------------------------------------------------------
diff --git a/src/system/boot/platform/u-boot/start.cpp
b/src/system/boot/platform/u-boot/start.cpp
index 2f6a637..fd1e951 100644
--- a/src/system/boot/platform/u-boot/start.cpp
+++ b/src/system/boot/platform/u-boot/start.cpp
@@ -137,7 +137,8 @@ start_netbsd(struct board_info *bd, struct image_header
*image,
{
const char *argv[] = { "haiku", cmdline };
int argc = 1;
- if (cmdline)
+ // TODO: Ensure cmdline is mapped into memory by MMU before usage.
+ if (cmdline && *cmdline)
argc++;
gUImage = image;
return start_raw(argc, argv);
Other related posts:
- » [haiku-commits] haiku: hrev47436 - in src/system/boot/platform/u-boot: . arch/arm - ithamar
