ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #14325 from AGlass0fMilk/ep-atlas-reg-init 

EP Atlas Target Updates
pull/14367/head
Martin Kojtal 2021-03-02 09:41:28 +00:00 committed by GitHub
parent 44e9e3ca80 d00699c70f
commit f78c24135c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 199 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/CMakeLists.txt
View File

@ -28,6 +28,7 @@ target_sources(mbed-nrf52
serial_api.c
sleep.c
spi_api.c
subtarget_init.c
trng_api.c
us_ticker.c
watchdog_api.c

7
targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/CMakeLists.txt
View File

@ -25,6 +25,13 @@ target_include_directories(mbed-ep-atlas
TARGET_EP_ATLAS
)
target_sources(mbed-ep-atlas
INTERFACE
TARGET_EP_ATLAS/ONBOARD_TELIT_ME310.cpp
TARGET_EP_ATLAS/usb_stdio.cpp
TARGET_EP_ATLAS/atlas_init.c
)
target_include_directories(mbed-nrf52840-dk
INTERFACE
TARGET_NRF52840_DK

44
targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/TARGET_EP_ATLAS/atlas_init.c Normal file
View File

@ -0,0 +1,44 @@
/* mbed Microcontroller Library
* Copyright (c) 2021 ARM Limited
* Copyright (c) 2021 Embedded Planet, Inc.
* 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 <stdint.h>
#include "subtarget_init.h"
#include "nrf.h"
/**
* Override the subtarget sdk init startup hook (specific to nRF2)
* This will configure the internal regulator to operate at 3.3V
*/
void subtarget_sdk_init(void)
{
if (NRF_UICR->REGOUT0 != UICR_REGOUT0_VOUT_3V3) {
NRF_NVMC->CONFIG = NVMC_CONFIG_WEN_Wen << NVMC_CONFIG_WEN_Pos;
while (NRF_NVMC->READY == NVMC_READY_READY_Busy) {}
NRF_UICR->REGOUT0 = UICR_REGOUT0_VOUT_3V3;
NRF_NVMC->CONFIG = NVMC_CONFIG_WEN_Ren << NVMC_CONFIG_WEN_Pos;
while (NRF_NVMC->READY == NVMC_READY_READY_Busy) {}
// Trigger a soft reset so that the settings take effect
NVIC_SystemReset();
}
}

11
targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/TARGET_EP_ATLAS/mbed_lib.json
View File

@ -10,13 +10,18 @@
"help" : "Telit ME310C1 AT#PORTCFG Variant value",
"macro_name" : "EP_ATLAS_PORT_CONFIGURATION_VARIANT",
"value" : 0
},
"enable-usb-stdio-console": {
"help" : "Enables using USB Serial for the stdio console. If you use USB in your application, you must disable this feature and implement a composite USB device if you require USB serial output. This feature is disabled by default.",
"value" : false
}
},
"target_overrides": {
"EP_ATLAS": {
"target.network-default-interface-type": "CELLULAR"
"target.network-default-interface-type": "CELLULAR",
"target.mbed_app_start": "0x1000",
"target.mbed_app_size": "0xDF000"
}
}
}
}

35
targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/TARGET_EP_ATLAS/usb_stdio.cpp Normal file
View File

@ -0,0 +1,35 @@
/* mbed Microcontroller Library
* Copyright (c) 2021 ARM Limited
* Copyright (c) 2021 Embedded Planet, Inc.
* 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 "USBSerial.h"
#include "platform/mbed_retarget.h"
#ifndef MBED_CONF_EP_ATLAS_ENABLE_USB_STDIO_CONSOLE
#define MBED_CONF_EP_ATLAS_ENABLE_USB_STDIO_CONSOLE 0
#endif
#if MBED_CONF_EP_ATLAS_ENABLE_USB_STDIO_CONSOLE
/* Retarget stdio to USBSerial */
mbed::FileHandle *mbed::mbed_target_override_console(int fd)
{
static USBSerial usb_serial;
return &usb_serial;
}
#endif

76
targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/reloc_vector_table.c
View File

