From bd9497be77424c6d00054a3f4a74cfb936817252 Mon Sep 17 00:00:00 2001
From: David Given <dg@cowlark.com>
Date: Sun, 26 May 2013 00:22:39 +0100
Subject: [PATCH] Renamed the pi-specific functions to be a bit cleaner.

--HG--
branch : dtrg-videocore
rename : plat/rpi/libsys/phys_to_user.s => plat/rpi/libsys/pi_phys_to_user.s
rename : plat/rpi/libsys/uart.s => plat/rpi/libsys/pi_uart.s
rename : plat/rpi/libsys/user_to_phys.s => plat/rpi/libsys/pi_user_to_phys.s
---
 plat/rpi/build.mk                                     | 6 +++---
 plat/rpi/include/pi.h                                 | 6 +++---
 plat/rpi/libsys/{phys_to_user.s => pi_phys_to_user.s} | 4 ++--
 plat/rpi/libsys/{uart.s => pi_uart.s}                 | 4 ++--
 plat/rpi/libsys/{user_to_phys.s => pi_user_to_phys.s} | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)
 rename plat/rpi/libsys/{phys_to_user.s => pi_phys_to_user.s} (89%)
 rename plat/rpi/libsys/{uart.s => pi_uart.s} (98%)
 rename plat/rpi/libsys/{user_to_phys.s => pi_user_to_phys.s} (89%)

diff --git a/plat/rpi/build.mk b/plat/rpi/build.mk
index eb1cd036f..7bbf007e4 100644
--- a/plat/rpi/build.mk
+++ b/plat/rpi/build.mk
@@ -19,9 +19,9 @@ platform-headers := \
 platform-libsys := \
 	_hol0.s \
 	errno.s \
-	phys_to_user.s \
-	user_to_phys.s \
-	uart.s \
+	pi_phys_to_user.s \
+	pi_user_to_phys.s \
+	pi_uart.s \
 	creat.c \
 	close.c \
 	open.c \
diff --git a/plat/rpi/include/pi.h b/plat/rpi/include/pi.h
index a69cdd8d9..b5c54289e 100644
--- a/plat/rpi/include/pi.h
+++ b/plat/rpi/include/pi.h
@@ -9,13 +9,13 @@
 #define PI_H
 
 /* Initialise the mini UART (only do this if running on bare metal! */
-extern void init_uart(void);
+extern void pi_init_uart(void);
 
 /* Converts a pointer from a physical address to a user address. */
-extern void* phys_to_user(void* ptr);
+extern void* pi_phys_to_user(void* ptr);
 
 /* Converts a pointer from a user address to a physical address. */
-extern void* user_to_phys(void* ptr);
+extern void* pi_user_to_phys(void* ptr);
 
 #endif
 
diff --git a/plat/rpi/libsys/phys_to_user.s b/plat/rpi/libsys/pi_phys_to_user.s
similarity index 89%
rename from plat/rpi/libsys/phys_to_user.s
rename to plat/rpi/libsys/pi_phys_to_user.s
index 649b19b5a..d67cac895 100644
--- a/plat/rpi/libsys/phys_to_user.s
+++ b/plat/rpi/libsys/pi_phys_to_user.s
@@ -12,8 +12,8 @@
 
 ! Transforms a physical address into a user address.
 
-.define _phys_to_user
-_phys_to_user:
+.define _pi_phys_to_user
+_pi_phys_to_user:
 	ld r0, 0 (sp)
 	sub r0, gp
 	b lr
diff --git a/plat/rpi/libsys/uart.s b/plat/rpi/libsys/pi_uart.s
similarity index 98%
rename from plat/rpi/libsys/uart.s
rename to plat/rpi/libsys/pi_uart.s
index b12f2efd2..caa9f6f89 100644
--- a/plat/rpi/libsys/uart.s
+++ b/plat/rpi/libsys/pi_uart.s
@@ -38,8 +38,8 @@ AUX_MU_BAUD_REG = 0x7e215068
 
 ! Sets up the mini UART for use as a console.
 
-.define _init_uart
-_init_uart:
+.define _pi_init_uart
+_pi_init_uart:
 	! Configure TX and RX GPIO pins for Mini Uart function.
 	mov	r1, #GPFSEL1
 	ld	r0, (r1)
diff --git a/plat/rpi/libsys/user_to_phys.s b/plat/rpi/libsys/pi_user_to_phys.s
similarity index 89%
rename from plat/rpi/libsys/user_to_phys.s
rename to plat/rpi/libsys/pi_user_to_phys.s
index 7b988fdd6..dd62c069a 100644
--- a/plat/rpi/libsys/user_to_phys.s
+++ b/plat/rpi/libsys/pi_user_to_phys.s
@@ -12,8 +12,8 @@
 
 ! Transforms a user address into a physical address.
 
-.define _user_to_phys
-_user_to_phys:
+.define _pi_user_to_phys
+_pi_user_to_phys:
 	ld r0, 0 (sp)
 	add r0, gp
 	b lr