nrf: Remove SAMD mentions carried over while copying files

crypto-aes
arturo182 5 years ago
parent 05bd5d4ee6
commit 8bfdaa89b9
  1. 27
      ports/nrf/boards/nrf52832_512k_64k_s132_3.0.0.ld
  2. 6
      ports/nrf/common-hal/pulseio/PWMOut.h
  3. 9
      ports/nrf/common-hal/pulseio/PulseIn.c
  4. 6
      ports/nrf/common-hal/pulseio/PulseIn.h
  5. 5
      ports/nrf/common-hal/pulseio/PulseOut.c
  6. 6
      ports/nrf/common-hal/pulseio/PulseOut.h
  7. 7
      ports/nrf/internal_flash.c
  8. 6
      ports/nrf/internal_flash.h

@ -1,27 +0,0 @@
/*
GNU linker script for NRF52 w/ s132 3.0.0 SoftDevice
*/
/* Specify the memory areas */
MEMORY
{
FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x080000 /* entire flash, 512 KiB */
FLASH_ISR (rx) : ORIGIN = 0x0001f000, LENGTH = 0x001000 /* sector 0, 4 KiB */
FLASH_TEXT (rx) : ORIGIN = 0x00020000, LENGTH = 0x060000 /* 396 KiB */
RAM (xrw) : ORIGIN = 0x200039c0, LENGTH = 0x0c640 /* 49.5 KiB, give 8KiB headroom for softdevice */
}
/* produce a link error if there is not this amount of RAM for these sections */
_minimum_stack_size = 2K;
_minimum_heap_size = 16K;
/* top end of the stack */
/*_stack_end = ORIGIN(RAM) + LENGTH(RAM);*/
_estack = ORIGIN(RAM) + LENGTH(RAM);
/* RAM extents for the garbage collector */
_ram_end = ORIGIN(RAM) + LENGTH(RAM);
_heap_end = 0x20007000; /* tunable */
INCLUDE "boards/common.ld"

@ -24,8 +24,8 @@
* THE SOFTWARE.
*/
#ifndef MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_PULSEIO_PWMOUT_H
#define MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_PULSEIO_PWMOUT_H
#ifndef MICROPY_INCLUDED_NRF_COMMON_HAL_PULSEIO_PWMOUT_H
#define MICROPY_INCLUDED_NRF_COMMON_HAL_PULSEIO_PWMOUT_H
#include "common-hal/microcontroller/Pin.h"
@ -44,4 +44,4 @@ typedef struct {
void pwmout_reset(void);
#endif // MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_PULSEIO_PWMOUT_H
#endif // MICROPY_INCLUDED_NRF_COMMON_HAL_PULSEIO_PWMOUT_H

@ -28,20 +28,13 @@
#include <stdint.h>
//#include "asf/common2/services/delay/delay.h"
//#include "asf/sam0/drivers/extint/extint.h"
//#include "asf/sam0/drivers/extint/extint_callback.h"
//#include "asf/sam0/drivers/port/port.h"
#include "mpconfigport.h"
#include "py/gc.h"
#include "py/runtime.h"
//#include "samd21_pins.h"
#include "shared-bindings/microcontroller/__init__.h"
#include "shared-bindings/pulseio/PulseIn.h"
//#include "tick.h"
void pulsein_reset(void) {
}

@ -24,8 +24,8 @@
* THE SOFTWARE.
*/
#ifndef MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_PULSEIO_PULSEIN_H
#define MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_PULSEIO_PULSEIN_H
#ifndef MICROPY_INCLUDED_NRF_COMMON_HAL_PULSEIO_PULSEIN_H
#define MICROPY_INCLUDED_NRF_COMMON_HAL_PULSEIO_PULSEIN_H
#include "common-hal/microcontroller/Pin.h"
@ -46,4 +46,4 @@ typedef struct {
void pulsein_reset(void);
#endif // MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_PULSEIO_PULSEIN_H
#endif // MICROPY_INCLUDED_NRF_COMMON_HAL_PULSEIO_PULSEIN_H

@ -28,13 +28,10 @@
#include <stdint.h>
//#include "asf/sam0/drivers/tc/tc_interrupt.h"
//#include "asf/sam0/drivers/port/port.h"
#include "mpconfigport.h"
#include "py/gc.h"
#include "py/runtime.h"
//#include "samd21_pins.h"
#include "shared-bindings/pulseio/PulseOut.h"
//void pulse_finish(struct tc_module *const module) {

@ -24,8 +24,8 @@
* THE SOFTWARE.
*/
#ifndef MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_PULSEIO_PULSEOUT_H
#define MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_PULSEIO_PULSEOUT_H
#ifndef MICROPY_INCLUDED_NRF_COMMON_HAL_PULSEIO_PULSEOUT_H
#define MICROPY_INCLUDED_NRF_COMMON_HAL_PULSEIO_PULSEOUT_H
#include "common-hal/microcontroller/Pin.h"
@ -39,4 +39,4 @@ typedef struct {
void pulseout_reset(void);
#endif // MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_PULSEIO_PULSEOUT_H
#endif // MICROPY_INCLUDED_NRF_COMMON_HAL_PULSEIO_PULSEOUT_H

@ -56,13 +56,6 @@ void internal_flash_init(void) {
port_pin_set_config(MICROPY_HW_LED_MSC, &pin_conf);
port_pin_set_output_level(MICROPY_HW_LED_MSC, false);
#endif
#ifdef SAMD51
hri_mclk_set_AHBMASK_NVMCTRL_bit(MCLK);
#endif
#ifdef SAMD21
_pm_enable_bus_clock(PM_BUS_APBB, NVMCTRL);
#endif
// flash_init(&internal_flash_desc, NVMCTRL);
}

@ -23,8 +23,8 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#ifndef MICROPY_INCLUDED_ATMEL_SAMD_INTERNAL_FLASH_H
#define MICROPY_INCLUDED_ATMEL_SAMD_INTERNAL_FLASH_H
#ifndef MICROPY_INCLUDED_NRF_INTERNAL_FLASH_H
#define MICROPY_INCLUDED_NRF_INTERNAL_FLASH_H
#include <stdbool.h>
#include <stdint.h>
@ -58,4 +58,4 @@ struct _fs_user_mount_t;
void flash_init_vfs(struct _fs_user_mount_t *vfs);
void flash_flush(void);
#endif // MICROPY_INCLUDED_ATMEL_SAMD_INTERNAL_FLASH_H
#endif // MICROPY_INCLUDED_NRF_INTERNAL_FLASH_H

Loading…
Cancel
Save