From 6f742d85f9f907e6c2f69fffca89d029e3fc247b Mon Sep 17 00:00:00 2001 From: Arvind S Raj Date: Fri, 27 Jun 2014 18:07:40 +0530 Subject: [PATCH] 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 --- src/system/boot/platform/u-boot/start.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/system/boot/platform/u-boot/start.cpp b/src/system/boot/platform/u-boot/start.cpp index 2f6a63774c..fd1e951796 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);