mirror of
https://github.com/apache/nuttx.git
synced 2026-06-05 07:12:54 +08:00
boards/arm/stm32f7: move reset logic to common
move stm32f7 reset logic to common
This commit is contained in:
@@ -45,4 +45,8 @@ if(CONFIG_STM32F7_ROMFS)
|
|||||||
list(APPEND SRCS stm32_romfs_initialize.c)
|
list(APPEND SRCS stm32_romfs_initialize.c)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if(CONFIG_BOARDCTL_RESET)
|
||||||
|
list(APPEND SRCS stm32_reset.c)
|
||||||
|
endif()
|
||||||
|
|
||||||
target_sources(board PRIVATE ${SRCS})
|
target_sources(board PRIVATE ${SRCS})
|
||||||
|
|||||||
@@ -45,6 +45,10 @@ ifeq ($(CONFIG_STM32F7_ROMFS),y)
|
|||||||
CSRCS += stm32_romfs_initialize.c
|
CSRCS += stm32_romfs_initialize.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifeq ($(CONFIG_BOARDCTL_RESET),y)
|
||||||
|
CSRCS += stm32_reset.c
|
||||||
|
endif
|
||||||
|
|
||||||
DEPPATH += --dep-path src
|
DEPPATH += --dep-path src
|
||||||
VPATH += :src
|
VPATH += :src
|
||||||
CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)src
|
CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)src
|
||||||
|
|||||||
+1
-5
@@ -1,5 +1,5 @@
|
|||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* boards/arm/stm32f7/nucleo-f722ze/src/stm32_reset.c
|
* boards/arm/stm32f7/common/src/stm32_reset.c
|
||||||
*
|
*
|
||||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||||
* contributor license agreements. See the NOTICE file distributed with
|
* contributor license agreements. See the NOTICE file distributed with
|
||||||
@@ -27,8 +27,6 @@
|
|||||||
#include <nuttx/arch.h>
|
#include <nuttx/arch.h>
|
||||||
#include <nuttx/board.h>
|
#include <nuttx/board.h>
|
||||||
|
|
||||||
#ifdef CONFIG_BOARDCTL_RESET
|
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* Public Functions
|
* Public Functions
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
@@ -58,5 +56,3 @@ int board_reset(int status)
|
|||||||
up_systemreset();
|
up_systemreset();
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* CONFIG_BOARDCTL_RESET */
|
|
||||||
@@ -62,10 +62,6 @@ if(CONFIG_STM32F7_BBSRAM)
|
|||||||
list(APPEND SRCS stm32_bbsram.c)
|
list(APPEND SRCS stm32_bbsram.c)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(CONFIG_BOARDCTL_RESET)
|
|
||||||
list(APPEND SRCS stm32_reset.c)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(CONFIG_SENSORS_QENCODER)
|
if(CONFIG_SENSORS_QENCODER)
|
||||||
list(APPEND SRCS stm32_qencoder.c)
|
list(APPEND SRCS stm32_qencoder.c)
|
||||||
endif()
|
endif()
|
||||||
|
|||||||
@@ -64,10 +64,6 @@ ifeq ($(CONFIG_STM32F7_BBSRAM),y)
|
|||||||
CSRCS += stm32_bbsram.c
|
CSRCS += stm32_bbsram.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(CONFIG_BOARDCTL_RESET),y)
|
|
||||||
CSRCS += stm32_reset.c
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(CONFIG_SENSORS_QENCODER),y)
|
ifeq ($(CONFIG_SENSORS_QENCODER),y)
|
||||||
CSRCS += stm32_qencoder.c
|
CSRCS += stm32_qencoder.c
|
||||||
endif
|
endif
|
||||||
|
|||||||
@@ -62,10 +62,6 @@ if(CONFIG_STM32F7_BBSRAM)
|
|||||||
list(APPEND SRCS stm32_bbsram.c)
|
list(APPEND SRCS stm32_bbsram.c)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(CONFIG_BOARDCTL_RESET)
|
|
||||||
list(APPEND SRCS stm32_reset.c)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(CONFIG_SENSORS_QENCODER)
|
if(CONFIG_SENSORS_QENCODER)
|
||||||
list(APPEND SRCS stm32_qencoder.c)
|
list(APPEND SRCS stm32_qencoder.c)
|
||||||
endif()
|
endif()
|
||||||
|
|||||||
@@ -64,10 +64,6 @@ ifeq ($(CONFIG_STM32F7_BBSRAM),y)
|
|||||||
CSRCS += stm32_bbsram.c
|
CSRCS += stm32_bbsram.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(CONFIG_BOARDCTL_RESET),y)
|
|
||||||
CSRCS += stm32_reset.c
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(CONFIG_SENSORS_QENCODER),y)
|
ifeq ($(CONFIG_SENSORS_QENCODER),y)
|
||||||
CSRCS += stm32_qencoder.c
|
CSRCS += stm32_qencoder.c
|
||||||
endif
|
endif
|
||||||
|
|||||||
@@ -1,62 +0,0 @@
|
|||||||
/****************************************************************************
|
|
||||||
* boards/arm/stm32f7/nucleo-f746zg/src/stm32_reset.c
|
|
||||||
*
|
|
||||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
||||||
* contributor license agreements. See the NOTICE file distributed with
|
|
||||||
* this work for additional information regarding copyright ownership. The
|
|
||||||
* ASF licenses this file to you 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.
|
|
||||||
*
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Included Files
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
#include <nuttx/config.h>
|
|
||||||
|
|
||||||
#include <nuttx/arch.h>
|
|
||||||
#include <nuttx/board.h>
|
|
||||||
|
|
||||||
#ifdef CONFIG_BOARDCTL_RESET
|
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Public Functions
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Name: board_reset
|
|
||||||
*
|
|
||||||
* Description:
|
|
||||||
* Reset board. Support for this function is required by board-level
|
|
||||||
* logic if CONFIG_BOARDCTL_RESET is selected.
|
|
||||||
*
|
|
||||||
* Input Parameters:
|
|
||||||
* status - Status information provided with the reset event. This
|
|
||||||
* meaning of this status information is board-specific. If not
|
|
||||||
* used by a board, the value zero may be provided in calls to
|
|
||||||
* board_reset().
|
|
||||||
*
|
|
||||||
* Returned Value:
|
|
||||||
* If this function returns, then it was not possible to power-off the
|
|
||||||
* board due to some constraints. The return value int this case is a
|
|
||||||
* board-specific reason for the failure to shutdown.
|
|
||||||
*
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
int board_reset(int status)
|
|
||||||
{
|
|
||||||
up_systemreset();
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif /* CONFIG_BOARDCTL_RESET */
|
|
||||||
@@ -62,10 +62,6 @@ if(CONFIG_STM32F7_BBSRAM)
|
|||||||
list(APPEND SRCS stm32_bbsram.c)
|
list(APPEND SRCS stm32_bbsram.c)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(CONFIG_BOARDCTL_RESET)
|
|
||||||
list(APPEND SRCS stm32_reset.c)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(CONFIG_SENSORS_QENCODER)
|
if(CONFIG_SENSORS_QENCODER)
|
||||||
list(APPEND SRCS stm32_qencoder.c)
|
list(APPEND SRCS stm32_qencoder.c)
|
||||||
endif()
|
endif()
|
||||||
|
|||||||
@@ -64,10 +64,6 @@ ifeq ($(CONFIG_STM32F7_BBSRAM),y)
|
|||||||
CSRCS += stm32_bbsram.c
|
CSRCS += stm32_bbsram.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(CONFIG_BOARDCTL_RESET),y)
|
|
||||||
CSRCS += stm32_reset.c
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(CONFIG_SENSORS_QENCODER),y)
|
ifeq ($(CONFIG_SENSORS_QENCODER),y)
|
||||||
CSRCS += stm32_qencoder.c
|
CSRCS += stm32_qencoder.c
|
||||||
endif
|
endif
|
||||||
|
|||||||
@@ -1,62 +0,0 @@
|
|||||||
/****************************************************************************
|
|
||||||
* boards/arm/stm32f7/nucleo-f767zi/src/stm32_reset.c
|
|
||||||
*
|
|
||||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
||||||
* contributor license agreements. See the NOTICE file distributed with
|
|
||||||
* this work for additional information regarding copyright ownership. The
|
|
||||||
* ASF licenses this file to you 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.
|
|
||||||
*
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Included Files
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
#include <nuttx/config.h>
|
|
||||||
|
|
||||||
#include <nuttx/arch.h>
|
|
||||||
#include <nuttx/board.h>
|
|
||||||
|
|
||||||
#ifdef CONFIG_BOARDCTL_RESET
|
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Public Functions
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Name: board_reset
|
|
||||||
*
|
|
||||||
* Description:
|
|
||||||
* Reset board. Support for this function is required by board-level
|
|
||||||
* logic if CONFIG_BOARDCTL_RESET is selected.
|
|
||||||
*
|
|
||||||
* Input Parameters:
|
|
||||||
* status - Status information provided with the reset event. This
|
|
||||||
* meaning of this status information is board-specific. If not
|
|
||||||
* used by a board, the value zero may be provided in calls to
|
|
||||||
* board_reset().
|
|
||||||
*
|
|
||||||
* Returned Value:
|
|
||||||
* If this function returns, then it was not possible to power-off the
|
|
||||||
* board due to some constraints. The return value int this case is a
|
|
||||||
* board-specific reason for the failure to shutdown.
|
|
||||||
*
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
int board_reset(int status)
|
|
||||||
{
|
|
||||||
up_systemreset();
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif /* CONFIG_BOARDCTL_RESET */
|
|
||||||
Reference in New Issue
Block a user