diff --git a/boards/arm64/rk3399/pinephonepro/src/Makefile b/boards/arm64/rk3399/pinephonepro/src/Makefile index e7c3d94397b08..376c850d4d59f 100644 --- a/boards/arm64/rk3399/pinephonepro/src/Makefile +++ b/boards/arm64/rk3399/pinephonepro/src/Makefile @@ -24,6 +24,9 @@ CSRCS = pinephonepro_boardinit.c pinephonepro_bringup.c ifeq ($(CONFIG_BOARDCTL),y) CSRCS += pinephonepro_appinit.c +ifeq ($(CONFIG_BOARDCTL_RESET),y) +CSRCS += pinephonepro_reset.c +endif endif include $(TOPDIR)/boards/Board.mk diff --git a/boards/arm64/rk3399/pinephonepro/src/pinephonepro.h b/boards/arm64/rk3399/pinephonepro/src/pinephonepro.h index 5eba9bdb17769..5f50e71b8a384 100644 --- a/boards/arm64/rk3399/pinephonepro/src/pinephonepro.h +++ b/boards/arm64/rk3399/pinephonepro/src/pinephonepro.h @@ -34,7 +34,7 @@ ****************************************************************************/ /**************************************************************************** - * Name: pinephone_bringup + * Name: pinephonepro_bringup * * Description: * Bring up board features @@ -42,7 +42,7 @@ ****************************************************************************/ #if defined(CONFIG_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE) -int pinephone_bringup(void); +int pinephonepro_bringup(void); #endif #endif /* __ASSEMBLY__ */ diff --git a/boards/arm64/rk3399/pinephonepro/src/pinephonepro_appinit.c b/boards/arm64/rk3399/pinephonepro/src/pinephonepro_appinit.c index 27f1c599c6bb5..ea732f9ca6aba 100644 --- a/boards/arm64/rk3399/pinephonepro/src/pinephonepro_appinit.c +++ b/boards/arm64/rk3399/pinephonepro/src/pinephonepro_appinit.c @@ -64,7 +64,7 @@ int board_app_initialize(uintptr_t arg) #ifndef CONFIG_BOARD_LATE_INITIALIZE /* Perform board initialization */ - return pinephone_bringup(); + return pinephonepro_bringup(); #else return OK; #endif diff --git a/boards/arm64/rk3399/pinephonepro/src/pinephonepro_boardinit.c b/boards/arm64/rk3399/pinephonepro/src/pinephonepro_boardinit.c index 185206181f2de..a72ca8ebf6549 100644 --- a/boards/arm64/rk3399/pinephonepro/src/pinephonepro_boardinit.c +++ b/boards/arm64/rk3399/pinephonepro/src/pinephonepro_boardinit.c @@ -101,6 +101,6 @@ void board_late_initialize(void) { /* Perform board initialization */ - pinephone_bringup(); + pinephonepro_bringup(); } #endif /* CONFIG_BOARD_LATE_INITIALIZE */ diff --git a/boards/arm64/rk3399/pinephonepro/src/pinephonepro_bringup.c b/boards/arm64/rk3399/pinephonepro/src/pinephonepro_bringup.c index 874c267cdc48c..b6e1d85a60d0f 100644 --- a/boards/arm64/rk3399/pinephonepro/src/pinephonepro_bringup.c +++ b/boards/arm64/rk3399/pinephonepro/src/pinephonepro_bringup.c @@ -37,14 +37,14 @@ ****************************************************************************/ /**************************************************************************** - * Name: pinephone_bringup + * Name: pinephonepro_bringup * * Description: * Bring up board features * ****************************************************************************/ -int pinephone_bringup(void) +int pinephonepro_bringup(void) { int ret = OK; diff --git a/boards/arm64/rk3399/pinephonepro/src/pinephonepro_reset.c b/boards/arm64/rk3399/pinephonepro/src/pinephonepro_reset.c new file mode 100644 index 0000000000000..0e44a2eb643d5 --- /dev/null +++ b/boards/arm64/rk3399/pinephonepro/src/pinephonepro_reset.c @@ -0,0 +1,66 @@ +/**************************************************************************** + * boards/arm64/rk3399/pinephonepro/src/pinephonepro_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 + +#include +#include + +#ifdef CONFIG_BOARDCTL_RESET + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/**************************************************************************** + * 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 */