MLECO-2984: Refactor components

* Use UART component from Ethos-U core-platform
* Components as cmake project

Change-Id: I053f3a59800abc20216e6a4df8555db357e3f21d
Signed-off-by: Isabella Gottardi <isabella.gottardi@arm.com>
diff --git a/source/hal/components/ethosu_npu_init/CMakeLists.txt b/source/hal/components/ethosu_npu_init/CMakeLists.txt
new file mode 100644
index 0000000..57eef61
--- /dev/null
+++ b/source/hal/components/ethosu_npu_init/CMakeLists.txt
@@ -0,0 +1,98 @@
+#----------------------------------------------------------------------------
+#  Copyright (c) 2022 Arm Limited. All rights reserved.
+#  SPDX-License-Identifier: Apache-2.0
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#----------------------------------------------------------------------------
+
+#########################################################
+#         Ethos-U NPU initialization library            #
+#########################################################
+
+cmake_minimum_required(VERSION 3.15.6)
+set(ETHOS_U_NPU_INIT_COMPONENT ethosu_npu_init_component)
+project(${ETHOS_U_NPU_INIT_COMPONENT}
+    DESCRIPTION     "Ethos-U NPU initialization library"
+    LANGUAGES       C CXX ASM)
+
+if (NOT DEFINED ETHOS_U_NPU_DRIVER_SRC_PATH)
+    message(FATAL_ERROR "ETHOS_U_NPU_DRIVER_SRC_PATH should"
+            " be defined when ETHOS_U_NPU_ENABLED=${ETHOS_U_NPU_ENABLED}")
+endif()
+
+# For the driver, we need to provide the CMSIS_PATH variable
+set(CMSIS_PATH ${CMSIS_SRC_PATH} CACHE PATH "Path to CMSIS directory")
+add_subdirectory(${ETHOS_U_NPU_DRIVER_SRC_PATH} ${CMAKE_BINARY_DIR}/ethos-u-driver)
+
+# Create static library
+add_library(${ETHOS_U_NPU_INIT_COMPONENT} STATIC)
+
+## Include directories - public
+target_include_directories(${ETHOS_U_NPU_INIT_COMPONENT}
+    PUBLIC
+    include
+    ${SOURCE_GEN_DIR})
+
+## Component sources
+target_sources(${ETHOS_U_NPU_INIT_COMPONENT}
+    PRIVATE
+    ethosu_npu_init.c)
+
+## Add dependencies:
+target_link_libraries(${ETHOS_U_NPU_INIT_COMPONENT} PUBLIC
+    cmsis_device
+    ethosu_core_driver
+    log)
+
+## Memory mode target definition
+if (NOT DEFINED ETHOS_U_NPU_ID)
+    set(ETHOS_U_NPU_ID U55)
+endif()
+
+if (NOT DEFINED ETHOS_U_NPU_MEMORY_MODE)
+    set(ETHOS_U_NPU_MEMORY_MODE Shared_Sram)
+endif()
+
+if (ETHOS_U_NPU_MEMORY_MODE STREQUAL Sram_Only)
+    if (ETHOS_U_NPU_ID STREQUAL U55)
+        set(ETHOS_U_NPU_MEMORY_MODE_FLAG "-DETHOS_U_NPU_MEMORY_MODE=ETHOS_U_NPU_MEM_MODE_SRAM_ONLY")
+    else ()
+        message(FATAL_ERROR "Non compatible Ethos-U NPU memory mode and processor ${ETHOS_U_NPU_MEMORY_MODE} - ${ETHOS_U_NPU_ID}. `sram_only` can be used only for Ethos-U55.")
+    endif ()
+
+elseif (ETHOS_U_NPU_MEMORY_MODE STREQUAL Shared_Sram)
+    # Shared Sram can be used for Ethos-U55 and Ethos-U65
+    set(ETHOS_U_NPU_MEMORY_MODE_FLAG "-DETHOS_U_NPU_MEMORY_MODE=ETHOS_U_NPU_MEMORY_MODE_SHARED_SRAM")
+
+elseif (ETHOS_U_NPU_MEMORY_MODE STREQUAL Dedicated_Sram)
+    # Dedicated Sram is used only for Ethos-U65
+    if (ETHOS_U_NPU_ID STREQUAL U65)
+        list(APPEND ETHOS_U_NPU_MEMORY_MODE_FLAG "-DETHOS_U_NPU_MEMORY_MODE=ETHOS_U_NPU_MEMORY_MODE_DEDICATED_SRAM" "-DETHOS_U_NPU_CACHE_SIZE=${ETHOS_U_NPU_CACHE_SIZE}")
+    else ()
+        message(FATAL_ERROR "Non compatible Ethos-U NPU memory mode and processor ${ETHOS_U_NPU_MEMORY_MODE} - ${ETHOS_U_NPU_ID}. `dedicated_sram` can be used only for Ethos-U65.")
+    endif ()
+
+else ()
+    message(FATAL_ERROR "Non compatible Ethos-U NPU memory mode ${ETHOS_U_NPU_MEMORY_MODE}")
+
+endif ()
+
+target_compile_definitions(${ETHOS_U_NPU_INIT_COMPONENT}
+    PUBLIC
+    ${ETHOS_U_NPU_MEMORY_MODE_FLAG})
+
+# Display status
+message(STATUS "CMAKE_CURRENT_SOURCE_DIR: " ${CMAKE_CURRENT_SOURCE_DIR})
+message(STATUS "*******************************************************")
+message(STATUS "Library                                : " ${ETHOS_U_NPU_INIT_COMPONENT})
+message(STATUS "*******************************************************")
diff --git a/source/hal/components/ethosu_npu_init/include/ethosu_mem_config.h b/source/hal/components/ethosu_npu_init/include/ethosu_mem_config.h
new file mode 100644
index 0000000..aa0cfda
--- /dev/null
+++ b/source/hal/components/ethosu_npu_init/include/ethosu_mem_config.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2022 Arm Limited. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ETHOS_U_NPU_MEM_CONFIG_H
+#define ETHOS_U_NPU_MEM_CONFIG_H
+
+#define ETHOS_U_NPU_MEMORY_MODE_SRAM_ONLY           0
+#define ETHOS_U_NPU_MEMORY_MODE_SHARED_SRAM         1
+#define ETHOS_U_NPU_MEMORY_MODE_DEDICATED_SRAM      2
+
+#define ETHOS_U_MEM_BYTE_ALIGNMENT                  16
+
+#ifndef ETHOS_U_NPU_MEMORY_MODE
+    #define ETHOS_U_NPU_MEMORY_MODE                 ETHOS_U_MEMORY_MODE_SHARED_SRAM
+#endif /* ETHOS_U_NPU_MEMORY_MODE */
+
+#if (ETHOS_U_NPU_MEMORY_MODE==ETHOS_U_NPU_MEMORY_MODE_DEDICATED_SRAM)
+    #ifndef ETHOS_U_NPU_CACHE_SIZE
+        #define ETHOS_U_CACHE_BUF_SZ                (393216U)  /* See vela doc for reference */
+    #else
+        #define ETHOS_U_CACHE_BUF_SZ                ETHOS_U_NPU_CACHE_SIZE
+    #endif /* ETHOS_U_NPU_CACHE_SIZE */
+#else
+    #define ETHOS_U_CACHE_BUF_SZ    (0U)
+#endif /* CACHE_BUF_SZ */
+
+/**
+ * Activation buffer aka tensor arena section name
+ * We have to place the tensor arena in different region based on the memory config.
+ **/
+#if (ETHOS_U_NPU_MEMORY_MODE==ETHOS_U_NPU_MEMORY_MODE_SHARED_SRAM)
+    #define ACTIVATION_BUF_SECTION      section(".bss.NoInit.activation_buf_sram")
+    #define ACTIVATION_BUF_SECTION_NAME ("SRAM")
+#elif (ETHOS_U_NPU_MEMORY_MODE==ETHOS_U_NPU_MEMORY_MODE_SRAM_ONLY)
+    #define ACTIVATION_BUF_SECTION      section(".bss.NoInit.activation_buf_sram")
+    #define ACTIVATION_BUF_SECTION_NAME ("SRAM")
+#elif (ETHOS_U_NPU_MEMORY_MODE==ETHOS_U_NPU_MEMORY_MODE_DEDICATED_SRAM)
+    #define ACTIVATION_BUF_SECTION      section("activation_buf_dram")
+    #define CACHE_BUF_SECTION           section(".bss.NoInit.ethos_u_cache")
+    #define ACTIVATION_BUF_SECTION_NAME ("DDR/DRAM")
+    #define CACHE_BUF_ATTRIBUTE         __attribute__((aligned(ETHOS_U_MEM_BYTE_ALIGNMENT), CACHE_BUF_SECTION))
+#endif
+
+#endif /* ETHOS_U_NPU_MEM_CONFIG_H */
diff --git a/source/hal/components/ethosu_ta_init/CMakeLists.txt b/source/hal/components/ethosu_ta_init/CMakeLists.txt
new file mode 100644
index 0000000..b5f94c1
--- /dev/null
+++ b/source/hal/components/ethosu_ta_init/CMakeLists.txt
@@ -0,0 +1,67 @@
+#----------------------------------------------------------------------------
+#  Copyright (c) 2022 Arm Limited. All rights reserved.
+#  SPDX-License-Identifier: Apache-2.0
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#----------------------------------------------------------------------------
+
+#########################################################
+#  Ethos-U NPU timing adapter initialization library    #
+#########################################################
+
+cmake_minimum_required(VERSION 3.15.6)
+set(ETHOS_U_NPU_TA_COMPONENT ethosu_ta_init_component)
+project(${ETHOS_U_NPU_TA_COMPONENT}
+    DESCRIPTION     "Ethos-U NPU timing adapter initialization library"
+    LANGUAGES       C CXX ASM)
+
+# Checks
+## If a TA config file is provided, we generate a settings file
+if (DEFINED TA_CONFIG_FILE)
+    include(${TA_CONFIG_FILE})
+    set(TA_SETTINGS_TEMPLATE ${CMAKE_CURRENT_SOURCE_DIR}/cmake/templates/timing_adapter_settings.template)
+    configure_file("${TA_SETTINGS_TEMPLATE}" "${SOURCE_GEN_DIR}/timing_adapter_settings.h")
+endif()
+
+## Timing adapter Source path check
+if (NOT DEFINED ETHOS_U_NPU_TIMING_ADAPTER_SRC_PATH)
+    message(FATAL_ERROR "ETHOS_U_NPU_TIMING_ADAPTER_SRC_PATH should"
+            " be defined when ETHOS_U_NPU_ENABLED=${ETHOS_U_NPU_ENABLED}")
+endif()
+
+add_subdirectory(${ETHOS_U_NPU_TIMING_ADAPTER_SRC_PATH} ${CMAKE_BINARY_DIR}/timing_adapter)
+
+# Create static library
+add_library(${ETHOS_U_NPU_TA_COMPONENT} STATIC)
+
+## Include directories - public
+target_include_directories(${ETHOS_U_NPU_TA_COMPONENT}
+    PUBLIC
+    include
+    ${SOURCE_GEN_DIR})
+
+## Component sources
+target_sources(${ETHOS_U_NPU_TA_COMPONENT}
+    PRIVATE
+    ethosu_ta_init.c)
+
+## Add dependencies
+target_link_libraries(${ETHOS_U_NPU_TA_COMPONENT} PUBLIC
+    timing_adapter
+    log)
+
+# Display status
+message(STATUS "CMAKE_CURRENT_SOURCE_DIR: " ${CMAKE_CURRENT_SOURCE_DIR})
+message(STATUS "*******************************************************")
+message(STATUS "Library                                : " ${ETHOS_U_NPU_TA_COMPONENT})
+message(STATUS "*******************************************************")
diff --git a/source/hal/components/ethosu_ta_init/cmake/templates/timing_adapter_settings.template b/source/hal/components/ethosu_ta_init/cmake/templates/timing_adapter_settings.template
new file mode 100644
index 0000000..5b6c43d
--- /dev/null
+++ b/source/hal/components/ethosu_ta_init/cmake/templates/timing_adapter_settings.template
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2021 Arm Limited. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+// Auto-generated file
+// ** DO NOT EDIT **
+
+#ifndef TIMING_ADAPTER_SETTINGS_H
+#define TIMING_ADAPTER_SETTINGS_H
+
+#cmakedefine TA0_BASE       (@TA0_BASE@)
+#cmakedefine TA1_BASE       (@TA1_BASE@)
+
+/* Timing adapter settings for AXI0 */
+#if defined(TA0_BASE)
+
+#define TA0_MAXR           (@TA0_MAXR@)
+#define TA0_MAXW           (@TA0_MAXW@)
+#define TA0_MAXRW          (@TA0_MAXRW@)
+#define TA0_RLATENCY       (@TA0_RLATENCY@)
+#define TA0_WLATENCY       (@TA0_WLATENCY@)
+#define TA0_PULSE_ON       (@TA0_PULSE_ON@)
+#define TA0_PULSE_OFF      (@TA0_PULSE_OFF@)
+#define TA0_BWCAP          (@TA0_BWCAP@)
+#define TA0_PERFCTRL       (@TA0_PERFCTRL@)
+#define TA0_PERFCNT        (@TA0_PERFCNT@)
+#define TA0_MODE           (@TA0_MODE@)
+#define TA0_HISTBIN        (@TA0_HISTBIN@)
+#define TA0_HISTCNT        (@TA0_HISTCNT@)
+
+#endif /* defined(TA0_BASE) */
+
+/* Timing adapter settings for AXI1 */
+#if defined(TA1_BASE)
+
+#define TA1_MAXR           (@TA1_MAXR@)
+#define TA1_MAXW           (@TA1_MAXW@)
+#define TA1_MAXRW          (@TA1_MAXRW@)
+#define TA1_RLATENCY       (@TA1_RLATENCY@)
+#define TA1_WLATENCY       (@TA1_WLATENCY@)
+#define TA1_PULSE_ON       (@TA1_PULSE_ON@)
+#define TA1_PULSE_OFF      (@TA1_PULSE_OFF@)
+#define TA1_BWCAP          (@TA1_BWCAP@)
+#define TA1_PERFCTRL       (@TA1_PERFCTRL@)
+#define TA1_PERFCNT        (@TA1_PERFCNT@)
+#define TA1_MODE           (@TA1_MODE@)
+#define TA1_HISTBIN        (@TA1_HISTBIN@)
+#define TA1_HISTCNT        (@TA1_HISTCNT@)
+
+#endif /* defined(TA1_BASE) */
+
+#endif /* TIMING_ADAPTER_SETTINGS_H */
diff --git a/source/hal/components/ethosu_ta_init/ethosu_ta_init.c b/source/hal/components/ethosu_ta_init/ethosu_ta_init.c
index 26eeb5c..323ab73 100644
--- a/source/hal/components/ethosu_ta_init/ethosu_ta_init.c
+++ b/source/hal/components/ethosu_ta_init/ethosu_ta_init.c
@@ -19,8 +19,6 @@
 
 #include "log_macros.h"                 /* Logging functions */
 
