From 0c717b970637cde40526b1d2b4cba69a8b69e6ce Mon Sep 17 00:00:00 2001 From: Bhuvanchandra DV Date: Mon, 3 Oct 2016 21:00:12 +0530 Subject: examples: vf6xx_colibri_m4: Configure UART2 pins Add IOMUX configuration for UART2 pins Signed-off-by: Bhuvanchandra DV Signed-off-by: Stefan Agner --- examples/vf6xx_colibri_m4/demo_apps/gpio_sample/armgcc/CMakeLists.txt | 2 ++ examples/vf6xx_colibri_m4/demo_apps/gpio_sample/main.c | 2 ++ examples/vf6xx_colibri_m4/demo_apps/hello_world/armgcc/CMakeLists.txt | 2 ++ examples/vf6xx_colibri_m4/demo_apps/hello_world/main.c | 2 ++ .../vf6xx_colibri_m4/demo_apps/rpmsg/pingpong/armgcc/CMakeLists.txt | 2 ++ examples/vf6xx_colibri_m4/demo_apps/rpmsg/pingpong/pingpong.c | 2 ++ .../vf6xx_colibri_m4/demo_apps/rpmsg/str_echo/armgcc/CMakeLists.txt | 2 ++ examples/vf6xx_colibri_m4/demo_apps/rpmsg/str_echo/rpmsg_str_echo.c | 2 ++ 8 files changed, 16 insertions(+) diff --git a/examples/vf6xx_colibri_m4/demo_apps/gpio_sample/armgcc/CMakeLists.txt b/examples/vf6xx_colibri_m4/demo_apps/gpio_sample/armgcc/CMakeLists.txt index c580c64..e08c2a4 100644 --- a/examples/vf6xx_colibri_m4/demo_apps/gpio_sample/armgcc/CMakeLists.txt +++ b/examples/vf6xx_colibri_m4/demo_apps/gpio_sample/armgcc/CMakeLists.txt @@ -127,6 +127,8 @@ ADD_EXECUTABLE(gpio_sample "${ProjDirPath}/../../../../../platform/utilities/src/print_scan.h" "${ProjDirPath}/../../../../../platform/devices/VF6XX/startup/system_VF6XX_M4.c" "${ProjDirPath}/../../../../../platform/devices/VF6XX/startup/system_VF6XX_M4.h" + "${ProjDirPath}/../../../pin_mux.c" + "${ProjDirPath}/../../../pin_mux.h" ) SET_TARGET_PROPERTIES(gpio_sample PROPERTIES OUTPUT_NAME "gpio_sample.elf") diff --git a/examples/vf6xx_colibri_m4/demo_apps/gpio_sample/main.c b/examples/vf6xx_colibri_m4/demo_apps/gpio_sample/main.c index ae22319..8b29c54 100644 --- a/examples/vf6xx_colibri_m4/demo_apps/gpio_sample/main.c +++ b/examples/vf6xx_colibri_m4/demo_apps/gpio_sample/main.c @@ -35,6 +35,7 @@ #include #include #include "debug_console_vf6xx.h" +#include "pin_mux.h" struct hello_world { const char *text; @@ -73,6 +74,7 @@ int main(void) CCM_GetClocks(); CCM_ControlGate(ccmCcgrGateUart2, ccmClockNeededAll); + configure_uart_pins(UART2); vf6xx_DbgConsole_Init(UART2, ccmIpgBusClk, 115200); gpio_init_t ledIn = {.pin = 38, .direction = gpioDigitalInput}; diff --git a/examples/vf6xx_colibri_m4/demo_apps/hello_world/armgcc/CMakeLists.txt b/examples/vf6xx_colibri_m4/demo_apps/hello_world/armgcc/CMakeLists.txt index 741b0c6..57055bf 100644 --- a/examples/vf6xx_colibri_m4/demo_apps/hello_world/armgcc/CMakeLists.txt +++ b/examples/vf6xx_colibri_m4/demo_apps/hello_world/armgcc/CMakeLists.txt @@ -127,6 +127,8 @@ ADD_EXECUTABLE(hello_world "${ProjDirPath}/../../../../../platform/utilities/src/print_scan.h" "${ProjDirPath}/../../../../../platform/devices/VF6XX/startup/system_VF6XX_M4.c" "${ProjDirPath}/../../../../../platform/devices/VF6XX/startup/system_VF6XX_M4.h" + "${ProjDirPath}/../../../pin_mux.c" + "${ProjDirPath}/../../../pin_mux.h" ) SET_TARGET_PROPERTIES(hello_world PROPERTIES OUTPUT_NAME "hello_world.elf") diff --git a/examples/vf6xx_colibri_m4/demo_apps/hello_world/main.c b/examples/vf6xx_colibri_m4/demo_apps/hello_world/main.c index 1fad4c2..c661f02 100644 --- a/examples/vf6xx_colibri_m4/demo_apps/hello_world/main.c +++ b/examples/vf6xx_colibri_m4/demo_apps/hello_world/main.c @@ -34,6 +34,7 @@ #include #include #include "debug_console_vf6xx.h" +#include "pin_mux.h" /*! * @brief A basic user-defined task @@ -58,6 +59,7 @@ int main(void) CCM_GetClocks(); CCM_ControlGate(ccmCcgrGateUart2, ccmClockNeededAll); + configure_uart_pins(UART2); vf6xx_DbgConsole_Init(UART2, ccmIpgBusClk, 115200); xTaskCreate(HelloTask, "Print Task", configMINIMAL_STACK_SIZE, diff --git a/examples/vf6xx_colibri_m4/demo_apps/rpmsg/pingpong/armgcc/CMakeLists.txt b/examples/vf6xx_colibri_m4/demo_apps/rpmsg/pingpong/armgcc/CMakeLists.txt index 117a194..7e28f61 100644 --- a/examples/vf6xx_colibri_m4/demo_apps/rpmsg/pingpong/armgcc/CMakeLists.txt +++ b/examples/vf6xx_colibri_m4/demo_apps/rpmsg/pingpong/armgcc/CMakeLists.txt @@ -153,6 +153,8 @@ ADD_EXECUTABLE(rpmsg_pingpong_example "${ProjDirPath}/../../../../../../platform/devices/VF6XX/startup/system_VF6XX_M4.c" "${ProjDirPath}/../../../../../../platform/devices/VF6XX/startup/system_VF6XX_M4.h" "${ProjDirPath}/../pingpong.c" + "${ProjDirPath}/../../../../pin_mux.c" + "${ProjDirPath}/../../../../pin_mux.h" ) SET_TARGET_PROPERTIES(rpmsg_pingpong_example PROPERTIES OUTPUT_NAME "rpmsg_pingpong_example.elf") diff --git a/examples/vf6xx_colibri_m4/demo_apps/rpmsg/pingpong/pingpong.c b/examples/vf6xx_colibri_m4/demo_apps/rpmsg/pingpong/pingpong.c index 07639b4..6fa1d1c 100644 --- a/examples/vf6xx_colibri_m4/demo_apps/rpmsg/pingpong/pingpong.c +++ b/examples/vf6xx_colibri_m4/demo_apps/rpmsg/pingpong/pingpong.c @@ -38,6 +38,7 @@ #include "plat_porting.h" #include #include "debug_console_vf6xx.h" +#include "pin_mux.h" /* * function decalaration for platform provided facility @@ -100,6 +101,7 @@ int main(void) CCM_GetClocks(); CCM_ControlGate(ccmCcgrGateUart2, ccmClockNeededAll); + configure_uart_pins(UART2); vf6xx_DbgConsole_Init(UART2, ccmIpgBusClk, 115200); printf("Starting RPMSG PingPong Demo...\r\n"); diff --git a/examples/vf6xx_colibri_m4/demo_apps/rpmsg/str_echo/armgcc/CMakeLists.txt b/examples/vf6xx_colibri_m4/demo_apps/rpmsg/str_echo/armgcc/CMakeLists.txt index 35ba82c..bc99266 100644 --- a/examples/vf6xx_colibri_m4/demo_apps/rpmsg/str_echo/armgcc/CMakeLists.txt +++ b/examples/vf6xx_colibri_m4/demo_apps/rpmsg/str_echo/armgcc/CMakeLists.txt @@ -153,6 +153,8 @@ ADD_EXECUTABLE(rpmsg_str_echo_example "${ProjDirPath}/../../../../../../platform/devices/VF6XX/startup/system_VF6XX_M4.c" "${ProjDirPath}/../../../../../../platform/devices/VF6XX/startup/system_VF6XX_M4.h" "${ProjDirPath}/../rpmsg_str_echo.c" + "${ProjDirPath}/../../../../pin_mux.c" + "${ProjDirPath}/../../../../pin_mux.h" ) SET_TARGET_PROPERTIES(rpmsg_str_echo_example PROPERTIES OUTPUT_NAME "rpmsg_str_echo_example.elf") diff --git a/examples/vf6xx_colibri_m4/demo_apps/rpmsg/str_echo/rpmsg_str_echo.c b/examples/vf6xx_colibri_m4/demo_apps/rpmsg/str_echo/rpmsg_str_echo.c index 4c7847d..7e4073a 100644 --- a/examples/vf6xx_colibri_m4/demo_apps/rpmsg/str_echo/rpmsg_str_echo.c +++ b/examples/vf6xx_colibri_m4/demo_apps/rpmsg/str_echo/rpmsg_str_echo.c @@ -40,6 +40,7 @@ #include "plat_porting.h" #include #include "debug_console_vf6xx.h" +#include "pin_mux.h" /* * function decalaration for platform provided facility @@ -144,6 +145,7 @@ int main(void) CCM_GetClocks(); CCM_ControlGate(ccmCcgrGateUart2, ccmClockNeededAll); + configure_uart_pins(UART2); vf6xx_DbgConsole_Init(UART2, ccmIpgBusClk, 115200); printf("Starting RPMSG String Echo Demo...\r\n"); -- cgit v1.2.3