From ef7bb168f77d9d3537cc0b08bedbe70d50c86924 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Wed, 2 Jan 2013 02:07:06 +0100
Subject: [PATCH] U-Boot: fix warnings

---
 src/system/boot/platform/u-boot/console.cpp | 2 ++
 src/system/boot/platform/u-boot/devices.cpp | 2 +-
 src/system/boot/platform/u-boot/serial.cpp  | 4 ++++
 src/system/boot/platform/u-boot/start.cpp   | 2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/system/boot/platform/u-boot/console.cpp b/src/system/boot/platform/u-boot/console.cpp
index 62293e464c..1ff4694278 100644
--- a/src/system/boot/platform/u-boot/console.cpp
+++ b/src/system/boot/platform/u-boot/console.cpp
@@ -45,10 +45,12 @@ static SerialConsole sSerial;
 FILE *stdin, *stdout, *stderr;
 
 
+/*
 static void
 scroll_up()
 {
 }
+*/
 
 
 //	#pragma mark -
diff --git a/src/system/boot/platform/u-boot/devices.cpp b/src/system/boot/platform/u-boot/devices.cpp
index 650211b6ee..8a77d92713 100644
--- a/src/system/boot/platform/u-boot/devices.cpp
+++ b/src/system/boot/platform/u-boot/devices.cpp
@@ -28,7 +28,7 @@ platform_add_boot_device(struct stage2_args *args, NodeList *devicesList)
 	if (!args->platform.boot_tgz_data || !args->platform.boot_tgz_size)
 		return B_DEVICE_NOT_FOUND;
 
-	TRACE("Memory Disk at: %lx size: %lx\n", args->platform.boot_tgz_data,
+	TRACE("Memory Disk at: %p size: %lx\n", args->platform.boot_tgz_data,
 		args->platform.boot_tgz_size);
 
 	MemoryDisk* disk = new(nothrow) MemoryDisk(
diff --git a/src/system/boot/platform/u-boot/serial.cpp b/src/system/boot/platform/u-boot/serial.cpp
index 27bbb812a1..61093ceb91 100644
--- a/src/system/boot/platform/u-boot/serial.cpp
+++ b/src/system/boot/platform/u-boot/serial.cpp
@@ -165,9 +165,13 @@ serial_init_fdt(const void *fdt)
 		|| fdt_node_check_compatible(fdt, node, "ns16550") == 1) {
 		gUART = arch_get_uart_8250(regs, clock);
 		//dprintf("serial: using 8250\n");
+		// XXX:assume speed is already set
+		(void)speed;
 		return;
 	}
 
+	// for when we can use U-Boot's console
+	panic("Unknown UART type %s", type);
 }
 
 
diff --git a/src/system/boot/platform/u-boot/start.cpp b/src/system/boot/platform/u-boot/start.cpp
index 074e434f07..1bcc0d346f 100644
--- a/src/system/boot/platform/u-boot/start.cpp
+++ b/src/system/boot/platform/u-boot/start.cpp
@@ -115,7 +115,7 @@ platform_start_kernel(void)
 	status_t error = arch_start_kernel(&gKernelArgs, kernelEntry,
 		stackTop);
 
-	panic("kernel returned!\n");
+	panic("kernel returned %lx!\n", error);
 }