sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename RDDRONE-UAVCAN146 board to UCANS32K146

Browse Source
This commit is contained in:
Jari van Ewijk 2021-09-14 15:36:53 +02:00 committed by Xiang Xiao
parent ea6955f77b
commit 7c8515e21c
21 changed files with 55 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
boards/Kconfig
View File

@ -1465,14 +1465,14 @@ config ARCH_BOARD_RDDRONE_UAVCAN144
This options selects support for NuttX on the NXP RDDRONE-UAVCAN board
featuring the S32K144 Cortex-M4F.
config ARCH_BOARD_RDDRONE_UAVCAN146
bool "NXP RDDRONE-UAVCAN146"
config ARCH_BOARD_UCANS32K146
bool "NXP UCANS32K146"
depends on ARCH_CHIP_S32K146
select ARCH_HAVE_LEDS
select ARCH_HAVE_BUTTONS
select ARCH_HAVE_IRQBUTTONS
---help---
This options selects support for NuttX on the NXP RDDRONE-UAVCAN board
This options selects support for NuttX on the NXP UCANS32K board
featuring the S32K146 Cortex-M4F.
config ARCH_BOARD_S32K146EVB
@ -2475,7 +2475,7 @@ config ARCH_BOARD
default "s32k118evb" if ARCH_BOARD_S32K118EVB
default "s32k144evb" if ARCH_BOARD_S32K144EVB
default "rddrone-uavcan144" if ARCH_BOARD_RDDRONE_UAVCAN144
default "rddrone-uavcan146" if ARCH_BOARD_RDDRONE_UAVCAN146
default "ucans32k146" if ARCH_BOARD_UCANS32K146
default "rv32m1-vega" if ARCH_BOARD_RV32M1_VEGA
default "s32k146evb" if ARCH_BOARD_S32K146EVB
default "s32k148evb" if ARCH_BOARD_S32K148EVB
@ -2637,8 +2637,8 @@ endif
if ARCH_BOARD_RDDRONE_UAVCAN144
source "boards/arm/s32k1xx/rddrone-uavcan144/Kconfig"
endif
if ARCH_BOARD_RDDRONE_UAVCAN146
source "boards/arm/s32k1xx/rddrone-uavcan146/Kconfig"
if ARCH_BOARD_UCANS32K146
source "boards/arm/s32k1xx/ucans32k146/Kconfig"
endif
if ARCH_BOARD_S32K146EVB
source "boards/arm/s32k1xx/s32k146evb/Kconfig"

4
boards/arm/s32k1xx/rddrone-uavcan146/Kconfig → boards/arm/s32k1xx/ucans32k146/Kconfig
View File

@ -3,6 +3,6 @@
# see the file kconfig-language.txt in the NuttX tools repository.
#
if ARCH_BOARD_RDDRONE_UAVCAN146
if ARCH_BOARD_UCANS32K146
endif # ARCH_BOARD_RDDRONE_UAVCAN146
endif # ARCH_BOARD_UCANS32K146

2
boards/arm/s32k1xx/rddrone-uavcan146/README.txt → boards/arm/s32k1xx/ucans32k146/README.txt
View File

@ -1,7 +1,7 @@
README
======
This directory holds the port to the NXP RDDRONE-UAVCAN board with S32K146 MCU.
This directory holds the port to the NXP UCANS32K board with S32K146 MCU.
Contents
========

4
boards/arm/s32k1xx/rddrone-uavcan146/configs/nsh/defconfig → boards/arm/s32k1xx/ucans32k146/configs/nsh/defconfig
View File

@ -12,8 +12,8 @@
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
# CONFIG_NSH_CMDPARMS is not set
CONFIG_ARCH="arm"
CONFIG_ARCH_BOARD="rddrone-uavcan146"
CONFIG_ARCH_BOARD_RDDRONE_UAVCAN146=y
CONFIG_ARCH_BOARD="ucans32k146"
CONFIG_ARCH_BOARD_UCANS32K146=y
CONFIG_ARCH_CHIP="s32k1xx"
CONFIG_ARCH_CHIP_S32K146=y
CONFIG_ARCH_CHIP_S32K14X=y

4
boards/arm/s32k1xx/rddrone-uavcan146/configs/nshdebug/defconfig → boards/arm/s32k1xx/ucans32k146/configs/nshdebug/defconfig
View File

