Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-04 23:03:27 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Building of xyz_appinit.c should depend on CONFIG_LIB_BOARDCTL, not CONFIG_NSH_ARCHINITIALIZE

Browse Source
This commit is contained in:
Gregory Nutt
2016-02-04 12:14:17 -06:00
parent 95d6131847
commit 9ed7d56a18
103 changed files with 118 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configs/arduino-due/src/Makefile
+1 -1
View File
@@ -61,7 +61,7 @@ CSRCS += sam_lcd.c
endif
endif
ifeq ($(CONFIG_NSH_ARCHINIT),y)
ifeq ($(CONFIG_LIB_BOARDCTL),y)
CSRCS += sam_appinit.c
endif
configs/cc3200-launchpad/src/cc3200_boot.c
+2 -2
View File
@@ -73,11 +73,11 @@
* Description:
* Perform architecture specific initialization
*
* CONFIG_NSH_ARCHINIT=y :
* CONFIG_LIB_BOARDCTL=y :
* Called from the NSH library
*
* CONFIG_BOARD_INITIALIZE=y, CONFIG_NSH_LIBRARY=y, &&
* CONFIG_NSH_ARCHINIT=n :
* CONFIG_LIB_BOARDCTL=n :
* Called from board_initialize().
*
****************************************************************************/
configs/cloudctrl/src/Makefile
+1 -1
View File
@@ -57,7 +57,7 @@ ifeq ($(CONFIG_STM32_OTGFS),y)
CSRCS += stm32_usb.c
endif
ifeq ($(CONFIG_NSH_ARCHINIT),y)
ifeq ($(CONFIG_LIB_BOARDCTL),y)
CSRCS += stm32_appinit.c
endif
configs/demo9s12ne64/src/Makefile
+1 -1
View File
@@ -37,7 +37,7 @@
ASRCS =
CSRCS = m9s12_boot.c m9s12_leds.c m9s12_buttons.c m9s12_spi.c
ifeq ($(CONFIG_NSH_ARCHINIT),y)
ifeq ($(CONFIG_LIB_BOARDCTL),y)
CSRCS += m9s12_appinit.c
endif
configs/dk-tm4c129x/src/Makefile
+1 -1
View File
@@ -56,7 +56,7 @@ ifeq ($(CONFIG_DK_TM4C129X_TIMER),y)
CSRCS += tm4c_timer.c
endif
ifeq ($(CONFIG_NSH_ARCHINIT),y)
ifeq ($(CONFIG_LIB_BOARDCTL),y)
CSRCS += tm4c_appinit.c
endif
configs/ea3131/src/Makefile
+1 -1
View File
@@ -54,7 +54,7 @@ ifeq ($(CONFIG_LPC31_SPI),y)
CSRCS += lpc31_spi.c
endif
ifeq ($(CONFIG_NSH_ARCHINIT),y)
ifeq ($(CONFIG_LIB_BOARDCTL),y)
CSRCS += lpc31_appinit.c
endif
configs/ea3152/src/Makefile
+1 -1
View File
@@ -49,7 +49,7 @@ endif
ifeq ($(CONFIG_LPC31_SPI),y)
CSRCS += lpc31_spi.c
endif
ifeq ($(CONFIG_NSH_ARCHINIT),y)
ifeq ($(CONFIG_LIB_BOARDCTL),y)
CSRCS += lpc31_appinit.c
endif
ifeq ($(CONFIG_PAGING),y)
configs/eagle100/src/Makefile
+1 -1
View File
@@ -37,7 +37,7 @@
ASRCS =
CSRCS = lm_boot.c lm_leds.c lm_ethernet.c lm_ssi.c
ifeq ($(CONFIG_NSH_ARCHINIT),y)
ifeq ($(CONFIG_LIB_BOARDCTL),y)
CSRCS += lm_appinit.c
endif
configs/ekk-lm3s9b96/src/Makefile
+1 -1
View File
@@ -38,7 +38,7 @@
ASRCS =
CSRCS = lm_boot.c lm_leds.c lm_ethernet.c lm_ssi.c
ifeq ($(CONFIG_NSH_ARCHINIT),y)
ifeq ($(CONFIG_LIB_BOARDCTL),y)
CSRCS += lm_appinit.c
endif
configs/fire-stm32v2/src/Makefile
+1 -1
View File
@@ -52,7 +52,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y)
CSRCS += stm32_buttons.c
endif
ifeq ($(CONFIG_NSH_ARCHINIT),y)
ifeq ($(CONFIG_LIB_BOARDCTL),y)
CSRCS += stm32_appinit.c
endif
configs/freedom-kl25z/src/kl_boardinitialize.c
+1 -1
View File
@@ -124,7 +124,7 @@ void board_initialize(void)
* but the initialization function must run in kernel space.
*/
#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT)
#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL)
(void)board_app_initialize();
#endif
configs/freedom-kl26z/src/kl_boardinitialize.c
+1 -1
View File
@@ -123,7 +123,7 @@ void board_initialize(void)
* but the initialization function must run in kernel space.
*/
#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT)
#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL)
(void)board_app_initialize();
#endif
}
configs/hymini-stm32v/src/Makefile
+1 -1
View File
@@ -47,7 +47,7 @@ CSRCS += stm32_r61505u.c
endif
endif
ifeq ($(CONFIG_NSH_ARCHINIT),y)
ifeq ($(CONFIG_LIB_BOARDCTL),y)
CSRCS += stm32_appinit.c
endif
configs/kwikstik-k40/src/Makefile
+1 -1
View File
@@ -46,7 +46,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y)
CSRCS += k40_buttons.c
endif
ifeq ($(CONFIG_NSH_ARCHINIT),y)
ifeq ($(CONFIG_LIB_BOARDCTL),y)
CSRCS += k40_appinit.c
endif
configs/lincoln60/src/Makefile
+1 -1
View File
@@ -38,7 +38,7 @@
ASRCS =
CSRCS = lpc17_boot.c lpc17_leds.c
ifeq ($(CONFIG_NSH_ARCHINIT),y)
ifeq ($(CONFIG_LIB_BOARDCTL),y)
CSRCS += lpc17_appinit.c
endif
configs/lm3s6432-s2e/src/Makefile
+1 -1
View File
@@ -37,7 +37,7 @@
ASRCS =
CSRCS = lm_boot.c lm_leds.c lm_ethernet.c lm_ssi.c
ifeq ($(CONFIG_NSH_ARCHINIT),y)
ifeq ($(CONFIG_LIB_BOARDCTL),y)
CSRCS += lm_appinit.c
endif
configs/lm3s6965-ek/src/lm_appinit.c
+1 -1
View File
@@ -74,7 +74,7 @@
/* PORT and SLOT number depend on the board configuration */
#ifdef CONFIG_NSH_ARCHINIT
#ifdef CONFIG_LIB_BOARDCTL
# if !defined(CONFIG_NSH_MMCSDSPIPORTNO) || CONFIG_NSH_MMCSDSPIPORTNO != 0
# error "The LM3S6965 Eval Kit MMC/SD is on SSI0"
# undef CONFIG_NSH_MMCSDSPIPORTNO
configs/lm3s8962-ek/src/lm_appinit.c
+1 -1
View File
@@ -61,7 +61,7 @@
/* PORT and SLOT number depend on the board configuration */
#ifdef CONFIG_NSH_ARCHINIT
#ifdef CONFIG_LIB_BOARDCTL
# if !defined(CONFIG_NSH_MMCSDSPIPORTNO) || CONFIG_NSH_MMCSDSPIPORTNO != 0
# error "The LM3S8962 Eval Kit MMC/SD is on SSI0"
# undef CONFIG_NSH_MMCSDSPIPORTNO
configs/lm4f120-launchpad/src/Makefile
+1 -1
View File
@@ -42,7 +42,7 @@ ifeq ($(CONFIG_ARCH_LEDS),y)
CSRCS += lm4f_autoleds.c
endif
ifeq ($(CONFIG_NSH_ARCHINIT),y)
ifeq ($(CONFIG_LIB_BOARDCTL),y)
CSRCS += lm4f_appinit.c
endif
configs/lpc4330-xplorer/src/Makefile
+1 -1
View File
@@ -38,7 +38,7 @@
ASRCS =
CSRCS = lpc43_boot.c
ifeq ($(CONFIG_NSH_ARCHINIT),y)
ifeq ($(CONFIG_LIB_BOARDCTL),y)
CSRCS += lpc43_appinit.c
endif
configs/lpc4337-ws/src/Makefile
+1 -1
View File
@@ -38,7 +38,7 @@
ASRCS =
CSRCS = lpc43_boot.c
ifeq ($(CONFIG_NSH_ARCHINIT),y)
ifeq ($(CONFIG_LIB_BOARDCTL),y)
CSRCS += lpc43_appinit.c
endif
configs/lpc4357-evb/src/Makefile
+1 -1
View File
@@ -38,7 +38,7 @@
ASRCS =
CSRCS = lpc43_boot.c
ifeq ($(CONFIG_NSH_ARCHINIT),y)
ifeq ($(CONFIG_LIB_BOARDCTL),y)
CSRCS += lpc43_appinit.c
endif
configs/lpc4370-link2/src/Makefile
+1 -1
View File
@@ -38,7 +38,7 @@
ASRCS =
CSRCS = lpc43_boot.c
ifeq ($(CONFIG_NSH_ARCHINIT),y)
ifeq ($(CONFIG_LIB_BOARDCTL),y)
CSRCS += lpc43_appinit.c
endif
configs/lpcxpresso-lpc1115/src/Makefile
+1 -1
View File
@@ -38,7 +38,7 @@
ASRCS =
CSRCS = lpc11_boot.c
ifeq ($(CONFIG_NSH_ARCHINIT),y)
ifeq ($(CONFIG_LIB_BOARDCTL),y)
CSRCS += lpc11_appinit.c
endif
configs/lpcxpresso-lpc1768/src/lpc17_appinit.c
+2 -2
View File
@@ -55,7 +55,7 @@
/* Configuration ************************************************************/
#ifdef CONFIG_NSH_ARCHINIT
#ifdef CONFIG_LIB_BOARDCTL
/* PORT and SLOT number probably depend on the board configuration */
@@ -107,7 +107,7 @@
#else
# undef NSH_HAVEMMCSD
#endif /* CONFIG_NSH_ARCHINIT */
#endif /* CONFIG_LIB_BOARDCTL */
/****************************************************************************
* Private Data
configs/maple/src/Makefile
+1 -1
View File
@@ -43,7 +43,7 @@ ifeq ($(CONFIG_NX_LCDDRIVER),y)
CSRCS += stm32_lcd.c
endif
ifeq ($(CONFIG_NSH_ARCHINIT),y)
ifeq ($(CONFIG_LIB_BOARDCTL),y)
endif
ifeq ($(CONFIG_INPUT),y)
configs/mbed/src/Makefile
+1 -1
View File
@@ -38,7 +38,7 @@
ASRCS =
CSRCS = lpc17_boot.c lpc17_leds.c lpc17_adc.c lpc17_dac.c lpc17_pwm.c
ifeq ($(CONFIG_NSH_ARCHINIT),y)
ifeq ($(CONFIG_LIB_BOARDCTL),y)
CSRCS += lpc17_appinit.c
endif
ifeq ($(CONFIG_USBMSC),y)
configs/mcu123-lpc214x/src/lpc2148_appinit.c
+1 -1
View File
@@ -60,7 +60,7 @@
/* PORT and SLOT number depend on the board configuration */
#ifdef CONFIG_NSH_ARCHINIT
#ifdef CONFIG_LIB_BOARDCTL
# if !defined(CONFIG_NSH_MMCSDSPIPORTNO) || CONFIG_NSH_MMCSDSPIPORTNO != 1
# error "The LPC214x MMC/SD is on SPI1"
# undef CONFIG_NSH_MMCSDSPIPORTNO
configs/mikroe-stm32f4/src/Makefile
+1 -1
View File
@@ -62,7 +62,7 @@ ifeq ($(CONFIG_WATCHDOG),y)
CSRCS += stm32_watchdog.c
endif
ifeq ($(CONFIG_NSH_ARCHINIT),y)
ifeq ($(CONFIG_LIB_BOARDCTL),y)
CSRCS += stm32_appinit.c
endif
configs/mirtoo/src/Makefile
+1 -1
View File
@@ -46,7 +46,7 @@ ifeq ($(CONFIG_PIC32MX_ADC),y)
CSRCS += pic32_adc.c
endif
ifeq ($(CONFIG_NSH_ARCHINIT),y)
ifeq ($(CONFIG_LIB_BOARDCTL),y)
CSRCS += pic32_appinit.c
endif
configs/moxa/src/moxart_appinit.c
+2 -2
View File
@@ -63,11 +63,11 @@
* Description:
* Perform architecture specific initialization
*
* CONFIG_NSH_ARCHINIT=y :
* CONFIG_LIB_BOARDCTL=y :
* Called from the NSH library
*
* CONFIG_BOARD_INITIALIZE=y, CONFIG_NSH_LIBRARY=y, &&
* CONFIG_NSH_ARCHINIT=n :
* CONFIG_LIB_BOARDCTL=n :
* Called from board_initialize().
*
****************************************************************************/
configs/ne64badge/src/Makefile
+1 -1
View File
@@ -37,7 +37,7 @@
ASRCS =
CSRCS = m9s12_boot.c m9s12_leds.c m9s12_buttons.c m9s12_spi.c
ifeq ($(CONFIG_NSH_ARCHINIT),y)
ifeq ($(CONFIG_LIB_BOARDCTL),y)
CSRCS += m9s12_appinit.c
endif
configs/nucleo-f4x1re/src/stm32_boot.c
+1 -1
View File
@@ -120,7 +120,7 @@ void board_initialize(void)
* but the initialization function must run in kernel space.
*/
#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT)
#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL)
board_app_initialize();
#endif
configs/nucleus2g/src/lpc17_appinit.c
+1 -1
View File
@@ -60,7 +60,7 @@
/* PORT and SLOT number probably depend on the board configuration */
#ifdef CONFIG_NSH_ARCHINIT
#ifdef CONFIG_LIB_BOARDCTL
# if !defined(CONFIG_NSH_MMCSDSPIPORTNO) || CONFIG_NSH_MMCSDSPIPORTNO != 0
# error "The Nucleus-2G MMC/SD is on SSP0"
# undef CONFIG_NSH_MMCSDSPIPORTNO
configs/nutiny-nuc120/src/Makefile
-4
View File
@@ -62,8 +62,4 @@ ifeq ($(CONFIG_WATCHDOG),y)
CSRCS += nuc_watchdog.c
endif
ifeq ($(CONFIG_NSH_ARCHINIT),y)
CSRCS += nuc_nsh.c
endif
include $(TOPDIR)/configs/Board.mk
configs/olimex-lpc-h3131/src/Makefile
+1 -1
View File
@@ -54,7 +54,7 @@ ifeq ($(CONFIG_LPC31_MCI),y)
CSRCS += lpc31_mmcsd.c
endif
ifeq ($(CONFIG_NSH_ARCHINIT),y)
ifeq ($(CONFIG_LIB_BOARDCTL),y)
CSRCS += lpc31_appinit.c
endif
configs/olimex-lpc1766stk/src/lpc17_appinit.c
+1 -1
View File
@@ -66,7 +66,7 @@
/* MMC/SD is on SSP port 1. There is only a single slot, slot 0 */
#ifdef CONFIG_NSH_ARCHINIT
#ifdef CONFIG_LIB_BOARDCTL
# if !defined(CONFIG_NSH_MMCSDSPIPORTNO) || CONFIG_NSH_MMCSDSPIPORTNO != 1
# undef CONFIG_NSH_MMCSDSPIPORTNO
# define CONFIG_NSH_MMCSDSPIPORTNO 1
configs/olimex-lpc2378/src/Makefile
+1 -1
View File
@@ -43,7 +43,7 @@
ASRCS =
CSRCS = lpc2378_leds.c
ifeq ($(CONFIG_NSH_ARCHINIT),y)
ifeq ($(CONFIG_LIB_BOARDCTL),y)
CSRCS += lpc2378_appinit.c
endif
configs/olimex-stm32-h405/src/stm32_appinit.c
+2 -2
View File
@@ -75,11 +75,11 @@
* Description:
* Perform architecture specific initialization
*
* CONFIG_NSH_ARCHINIT=y :
* CONFIG_LIB_BOARDCTL=y :
* Called from the NSH library
*
* CONFIG_BOARD_INITIALIZE=y, CONFIG_NSH_LIBRARY=y, &&
* CONFIG_NSH_ARCHINIT=n :
* CONFIG_LIB_BOARDCTL=n :
* Called from board_initialize().
*
****************************************************************************/
configs/olimex-stm32-h405/src/stm32_boot.c
+1 -1
View File
@@ -117,7 +117,7 @@ void board_initialize(void)
* but the initialization function must run in kernel space.
*/
#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT)
#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL)
board_app_initialize();
#endif
}
configs/olimex-stm32-h407/src/stm32_appinit.c
+2 -2
View File
@@ -108,11 +108,11 @@
* Description:
* Perform architecture specific initialization
*
* CONFIG_NSH_ARCHINIT=y :
* CONFIG_LIB_BOARDCTL=y :
* Called from the NSH library
*
* CONFIG_BOARD_INITIALIZE=y, CONFIG_NSH_LIBRARY=y, &&
* CONFIG_NSH_ARCHINIT=n :
* CONFIG_LIB_BOARDCTL=n :
* Called from board_initialize().
*
****************************************************************************/
configs/olimex-stm32-h407/src/stm32_boot.c
+1 -1
View File
@@ -106,7 +106,7 @@ void stm32_boardinitialize(void)
#ifdef CONFIG_BOARD_INITIALIZE
void board_initialize(void)
{
#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT)
#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL)
/* Perform NSH initialization here instead of from the NSH. This
* alternative NSH initialization is necessary when NSH is ran in user-space
* but the initialization function must run in kernel space.
configs/olimex-stm32-p207/src/stm32_appinit.c
+2 -2
View File
@@ -104,11 +104,11 @@
* Description:
* Perform architecture specific initialization
*
* CONFIG_NSH_ARCHINIT=y :
* CONFIG_LIB_BOARDCTL=y :
* Called from the NSH library
*
* CONFIG_BOARD_INITIALIZE=y, CONFIG_NSH_LIBRARY=y, &&
* CONFIG_NSH_ARCHINIT=n :
* CONFIG_LIB_BOARDCTL=n :
* Called from board_initialize().
*
****************************************************************************/
configs/olimex-stm32-p207/src/stm32_boot.c
+1 -1
View File
@@ -118,7 +118,7 @@ void board_initialize(void)
* but the initialization function must run in kernel space.
*/
#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT)
#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL)
board_app_initialize();
#endif
}
configs/olimex-strp711/src/Makefile
+1 -1
View File
@@ -37,7 +37,7 @@
ASRCS =
CSRCS = str71_spi.c str71_leds.c str71_buttons.c
ifeq ($(CONFIG_NSH_ARCHINIT),y)
ifeq ($(CONFIG_LIB_BOARDCTL),y)
CSRCS += str71_appinit.c
endif
ifeq ($(CONFIG_ENC28J60),y)
configs/olimexino-stm32/src/stm32_boot.c
+1 -1
View File
@@ -130,7 +130,7 @@ void stm32_boardinitialize(void)
#ifdef CONFIG_BOARD_INITIALIZE
void board_initialize(void)
{
#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT)
#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL)
/* Perform NSH initialization here instead of from the NSH. This
* alternative NSH initialization is necessary when NSH is ran in user-
* space but the initialization function must run in kernel space.
configs/open1788/src/lpc17_appinit.c
+2 -2
View File
@@ -364,11 +364,11 @@ static int nsh_usbhostinitialize(void)
* Description:
* Perform architecture specific initialization for NSH.
*
* CONFIG_NSH_ARCHINIT=y :
* CONFIG_LIB_BOARDCTL=y :
* Called from the NSH library
*
* CONFIG_BOARD_INITIALIZE=y, CONFIG_NSH_LIBRARY=y, &&
* CONFIG_NSH_ARCHINIT=n:
* CONFIG_LIB_BOARDCTL=n:
* Called from board_initialize().
*
****************************************************************************/
configs/open1788/src/lpc17_boardinitialize.c
+1 -1
View File
@@ -135,7 +135,7 @@ void board_initialize(void)
* but the initialization function must run in kernel space.
*/
#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT)
#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL)
(void)board_app_initialize();
#endif
}
configs/pcblogic-pic32mx/src/Makefile
+1 -1
View File
@@ -38,7 +38,7 @@
ASRCS =
CSRCS = pic32mx_boot.c
ifeq ($(CONFIG_NSH_ARCHINIT),y)
ifeq ($(CONFIG_LIB_BOARDCTL),y)
CSRCS += pic32mx_appinit.c
endif
configs/pcduino-a10/src/Makefile
+1 -1
View File
@@ -38,7 +38,7 @@
ASRCS =
CSRCS = a1x_boot.c a1x_leds.c
ifeq ($(CONFIG_NSH_ARCHINIT),y)
ifeq ($(CONFIG_LIB_BOARDCTL),y)
CSRCS += a1x_nsh.c
endif

Some files were not shown because too many files have changed in this diff Show More