-#if defined(TIMING_ADAPTER_AVAILABLE)
-
 #include "timing_adapter.h"             /* Arm Ethos-U timing adapter driver header */
 #include "timing_adapter_settings.h"    /* Arm Ethos-U timing adapter settings */
 
@@ -82,5 +80,3 @@
 
     return 0;
 }
-
-#endif /* TIMING_ADAPTER_AVAILABLE */
diff --git a/source/hal/components/ethosu_ta_init/include/ethosu_ta_init.h b/source/hal/components/ethosu_ta_init/include/ethosu_ta_init.h
index 2ab7fb2..7e6df6c 100644
--- a/source/hal/components/ethosu_ta_init/include/ethosu_ta_init.h
+++ b/source/hal/components/ethosu_ta_init/include/ethosu_ta_init.h
@@ -17,14 +17,10 @@
 #ifndef ETHOS_U_TA_INIT_H
 #define ETHOS_U_TA_INIT_H
 
-#if defined(ARM_NPU) && defined(TIMING_ADAPTER_AVAILABLE)
-
 /**
  * @brief   Initialises the Arm Ethos-U NPU timing adapter
  * @return  0 if successful, error code otherwise
  **/
 int arm_ethosu_timing_adapter_init(void);
 
-#endif /* ARM_NPU && TIMING_ADAPTER_AVAILABLE */
-
 #endif /* ETHOS_U_TA_INIT_H */