@ -1,28 +1,28 @@
/*
/*
* Copyright (c) 2016 Nordic Semiconductor ASA
* All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modification,
* are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this list
*
* 1. Redistributions of source code must retain the above copyright notice, this list
* of conditions and the following disclaimer.
*
* 2. Redistributions in binary form, except as embedded into a Nordic Semiconductor ASA
* integrated circuit in a product or a software update for such product, must reproduce
* the above copyright notice, this list of conditions and the following disclaimer in
* 2. Redistributions in binary form, except as embedded into a Nordic Semiconductor ASA
* integrated circuit in a product or a software update for such product, must reproduce
* the above copyright notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the distribution.
*
* 3. Neither the name of Nordic Semiconductor ASA nor the names of its contributors may be
* used to endorse or promote products derived from this software without specific prior
* 3. Neither the name of Nordic Semiconductor ASA nor the names of its contributors may be
* used to endorse or promote products derived from this software without specific prior
* written permission.
*
* 4. This software, with or without modification, must only be used with a
* 4. This software, with or without modification, must only be used with a
* Nordic Semiconductor ASA integrated circuit.
*
* 5. Any software provided in binary or object form under this license must not be reverse
* engineered, decompiled, modified and/or disassembled.
*
* 5. Any software provided in binary or object form under this license must not be reverse
* engineered, decompiled, modified and/or disassembled.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@ -33,9 +33,9 @@
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*
*/
#include "nrf.h"
#include "cmsis_nvic.h"
#include "stdint.h"
@ -48,15 +48,18 @@
#endif
#if defined(__ARMCC_VERSION)
__attribute__ ((section(".bss.nvictable")))
uint32_t nrf_dispatch_vector[NVIC_NUM_VECTORS];
__attribute__((section(".bss.nvictable")))
uint32_t nrf_dispatch_vector[NVIC_NUM_VECTORS];
#elif defined(__GNUC__)
__attribute__ ((section(".nvictable")))
uint32_t nrf_dispatch_vector[NVIC_NUM_VECTORS];
__attribute__((section(".nvictable")))
uint32_t nrf_dispatch_vector[NVIC_NUM_VECTORS];
#elif defined(__ICCARM__)
uint32_t nrf_dispatch_vector[NVIC_NUM_VECTORS] @ ".nvictable";
uint32_t nrf_dispatch_vector[NVIC_NUM_VECTORS] @ ".nvictable";
#endif
#include "platform/mbed_toolchain.h"
#include "subtarget_init.h"
extern uint32_t __Vectors[];
#define VECTORS_FLASH_START __Vectors
@ -70,11 +73,11 @@ extern uint32_t __Vectors[];
void nrf_reloc_vector_table(void)
{
// Copy and switch to dynamic vectors
uint32_t *old_vectors = VECTORS_FLASH_START;
uint32_t i;
for (i = 0; i< NVIC_NUM_VECTORS; i++) {
nrf_dispatch_vector[i] = old_vectors[i];
}
uint32_t *old_vectors = VECTORS_FLASH_START;
uint32_t i;
for (i = 0; i < NVIC_NUM_VECTORS; i++) {
nrf_dispatch_vector[i] = old_vectors[i];
}
#if defined(SOFTDEVICE_PRESENT)
@ -82,9 +85,9 @@ void nrf_reloc_vector_table(void)
* Before setting the new vector table address in the SoftDevice the MBR must be initialized.
* If no bootloader is present the MBR will be initialized automatically.
* If a bootloader is present nrf_dfu_mbr_init_sd must be called once and only once.
*
*
* By resetting the MBR and SoftDevice VTOR address first, it becomes safe to initialize
* the MBR again regardless of how the application was started.
* the MBR again regardless of how the application was started.
*/
/* Reset MBR VTOR to original state before calling MBR init. */
@ -98,7 +101,7 @@ void nrf_reloc_vector_table(void)
/* Set SCB->VTOR to go through MBR to trap SoftDevice service calls. */
SCB->VTOR = 0x0;
/* Initialize MBR so SoftDevice service calls are being trapped correctly.
/* Initialize MBR so SoftDevice service calls are being trapped correctly.
* This call sets MBR_VTOR_ADDRESS to point to the SoftDevice's VTOR at address 0x1000.
*/
nrf_dfu_mbr_init_sd();
@ -109,17 +112,18 @@ void nrf_reloc_vector_table(void)
#else
/* No SoftDevice is present. Set all interrupts to vector table in RAM. */
SCB->VTOR = (uint32_t) nrf_dispatch_vector;
SCB->VTOR = (uint32_t) nrf_dispatch_vector;
#endif
}
void mbed_sdk_init(void)
{
if (STDIO_UART_RTS != NC) {
gpio_t rts;
gpio_init_out(&rts, STDIO_UART_RTS);
/* Set STDIO_UART_RTS as gpio driven low */
gpio_write(&rts, 0);
}
if (STDIO_UART_RTS != NC) {
gpio_t rts;
gpio_init_out(&rts, STDIO_UART_RTS);
/* Set STDIO_UART_RTS as gpio driven low */
gpio_write(&rts, 0);
}
subtarget_sdk_init();
}

25
targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/subtarget_init.c Normal file
View File

@ -0,0 +1,25 @@
/* mbed Microcontroller Library
* Copyright (c) 2021 ARM Limited
* Copyright (c) 2021 Embedded Planet, Inc.
* 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 "subtarget_init.h"
#include "platform/mbed_toolchain.h"
MBED_WEAK void subtarget_sdk_init(void)
{
/* Do nothing by default */
}

39
targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/subtarget_init.h Normal file
View File

@ -0,0 +1,39 @@
/* mbed Microcontroller Library
* Copyright (c) 2021 ARM Limited
* Copyright (c) 2021 Embedded Planet, Inc.
* 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 _NORDIC_SUBTARGET_INIT_
#define _NORDIC_SUBTARGET_INIT_
#ifdef __cplusplus
extern "C" {
#endif
/**
* Since Mbed's `mbed_sdk_init` hook is used by the NRF52 family code, this
* initialization hook is provided so subtargets may implement their own startup
* initialization code, if necessary.
*
* By default, it is a blank function that is declared a "weak" symbol
*/
void subtarget_sdk_init(void);
#ifdef __cplusplus
}
#endif
#endif /* _NORDIC_SUBTARGET_INIT_ */