From 8fb4d80f29274583c2372049eb706547e0fcfcea Mon Sep 17 00:00:00 2001 From: Heuisam Kwag Date: Mon, 28 Sep 2020 16:11:01 +0900 Subject: [PATCH 1/4] targets/s1sbp6a: fix typo Signed-off-by: Heuisam Kwag --- targets/TARGET_Samsung/TARGET_SIDK_S1SBP6A/PinNames.h | 2 -- .../TARGET_SIDK_S1SBP6A/device/TOOLCHAIN_ARM_STD/s1sbp6a.sct | 4 ++-- .../TARGET_Samsung/TARGET_SIDK_S1SBP6A/device/memory_zones.h | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/targets/TARGET_Samsung/TARGET_SIDK_S1SBP6A/PinNames.h b/targets/TARGET_Samsung/TARGET_SIDK_S1SBP6A/PinNames.h index 5387ceca670..6547bc5dbe2 100644 --- a/targets/TARGET_Samsung/TARGET_SIDK_S1SBP6A/PinNames.h +++ b/targets/TARGET_Samsung/TARGET_SIDK_S1SBP6A/PinNames.h @@ -107,8 +107,6 @@ typedef enum { ECG_INP, ECG_INN, - UART_TX0 = GPIO24, - UART_RX0 = GPIO25, AN0 = GPA0_INP, AN1 = GPA1_INP, AN2 = GPA24_INP0, diff --git a/targets/TARGET_Samsung/TARGET_SIDK_S1SBP6A/device/TOOLCHAIN_ARM_STD/s1sbp6a.sct b/targets/TARGET_Samsung/TARGET_SIDK_S1SBP6A/device/TOOLCHAIN_ARM_STD/s1sbp6a.sct index d8937240aef..26641b46673 100644 --- a/targets/TARGET_Samsung/TARGET_SIDK_S1SBP6A/device/TOOLCHAIN_ARM_STD/s1sbp6a.sct +++ b/targets/TARGET_Samsung/TARGET_SIDK_S1SBP6A/device/TOOLCHAIN_ARM_STD/s1sbp6a.sct @@ -37,7 +37,7 @@ #endif #if !defined(MBED_ROM_SIZE) -#define MBED_ROM_SIZE 0x200000 // 2MB KB +#define MBED_ROM_SIZE 0x200000 // 2 MB #endif #if !defined(MBED_RAM_START) @@ -52,7 +52,7 @@ #define MBED_APP_START 0x00000000 #endif #if !defined(MBED_APP_SIZE) -#define MBED_APP_SIZE 0x0080000 //512K +#define MBED_APP_SIZE 0x0080000 //512KB #endif #if !defined(MBED_CONF_TARGET_BOOT_STACK_SIZE) diff --git a/targets/TARGET_Samsung/TARGET_SIDK_S1SBP6A/device/memory_zones.h b/targets/TARGET_Samsung/TARGET_SIDK_S1SBP6A/device/memory_zones.h index 778440cb2ed..ab77af85284 100644 --- a/targets/TARGET_Samsung/TARGET_SIDK_S1SBP6A/device/memory_zones.h +++ b/targets/TARGET_Samsung/TARGET_SIDK_S1SBP6A/device/memory_zones.h @@ -45,7 +45,7 @@ #endif #if !defined(MBED_ROM_SIZE) -#define MBED_ROM_SIZE 0x200000 // 2MB KB +#define MBED_ROM_SIZE 0x200000 // 2MB #endif #if !defined(MBED_RAM_START) @@ -53,7 +53,7 @@ #endif #if !defined(MBED_RAM_SIZE) -#define MBED_RAM_SIZE 0x40000 // 256 KB +#define MBED_RAM_SIZE 0x40000 // 25KB #endif #if !defined(MBED_APP_START) From bc681135662f03dbe41e735b02267ed11eb3b7b1 Mon Sep 17 00:00:00 2001 From: Heuisam Kwag Date: Mon, 28 Sep 2020 16:13:01 +0900 Subject: [PATCH 2/4] targets/s1sbp6a: fix uart baud rate setting of UART1~2 Signed-off-by: Heuisam Kwag --- targets/TARGET_Samsung/TARGET_SIDK_S1SBP6A/serial_api.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/targets/TARGET_Samsung/TARGET_SIDK_S1SBP6A/serial_api.c b/targets/TARGET_Samsung/TARGET_SIDK_S1SBP6A/serial_api.c index dc54cdd4369..99f9c13bb3e 100644 --- a/targets/TARGET_Samsung/TARGET_SIDK_S1SBP6A/serial_api.c +++ b/targets/TARGET_Samsung/TARGET_SIDK_S1SBP6A/serial_api.c @@ -139,7 +139,7 @@ void serial_baud(serial_t *obj, int baudrate) struct serial_s *objs = serial_s(obj); float fFrac = 0; float fDiv = 0; - uint32_t Peri_Clock = bp6a_cmu_get_clock_freq(CMU_UART0_CLK); + uint32_t Peri_Clock = bp6a_cmu_get_clock_freq(CMU_UART0_CLK + obj->index); fDiv = ((float)Peri_Clock / ((float)baudrate * 16)) - (float)1.0; fFrac = (uint32_t)((fDiv - (int32_t)fDiv) * 16.0f); @@ -215,7 +215,7 @@ void uart1_irq(void) void uart2_irq(void) { - uint32_t uints = getreg32(BP_UART0_BASE + UART_UINTP_OFFSET); + uint32_t uints = getreg32(BP_UART2_BASE + UART_UINTP_OFFSET); if (uints & UART_UINTS_RXD_MASK) { _uart_irq_handler(RxIrq, 2); From f0679cca367d3c4821b037d6cbff7d43b7dcc800 Mon Sep 17 00:00:00 2001 From: Heuisam Kwag Date: Mon, 28 Sep 2020 17:04:13 +0900 Subject: [PATCH 3/4] tartgets/s1sbp6a: fix afe clock initial value Signed-off-by: Heuisam Kwag --- .../TARGET_Samsung/TARGET_SIDK_S1SBP6A/device/system_s1sbp6a.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/targets/TARGET_Samsung/TARGET_SIDK_S1SBP6A/device/system_s1sbp6a.c b/targets/TARGET_Samsung/TARGET_SIDK_S1SBP6A/device/system_s1sbp6a.c index 622e92b65fd..3ad3d34659c 100644 --- a/targets/TARGET_Samsung/TARGET_SIDK_S1SBP6A/device/system_s1sbp6a.c +++ b/targets/TARGET_Samsung/TARGET_SIDK_S1SBP6A/device/system_s1sbp6a.c @@ -37,7 +37,7 @@ static void peripheral_init(void) { /*AFE Voltage Config */ putreg32(&BP_AFE_TOP->REF_CTRL, 0x7A68201F); - putreg32(&BP_AFE_TOP->AFE_CLK_CTRL, 0x0); + putreg32(&BP_AFE_TOP->AFE_CLK_CTRL, 0x08); } void SystemCoreClockUpdate(void) /* Get Core Clock Frequency */ From 6ff504a89f27d3685d653de804a6e216550f5e2e Mon Sep 17 00:00:00 2001 From: Heuisam Kwag Date: Mon, 28 Sep 2020 17:05:42 +0900 Subject: [PATCH 4/4] targets/s1sb6a: change UART_STDIO_PORT from UART0 to UART2 Signed-off-by: Heuisam Kwag --- .../TARGET_SIDK_S1SBP6A/PeripheralNames.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/targets/TARGET_Samsung/TARGET_SIDK_S1SBP6A/PeripheralNames.h b/targets/TARGET_Samsung/TARGET_SIDK_S1SBP6A/PeripheralNames.h index bc03b71c577..8aee5b580c8 100644 --- a/targets/TARGET_Samsung/TARGET_SIDK_S1SBP6A/PeripheralNames.h +++ b/targets/TARGET_Samsung/TARGET_SIDK_S1SBP6A/PeripheralNames.h @@ -66,17 +66,17 @@ typedef enum { #define _UART_NAME(a, b) _UART_NAME_(a, b) #ifndef UART_STDIO_PORT -#define STDIO_UART_TX UART_TX0 -#define STDIO_UART_RX UART_RX0 -#define STDIO_UART UART_0 +#define STDIO_UART_TX UART2_TX +#define STDIO_UART_RX UART2_RX +#define STDIO_UART UART_2 #else #define STDIO_UART_TX _UART_NAME(UART_TX, UART_STDIO_PORT) #define STDIO_UART_RX _UART_NAME(UART_RX, UART_STDIO_PORT) #define STDIO_UART _UART_NAME(UART_, UART_STDIO_PORT) #endif -#define USBTX UART_TX0 -#define USBRX UART_RX0 +#define USBTX UART2_TX +#define USBRX UART2_RX #ifdef __cplusplus }