diff --git a/source/hal/components/lcd_mps3/glcd_mps3.c b/source/hal/components/lcd_mps3/glcd_mps3.c
deleted file mode 100644
index 55a6575..0000000
--- a/source/hal/components/lcd_mps3/glcd_mps3.c
+++ /dev/null
@@ -1,460 +0,0 @@
-/*
- * Copyright (c) 2021-2022 Arm Limited. All rights reserved.
- * SPDX-License-Identifier: Apache-2.0
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include "glcd_mps3.h"
-
-#include "log_macros.h"
-#include "font_9x15_h.h"
-#include "smm_mps3.h"
-
-/*-------------- CLCD Controller Internal Register addresses ----------------*/
-#define CHAR_COM        ((volatile unsigned int *)(CLCD_CONFIG_BASE + 0x000))
-#define CHAR_DAT        ((volatile unsigned int *)(CLCD_CONFIG_BASE + 0x004))
-#define CHAR_RD         ((volatile unsigned int *)(CLCD_CONFIG_BASE + 0x008))
-#define CHAR_RAW        ((volatile unsigned int *)(CLCD_CONFIG_BASE + 0x00C))
-#define CHAR_MASK       ((volatile unsigned int *)(CLCD_CONFIG_BASE + 0x010))
-#define CHAR_STAT       ((volatile unsigned int *)(CLCD_CONFIG_BASE + 0x014))
-#define CHAR_MISC       ((volatile unsigned int *)(CLCD_CONFIG_BASE + 0x04C))
-
-/*--------------- Graphic LCD interface hardware definitions -----------------*/
-/* Pin CS setting to 0 or 1                                                   */
-#define LCD_CS(x)   ((x) ? (*CHAR_MISC |= CLCD_CS_Msk)    : (*CHAR_MISC &= ~CLCD_CS_Msk))
-#define LCD_RST(x)  ((x) ? (*CHAR_MISC |= CLCD_RESET_Msk) : (*CHAR_MISC &= ~CLCD_RESET_Msk))
-#define LCD_BL(x)   ((x) ? (*CHAR_MISC |= CLCD_BL_Msk)    : (*CHAR_MISC &= ~CLCD_BL_Msk))
-
-#define BG_COLOR  0                     /* Background colour                  */
-#define TXT_COLOR 1                     /* Text colour                        */
-
-/**
-* Text and background colour
-*/
-static volatile unsigned short Color[2] = {Black, White};
-
-/**
- * @brief     Delay in while loop cycles.
- * @param[in] cnt    Number of while cycles to delay.
- **/
-static void delay (int cnt)
-{
-    cnt <<= DELAY_2N;
-    while (cnt != 0) {
-        --cnt;
-    }
-}
-
-/**
- * @brief       Write a command the LCD controller.
- * @param[in]   cmd    Command to be written.
- */
-static __inline void wr_cmd(unsigned char cmd)
-{
-    LCD_CS(0);
-    *CHAR_COM = cmd;
-    LCD_CS(1);
-}
-
-/**
- * @brief       Start of data writing to the LCD controller.
- */
-static __inline void wr_dat_start (void)
-{
-    LCD_CS(0);
-}
-
-/**
- * @brief       Stop of data writing to the LCD controller.
- */
-static __inline void wr_dat_stop (void)
-{
-    LCD_CS(1);
-}
-
-/**
- * @brief       Data writing to the LCD controller.
- * @param[in]   dat    Data to be written.
- */
-static __inline void wr_dat_only(unsigned short dat)
-{
-    *CHAR_DAT = (dat >>   8);   /* Write D8..D15    */
-    *CHAR_DAT = (dat & 0xFF);   /* Write D0..D7     */
-}
-
-/**
- * @brief       Write a value to the to LCD register.
- * @param[in]   reg    Register to be written.
- * @param[in]   val    Value to write to the register.
- */
-static __inline void wr_reg(unsigned char reg, unsigned short val)
-{
-    LCD_CS(0);
-    *CHAR_COM = reg;
-    wr_dat_only(val);
-    LCD_CS(1);
-}
-
-/**
- * @brief       Converts a gray value to RGB565 representation.
- * @param[in]   src_uchar   Pointer to the source pixel.
- * @return      16 bit RGB565 value.
- */
-static inline uint16_t _GLCD_Gray8_to_RGB565(uint8_t *src_uchar)
-{
-    uint16_t val_r = (*src_uchar >> 3);
-    uint16_t val_g = (*src_uchar >> 2);
-    return ((val_r << 11) | (val_g << 5) | val_r);
-}
-
-/**
- * @brief       Converts an RGB888 value to RGB565 representation.
- * @param[in]   src_uchar   Pointer to the source pixel for R (assumed to
- *                          be RGB format).
- * @return      16 bit RGB565 value.
- */
-static inline uint16_t _GLCD_RGB888_to_RGB565(uint8_t *src_uchar)
-{
-    uint16_t val_r = (*src_uchar >> 3) & 0x1F;
-    uint16_t val_g = (*(src_uchar+1) >> 2) & 0x3F;
-    uint16_t val_b = (*(src_uchar+2) >> 3) & 0x1F;
-    return ((val_r << 11) | (val_g << 5) | val_b);
-}
-
-/* Helper typedef to encapsulate the colour conversion function
- * signatures */
-typedef uint16_t (* std_clr_2_lcd_clr_fn)(uint8_t *src_uchar);
-
-void GLCD_SetWindow(unsigned int x, unsigned int y, unsigned int w, unsigned int h) {
-    unsigned int xe, ye;
-
-    xe = x+w-1;
-    ye = y+h-1;
-
-    wr_reg(0x02, x  >>    8);   /* Column address start MSB           */
-    wr_reg(0x03, x  &  0xFF);   /* Column address start LSB           */
-    wr_reg(0x04, xe >>    8);   /* Column address end MSB             */
-    wr_reg(0x05, xe &  0xFF);   /* Column address end LSB             */
-
-    wr_reg(0x06, y  >>    8);   /* Row address start MSB              */
-    wr_reg(0x07, y  &  0xFF);   /* Row address start LSB              */
-    wr_reg(0x08, ye >>    8);   /* Row address end MSB                */
-    wr_reg(0x09, ye &  0xFF);   /* Row address end LSB                */
-}
-
-void GLCD_WindowMax(void)
-{
-    GLCD_SetWindow (0, 0, GLCD_WIDTH, GLCD_HEIGHT);
-}
-
-void GLCD_SetTextColor(unsigned short color)
-{
-    Color[TXT_COLOR] = color;
-}
-
-void GLCD_SetBackColor(unsigned short color)
-{
-    Color[BG_COLOR] = color;
-}
-
-void GLCD_Clear(unsigned short color)
-{
-    unsigned int i;
-
-    GLCD_WindowMax();
-    wr_cmd(0x22);
-    wr_dat_start();
-
-    for(i = 0; i < (GLCD_WIDTH*GLCD_HEIGHT); ++i) {
-        wr_dat_only(color);
-    }
-    wr_dat_stop();
-}
-
-
-void GLCD_DrawChar(
-        unsigned int x, unsigned int y,
-        unsigned int cw, unsigned int ch,
-        unsigned char *c)
-{
-    unsigned int i, j, k, pixs;
-
-    /* Sanity check: out of bounds? */
-    if ((x + cw) > GLCD_WIDTH || (y + ch) > GLCD_HEIGHT) {
-        return;
-    }
-
-    GLCD_SetWindow(x, y, cw, ch);
-
-    wr_cmd(0x22);
-    wr_dat_start();
-
-    k  = (cw + 7)/8;
-
-    if (k == 1) {
-        for (j = 0; j < ch; ++j) {
-            pixs = *(unsigned char  *)c;
-            c += 1;
-
-            for (i = 0; i < cw; ++i) {
-                wr_dat_only (Color[(pixs >> i) & 1]);
-            }
-        }
-    }
-    else if (k == 2) {
-        for (j = 0; j < ch; ++j) {
-            pixs = *(unsigned short *)c;
-            c += 2;
-
-            for (i = 0; i < cw; ++i) {
-                wr_dat_only (Color[(pixs >> i) & 1]);
-            }
-        }
-    }
-    wr_dat_stop();
-}
-
-void GLCD_DisplayChar(
-        unsigned int ln, unsigned int col,
-        unsigned char fi, unsigned char c)
-{
-    c -= 32;
-    switch (fi) {
-        case 0: /* Font 9 x 15. */
-            GLCD_DrawChar(col * 9, ln * 15, 9, 15,
-                         (unsigned char *)&Font_9x15_h[c * 15]);
-            break;
-    }
-}
-
-void GLCD_DisplayString(
-        unsigned int ln, unsigned int col,
-        unsigned char fi, char *s)
-{
-  while (*s) {
-    GLCD_DisplayChar(ln, col++, fi, *s++);
-  }
-}
-
-
-
-void GLCD_ClearLn(unsigned int ln, unsigned char fi)
-{
-    unsigned char i;
-    char buf[60];
-
-    GLCD_WindowMax();
-    switch (fi) {
-        case 0:  /* Font 9x15*/
-            for (i = 0; i < (GLCD_WIDTH+8)/9; ++i) {
-                buf[i] = ' ';
-            }
-            buf[i+1] = 0;
-            break;
-    }
-    GLCD_DisplayString (ln, 0, fi, buf);
-}
-
-void GLCD_Bitmap(unsigned int x, unsigned int y,
-        unsigned int w, unsigned int h,
-        unsigned short *bitmap)
-{
-    unsigned int i;
-    unsigned short *bitmap_ptr = bitmap;
-
-    GLCD_SetWindow (x, y, w, h);
-
-    wr_cmd(0x22);
-    wr_dat_start();
-
-    for (i = 0; i < (w*h); ++i) {
-        wr_dat_only (bitmap_ptr[i]);
-    }
-    wr_dat_stop();
-}
-
-void GLCD_Image(const void *data, const uint32_t width,
-    const uint32_t height, const uint32_t channels,
-    const uint32_t pos_x, const uint32_t pos_y,
-    const uint32_t downsample_factor)
-{
-    uint32_t i, j = 0; /* for loops */
-    const uint32_t x_incr = channels * downsample_factor; /* stride. */
-    const uint32_t y_incr = channels * width * (downsample_factor - 1); /* skip rows. */
-    uint8_t* src_unsigned = (uint8_t *)data; /* temporary pointer. */
-    std_clr_2_lcd_clr_fn cvt_clr_fn = 0; /* colour conversion function. */
-
-    /* Based on number of channels, we decide which of the above functions to use. */
-    switch (channels) {
-        case 1:
-            cvt_clr_fn = _GLCD_Gray8_to_RGB565;
-            break;
-
-        case 3:
-            cvt_clr_fn = _GLCD_RGB888_to_RGB565;
-            break;
-
-        default:
-            printf_err("number of channels not supported by display\n");
-            return;
-    }
-
-    /* Set the window position expected. Note: this is integer div. */
-    GLCD_SetWindow(pos_x, pos_y,
-        width/downsample_factor, height/downsample_factor);
-    wr_cmd(0x22);
-    wr_dat_start();
-
-    /* Loop over the image. */
-    for (j = height; j != 0; j -= downsample_factor) {
-        for (i = width; i != 0; i -= downsample_factor) {
-            wr_dat_only(cvt_clr_fn(src_unsigned));
-            src_unsigned += x_incr;
-        }
-
-        /* Skip rows if needed. */
-        src_unsigned += y_incr;
-    }
-
-    wr_dat_stop();
-}
-
-void GLCD_Box(
-        unsigned int x, unsigned int y,
-        unsigned int w, unsigned int h,
-        unsigned short color)
-{
-    unsigned int i;
-
-    GLCD_SetWindow (x, y, w, h);
-
-    wr_cmd(0x22);
-    wr_dat_start();
-    for(i = 0; i < (w*h); ++i){
-        wr_dat_only (color);
-    }
-    wr_dat_stop();
-}
-
-
-void GLCD_Initialize (void)
-{
-    /* CLCD screen setup (Default CLCD screen interface state) ------------- */
-    LCD_CS(1);              /* deassert nCS0. */
-    LCD_RST(1);             /* deassert Reset. */
-    LCD_BL(0);              /* switch off backlight. */
-
-    /* Reset CLCD screen --------------------------------------------------- */
-    LCD_RST(0);             /* assert Reset. */
-    delay(1);
-    LCD_RST(1);             /* deassert Reset. */
-    delay(10);
-
-    /* Driving ability settings ----------------------------------------------*/
-    wr_reg(0xEA, 0x00);     /* Power control internal used (1).    */
-    wr_reg(0xEB, 0x20);     /* Power control internal used (2).    */
-    wr_reg(0xEC, 0x0C);     /* Source control internal used (1).   */
-    wr_reg(0xED, 0xC7);     /* Source control internal used (2).   */
-    wr_reg(0xE8, 0x38);     /* Source output period Normal mode.   */
-    wr_reg(0xE9, 0x10);     /* Source output period Idle mode.     */
-    wr_reg(0xF1, 0x01);     /* RGB 18-bit interface ;0x0110.       */
-    wr_reg(0xF2, 0x10);
-
-    /* Adjust the Gamma Curve ------------------------------------------------*/
-    wr_reg(0x40, 0x01);
-    wr_reg(0x41, 0x00);
-    wr_reg(0x42, 0x00);
-    wr_reg(0x43, 0x10);
-    wr_reg(0x44, 0x0E);
-    wr_reg(0x45, 0x24);
-    wr_reg(0x46, 0x04);
-    wr_reg(0x47, 0x50);
-    wr_reg(0x48, 0x02);
-    wr_reg(0x49, 0x13);
-    wr_reg(0x4A, 0x19);
-    wr_reg(0x4B, 0x19);
-    wr_reg(0x4C, 0x16);
-
-    wr_reg(0x50, 0x1B);
-    wr_reg(0x51, 0x31);
-    wr_reg(0x52, 0x2F);
-    wr_reg(0x53, 0x3F);
-    wr_reg(0x54, 0x3F);
-    wr_reg(0x55, 0x3E);
-    wr_reg(0x56, 0x2F);
-    wr_reg(0x57, 0x7B);
-    wr_reg(0x58, 0x09);
-    wr_reg(0x59, 0x06);
-    wr_reg(0x5A, 0x06);
-    wr_reg(0x5B, 0x0C);
-    wr_reg(0x5C, 0x1D);
-    wr_reg(0x5D, 0xCC);
-
-    /* Power voltage setting -------------------------------------------------*/
-    wr_reg(0x1B, 0x1B);
-    wr_reg(0x1A, 0x01);
-    wr_reg(0x24, 0x2F);
-    wr_reg(0x25, 0x57);
-    wr_reg(0x23, 0x88);
-
-    /* Power on setting ------------------------------------------------------*/
-    wr_reg(0x18, 0x36);    /* Internal oscillator frequency adj.  */
-    wr_reg(0x19, 0x01);    /* Enable internal oscillator.         */
-    wr_reg(0x01, 0x00);    /* Normal mode, no scroll.             */
-    wr_reg(0x1F, 0x88);    /* Power control 6 - DDVDH Off.        */
-    delay(20);
-    wr_reg(0x1F, 0x82);    /* Power control 6 - Step-up: 3 x VCI. */
-    delay(5);
-    wr_reg(0x1F, 0x92);    /* Power control 6 - Step-up: On.      */
-    delay(5);
-    wr_reg(0x1F, 0xD2);    /* Power control 6 - VCOML active.     */
-    delay(5);
-
-    /* Color selection -------------------------------------------------------*/
-    wr_reg(0x17, 0x55);    /* RGB, System interface: 16 Bit/Pixel. */
-    wr_reg(0x00, 0x00);    /* Scrolling off, no standby.           */
-
-    /* Interface config ------------------------------------------------------*/
-    wr_reg(0x2F, 0x11);    /* LCD Drive: 1-line inversion.        */
-    wr_reg(0x31, 0x00);
-    wr_reg(0x32, 0x00);    /* DPL=0, HSPL=0, VSPL=0, EPL=0.       */
-
-    /* Display on setting ----------------------------------------------------*/
-    wr_reg(0x28, 0x38);    /* PT(0,0) active, VGL/VGL.            */
-    delay(20);
-    wr_reg(0x28, 0x3C);    /* Display active, VGL/VGL.            */
-
-#if (LANDSCAPE == 1)
-#if (ROTATE180 == 0)
-    wr_reg (0x16, 0xA8);
-#else /* (ROTATE180 == 0) */
-    wr_reg (0x16, 0x68);
-#endif /* (ROTATE180 == 0) */
-#else /* (LANDSCAPE == 1) */
-#if (ROTATE180 == 0)
-    wr_reg (0x16, 0x08);
-#else /* (ROTATE180 == 0) */
-     wr_reg (0x16, 0xC8);
-#endif /* (ROTATE180 == 0) */
-#endif /* (LANDSCAPE == 1) */
-
-    /* Display scrolling settings --------------------------------------------*/
-    wr_reg(0x0E, 0x00);         /* TFA MSB */
-    wr_reg(0x0F, 0x00);         /* TFA LSB */
-    wr_reg(0x10, 320 >> 8);     /* VSA MSB */
-    wr_reg(0x11, 320 &  0xFF);  /* VSA LSB */
-    wr_reg(0x12, 0x00);         /* BFA MSB */
-    wr_reg(0x13, 0x00);         /* BFA LSB */
-
-    LCD_BL(1);                  /* turn on backlight                  */
-}
diff --git a/source/hal/components/lcd_mps3/include/font_9x15_h.h b/source/hal/components/lcd_mps3/include/font_9x15_h.h
deleted file mode 100644
index b8b6bdc..0000000
--- a/source/hal/components/lcd_mps3/include/font_9x15_h.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (c) 2021 Arm Limited. All rights reserved.
- * SPDX-License-Identifier: Apache-2.0
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-//Font Generated by MikroElektronika GLCD Font Creator 1.2.0.0
-//MikroElektrnika 2011
-//http://www.mikroe.com
-
-//GLCD FontName : Lucida_Console9x15
-//GLCD FontSize : 9x15
-
-#ifndef FONT_9x15_H_H
-#define FONT_9x15_H_H
-
-const unsigned short Font_9x15_h[] = {
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,      /* Code for char num 32. */
-    0x00,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x00,0x10,0x10,0x00,0x00,0x00,      /* Code for char num 33. */
-    0x44,0x44,0x44,0x44,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,      /* Code for char num 34. */
-    0x00,0x12,0x12,0x24,0x7F,0x24,0x28,0x48,0xFE,0x48,0x90,0x90,0x00,0x00,0x00,      /* Code for char num 35. */
-    0x10,0x7C,0x16,0x12,0x12,0x1C,0x38,0x70,0x50,0x50,0x52,0x3E,0x10,0x00,0x00,      /* Code for char num 36. */
-    0x00,0x8C,0x92,0x52,0x52,0x2C,0x10,0x08,0x68,0x94,0x92,0x92,0x62,0x00,0x00,      /* Code for char num 37. */
-    0x00,0x18,0x24,0x24,0x34,0x18,0x0C,0x12,0xB2,0xE2,0xC2,0xBC,0x00,0x00,0x00,      /* Code for char num 38. */
-    0x08,0x08,0x08,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,      /* Code for char num 39. */
-    0xC0,0x60,0x10,0x10,0x08,0x08,0x08,0x08,0x08,0x08,0x10,0x10,0x60,0xC0,0x00,      /* Code for char num 40. */
-    0x0C,0x18,0x20,0x20,0x40,0x40,0x40,0x40,0x40,0x40,0x20,0x20,0x18,0x0C,0x00,      /* Code for char num 41. */
-    0x00,0x10,0x92,0xEE,0x18,0x28,0x28,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,      /* Code for char num 42. */
-    0x00,0x00,0x00,0x00,0x10,0x10,0x10,0x10,0xFE,0x10,0x10,0x10,0x00,0x00,0x00,      /* Code for char num 43. */
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x10,0x08,0x00,      /* Code for char num 44. */
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,      /* Code for char num 45. */
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x00,0x00,0x00,      /* Code for char num 46. */
-    0x80,0x40,0x40,0x60,0x20,0x20,0x10,0x10,0x08,0x08,0x0C,0x04,0x04,0x02,0x00,      /* Code for char num 47. */
-    0x00,0x38,0x44,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x44,0x38,0x00,0x00,0x00,      /* Code for char num 48. */
-    0x00,0x10,0x1E,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0xFE,0x00,0x00,0x00,      /* Code for char num 49. */
-    0x00,0x3E,0x42,0x40,0x40,0x40,0x20,0x10,0x08,0x04,0x02,0x7E,0x00,0x00,0x00,      /* Code for char num 50. */
-    0x00,0x3C,0x40,0x40,0x40,0x60,0x38,0x40,0x40,0x40,0x40,0x3C,0x00,0x00,0x00,      /* Code for char num 51. */
-    0x00,0x20,0x30,0x28,0x24,0x24,0x22,0x21,0x7F,0x20,0x20,0x20,0x00,0x00,0x00,      /* Code for char num 52. */
-    0x00,0x7C,0x04,0x04,0x04,0x1C,0x20,0x40,0x40,0x40,0x20,0x3C,0x00,0x00,0x00,      /* Code for char num 53. */
-    0x00,0x78,0x04,0x04,0x02,0x3A,0x46,0x82,0x82,0x82,0x44,0x38,0x00,0x00,0x00,      /* Code for char num 54. */
-    0x00,0xFE,0x80,0x40,0x20,0x20,0x10,0x10,0x08,0x08,0x04,0x04,0x00,0x00,0x00,      /* Code for char num 55. */
-    0x00,0x3C,0x42,0x42,0x42,0x24,0x1C,0x62,0x42,0x42,0x42,0x3C,0x00,0x00,0x00,      /* Code for char num 56. */
-    0x00,0x38,0x44,0x82,0x82,0x82,0xC4,0xB8,0x80,0x40,0x40,0x3C,0x00,0x00,0x00,      /* Code for char num 57. */
-    0x00,0x00,0x00,0x00,0x18,0x18,0x00,0x00,0x00,0x00,0x18,0x18,0x00,0x00,0x00,      /* Code for char num 58. */
-    0x00,0x00,0x00,0x00,0x18,0x18,0x00,0x00,0x00,0x00,0x18,0x18,0x10,0x08,0x00,      /* Code for char num 59. */
-    0x00,0x00,0x00,0x00,0x80,0x60,0x10,0x0C,0x0C,0x10,0x60,0x80,0x00,0x00,0x00,      /* Code for char num 60. */
-    0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x00,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,      /* Code for char num 61. */
-    0x00,0x00,0x00,0x00,0x02,0x0C,0x10,0x60,0x60,0x10,0x0C,0x02,0x00,0x00,0x00,      /* Code for char num 62. */
-    0x00,0x3E,0x42,0x42,0x40,0x20,0x10,0x08,0x08,0x00,0x08,0x08,0x00,0x00,0x00,      /* Code for char num 63. */
-    0x00,0x78,0x84,0xE2,0x92,0x8A,0x8A,0xCA,0xCA,0xB2,0xA6,0x3C,0x00,0x00,0x00,      /* Code for char num 64. */
-    0x00,0x00,0x10,0x38,0x28,0x28,0x44,0x44,0xFE,0x82,0x82,0x82,0x00,0x00,0x00,      /* Code for char num 65. */
-    0x00,0x00,0x3E,0x42,0x42,0x22,0x1E,0x22,0x42,0x42,0x42,0x3E,0x00,0x00,0x00,      /* Code for char num 66. */
-    0x00,0x00,0xF8,0x06,0x02,0x01,0x01,0x01,0x01,0x02,0x06,0xF8,0x00,0x00,0x00,      /* Code for char num 67. */
-    0x00,0x00,0x3E,0x42,0x82,0x82,0x82,0x82,0x82,0x82,0x42,0x3E,0x00,0x00,0x00,      /* Code for char num 68. */
-    0x00,0x00,0xFE,0x02,0x02,0x02,0x02,0x7E,0x02,0x02,0x02,0xFE,0x00,0x00,0x00,      /* Code for char num 69. */
-    0x00,0x00,0xFE,0x02,0x02,0x02,0x02,0x7E,0x02,0x02,0x02,0x02,0x00,0x00,0x00,      /* Code for char num 70. */
-    0x00,0x00,0xF8,0x06,0x02,0x01,0x01,0xE1,0x81,0x82,0x86,0xF8,0x00,0x00,0x00,      /* Code for char num 71. */
-    0x00,0x00,0x42,0x42,0x42,0x42,0x42,0x7E,0x42,0x42,0x42,0x42,0x00,0x00,0x00,      /* Code for char num 72. */
-    0x00,0x00,0xFE,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0xFE,0x00,0x00,0x00,      /* Code for char num 73. */
-    0x00,0x00,0x3C,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x1E,0x00,0x00,0x00,      /* Code for char num 74. */
-    0x00,0x00,0x42,0x22,0x12,0x0A,0x06,0x0A,0x12,0x22,0x42,0x82,0x00,0x00,0x00,      /* Code for char num 75. */
-    0x00,0x00,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0xFE,0x00,0x00,0x00,      /* Code for char num 76. */
-    0x00,0x00,0x63,0x63,0x63,0x55,0x55,0x55,0x4D,0x49,0x41,0x41,0x00,0x00,0x00,      /* Code for char num 77. */
-    0x00,0x00,0x82,0x86,0x8A,0x8A,0x92,0x92,0xA2,0xA2,0xC2,0x82,0x00,0x00,0x00,      /* Code for char num 78. */
-    0x00,0x00,0x3C,0x42,0x81,0x81,0x81,0x81,0x81,0x81,0x42,0x3C,0x00,0x00,0x00,      /* Code for char num 79. */
-    0x00,0x00,0x3E,0x42,0x42,0x42,0x62,0x1E,0x02,0x02,0x02,0x02,0x00,0x00,0x00,      /* Code for char num 80. */
-    0x00,0x00,0x3C,0x42,0x81,0x81,0x81,0x81,0x81,0x81,0x42,0x3C,0x60,0x80,0x00,      /* Code for char num 81. */
-    0x00,0x00,0x3E,0x42,0x42,0x42,0x22,0x1E,0x12,0x22,0x42,0x82,0x00,0x00,0x00,      /* Code for char num 82. */
-    0x00,0x00,0x7C,0x42,0x02,0x06,0x1C,0x20,0x40,0x40,0x42,0x3E,0x00,0x00,0x00,      /* Code for char num 83. */
-    0x00,0x00,0xFE,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x00,0x00,0x00,      /* Code for char num 84. */
-    0x00,0x00,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x44,0x3C,0x00,0x00,0x00,      /* Code for char num 85. */
-    0x00,0x00,0x82,0x82,0x82,0x82,0x44,0x44,0x28,0x28,0x38,0x10,0x00,0x00,0x00,      /* Code for char num 86. */
-    0x00,0x00,0x82,0x82,0x92,0x92,0xAA,0xAA,0xAA,0xAA,0x64,0x44,0x00,0x00,0x00,      /* Code for char num 87. */
-    0x00,0x00,0x82,0x82,0x44,0x28,0x10,0x10,0x28,0x44,0x82,0x82,0x00,0x00,0x00,      /* Code for char num 88. */
-    0x00,0x00,0x82,0x82,0x44,0x44,0x28,0x10,0x10,0x10,0x10,0x10,0x00,0x00,0x00,      /* Code for char num 89. */
-    0x00,0x00,0xFF,0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,0xFF,0x00,0x00,0x00,      /* Code for char num 90. */
-    0xF8,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0xF8,0x00,      /* Code for char num 91. */
-    0x02,0x04,0x04,0x04,0x08,0x08,0x10,0x10,0x20,0x20,0x20,0x40,0x40,0x80,0x00,      /* Code for char num 92. */
-    0x3E,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x3E,0x00,      /* Code for char num 93. */
-    0x00,0x10,0x10,0x10,0x28,0x28,0x44,0x44,0x44,0x82,0x00,0x00,0x00,0x00,0x00,      /* Code for char num 94. */
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x00,0x00,      /* Code for char num 95. */
-    0x10,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,      /* Code for char num 96. */
-    0x00,0x00,0x00,0x00,0x3C,0x40,0x40,0x78,0x44,0x42,0x62,0xDC,0x00,0x00,0x00,      /* Code for char num 97. */
-    0x02,0x02,0x02,0x02,0x7A,0x46,0x82,0x82,0x82,0x82,0x46,0x3A,0x00,0x00,0x00,      /* Code for char num 98. */
-    0x00,0x00,0x00,0x00,0xF8,0x04,0x02,0x02,0x02,0x02,0x04,0xF8,0x00,0x00,0x00,      /* Code for char num 99. */
-    0x80,0x80,0x80,0x80,0xB8,0xC4,0x82,0x82,0x82,0x82,0xC4,0xBC,0x00,0x00,0x00,      /* Code for char num 100. */
-    0x00,0x00,0x00,0x00,0x38,0x44,0x42,0x7E,0x02,0x02,0x04,0x78,0x00,0x00,0x00,      /* Code for char num 101. */
-    0xF0,0x08,0x08,0x08,0xFE,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x00,0x00,0x00,      /* Code for char num 102. */
-    0x00,0x00,0x00,0x00,0xB8,0xC4,0x82,0x82,0x82,0x82,0xC4,0xBC,0x80,0x40,0x3C,      /* Code for char num 103. */
-    0x02,0x02,0x02,0x02,0x3A,0x46,0x42,0x42,0x42,0x42,0x42,0x42,0x00,0x00,0x00,      /* Code for char num 104. */
-    0x18,0x18,0x00,0x00,0x1E,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x00,0x00,0x00,      /* Code for char num 105. */
-    0x30,0x30,0x00,0x00,0x3C,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x1E,      /* Code for char num 106. */
-    0x02,0x02,0x02,0x02,0x42,0x22,0x12,0x0E,0x0A,0x12,0x22,0x42,0x00,0x00,0x00,      /* Code for char num 107. */
-    0x1E,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x00,0x00,0x00,      /* Code for char num 108. */
-    0x00,0x00,0x00,0x00,0xDA,0xB6,0x92,0x92,0x92,0x92,0x92,0x92,0x00,0x00,0x00,      /* Code for char num 109. */
-    0x00,0x00,0x00,0x00,0x3A,0x46,0x42,0x42,0x42,0x42,0x42,0x42,0x00,0x00,0x00,      /* Code for char num 110. */
-    0x00,0x00,0x00,0x00,0x38,0x44,0x82,0x82,0x82,0x82,0x44,0x38,0x00,0x00,0x00,      /* Code for char num 111. */
-    0x00,0x00,0x00,0x00,0x7A,0x46,0x82,0x82,0x82,0x82,0x46,0x3A,0x02,0x02,0x02,      /* Code for char num 112. */
-    0x00,0x00,0x00,0x00,0xB8,0xC4,0x82,0x82,0x82,0x82,0xC4,0xBC,0x80,0x80,0x80,      /* Code for char num 113. */
-    0x00,0x00,0x00,0x00,0xF4,0x8C,0x04,0x04,0x04,0x04,0x04,0x04,0x00,0x00,0x00,      /* Code for char num 114. */
-    0x00,0x00,0x00,0x00,0x7C,0x02,0x02,0x0C,0x30,0x40,0x42,0x3E,0x00,0x00,0x00,      /* Code for char num 115. */
-    0x00,0x00,0x08,0x08,0xFE,0x08,0x08,0x08,0x08,0x08,0x08,0xF0,0x00,0x00,0x00,      /* Code for char num 116. */
-    0x00,0x00,0x00,0x00,0x42,0x42,0x42,0x42,0x42,0x42,0x62,0x5C,0x00,0x00,0x00,      /* Code for char num 117. */
-    0x00,0x00,0x00,0x00,0x82,0x82,0x82,0x44,0x44,0x28,0x28,0x10,0x00,0x00,0x00,      /* Code for char num 118. */
-    0x00,0x00,0x00,0x00,0x82,0x92,0xAA,0xAA,0xAA,0xAA,0x44,0x44,0x00,0x00,0x00,      /* Code for char num 119. */
-    0x00,0x00,0x00,0x00,0x82,0x44,0x28,0x10,0x10,0x28,0x44,0x82,0x00,0x00,0x00,      /* Code for char num 120. */
-    0x00,0x00,0x00,0x00,0x82,0x82,0x82,0x44,0x44,0x28,0x28,0x10,0x10,0x0C,0x00,      /* Code for char num 121. */
-    0x00,0x00,0x00,0x00,0xFE,0x80,0x40,0x20,0x10,0x08,0x04,0xFE,0x00,0x00,0x00,      /* Code for char num 122. */
-    0xE0,0x10,0x10,0x10,0x10,0x10,0x10,0x0C,0x10,0x10,0x10,0x10,0x10,0xE0,0x00,      /* Code for char num 123. */
-    0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x00,      /* Code for char num 124. */
-    0x0E,0x10,0x10,0x10,0x10,0x10,0x10,0x60,0x10,0x10,0x10,0x10,0x10,0x0E,0x00,      /* Code for char num 125. */
-    0x00,0x00,0x00,0x00,0x00,0x00,0x62,0x92,0x8C,0x00,0x00,0x00,0x00,0x00,0x00,      /* Code for char num 126. */
-    0x00,0x00,0x00,0x07,0x05,0x05,0x05,0x05,0x05,0x05,0x07,0x00,0x00,0x00,0x00       /* Code for char num 127. */
-};
-
-
-#endif /* FONT_9x15_H_H */
\ No newline at end of file
diff --git a/source/hal/components/lcd_mps3/include/glcd_mps3.h b/source/hal/components/lcd_mps3/include/glcd_mps3.h
deleted file mode 100644
index 313d4ca..0000000
--- a/source/hal/components/lcd_mps3/include/glcd_mps3.h
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * Copyright (c) 2021-2022 Arm Limited. All rights reserved.
- * SPDX-License-Identifier: Apache-2.0
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef GLCD_MPS3_H
-#define GLCD_MPS3_H
-
-#include <stdint.h>
-
-/******************************************************************************
-  Color coding
-  GLCD is coded:   15..11 red, 10..5 green, 4..0 blue  (unsigned short)
-                   GLCD_R5, GLCD_G6, GLCD_B5
-  original coding: 17..12 red, 11..6 green, 5..0 blue
-                   ORG_R6,  ORG_G6,  ORG_B6
-
-  ORG_R1..5 = GLCD_R0..4,  ORG_R0 = GLCD_R4
-  ORG_G0..5 = GLCD_G0..5,
-  ORG_B1..5 = GLCD_B0..4,  ORG_B0 = GLCD_B4
-
-  GLCD RGB color definitions
-******************************************************************************/
-#define Black           0x0000      /*   0,   0,   0 */
-#define Navy            0x000F      /*   0,   0, 128 */
-#define DarkGreen       0x03E0      /*   0, 128,   0 */
-#define DarkCyan        0x03EF      /*   0, 128, 128 */
-#define Maroon          0x7800      /* 128,   0,   0 */
-#define Purple          0x780F      /* 128,   0, 128 */
-#define Olive           0x7BE0      /* 128, 128,   0 */
-#define LightGrey       0xC618      /* 192, 192, 192 */
-#define DarkGrey        0x7BEF      /* 128, 128, 128 */
-#define Blue            0x001F      /*   0,   0, 255 */
-#define Green           0x07E0      /*   0, 255,   0 */
-#define Cyan            0x07FF      /*   0, 255, 255 */
-#define Red             0xF800      /* 255,   0,   0 */
-#define Magenta         0xF81F      /* 255,   0, 255 */
-#define Yellow          0xFFE0      /* 255, 255, 0   */
-#define White           0xFFFF      /* 255, 255, 255 */
-
-/************************** Orientation  configuration ************************/
-#ifndef LANDSCAPE
-#define LANDSCAPE   1               /* 1 for landscape, 0 for portrait.    */
-#endif
-#ifndef ROTATE180
-#define ROTATE180   1               /* 1 to rotate the screen for 180 deg. */
-#endif
-
-/*------------------------- Speed dependant settings -------------------------*/
-
-/* If processor works on high frequency delay has to be increased, it can be
-   increased by factor 2^N by this constant. */
-#define DELAY_2N    8
-
-/*---------------------- Graphic LCD size definitions ------------------------*/
-#if (LANDSCAPE == 1)
-   #define GLCD_WIDTH       320                 /* Screen Width (in pixels). */
-   #define GLCD_HEIGHT      240                 /* Screen Hight (in pixels). */
-#else
-   #define GLCD_WIDTH       240                 /* Screen Width (in pixels). */
-   #define GLCD_HEIGHT      320                 /* Screen Hight (in pixels). */
-#endif
-
-#define BPP                 16                  /* Bits per pixel.           */
-#define BYPP                ((BPP+7)/8)         /* Bytes per pixel.          */
-
-
-/**
- * @brief      Initialize the Himax LCD with HX8347-D LCD Controller.
- */
-void GLCD_Initialize(void);
-
-/**
- * @brief      Set draw window region to whole screen.
- */
-void GLCD_WindowMax(void);
-
-/**
- * @brief      Set draw window region.
- * @param[in]  x  Horizontal position.
- * @param[in]  y  Vertical position.
- * @param[in]  w  Window width in pixel.
- * @param[in]  h  Window height in pixels.
- */
-void GLCD_SetWindow(unsigned int x, unsigned int y,
-                     unsigned int w, unsigned int h);
-
-/**
- * @brief      Set foreground color.
- * @param[in]  color    Foreground color.
- */
-void GLCD_SetTextColor(unsigned short color);
-
-/**
- * @brief      Set background color.
- * @param[in]  color    Background color.
- */
-void GLCD_SetBackColor(unsigned short color);
-
-/**
- * @brief      Clear display.
- * @param[in]  color Display clearing color.
- *
- */
-void GLCD_Clear(unsigned short color);
-
-/**
- * @brief      Draw character on given position.
- * @param[in]  x     Horizontal position.
- * @param[in]  y     Vertical position.
- * @param[in]  cw    Character width in pixel.
- * @param[in]  ch    Character height in pixels.
- * @param[in]  c     Pointer to character bitmap.
- *
- */
-void GLCD_DrawChar(unsigned int x,  unsigned int y,
-                  unsigned int cw, unsigned int ch,
-                  unsigned char *c);
-
-/**
- * @brief      Display character on given line.
- * @param[in]  ln    Line number.
- * @param[in]  col   Column number.
- * @param[in]  fi    Font index (0 = 9x15).
- * @param[in]  c     ASCII character.
- */
-void GLCD_DisplayChar(unsigned int ln, unsigned int col,
-                     unsigned char fi, unsigned char  c);
-
-
-/**
- * @brief      Display string on given line.
- * @param[in]  ln    Line number.
- * @param[in]  col   Column number.
- * @param[in]  fi    Font index (0 = 9x15).
- * @param[in]  s     Pointer to string.
- */
-void GLCD_DisplayString(unsigned int ln, unsigned int col,
-                        unsigned char fi, char *s);
-
-/**
- * @brief      Clear given line.
- * @param[in]  ln:   Line number.
- * @param[in]  fi    Font index (0 = 9x15).
- */
-void GLCD_ClearLn(unsigned int ln, unsigned char fi);
-
-/**
- * @brief      Display graphical bitmap image at position x horizontally and y
- *             vertically. This function is optimized for 16 bits per pixel
- *             format, it has to be adapted for any other format.
- * @param[in]  x        Horizontal position.
- * @param[in]  y        Vertical position.
- * @param[in]  w        Width of bitmap.
- * @param[in]  h        Height of bitmap.
- * @param[in]  bitmap   Address at which the bitmap data resides.
- */
-void GLCD_Bitmap(unsigned int x,  unsigned int y,
-               unsigned int w, unsigned int h,
-               unsigned short *bitmap);
-
-/**
- * @brief Displays an 8 bit image, conversion to the LCD's
- *        16 bit codec is done on the fly.
- * @param[in]  data                 Pointer to the full sized image data.
- * @param[in]  width                Image width.
- * @param[in]  height               Image height.
- * @param[in]  channels             Number of channels in the image.
- * @param[in]  pos_x                Start x position for the LCD.
- * @param[in]  pos_y                Start y position for the LCD.
- * @param[in]  downsample_factor    Factor by which the image
- *                                  is downsampled by.
- */
-void GLCD_Image(const void *data, const uint32_t width,
-               const uint32_t height, const uint32_t channels,
-               const uint32_t pos_x, const uint32_t pos_y,
-               const uint32_t downsample_factor);
-
-/**
- * @brief      Draw box filled with color.
- * @param[in]  x        Horizontal position.
- * @param[in]  y        Vertical position.
- * @param[in]  w        Window width in pixels.
- * @param[in]  h        Window height in pixels.
- * @param[in]  color    Box color.
- */
-void GLCD_Box(unsigned int x, unsigned int y,
-            unsigned int w, unsigned int h,
-            unsigned short color);
-
-#endif /* GLCD_MPS3_H */
diff --git a/source/hal/components/uart_cmsdk/include/uart_stdout.h b/source/hal/components/uart_cmsdk/include/uart_stdout.h
deleted file mode 100644
index 9c5fbcf..0000000
--- a/source/hal/components/uart_cmsdk/include/uart_stdout.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2021 Arm Limited. All rights reserved.
- * SPDX-License-Identifier: Apache-2.0
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef UART_STDOUT_H
-#define UART_STDOUT_H
-
-#include <stdbool.h>
-
-/**
- * @brief       Initialised the UART block.
- **/
-extern void UartStdOutInit(void);
-
-/**
- * @brief       Transmits a character over UART (blocking call).
- * @param[in]   my_ch Character to be transmitted.
- * @return      Character transmitted.
- **/
-extern unsigned char UartPutc(unsigned char my_ch);
-
-/**
- * @brief       Receives a character from the UART block (blocking call).
- * @return      Character received.
- **/
-extern unsigned char UartGetc(void);
-
-/**
- * @brief       Reads characters from the UART block until a line feed or
- *              carriage return terminates the function. NULL character
- *              also terminates the function, error is returned.
- * @param[out]  lp      Characters read from the UART block.
- * @param[in]   len     Character to be transmitted.
- * @return      true if successful, false otherwise.
- **/
-extern bool GetLine(char *lp, unsigned int len);
-
-/**
- * @brief       Terminates UART simulation. This is useful when a Fixed
- *              Virtual Platform's session needs to be gracefully terminated.
- * @param[in]   code Terminating code displayed on the UART before the end of the simulation.
- **/
-extern void UartEndSimulation(int code);
-
-#endif /* UART_STDOUT_H */
diff --git a/source/hal/components/uart_cmsdk/uart_cmsdk.c b/source/hal/components/uart_cmsdk/uart_cmsdk.c
deleted file mode 100644
index 35d4160..0000000
--- a/source/hal/components/uart_cmsdk/uart_cmsdk.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright (c) 2021 Arm Limited. All rights reserved.
- * SPDX-License-Identifier: Apache-2.0
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include "uart_stdout.h"
-
-#include "device_mps3.h"
-
-#include <stdio.h>
-
-#define CNTLQ       0x11
-#define CNTLS       0x13
-#define DEL         0x7F
-#define BACKSPACE   0x08
-#define CR          0x0D
-#define LF          0x0A
-#define ESC         0x1B
-
-void UartStdOutInit(void)
-{
-    CMSDK_UART0->BAUDDIV = PERIF_CLK / 115200;   /* => (25 or 32 MHz) / (115200 bps). */
-    CMSDK_UART0->CTRL    = ((1ul <<  0) |              /* TX enable. */
-                            (1ul <<  1) );             /* RX enable. */
-    return;
-}
-
-unsigned char UartPutc(unsigned char my_ch)
-{
-    while ((CMSDK_UART0->STATE & 1)); /* Wait if Transmit Holding register is full. */
-
-    if (my_ch == '\n') {
-        CMSDK_UART0->DATA  = '\r';
-        while ((CMSDK_UART0->STATE & 1)); /* Wait if Transmit Holding register is full. */
-    }
-
-    CMSDK_UART0->DATA = my_ch; /* Write to transmit holding register. */
-    return (my_ch);
-}
-
-unsigned char UartGetc(void)
-{
-    unsigned char my_ch;
-    unsigned int  cnt;
-
-    /* Wait if Receive Holding register is empty. */
-    while (0 == (CMSDK_UART0->STATE & 2)) {
-        cnt = MPS3_FPGAIO->CLK100HZ / 50;
-        if (cnt & 0x8) {
-            MPS3_FPGAIO->LED = 0x01 << (cnt & 0x7);
-        }
-        else {
-            MPS3_FPGAIO->LED = 0x80 >> (cnt & 0x7);
-        }
-    }
-
-    my_ch = CMSDK_UART0->DATA;
-
-    /* Convert CR to LF. */
-    if(my_ch == '\r') {
-        my_ch = '\n';
-    }
-
-    return (my_ch);
-}
-
-bool GetLine(char *lp, unsigned int len)
-{
-    unsigned int cnt = 0;
-    char c;
-
-    do {
-        c = UartGetc ();
-        switch (c) {
-            case CNTLQ:                       /* Ignore Control S/Q.            */
-            case CNTLS:
-                break;
-
-            case BACKSPACE:
-            case DEL:
-                if (cnt == 0) {
-                    break;
-                }
-                cnt--;                         /* Decrement count.               */
-                lp--;                          /* Decrement line pointer.        */
-                UartPutc (0x08);               /* Echo backspace.                */
-                UartPutc (' ');
-                UartPutc (0x08);
-                fflush (stdout);
-                break;
-
-            case ESC:
-            case 0:
-                *lp = 0;                        /* ESC - stop editing line.       */
-                return false;
-
-            case CR:                            /* CR - done, stop editing line.  */
-                UartPutc (*lp = c);             /* Echo and store character.      */
-                lp++;                           /* Increment line pointer         */
-                cnt++;                          /* and count.                     */
-                c = LF;
-                UartPutc (*lp = c);             /* Echo and store character.      */
-                fflush (stdout);
-                lp++;                           /* Increment line pointer         */
-                    cnt++;                      /* and count.                     */
-                break;
-            default:
-                UartPutc (*lp = c);             /* Echo and store character.      */
-                fflush (stdout);
-                lp++;                           /* Increment line pointer         */
-                    cnt++;                      /* and count.                     */
-                break;
-        }
-    } while (cnt < len - 2  &&  c != LF);       /* Check limit and CR.            */
-    *lp = 0;                                    /* Mark end of string.            */
-
-    return true;
-}
-
-__attribute__((noreturn)) void UartEndSimulation(int code)
-{
-    UartPutc((char) 0x4);   /* End of simulation */
-    UartPutc((char) code);  /* End of simulation */
-    while(1);
-}
diff --git a/source/hal/components/uart_pl011/include/uart_stdout.h b/source/hal/components/uart_pl011/include/uart_stdout.h
deleted file mode 100644
index 9c5fbcf..0000000
--- a/source/hal/components/uart_pl011/include/uart_stdout.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2021 Arm Limited. All rights reserved.
- * SPDX-License-Identifier: Apache-2.0
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef UART_STDOUT_H
-#define UART_STDOUT_H
-
-#include <stdbool.h>
-
-/**
- * @brief       Initialised the UART block.
- **/
-extern void UartStdOutInit(void);
-
-/**
- * @brief       Transmits a character over UART (blocking call).
- * @param[in]   my_ch Character to be transmitted.
- * @return      Character transmitted.
- **/
-extern unsigned char UartPutc(unsigned char my_ch);
-
-/**
- * @brief       Receives a character from the UART block (blocking call).
- * @return      Character received.
- **/
-extern unsigned char UartGetc(void);
-
-/**
- * @brief       Reads characters from the UART block until a line feed or
- *              carriage return terminates the function. NULL character
- *              also terminates the function, error is returned.
- * @param[out]  lp      Characters read from the UART block.
- * @param[in]   len     Character to be transmitted.
- * @return      true if successful, false otherwise.
- **/
-extern bool GetLine(char *lp, unsigned int len);
-
-/**
- * @brief       Terminates UART simulation. This is useful when a Fixed
- *              Virtual Platform's session needs to be gracefully terminated.
- * @param[in]   code Terminating code displayed on the UART before the end of the simulation.
- **/
-extern void UartEndSimulation(int code);
-
-#endif /* UART_STDOUT_H */
diff --git a/source/hal/components/uart_pl011/uart_pl011.c b/source/hal/components/uart_pl011/uart_pl011.c
deleted file mode 100644
index 1cbf70c..0000000
--- a/source/hal/components/uart_pl011/uart_pl011.c
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * Copyright (c) 2021 Arm Limited. All rights reserved.
- * SPDX-License-Identifier: Apache-2.0
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include "uart_stdout.h"
-#include "peripheral_memmap.h"      /* peripheral memory map definitions */
-
-#include <stdio.h>
-#include <stdint.h>
-
-#define CNTLQ       0x11
-#define CNTLS       0x13
-#define DEL         0x7F
-#define BACKSPACE   0x08
-#define CR          0x0D
-#define LF          0x0A
-#define ESC         0x1B
-
-#define UARTBASE    (PL011_UART0_BASE)
-
-/*****************************************************************************/
-/*  UART Control Register Locations                                          */
-/*****************************************************************************/
-#define UART0_DR   *((volatile unsigned *) UARTBASE)
-#define UART0_RSR  *((volatile unsigned *)(UARTBASE + 0x04))
-#define UART0_ECR  *((volatile unsigned *)(UARTBASE + 0x04))
-#define UART0_LCRH *((volatile unsigned *)(UARTBASE + 0x2C))
-#define UART0_LCRM *((volatile unsigned *)(UARTBASE + 0x28))
-#define UART0_LCRL *((volatile unsigned *)(UARTBASE + 0x24))
-#define UART0_CR   *((volatile unsigned *)(UARTBASE + 0x30))
-#define UART0_FR   *((volatile unsigned *)(UARTBASE + 0x18))
-#define UART0_IIR  *((volatile unsigned *)(UARTBASE + 0x1C))
-#define UART0_ICR  *((volatile unsigned *)(UARTBASE + 0x44))
-
-/*****************************************************************************/
-/* Received Status Register - RSR                                            */
-/*****************************************************************************/
-#define RSR_OVERRUN_ERROR   0x08
-#define RSR_BREAK_ERROR     0x04
-#define RSR_PARITY_ERROR    0x02
-#define RSR_FRAMING_ERROR   0x01
-
-/*****************************************************************************/
-/* Line Control High Byte Register - LCRH                                    */
-/*****************************************************************************/
-#define LCRH_WORD_LENGTH_8  0x60
-#define LCRH_WORD_LENGTH_7  0x40
-#define LCRH_WORD_LENGTH_6  0x20
-#define LCRH_WORD_LENGTH_5  0x00
-#define LCRH_FIFO_ENABLED   0x10
-#define LCRH_2_STOP_BITS    0x08
-#define LCRH_EVEN_PARITY    0x04
-#define LCRH_PARITY_ENABLE  0x02
-#define LCRH_SEND_BREAK     0x01
-
-/*****************************************************************************/
-/* Line Control Medium Byte Register - LCRM                                  */
-/* This register specifies the high byte of the Baud rate divisor            */
-/*****************************************************************************/
-#define LCRM_BAUD_460800  0x00
-#define LCRM_BAUD_230400  0x00
-#define LCRM_BAUD_115200  0x00
-#define LCRM_BAUD_76800   0x00
-#define LCRM_BAUD_57600   0x00
-#define LCRM_BAUD_38400   0x00
-#define LCRM_BAUD_19200   0x00
-#define LCRM_BAUD_14400   0x00
-#define LCRM_BAUD_9600    0x00
-#define LCRM_BAUD_2400    0x01
-#define LCRM_BAUD_1200    0x02
-
-/*****************************************************************************/
-/* Line Control Low Byte Register - LCRL                                     */
-/* This register specifies the low byte of the Baud rate divisor             */
-/*****************************************************************************/
-#define LCRL_BAUD_460800  0x01
-#define LCRL_BAUD_230400  0x03
-#define LCRL_BAUD_115200  0x07
-#define LCRL_BAUD_76800   0x0B
-#define LCRL_BAUD_57600   0x0F
-#define LCRL_BAUD_38400   0xC
-#define LCRL_BAUD_19200   0x2F
-#define LCRL_BAUD_14400   0x3F
-#define LCRL_BAUD_9600    0x5F
-#define LCRL_BAUD_2400    0x7F
-#define LCRL_BAUD_1200    0xFF
-
-/*****************************************************************************/
-/* Control Register - CR                                                     */
-/*****************************************************************************/
-#define CR_LOOP_BACK_EN   0x80
-#define CR_TIMEOUT_INT_EN 0x40
-#define CR_TX_INT_ENABLE  0x100
-#define CR_RX_INT_ENABLE  0x200
-#define CR_MODSTAT_INT_EN 0x08
-#define CR_UART_ENABLE    0x01
-
-/*****************************************************************************/
-/* Flag Register - FR                                                        */
-/*****************************************************************************/
-#define FR_TX_FIFO_EMPTY  0x80
-#define FR_RX_FIFO_FULL   0x40
-#define FR_TX_FIFO_FULL   0x20
-#define FR_RX_FIFO_EMPTY  0x10
-#define FR_BUSY           0x08
-#define FR_CARRIER_DETECT 0x04
-#define FR_SET_READY      0x02
-#define FR_CLEAR_TO_SEND  0x01
-
-/*****************************************************************************/
-/* Interrupt Identification Register - IIR                                   */
-/*****************************************************************************/
-#define IIR_RX_TIME_OUT   0x08
-#define IIR_TX            0x04
-#define IIR_RX            0x02
-#define IIR_MODEM         0x01
-
-void UartStdOutInit(void)
-{
-    /* Disable the serial port while setting the baud rate and word length. */
-    UART0_CR = 0;
-
-    /* Clear the receive status register. */
-    UART0_ECR = 0;
-
-    /* Set the correct baud rate and word length. */
-    UART0_LCRL = LCRL_BAUD_115200;
-    UART0_LCRM = LCRM_BAUD_115200;
-    UART0_LCRH = LCRH_WORD_LENGTH_8;
-
-    /* Explicitly disable FIFO's for char mode. */
-    UART0_LCRH &= ~LCRH_FIFO_ENABLED;
-
-    /* Enable UART0 (and RX/TX) without interrupts. */
-    UART0_CR = CR_UART_ENABLE | CR_TX_INT_ENABLE | CR_RX_INT_ENABLE;
-}
-
-unsigned char UartPutc(unsigned char ch)
-{
-    if (ch == '\n') {
-        (void) UartPutc('\r');
-    }
-    while (UART0_FR & FR_TX_FIFO_FULL)
-        ;
-    UART0_DR = ch;
-
-    return ch;
-}
-
-unsigned char UartGetc(void)
-{
-    unsigned char c;
-    while (UART0_FR & FR_RX_FIFO_EMPTY)
-        ;
-    c = UART0_DR;
-    if (c == '\r') {
-        c = '\n';
-    }
-
-    return c;
-}
-
-bool GetLine (char *lp, unsigned int len)
-{
-    unsigned int cnt = 0;
-    char c;
-
-    do {
-        c = UartGetc();
-        switch (c) {
-            case CNTLQ:                       /* ignore Control S/Q.            */
-            case CNTLS:
-                break;
-            case BACKSPACE:
-            case DEL:
-                if (cnt == 0) {
-                    break;
-                }
-                cnt--;                         /* decrement count.               */
-                lp--;                          /* and line pointer.              */
-                UartPutc (0x08);               /* echo backspace.                */
-                UartPutc (' ');
-                UartPutc (0x08);
-                fflush (stdout);
-                break;
-            case ESC:
-            case 0:
-                *lp = 0;                       /* ESC - stop editing line.       */
-                return false;
-            case CR:                            /* CR - done, stop editing line. */
-                UartPutc (*lp = c);             /* Echo and store character.     */
-                lp++;                           /* Increment line pointer        */
-                cnt++;                          /* and count.                    */
-                c = LF;
-                UartPutc (*lp = c);             /* Echo and store character.      */
-                fflush (stdout);
-                lp++;                           /* Increment line pointer         */
-                cnt++;                          /* and count.                     */
-                break;
-            default:
-                UartPutc (*lp = c);            /* echo and store character.      */
-                fflush (stdout);
-                lp++;                          /* increment line pointer.        */
-                cnt++;                         /* and count.                     */
-                break;
-        }
-    } while (cnt < len - 2  &&  c != LF);      /* check limit and CR.            */
-    *lp = 0;                                   /* mark end of string.            */
-    return true;
-}
-
-__attribute__((noreturn)) void UartEndSimulation(int code)
-{
-    UartPutc((char) 0x4);  // End of simulation
-    UartPutc((char) code); // Exit code
-    while(1);
-}