summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSoby Mathew <soby.mathew@arm.com>2016-06-09 12:29:39 +0100
committerSandrine Bailleux <sandrine.bailleux@arm.com>2016-07-22 09:36:32 +0100
commit67a927195c29f26130ec6d37e93f3bfc78be32be (patch)
tree8cc24c99bb2c15bbb2789145fbf595d41c1a15bc /include
parent2488d0622b10544a643e4bc9107f109d62869c54 (diff)
Various fixes for console and pl011 driver
This patch fixes the types in console and pl011 driver and also moves the `pl011_console.S` to AArch64 specific folder. The patch also modifies the pl011 console initialization to disables the UART prior to configuration. The platform makefiles are also modified for the new driver location. Change-Id: Ic4acacd200432e61fbeb20f2d3148683764338e4
Diffstat (limited to 'include')
-rw-r--r--include/drivers/console.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/drivers/console.h b/include/drivers/console.h
index f144ab9..0ff3fba 100644
--- a/include/drivers/console.h
+++ b/include/drivers/console.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013-2014, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2013-2016, ARM Limited and Contributors. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
@@ -31,7 +31,9 @@
#ifndef __CONSOLE_H__
#define __CONSOLE_H__
-int console_init(unsigned long base_addr,
+#include <types.h>
+
+int console_init(uintptr_t base_addr,
unsigned int uart_clk, unsigned int baud_rate);
int console_putc(int c);
int console_getc(void);