@ -10,8 +10,8 @@
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
# CONFIG_NSH_CMDPARMS is not set
CONFIG_ARCH="arm"
CONFIG_ARCH_BOARD="rddrone-uavcan146"
CONFIG_ARCH_BOARD_RDDRONE_UAVCAN146=y
CONFIG_ARCH_BOARD="ucans32k146"
CONFIG_ARCH_BOARD_UCANS32K146=y
CONFIG_ARCH_CHIP="s32k1xx"
CONFIG_ARCH_CHIP_S32K146=y
CONFIG_ARCH_CHIP_S32K14X=y

18
boards/arm/s32k1xx/rddrone-uavcan146/include/board.h → boards/arm/s32k1xx/ucans32k146/include/board.h
View File

@ -1,5 +1,5 @@
/****************************************************************************
* boards/arm/s32k1xx/rddrone-uavcan146/include/board.h
* boards/arm/s32k1xx/ucans32k146/include/board.h
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@ -18,8 +18,8 @@
*
****************************************************************************/
#ifndef __BOARDS_ARM_RDDRONE_UAVCAN146_INCLUDE_BOARD_H
#define __BOARDS_ARM_RDDRONE_UAVCAN146_INCLUDE_BOARD_H
#ifndef __BOARDS_ARM_S32K1XX_UCANS32K146_INCLUDE_BOARD_H
#define __BOARDS_ARM_S32K1XX_UCANS32K146_INCLUDE_BOARD_H
/****************************************************************************
* Included Files
@ -38,7 +38,7 @@
/* Clocking *****************************************************************/
/* The RDDRONE-UAVCAN146 is fitted with a 8MHz Crystal */
/* The UCANS32K146 is fitted with a 8MHz Crystal */
#define BOARD_XTAL_FREQUENCY 8000000
@ -46,7 +46,7 @@
/* LED definitions **********************************************************/
/* The RDDRONE-UAVCAN146 has one RGB LED:
/* The UCANS32K146 has one RGB LED:
*
* RedLED PTD15 (FTM0 CH0)
* GreenLED PTD16 (FTM0 CH1)
@ -80,7 +80,7 @@
#define BOARD_REVISION_DETECT_PIN (GPIO_INPUT | PIN_PORTA | PIN10 )
/* If CONFIG_ARCH_LEDs is defined, then NuttX will control the LEDs on board
* the RDDRONE-UAVCAN146. The following definitions describe how NuttX
* the UCANS32K146. The following definitions describe how NuttX
* controls the LEDs:
*
* SYMBOL Meaning LED state
@ -96,11 +96,11 @@
#define LED_SIGNAL 0 /* In a signal handler (no change) */
#define LED_ASSERTION 0 /* An assertion failed (no change) */
#define LED_PANIC 4 /* The system has crashed FLASH OFF OFF */
#undef LED_IDLE /* RDDRONE-UAVCAN146 in sleep mode (Not used) */
#undef LED_IDLE /* UCANS32K146 in sleep mode (Not used) */
/* Button definitions *******************************************************/
/* The RDDRONE-UAVCAN146 supports two buttons:
/* The UCANS32K146 supports two buttons:
*
* SW2 PTC12
* SW3 PTC13
@ -149,4 +149,4 @@
#define PIN_CAN1_RX PIN_CAN1_RX_1 /* PTA12 */
#define PIN_CAN1_STB (GPIO_OUTPUT | PIN_PORTE | PIN10 )
#endif /* __BOARDS_ARM_RDDRONE_UAVCAN146_INCLUDE_BOARD_H */
#endif /* __BOARDS_ARM_S32K1XX_UCANS32K146_INCLUDE_BOARD_H */

2
boards/arm/s32k1xx/rddrone-uavcan146/scripts/Make.defs → boards/arm/s32k1xx/ucans32k146/scripts/Make.defs
View File

@ -1,5 +1,5 @@
############################################################################
# boards/arm/s32k1xx/rddrone-uavcan146/scripts/Make.defs
# boards/arm/s32k1xx/ucans32k146/scripts/Make.defs
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with

2
boards/arm/s32k1xx/rddrone-uavcan146/scripts/flash.ld → boards/arm/s32k1xx/ucans32k146/scripts/flash.ld
View File

