diff --git a/include/plat/allwinnerA20/plat/machine/devices.h b/include/plat/allwinnerA20/plat/machine/devices.h
index bef602d96068ee412f76af95530a6ddf7ee576a9..06d71f333d14f7a6b40675fdb5710318b5983c08 100644
--- a/include/plat/allwinnerA20/plat/machine/devices.h
+++ b/include/plat/allwinnerA20/plat/machine/devices.h
@@ -18,7 +18,7 @@
 #define __PLAT_MACHINE_DEVICES_H
 
 /* These devices are used by the seL4 kernel. */
-#define UART0_PPTR                  0xfff01000
+#define UART_PPTR                  0xfff01000
 #define TIMER0_PPTR                 0xfff02000
 #define GIC_DISTRIBUTOR_PPTR        0xfff03000
 #define GIC_CONTROLLER_PPTR         0xfff04000
diff --git a/include/plat/allwinnerA20/plat/machine/hardware.h b/include/plat/allwinnerA20/plat/machine/hardware.h
index 1b70163d91d548f8fd9e3b14980370e4d0e32879..7736ed2d1e6a87961fede581ef287ce963b8dfe0 100755
--- a/include/plat/allwinnerA20/plat/machine/hardware.h
+++ b/include/plat/allwinnerA20/plat/machine/hardware.h
@@ -35,7 +35,7 @@ static const kernel_frame_t BOOT_RODATA kernel_devices[] = {
     {
         /*  UART */
         UART0_PADDR,
-        UART0_PPTR,
+        UART_PPTR,
         true  /* armExecuteNever */
 #endif
     }
diff --git a/include/plat/am335x/plat/machine/devices.h b/include/plat/am335x/plat/machine/devices.h
index fc7946feb1ff06928b14d0b2175f6f2acc6a6f85..8767e429fd753c7ad184887dbc1c65b2997aa6fe 100644
--- a/include/plat/am335x/plat/machine/devices.h
+++ b/include/plat/am335x/plat/machine/devices.h
@@ -13,7 +13,7 @@
 
 /* These devices are used by the kernel. */
 #define INTC_PPTR                       0xfff01000
-#define UART0_PPTR                      0xfff02000
+#define UART_PPTR                      0xfff02000
 #define DMTIMER0_PPTR                   0xfff03000
 #define WDT1_PPTR                       0xfff04000
 #define CMPER_PPTR                      0xfff05000
diff --git a/include/plat/am335x/plat/machine/hardware.h b/include/plat/am335x/plat/machine/hardware.h
index 4d47c521b7b895f7b1fa3d1c60558b16e43ed642..f215aeb75a85a39b3133c5bec92100503d1053b8 100644
--- a/include/plat/am335x/plat/machine/hardware.h
+++ b/include/plat/am335x/plat/machine/hardware.h
@@ -47,7 +47,7 @@ static const kernel_frame_t BOOT_RODATA kernel_devices[] = {
     {
         /*  UART */
         UART0_PADDR,
-        UART0_PPTR,
+        UART_PPTR,
         true  /* armExecuteNever */
 #endif
     }
diff --git a/include/plat/hikey/plat/32/plat_mode/machine/devices.h b/include/plat/hikey/plat/32/plat_mode/machine/devices.h
index 47126e023597097449ba796b3451c5d9c7113fbe..9516d17b6494c49217797f5f6114ab0efde6eee3 100644
--- a/include/plat/hikey/plat/32/plat_mode/machine/devices.h
+++ b/include/plat/hikey/plat/32/plat_mode/machine/devices.h
@@ -14,7 +14,7 @@
 #define __PLAT_MODE_MACHINE_DEVICES_H
 
 /* These devices are used by the seL4 kernel. */
-#define UART0_PPTR                  0xfff01000
+#define UART_PPTR                  0xfff01000
 #define GIC_DISTRIBUTOR_PPTR        0xfff03000
 #define GIC_CONTROLLER_PPTR         0xfff04000
 #define ARM_DEBUG_MMAPPING_PPTR     0xfff05000
diff --git a/include/plat/hikey/plat/64/plat_mode/machine/devices.h b/include/plat/hikey/plat/64/plat_mode/machine/devices.h
index 5e749afc5a9c649dd10121f9f55205dc01d410ed..9a2bf2af033083f9a1d5ea1fab2ddc048c8f68bb 100644
--- a/include/plat/hikey/plat/64/plat_mode/machine/devices.h
+++ b/include/plat/hikey/plat/64/plat_mode/machine/devices.h
@@ -14,7 +14,7 @@
 #define __PLAT_MODE_MACHINE_DEVICES_H
 
 /* These devices are used by the seL4 kernel. */
-#define UART0_PPTR                  0xffffffffffff0000
+#define UART_PPTR                  0xffffffffffff0000
 #define GIC_DISTRIBUTOR_PPTR        0xffffffffffff3000
 #define GIC_CONTROLLER_PPTR         0xffffffffffff4000
 
diff --git a/include/plat/hikey/plat/machine/hardware.h b/include/plat/hikey/plat/machine/hardware.h
index 06cd6fb2e1acaa77d5fc4f89fef5a338b52fb102..dfa7193367e7234a8d641edba167c07f466f85af 100755
--- a/include/plat/hikey/plat/machine/hardware.h
+++ b/include/plat/hikey/plat/machine/hardware.h
@@ -34,7 +34,7 @@ static const kernel_frame_t BOOT_RODATA kernel_devices[] = {
     {
         /*  UART */
         UART0_PADDR,
-        UART0_PPTR,
+        UART_PPTR,
         true  /* armExecuteNever */
 #endif
     }
diff --git a/include/plat/omap3/plat/machine/devices.h b/include/plat/omap3/plat/machine/devices.h
index 48e0dd23c4ee756da6b1e75db98216c83c2abcb2..5412292c1e206082f27d53004916663df5c08dd5 100644
--- a/include/plat/omap3/plat/machine/devices.h
+++ b/include/plat/omap3/plat/machine/devices.h
@@ -19,7 +19,7 @@
 #define __PLAT_MACHINE_DEVICES_H
 
 /* These devices are used by the seL4 kernel. */
-#define UART3_PPTR                     0xfff01000
+#define UART_PPTR                     0xfff01000
 #define INTC_PPTR                      0xfff02000
 #define GPTIMER9_PPTR                  0xfff03000
 #define ARM_DEBUG_MMAPPING_PPTR        0xfff04000
diff --git a/include/plat/omap3/plat/machine/hardware.h b/include/plat/omap3/plat/machine/hardware.h
index d115ee17b5ae3362e554b7f41f3884d751a4ae91..7bc466dc909f0de6c0252a7234c6f9ff2c772f19 100644
--- a/include/plat/omap3/plat/machine/hardware.h
+++ b/include/plat/omap3/plat/machine/hardware.h
@@ -36,7 +36,7 @@ static const kernel_frame_t BOOT_RODATA kernel_devices[] = {
     {
         /*  UART */
         UART3_PADDR,
-        UART3_PPTR,
+        UART_PPTR,
         true  /* armExecuteNever */
 #endif
     }
diff --git a/include/plat/tk1/plat/machine/devices.h b/include/plat/tk1/plat/machine/devices.h
index 520aec52e10f85248407ded4ed3543ccda19e80f..1a4feae6dfab6cf32fbe4258a062090c965ecb11 100644
--- a/include/plat/tk1/plat/machine/devices.h
+++ b/include/plat/tk1/plat/machine/devices.h
@@ -26,6 +26,7 @@
 #define ARM_DEBUG_MMAPPING_PPTR     0xfff08000
 
 
+#define UART_PPTR                   UARTD_PPTR
 #define GIC_PL390_CONTROLLER_PPTR   GIC_CONTROLLER_PPTR
 #define GIC_PL390_DISTRIBUTOR_PPTR  GIC_DISTRIBUTOR_PPTR
 
diff --git a/include/plat/tx1/plat/machine/devices.h b/include/plat/tx1/plat/machine/devices.h
index 66792c591454895946caf2184747af6b9e54e37d..4e0ea3967c8b27323617a5fa180c4f8e6352785d 100644
--- a/include/plat/tx1/plat/machine/devices.h
+++ b/include/plat/tx1/plat/machine/devices.h
@@ -22,7 +22,7 @@
 #define KDEV_PPTR                   0xffffffffffff0000lu
 #endif
 
-#define UARTA_PPTR                  (KDEV_PPTR)
+#define UART_PPTR                  (KDEV_PPTR)
 #define GIC_DISTRIBUTOR_PPTR        (KDEV_PPTR + 0x3000)
 #define GIC_CONTROLLER_PPTR         (KDEV_PPTR + 0x4000)
 #define GICH_PPTR                   (KDEV_PPTR + 0x6000)
diff --git a/include/plat/tx1/plat/machine/hardware.h b/include/plat/tx1/plat/machine/hardware.h
index 2e7f9ca84deae60998112b3da7ccfb21ecaffe25..d62905b280635fb33b523d5ad155dddbce186c21 100644
--- a/include/plat/tx1/plat/machine/hardware.h
+++ b/include/plat/tx1/plat/machine/hardware.h
@@ -37,7 +37,7 @@ static const kernel_frame_t BOOT_RODATA kernel_devices[] = {
     {
         /* UART */
         UARTA_PADDR,
-        UARTA_PPTR,
+        UART_PPTR,
         true
 #endif /* CONFIG_PRINTING */
 #ifdef CONFIG_ARM_HYPERVISOR_SUPPORT
diff --git a/include/plat/tx2/plat/machine/devices.h b/include/plat/tx2/plat/machine/devices.h
index c391a003bbcb67101326bc4e9beb5b7f8a83043d..8c7becf3814765e36646b9544e8f7b869034e28b 100644
--- a/include/plat/tx2/plat/machine/devices.h
+++ b/include/plat/tx2/plat/machine/devices.h
@@ -38,7 +38,7 @@ compile_assert(log_buffer_vaddr_2MiB_aligned, (KS_LOG_PPTR & (0x200000 - 1)) ==
 #endif
 
 
-#define UARTA_PPTR                  (KDEV_PPTR)
+#define UART_PPTR                  (KDEV_PPTR)
 #define GIC_DISTRIBUTOR_PPTR        (KDEV_PPTR + 0x3000)
 #define GIC_CONTROLLER_PPTR         (KDEV_PPTR + 0x4000)
 #define GICH_PPTR                   (KDEV_PPTR + 0x6000)
diff --git a/include/plat/tx2/plat/machine/hardware.h b/include/plat/tx2/plat/machine/hardware.h
index bd0d9037857871c9205ad5c0f0aec8401f030b17..b9f9d9e451ffa5e7f5c3fbdf068a77820f9bcf2a 100644
--- a/include/plat/tx2/plat/machine/hardware.h
+++ b/include/plat/tx2/plat/machine/hardware.h
@@ -37,7 +37,7 @@ static const kernel_frame_t BOOT_RODATA kernel_devices[] = {
     {
         /* UART */
         UARTA_PADDR,
-        UARTA_PPTR,
+        UART_PPTR,
         true
 #endif /* CONFIG_PRINTING */
 #ifdef CONFIG_ARM_HYPERVISOR_SUPPORT
diff --git a/src/plat/allwinnerA20/machine/io.c b/src/plat/allwinnerA20/machine/io.c
index 7e0fa919c4f86038d6acf390a5783fcb37c5e0ca..956ff6f8cce2454b8e95b3732eacdc4cbad6314f 100755
--- a/src/plat/allwinnerA20/machine/io.c
+++ b/src/plat/allwinnerA20/machine/io.c
@@ -18,7 +18,7 @@
 #define ULSR 0x14 /* UART Line Status Register */
 #define ULSR_THRE 0x20 /* Transmit Holding Register Empty */
 
-#define UART_REG(x) ((volatile uint32_t *)(UART0_PPTR + (x)))
+#define UART_REG(x) ((volatile uint32_t *)(UART_PPTR + (x)))
 
 #if defined(CONFIG_DEBUG_BUILD) || defined(CONFIG_PRINTING)
 void
diff --git a/src/plat/am335x/machine/io.c b/src/plat/am335x/machine/io.c
index 84ca4ecf7a53ed877408761876b0a6946bdd02ae..5617b247e383d67dd5b21e67d51b02f84b35ce8b 100644
--- a/src/plat/am335x/machine/io.c
+++ b/src/plat/am335x/machine/io.c
@@ -18,7 +18,7 @@
 #define ULSR 0x14 /* UART Line Status Register */
 #define ULSR_THRE BIT(5) /* Transmit Holding Register Empty */
 
-#define UART_REG(x) ((volatile uint32_t *)(UART0_PPTR + (x)))
+#define UART_REG(x) ((volatile uint32_t *)(UART_PPTR + (x)))
 
 #if defined(CONFIG_PRINTING) || defined(CONFIG_DEBUG_BUILD)
 void
diff --git a/src/plat/hikey/machine/io.c b/src/plat/hikey/machine/io.c
index f5f13caf0ea632fb466f91e96339ebc02c43e057..069dfd2b7839ebc5862e20c67148ffca3ab94d9f 100644
--- a/src/plat/hikey/machine/io.c
+++ b/src/plat/hikey/machine/io.c
@@ -18,7 +18,7 @@
 #define UARTFR                    0x018
 #define PL011_UARTFR_TXFF         (1 << 5)
 
-#define UART_REG(x) ((volatile uint32_t *)(UART0_PPTR + (x)))
+#define UART_REG(x) ((volatile uint32_t *)(UART_PPTR + (x)))
 
 #if defined(CONFIG_DEBUG_BUILD) || defined(CONFIG_PRINTING)
 void
diff --git a/src/plat/omap3/machine/io.c b/src/plat/omap3/machine/io.c
index 44a0a3dad99ee3b45b26ce604fd40b92e4623929..995e62a975023707c5d74fbf152b5a6595d9b579 100644
--- a/src/plat/omap3/machine/io.c
+++ b/src/plat/omap3/machine/io.c
@@ -18,7 +18,7 @@
 #define ULSR 0x14 /* UART Line Status Register */
 #define ULSR_THRE 0x20 /* Transmit Holding Register Empty */
 
-#define UART_REG(x) ((volatile uint32_t *)(UART3_PPTR + (x)))
+#define UART_REG(x) ((volatile uint32_t *)(UART_PPTR + (x)))
 
 #if defined(CONFIG_DEBUG_BUILD) || defined(CONFIG_PRINTING)
 void
diff --git a/src/plat/tk1/machine/io.c b/src/plat/tk1/machine/io.c
index 3094198a4c57a90012dbc3b718fa59da19632ffb..d6ccca757d82e0e3a12beae12a9d6b61fd4f8a15 100644
--- a/src/plat/tk1/machine/io.c
+++ b/src/plat/tk1/machine/io.c
@@ -18,7 +18,7 @@
 #define ULSR        0x14
 #define ULSR_THRE   (1 << 5)
 
-#define UART_REG(x) ((volatile uint32_t *)(UARTD_PPTR + (x)))
+#define UART_REG(x) ((volatile uint32_t *)(UART_PPTR + (x)))
 
 #if defined(CONFIG_DEBUG_BUILD) || defined(CONFIG_PRINTING)
 void
diff --git a/src/plat/tx1/machine/io.c b/src/plat/tx1/machine/io.c
index 7550d9d6270cf8a80ed9da38f37a5554c1cb4d82..ef4b439573fef05be2ac95425f748e50a112cb6a 100644
--- a/src/plat/tx1/machine/io.c
+++ b/src/plat/tx1/machine/io.c
@@ -20,7 +20,7 @@
 #define ULSR        0x14
 #define ULSR_THRE   (1 << 5)
 
-#define UART_REG(x) ((volatile uint32_t *)(UARTA_PPTR + (x)))
+#define UART_REG(x) ((volatile uint32_t *)(UART_PPTR + (x)))
 
 #if defined(CONFIG_DEBUG_BUILD) || defined(CONFIG_PRINTING)
 void
diff --git a/src/plat/tx2/machine/io.c b/src/plat/tx2/machine/io.c
index 1ec85477bc629be25a55045853a40d0efb8822fe..e8c52ceabdfb06f81e1546c84ca4c597b7e37278 100644
--- a/src/plat/tx2/machine/io.c
+++ b/src/plat/tx2/machine/io.c
@@ -20,7 +20,7 @@
 #define ULSR        0x14
 #define ULSR_THRE   BIT(5)
 
-#define UART_REG(x) ((volatile uint32_t *)(UARTA_PPTR + (x)))
+#define UART_REG(x) ((volatile uint32_t *)(UART_PPTR + (x)))
 
 #if defined(CONFIG_DEBUG_BUILD) || defined(CONFIG_PRINTING)
 void