@ -1,5 +1,5 @@
/****************************************************************************
* boards/arm/s32k1xx/rddrone-uavcan146/scripts/flash.ld
* boards/arm/s32k1xx/ucans32k146/scripts/flash.ld
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with

0
boards/arm/s32k1xx/rddrone-uavcan146/scripts/s32k146.cfg → boards/arm/s32k1xx/ucans32k146/scripts/s32k146.cfg
View File

2
boards/arm/s32k1xx/rddrone-uavcan146/scripts/sram.ld → boards/arm/s32k1xx/ucans32k146/scripts/sram.ld
View File

@ -1,5 +1,5 @@
/****************************************************************************
* boards/arm/s32k1xx/rddrone-uavcan146/scripts/sram.ld
* boards/arm/s32k1xx/ucans32k146/scripts/sram.ld
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with

2
boards/arm/s32k1xx/rddrone-uavcan146/src/Makefile → boards/arm/s32k1xx/ucans32k146/src/Makefile
View File

@ -1,5 +1,5 @@
############################################################################
# boards/arm/s32k1xx/rddrone-uavcan146/src/Makefile
# boards/arm/s32k1xx/ucans32k146/src/Makefile
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with

4
boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_appinit.c → boards/arm/s32k1xx/ucans32k146/src/s32k1xx_appinit.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_appinit.c
* boards/arm/s32k1xx/ucans32k146/src/s32k1xx_appinit.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@ -26,7 +26,7 @@
#include <nuttx/board.h>
#include "rddrone-uavcan146.h"
#include "ucans32k146.h"
/****************************************************************************
* Pre-processor Definitions

6
boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_autoleds.c → boards/arm/s32k1xx/ucans32k146/src/s32k1xx_autoleds.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_autoleds.c
* boards/arm/s32k1xx/ucans32k146/src/s32k1xx_autoleds.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@ -18,7 +18,7 @@
*
****************************************************************************/
/* The RDDRONE-UAVCAN146 has one RGB LED:
/* The UCANS32K146 has one RGB LED:
*
* RedLED PTD15 (FTM0 CH0)
* GreenLED PTD16 (FTM0 CH1)
@ -61,7 +61,7 @@
#include "arm_internal.h"
#include "s32k1xx_pin.h"
#include "rddrone-uavcan146.h"
#include "ucans32k146.h"
#include <arch/board/board.h>

4
boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_boot.c → boards/arm/s32k1xx/ucans32k146/src/s32k1xx_boot.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_boot.c
* boards/arm/s32k1xx/ucans32k146/src/s32k1xx_boot.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@ -28,7 +28,7 @@
#include <nuttx/board.h>
#include "rddrone-uavcan146.h"
#include "ucans32k146.h"
/****************************************************************************
* Public Functions

4
boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_bringup.c → boards/arm/s32k1xx/ucans32k146/src/s32k1xx_bringup.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_bringup.c
* boards/arm/s32k1xx/ucans32k146/src/s32k1xx_bringup.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@ -47,7 +47,7 @@
# include "s32k1xx_eeeprom.h"
#endif
#include "rddrone-uavcan146.h"
#include "ucans32k146.h"
/****************************************************************************
* Public Functions

6
boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_buttons.c → boards/arm/s32k1xx/ucans32k146/src/s32k1xx_buttons.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_buttons.c
* boards/arm/s32k1xx/ucans32k146/src/s32k1xx_buttons.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@ -18,7 +18,7 @@
*
****************************************************************************/
/* The RDDRONE-UAVCAN146 supports one button:
/* The UCANS32K146 supports one button:
*
* SW3 PTC14
*/
@ -36,7 +36,7 @@
#include <nuttx/board.h>
#include "s32k1xx_pin.h"
#include "rddrone-uavcan146.h"
#include "ucans32k146.h"
#include <arch/board/board.h>

4
boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_clockconfig.c → boards/arm/s32k1xx/ucans32k146/src/s32k1xx_clockconfig.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_clockconfig.c
* boards/arm/s32k1xx/ucans32k146/src/s32k1xx_clockconfig.c
*
* Copyright (C) 2019 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -63,7 +63,7 @@
#include "s32k1xx_clockconfig.h"
#include "s32k1xx_start.h"
#include "rddrone-uavcan146.h"
#include "ucans32k146.h"
/****************************************************************************
* Public Data

4
boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_periphclocks.c → boards/arm/s32k1xx/ucans32k146/src/s32k1xx_periphclocks.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_periphclocks.c
* boards/arm/s32k1xx/ucans32k146/src/s32k1xx_periphclocks.c
*
* Copyright (C) 2019 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -59,7 +59,7 @@
#include <nuttx/config.h>
#include "s32k1xx_periphclocks.h"
#include "rddrone-uavcan146.h"
#include "ucans32k146.h"
/****************************************************************************
* Public Data

7
boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_spi.c → boards/arm/s32k1xx/ucans32k146/src/s32k1xx_spi.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_spi.c
* boards/arm/s32k1xx/ucans32k146/src/s32k1xx_spi.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@ -38,7 +38,7 @@
#include "s32k1xx_config.h"
#include "s32k1xx_lpspi.h"
#include "s32k1xx_pin.h"
#include "rddrone-uavcan146.h"
#include "ucans32k146.h"
#if defined(CONFIG_S32K1XX_LPSPI0) || defined(CONFIG_S32K1XX_LPSPI1) || \
defined(CONFIG_S32K1XX_LPSPI2)
@ -51,8 +51,7 @@
* Name: s32k1xx_spidev_initialize
*
* Description:
* Called to configure SPI chip select GPIO pins for the RDDRONE-UAVCAN146
* board.
* Called to configure SPI chip select GPIO pins for the UCANS32K146 board.
*
****************************************************************************/

4
boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_userleds.c → boards/arm/s32k1xx/ucans32k146/src/s32k1xx_userleds.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_userleds.c
* boards/arm/s32k1xx/ucans32k146/src/s32k1xx_userleds.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@ -34,7 +34,7 @@
#include "arm_internal.h"
#include "s32k1xx_pin.h"
#include "rddrone-uavcan146.h"
#include "ucans32k146.h"
#include <arch/board/board.h>

17
boards/arm/s32k1xx/rddrone-uavcan146/src/rddrone-uavcan146.h → boards/arm/s32k1xx/ucans32k146/src/ucans32k146.h
View File

@ -1,5 +1,5 @@
/****************************************************************************
* boards/arm/s32k1xx/rddrone-uavcan146/src/rddrone-uavcan146.h
* boards/arm/s32k1xx/ucans32k146/src/ucans32k146.h
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@ -18,8 +18,8 @@
*
****************************************************************************/
#ifndef __BOARDS_ARM_S32K1XX_RDDRONE_UAVCAN146_SRC_RDDRONE_UAVCAN146_H
#define __BOARDS_ARM_S32K1XX_RDDRONE_UAVCAN146_SRC_RDDRONE_UAVCAN146_H
#ifndef __BOARDS_ARM_S32K1XX_UCANS32K146_SRC_UCANS32K146_H
#define __BOARDS_ARM_S32K1XX_UCANS32K146_SRC_UCANS32K146_H
/****************************************************************************
* Included Files
@ -39,9 +39,9 @@
/* Configuration ************************************************************/
/* RDDRONE-UAVCAN146 GPIOs **************************************************/
/* UCANS32K146 GPIOs ********************************************************/
/* LEDs. The RDDRONE-UAVCAN146 has one RGB LED:
/* LEDs. The UCANS32K146 has one RGB LED:
*
* RedLED PTD15 (FTM0 CH0)
* GreenLED PTD16 (FTM0 CH1)
@ -54,7 +54,7 @@
#define GPIO_LED_G (PIN_PTD16 | GPIO_LOWDRIVE | GPIO_OUTPUT_ZERO)
#define GPIO_LED_B (PIN_PTD0 | GPIO_LOWDRIVE | GPIO_OUTPUT_ZERO)
/* Buttons. The RDDRONE-UAVCAN146 supports one button:
/* Buttons. The UCANS32K146 supports one button:
*
* SW3 PTC14
*/
@ -109,8 +109,7 @@ int s32k1xx_bringup(void);
* Name: s32k1xx_spidev_initialize
*
* Description:
* Called to configure SPI chip select GPIO pins for the RDDRONE-UAVCAN146
* board.
* Called to configure SPI chip select GPIO pins for the UCANS32K146 board.
*
****************************************************************************/
@ -119,4 +118,4 @@ void s32k1xx_spidev_initialize(void);
#endif
#endif /* __ASSEMBLY__ */
#endif /* __BOARDS_ARM_S32K1XX_RDDRONE_UAVCAN146_SRC_RDDRONE_UAVCAN146_H */
#endif /* __BOARDS_ARM_S32K1XX_UCANS32K146_SRC_UCANS32K146_H */