From a76e137ce2ef8f7b49eda0927c8a66c4a30ad624 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Mon, 18 Feb 2019 15:32:00 -0600 Subject: [PATCH] Squashed commit of the following: sched/init/nx_start.c: Add support for CONFIG_BOARD_DRIVER_INITIALIZE. If this option is selected then nx_start() will call a board-provided function board_driver_initialize() immediately after calling up_initialize(). Rename CONFIG_BOARD_INITIALIZE to CONFIG_BOARD_LATE_INITIALIZE. Raname board_initialize() to board_late_initialize() --- Documentation/NXGraphicsSubsystem.html | 2 +- configs/arduino-due/src/arduino-due.h | 6 +- configs/arduino-due/src/sam_appinit.c | 4 +- configs/arduino-due/src/sam_boot.c | 10 +- configs/arduino-due/src/sam_bringup.c | 6 +- configs/b-l072z-lrwan1/src/b-l072z-lrwan1.h | 6 +- configs/b-l072z-lrwan1/src/stm32_appinit.c | 4 +- configs/b-l072z-lrwan1/src/stm32_boot.c | 10 +- configs/b-l072z-lrwan1/src/stm32_bringup.c | 6 +- configs/b-l475e-iot01a/src/b-l475e-iot01a.h | 4 +- configs/b-l475e-iot01a/src/stm32_appinit.c | 2 +- configs/b-l475e-iot01a/src/stm32_boot.c | 12 +-- configs/b-l475e-iot01a/src/stm32_bringup.c | 2 +- configs/bambino-200e/max31855/defconfig | 2 +- configs/bambino-200e/src/lpc43_boot.c | 10 +- configs/beaglebone-black/src/am335x_boot.c | 12 +-- configs/clicker2-stm32/knsh/defconfig | 2 +- .../clicker2-stm32/mrf24j40-6lowpan/defconfig | 2 +- configs/clicker2-stm32/mrf24j40-mac/defconfig | 2 +- .../clicker2-stm32/mrf24j40-starhub/defconfig | 2 +- .../mrf24j40-starpoint/defconfig | 2 +- configs/clicker2-stm32/nsh/defconfig | 2 +- configs/clicker2-stm32/src/clicker2-stm32.h | 6 +- configs/clicker2-stm32/src/stm32_appinit.c | 8 +- configs/clicker2-stm32/src/stm32_boot.c | 10 +- configs/clicker2-stm32/src/stm32_bringup.c | 6 +- configs/clicker2-stm32/usbnsh/defconfig | 2 +- configs/clicker2-stm32/xbee-6lowpan/defconfig | 2 +- configs/dk-tm4c129x/src/tm4c_appinit.c | 6 +- configs/dk-tm4c129x/src/tm4c_boot.c | 12 +-- configs/eagle100/nxflat/defconfig | 2 +- configs/efm32-g8xx-stk/src/efm32_boot.c | 10 +- configs/efm32gg-stk3700/src/efm32_boot.c | 10 +- configs/esp32-core/src/esp32-core.h | 6 +- configs/esp32-core/src/esp32_appinit.c | 4 +- configs/esp32-core/src/esp32_boot.c | 10 +- configs/esp32-core/src/esp32_bringup.c | 6 +- .../flipnclick-pic32mz/src/pic32mz_appinit.c | 6 +- configs/flipnclick-pic32mz/src/pic32mz_boot.c | 12 +-- .../flipnclick-sam3x/src/flipnclick-sam3x.h | 6 +- configs/flipnclick-sam3x/src/sam_appinit.c | 4 +- configs/flipnclick-sam3x/src/sam_boot.c | 10 +- configs/flipnclick-sam3x/src/sam_bringup.c | 6 +- configs/freedom-k28f/src/freedom-k28f.h | 6 +- configs/freedom-k28f/src/k28_appinit.c | 4 +- configs/freedom-k28f/src/k28_boot.c | 10 +- configs/freedom-k28f/src/k28_bringup.c | 6 +- configs/freedom-k64f/README.txt | 2 +- configs/freedom-k64f/src/Makefile | 2 +- configs/freedom-k64f/src/freedom-k64f.h | 2 +- configs/freedom-k64f/src/k64_appinit.c | 2 +- configs/freedom-k64f/src/k64_boot.c | 12 +-- configs/freedom-k64f/src/k64_bringup.c | 4 +- configs/freedom-k66f/README.txt | 2 +- configs/freedom-k66f/src/Makefile | 2 +- configs/freedom-k66f/src/freedom-k66f.h | 2 +- configs/freedom-k66f/src/k66_appinit.c | 2 +- configs/freedom-k66f/src/k66_boot.c | 12 +-- configs/freedom-k66f/src/k66_bringup.c | 4 +- .../freedom-kl25z/src/kl_boardinitialize.c | 10 +- .../freedom-kl26z/src/kl_boardinitialize.c | 10 +- configs/imxrt1050-evk/libcxxtest/defconfig | 2 +- configs/imxrt1050-evk/src/Makefile | 2 +- configs/imxrt1050-evk/src/imxrt1050-evk.h | 2 +- configs/imxrt1050-evk/src/imxrt_appinit.c | 2 +- configs/imxrt1050-evk/src/imxrt_boot.c | 12 +-- configs/imxrt1060-evk/libcxxtest/defconfig | 2 +- configs/imxrt1060-evk/src/Makefile | 2 +- configs/imxrt1060-evk/src/imxrt1060-evk.h | 2 +- configs/imxrt1060-evk/src/imxrt_appinit.c | 2 +- configs/imxrt1060-evk/src/imxrt_boot.c | 12 +-- configs/launchxl-cc1310/src/Makefile | 2 +- configs/launchxl-cc1310/src/cc1310_appinit.c | 2 +- configs/launchxl-cc1310/src/cc1310_boot.c | 12 +-- configs/launchxl-cc1310/src/cc1310_bringup.c | 6 +- configs/launchxl-cc1310/src/launchxl-cc1310.h | 6 +- configs/launchxl-cc1312r1/src/Makefile | 2 +- .../launchxl-cc1312r1/src/cc1312_appinit.c | 2 +- configs/launchxl-cc1312r1/src/cc1312_boot.c | 12 +-- .../launchxl-cc1312r1/src/cc1312_bringup.c | 6 +- .../launchxl-cc1312r1/src/launchxl-cc1312r1.h | 6 +- .../launchxl-tms57004/src/tms570_appinit.c | 4 +- .../launchxl-tms57004/src/tms570_initialize.c | 10 +- configs/lc823450-xgevk/elf/defconfig | 2 +- configs/lc823450-xgevk/src/Makefile | 2 +- configs/lc823450-xgevk/src/lc823450-xgevk.h | 2 +- configs/lc823450-xgevk/src/lc823450_appinit.c | 2 +- configs/lc823450-xgevk/src/lc823450_boot.c | 12 +-- .../lpcxpresso-lpc54628/src/lpc54_appinit.c | 4 +- configs/lpcxpresso-lpc54628/src/lpc54_boot.c | 10 +- .../lpcxpresso-lpc54628/src/lpc54_bringup.c | 6 +- .../src/lpcxpresso-lpc54628.h | 6 +- configs/max32660-evsys/src/Makefile | 2 +- configs/max32660-evsys/src/max32660-evsys.h | 6 +- configs/max32660-evsys/src/max326_appinit.c | 2 +- configs/max32660-evsys/src/max326_boot.c | 12 +-- configs/max32660-evsys/src/max326_bringup.c | 6 +- configs/mcb1700/src/lpc17_appinit.c | 4 +- configs/mcb1700/src/lpc17_boot.c | 10 +- configs/mcb1700/src/lpc17_bringup.c | 6 +- configs/mcb1700/src/mcb1700.h | 6 +- configs/metro-m4/src/metro-m4.h | 6 +- configs/metro-m4/src/sam_appinit.c | 4 +- configs/metro-m4/src/sam_boot.c | 10 +- configs/metro-m4/src/sam_bringup.c | 6 +- configs/moxa/nsh/defconfig | 2 +- configs/moxa/src/moxart_appinit.c | 6 +- configs/moxa/src/moxart_boot.c | 10 +- configs/nrf52-generic/src/nrf52-generic.h | 6 +- configs/nrf52-generic/src/nrf52_appinit.c | 4 +- configs/nrf52-generic/src/nrf52_boot.c | 10 +- configs/nrf52-generic/src/nrf52_bringup.c | 6 +- configs/nucleo-144/src/stm32_boot.c | 10 +- configs/nucleo-f072rb/src/nucleo-f072rb.h | 6 +- configs/nucleo-f072rb/src/stm32_appinit.c | 4 +- configs/nucleo-f072rb/src/stm32_boot.c | 10 +- configs/nucleo-f072rb/src/stm32_bringup.c | 6 +- configs/nucleo-f091rc/src/nucleo-f091rc.h | 6 +- configs/nucleo-f091rc/src/stm32_appinit.c | 4 +- configs/nucleo-f091rc/src/stm32_boot.c | 10 +- configs/nucleo-f091rc/src/stm32_bringup.c | 6 +- .../nucleo-f207zg/src/stm32_appinitialize.c | 4 +- configs/nucleo-f207zg/src/stm32_boot.c | 10 +- configs/nucleo-f207zg/src/stm32_bringup.c | 6 +- .../nucleo-f303ze/src/stm32_appinitialize.c | 4 +- configs/nucleo-f303ze/src/stm32_boot.c | 10 +- configs/nucleo-f303ze/src/stm32_bringup.c | 6 +- configs/nucleo-f410rb/nsh/defconfig | 2 +- configs/nucleo-f410rb/src/nucleo-f410rb.h | 6 +- configs/nucleo-f410rb/src/stm32_appinit.c | 4 +- configs/nucleo-f410rb/src/stm32_boot.c | 10 +- configs/nucleo-f410rb/src/stm32_bringup.c | 6 +- configs/nucleo-f4x1re/src/stm32_boot.c | 10 +- configs/nucleo-h743zi/src/nucleo-h743zi.h | 6 +- .../nucleo-h743zi/src/stm32_appinitialize.c | 4 +- configs/nucleo-h743zi/src/stm32_boot.c | 10 +- configs/nucleo-h743zi/src/stm32_bringup.c | 6 +- configs/nucleo-l073rz/src/nucleo-l073rz.h | 6 +- configs/nucleo-l073rz/src/stm32_appinit.c | 4 +- configs/nucleo-l073rz/src/stm32_boot.c | 10 +- configs/nucleo-l073rz/src/stm32_bringup.c | 6 +- configs/nucleo-l432kc/src/stm32_boot.c | 10 +- configs/nucleo-l452re/src/nucleo-l452re.h | 6 +- configs/nucleo-l452re/src/stm32_appinit.c | 4 +- configs/nucleo-l452re/src/stm32_boot.c | 10 +- configs/nucleo-l452re/src/stm32_bringup.c | 6 +- configs/nucleo-l476rg/src/stm32_boot.c | 10 +- configs/nucleo-l496zg/src/stm32_boot.c | 10 +- .../olimex-efm32g880f128-stk/src/efm32_boot.c | 10 +- configs/olimex-lpc1766stk/src/lpc1766stk.h | 6 +- configs/olimex-lpc1766stk/src/lpc17_appinit.c | 8 +- configs/olimex-lpc1766stk/src/lpc17_boot.c | 10 +- configs/olimex-lpc1766stk/src/lpc17_bringup.c | 6 +- configs/olimex-stm32-e407/src/stm32_appinit.c | 4 +- configs/olimex-stm32-e407/src/stm32_boot.c | 10 +- configs/olimex-stm32-h405/src/stm32_appinit.c | 4 +- configs/olimex-stm32-h405/src/stm32_boot.c | 10 +- configs/olimex-stm32-h405/usbnsh/defconfig | 2 +- .../olimex-stm32-h407/src/olimex-stm32-h407.h | 4 +- configs/olimex-stm32-h407/src/stm32_boot.c | 10 +- configs/olimex-stm32-h407/src/stm32_bringup.c | 4 +- configs/olimex-stm32-p207/nsh/defconfig | 2 +- configs/olimex-stm32-p207/src/stm32_appinit.c | 4 +- configs/olimex-stm32-p207/src/stm32_boot.c | 10 +- configs/olimex-stm32-p407/dhtxx/defconfig | 2 +- configs/olimex-stm32-p407/hidkbd/defconfig | 2 +- configs/olimex-stm32-p407/kelf/defconfig | 2 +- configs/olimex-stm32-p407/kmodule/defconfig | 2 +- configs/olimex-stm32-p407/knsh/defconfig | 2 +- configs/olimex-stm32-p407/nsh/defconfig | 2 +- .../olimex-stm32-p407/src/olimex-stm32-p407.h | 6 +- configs/olimex-stm32-p407/src/stm32_appinit.c | 8 +- configs/olimex-stm32-p407/src/stm32_boot.c | 10 +- configs/olimex-stm32-p407/src/stm32_bringup.c | 6 +- configs/olimexino-stm32/can/defconfig | 2 +- configs/olimexino-stm32/composite/defconfig | 2 +- configs/olimexino-stm32/nsh/defconfig | 2 +- configs/olimexino-stm32/smallnsh/defconfig | 2 +- configs/olimexino-stm32/src/stm32_boot.c | 10 +- configs/olimexino-stm32/tiny/defconfig | 2 +- configs/open1788/fb/defconfig | 2 +- configs/open1788/knsh/defconfig | 2 +- configs/open1788/src/lpc17_appinit.c | 4 +- configs/open1788/src/lpc17_boardinitialize.c | 10 +- configs/open1788/src/lpc17_bringup.c | 6 +- configs/open1788/src/open1788.h | 6 +- configs/or1k/nsh/defconfig | 2 +- configs/or1k/src/or1k.h | 6 +- configs/or1k/src/or1k_appinit.c | 4 +- configs/or1k/src/or1k_boot.c | 10 +- configs/or1k/src/or1k_bringup.c | 6 +- configs/pcduino-a10/src/a1x_boot.c | 12 +-- configs/photon/src/photon.h | 4 +- configs/photon/src/stm32_appinit.c | 2 +- configs/photon/src/stm32_boot.c | 12 +-- configs/photon/src/stm32_bringup.c | 2 +- configs/pic32mx7mmb/src/pic32_appinit.c | 8 +- configs/pic32mx7mmb/src/pic32_boot.c | 10 +- configs/pic32mx7mmb/src/pic32_bringup.c | 6 +- configs/pic32mx7mmb/src/pic32mx7mmb.h | 6 +- .../pic32mz-starterkit/src/pic32mz_appinit.c | 6 +- configs/pic32mz-starterkit/src/pic32mz_boot.c | 12 +-- configs/sabre-6quad/src/imx_appinit.c | 2 +- configs/sabre-6quad/src/imx_boardinit.c | 12 +-- configs/sabre-6quad/src/sabre-6quad.h | 2 +- configs/sam4cmp-db/src/Makefile | 2 +- configs/sam4cmp-db/src/sam4cmp-db.h | 2 +- configs/sam4cmp-db/src/sam_appinit.c | 2 +- configs/sam4cmp-db/src/sam_boot.c | 12 +-- configs/sam4e-ek/src/sam_boot.c | 12 +-- configs/sam4s-xplained-pro/nsh/defconfig | 2 +- configs/sam4s-xplained-pro/src/sam_boot.c | 12 +-- configs/sama5d2-xult/src/Makefile | 2 +- configs/sama5d2-xult/src/sam_appinit.c | 2 +- configs/sama5d2-xult/src/sam_boot.c | 12 +-- configs/sama5d3-xplained/src/sam_boot.c | 12 +-- configs/sama5d3x-ek/src/sam_boot.c | 12 +-- configs/sama5d4-ek/README.txt | 2 +- configs/sama5d4-ek/elf/defconfig | 2 +- configs/sama5d4-ek/knsh/defconfig | 2 +- configs/sama5d4-ek/src/Makefile | 2 +- configs/sama5d4-ek/src/sam_appinit.c | 2 +- configs/sama5d4-ek/src/sam_boot.c | 12 +-- configs/same70-xplained/README.txt | 2 +- configs/same70-xplained/src/Makefile | 2 +- configs/same70-xplained/src/sam_appinit.c | 2 +- configs/same70-xplained/src/sam_boot.c | 12 +-- configs/same70-xplained/src/same70-xplained.h | 2 +- configs/samv71-xult/README.txt | 2 +- configs/samv71-xult/src/Makefile | 2 +- configs/samv71-xult/src/sam_appinit.c | 2 +- configs/samv71-xult/src/sam_boot.c | 12 +-- configs/samv71-xult/src/samv71-xult.h | 2 +- configs/sim/fb/defconfig | 2 +- configs/sim/loadable/defconfig | 2 +- configs/sim/spiffs/defconfig | 2 +- configs/sim/src/Makefile | 4 +- configs/sim/src/sim_appinit.c | 2 +- configs/sim/src/sim_boot.c | 12 +-- configs/sim/traveler/defconfig | 2 +- configs/stm3210e-eval/src/stm3210e-eval.h | 6 +- configs/stm3210e-eval/src/stm32_appinit.c | 4 +- configs/stm3210e-eval/src/stm32_boot.c | 10 +- configs/stm3210e-eval/src/stm32_bringup.c | 6 +- configs/stm3210e-eval/src/stm32_usbmsc.c | 6 +- configs/stm3240g-eval/Kconfig | 16 ++-- configs/stm3240g-eval/fb/defconfig | 2 +- configs/stm3240g-eval/src/stm3240g-eval.h | 6 +- configs/stm3240g-eval/src/stm32_appinit.c | 4 +- configs/stm3240g-eval/src/stm32_boot.c | 10 +- configs/stm3240g-eval/src/stm32_bringup.c | 6 +- .../stm32f051-discovery/src/stm32_appinit.c | 4 +- configs/stm32f051-discovery/src/stm32_boot.c | 10 +- .../stm32f051-discovery/src/stm32_bringup.c | 6 +- .../src/stm32f051-discovery.h | 6 +- .../stm32f072-discovery/src/stm32_appinit.c | 4 +- configs/stm32f072-discovery/src/stm32_boot.c | 10 +- .../stm32f072-discovery/src/stm32_bringup.c | 6 +- .../src/stm32f072-discovery.h | 6 +- configs/stm32f103-minimum/README.txt | 2 +- configs/stm32f103-minimum/buttons/defconfig | 2 +- configs/stm32f103-minimum/src/stm32_boot.c | 10 +- configs/stm32f103-minimum/src/stm32_bringup.c | 6 +- .../stm32f103-minimum/src/stm32f103_minimum.h | 4 +- configs/stm32f103-minimum/userled/defconfig | 2 +- configs/stm32f103-minimum/veml6070/defconfig | 2 +- configs/stm32f3discovery/src/stm32_appinit.c | 4 +- configs/stm32f3discovery/src/stm32_boot.c | 10 +- configs/stm32f3discovery/src/stm32_bringup.c | 6 +- .../stm32f3discovery/src/stm32f3discovery.h | 6 +- configs/stm32f411e-disco/src/stm32_appinit.c | 2 +- configs/stm32f411e-disco/src/stm32_boot.c | 10 +- configs/stm32f411e-disco/src/stm32_bringup.c | 6 +- .../stm32f411e-disco/src/stm32f411e-disco.h | 6 +- configs/stm32f429i-disco/lcd/defconfig | 2 +- configs/stm32f429i-disco/src/stm32_appinit.c | 4 +- configs/stm32f429i-disco/src/stm32_boot.c | 10 +- configs/stm32f429i-disco/src/stm32_bringup.c | 6 +- .../stm32f429i-disco/src/stm32f429i-disco.h | 6 +- configs/stm32f4discovery/README.txt | 4 +- configs/stm32f4discovery/audio/defconfig | 2 +- configs/stm32f4discovery/elf/defconfig | 2 +- configs/stm32f4discovery/kostest/defconfig | 2 +- configs/stm32f4discovery/max31855/defconfig | 2 +- configs/stm32f4discovery/nsh/defconfig | 2 +- configs/stm32f4discovery/rgbled/defconfig | 2 +- configs/stm32f4discovery/src/stm32_appinit.c | 4 +- configs/stm32f4discovery/src/stm32_boot.c | 10 +- configs/stm32f4discovery/src/stm32_bringup.c | 6 +- .../stm32f4discovery/src/stm32f4discovery.h | 6 +- configs/stm32f4discovery/xen1210/defconfig | 2 +- configs/stm32f746-ws/src/stm32_boot.c | 10 +- configs/stm32f746g-disco/fb/defconfig | 2 +- configs/stm32f746g-disco/lvgl/defconfig | 2 +- configs/stm32f746g-disco/nxdemo/defconfig | 2 +- configs/stm32f746g-disco/nxterm/defconfig | 2 +- .../src/stm32_appinitialize.c | 2 +- configs/stm32f746g-disco/src/stm32_boot.c | 10 +- configs/stm32f746g-disco/src/stm32_bringup.c | 6 +- .../stm32f746g-disco/src/stm32f746g-disco.h | 6 +- configs/stm32f769i-disco/src/stm32_boot.c | 10 +- configs/stm32l476-mdk/src/stm32_appinit.c | 4 +- configs/stm32l476-mdk/src/stm32_boot.c | 10 +- configs/stm32l476-mdk/src/stm32l476-mdk.h | 6 +- configs/stm32l476vg-disco/src/stm32_boot.c | 10 +- configs/stm32l4r9ai-disco/src/stm32_boot.c | 10 +- configs/teensy-3.x/src/k20_boot.c | 4 +- configs/teensy-lc/src/kl_boardinitialize.c | 10 +- configs/tm4c123g-launchpad/src/tm4c_appinit.c | 6 +- configs/tm4c123g-launchpad/src/tm4c_boot.c | 12 +-- configs/tm4c1294-launchpad/src/tm4c_appinit.c | 6 +- configs/tm4c1294-launchpad/src/tm4c_boot.c | 12 +-- .../tms570ls31x-usb-kit/src/tms570_appinit.c | 4 +- .../src/tms570_initialize.c | 10 +- configs/twr-k64f120m/src/twrk64.h | 2 +- configs/u-blox-c027/nsh/defconfig | 2 +- configs/u-blox-c027/src/lpc17_boot.c | 12 +-- .../viewtool-stm32f107/src/stm32_appinit.c | 4 +- configs/viewtool-stm32f107/src/stm32_boot.c | 10 +- .../viewtool-stm32f107/src/stm32_bringup.c | 6 +- .../src/viewtool_stm32f107.h | 6 +- configs/xmc4500-relax/src/xmc4_appinit.c | 4 +- configs/xmc4500-relax/src/xmc4_boot.c | 12 +-- include/nuttx/board.h | 49 ++++++++-- libs/libc/zoneinfo/README.txt | 2 +- net/usrsock/usrsock_dev.c | 2 +- sched/Kconfig | 93 +++++++++++++++---- sched/init/nx_bringup.c | 16 ++-- sched/init/nx_start.c | 9 ++ 329 files changed, 1067 insertions(+), 964 deletions(-) diff --git a/Documentation/NXGraphicsSubsystem.html b/Documentation/NXGraphicsSubsystem.html index 273a8fcc83..a88312a3ae 100644 --- a/Documentation/NXGraphicsSubsystem.html +++ b/Documentation/NXGraphicsSubsystem.html @@ -939,7 +939,7 @@ struct nx_callback_s

The NX server may be started in your board startup logic by simply calling the function nxmu_start(). The board startup logic usually resides the the configs/board/src directory. - The boar board startup logic can run automatically during the early system if CONFIG_BOARD_INITIALIZE is defined in the configuration. + The boar board startup logic can run automatically during the early system if CONFIG_BOARD_LATE_INITIALIZE is defined in the configuration. Or, the board startup logic can execute under control of the application by calling the boardctl(BOARDIOC_INIT, arg) OS interface.

diff --git a/configs/arduino-due/src/arduino-due.h b/configs/arduino-due/src/arduino-due.h index 01768855d7..780385dedd 100644 --- a/configs/arduino-due/src/arduino-due.h +++ b/configs/arduino-due/src/arduino-due.h @@ -314,10 +314,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ************************************************************************************/ diff --git a/configs/arduino-due/src/sam_appinit.c b/configs/arduino-due/src/sam_appinit.c index 91e9391daf..c8fcce63c1 100644 --- a/configs/arduino-due/src/sam_appinit.c +++ b/configs/arduino-due/src/sam_appinit.c @@ -82,8 +82,8 @@ int board_app_initialize(uintptr_t arg) { -#ifdef CONFIG_BOARD_INITIALIZE - /* Board initialization already performed by board_initialize() */ +#ifdef CONFIG_BOARD_LATE_INITIALIZE + /* Board initialization already performed by board_late_initialize() */ return OK; #else diff --git a/configs/arduino-due/src/sam_boot.c b/configs/arduino-due/src/sam_boot.c index 0d226bc13a..f587bd2fac 100644 --- a/configs/arduino-due/src/sam_boot.c +++ b/configs/arduino-due/src/sam_boot.c @@ -70,20 +70,20 @@ void sam_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_initialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform board-specific initialization */ diff --git a/configs/arduino-due/src/sam_bringup.c b/configs/arduino-due/src/sam_bringup.c index 50dc141500..b6d18176dc 100644 --- a/configs/arduino-due/src/sam_bringup.c +++ b/configs/arduino-due/src/sam_bringup.c @@ -79,10 +79,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ****************************************************************************/ diff --git a/configs/b-l072z-lrwan1/src/b-l072z-lrwan1.h b/configs/b-l072z-lrwan1/src/b-l072z-lrwan1.h index 9f8c0c8127..d137c43a26 100644 --- a/configs/b-l072z-lrwan1/src/b-l072z-lrwan1.h +++ b/configs/b-l072z-lrwan1/src/b-l072z-lrwan1.h @@ -118,10 +118,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ************************************************************************************/ diff --git a/configs/b-l072z-lrwan1/src/stm32_appinit.c b/configs/b-l072z-lrwan1/src/stm32_appinit.c index 09c3501044..b9c54c2138 100644 --- a/configs/b-l072z-lrwan1/src/stm32_appinit.c +++ b/configs/b-l072z-lrwan1/src/stm32_appinit.c @@ -82,8 +82,8 @@ int board_app_initialize(uintptr_t arg) { -#ifdef CONFIG_BOARD_INITIALIZE - /* Board initialization already performed by board_initialize() */ +#ifdef CONFIG_BOARD_LATE_INITIALIZE + /* Board initialization already performed by board_late_initialize() */ return OK; #else diff --git a/configs/b-l072z-lrwan1/src/stm32_boot.c b/configs/b-l072z-lrwan1/src/stm32_boot.c index 3106e3a580..6c3a45d462 100644 --- a/configs/b-l072z-lrwan1/src/stm32_boot.c +++ b/configs/b-l072z-lrwan1/src/stm32_boot.c @@ -92,20 +92,20 @@ void stm32_boardinitialize(void) } /************************************************************************************ - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional initialization call + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional initialization call * will be performed in the boot-up sequence to a function called - * board_initialize(). board_initialize() will be called immediately after + * board_late_initialize(). board_late_initialize() will be called immediately after * up_initialize() is called and just before the initial application is started. * This additional initialization phase may be used, for example, to initialize * board-specific device drivers. * ************************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { #if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL) /* Perform board bring-up here instead of from the board_app_initialize(). */ diff --git a/configs/b-l072z-lrwan1/src/stm32_bringup.c b/configs/b-l072z-lrwan1/src/stm32_bringup.c index 3321734bb3..322d621f40 100644 --- a/configs/b-l072z-lrwan1/src/stm32_bringup.c +++ b/configs/b-l072z-lrwan1/src/stm32_bringup.c @@ -73,10 +73,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y && CONFIG_NSH_ARCHINIT: + * CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y && CONFIG_NSH_ARCHINIT: * Called from the NSH library * ****************************************************************************/ diff --git a/configs/b-l475e-iot01a/src/b-l475e-iot01a.h b/configs/b-l475e-iot01a/src/b-l475e-iot01a.h index 7351a37cf7..3e3d45a501 100644 --- a/configs/b-l475e-iot01a/src/b-l475e-iot01a.h +++ b/configs/b-l475e-iot01a/src/b-l475e-iot01a.h @@ -145,14 +145,14 @@ * Name: stm32l4_bringup * * Description: - * Called either by board_intialize() if CONFIG_BOARD_INITIALIZE or by + * Called either by board_intialize() if CONFIG_BOARD_LATE_INITIALIZE or by * board_app_initialize if CONFIG_LIB_BOARDCTL is selected. This function * initializes and configures all on-board features appropriate for the * selected configuration. * ****************************************************************************/ -#if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_INITIALIZE) +#if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE) int stm32l4_bringup(void); #endif diff --git a/configs/b-l475e-iot01a/src/stm32_appinit.c b/configs/b-l475e-iot01a/src/stm32_appinit.c index cbb2f01043..012ae4ceae 100644 --- a/configs/b-l475e-iot01a/src/stm32_appinit.c +++ b/configs/b-l475e-iot01a/src/stm32_appinit.c @@ -78,7 +78,7 @@ int board_app_initialize(uintptr_t arg) { -#ifndef CONFIG_BOARD_INITIALIZE +#ifndef CONFIG_BOARD_LATE_INITIALIZE /* Perform board initialization */ return stm32l4_bringup(); diff --git a/configs/b-l475e-iot01a/src/stm32_boot.c b/configs/b-l475e-iot01a/src/stm32_boot.c index 32316e4912..50f124b593 100644 --- a/configs/b-l475e-iot01a/src/stm32_boot.c +++ b/configs/b-l475e-iot01a/src/stm32_boot.c @@ -81,23 +81,23 @@ void stm32l4_board_initialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_intitialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform board initialization */ (void)stm32l4_bringup(); } -#endif /* CONFIG_BOARD_INITIALIZE */ +#endif /* CONFIG_BOARD_LATE_INITIALIZE */ diff --git a/configs/b-l475e-iot01a/src/stm32_bringup.c b/configs/b-l475e-iot01a/src/stm32_bringup.c index 50beaf4294..4f1435ed34 100644 --- a/configs/b-l475e-iot01a/src/stm32_bringup.c +++ b/configs/b-l475e-iot01a/src/stm32_bringup.c @@ -65,7 +65,7 @@ * Name: stm32l4_bringup * * Description: - * Called either by board_intialize() if CONFIG_BOARD_INITIALIZE or by + * Called either by board_intialize() if CONFIG_BOARD_LATE_INITIALIZE or by * board_app_initialize if CONFIG_LIB_BOARDCTL is selected. This function * initializes and configures all on-board features appropriate for the * selected configuration. diff --git a/configs/bambino-200e/max31855/defconfig b/configs/bambino-200e/max31855/defconfig index 5964610d77..ce0e310969 100644 --- a/configs/bambino-200e/max31855/defconfig +++ b/configs/bambino-200e/max31855/defconfig @@ -8,7 +8,7 @@ CONFIG_ARCH_CHIP_LPC4330FBD144=y CONFIG_ARCH_CHIP_LPC43XX=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH_STDARG_H=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=18535 CONFIG_BUILTIN=y CONFIG_CDCACM=y diff --git a/configs/bambino-200e/src/lpc43_boot.c b/configs/bambino-200e/src/lpc43_boot.c index 310dc958b6..b69dd42d03 100644 --- a/configs/bambino-200e/src/lpc43_boot.c +++ b/configs/bambino-200e/src/lpc43_boot.c @@ -101,20 +101,20 @@ void lpc43_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_initialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Configure max31855 driver for SSP0 or SSP1 */ diff --git a/configs/beaglebone-black/src/am335x_boot.c b/configs/beaglebone-black/src/am335x_boot.c index e4bb3a1874..bb72a84e99 100644 --- a/configs/beaglebone-black/src/am335x_boot.c +++ b/configs/beaglebone-black/src/am335x_boot.c @@ -101,20 +101,20 @@ void am335x_board_initialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_initialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { #if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL) /* Perform NSH initialization here instead of from the NSH. This @@ -125,4 +125,4 @@ void board_initialize(void) (void)board_app_initialize(0); #endif } -#endif /* CONFIG_BOARD_INITIALIZE */ +#endif /* CONFIG_BOARD_LATE_INITIALIZE */ diff --git a/configs/clicker2-stm32/knsh/defconfig b/configs/clicker2-stm32/knsh/defconfig index 85624e08bb..89f361e59c 100644 --- a/configs/clicker2-stm32/knsh/defconfig +++ b/configs/clicker2-stm32/knsh/defconfig @@ -7,7 +7,7 @@ CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARM_MPU=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILD_PROTECTED=y CONFIG_DISABLE_POLL=y diff --git a/configs/clicker2-stm32/mrf24j40-6lowpan/defconfig b/configs/clicker2-stm32/mrf24j40-6lowpan/defconfig index 4d34bf520b..6de434bc9d 100644 --- a/configs/clicker2-stm32/mrf24j40-6lowpan/defconfig +++ b/configs/clicker2-stm32/mrf24j40-6lowpan/defconfig @@ -11,7 +11,7 @@ CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_STACKDUMP=y CONFIG_BOARDCTL_USBDEVCTRL=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_CDCACM=y diff --git a/configs/clicker2-stm32/mrf24j40-mac/defconfig b/configs/clicker2-stm32/mrf24j40-mac/defconfig index cb7e03f3a6..96a6985b16 100644 --- a/configs/clicker2-stm32/mrf24j40-mac/defconfig +++ b/configs/clicker2-stm32/mrf24j40-mac/defconfig @@ -6,7 +6,7 @@ CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_DISABLE_POLL=y diff --git a/configs/clicker2-stm32/mrf24j40-starhub/defconfig b/configs/clicker2-stm32/mrf24j40-starhub/defconfig index 2cd11f7477..7f935825dc 100644 --- a/configs/clicker2-stm32/mrf24j40-starhub/defconfig +++ b/configs/clicker2-stm32/mrf24j40-starhub/defconfig @@ -11,7 +11,7 @@ CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_STACKDUMP=y CONFIG_BOARDCTL_USBDEVCTRL=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_CDCACM=y diff --git a/configs/clicker2-stm32/mrf24j40-starpoint/defconfig b/configs/clicker2-stm32/mrf24j40-starpoint/defconfig index 404bc4df4a..afdf3b4c7c 100644 --- a/configs/clicker2-stm32/mrf24j40-starpoint/defconfig +++ b/configs/clicker2-stm32/mrf24j40-starpoint/defconfig @@ -11,7 +11,7 @@ CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_STACKDUMP=y CONFIG_BOARDCTL_USBDEVCTRL=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_CDCACM=y diff --git a/configs/clicker2-stm32/nsh/defconfig b/configs/clicker2-stm32/nsh/defconfig index 4bc6619e9e..701c286e6c 100644 --- a/configs/clicker2-stm32/nsh/defconfig +++ b/configs/clicker2-stm32/nsh/defconfig @@ -6,7 +6,7 @@ CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_DISABLE_POLL=y diff --git a/configs/clicker2-stm32/src/clicker2-stm32.h b/configs/clicker2-stm32/src/clicker2-stm32.h index e39f06d44a..8a0eaa0aa6 100644 --- a/configs/clicker2-stm32/src/clicker2-stm32.h +++ b/configs/clicker2-stm32/src/clicker2-stm32.h @@ -273,10 +273,10 @@ void weak_function stm32_spidev_initialize(void); * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ************************************************************************************/ diff --git a/configs/clicker2-stm32/src/stm32_appinit.c b/configs/clicker2-stm32/src/stm32_appinit.c index 74e4d24c57..35de47b146 100644 --- a/configs/clicker2-stm32/src/stm32_appinit.c +++ b/configs/clicker2-stm32/src/stm32_appinit.c @@ -66,9 +66,9 @@ * CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * - * CONFIG_BOARD_INITIALIZE=y, CONFIG_NSH_LIBRARY=y, && + * CONFIG_BOARD_LATE_INITIALIZE=y, CONFIG_NSH_LIBRARY=y, && * CONFIG_LIB_BOARDCTL=n : - * Called from board_initialize(). + * Called from board_late_initialize(). * * Input Parameters: * arg - The boardctl() argument is passed to the board_app_initialize() @@ -91,9 +91,9 @@ int board_app_initialize(uintptr_t arg) { int ret; - /* Did we already initialize via board_initialize()? */ + /* Did we already initialize via board_late_initialize()? */ -#ifndef CONFIG_BOARD_INITIALIZE +#ifndef CONFIG_BOARD_LATE_INITIALIZE ret = stm32_bringup(); if (ret < 0) { diff --git a/configs/clicker2-stm32/src/stm32_boot.c b/configs/clicker2-stm32/src/stm32_boot.c index e87d316572..6da2816d9e 100644 --- a/configs/clicker2-stm32/src/stm32_boot.c +++ b/configs/clicker2-stm32/src/stm32_boot.c @@ -98,20 +98,20 @@ void stm32_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_initialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform board-specific initialization here if so configured */ diff --git a/configs/clicker2-stm32/src/stm32_bringup.c b/configs/clicker2-stm32/src/stm32_bringup.c index 7b0ba27bec..5ba13726df 100644 --- a/configs/clicker2-stm32/src/stm32_bringup.c +++ b/configs/clicker2-stm32/src/stm32_bringup.c @@ -80,10 +80,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ****************************************************************************/ diff --git a/configs/clicker2-stm32/usbnsh/defconfig b/configs/clicker2-stm32/usbnsh/defconfig index 81105c293e..cc4010520c 100644 --- a/configs/clicker2-stm32/usbnsh/defconfig +++ b/configs/clicker2-stm32/usbnsh/defconfig @@ -8,7 +8,7 @@ CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_STACKDUMP=y CONFIG_BOARDCTL_USBDEVCTRL=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_CDCACM=y diff --git a/configs/clicker2-stm32/xbee-6lowpan/defconfig b/configs/clicker2-stm32/xbee-6lowpan/defconfig index a833b48475..d763ad143e 100644 --- a/configs/clicker2-stm32/xbee-6lowpan/defconfig +++ b/configs/clicker2-stm32/xbee-6lowpan/defconfig @@ -11,7 +11,7 @@ CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_STACKDUMP=y CONFIG_BOARDCTL_USBDEVCTRL=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_CDCACM=y diff --git a/configs/dk-tm4c129x/src/tm4c_appinit.c b/configs/dk-tm4c129x/src/tm4c_appinit.c index 89b15be570..bc77635ce7 100644 --- a/configs/dk-tm4c129x/src/tm4c_appinit.c +++ b/configs/dk-tm4c129x/src/tm4c_appinit.c @@ -72,11 +72,11 @@ int board_app_initialize(uintptr_t arg) { - /* If CONFIG_BOARD_INITIALIZE is selected then board initialization was - * already performed in board_initialize. + /* If CONFIG_BOARD_LATE_INITIALIZE is selected then board initialization was + * already performed in board_late_initialize. */ -#ifndef CONFIG_BOARD_INITIALIZE +#ifndef CONFIG_BOARD_LATE_INITIALIZE return tm4c_bringup(); #else return OK; diff --git a/configs/dk-tm4c129x/src/tm4c_boot.c b/configs/dk-tm4c129x/src/tm4c_boot.c index 96d42b8f0e..be8a5d69a6 100644 --- a/configs/dk-tm4c129x/src/tm4c_boot.c +++ b/configs/dk-tm4c129x/src/tm4c_boot.c @@ -93,23 +93,23 @@ void tiva_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_intiialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform board initialization */ (void)tm4c_bringup(); } -#endif /* CONFIG_BOARD_INITIALIZE */ +#endif /* CONFIG_BOARD_LATE_INITIALIZE */ diff --git a/configs/eagle100/nxflat/defconfig b/configs/eagle100/nxflat/defconfig index 08b67b03e1..3dceadc1ac 100644 --- a/configs/eagle100/nxflat/defconfig +++ b/configs/eagle100/nxflat/defconfig @@ -6,7 +6,7 @@ CONFIG_ARCH_CHIP_LM3S=y CONFIG_ARCH_CHIP_LM=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=4531 CONFIG_DEV_LOWCONSOLE=y CONFIG_DISABLE_ENVIRON=y diff --git a/configs/efm32-g8xx-stk/src/efm32_boot.c b/configs/efm32-g8xx-stk/src/efm32_boot.c index 214e2d339d..a7331d827c 100644 --- a/configs/efm32-g8xx-stk/src/efm32_boot.c +++ b/configs/efm32-g8xx-stk/src/efm32_boot.c @@ -80,20 +80,20 @@ void efm32_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_initialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { } #endif diff --git a/configs/efm32gg-stk3700/src/efm32_boot.c b/configs/efm32gg-stk3700/src/efm32_boot.c index b34d2b7581..2c4701b612 100644 --- a/configs/efm32gg-stk3700/src/efm32_boot.c +++ b/configs/efm32gg-stk3700/src/efm32_boot.c @@ -80,20 +80,20 @@ void efm32_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_initialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { } #endif diff --git a/configs/esp32-core/src/esp32-core.h b/configs/esp32-core/src/esp32-core.h index 88e6f9fe79..90e1cfec4c 100644 --- a/configs/esp32-core/src/esp32-core.h +++ b/configs/esp32-core/src/esp32-core.h @@ -68,10 +68,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library via board_app_initialize() * ****************************************************************************/ diff --git a/configs/esp32-core/src/esp32_appinit.c b/configs/esp32-core/src/esp32_appinit.c index dcf65d5e71..ba06d76ca3 100644 --- a/configs/esp32-core/src/esp32_appinit.c +++ b/configs/esp32-core/src/esp32_appinit.c @@ -81,8 +81,8 @@ int board_app_initialize(uintptr_t arg) { -#ifdef CONFIG_BOARD_INITIALIZE - /* Board initialization already performed by board_initialize() */ +#ifdef CONFIG_BOARD_LATE_INITIALIZE + /* Board initialization already performed by board_late_initialize() */ return OK; #else diff --git a/configs/esp32-core/src/esp32_boot.c b/configs/esp32-core/src/esp32_boot.c index 6dfe57a5ed..c6747f1fc3 100644 --- a/configs/esp32-core/src/esp32_boot.c +++ b/configs/esp32-core/src/esp32_boot.c @@ -73,20 +73,20 @@ void esp32_board_initialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_initialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform board-specific initialization */ diff --git a/configs/esp32-core/src/esp32_bringup.c b/configs/esp32-core/src/esp32_bringup.c index b5121b2a4d..9e8eb9f9f2 100644 --- a/configs/esp32-core/src/esp32_bringup.c +++ b/configs/esp32-core/src/esp32_bringup.c @@ -59,10 +59,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ****************************************************************************/ diff --git a/configs/flipnclick-pic32mz/src/pic32mz_appinit.c b/configs/flipnclick-pic32mz/src/pic32mz_appinit.c index 68e8e94912..e0e25e002e 100644 --- a/configs/flipnclick-pic32mz/src/pic32mz_appinit.c +++ b/configs/flipnclick-pic32mz/src/pic32mz_appinit.c @@ -76,11 +76,11 @@ int board_app_initialize(uintptr_t arg) { - /* If CONFIG_BOARD_INITIALIZE is selected then board initialization was - * already performed in board_initialize. + /* If CONFIG_BOARD_LATE_INITIALIZE is selected then board initialization was + * already performed in board_late_initialize. */ -#ifndef CONFIG_BOARD_INITIALIZE +#ifndef CONFIG_BOARD_LATE_INITIALIZE return pic32mz_bringup(); #else return OK; diff --git a/configs/flipnclick-pic32mz/src/pic32mz_boot.c b/configs/flipnclick-pic32mz/src/pic32mz_boot.c index 7638d292a4..514ea7186b 100644 --- a/configs/flipnclick-pic32mz/src/pic32mz_boot.c +++ b/configs/flipnclick-pic32mz/src/pic32mz_boot.c @@ -81,23 +81,23 @@ void pic32mz_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_intiialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform board initialization */ (void)pic32mz_bringup(); } -#endif /* CONFIG_BOARD_INITIALIZE */ +#endif /* CONFIG_BOARD_LATE_INITIALIZE */ diff --git a/configs/flipnclick-sam3x/src/flipnclick-sam3x.h b/configs/flipnclick-sam3x/src/flipnclick-sam3x.h index 0bde2f81e5..9b6a563d3b 100644 --- a/configs/flipnclick-sam3x/src/flipnclick-sam3x.h +++ b/configs/flipnclick-sam3x/src/flipnclick-sam3x.h @@ -250,10 +250,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ****************************************************************************/ diff --git a/configs/flipnclick-sam3x/src/sam_appinit.c b/configs/flipnclick-sam3x/src/sam_appinit.c index 55499d73e5..bba05ae7d6 100644 --- a/configs/flipnclick-sam3x/src/sam_appinit.c +++ b/configs/flipnclick-sam3x/src/sam_appinit.c @@ -82,8 +82,8 @@ int board_app_initialize(uintptr_t arg) { -#ifdef CONFIG_BOARD_INITIALIZE - /* Board initialization already performed by board_initialize() */ +#ifdef CONFIG_BOARD_LATE_INITIALIZE + /* Board initialization already performed by board_late_initialize() */ return OK; #else diff --git a/configs/flipnclick-sam3x/src/sam_boot.c b/configs/flipnclick-sam3x/src/sam_boot.c index 3762c8f944..3707bcb2e4 100644 --- a/configs/flipnclick-sam3x/src/sam_boot.c +++ b/configs/flipnclick-sam3x/src/sam_boot.c @@ -70,20 +70,20 @@ void sam_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_initialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform board-specific initialization */ diff --git a/configs/flipnclick-sam3x/src/sam_bringup.c b/configs/flipnclick-sam3x/src/sam_bringup.c index 3d1d229bb1..8ca27df4a0 100644 --- a/configs/flipnclick-sam3x/src/sam_bringup.c +++ b/configs/flipnclick-sam3x/src/sam_bringup.c @@ -61,10 +61,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ****************************************************************************/ diff --git a/configs/freedom-k28f/src/freedom-k28f.h b/configs/freedom-k28f/src/freedom-k28f.h index b7d2ec46f5..b318d59659 100644 --- a/configs/freedom-k28f/src/freedom-k28f.h +++ b/configs/freedom-k28f/src/freedom-k28f.h @@ -104,10 +104,10 @@ extern FAR struct i2c_master_s* g_i2c1_dev; * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ****************************************************************************/ diff --git a/configs/freedom-k28f/src/k28_appinit.c b/configs/freedom-k28f/src/k28_appinit.c index 9b0d714638..bd4722644f 100644 --- a/configs/freedom-k28f/src/k28_appinit.c +++ b/configs/freedom-k28f/src/k28_appinit.c @@ -90,8 +90,8 @@ int board_app_initialize(uintptr_t arg) { -#ifdef CONFIG_BOARD_INITIALIZE - /* Board initialization already performed by board_initialize() */ +#ifdef CONFIG_BOARD_LATE_INITIALIZE + /* Board initialization already performed by board_late_initialize() */ return OK; #else diff --git a/configs/freedom-k28f/src/k28_boot.c b/configs/freedom-k28f/src/k28_boot.c index 065850eb85..e7b35ec03c 100644 --- a/configs/freedom-k28f/src/k28_boot.c +++ b/configs/freedom-k28f/src/k28_boot.c @@ -81,20 +81,20 @@ void kinetis_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_initialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform board-specific initialization */ diff --git a/configs/freedom-k28f/src/k28_bringup.c b/configs/freedom-k28f/src/k28_bringup.c index 374af659b5..a332679203 100644 --- a/configs/freedom-k28f/src/k28_bringup.c +++ b/configs/freedom-k28f/src/k28_bringup.c @@ -55,10 +55,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ****************************************************************************/ diff --git a/configs/freedom-k64f/README.txt b/configs/freedom-k64f/README.txt index d55ed21047..c0ac8a9e97 100644 --- a/configs/freedom-k64f/README.txt +++ b/configs/freedom-k64f/README.txt @@ -465,7 +465,7 @@ SD Card Support Application Configuration -> NSH Library CONFIG_NSH_ARCHINIT=y : NSH board-initialization, and CONFIG_LIB_BOARDCTL=y : Or - CONFIG_BOARD_INITIALIZE=y + CONFIG_BOARD_LATE_INITIALIZE=y Using the SD card ----------------- diff --git a/configs/freedom-k64f/src/Makefile b/configs/freedom-k64f/src/Makefile index e11590bbc1..6c56a51f93 100644 --- a/configs/freedom-k64f/src/Makefile +++ b/configs/freedom-k64f/src/Makefile @@ -50,7 +50,7 @@ endif ifeq ($(CONFIG_LIB_BOARDCTL),y) CSRCS += k64_appinit.c k64_bringup.c -else ifeq ($(CONFIG_BOARD_INITIALIZE),y) +else ifeq ($(CONFIG_BOARD_LATE_INITIALIZE),y) CSRCS += k64_bringup.c endif diff --git a/configs/freedom-k64f/src/freedom-k64f.h b/configs/freedom-k64f/src/freedom-k64f.h index 40f788d7cd..1616bfe0de 100644 --- a/configs/freedom-k64f/src/freedom-k64f.h +++ b/configs/freedom-k64f/src/freedom-k64f.h @@ -257,7 +257,7 @@ void weak_function k64_usbinitialize(void); * ************************************************************************************/ -#if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_INITIALIZE) +#if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE) int k64_bringup(void); #endif diff --git a/configs/freedom-k64f/src/k64_appinit.c b/configs/freedom-k64f/src/k64_appinit.c index f9851a74a1..0ca9b405fb 100644 --- a/configs/freedom-k64f/src/k64_appinit.c +++ b/configs/freedom-k64f/src/k64_appinit.c @@ -78,7 +78,7 @@ int board_app_initialize(uintptr_t arg) { -#ifndef CONFIG_BOARD_INITIALIZE +#ifndef CONFIG_BOARD_LATE_INITIALIZE /* Perform board initialization */ return k64_bringup(); diff --git a/configs/freedom-k64f/src/k64_boot.c b/configs/freedom-k64f/src/k64_boot.c index 4ca687d96f..4f947bd0bc 100644 --- a/configs/freedom-k64f/src/k64_boot.c +++ b/configs/freedom-k64f/src/k64_boot.c @@ -94,24 +94,24 @@ void kinetis_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_intitialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform board initialization */ (void)k64_bringup(); } -#endif /* CONFIG_BOARD_INITIALIZE */ +#endif /* CONFIG_BOARD_LATE_INITIALIZE */ diff --git a/configs/freedom-k64f/src/k64_bringup.c b/configs/freedom-k64f/src/k64_bringup.c index 78bba052f4..657817343f 100644 --- a/configs/freedom-k64f/src/k64_bringup.c +++ b/configs/freedom-k64f/src/k64_bringup.c @@ -52,7 +52,7 @@ #include "freedom-k64f.h" -#if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_INITIALIZE) +#if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE) /**************************************************************************** * Public Functions @@ -162,4 +162,4 @@ int k64_bringup(void) return OK; } -#endif /* CONFIG_LIB_BOARDCTL CONFIG_BOARD_INITIALIZE */ +#endif /* CONFIG_LIB_BOARDCTL CONFIG_BOARD_LATE_INITIALIZE */ diff --git a/configs/freedom-k66f/README.txt b/configs/freedom-k66f/README.txt index c3fa065ea8..40c6b4f603 100644 --- a/configs/freedom-k66f/README.txt +++ b/configs/freedom-k66f/README.txt @@ -468,7 +468,7 @@ SD Card Support Application Configuration -> NSH Library CONFIG_NSH_ARCHINIT=y : NSH board-initialization, and CONFIG_LIB_BOARDCTL=y : Or - CONFIG_BOARD_INITIALIZE=y + CONFIG_BOARD_LATE_INITIALIZE=y Using the SD card ----------------- diff --git a/configs/freedom-k66f/src/Makefile b/configs/freedom-k66f/src/Makefile index bf4e0e6be1..138882a365 100644 --- a/configs/freedom-k66f/src/Makefile +++ b/configs/freedom-k66f/src/Makefile @@ -51,7 +51,7 @@ endif ifeq ($(CONFIG_LIB_BOARDCTL),y) CSRCS += k66_appinit.c k66_bringup.c -else ifeq ($(CONFIG_BOARD_INITIALIZE),y) +else ifeq ($(CONFIG_BOARD_LATE_INITIALIZE),y) CSRCS += k66_bringup.c endif diff --git a/configs/freedom-k66f/src/freedom-k66f.h b/configs/freedom-k66f/src/freedom-k66f.h index da91d285e7..1d76d4c93e 100644 --- a/configs/freedom-k66f/src/freedom-k66f.h +++ b/configs/freedom-k66f/src/freedom-k66f.h @@ -285,7 +285,7 @@ void weak_function k66_usbinitialize(void); * ************************************************************************************/ -#if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_INITIALIZE) +#if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE) int k66_bringup(void); #endif diff --git a/configs/freedom-k66f/src/k66_appinit.c b/configs/freedom-k66f/src/k66_appinit.c index c52a52e6da..64950b1fd9 100644 --- a/configs/freedom-k66f/src/k66_appinit.c +++ b/configs/freedom-k66f/src/k66_appinit.c @@ -79,7 +79,7 @@ int board_app_initialize(uintptr_t arg) { -#ifndef CONFIG_BOARD_INITIALIZE +#ifndef CONFIG_BOARD_LATE_INITIALIZE /* Perform board initialization */ return k66_bringup(); diff --git a/configs/freedom-k66f/src/k66_boot.c b/configs/freedom-k66f/src/k66_boot.c index 2f27dcf2a5..00b273bbd4 100644 --- a/configs/freedom-k66f/src/k66_boot.c +++ b/configs/freedom-k66f/src/k66_boot.c @@ -96,24 +96,24 @@ void kinetis_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_intitialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform board initialization */ (void)k66_bringup(); } -#endif /* CONFIG_BOARD_INITIALIZE */ +#endif /* CONFIG_BOARD_LATE_INITIALIZE */ diff --git a/configs/freedom-k66f/src/k66_bringup.c b/configs/freedom-k66f/src/k66_bringup.c index 8de8efb552..a8346e6973 100644 --- a/configs/freedom-k66f/src/k66_bringup.c +++ b/configs/freedom-k66f/src/k66_bringup.c @@ -53,7 +53,7 @@ #include "kinetis_spi.h" #include "freedom-k66f.h" -#if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_INITIALIZE) +#if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE) /**************************************************************************** * Public Functions @@ -172,4 +172,4 @@ int k66_bringup(void) UNUSED(ret); return OK; } -#endif /* CONFIG_LIB_BOARDCTL CONFIG_BOARD_INITIALIZE */ +#endif /* CONFIG_LIB_BOARDCTL CONFIG_BOARD_LATE_INITIALIZE */ diff --git a/configs/freedom-kl25z/src/kl_boardinitialize.c b/configs/freedom-kl25z/src/kl_boardinitialize.c index 81eea49cfd..f851a385c8 100644 --- a/configs/freedom-kl25z/src/kl_boardinitialize.c +++ b/configs/freedom-kl25z/src/kl_boardinitialize.c @@ -103,20 +103,20 @@ void kl_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_intitialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform NSH initialization here instead of from the NSH. This * alternative NSH initialization is necessary when NSH is ran in user-space diff --git a/configs/freedom-kl26z/src/kl_boardinitialize.c b/configs/freedom-kl26z/src/kl_boardinitialize.c index f976a86727..53a4f03640 100644 --- a/configs/freedom-kl26z/src/kl_boardinitialize.c +++ b/configs/freedom-kl26z/src/kl_boardinitialize.c @@ -95,20 +95,20 @@ void kl_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_intitialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform NSH initialization here instead of from the NSH. This * alternative NSH initialization is necessary when NSH is ran in user-space diff --git a/configs/imxrt1050-evk/libcxxtest/defconfig b/configs/imxrt1050-evk/libcxxtest/defconfig index 898728d856..5a9f88b289 100644 --- a/configs/imxrt1050-evk/libcxxtest/defconfig +++ b/configs/imxrt1050-evk/libcxxtest/defconfig @@ -4,7 +4,7 @@ CONFIG_ARCH_BOARD_IMXRT1050_EVK=y CONFIG_ARCH_CHIP_IMXRT=y CONFIG_ARCH_CHIP_MIMXRT1052DVL6A=y CONFIG_ARCH_STACKDUMP=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=20000 CONFIG_BUILTIN=y CONFIG_C99_BOOL8=y diff --git a/configs/imxrt1050-evk/src/Makefile b/configs/imxrt1050-evk/src/Makefile index 95bcc3299d..914aba2635 100644 --- a/configs/imxrt1050-evk/src/Makefile +++ b/configs/imxrt1050-evk/src/Makefile @@ -44,7 +44,7 @@ endif ifeq ($(CONFIG_LIB_BOARDCTL),y) CSRCS += imxrt_appinit.c imxrt_bringup.c -else ifeq ($(CONFIG_BOARD_INITIALIZE),y) +else ifeq ($(CONFIG_BOARD_LATE_INITIALIZE),y) CSRCS += imxrt_bringup.c endif diff --git a/configs/imxrt1050-evk/src/imxrt1050-evk.h b/configs/imxrt1050-evk/src/imxrt1050-evk.h index 271fc0920b..94600c4da6 100644 --- a/configs/imxrt1050-evk/src/imxrt1050-evk.h +++ b/configs/imxrt1050-evk/src/imxrt1050-evk.h @@ -187,7 +187,7 @@ * ****************************************************************************/ -#if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_INITIALIZE) +#if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE) int imxrt_bringup(void); #endif diff --git a/configs/imxrt1050-evk/src/imxrt_appinit.c b/configs/imxrt1050-evk/src/imxrt_appinit.c index e3c22582ea..581b173aa8 100644 --- a/configs/imxrt1050-evk/src/imxrt_appinit.c +++ b/configs/imxrt1050-evk/src/imxrt_appinit.c @@ -78,7 +78,7 @@ int board_app_initialize(uintptr_t arg) { -#ifndef CONFIG_BOARD_INITIALIZE +#ifndef CONFIG_BOARD_LATE_INITIALIZE /* Perform board initialization */ return imxrt_bringup(); diff --git a/configs/imxrt1050-evk/src/imxrt_boot.c b/configs/imxrt1050-evk/src/imxrt_boot.c index f7b2a31922..f9306dfe7f 100644 --- a/configs/imxrt1050-evk/src/imxrt_boot.c +++ b/configs/imxrt1050-evk/src/imxrt_boot.c @@ -70,23 +70,23 @@ void imxrt_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_intitialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform board initialization */ (void)imxrt_bringup(); } -#endif /* CONFIG_BOARD_INITIALIZE */ +#endif /* CONFIG_BOARD_LATE_INITIALIZE */ diff --git a/configs/imxrt1060-evk/libcxxtest/defconfig b/configs/imxrt1060-evk/libcxxtest/defconfig index 0908fbb511..76a85e9baa 100644 --- a/configs/imxrt1060-evk/libcxxtest/defconfig +++ b/configs/imxrt1060-evk/libcxxtest/defconfig @@ -4,7 +4,7 @@ CONFIG_ARCH_BOARD_IMXRT1060_EVK=y CONFIG_ARCH_CHIP_IMXRT=y CONFIG_ARCH_CHIP_MIMXRT1062DVL6A=y CONFIG_ARCH_STACKDUMP=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=20000 CONFIG_BUILTIN=y CONFIG_C99_BOOL8=y diff --git a/configs/imxrt1060-evk/src/Makefile b/configs/imxrt1060-evk/src/Makefile index d1fe503f6c..dcb4bceafd 100644 --- a/configs/imxrt1060-evk/src/Makefile +++ b/configs/imxrt1060-evk/src/Makefile @@ -44,7 +44,7 @@ endif ifeq ($(CONFIG_LIB_BOARDCTL),y) CSRCS += imxrt_appinit.c imxrt_bringup.c -else ifeq ($(CONFIG_BOARD_INITIALIZE),y) +else ifeq ($(CONFIG_BOARD_LATE_INITIALIZE),y) CSRCS += imxrt_bringup.c endif diff --git a/configs/imxrt1060-evk/src/imxrt1060-evk.h b/configs/imxrt1060-evk/src/imxrt1060-evk.h index ddf0c6c401..63d50da03e 100644 --- a/configs/imxrt1060-evk/src/imxrt1060-evk.h +++ b/configs/imxrt1060-evk/src/imxrt1060-evk.h @@ -166,7 +166,7 @@ * ****************************************************************************/ -#if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_INITIALIZE) +#if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE) int imxrt_bringup(void); #endif diff --git a/configs/imxrt1060-evk/src/imxrt_appinit.c b/configs/imxrt1060-evk/src/imxrt_appinit.c index f18d7f4aa9..e7fb82fc29 100644 --- a/configs/imxrt1060-evk/src/imxrt_appinit.c +++ b/configs/imxrt1060-evk/src/imxrt_appinit.c @@ -79,7 +79,7 @@ int board_app_initialize(uintptr_t arg) { -#ifndef CONFIG_BOARD_INITIALIZE +#ifndef CONFIG_BOARD_LATE_INITIALIZE /* Perform board initialization */ return imxrt_bringup(); diff --git a/configs/imxrt1060-evk/src/imxrt_boot.c b/configs/imxrt1060-evk/src/imxrt_boot.c index d48f713adc..af54044528 100644 --- a/configs/imxrt1060-evk/src/imxrt_boot.c +++ b/configs/imxrt1060-evk/src/imxrt_boot.c @@ -71,23 +71,23 @@ void imxrt_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_intitialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform board initialization */ (void)imxrt_bringup(); } -#endif /* CONFIG_BOARD_INITIALIZE */ +#endif /* CONFIG_BOARD_LATE_INITIALIZE */ diff --git a/configs/launchxl-cc1310/src/Makefile b/configs/launchxl-cc1310/src/Makefile index 5d872ca91c..1a775a6a82 100644 --- a/configs/launchxl-cc1310/src/Makefile +++ b/configs/launchxl-cc1310/src/Makefile @@ -40,7 +40,7 @@ CSRCS = cc1310_boot.c cc1310_pinconfig.c ifeq ($(CONFIG_LIB_BOARDCTL),y) CSRCS += cc1310_appinit.c cc1310_bringup.c -else ifeq ($(CONFIG_BOARD_INITIALIZE),y) +else ifeq ($(CONFIG_BOARD_LATE_INITIALIZE),y) CSRCS += cc1310_bringup.c endif diff --git a/configs/launchxl-cc1310/src/cc1310_appinit.c b/configs/launchxl-cc1310/src/cc1310_appinit.c index 94cf6ff6a2..8a3e2c5ca2 100644 --- a/configs/launchxl-cc1310/src/cc1310_appinit.c +++ b/configs/launchxl-cc1310/src/cc1310_appinit.c @@ -78,7 +78,7 @@ int board_app_initialize(uintptr_t arg) { -#ifndef CONFIG_BOARD_INITIALIZE +#ifndef CONFIG_BOARD_LATE_INITIALIZE /* Perform board initialization */ return cc1310_bringup(); diff --git a/configs/launchxl-cc1310/src/cc1310_boot.c b/configs/launchxl-cc1310/src/cc1310_boot.c index 584e0da3a3..7b4ac69854 100644 --- a/configs/launchxl-cc1310/src/cc1310_boot.c +++ b/configs/launchxl-cc1310/src/cc1310_boot.c @@ -87,23 +87,23 @@ void tiva_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_intitialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform board initialization */ (void)cc1310_bringup(); } -#endif /* CONFIG_BOARD_INITIALIZE */ +#endif /* CONFIG_BOARD_LATE_INITIALIZE */ diff --git a/configs/launchxl-cc1310/src/cc1310_bringup.c b/configs/launchxl-cc1310/src/cc1310_bringup.c index d891f3eced..10a11a515f 100644 --- a/configs/launchxl-cc1310/src/cc1310_bringup.c +++ b/configs/launchxl-cc1310/src/cc1310_bringup.c @@ -59,10 +59,10 @@ * Description: * Bring up board features. * - * If CONFIG_BOARD_INITIALIZE=y, then this function will be called from - * board_initialize(). + * If CONFIG_BOARD_LATE_INITIALIZE=y, then this function will be called from + * board_late_initialize(). * - * If CONFIG_BOARD_INITIALIZE is not selected, but CONFIG_LIB_BOARDCTL=y + * If CONFIG_BOARD_LATE_INITIALIZE is not selected, but CONFIG_LIB_BOARDCTL=y * then this function will *probably* be called from application logic via * boardctl(). * diff --git a/configs/launchxl-cc1310/src/launchxl-cc1310.h b/configs/launchxl-cc1310/src/launchxl-cc1310.h index 51e7d0dd86..d46b8d22b5 100644 --- a/configs/launchxl-cc1310/src/launchxl-cc1310.h +++ b/configs/launchxl-cc1310/src/launchxl-cc1310.h @@ -90,10 +90,10 @@ extern const struct cc13xx_pinconfig_s g_gpio_sw2; * Description: * Bring up board features. * - * If CONFIG_BOARD_INITIALIZE=y, then this function will be called from - * board_initialize(). + * If CONFIG_BOARD_LATE_INITIALIZE=y, then this function will be called from + * board_late_initialize(). * - * If CONFIG_BOARD_INITIALIZE is not selected, but CONFIG_LIB_BOARDCTL=y + * If CONFIG_BOARD_LATE_INITIALIZE is not selected, but CONFIG_LIB_BOARDCTL=y * then this function will *probably* be called from application logic via * boardctl(). * diff --git a/configs/launchxl-cc1312r1/src/Makefile b/configs/launchxl-cc1312r1/src/Makefile index b29b2a8671..ec53a29f5c 100644 --- a/configs/launchxl-cc1312r1/src/Makefile +++ b/configs/launchxl-cc1312r1/src/Makefile @@ -40,7 +40,7 @@ CSRCS = cc1312_boot.c cc1312_pinconfig.c ifeq ($(CONFIG_LIB_BOARDCTL),y) CSRCS += cc1312_appinit.c cc1312_bringup.c -else ifeq ($(CONFIG_BOARD_INITIALIZE),y) +else ifeq ($(CONFIG_BOARD_LATE_INITIALIZE),y) CSRCS += cc1312_bringup.c endif diff --git a/configs/launchxl-cc1312r1/src/cc1312_appinit.c b/configs/launchxl-cc1312r1/src/cc1312_appinit.c index f6ea3f62ae..919b838ff9 100644 --- a/configs/launchxl-cc1312r1/src/cc1312_appinit.c +++ b/configs/launchxl-cc1312r1/src/cc1312_appinit.c @@ -78,7 +78,7 @@ int board_app_initialize(uintptr_t arg) { -#ifndef CONFIG_BOARD_INITIALIZE +#ifndef CONFIG_BOARD_LATE_INITIALIZE /* Perform board initialization */ return cc1312_bringup(); diff --git a/configs/launchxl-cc1312r1/src/cc1312_boot.c b/configs/launchxl-cc1312r1/src/cc1312_boot.c index 82882c79c5..d09ce49561 100644 --- a/configs/launchxl-cc1312r1/src/cc1312_boot.c +++ b/configs/launchxl-cc1312r1/src/cc1312_boot.c @@ -87,23 +87,23 @@ void tiva_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_intitialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform board initialization */ (void)cc1312_bringup(); } -#endif /* CONFIG_BOARD_INITIALIZE */ +#endif /* CONFIG_BOARD_LATE_INITIALIZE */ diff --git a/configs/launchxl-cc1312r1/src/cc1312_bringup.c b/configs/launchxl-cc1312r1/src/cc1312_bringup.c index c5f727fdba..55cc4f0e81 100644 --- a/configs/launchxl-cc1312r1/src/cc1312_bringup.c +++ b/configs/launchxl-cc1312r1/src/cc1312_bringup.c @@ -59,10 +59,10 @@ * Description: * Bring up board features. * - * If CONFIG_BOARD_INITIALIZE=y, then this function will be called from - * board_initialize(). + * If CONFIG_BOARD_LATE_INITIALIZE=y, then this function will be called from + * board_late_initialize(). * - * If CONFIG_BOARD_INITIALIZE is not selected, but CONFIG_LIB_BOARDCTL=y + * If CONFIG_BOARD_LATE_INITIALIZE is not selected, but CONFIG_LIB_BOARDCTL=y * then this function will *probably* be called from application logic via * boardctl(). * diff --git a/configs/launchxl-cc1312r1/src/launchxl-cc1312r1.h b/configs/launchxl-cc1312r1/src/launchxl-cc1312r1.h index 035279a9ac..b91216881f 100644 --- a/configs/launchxl-cc1312r1/src/launchxl-cc1312r1.h +++ b/configs/launchxl-cc1312r1/src/launchxl-cc1312r1.h @@ -90,10 +90,10 @@ extern const struct cc13xx_pinconfig_s g_gpio_sw2; * Description: * Bring up board features. * - * If CONFIG_BOARD_INITIALIZE=y, then this function will be called from - * board_initialize(). + * If CONFIG_BOARD_LATE_INITIALIZE=y, then this function will be called from + * board_late_initialize(). * - * If CONFIG_BOARD_INITIALIZE is not selected, but CONFIG_LIB_BOARDCTL=y + * If CONFIG_BOARD_LATE_INITIALIZE is not selected, but CONFIG_LIB_BOARDCTL=y * then this function will *probably* be called from application logic via * boardctl(). * diff --git a/configs/launchxl-tms57004/src/tms570_appinit.c b/configs/launchxl-tms57004/src/tms570_appinit.c index 90360ee7ed..6c7ff9bf22 100644 --- a/configs/launchxl-tms57004/src/tms570_appinit.c +++ b/configs/launchxl-tms57004/src/tms570_appinit.c @@ -72,9 +72,9 @@ #ifdef CONFIG_LIB_BOARDCTL int board_app_initialize(uintptr_t arg) { -#ifndef CONFIG_BOARD_INITIALIZE +#ifndef CONFIG_BOARD_LATE_INITIALIZE /* Perform application level board initialization (if that was not already - * done in board_initialize(). + * done in board_late_initialize(). */ tms570_bringup(); diff --git a/configs/launchxl-tms57004/src/tms570_initialize.c b/configs/launchxl-tms57004/src/tms570_initialize.c index b6b3d5950e..855931b445 100644 --- a/configs/launchxl-tms57004/src/tms570_initialize.c +++ b/configs/launchxl-tms57004/src/tms570_initialize.c @@ -83,20 +83,20 @@ void tms570_board_initialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_initialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform application level board initialization */ diff --git a/configs/lc823450-xgevk/elf/defconfig b/configs/lc823450-xgevk/elf/defconfig index 6183c328b4..888db04ece 100644 --- a/configs/lc823450-xgevk/elf/defconfig +++ b/configs/lc823450-xgevk/elf/defconfig @@ -7,7 +7,7 @@ CONFIG_ARCH_FLOAT_H=y CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_STDARG_H=y CONFIG_BINFMT_CONSTRUCTORS=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=12061 CONFIG_C99_BOOL8=y CONFIG_CODECS_HASH_MD5=y diff --git a/configs/lc823450-xgevk/src/Makefile b/configs/lc823450-xgevk/src/Makefile index b05ae52e06..07fe5203bd 100644 --- a/configs/lc823450-xgevk/src/Makefile +++ b/configs/lc823450-xgevk/src/Makefile @@ -40,7 +40,7 @@ CSRCS = lc823450_boot.c lc823450_mux.c ifeq ($(CONFIG_LIB_BOARDCTL),y) CSRCS += lc823450_appinit.c lc823450_bringup.c -else ifeq ($(CONFIG_BOARD_INITIALIZE),y) +else ifeq ($(CONFIG_BOARD_LATE_INITIALIZE),y) CSRCS += lc823450_bringup.c endif diff --git a/configs/lc823450-xgevk/src/lc823450-xgevk.h b/configs/lc823450-xgevk/src/lc823450-xgevk.h index 41007adb28..2daf09df8d 100644 --- a/configs/lc823450-xgevk/src/lc823450-xgevk.h +++ b/configs/lc823450-xgevk/src/lc823450-xgevk.h @@ -82,7 +82,7 @@ int lc823450_adc_setup(void); * ****************************************************************************/ -#if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_INITIALIZE) +#if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE) int lc823450_bringup(void); #endif diff --git a/configs/lc823450-xgevk/src/lc823450_appinit.c b/configs/lc823450-xgevk/src/lc823450_appinit.c index 75631a3166..1836bdb3a4 100644 --- a/configs/lc823450-xgevk/src/lc823450_appinit.c +++ b/configs/lc823450-xgevk/src/lc823450_appinit.c @@ -180,7 +180,7 @@ int board_app_initialize(uintptr_t arg) UNUSED(ret); /* May not be used */ -#ifndef CONFIG_BOARD_INITIALIZE +#ifndef CONFIG_BOARD_LATE_INITIALIZE /* Perform board initialization */ return lc823450_bringup(); diff --git a/configs/lc823450-xgevk/src/lc823450_boot.c b/configs/lc823450-xgevk/src/lc823450_boot.c index d18e9c6810..f96fddd597 100644 --- a/configs/lc823450-xgevk/src/lc823450_boot.c +++ b/configs/lc823450-xgevk/src/lc823450_boot.c @@ -50,24 +50,24 @@ ****************************************************************************/ /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_intitialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform board initialization */ (void)lc823450_bringup(); } -#endif /* CONFIG_BOARD_INITIALIZE */ +#endif /* CONFIG_BOARD_LATE_INITIALIZE */ diff --git a/configs/lpcxpresso-lpc54628/src/lpc54_appinit.c b/configs/lpcxpresso-lpc54628/src/lpc54_appinit.c index caaab21998..d545d1af53 100644 --- a/configs/lpcxpresso-lpc54628/src/lpc54_appinit.c +++ b/configs/lpcxpresso-lpc54628/src/lpc54_appinit.c @@ -76,8 +76,8 @@ int board_app_initialize(uintptr_t arg) { -#ifdef CONFIG_BOARD_INITIALIZE - /* Board initialization already performed by board_initialize() */ +#ifdef CONFIG_BOARD_LATE_INITIALIZE + /* Board initialization already performed by board_late_initialize() */ return OK; #else diff --git a/configs/lpcxpresso-lpc54628/src/lpc54_boot.c b/configs/lpcxpresso-lpc54628/src/lpc54_boot.c index 0d7541143a..430260a718 100644 --- a/configs/lpcxpresso-lpc54628/src/lpc54_boot.c +++ b/configs/lpcxpresso-lpc54628/src/lpc54_boot.c @@ -81,20 +81,20 @@ void lpc54_board_initialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_initialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform board-specific initialization */ diff --git a/configs/lpcxpresso-lpc54628/src/lpc54_bringup.c b/configs/lpcxpresso-lpc54628/src/lpc54_bringup.c index 5b1bf5152b..ed1204b646 100644 --- a/configs/lpcxpresso-lpc54628/src/lpc54_bringup.c +++ b/configs/lpcxpresso-lpc54628/src/lpc54_bringup.c @@ -74,10 +74,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ****************************************************************************/ diff --git a/configs/lpcxpresso-lpc54628/src/lpcxpresso-lpc54628.h b/configs/lpcxpresso-lpc54628/src/lpcxpresso-lpc54628.h index 35eba92525..85ba984c69 100644 --- a/configs/lpcxpresso-lpc54628/src/lpcxpresso-lpc54628.h +++ b/configs/lpcxpresso-lpc54628/src/lpcxpresso-lpc54628.h @@ -317,10 +317,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ****************************************************************************/ diff --git a/configs/max32660-evsys/src/Makefile b/configs/max32660-evsys/src/Makefile index 9418ce91f2..fc564b8322 100644 --- a/configs/max32660-evsys/src/Makefile +++ b/configs/max32660-evsys/src/Makefile @@ -40,7 +40,7 @@ CSRCS = max326_boot.c ifeq ($(CONFIG_LIB_BOARDCTL),y) CSRCS += max326_appinit.c max326_bringup.c -else ifeq ($(CONFIG_BOARD_INITIALIZE),y) +else ifeq ($(CONFIG_BOARD_LATE_INITIALIZE),y) CSRCS += max326_bringup.c endif diff --git a/configs/max32660-evsys/src/max32660-evsys.h b/configs/max32660-evsys/src/max32660-evsys.h index 0abe7f7081..e3e2250f96 100644 --- a/configs/max32660-evsys/src/max32660-evsys.h +++ b/configs/max32660-evsys/src/max32660-evsys.h @@ -110,10 +110,10 @@ * Description: * Bring up board features. * - * If CONFIG_BOARD_INITIALIZE=y, then this function will be called from - * board_initialize(). + * If CONFIG_BOARD_LATE_INITIALIZE=y, then this function will be called from + * board_late_initialize(). * - * If CONFIG_BOARD_INITIALIZE is not selected, but CONFIG_LIB_BOARDCTL=y + * If CONFIG_BOARD_LATE_INITIALIZE is not selected, but CONFIG_LIB_BOARDCTL=y * then this function will *probably* be called from application logic via * boardctl(). * diff --git a/configs/max32660-evsys/src/max326_appinit.c b/configs/max32660-evsys/src/max326_appinit.c index 708bb4c9c6..4458b35f1d 100644 --- a/configs/max32660-evsys/src/max326_appinit.c +++ b/configs/max32660-evsys/src/max326_appinit.c @@ -78,7 +78,7 @@ int board_app_initialize(uintptr_t arg) { -#ifndef CONFIG_BOARD_INITIALIZE +#ifndef CONFIG_BOARD_LATE_INITIALIZE /* Perform board initialization */ return max326_bringup(); diff --git a/configs/max32660-evsys/src/max326_boot.c b/configs/max32660-evsys/src/max326_boot.c index 1713598e6e..4ee298b288 100644 --- a/configs/max32660-evsys/src/max326_boot.c +++ b/configs/max32660-evsys/src/max326_boot.c @@ -83,23 +83,23 @@ void max326_board_initialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_intitialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform board initialization */ (void)max326_bringup(); } -#endif /* CONFIG_BOARD_INITIALIZE */ +#endif /* CONFIG_BOARD_LATE_INITIALIZE */ diff --git a/configs/max32660-evsys/src/max326_bringup.c b/configs/max32660-evsys/src/max326_bringup.c index e720cc3ba1..b40100f75a 100644 --- a/configs/max32660-evsys/src/max326_bringup.c +++ b/configs/max32660-evsys/src/max326_bringup.c @@ -67,10 +67,10 @@ * Description: * Bring up board features. * - * If CONFIG_BOARD_INITIALIZE=y, then this function will be called from - * board_initialize(). + * If CONFIG_BOARD_LATE_INITIALIZE=y, then this function will be called from + * board_late_initialize(). * - * If CONFIG_BOARD_INITIALIZE is not selected, but CONFIG_LIB_BOARDCTL=y + * If CONFIG_BOARD_LATE_INITIALIZE is not selected, but CONFIG_LIB_BOARDCTL=y * then this function will *probably* be called from application logic via * boardctl(). * diff --git a/configs/mcb1700/src/lpc17_appinit.c b/configs/mcb1700/src/lpc17_appinit.c index 527f447b78..3499c0d0b9 100644 --- a/configs/mcb1700/src/lpc17_appinit.c +++ b/configs/mcb1700/src/lpc17_appinit.c @@ -82,8 +82,8 @@ int board_app_initialize(uintptr_t arg) { -#ifdef CONFIG_BOARD_INITIALIZE - /* Board initialization already performed by board_initialize() */ +#ifdef CONFIG_BOARD_LATE_INITIALIZE + /* Board initialization already performed by board_late_initialize() */ return OK; #else diff --git a/configs/mcb1700/src/lpc17_boot.c b/configs/mcb1700/src/lpc17_boot.c index 3e3f939604..981deb5e87 100644 --- a/configs/mcb1700/src/lpc17_boot.c +++ b/configs/mcb1700/src/lpc17_boot.c @@ -73,20 +73,20 @@ void lpc17_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_initialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform board-specific initialization */ diff --git a/configs/mcb1700/src/lpc17_bringup.c b/configs/mcb1700/src/lpc17_bringup.c index 8e87b85927..be818078b9 100644 --- a/configs/mcb1700/src/lpc17_bringup.c +++ b/configs/mcb1700/src/lpc17_bringup.c @@ -324,10 +324,10 @@ static int nsh_usbhostinitialize(void) * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ****************************************************************************/ diff --git a/configs/mcb1700/src/mcb1700.h b/configs/mcb1700/src/mcb1700.h index 481cbbc5e8..7c1b5531d1 100644 --- a/configs/mcb1700/src/mcb1700.h +++ b/configs/mcb1700/src/mcb1700.h @@ -76,10 +76,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ****************************************************************************/ diff --git a/configs/metro-m4/src/metro-m4.h b/configs/metro-m4/src/metro-m4.h index f106666448..18d3e94d19 100644 --- a/configs/metro-m4/src/metro-m4.h +++ b/configs/metro-m4/src/metro-m4.h @@ -90,10 +90,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ****************************************************************************/ diff --git a/configs/metro-m4/src/sam_appinit.c b/configs/metro-m4/src/sam_appinit.c index 1374a78fe7..ad7b72bb58 100644 --- a/configs/metro-m4/src/sam_appinit.c +++ b/configs/metro-m4/src/sam_appinit.c @@ -82,8 +82,8 @@ int board_app_initialize(uintptr_t arg) { -#ifdef CONFIG_BOARD_INITIALIZE - /* Board initialization already performed by board_initialize() */ +#ifdef CONFIG_BOARD_LATE_INITIALIZE + /* Board initialization already performed by board_late_initialize() */ return OK; #else diff --git a/configs/metro-m4/src/sam_boot.c b/configs/metro-m4/src/sam_boot.c index 331bbf597e..7f962d78b7 100644 --- a/configs/metro-m4/src/sam_boot.c +++ b/configs/metro-m4/src/sam_boot.c @@ -72,20 +72,20 @@ void sam_board_initialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_initialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform board-specific initialization */ diff --git a/configs/metro-m4/src/sam_bringup.c b/configs/metro-m4/src/sam_bringup.c index d4799669ea..ea17d0c44c 100644 --- a/configs/metro-m4/src/sam_bringup.c +++ b/configs/metro-m4/src/sam_bringup.c @@ -63,10 +63,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ****************************************************************************/ diff --git a/configs/moxa/nsh/defconfig b/configs/moxa/nsh/defconfig index 56cd47663f..8ad08444ef 100644 --- a/configs/moxa/nsh/defconfig +++ b/configs/moxa/nsh/defconfig @@ -36,7 +36,7 @@ CONFIG_ARCH_INTERRUPTSTACK=1024 CONFIG_ARCH_STACKDUMP=y CONFIG_BOARDCTL_APP_SYMTAB=y CONFIG_BOARDCTL_RESET=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=6965 CONFIG_BOOT_RUNFROMISRAM=y CONFIG_BUILTIN=y diff --git a/configs/moxa/src/moxart_appinit.c b/configs/moxa/src/moxart_appinit.c index a550e1f777..4f52b68c3e 100644 --- a/configs/moxa/src/moxart_appinit.c +++ b/configs/moxa/src/moxart_appinit.c @@ -66,9 +66,9 @@ * CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * - * CONFIG_BOARD_INITIALIZE=y, CONFIG_NSH_LIBRARY=y, && + * CONFIG_BOARD_LATE_INITIALIZE=y, CONFIG_NSH_LIBRARY=y, && * CONFIG_LIB_BOARDCTL=n : - * Called from board_initialize(). + * Called from board_late_initialize(). * * Input Parameters: * arg - The boardctl() argument is passed to the board_app_initialize() @@ -89,7 +89,7 @@ int board_app_initialize(uintptr_t arg) { -#ifndef CONFIG_BOARD_INITIALIZE +#ifndef CONFIG_BOARD_LATE_INITIALIZE #ifdef CONFIG_NET_FTMAC100 /* Perform board-specific initialization */ diff --git a/configs/moxa/src/moxart_boot.c b/configs/moxa/src/moxart_boot.c index 4520ca8835..0e1bd638d7 100644 --- a/configs/moxa/src/moxart_boot.c +++ b/configs/moxa/src/moxart_boot.c @@ -58,20 +58,20 @@ ****************************************************************************/ /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_initialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { #ifdef CONFIG_NET_FTMAC100 /* Perform board-specific initialization */ diff --git a/configs/nrf52-generic/src/nrf52-generic.h b/configs/nrf52-generic/src/nrf52-generic.h index 8924756e37..8a78064301 100644 --- a/configs/nrf52-generic/src/nrf52-generic.h +++ b/configs/nrf52-generic/src/nrf52-generic.h @@ -85,10 +85,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ****************************************************************************/ diff --git a/configs/nrf52-generic/src/nrf52_appinit.c b/configs/nrf52-generic/src/nrf52_appinit.c index 6cd61207fe..d38d79095d 100644 --- a/configs/nrf52-generic/src/nrf52_appinit.c +++ b/configs/nrf52-generic/src/nrf52_appinit.c @@ -77,8 +77,8 @@ int board_app_initialize(uintptr_t arg) { -#ifdef CONFIG_BOARD_INITIALIZE - /* Board initialization already performed by board_initialize() */ +#ifdef CONFIG_BOARD_LATE_INITIALIZE + /* Board initialization already performed by board_late_initialize() */ return OK; #else diff --git a/configs/nrf52-generic/src/nrf52_boot.c b/configs/nrf52-generic/src/nrf52_boot.c index 955ec3ac81..9a22fb1e24 100644 --- a/configs/nrf52-generic/src/nrf52_boot.c +++ b/configs/nrf52-generic/src/nrf52_boot.c @@ -74,20 +74,20 @@ void nrf52_board_initialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_initialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform board-specific initialization */ diff --git a/configs/nrf52-generic/src/nrf52_bringup.c b/configs/nrf52-generic/src/nrf52_bringup.c index 293830ed19..00c9f0a049 100644 --- a/configs/nrf52-generic/src/nrf52_bringup.c +++ b/configs/nrf52-generic/src/nrf52_bringup.c @@ -60,10 +60,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ****************************************************************************/ diff --git a/configs/nucleo-144/src/stm32_boot.c b/configs/nucleo-144/src/stm32_boot.c index 684ade8176..c4c6ccf6e6 100644 --- a/configs/nucleo-144/src/stm32_boot.c +++ b/configs/nucleo-144/src/stm32_boot.c @@ -82,20 +82,20 @@ void stm32_boardinitialize(void) } /************************************************************************************ - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional initialization call + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional initialization call * will be performed in the boot-up sequence to a function called - * board_initialize(). board_initialize() will be called immediately after + * board_late_initialize(). board_late_initialize() will be called immediately after * up_initialize() is called and just before the initial application is started. * This additional initialization phase may be used, for example, to initialize * board-specific device drivers. * ************************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { #if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL) /* Perform NSH initialization here instead of from the NSH. This diff --git a/configs/nucleo-f072rb/src/nucleo-f072rb.h b/configs/nucleo-f072rb/src/nucleo-f072rb.h index 78ad7e84f4..03eae5d48a 100644 --- a/configs/nucleo-f072rb/src/nucleo-f072rb.h +++ b/configs/nucleo-f072rb/src/nucleo-f072rb.h @@ -109,10 +109,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ****************************************************************************/ diff --git a/configs/nucleo-f072rb/src/stm32_appinit.c b/configs/nucleo-f072rb/src/stm32_appinit.c index b82a3d5457..ea68c64f49 100644 --- a/configs/nucleo-f072rb/src/stm32_appinit.c +++ b/configs/nucleo-f072rb/src/stm32_appinit.c @@ -77,9 +77,9 @@ int board_app_initialize(uintptr_t arg) { - /* Did we already initialize via board_initialize()? */ + /* Did we already initialize via board_late_initialize()? */ -#ifndef CONFIG_BOARD_INITIALIZE +#ifndef CONFIG_BOARD_LATE_INITIALIZE return stm32_bringup(); #else return OK; diff --git a/configs/nucleo-f072rb/src/stm32_boot.c b/configs/nucleo-f072rb/src/stm32_boot.c index 8a4cab045b..5b18c4f1f3 100644 --- a/configs/nucleo-f072rb/src/stm32_boot.c +++ b/configs/nucleo-f072rb/src/stm32_boot.c @@ -72,20 +72,20 @@ void stm32_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_initialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform board-specific initialization here if so configured */ diff --git a/configs/nucleo-f072rb/src/stm32_bringup.c b/configs/nucleo-f072rb/src/stm32_bringup.c index 430176b07c..bfaa991e0a 100644 --- a/configs/nucleo-f072rb/src/stm32_bringup.c +++ b/configs/nucleo-f072rb/src/stm32_bringup.c @@ -67,10 +67,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ****************************************************************************/ diff --git a/configs/nucleo-f091rc/src/nucleo-f091rc.h b/configs/nucleo-f091rc/src/nucleo-f091rc.h index 0b261515dd..ad7279f4c3 100644 --- a/configs/nucleo-f091rc/src/nucleo-f091rc.h +++ b/configs/nucleo-f091rc/src/nucleo-f091rc.h @@ -121,10 +121,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ****************************************************************************/ diff --git a/configs/nucleo-f091rc/src/stm32_appinit.c b/configs/nucleo-f091rc/src/stm32_appinit.c index 2eb92bcb77..b2b7ab2473 100644 --- a/configs/nucleo-f091rc/src/stm32_appinit.c +++ b/configs/nucleo-f091rc/src/stm32_appinit.c @@ -77,9 +77,9 @@ int board_app_initialize(uintptr_t arg) { - /* Did we already initialize via board_initialize()? */ + /* Did we already initialize via board_late_initialize()? */ -#ifndef CONFIG_BOARD_INITIALIZE +#ifndef CONFIG_BOARD_LATE_INITIALIZE return stm32_bringup(); #else return OK; diff --git a/configs/nucleo-f091rc/src/stm32_boot.c b/configs/nucleo-f091rc/src/stm32_boot.c index b0a730949b..80f4deee82 100644 --- a/configs/nucleo-f091rc/src/stm32_boot.c +++ b/configs/nucleo-f091rc/src/stm32_boot.c @@ -78,20 +78,20 @@ void stm32_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_initialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform board-specific initialization here if so configured */ diff --git a/configs/nucleo-f091rc/src/stm32_bringup.c b/configs/nucleo-f091rc/src/stm32_bringup.c index 9c787ece4f..5745b7b18e 100644 --- a/configs/nucleo-f091rc/src/stm32_bringup.c +++ b/configs/nucleo-f091rc/src/stm32_bringup.c @@ -55,10 +55,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ****************************************************************************/ diff --git a/configs/nucleo-f207zg/src/stm32_appinitialize.c b/configs/nucleo-f207zg/src/stm32_appinitialize.c index 542590c4de..8b56af67d8 100644 --- a/configs/nucleo-f207zg/src/stm32_appinitialize.c +++ b/configs/nucleo-f207zg/src/stm32_appinitialize.c @@ -82,8 +82,8 @@ int board_app_initialize(uintptr_t arg) { -#ifdef CONFIG_BOARD_INITIALIZE - /* Board initialization already performed by board_initialize() */ +#ifdef CONFIG_BOARD_LATE_INITIALIZE + /* Board initialization already performed by board_late_initialize() */ return OK; #else diff --git a/configs/nucleo-f207zg/src/stm32_boot.c b/configs/nucleo-f207zg/src/stm32_boot.c index 394b44e1a8..148d1182c6 100644 --- a/configs/nucleo-f207zg/src/stm32_boot.c +++ b/configs/nucleo-f207zg/src/stm32_boot.c @@ -72,20 +72,20 @@ void stm32_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional initialization call + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional initialization call * will be performed in the boot-up sequence to a function called - * board_initialize(). board_initialize() will be called immediately after + * board_late_initialize(). board_late_initialize() will be called immediately after * up_initialize() is called and just before the initial application is started. * This additional initialization phase may be used, for example, to initialize * board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { #if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL) /* Perform board bring-up here instead of from the board_app_initialize(). */ diff --git a/configs/nucleo-f207zg/src/stm32_bringup.c b/configs/nucleo-f207zg/src/stm32_bringup.c index e6856b701b..ac623a9402 100644 --- a/configs/nucleo-f207zg/src/stm32_bringup.c +++ b/configs/nucleo-f207zg/src/stm32_bringup.c @@ -60,10 +60,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y && CONFIG_NSH_ARCHINIT: + * CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y && CONFIG_NSH_ARCHINIT: * Called from the NSH library * ****************************************************************************/ diff --git a/configs/nucleo-f303ze/src/stm32_appinitialize.c b/configs/nucleo-f303ze/src/stm32_appinitialize.c index 3e9b2226ae..926ac02903 100644 --- a/configs/nucleo-f303ze/src/stm32_appinitialize.c +++ b/configs/nucleo-f303ze/src/stm32_appinitialize.c @@ -82,8 +82,8 @@ int board_app_initialize(uintptr_t arg) { -#ifdef CONFIG_BOARD_INITIALIZE - /* Board initialization already performed by board_initialize() */ +#ifdef CONFIG_BOARD_LATE_INITIALIZE + /* Board initialization already performed by board_late_initialize() */ return OK; #else diff --git a/configs/nucleo-f303ze/src/stm32_boot.c b/configs/nucleo-f303ze/src/stm32_boot.c index 79db1b42e5..4e097a6d26 100644 --- a/configs/nucleo-f303ze/src/stm32_boot.c +++ b/configs/nucleo-f303ze/src/stm32_boot.c @@ -72,20 +72,20 @@ void stm32_boardinitialize(void) } /************************************************************************************ - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional initialization call + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional initialization call * will be performed in the boot-up sequence to a function called - * board_initialize(). board_initialize() will be called immediately after + * board_late_initialize(). board_late_initialize() will be called immediately after * up_initialize() is called and just before the initial application is started. * This additional initialization phase may be used, for example, to initialize * board-specific device drivers. * ************************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { #if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL) /* Perform board bring-up here instead of from the board_app_initialize(). */ diff --git a/configs/nucleo-f303ze/src/stm32_bringup.c b/configs/nucleo-f303ze/src/stm32_bringup.c index 134939e9df..e767ede92b 100644 --- a/configs/nucleo-f303ze/src/stm32_bringup.c +++ b/configs/nucleo-f303ze/src/stm32_bringup.c @@ -60,10 +60,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y && CONFIG_NSH_ARCHINIT: + * CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y && CONFIG_NSH_ARCHINIT: * Called from the NSH library * ****************************************************************************/ diff --git a/configs/nucleo-f410rb/nsh/defconfig b/configs/nucleo-f410rb/nsh/defconfig index fc791ef980..0c544227e8 100644 --- a/configs/nucleo-f410rb/nsh/defconfig +++ b/configs/nucleo-f410rb/nsh/defconfig @@ -13,7 +13,7 @@ CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F410RB=y CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_STACKDUMP=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=8499 CONFIG_BUILTIN=y CONFIG_DISABLE_POLL=y diff --git a/configs/nucleo-f410rb/src/nucleo-f410rb.h b/configs/nucleo-f410rb/src/nucleo-f410rb.h index 76c4bf1d18..bddf7e39e2 100644 --- a/configs/nucleo-f410rb/src/nucleo-f410rb.h +++ b/configs/nucleo-f410rb/src/nucleo-f410rb.h @@ -84,10 +84,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ************************************************************************************/ diff --git a/configs/nucleo-f410rb/src/stm32_appinit.c b/configs/nucleo-f410rb/src/stm32_appinit.c index 0567d04ba8..1e6dccb6da 100644 --- a/configs/nucleo-f410rb/src/stm32_appinit.c +++ b/configs/nucleo-f410rb/src/stm32_appinit.c @@ -82,8 +82,8 @@ int board_app_initialize(uintptr_t arg) { -#ifdef CONFIG_BOARD_INITIALIZE - /* Board initialization already performed by board_initialize() */ +#ifdef CONFIG_BOARD_LATE_INITIALIZE + /* Board initialization already performed by board_late_initialize() */ return OK; #else diff --git a/configs/nucleo-f410rb/src/stm32_boot.c b/configs/nucleo-f410rb/src/stm32_boot.c index d9dd87303e..b1a5d53f9d 100644 --- a/configs/nucleo-f410rb/src/stm32_boot.c +++ b/configs/nucleo-f410rb/src/stm32_boot.c @@ -86,20 +86,20 @@ void stm32_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_intiialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { #if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL) /* Perform board-specific initialization */ diff --git a/configs/nucleo-f410rb/src/stm32_bringup.c b/configs/nucleo-f410rb/src/stm32_bringup.c index 1752b5e76b..2195f4381d 100644 --- a/configs/nucleo-f410rb/src/stm32_bringup.c +++ b/configs/nucleo-f410rb/src/stm32_bringup.c @@ -59,10 +59,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ****************************************************************************/ diff --git a/configs/nucleo-f4x1re/src/stm32_boot.c b/configs/nucleo-f4x1re/src/stm32_boot.c index 1fb22f61e7..a60931ba96 100644 --- a/configs/nucleo-f4x1re/src/stm32_boot.c +++ b/configs/nucleo-f4x1re/src/stm32_boot.c @@ -100,20 +100,20 @@ void stm32_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_intiialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform NSH initialization here instead of from the NSH. This * alternative NSH initialization is necessary when NSH is ran in user-space diff --git a/configs/nucleo-h743zi/src/nucleo-h743zi.h b/configs/nucleo-h743zi/src/nucleo-h743zi.h index ec30a57dcb..96ee059c49 100644 --- a/configs/nucleo-h743zi/src/nucleo-h743zi.h +++ b/configs/nucleo-h743zi/src/nucleo-h743zi.h @@ -110,10 +110,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ************************************************************************************/ diff --git a/configs/nucleo-h743zi/src/stm32_appinitialize.c b/configs/nucleo-h743zi/src/stm32_appinitialize.c index 923cc208c9..2612700a9c 100644 --- a/configs/nucleo-h743zi/src/stm32_appinitialize.c +++ b/configs/nucleo-h743zi/src/stm32_appinitialize.c @@ -82,8 +82,8 @@ int board_app_initialize(uintptr_t arg) { -#ifdef CONFIG_BOARD_INITIALIZE - /* Board initialization already performed by board_initialize() */ +#ifdef CONFIG_BOARD_LATE_INITIALIZE + /* Board initialization already performed by board_late_initialize() */ return OK; #else diff --git a/configs/nucleo-h743zi/src/stm32_boot.c b/configs/nucleo-h743zi/src/stm32_boot.c index 863b6847ad..a8a65f224d 100644 --- a/configs/nucleo-h743zi/src/stm32_boot.c +++ b/configs/nucleo-h743zi/src/stm32_boot.c @@ -78,20 +78,20 @@ void stm32_boardinitialize(void) } /************************************************************************************ - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional initialization call + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional initialization call * will be performed in the boot-up sequence to a function called - * board_initialize(). board_initialize() will be called immediately after + * board_late_initialize(). board_late_initialize() will be called immediately after * up_initialize() is called and just before the initial application is started. * This additional initialization phase may be used, for example, to initialize * board-specific device drivers. * ************************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { #if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL) /* Perform board bring-up here instead of from the board_app_initialize(). */ diff --git a/configs/nucleo-h743zi/src/stm32_bringup.c b/configs/nucleo-h743zi/src/stm32_bringup.c index a8159b4261..d1ef3b9220 100644 --- a/configs/nucleo-h743zi/src/stm32_bringup.c +++ b/configs/nucleo-h743zi/src/stm32_bringup.c @@ -60,10 +60,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y && CONFIG_NSH_ARCHINIT: + * CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y && CONFIG_NSH_ARCHINIT: * Called from the NSH library * ****************************************************************************/ diff --git a/configs/nucleo-l073rz/src/nucleo-l073rz.h b/configs/nucleo-l073rz/src/nucleo-l073rz.h index f042b32d8c..298a179a04 100644 --- a/configs/nucleo-l073rz/src/nucleo-l073rz.h +++ b/configs/nucleo-l073rz/src/nucleo-l073rz.h @@ -125,10 +125,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ************************************************************************************/ diff --git a/configs/nucleo-l073rz/src/stm32_appinit.c b/configs/nucleo-l073rz/src/stm32_appinit.c index bcbeb860f4..2900de83fa 100644 --- a/configs/nucleo-l073rz/src/stm32_appinit.c +++ b/configs/nucleo-l073rz/src/stm32_appinit.c @@ -82,8 +82,8 @@ int board_app_initialize(uintptr_t arg) { -#ifdef CONFIG_BOARD_INITIALIZE - /* Board initialization already performed by board_initialize() */ +#ifdef CONFIG_BOARD_LATE_INITIALIZE + /* Board initialization already performed by board_late_initialize() */ return OK; #else diff --git a/configs/nucleo-l073rz/src/stm32_boot.c b/configs/nucleo-l073rz/src/stm32_boot.c index f53c620588..55b3989232 100644 --- a/configs/nucleo-l073rz/src/stm32_boot.c +++ b/configs/nucleo-l073rz/src/stm32_boot.c @@ -91,20 +91,20 @@ void stm32_boardinitialize(void) } /************************************************************************************ - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional initialization call + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional initialization call * will be performed in the boot-up sequence to a function called - * board_initialize(). board_initialize() will be called immediately after + * board_late_initialize(). board_late_initialize() will be called immediately after * up_initialize() is called and just before the initial application is started. * This additional initialization phase may be used, for example, to initialize * board-specific device drivers. * ************************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { #if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL) /* Perform board bring-up here instead of from the board_app_initialize(). */ diff --git a/configs/nucleo-l073rz/src/stm32_bringup.c b/configs/nucleo-l073rz/src/stm32_bringup.c index 78453a4031..207da302bd 100644 --- a/configs/nucleo-l073rz/src/stm32_bringup.c +++ b/configs/nucleo-l073rz/src/stm32_bringup.c @@ -72,10 +72,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y && CONFIG_NSH_ARCHINIT: + * CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y && CONFIG_NSH_ARCHINIT: * Called from the NSH library * ****************************************************************************/ diff --git a/configs/nucleo-l432kc/src/stm32_boot.c b/configs/nucleo-l432kc/src/stm32_boot.c index f4bc7c3945..c8f9b4e3de 100644 --- a/configs/nucleo-l432kc/src/stm32_boot.c +++ b/configs/nucleo-l432kc/src/stm32_boot.c @@ -100,20 +100,20 @@ void stm32l4_board_initialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_intiialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform NSH initialization here instead of from the NSH. This * alternative NSH initialization is necessary when NSH is ran in user-space diff --git a/configs/nucleo-l452re/src/nucleo-l452re.h b/configs/nucleo-l452re/src/nucleo-l452re.h index ae511be83e..5d60817d4c 100644 --- a/configs/nucleo-l452re/src/nucleo-l452re.h +++ b/configs/nucleo-l452re/src/nucleo-l452re.h @@ -165,10 +165,10 @@ int stm32l4_dac_setup(void); * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ****************************************************************************/ diff --git a/configs/nucleo-l452re/src/stm32_appinit.c b/configs/nucleo-l452re/src/stm32_appinit.c index ff3e604781..7d7d1a09a1 100644 --- a/configs/nucleo-l452re/src/stm32_appinit.c +++ b/configs/nucleo-l452re/src/stm32_appinit.c @@ -77,9 +77,9 @@ int board_app_initialize(uintptr_t arg) { - /* Did we already initialize via board_initialize()? */ + /* Did we already initialize via board_late_initialize()? */ -#ifndef CONFIG_BOARD_INITIALIZE +#ifndef CONFIG_BOARD_LATE_INITIALIZE return stm32_bringup(); #else return OK; diff --git a/configs/nucleo-l452re/src/stm32_boot.c b/configs/nucleo-l452re/src/stm32_boot.c index b119833f5e..10a675b6a9 100644 --- a/configs/nucleo-l452re/src/stm32_boot.c +++ b/configs/nucleo-l452re/src/stm32_boot.c @@ -73,20 +73,20 @@ void stm32l4_board_initialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_initialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform board-specific initialization here if so configured */ diff --git a/configs/nucleo-l452re/src/stm32_bringup.c b/configs/nucleo-l452re/src/stm32_bringup.c index 65cca4abaa..dbe3ec9655 100644 --- a/configs/nucleo-l452re/src/stm32_bringup.c +++ b/configs/nucleo-l452re/src/stm32_bringup.c @@ -72,10 +72,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ****************************************************************************/ diff --git a/configs/nucleo-l476rg/src/stm32_boot.c b/configs/nucleo-l476rg/src/stm32_boot.c index 6fbea1751d..1b2054bcf3 100644 --- a/configs/nucleo-l476rg/src/stm32_boot.c +++ b/configs/nucleo-l476rg/src/stm32_boot.c @@ -92,20 +92,20 @@ void stm32l4_board_initialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_intiialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform NSH initialization here instead of from the NSH. This * alternative NSH initialization is necessary when NSH is ran in user-space diff --git a/configs/nucleo-l496zg/src/stm32_boot.c b/configs/nucleo-l496zg/src/stm32_boot.c index ec2bff2d24..94162c0710 100644 --- a/configs/nucleo-l496zg/src/stm32_boot.c +++ b/configs/nucleo-l496zg/src/stm32_boot.c @@ -82,20 +82,20 @@ void stm32l4_board_initialize(void) } /************************************************************************************ - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional initialization call + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional initialization call * will be performed in the boot-up sequence to a function called - * board_initialize(). board_initialize() will be called immediately after + * board_late_initialize(). board_late_initialize() will be called immediately after * up_initialize() is called and just before the initial application is started. * This additional initialization phase may be used, for example, to initialize * board-specific device drivers. * ************************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { #if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL) /* Perform NSH initialization here instead of from the NSH. This diff --git a/configs/olimex-efm32g880f128-stk/src/efm32_boot.c b/configs/olimex-efm32g880f128-stk/src/efm32_boot.c index 76074dbe06..e0f872d931 100644 --- a/configs/olimex-efm32g880f128-stk/src/efm32_boot.c +++ b/configs/olimex-efm32g880f128-stk/src/efm32_boot.c @@ -64,20 +64,20 @@ void efm32_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_initialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { } #endif diff --git a/configs/olimex-lpc1766stk/src/lpc1766stk.h b/configs/olimex-lpc1766stk/src/lpc1766stk.h index 714acf5dc5..83547e91b3 100644 --- a/configs/olimex-lpc1766stk/src/lpc1766stk.h +++ b/configs/olimex-lpc1766stk/src/lpc1766stk.h @@ -256,10 +256,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ************************************************************************************/ diff --git a/configs/olimex-lpc1766stk/src/lpc17_appinit.c b/configs/olimex-lpc1766stk/src/lpc17_appinit.c index eeb2d5550a..cd252c741d 100644 --- a/configs/olimex-lpc1766stk/src/lpc17_appinit.c +++ b/configs/olimex-lpc1766stk/src/lpc17_appinit.c @@ -63,9 +63,9 @@ * CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * - * CONFIG_BOARD_INITIALIZE=y, CONFIG_NSH_LIBRARY=y, && + * CONFIG_BOARD_LATE_INITIALIZE=y, CONFIG_NSH_LIBRARY=y, && * CONFIG_LIB_BOARDCTL=n : - * Called from board_initialize(). + * Called from board_late_initialize(). * * Input Parameters: * arg - The boardctl() argument is passed to the board_app_initialize() @@ -86,9 +86,9 @@ int board_app_initialize(uintptr_t arg) { - /* Did we already initialize via board_initialize()? */ + /* Did we already initialize via board_late_initialize()? */ -#ifndef CONFIG_BOARD_INITIALIZE +#ifndef CONFIG_BOARD_LATE_INITIALIZE return lpc17_bringup(); #else return OK; diff --git a/configs/olimex-lpc1766stk/src/lpc17_boot.c b/configs/olimex-lpc1766stk/src/lpc17_boot.c index caf8cf373a..0f8e89be51 100644 --- a/configs/olimex-lpc1766stk/src/lpc17_boot.c +++ b/configs/olimex-lpc1766stk/src/lpc17_boot.c @@ -93,20 +93,20 @@ void lpc17_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_initialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform board-specific initialization here if so configured */ diff --git a/configs/olimex-lpc1766stk/src/lpc17_bringup.c b/configs/olimex-lpc1766stk/src/lpc17_bringup.c index 4694fddf43..635f3515a7 100644 --- a/configs/olimex-lpc1766stk/src/lpc17_bringup.c +++ b/configs/olimex-lpc1766stk/src/lpc17_bringup.c @@ -343,10 +343,10 @@ static int nsh_usbhostinitialize(void) * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ************************************************************************************/ diff --git a/configs/olimex-stm32-e407/src/stm32_appinit.c b/configs/olimex-stm32-e407/src/stm32_appinit.c index 672d6a7561..4e60b24324 100644 --- a/configs/olimex-stm32-e407/src/stm32_appinit.c +++ b/configs/olimex-stm32-e407/src/stm32_appinit.c @@ -172,9 +172,9 @@ static void stm32_i2ctool(void) * CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * - * CONFIG_BOARD_INITIALIZE=y, CONFIG_NSH_LIBRARY=y, && + * CONFIG_BOARD_LATE_INITIALIZE=y, CONFIG_NSH_LIBRARY=y, && * CONFIG_LIB_BOARDCTL=n : - * Called from board_initialize(). + * Called from board_late_initialize(). * ****************************************************************************/ diff --git a/configs/olimex-stm32-e407/src/stm32_boot.c b/configs/olimex-stm32-e407/src/stm32_boot.c index cad3479aa1..6ee85d1171 100644 --- a/configs/olimex-stm32-e407/src/stm32_boot.c +++ b/configs/olimex-stm32-e407/src/stm32_boot.c @@ -94,20 +94,20 @@ void stm32_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_intitialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { #if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL) /* Perform NSH initialization here instead of from the NSH. This diff --git a/configs/olimex-stm32-h405/src/stm32_appinit.c b/configs/olimex-stm32-h405/src/stm32_appinit.c index 43fb94d1fd..442a51ea8e 100644 --- a/configs/olimex-stm32-h405/src/stm32_appinit.c +++ b/configs/olimex-stm32-h405/src/stm32_appinit.c @@ -80,9 +80,9 @@ * CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * - * CONFIG_BOARD_INITIALIZE=y, CONFIG_NSH_LIBRARY=y, && + * CONFIG_BOARD_LATE_INITIALIZE=y, CONFIG_NSH_LIBRARY=y, && * CONFIG_LIB_BOARDCTL=n : - * Called from board_initialize(). + * Called from board_late_initialize(). * * Input Parameters: * arg - The boardctl() argument is passed to the board_app_initialize() diff --git a/configs/olimex-stm32-h405/src/stm32_boot.c b/configs/olimex-stm32-h405/src/stm32_boot.c index bc4792fc09..f29ea5ac34 100644 --- a/configs/olimex-stm32-h405/src/stm32_boot.c +++ b/configs/olimex-stm32-h405/src/stm32_boot.c @@ -89,20 +89,20 @@ void stm32_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_intitialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform NSH initialization here instead of from the NSH. This * alternative NSH initialization is necessary when NSH is ran in user-space diff --git a/configs/olimex-stm32-h405/usbnsh/defconfig b/configs/olimex-stm32-h405/usbnsh/defconfig index 3946c3e81e..725c6bc9a1 100644 --- a/configs/olimex-stm32-h405/usbnsh/defconfig +++ b/configs/olimex-stm32-h405/usbnsh/defconfig @@ -14,7 +14,7 @@ CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y CONFIG_BOARDCTL_USBDEVCTRL=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_CDCACM=y diff --git a/configs/olimex-stm32-h407/src/olimex-stm32-h407.h b/configs/olimex-stm32-h407/src/olimex-stm32-h407.h index 2b6edb38c1..3a875edc27 100644 --- a/configs/olimex-stm32-h407/src/olimex-stm32-h407.h +++ b/configs/olimex-stm32-h407/src/olimex-stm32-h407.h @@ -207,8 +207,8 @@ * Called from the NSH library (or other application) * Otherse, assumed to be called from some other application. * - * Otherwise CONFIG_BOARD_INITIALIZE=y: - * Called from board_initialize(). + * Otherwise CONFIG_BOARD_LATE_INITIALIZE=y: + * Called from board_late_initialize(). * * Otherise, bad news: Never called * diff --git a/configs/olimex-stm32-h407/src/stm32_boot.c b/configs/olimex-stm32-h407/src/stm32_boot.c index a0e6c77f27..56bd60efb8 100644 --- a/configs/olimex-stm32-h407/src/stm32_boot.c +++ b/configs/olimex-stm32-h407/src/stm32_boot.c @@ -91,20 +91,20 @@ void stm32_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_intitialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { #ifndef CONFIG_LIB_BOARDCTL /* Perform NSH initialization here instead of from the board_app_initialize. diff --git a/configs/olimex-stm32-h407/src/stm32_bringup.c b/configs/olimex-stm32-h407/src/stm32_bringup.c index 621e6c1cca..0e1d35bdf5 100644 --- a/configs/olimex-stm32-h407/src/stm32_bringup.c +++ b/configs/olimex-stm32-h407/src/stm32_bringup.c @@ -82,8 +82,8 @@ * Called from the NSH library (or other application) * Otherse, assumed to be called from some other application. * - * Otherwise CONFIG_BOARD_INITIALIZE=y: - * Called from board_initialize(). + * Otherwise CONFIG_BOARD_LATE_INITIALIZE=y: + * Called from board_late_initialize(). * * Otherise, bad news: Never called * diff --git a/configs/olimex-stm32-p207/nsh/defconfig b/configs/olimex-stm32-p207/nsh/defconfig index a407efe9d2..8ca1b6283e 100644 --- a/configs/olimex-stm32-p207/nsh/defconfig +++ b/configs/olimex-stm32-p207/nsh/defconfig @@ -12,7 +12,7 @@ CONFIG_ARCH_CHIP_STM32F207ZE=y CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_DEBUG_SYMBOLS=y diff --git a/configs/olimex-stm32-p207/src/stm32_appinit.c b/configs/olimex-stm32-p207/src/stm32_appinit.c index 1818c08ab3..6a9b432b19 100644 --- a/configs/olimex-stm32-p207/src/stm32_appinit.c +++ b/configs/olimex-stm32-p207/src/stm32_appinit.c @@ -109,9 +109,9 @@ * CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * - * CONFIG_BOARD_INITIALIZE=y, CONFIG_NSH_LIBRARY=y, && + * CONFIG_BOARD_LATE_INITIALIZE=y, CONFIG_NSH_LIBRARY=y, && * CONFIG_LIB_BOARDCTL=n : - * Called from board_initialize(). + * Called from board_late_initialize(). * * Input Parameters: * arg - The boardctl() argument is passed to the board_app_initialize() diff --git a/configs/olimex-stm32-p207/src/stm32_boot.c b/configs/olimex-stm32-p207/src/stm32_boot.c index 1d81c62109..29fbb26a57 100644 --- a/configs/olimex-stm32-p207/src/stm32_boot.c +++ b/configs/olimex-stm32-p207/src/stm32_boot.c @@ -90,20 +90,20 @@ void stm32_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_intiialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform NSH initialization here instead of from the NSH. This * alternative NSH initialization is necessary when NSH is ran in user-space diff --git a/configs/olimex-stm32-p407/dhtxx/defconfig b/configs/olimex-stm32-p407/dhtxx/defconfig index 91336869c7..ff61b08b90 100644 --- a/configs/olimex-stm32-p407/dhtxx/defconfig +++ b/configs/olimex-stm32-p407/dhtxx/defconfig @@ -7,7 +7,7 @@ CONFIG_ARCH_CHIP_STM32F407ZG=y CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_STACKDUMP=y CONFIG_BOARDCTL_USBDEVCTRL=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_CDCACM=y diff --git a/configs/olimex-stm32-p407/hidkbd/defconfig b/configs/olimex-stm32-p407/hidkbd/defconfig index 7f3356fae4..ff4a7ccd05 100644 --- a/configs/olimex-stm32-p407/hidkbd/defconfig +++ b/configs/olimex-stm32-p407/hidkbd/defconfig @@ -6,7 +6,7 @@ CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407ZG=y CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_DISABLE_POLL=y diff --git a/configs/olimex-stm32-p407/kelf/defconfig b/configs/olimex-stm32-p407/kelf/defconfig index c89a8728dc..2ca7894669 100644 --- a/configs/olimex-stm32-p407/kelf/defconfig +++ b/configs/olimex-stm32-p407/kelf/defconfig @@ -8,7 +8,7 @@ CONFIG_ARCH_STACKDUMP=y CONFIG_ARMV7M_USEBASEPRI=y CONFIG_ARM_MPU=y CONFIG_BINFMT_CONSTRUCTORS=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILD_PROTECTED=y CONFIG_DEV_LOWCONSOLE=y diff --git a/configs/olimex-stm32-p407/kmodule/defconfig b/configs/olimex-stm32-p407/kmodule/defconfig index 849d180159..c2c58f8a3e 100644 --- a/configs/olimex-stm32-p407/kmodule/defconfig +++ b/configs/olimex-stm32-p407/kmodule/defconfig @@ -9,7 +9,7 @@ CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARMV7M_USEBASEPRI=y CONFIG_ARM_MPU=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILD_PROTECTED=y CONFIG_EXAMPLES_MODULE=y diff --git a/configs/olimex-stm32-p407/knsh/defconfig b/configs/olimex-stm32-p407/knsh/defconfig index f605c74fd0..99593fb9aa 100644 --- a/configs/olimex-stm32-p407/knsh/defconfig +++ b/configs/olimex-stm32-p407/knsh/defconfig @@ -7,7 +7,7 @@ CONFIG_ARCH_CHIP_STM32F407ZG=y CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARM_MPU=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILD_PROTECTED=y CONFIG_DISABLE_POLL=y diff --git a/configs/olimex-stm32-p407/nsh/defconfig b/configs/olimex-stm32-p407/nsh/defconfig index 647800faf2..2e303e2a88 100644 --- a/configs/olimex-stm32-p407/nsh/defconfig +++ b/configs/olimex-stm32-p407/nsh/defconfig @@ -6,7 +6,7 @@ CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407ZG=y CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_DISABLE_POLL=y diff --git a/configs/olimex-stm32-p407/src/olimex-stm32-p407.h b/configs/olimex-stm32-p407/src/olimex-stm32-p407.h index be946f2904..c8eea3a610 100644 --- a/configs/olimex-stm32-p407/src/olimex-stm32-p407.h +++ b/configs/olimex-stm32-p407/src/olimex-stm32-p407.h @@ -204,10 +204,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ************************************************************************************/ diff --git a/configs/olimex-stm32-p407/src/stm32_appinit.c b/configs/olimex-stm32-p407/src/stm32_appinit.c index 5880ed2120..ad6324b1be 100644 --- a/configs/olimex-stm32-p407/src/stm32_appinit.c +++ b/configs/olimex-stm32-p407/src/stm32_appinit.c @@ -63,9 +63,9 @@ * CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * - * CONFIG_BOARD_INITIALIZE=y, CONFIG_NSH_LIBRARY=y, && + * CONFIG_BOARD_LATE_INITIALIZE=y, CONFIG_NSH_LIBRARY=y, && * CONFIG_LIB_BOARDCTL=n : - * Called from board_initialize(). + * Called from board_late_initialize(). * * Input Parameters: * arg - The boardctl() argument is passed to the board_app_initialize() @@ -86,9 +86,9 @@ int board_app_initialize(uintptr_t arg) { - /* Did we already initialize via board_initialize()? */ + /* Did we already initialize via board_late_initialize()? */ -#ifndef CONFIG_BOARD_INITIALIZE +#ifndef CONFIG_BOARD_LATE_INITIALIZE return stm32_bringup(); #else return OK; diff --git a/configs/olimex-stm32-p407/src/stm32_boot.c b/configs/olimex-stm32-p407/src/stm32_boot.c index 7b82254291..3c7eb6b73e 100644 --- a/configs/olimex-stm32-p407/src/stm32_boot.c +++ b/configs/olimex-stm32-p407/src/stm32_boot.c @@ -93,20 +93,20 @@ void stm32_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_initialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform board-specific initialization here if so configured */ diff --git a/configs/olimex-stm32-p407/src/stm32_bringup.c b/configs/olimex-stm32-p407/src/stm32_bringup.c index a937cf07d7..6dd109ac63 100644 --- a/configs/olimex-stm32-p407/src/stm32_bringup.c +++ b/configs/olimex-stm32-p407/src/stm32_bringup.c @@ -84,10 +84,10 @@ extern const int MODSYMS_NSYMBOLS_VAR; * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ****************************************************************************/ diff --git a/configs/olimexino-stm32/can/defconfig b/configs/olimexino-stm32/can/defconfig index 01f09c9206..c6a619b484 100644 --- a/configs/olimexino-stm32/can/defconfig +++ b/configs/olimexino-stm32/can/defconfig @@ -22,7 +22,7 @@ CONFIG_ARCH_INTERRUPTSTACK=340 CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_BUILTIN=y CONFIG_BUILTIN_PROXY_STACKSIZE=768 diff --git a/configs/olimexino-stm32/composite/defconfig b/configs/olimexino-stm32/composite/defconfig index 9268ce70c7..6b8bf497af 100644 --- a/configs/olimexino-stm32/composite/defconfig +++ b/configs/olimexino-stm32/composite/defconfig @@ -33,7 +33,7 @@ CONFIG_ARCH_INTERRUPTSTACK=340 CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_BUILTIN=y CONFIG_BUILTIN_PROXY_STACKSIZE=768 diff --git a/configs/olimexino-stm32/nsh/defconfig b/configs/olimexino-stm32/nsh/defconfig index 5fb0dd5eb3..30814631c8 100644 --- a/configs/olimexino-stm32/nsh/defconfig +++ b/configs/olimexino-stm32/nsh/defconfig @@ -33,7 +33,7 @@ CONFIG_ARCH_INTERRUPTSTACK=340 CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_BUILTIN=y CONFIG_BUILTIN_PROXY_STACKSIZE=768 diff --git a/configs/olimexino-stm32/smallnsh/defconfig b/configs/olimexino-stm32/smallnsh/defconfig index 392e5ada44..9233330796 100644 --- a/configs/olimexino-stm32/smallnsh/defconfig +++ b/configs/olimexino-stm32/smallnsh/defconfig @@ -13,7 +13,7 @@ CONFIG_ARCH_HIPRI_INTERRUPT=y CONFIG_ARCH_INTERRUPTSTACK=340 CONFIG_ARCH_STACKDUMP=y CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_BUILTIN=y CONFIG_BUILTIN_PROXY_STACKSIZE=768 diff --git a/configs/olimexino-stm32/src/stm32_boot.c b/configs/olimexino-stm32/src/stm32_boot.c index bda0b87375..a0d04cfbf7 100644 --- a/configs/olimexino-stm32/src/stm32_boot.c +++ b/configs/olimexino-stm32/src/stm32_boot.c @@ -115,20 +115,20 @@ void stm32_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_intiialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { #if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL) /* Perform NSH initialization here instead of from the NSH. This diff --git a/configs/olimexino-stm32/tiny/defconfig b/configs/olimexino-stm32/tiny/defconfig index 0eaf5ceb5a..3cd1822a25 100644 --- a/configs/olimexino-stm32/tiny/defconfig +++ b/configs/olimexino-stm32/tiny/defconfig @@ -10,7 +10,7 @@ CONFIG_ARCH_HIPRI_INTERRUPT=y CONFIG_ARCH_INTERRUPTSTACK=340 CONFIG_ARCH_STACKDUMP=y CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_BUILTIN=y CONFIG_BUILTIN_PROXY_STACKSIZE=768 diff --git a/configs/open1788/fb/defconfig b/configs/open1788/fb/defconfig index 2448dcd658..75c4c03626 100644 --- a/configs/open1788/fb/defconfig +++ b/configs/open1788/fb/defconfig @@ -6,7 +6,7 @@ CONFIG_ARCH_CHIP_LPC1788=y CONFIG_ARCH_CHIP_LPC17XX=y CONFIG_ARCH_STACKDUMP=y CONFIG_BCH=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=11934 CONFIG_BUILTIN=y CONFIG_DEV_LOOP=y diff --git a/configs/open1788/knsh/defconfig b/configs/open1788/knsh/defconfig index d99f42be13..5363584c2b 100644 --- a/configs/open1788/knsh/defconfig +++ b/configs/open1788/knsh/defconfig @@ -12,7 +12,7 @@ CONFIG_ARMV7M_OABI_TOOLCHAIN=y CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y CONFIG_ARM_MPU=y CONFIG_BCH=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=11934 CONFIG_BUILD_PROTECTED=y CONFIG_DEV_LOOP=y diff --git a/configs/open1788/src/lpc17_appinit.c b/configs/open1788/src/lpc17_appinit.c index ee557911a5..dfb5b1737b 100644 --- a/configs/open1788/src/lpc17_appinit.c +++ b/configs/open1788/src/lpc17_appinit.c @@ -82,8 +82,8 @@ int board_app_initialize(uintptr_t arg) { -#ifdef CONFIG_BOARD_INITIALIZE - /* Board initialization already performed by board_initialize() */ +#ifdef CONFIG_BOARD_LATE_INITIALIZE + /* Board initialization already performed by board_late_initialize() */ return OK; #else diff --git a/configs/open1788/src/lpc17_boardinitialize.c b/configs/open1788/src/lpc17_boardinitialize.c index 1058f6cc7e..7f232d7171 100644 --- a/configs/open1788/src/lpc17_boardinitialize.c +++ b/configs/open1788/src/lpc17_boardinitialize.c @@ -120,20 +120,20 @@ void lpc17_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_initialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform board-specific initialization */ diff --git a/configs/open1788/src/lpc17_bringup.c b/configs/open1788/src/lpc17_bringup.c index 44d9228f24..2adec2e1f9 100644 --- a/configs/open1788/src/lpc17_bringup.c +++ b/configs/open1788/src/lpc17_bringup.c @@ -366,10 +366,10 @@ static int nsh_usbhostinitialize(void) * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library via boardctl() * ****************************************************************************/ diff --git a/configs/open1788/src/open1788.h b/configs/open1788/src/open1788.h index 4a8254348b..edaeb59201 100644 --- a/configs/open1788/src/open1788.h +++ b/configs/open1788/src/open1788.h @@ -167,10 +167,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library via boardctl() * ************************************************************************************/ diff --git a/configs/or1k/nsh/defconfig b/configs/or1k/nsh/defconfig index b56245b6ba..7cf7c2e044 100644 --- a/configs/or1k/nsh/defconfig +++ b/configs/or1k/nsh/defconfig @@ -24,7 +24,7 @@ CONFIG_ARCH_BOARD="or1k" CONFIG_ARCH_BOARD_OR1K=y CONFIG_ARCH_CHIP_MOR1KX=y CONFIG_ARCH_OR1K=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=512 CONFIG_BOOT_RUNFROMSDRAM=y CONFIG_BUILTIN=y diff --git a/configs/or1k/src/or1k.h b/configs/or1k/src/or1k.h index cb7f95de8e..6f11bae16f 100644 --- a/configs/or1k/src/or1k.h +++ b/configs/or1k/src/or1k.h @@ -46,10 +46,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ****************************************************************************/ diff --git a/configs/or1k/src/or1k_appinit.c b/configs/or1k/src/or1k_appinit.c index bbd851e576..ab42265212 100644 --- a/configs/or1k/src/or1k_appinit.c +++ b/configs/or1k/src/or1k_appinit.c @@ -82,8 +82,8 @@ int board_app_initialize(uintptr_t arg) { -#ifdef CONFIG_BOARD_INITIALIZE - /* Board initialization already performed by board_initialize() */ +#ifdef CONFIG_BOARD_LATE_INITIALIZE + /* Board initialization already performed by board_late_initialize() */ return OK; #else diff --git a/configs/or1k/src/or1k_boot.c b/configs/or1k/src/or1k_boot.c index c05878465d..a5881ccd47 100644 --- a/configs/or1k/src/or1k_boot.c +++ b/configs/or1k/src/or1k_boot.c @@ -70,20 +70,20 @@ void or1k_board_initialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_initialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform board-specific initialization */ diff --git a/configs/or1k/src/or1k_bringup.c b/configs/or1k/src/or1k_bringup.c index ddf9b71575..af62686ee4 100644 --- a/configs/or1k/src/or1k_bringup.c +++ b/configs/or1k/src/or1k_bringup.c @@ -55,10 +55,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ****************************************************************************/ diff --git a/configs/pcduino-a10/src/a1x_boot.c b/configs/pcduino-a10/src/a1x_boot.c index 265d728731..0cc78220ea 100644 --- a/configs/pcduino-a10/src/a1x_boot.c +++ b/configs/pcduino-a10/src/a1x_boot.c @@ -75,20 +75,20 @@ void a1x_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_intiialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform NSH initialization here instead of from the NSH. This * alternative NSH initialization is necessary when NSH is ran in user-space @@ -99,4 +99,4 @@ void board_initialize(void) (void)board_app_initialize(0); #endif } -#endif /* CONFIG_BOARD_INITIALIZE */ +#endif /* CONFIG_BOARD_LATE_INITIALIZE */ diff --git a/configs/photon/src/photon.h b/configs/photon/src/photon.h index e07f142160..d301a035e2 100644 --- a/configs/photon/src/photon.h +++ b/configs/photon/src/photon.h @@ -93,14 +93,14 @@ * Name: stm32_bringup * * Description: - * Called either by board_intialize() if CONFIG_BOARD_INITIALIZE or by + * Called either by board_intialize() if CONFIG_BOARD_LATE_INITIALIZE or by * board_app_initialize if CONFIG_LIB_BOARDCTL is selected. This function * initializes and configures all on-board features appropriate for the * selected configuration. * ****************************************************************************/ -#if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_INITIALIZE) +#if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE) int stm32_bringup(void); #endif diff --git a/configs/photon/src/stm32_appinit.c b/configs/photon/src/stm32_appinit.c index 31c9f61f09..40cc5c3ead 100644 --- a/configs/photon/src/stm32_appinit.c +++ b/configs/photon/src/stm32_appinit.c @@ -78,7 +78,7 @@ int board_app_initialize(uintptr_t arg) { -#ifndef CONFIG_BOARD_INITIALIZE +#ifndef CONFIG_BOARD_LATE_INITIALIZE /* Perform board initialization */ return stm32_bringup(); diff --git a/configs/photon/src/stm32_boot.c b/configs/photon/src/stm32_boot.c index 18ef2e85d2..d7e1023ec8 100644 --- a/configs/photon/src/stm32_boot.c +++ b/configs/photon/src/stm32_boot.c @@ -93,23 +93,23 @@ void stm32_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_intitialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform board initialization */ (void)stm32_bringup(); } -#endif /* CONFIG_BOARD_INITIALIZE */ +#endif /* CONFIG_BOARD_LATE_INITIALIZE */ diff --git a/configs/photon/src/stm32_bringup.c b/configs/photon/src/stm32_bringup.c index 1354d6fb8f..9abc75b375 100644 --- a/configs/photon/src/stm32_bringup.c +++ b/configs/photon/src/stm32_bringup.c @@ -60,7 +60,7 @@ * Name: stm32_bringup * * Description: - * Called either by board_intialize() if CONFIG_BOARD_INITIALIZE or by + * Called either by board_intialize() if CONFIG_BOARD_LATE_INITIALIZE or by * board_app_initialize if CONFIG_LIB_BOARDCTL is selected. This function * initializes and configures all on-board features appropriate for the * selected configuration. diff --git a/configs/pic32mx7mmb/src/pic32_appinit.c b/configs/pic32mx7mmb/src/pic32_appinit.c index 95e74d5763..92913a46eb 100644 --- a/configs/pic32mx7mmb/src/pic32_appinit.c +++ b/configs/pic32mx7mmb/src/pic32_appinit.c @@ -63,9 +63,9 @@ * CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * - * CONFIG_BOARD_INITIALIZE=y, CONFIG_NSH_LIBRARY=y, && + * CONFIG_BOARD_LATE_INITIALIZE=y, CONFIG_NSH_LIBRARY=y, && * CONFIG_LIB_BOARDCTL=n : - * Called from board_initialize(). + * Called from board_late_initialize(). * * Input Parameters: * arg - The boardctl() argument is passed to the board_app_initialize() @@ -86,9 +86,9 @@ int board_app_initialize(uintptr_t arg) { - /* Did we already initialize via board_initialize()? */ + /* Did we already initialize via board_late_initialize()? */ -#ifndef CONFIG_BOARD_INITIALIZE +#ifndef CONFIG_BOARD_LATE_INITIALIZE return pic32mx_bringup(); #else return OK; diff --git a/configs/pic32mx7mmb/src/pic32_boot.c b/configs/pic32mx7mmb/src/pic32_boot.c index ec9d8b4a85..731ad4a4d9 100644 --- a/configs/pic32mx7mmb/src/pic32_boot.c +++ b/configs/pic32mx7mmb/src/pic32_boot.c @@ -100,20 +100,20 @@ void pic32mx_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_initialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform board-specific initialization here if so configured */ diff --git a/configs/pic32mx7mmb/src/pic32_bringup.c b/configs/pic32mx7mmb/src/pic32_bringup.c index bdc6b7bec1..0ed0e16ba8 100644 --- a/configs/pic32mx7mmb/src/pic32_bringup.c +++ b/configs/pic32mx7mmb/src/pic32_bringup.c @@ -365,10 +365,10 @@ static int nsh_usbdevinitialize(void) * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ****************************************************************************/ diff --git a/configs/pic32mx7mmb/src/pic32mx7mmb.h b/configs/pic32mx7mmb/src/pic32mx7mmb.h index f28e0cb901..e26fce5edd 100644 --- a/configs/pic32mx7mmb/src/pic32mx7mmb.h +++ b/configs/pic32mx7mmb/src/pic32mx7mmb.h @@ -151,10 +151,10 @@ void pic32mx_led_initialize(void); * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ****************************************************************************/ diff --git a/configs/pic32mz-starterkit/src/pic32mz_appinit.c b/configs/pic32mz-starterkit/src/pic32mz_appinit.c index ab96a4c20e..3d128c17e9 100644 --- a/configs/pic32mz-starterkit/src/pic32mz_appinit.c +++ b/configs/pic32mz-starterkit/src/pic32mz_appinit.c @@ -76,11 +76,11 @@ int board_app_initialize(uintptr_t arg) { - /* If CONFIG_BOARD_INITIALIZE is selected then board initialization was - * already performed in board_initialize. + /* If CONFIG_BOARD_LATE_INITIALIZE is selected then board initialization was + * already performed in board_late_initialize. */ -#ifndef CONFIG_BOARD_INITIALIZE +#ifndef CONFIG_BOARD_LATE_INITIALIZE return pic32mz_bringup(); #else return OK; diff --git a/configs/pic32mz-starterkit/src/pic32mz_boot.c b/configs/pic32mz-starterkit/src/pic32mz_boot.c index 4b2dcf4a62..90b9a78173 100644 --- a/configs/pic32mz-starterkit/src/pic32mz_boot.c +++ b/configs/pic32mz-starterkit/src/pic32mz_boot.c @@ -89,23 +89,23 @@ void pic32mz_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_intiialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform board initialization */ (void)pic32mz_bringup(); } -#endif /* CONFIG_BOARD_INITIALIZE */ +#endif /* CONFIG_BOARD_LATE_INITIALIZE */ diff --git a/configs/sabre-6quad/src/imx_appinit.c b/configs/sabre-6quad/src/imx_appinit.c index 2484d795a8..602664f950 100644 --- a/configs/sabre-6quad/src/imx_appinit.c +++ b/configs/sabre-6quad/src/imx_appinit.c @@ -78,7 +78,7 @@ int board_app_initialize(uintptr_t arg) { -#ifndef CONFIG_BOARD_INITIALIZE +#ifndef CONFIG_BOARD_LATE_INITIALIZE /* Perform board initialization */ return imx_bringup(); diff --git a/configs/sabre-6quad/src/imx_boardinit.c b/configs/sabre-6quad/src/imx_boardinit.c index 80dbc589a1..babb681309 100644 --- a/configs/sabre-6quad/src/imx_boardinit.c +++ b/configs/sabre-6quad/src/imx_boardinit.c @@ -115,23 +115,23 @@ void imx_board_initialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_intitialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform board initialization */ (void)imx_bringup(); } -#endif /* CONFIG_BOARD_INITIALIZE */ +#endif /* CONFIG_BOARD_LATE_INITIALIZE */ diff --git a/configs/sabre-6quad/src/sabre-6quad.h b/configs/sabre-6quad/src/sabre-6quad.h index b70589dbe3..1410babb79 100644 --- a/configs/sabre-6quad/src/sabre-6quad.h +++ b/configs/sabre-6quad/src/sabre-6quad.h @@ -87,7 +87,7 @@ * ************************************************************************************/ -#if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_INITIALIZE) +#if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE) int imx_bringup(void); #endif diff --git a/configs/sam4cmp-db/src/Makefile b/configs/sam4cmp-db/src/Makefile index 1dd2e0485c..ed3d4d171f 100644 --- a/configs/sam4cmp-db/src/Makefile +++ b/configs/sam4cmp-db/src/Makefile @@ -40,7 +40,7 @@ CSRCS = sam_boot.c ifeq ($(CONFIG_LIB_BOARDCTL),y) CSRCS += sam_appinit.c sam_bringup.c -else ifeq ($(CONFIG_BOARD_INITIALIZE),y) +else ifeq ($(CONFIG_BOARD_LATE_INITIALIZE),y) CSRCS += sam_bringup.c endif diff --git a/configs/sam4cmp-db/src/sam4cmp-db.h b/configs/sam4cmp-db/src/sam4cmp-db.h index 9fab435d5a..ab9a1733c6 100644 --- a/configs/sam4cmp-db/src/sam4cmp-db.h +++ b/configs/sam4cmp-db/src/sam4cmp-db.h @@ -72,7 +72,7 @@ * ************************************************************************************/ -#if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_INITIALIZE) +#if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE) int sam_bringup(void); #endif diff --git a/configs/sam4cmp-db/src/sam_appinit.c b/configs/sam4cmp-db/src/sam_appinit.c index 774bb033a8..60e90c15c7 100644 --- a/configs/sam4cmp-db/src/sam_appinit.c +++ b/configs/sam4cmp-db/src/sam_appinit.c @@ -76,7 +76,7 @@ int board_app_initialize(uintptr_t arg) { -#ifndef CONFIG_BOARD_INITIALIZE +#ifndef CONFIG_BOARD_LATE_INITIALIZE /* Perform board initialization */ return sam_bringup(); diff --git a/configs/sam4cmp-db/src/sam_boot.c b/configs/sam4cmp-db/src/sam_boot.c index f883f0add6..31e86c13ba 100644 --- a/configs/sam4cmp-db/src/sam_boot.c +++ b/configs/sam4cmp-db/src/sam_boot.c @@ -64,23 +64,23 @@ void sam_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_intitialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform board initialization */ (void)sam_bringup(); } -#endif /* CONFIG_BOARD_INITIALIZE */ +#endif /* CONFIG_BOARD_LATE_INITIALIZE */ diff --git a/configs/sam4e-ek/src/sam_boot.c b/configs/sam4e-ek/src/sam_boot.c index ba95e74654..816b5f1221 100644 --- a/configs/sam4e-ek/src/sam_boot.c +++ b/configs/sam4e-ek/src/sam_boot.c @@ -127,20 +127,20 @@ void sam_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_intiialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform NSH initialization here instead of from the NSH. This * alternative NSH initialization is necessary when NSH is ran in user-space @@ -151,4 +151,4 @@ void board_initialize(void) (void)board_app_initialize(0); #endif } -#endif /* CONFIG_BOARD_INITIALIZE */ +#endif /* CONFIG_BOARD_LATE_INITIALIZE */ diff --git a/configs/sam4s-xplained-pro/nsh/defconfig b/configs/sam4s-xplained-pro/nsh/defconfig index 9d553bc5e4..a833c78a84 100644 --- a/configs/sam4s-xplained-pro/nsh/defconfig +++ b/configs/sam4s-xplained-pro/nsh/defconfig @@ -12,7 +12,7 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y CONFIG_ARMV7M_USEBASEPRI=y CONFIG_ARM_MPU=y CONFIG_BOARDCTL_USBDEVCTRL=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=9186 CONFIG_BUILTIN=y CONFIG_CDCACM=y diff --git a/configs/sam4s-xplained-pro/src/sam_boot.c b/configs/sam4s-xplained-pro/src/sam_boot.c index 54767ee59c..14680e5f45 100644 --- a/configs/sam4s-xplained-pro/src/sam_boot.c +++ b/configs/sam4s-xplained-pro/src/sam_boot.c @@ -71,20 +71,20 @@ void sam_boardinitialize(void) /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_initialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { #if (defined(CONFIG_SAM34_WDT) && !defined(CONFIG_WDT_DISABLE_ON_RESET)) /* Configure watchdog timer and enable kicker kernel thread. */ @@ -98,4 +98,4 @@ void board_initialize(void) sam_led_initialize(); #endif } -#endif /* CONFIG_BOARD_INITIALIZE */ +#endif /* CONFIG_BOARD_LATE_INITIALIZE */ diff --git a/configs/sama5d2-xult/src/Makefile b/configs/sama5d2-xult/src/Makefile index 55e3d8b58e..01f09a98e7 100644 --- a/configs/sama5d2-xult/src/Makefile +++ b/configs/sama5d2-xult/src/Makefile @@ -41,7 +41,7 @@ CSRCS = sam_boot.c sam_userleds.c ifeq ($(CONFIG_LIB_BOARDCTL),y) CSRCS += sam_appinit.c sam_bringup.c else -ifeq ($(CONFIG_BOARD_INITIALIZE),y) +ifeq ($(CONFIG_BOARD_LATE_INITIALIZE),y) CSRCS += sam_bringup.c endif endif diff --git a/configs/sama5d2-xult/src/sam_appinit.c b/configs/sama5d2-xult/src/sam_appinit.c index 4159585d22..1d2125d4f8 100644 --- a/configs/sama5d2-xult/src/sam_appinit.c +++ b/configs/sama5d2-xult/src/sam_appinit.c @@ -80,7 +80,7 @@ int board_app_initialize(uintptr_t arg) { -#ifndef CONFIG_BOARD_INITIALIZE +#ifndef CONFIG_BOARD_LATE_INITIALIZE /* Perform board initialization */ return sam_bringup(); diff --git a/configs/sama5d2-xult/src/sam_boot.c b/configs/sama5d2-xult/src/sam_boot.c index ccfc900d09..f6958ace8b 100644 --- a/configs/sama5d2-xult/src/sam_boot.c +++ b/configs/sama5d2-xult/src/sam_boot.c @@ -77,24 +77,24 @@ void sam_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_intiialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform board initialization */ (void)sam_bringup(); } -#endif /* CONFIG_BOARD_INITIALIZE */ +#endif /* CONFIG_BOARD_LATE_INITIALIZE */ diff --git a/configs/sama5d3-xplained/src/sam_boot.c b/configs/sama5d3-xplained/src/sam_boot.c index 901c30e243..f3dc140245 100644 --- a/configs/sama5d3-xplained/src/sam_boot.c +++ b/configs/sama5d3-xplained/src/sam_boot.c @@ -132,20 +132,20 @@ void sam_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_intiialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform NSH initialization here instead of from the NSH. This * alternative NSH initialization is necessary when NSH is ran in user-space @@ -156,4 +156,4 @@ void board_initialize(void) (void)board_app_initialize(0); #endif } -#endif /* CONFIG_BOARD_INITIALIZE */ +#endif /* CONFIG_BOARD_LATE_INITIALIZE */ diff --git a/configs/sama5d3x-ek/src/sam_boot.c b/configs/sama5d3x-ek/src/sam_boot.c index d12ec87c75..8415d92db9 100644 --- a/configs/sama5d3x-ek/src/sam_boot.c +++ b/configs/sama5d3x-ek/src/sam_boot.c @@ -132,20 +132,20 @@ void sam_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_intiialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform NSH initialization here instead of from the NSH. This * alternative NSH initialization is necessary when NSH is ran in user-space @@ -156,4 +156,4 @@ void board_initialize(void) (void)board_app_initialize(0); #endif } -#endif /* CONFIG_BOARD_INITIALIZE */ +#endif /* CONFIG_BOARD_LATE_INITIALIZE */ diff --git a/configs/sama5d4-ek/README.txt b/configs/sama5d4-ek/README.txt index 254f5c8663..749c0ebb36 100644 --- a/configs/sama5d4-ek/README.txt +++ b/configs/sama5d4-ek/README.txt @@ -1680,7 +1680,7 @@ HSMCI Card Slots Application Configuration -> NSH Library CONFIG_NSH_ARCHINIT=y : NSH board-initialization, OR - CONFIG_BOARD_INITIALIZE=y + CONFIG_BOARD_LATE_INITIALIZE=y Using the SD card ----------------- diff --git a/configs/sama5d4-ek/elf/defconfig b/configs/sama5d4-ek/elf/defconfig index f93faf8fd1..befd2b36c4 100644 --- a/configs/sama5d4-ek/elf/defconfig +++ b/configs/sama5d4-ek/elf/defconfig @@ -22,7 +22,7 @@ CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH_TEXT_NPAGES=256 CONFIG_ARCH_TEXT_VBASE=0x80000000 CONFIG_ARMV7A_TOOLCHAIN_CODESOURCERYW=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=65775 CONFIG_BOOT_RUNFROMSDRAM=y CONFIG_BUILTIN=y diff --git a/configs/sama5d4-ek/knsh/defconfig b/configs/sama5d4-ek/knsh/defconfig index 9e4afa11b4..ea93d0630d 100644 --- a/configs/sama5d4-ek/knsh/defconfig +++ b/configs/sama5d4-ek/knsh/defconfig @@ -25,7 +25,7 @@ CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH_TEXT_NPAGES=256 CONFIG_ARCH_TEXT_VBASE=0x80000000 CONFIG_ARMV7A_TOOLCHAIN_CODESOURCERYW=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=65775 CONFIG_BOOT_RUNFROMSDRAM=y CONFIG_BUILD_KERNEL=y diff --git a/configs/sama5d4-ek/src/Makefile b/configs/sama5d4-ek/src/Makefile index 6e13295ef2..947175aaaf 100644 --- a/configs/sama5d4-ek/src/Makefile +++ b/configs/sama5d4-ek/src/Makefile @@ -115,7 +115,7 @@ endif ifeq ($(CONFIG_LIB_BOARDCTL),y) CSRCS += sam_appinit.c sam_bringup.c else -ifeq ($(CONFIG_BOARD_INITIALIZE),y) +ifeq ($(CONFIG_BOARD_LATE_INITIALIZE),y) CSRCS += sam_bringup.c endif endif diff --git a/configs/sama5d4-ek/src/sam_appinit.c b/configs/sama5d4-ek/src/sam_appinit.c index 8cce13cb62..5aa7292b68 100644 --- a/configs/sama5d4-ek/src/sam_appinit.c +++ b/configs/sama5d4-ek/src/sam_appinit.c @@ -80,7 +80,7 @@ int board_app_initialize(uintptr_t arg) { -#ifndef CONFIG_BOARD_INITIALIZE +#ifndef CONFIG_BOARD_LATE_INITIALIZE /* Perform board initialization */ return sam_bringup(); diff --git a/configs/sama5d4-ek/src/sam_boot.c b/configs/sama5d4-ek/src/sam_boot.c index 62eaf7916a..0eb8751342 100644 --- a/configs/sama5d4-ek/src/sam_boot.c +++ b/configs/sama5d4-ek/src/sam_boot.c @@ -133,23 +133,23 @@ void sam_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_intiialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform board initialization */ (void)sam_bringup(); } -#endif /* CONFIG_BOARD_INITIALIZE */ +#endif /* CONFIG_BOARD_LATE_INITIALIZE */ diff --git a/configs/same70-xplained/README.txt b/configs/same70-xplained/README.txt index 4fef4abd7f..e0c7f67d15 100644 --- a/configs/same70-xplained/README.txt +++ b/configs/same70-xplained/README.txt @@ -175,7 +175,7 @@ the SD slots can be enabled with the following settings: Application Configuration -> NSH Library CONFIG_NSH_ARCHINIT=y : NSH board-initialization, OR - CONFIG_BOARD_INITIALIZE=y + CONFIG_BOARD_LATE_INITIALIZE=y Using the SD card ----------------- diff --git a/configs/same70-xplained/src/Makefile b/configs/same70-xplained/src/Makefile index 4ff7f4b9eb..bd8a5255b7 100644 --- a/configs/same70-xplained/src/Makefile +++ b/configs/same70-xplained/src/Makefile @@ -44,7 +44,7 @@ endif ifeq ($(CONFIG_LIB_BOARDCTL),y) CSRCS += sam_appinit.c sam_bringup.c -else ifeq ($(CONFIG_BOARD_INITIALIZE),y) +else ifeq ($(CONFIG_BOARD_LATE_INITIALIZE),y) CSRCS += sam_bringup.c endif diff --git a/configs/same70-xplained/src/sam_appinit.c b/configs/same70-xplained/src/sam_appinit.c index 6dfa27a421..1912ad5ad3 100644 --- a/configs/same70-xplained/src/sam_appinit.c +++ b/configs/same70-xplained/src/sam_appinit.c @@ -78,7 +78,7 @@ int board_app_initialize(uintptr_t arg) { -#ifndef CONFIG_BOARD_INITIALIZE +#ifndef CONFIG_BOARD_LATE_INITIALIZE /* Perform board initialization */ return sam_bringup(); diff --git a/configs/same70-xplained/src/sam_boot.c b/configs/same70-xplained/src/sam_boot.c index ba38da7005..c5432520a7 100644 --- a/configs/same70-xplained/src/sam_boot.c +++ b/configs/same70-xplained/src/sam_boot.c @@ -137,23 +137,23 @@ void sam_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_intitialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform board initialization */ (void)sam_bringup(); } -#endif /* CONFIG_BOARD_INITIALIZE */ +#endif /* CONFIG_BOARD_LATE_INITIALIZE */ diff --git a/configs/same70-xplained/src/same70-xplained.h b/configs/same70-xplained/src/same70-xplained.h index 37219453a7..23ac63698a 100644 --- a/configs/same70-xplained/src/same70-xplained.h +++ b/configs/same70-xplained/src/same70-xplained.h @@ -448,7 +448,7 @@ void sam_sdram_config(void); * ************************************************************************************/ -#if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_INITIALIZE) +#if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE) int sam_bringup(void); #endif diff --git a/configs/samv71-xult/README.txt b/configs/samv71-xult/README.txt index fb3f3a29ab..f7bf184902 100644 --- a/configs/samv71-xult/README.txt +++ b/configs/samv71-xult/README.txt @@ -291,7 +291,7 @@ Enabling HSMCI support. The SAMV7-XULT provides a one, full-size SD memory card Application Configuration -> NSH Library CONFIG_NSH_ARCHINIT=y : NSH board-initialization, OR - CONFIG_BOARD_INITIALIZE=y + CONFIG_BOARD_LATE_INITIALIZE=y Using the SD card ----------------- diff --git a/configs/samv71-xult/src/Makefile b/configs/samv71-xult/src/Makefile index 37371c8a12..529f8d9c24 100644 --- a/configs/samv71-xult/src/Makefile +++ b/configs/samv71-xult/src/Makefile @@ -44,7 +44,7 @@ endif ifeq ($(CONFIG_LIB_BOARDCTL),y) CSRCS += sam_appinit.c sam_bringup.c -else ifeq ($(CONFIG_BOARD_INITIALIZE),y) +else ifeq ($(CONFIG_BOARD_LATE_INITIALIZE),y) CSRCS += sam_bringup.c endif diff --git a/configs/samv71-xult/src/sam_appinit.c b/configs/samv71-xult/src/sam_appinit.c index fa9997eb42..a0fbb2b4b8 100644 --- a/configs/samv71-xult/src/sam_appinit.c +++ b/configs/samv71-xult/src/sam_appinit.c @@ -80,7 +80,7 @@ int board_app_initialize(uintptr_t arg) { -#ifndef CONFIG_BOARD_INITIALIZE +#ifndef CONFIG_BOARD_LATE_INITIALIZE /* Perform board initialization */ return sam_bringup(); diff --git a/configs/samv71-xult/src/sam_boot.c b/configs/samv71-xult/src/sam_boot.c index 9f703718eb..bc722767aa 100644 --- a/configs/samv71-xult/src/sam_boot.c +++ b/configs/samv71-xult/src/sam_boot.c @@ -137,23 +137,23 @@ void sam_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_intitialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform board initialization */ (void)sam_bringup(); } -#endif /* CONFIG_BOARD_INITIALIZE */ +#endif /* CONFIG_BOARD_LATE_INITIALIZE */ diff --git a/configs/samv71-xult/src/samv71-xult.h b/configs/samv71-xult/src/samv71-xult.h index cb273a819f..1fd36ea8bf 100644 --- a/configs/samv71-xult/src/samv71-xult.h +++ b/configs/samv71-xult/src/samv71-xult.h @@ -667,7 +667,7 @@ void sam_sdram_config(void); * ************************************************************************************/ -#if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_INITIALIZE) +#if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE) int sam_bringup(void); #endif diff --git a/configs/sim/fb/defconfig b/configs/sim/fb/defconfig index 4d96384304..38850bccd1 100644 --- a/configs/sim/fb/defconfig +++ b/configs/sim/fb/defconfig @@ -2,7 +2,7 @@ CONFIG_ARCH_BOARD_SIM=y CONFIG_ARCH_BOARD="sim" CONFIG_ARCH_SIM=y CONFIG_ARCH="sim" -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_DEBUG_SYMBOLS=y CONFIG_DISABLE_ENVIRON=y CONFIG_DISABLE_MOUNTPOINT=y diff --git a/configs/sim/loadable/defconfig b/configs/sim/loadable/defconfig index 0c4dddac48..2f75cb40ab 100644 --- a/configs/sim/loadable/defconfig +++ b/configs/sim/loadable/defconfig @@ -4,7 +4,7 @@ CONFIG_ARCH_BOARD_SIM=y CONFIG_ARCH_SIM=y CONFIG_BOARDCTL_APP_SYMTAB=y CONFIG_BOARDCTL_POWEROFF=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BUILD_LOADABLE=y CONFIG_BUILTIN=y CONFIG_CLOCK_MONOTONIC=y diff --git a/configs/sim/spiffs/defconfig b/configs/sim/spiffs/defconfig index e6160144df..2e2c409963 100644 --- a/configs/sim/spiffs/defconfig +++ b/configs/sim/spiffs/defconfig @@ -2,7 +2,7 @@ CONFIG_ARCH="sim" CONFIG_ARCH_BOARD="sim" CONFIG_ARCH_BOARD_SIM=y CONFIG_ARCH_SIM=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_DEBUG_ASSERTIONS=y CONFIG_DEBUG_FEATURES=y CONFIG_DEBUG_SYMBOLS=y diff --git a/configs/sim/src/Makefile b/configs/sim/src/Makefile index 16ceb489e9..48d4e44ab3 100644 --- a/configs/sim/src/Makefile +++ b/configs/sim/src/Makefile @@ -38,7 +38,7 @@ include $(TOPDIR)/Make.defs ASRCS = CSRCS = -ifeq ($(CONFIG_BOARD_INITIALIZE),y) +ifeq ($(CONFIG_BOARD_LATE_INITIALIZE),y) CSRCS += sim_boot.c endif @@ -46,7 +46,7 @@ ifeq ($(CONFIG_LIB_BOARDCTL),y) CSRCS += sim_appinit.c endif -ifeq ($(CONFIG_BOARD_INITIALIZE),y) +ifeq ($(CONFIG_BOARD_LATE_INITIALIZE),y) CSRCS += sim_bringup.c ifeq ($(CONFIG_LIB_ZONEINFO_ROMFS),y) CSRCS += sim_zoneinfo.c diff --git a/configs/sim/src/sim_appinit.c b/configs/sim/src/sim_appinit.c index c3abef2d59..0bfe9f2bc1 100644 --- a/configs/sim/src/sim_appinit.c +++ b/configs/sim/src/sim_appinit.c @@ -74,7 +74,7 @@ #ifdef CONFIG_LIB_BOARDCTL int board_app_initialize(uintptr_t arg) { -#ifndef CONFIG_BOARD_INITIALIZE +#ifndef CONFIG_BOARD_LATE_INITIALIZE sim_bringup(); #endif diff --git a/configs/sim/src/sim_boot.c b/configs/sim/src/sim_boot.c index 6e0be20777..f71ac505df 100644 --- a/configs/sim/src/sim_boot.c +++ b/configs/sim/src/sim_boot.c @@ -47,21 +47,21 @@ ****************************************************************************/ /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_intiialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { sim_bringup(); } -#endif /* CONFIG_BOARD_INITIALIZE */ +#endif /* CONFIG_BOARD_LATE_INITIALIZE */ diff --git a/configs/sim/traveler/defconfig b/configs/sim/traveler/defconfig index 2b5111e294..10d09e26ad 100644 --- a/configs/sim/traveler/defconfig +++ b/configs/sim/traveler/defconfig @@ -3,7 +3,7 @@ CONFIG_ARCH="sim" CONFIG_ARCH_BOARD="sim" CONFIG_ARCH_BOARD_SIM=y CONFIG_ARCH_SIM=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_SYMBOLS=y CONFIG_DISABLE_ENVIRON=y diff --git a/configs/stm3210e-eval/src/stm3210e-eval.h b/configs/stm3210e-eval/src/stm3210e-eval.h index 16c1bd209f..7083195f77 100644 --- a/configs/stm3210e-eval/src/stm3210e-eval.h +++ b/configs/stm3210e-eval/src/stm3210e-eval.h @@ -183,10 +183,10 @@ extern const uint16_t g_commonconfig[NCOMMON_CONFIG]; * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ************************************************************************************/ diff --git a/configs/stm3210e-eval/src/stm32_appinit.c b/configs/stm3210e-eval/src/stm32_appinit.c index e2ee549e48..96e1a3353f 100644 --- a/configs/stm3210e-eval/src/stm32_appinit.c +++ b/configs/stm3210e-eval/src/stm32_appinit.c @@ -82,8 +82,8 @@ int board_app_initialize(uintptr_t arg) { -#ifdef CONFIG_BOARD_INITIALIZE - /* Board initialization already performed by board_initialize() */ +#ifdef CONFIG_BOARD_LATE_INITIALIZE + /* Board initialization already performed by board_late_initialize() */ return OK; #else diff --git a/configs/stm3210e-eval/src/stm32_boot.c b/configs/stm3210e-eval/src/stm32_boot.c index 0620a9e415..da7371612f 100644 --- a/configs/stm3210e-eval/src/stm32_boot.c +++ b/configs/stm3210e-eval/src/stm32_boot.c @@ -108,20 +108,20 @@ void stm32_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_initialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform board-specific initialization */ diff --git a/configs/stm3210e-eval/src/stm32_bringup.c b/configs/stm3210e-eval/src/stm32_bringup.c index ca626c449c..bc545587b0 100644 --- a/configs/stm3210e-eval/src/stm32_bringup.c +++ b/configs/stm3210e-eval/src/stm32_bringup.c @@ -182,10 +182,10 @@ static void stm32_i2ctool(void) * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ****************************************************************************/ diff --git a/configs/stm3210e-eval/src/stm32_usbmsc.c b/configs/stm3210e-eval/src/stm32_usbmsc.c index 5246689c28..31992e1c3c 100644 --- a/configs/stm3210e-eval/src/stm32_usbmsc.c +++ b/configs/stm3210e-eval/src/stm32_usbmsc.c @@ -85,10 +85,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ****************************************************************************/ diff --git a/configs/stm3240g-eval/Kconfig b/configs/stm3240g-eval/Kconfig index 2316635c06..5c984e6fcf 100644 --- a/configs/stm3240g-eval/Kconfig +++ b/configs/stm3240g-eval/Kconfig @@ -40,15 +40,15 @@ config STM3240G_ILI9325_DISABLE endif # STM3240G_LCD -if BOARD_INITIALIZE +if BOARD_LATE_INITIALIZE config STM3240G_BOARDINIT_PRIO int "Board initialization thread priority" default 196 ---help--- - If BOARD_INITIALIZE initialize is defined, then the function - board_initialize() will be called to perform board-specific - initialization. board_initialize() runs on the IDLE thread. + If BOARD_LATE_INITIALIZE initialize is defined, then the function + board_late_initialize() will be called to perform board-specific + initialization. board_late_initialize() runs on the IDLE thread. Depending on the features that are enabled, this board initialization logic may need to start a kernel thread that has more capability than the IDLE thread. This setting then provides @@ -63,13 +63,13 @@ config STM3240G_BOARDINIT_STACK int "Board initialization thread Size" default 2048 ---help--- - If BOARD_INITIALIZE initialize is defined, then the function - board_initialize() will be called to perform board-specific - initialization. board_initialize() runs on the IDLE thread. + If BOARD_LATE_INITIALIZE initialize is defined, then the function + board_late_initialize() will be called to perform board-specific + initialization. board_late_initialize() runs on the IDLE thread. Depending on the features that are enabled, this board initialization logic may need to start a kernel thread that has more capability than the IDLE thread. This setting then provides the size of the stack to use with the initialization kernel thread. -endif # BOARD_INITIALIZE +endif # BOARD_LATE_INITIALIZE endif # ARCH_BOARD_STM3240G_EVAL diff --git a/configs/stm3240g-eval/fb/defconfig b/configs/stm3240g-eval/fb/defconfig index 9d35fe0d85..48e63b3a2d 100644 --- a/configs/stm3240g-eval/fb/defconfig +++ b/configs/stm3240g-eval/fb/defconfig @@ -5,7 +5,7 @@ CONFIG_ARCH_BOARD_STM3240G_EVAL=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407IG=y CONFIG_ARCH_STACKDUMP=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_DISABLE_POLL=y diff --git a/configs/stm3240g-eval/src/stm3240g-eval.h b/configs/stm3240g-eval/src/stm3240g-eval.h index 71d997bbd3..4a6bee4ef0 100644 --- a/configs/stm3240g-eval/src/stm3240g-eval.h +++ b/configs/stm3240g-eval/src/stm3240g-eval.h @@ -220,10 +220,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ****************************************************************************************************/ diff --git a/configs/stm3240g-eval/src/stm32_appinit.c b/configs/stm3240g-eval/src/stm32_appinit.c index 1ae1aa76ba..9bf4ce8277 100644 --- a/configs/stm3240g-eval/src/stm32_appinit.c +++ b/configs/stm3240g-eval/src/stm32_appinit.c @@ -82,8 +82,8 @@ int board_app_initialize(uintptr_t arg) { -#ifdef CONFIG_BOARD_INITIALIZE - /* Board initialization already performed by board_initialize() */ +#ifdef CONFIG_BOARD_LATE_INITIALIZE + /* Board initialization already performed by board_late_initialize() */ return OK; #else diff --git a/configs/stm3240g-eval/src/stm32_boot.c b/configs/stm3240g-eval/src/stm32_boot.c index 2861a30b1d..2ef5834748 100644 --- a/configs/stm3240g-eval/src/stm32_boot.c +++ b/configs/stm3240g-eval/src/stm32_boot.c @@ -103,20 +103,20 @@ void stm32_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_initialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform the board initialization on the start-up thread. Some * initializations may fail in this case due to the limited capability of diff --git a/configs/stm3240g-eval/src/stm32_bringup.c b/configs/stm3240g-eval/src/stm32_bringup.c index 7f78ccb8f3..d4dee1e246 100644 --- a/configs/stm3240g-eval/src/stm32_bringup.c +++ b/configs/stm3240g-eval/src/stm32_bringup.c @@ -218,10 +218,10 @@ static void stm32_i2ctool(void) * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ****************************************************************************/ diff --git a/configs/stm32f051-discovery/src/stm32_appinit.c b/configs/stm32f051-discovery/src/stm32_appinit.c index 729fec987c..fdfa1f5d29 100644 --- a/configs/stm32f051-discovery/src/stm32_appinit.c +++ b/configs/stm32f051-discovery/src/stm32_appinit.c @@ -77,9 +77,9 @@ int board_app_initialize(uintptr_t arg) { - /* Did we already initialize via board_initialize()? */ + /* Did we already initialize via board_late_initialize()? */ -#ifndef CONFIG_BOARD_INITIALIZE +#ifndef CONFIG_BOARD_LATE_INITIALIZE return stm32_bringup(); #else return OK; diff --git a/configs/stm32f051-discovery/src/stm32_boot.c b/configs/stm32f051-discovery/src/stm32_boot.c index 04e2595624..dddb1c71aa 100644 --- a/configs/stm32f051-discovery/src/stm32_boot.c +++ b/configs/stm32f051-discovery/src/stm32_boot.c @@ -72,20 +72,20 @@ void stm32_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_initialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform board-specific initialization here if so configured */ diff --git a/configs/stm32f051-discovery/src/stm32_bringup.c b/configs/stm32f051-discovery/src/stm32_bringup.c index fe0ca8b1d4..a5ea2cebe3 100644 --- a/configs/stm32f051-discovery/src/stm32_bringup.c +++ b/configs/stm32f051-discovery/src/stm32_bringup.c @@ -54,10 +54,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ****************************************************************************/ diff --git a/configs/stm32f051-discovery/src/stm32f051-discovery.h b/configs/stm32f051-discovery/src/stm32f051-discovery.h index 74081adc05..22691e03fe 100644 --- a/configs/stm32f051-discovery/src/stm32f051-discovery.h +++ b/configs/stm32f051-discovery/src/stm32f051-discovery.h @@ -121,10 +121,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ****************************************************************************/ diff --git a/configs/stm32f072-discovery/src/stm32_appinit.c b/configs/stm32f072-discovery/src/stm32_appinit.c index 5c02059cda..fcf9d38c50 100644 --- a/configs/stm32f072-discovery/src/stm32_appinit.c +++ b/configs/stm32f072-discovery/src/stm32_appinit.c @@ -77,9 +77,9 @@ int board_app_initialize(uintptr_t arg) { - /* Did we already initialize via board_initialize()? */ + /* Did we already initialize via board_late_initialize()? */ -#ifndef CONFIG_BOARD_INITIALIZE +#ifndef CONFIG_BOARD_LATE_INITIALIZE return stm32_bringup(); #else return OK; diff --git a/configs/stm32f072-discovery/src/stm32_boot.c b/configs/stm32f072-discovery/src/stm32_boot.c index 7f981b56da..eb5df8ae1f 100644 --- a/configs/stm32f072-discovery/src/stm32_boot.c +++ b/configs/stm32f072-discovery/src/stm32_boot.c @@ -72,20 +72,20 @@ void stm32_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_initialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform board-specific initialization here if so configured */ diff --git a/configs/stm32f072-discovery/src/stm32_bringup.c b/configs/stm32f072-discovery/src/stm32_bringup.c index 43e0c6aa63..3a4e48d918 100644 --- a/configs/stm32f072-discovery/src/stm32_bringup.c +++ b/configs/stm32f072-discovery/src/stm32_bringup.c @@ -54,10 +54,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ****************************************************************************/ diff --git a/configs/stm32f072-discovery/src/stm32f072-discovery.h b/configs/stm32f072-discovery/src/stm32f072-discovery.h index 343cfa83ec..3d834708a2 100644 --- a/configs/stm32f072-discovery/src/stm32f072-discovery.h +++ b/configs/stm32f072-discovery/src/stm32f072-discovery.h @@ -127,10 +127,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ****************************************************************************/ diff --git a/configs/stm32f103-minimum/README.txt b/configs/stm32f103-minimum/README.txt index 9fd2d3fd98..1c1b5cd1a8 100644 --- a/configs/stm32f103-minimum/README.txt +++ b/configs/stm32f103-minimum/README.txt @@ -268,7 +268,7 @@ Nintendo Wii Nunchuck: - Enable to Custom board/driver initialization at RTOS Features -> RTOS hooks - CONFIG_BOARD_INITIALIZE=y + CONFIG_BOARD_LATE_INITIALIZE=y - Enable the I2C Driver Support at Device Drivers, it will enable this symbol: diff --git a/configs/stm32f103-minimum/buttons/defconfig b/configs/stm32f103-minimum/buttons/defconfig index 04cc9a7a7f..943e9108f6 100644 --- a/configs/stm32f103-minimum/buttons/defconfig +++ b/configs/stm32f103-minimum/buttons/defconfig @@ -19,7 +19,7 @@ CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103C8=y CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_BUILTIN=y CONFIG_BUTTONS=y diff --git a/configs/stm32f103-minimum/src/stm32_boot.c b/configs/stm32f103-minimum/src/stm32_boot.c index 92f321fbcb..99ba1ab8b4 100644 --- a/configs/stm32f103-minimum/src/stm32_boot.c +++ b/configs/stm32f103-minimum/src/stm32_boot.c @@ -89,20 +89,20 @@ void stm32_boardinitialize(void) } /************************************************************************************ - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional initialization call + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional initialization call * will be performed in the boot-up sequence to a function called - * board_initialize(). board_initialize() will be called immediately after + * board_late_initialize(). board_late_initialize() will be called immediately after * up_initialize() is called and just before the initial application is started. * This additional initialization phase may be used, for example, to initialize * board-specific device drivers. * ************************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { #ifndef CONFIG_LIB_BOARDCTL /* Perform board initialization here instead of from the board_app_initialize(). */ diff --git a/configs/stm32f103-minimum/src/stm32_bringup.c b/configs/stm32f103-minimum/src/stm32_bringup.c index 7b3cd57e12..8b1d25bc24 100644 --- a/configs/stm32f103-minimum/src/stm32_bringup.c +++ b/configs/stm32f103-minimum/src/stm32_bringup.c @@ -131,10 +131,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ****************************************************************************/ diff --git a/configs/stm32f103-minimum/src/stm32f103_minimum.h b/configs/stm32f103-minimum/src/stm32f103_minimum.h index b3382b9e6e..ed2e6c2533 100644 --- a/configs/stm32f103-minimum/src/stm32f103_minimum.h +++ b/configs/stm32f103-minimum/src/stm32f103_minimum.h @@ -226,8 +226,8 @@ * Called from the NSH library (or other application) * Otherwise, assumed to be called from some other application. * - * Otherwise CONFIG_BOARD_INITIALIZE=y: - * Called from board_initialize(). + * Otherwise CONFIG_BOARD_LATE_INITIALIZE=y: + * Called from board_late_initialize(). * * Otherise, bad news: Never called * diff --git a/configs/stm32f103-minimum/userled/defconfig b/configs/stm32f103-minimum/userled/defconfig index 2fad1b7a66..23cfade28e 100644 --- a/configs/stm32f103-minimum/userled/defconfig +++ b/configs/stm32f103-minimum/userled/defconfig @@ -17,7 +17,7 @@ CONFIG_ARCH_BOARD_STM32F103_MINIMUM=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103C8=y CONFIG_ARCH_STACKDUMP=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_BUILTIN=y CONFIG_DEFAULT_SMALL=y diff --git a/configs/stm32f103-minimum/veml6070/defconfig b/configs/stm32f103-minimum/veml6070/defconfig index f99374f7d2..9b27272710 100644 --- a/configs/stm32f103-minimum/veml6070/defconfig +++ b/configs/stm32f103-minimum/veml6070/defconfig @@ -16,7 +16,7 @@ CONFIG_ARCH_BOARD_STM32F103_MINIMUM=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103C8=y CONFIG_ARCH_STACKDUMP=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_BUILTIN=y CONFIG_DEFAULT_SMALL=y diff --git a/configs/stm32f3discovery/src/stm32_appinit.c b/configs/stm32f3discovery/src/stm32_appinit.c index bbeefca2a7..6543edf40a 100644 --- a/configs/stm32f3discovery/src/stm32_appinit.c +++ b/configs/stm32f3discovery/src/stm32_appinit.c @@ -82,8 +82,8 @@ int board_app_initialize(uintptr_t arg) { -#ifdef CONFIG_BOARD_INITIALIZE - /* Board initialization already performed by board_initialize() */ +#ifdef CONFIG_BOARD_LATE_INITIALIZE + /* Board initialization already performed by board_late_initialize() */ return OK; #else diff --git a/configs/stm32f3discovery/src/stm32_boot.c b/configs/stm32f3discovery/src/stm32_boot.c index cef461f980..bd0398ff4d 100644 --- a/configs/stm32f3discovery/src/stm32_boot.c +++ b/configs/stm32f3discovery/src/stm32_boot.c @@ -95,20 +95,20 @@ void stm32_boardinitialize(void) /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_initialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform board-specific initialization */ diff --git a/configs/stm32f3discovery/src/stm32_bringup.c b/configs/stm32f3discovery/src/stm32_bringup.c index 7686f7dfc0..d22531d044 100644 --- a/configs/stm32f3discovery/src/stm32_bringup.c +++ b/configs/stm32f3discovery/src/stm32_bringup.c @@ -94,10 +94,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ****************************************************************************/ diff --git a/configs/stm32f3discovery/src/stm32f3discovery.h b/configs/stm32f3discovery/src/stm32f3discovery.h index a2e58a7214..ebe3bd3f97 100644 --- a/configs/stm32f3discovery/src/stm32f3discovery.h +++ b/configs/stm32f3discovery/src/stm32f3discovery.h @@ -148,10 +148,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ****************************************************************************************************/ diff --git a/configs/stm32f411e-disco/src/stm32_appinit.c b/configs/stm32f411e-disco/src/stm32_appinit.c index 1656bb6a9b..f7fafaa968 100644 --- a/configs/stm32f411e-disco/src/stm32_appinit.c +++ b/configs/stm32f411e-disco/src/stm32_appinit.c @@ -84,7 +84,7 @@ int board_app_initialize(uintptr_t arg) { -#ifndef CONFIG_BOARD_INITIALIZE +#ifndef CONFIG_BOARD_LATE_INITIALIZE /* Perform board-specific initialization */ return stm32_bringup(); diff --git a/configs/stm32f411e-disco/src/stm32_boot.c b/configs/stm32f411e-disco/src/stm32_boot.c index 208f9b9a75..ec5bae002b 100644 --- a/configs/stm32f411e-disco/src/stm32_boot.c +++ b/configs/stm32f411e-disco/src/stm32_boot.c @@ -91,20 +91,20 @@ void stm32_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_intiialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform board-specific initialization */ diff --git a/configs/stm32f411e-disco/src/stm32_bringup.c b/configs/stm32f411e-disco/src/stm32_bringup.c index 22c0ef501d..4d6b93ca0b 100644 --- a/configs/stm32f411e-disco/src/stm32_bringup.c +++ b/configs/stm32f411e-disco/src/stm32_bringup.c @@ -60,10 +60,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ****************************************************************************/ diff --git a/configs/stm32f411e-disco/src/stm32f411e-disco.h b/configs/stm32f411e-disco/src/stm32f411e-disco.h index 1d78f4c6b3..56306dfb59 100644 --- a/configs/stm32f411e-disco/src/stm32f411e-disco.h +++ b/configs/stm32f411e-disco/src/stm32f411e-disco.h @@ -177,10 +177,10 @@ int stm32_usbhost_initialize(void); * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ****************************************************************************/ diff --git a/configs/stm32f429i-disco/lcd/defconfig b/configs/stm32f429i-disco/lcd/defconfig index 0381c553c3..6b1477a2ea 100644 --- a/configs/stm32f429i-disco/lcd/defconfig +++ b/configs/stm32f429i-disco/lcd/defconfig @@ -10,7 +10,7 @@ CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F429Z=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_DEBUG_CUSTOMOPT=y diff --git a/configs/stm32f429i-disco/src/stm32_appinit.c b/configs/stm32f429i-disco/src/stm32_appinit.c index d70edff0ff..7705084857 100644 --- a/configs/stm32f429i-disco/src/stm32_appinit.c +++ b/configs/stm32f429i-disco/src/stm32_appinit.c @@ -78,8 +78,8 @@ int board_app_initialize(uintptr_t arg) { -#ifdef CONFIG_BOARD_INITIALIZE - /* Board initialization already performed by board_initialize() */ +#ifdef CONFIG_BOARD_LATE_INITIALIZE + /* Board initialization already performed by board_late_initialize() */ return OK; #else diff --git a/configs/stm32f429i-disco/src/stm32_boot.c b/configs/stm32f429i-disco/src/stm32_boot.c index d76f3122fa..72e67fc825 100644 --- a/configs/stm32f429i-disco/src/stm32_boot.c +++ b/configs/stm32f429i-disco/src/stm32_boot.c @@ -108,20 +108,20 @@ void stm32_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_intiialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform board-specific initialization */ diff --git a/configs/stm32f429i-disco/src/stm32_bringup.c b/configs/stm32f429i-disco/src/stm32_bringup.c index 9e84f471b4..af9924dd99 100644 --- a/configs/stm32f429i-disco/src/stm32_bringup.c +++ b/configs/stm32f429i-disco/src/stm32_bringup.c @@ -91,10 +91,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ****************************************************************************/ diff --git a/configs/stm32f429i-disco/src/stm32f429i-disco.h b/configs/stm32f429i-disco/src/stm32f429i-disco.h index d7f2e95297..61e486df4a 100644 --- a/configs/stm32f429i-disco/src/stm32f429i-disco.h +++ b/configs/stm32f429i-disco/src/stm32f429i-disco.h @@ -205,10 +205,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ****************************************************************************/ diff --git a/configs/stm32f4discovery/README.txt b/configs/stm32f4discovery/README.txt index 32dd2b939e..9cea269391 100644 --- a/configs/stm32f4discovery/README.txt +++ b/configs/stm32f4discovery/README.txt @@ -233,7 +233,7 @@ Nintendo Wii Nunchuck: - Enable to Custom board/driver initialization at RTOS Features -> RTOS hooks - CONFIG_BOARD_INITIALIZE=y + CONFIG_BOARD_LATE_INITIALIZE=y - Enable the I2C Driver Support at Device Drivers, it will enable this symbol: @@ -263,7 +263,7 @@ Quadrature Encoder: - These setting enable support for the common QEncode upper half driver: - CONFIG_BOARD_INITIALIZE=y + CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_SENSORS=y CONFIG_SENSORS_QENCODER=y diff --git a/configs/stm32f4discovery/audio/defconfig b/configs/stm32f4discovery/audio/defconfig index d9ac6caa35..69dc44e255 100644 --- a/configs/stm32f4discovery/audio/defconfig +++ b/configs/stm32f4discovery/audio/defconfig @@ -13,7 +13,7 @@ CONFIG_AUDIO=y CONFIG_AUDIO_CS43L22=y CONFIG_AUDIO_CUSTOM_DEV_PATH=y CONFIG_AUDIO_EXCLUDE_TONE=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_DISABLE_POLL=y diff --git a/configs/stm32f4discovery/elf/defconfig b/configs/stm32f4discovery/elf/defconfig index f212f89524..aaf5b629fc 100644 --- a/configs/stm32f4discovery/elf/defconfig +++ b/configs/stm32f4discovery/elf/defconfig @@ -7,7 +7,7 @@ CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARMV7M_USEBASEPRI=y CONFIG_BINFMT_CONSTRUCTORS=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_DEV_LOWCONSOLE=y CONFIG_ELF=y diff --git a/configs/stm32f4discovery/kostest/defconfig b/configs/stm32f4discovery/kostest/defconfig index 26b3593a97..dbd1c08d3c 100644 --- a/configs/stm32f4discovery/kostest/defconfig +++ b/configs/stm32f4discovery/kostest/defconfig @@ -6,7 +6,7 @@ CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARM_MPU=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILD_PROTECTED=y CONFIG_DEV_LOWCONSOLE=y diff --git a/configs/stm32f4discovery/max31855/defconfig b/configs/stm32f4discovery/max31855/defconfig index efbe6087a7..fb5d7239ff 100644 --- a/configs/stm32f4discovery/max31855/defconfig +++ b/configs/stm32f4discovery/max31855/defconfig @@ -10,7 +10,7 @@ CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_DISABLE_POLL=y diff --git a/configs/stm32f4discovery/nsh/defconfig b/configs/stm32f4discovery/nsh/defconfig index bcfac5b99c..fbc38bdda6 100644 --- a/configs/stm32f4discovery/nsh/defconfig +++ b/configs/stm32f4discovery/nsh/defconfig @@ -10,7 +10,7 @@ CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_DISABLE_POLL=y diff --git a/configs/stm32f4discovery/rgbled/defconfig b/configs/stm32f4discovery/rgbled/defconfig index 0163ff32af..593b7d9e33 100644 --- a/configs/stm32f4discovery/rgbled/defconfig +++ b/configs/stm32f4discovery/rgbled/defconfig @@ -9,7 +9,7 @@ CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_DISABLE_POLL=y diff --git a/configs/stm32f4discovery/src/stm32_appinit.c b/configs/stm32f4discovery/src/stm32_appinit.c index 996122e9d6..c0c0924a83 100644 --- a/configs/stm32f4discovery/src/stm32_appinit.c +++ b/configs/stm32f4discovery/src/stm32_appinit.c @@ -82,8 +82,8 @@ int board_app_initialize(uintptr_t arg) { -#ifdef CONFIG_BOARD_INITIALIZE - /* Board initialization already performed by board_initialize() */ +#ifdef CONFIG_BOARD_LATE_INITIALIZE + /* Board initialization already performed by board_late_initialize() */ return OK; #else diff --git a/configs/stm32f4discovery/src/stm32_boot.c b/configs/stm32f4discovery/src/stm32_boot.c index 021797ca54..2377d378b0 100644 --- a/configs/stm32f4discovery/src/stm32_boot.c +++ b/configs/stm32f4discovery/src/stm32_boot.c @@ -117,20 +117,20 @@ void stm32_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_initialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform board-specific initialization */ diff --git a/configs/stm32f4discovery/src/stm32_bringup.c b/configs/stm32f4discovery/src/stm32_bringup.c index e107a04be7..90f482f453 100644 --- a/configs/stm32f4discovery/src/stm32_bringup.c +++ b/configs/stm32f4discovery/src/stm32_bringup.c @@ -143,10 +143,10 @@ static void stm32_i2ctool(void) * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ****************************************************************************/ diff --git a/configs/stm32f4discovery/src/stm32f4discovery.h b/configs/stm32f4discovery/src/stm32f4discovery.h index 3b3cf1ece8..2d6be6268a 100644 --- a/configs/stm32f4discovery/src/stm32f4discovery.h +++ b/configs/stm32f4discovery/src/stm32f4discovery.h @@ -403,10 +403,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ****************************************************************************/ diff --git a/configs/stm32f4discovery/xen1210/defconfig b/configs/stm32f4discovery/xen1210/defconfig index a6b05c7dc3..445ad01e98 100644 --- a/configs/stm32f4discovery/xen1210/defconfig +++ b/configs/stm32f4discovery/xen1210/defconfig @@ -9,7 +9,7 @@ CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_DISABLE_POLL=y diff --git a/configs/stm32f746-ws/src/stm32_boot.c b/configs/stm32f746-ws/src/stm32_boot.c index 3b28211005..63ab004f9c 100644 --- a/configs/stm32f746-ws/src/stm32_boot.c +++ b/configs/stm32f746-ws/src/stm32_boot.c @@ -78,20 +78,20 @@ void stm32_boardinitialize(void) } /************************************************************************************ - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional initialization call + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional initialization call * will be performed in the boot-up sequence to a function called - * board_initialize(). board_initialize() will be called immediately after + * board_late_initialize(). board_late_initialize() will be called immediately after * up_initialize() is called and just before the initial application is started. * This additional initialization phase may be used, for example, to initialize * board-specific device drivers. * ************************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { #if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL) /* Perform NSH initialization here instead of from the NSH. This diff --git a/configs/stm32f746g-disco/fb/defconfig b/configs/stm32f746g-disco/fb/defconfig index 4bb549b69a..b3ed798225 100644 --- a/configs/stm32f746g-disco/fb/defconfig +++ b/configs/stm32f746g-disco/fb/defconfig @@ -15,7 +15,7 @@ CONFIG_ARMV7M_DCACHE_WRITETHROUGH=y CONFIG_ARMV7M_DTCM=y CONFIG_ARMV7M_ICACHE=y CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=43103 CONFIG_BUILTIN=y CONFIG_DEBUG_FULLOPT=y diff --git a/configs/stm32f746g-disco/lvgl/defconfig b/configs/stm32f746g-disco/lvgl/defconfig index 36e2a26400..81be30f53a 100644 --- a/configs/stm32f746g-disco/lvgl/defconfig +++ b/configs/stm32f746g-disco/lvgl/defconfig @@ -14,7 +14,7 @@ CONFIG_ARMV7M_DCACHE=y CONFIG_ARMV7M_DCACHE_WRITETHROUGH=y CONFIG_ARMV7M_DTCM=y CONFIG_ARMV7M_ICACHE=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=43103 CONFIG_BUILTIN=y CONFIG_DEBUG_FULLOPT=y diff --git a/configs/stm32f746g-disco/nxdemo/defconfig b/configs/stm32f746g-disco/nxdemo/defconfig index 662cb425a7..ef0d915b96 100644 --- a/configs/stm32f746g-disco/nxdemo/defconfig +++ b/configs/stm32f746g-disco/nxdemo/defconfig @@ -15,7 +15,7 @@ CONFIG_ARMV7M_DCACHE=y CONFIG_ARMV7M_DCACHE_WRITETHROUGH=y CONFIG_ARMV7M_DTCM=y CONFIG_ARMV7M_ICACHE=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=43103 CONFIG_BUILTIN=y CONFIG_DEBUG_FULLOPT=y diff --git a/configs/stm32f746g-disco/nxterm/defconfig b/configs/stm32f746g-disco/nxterm/defconfig index 93d5ff4be0..a64778e0f2 100644 --- a/configs/stm32f746g-disco/nxterm/defconfig +++ b/configs/stm32f746g-disco/nxterm/defconfig @@ -16,7 +16,7 @@ CONFIG_ARMV7M_DCACHE=y CONFIG_ARMV7M_DCACHE_WRITETHROUGH=y CONFIG_ARMV7M_DTCM=y CONFIG_ARMV7M_ICACHE=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=43103 CONFIG_BUILTIN=y CONFIG_DEBUG_FULLOPT=y diff --git a/configs/stm32f746g-disco/src/stm32_appinitialize.c b/configs/stm32f746g-disco/src/stm32_appinitialize.c index 9d9f145b28..2586b7b796 100644 --- a/configs/stm32f746g-disco/src/stm32_appinitialize.c +++ b/configs/stm32f746g-disco/src/stm32_appinitialize.c @@ -75,7 +75,7 @@ int board_app_initialize(uintptr_t arg) { -#ifndef CONFIG_BOARD_INITIALIZE +#ifndef CONFIG_BOARD_LATE_INITIALIZE /* Perform board-specific initialization */ return stm32_bringup(); diff --git a/configs/stm32f746g-disco/src/stm32_boot.c b/configs/stm32f746g-disco/src/stm32_boot.c index efa12d3bda..ecb7461aec 100644 --- a/configs/stm32f746g-disco/src/stm32_boot.c +++ b/configs/stm32f746g-disco/src/stm32_boot.c @@ -96,20 +96,20 @@ void stm32_boardinitialize(void) } /************************************************************************************ - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional initialization call + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional initialization call * will be performed in the boot-up sequence to a function called - * board_initialize(). board_initialize() will be called immediately after + * board_late_initialize(). board_late_initialize() will be called immediately after * up_initialize() is called and just before the initial application is started. * This additional initialization phase may be used, for example, to initialize * board-specific device drivers. * ************************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform board-specific initialization */ diff --git a/configs/stm32f746g-disco/src/stm32_bringup.c b/configs/stm32f746g-disco/src/stm32_bringup.c index 6fdaa5619e..265b0de2d5 100644 --- a/configs/stm32f746g-disco/src/stm32_bringup.c +++ b/configs/stm32f746g-disco/src/stm32_bringup.c @@ -64,10 +64,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ****************************************************************************/ diff --git a/configs/stm32f746g-disco/src/stm32f746g-disco.h b/configs/stm32f746g-disco/src/stm32f746g-disco.h index 5662911cb5..3482700b5a 100644 --- a/configs/stm32f746g-disco/src/stm32f746g-disco.h +++ b/configs/stm32f746g-disco/src/stm32f746g-disco.h @@ -115,10 +115,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ****************************************************************************************************/ diff --git a/configs/stm32f769i-disco/src/stm32_boot.c b/configs/stm32f769i-disco/src/stm32_boot.c index d0f9519213..ca93c8dc12 100644 --- a/configs/stm32f769i-disco/src/stm32_boot.c +++ b/configs/stm32f769i-disco/src/stm32_boot.c @@ -100,20 +100,20 @@ void stm32_boardinitialize(void) } /************************************************************************************ - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional initialization call + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional initialization call * will be performed in the boot-up sequence to a function called - * board_initialize(). board_initialize() will be called immediately after + * board_late_initialize(). board_late_initialize() will be called immediately after * up_initialize() is called and just before the initial application is started. * This additional initialization phase may be used, for example, to initialize * board-specific device drivers. * ************************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { #if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL) /* Perform NSH initialization here instead of from the NSH. This diff --git a/configs/stm32l476-mdk/src/stm32_appinit.c b/configs/stm32l476-mdk/src/stm32_appinit.c index b03dbe964f..e899f4f3ae 100644 --- a/configs/stm32l476-mdk/src/stm32_appinit.c +++ b/configs/stm32l476-mdk/src/stm32_appinit.c @@ -76,8 +76,8 @@ int board_app_initialize(uintptr_t arg) { -#ifdef CONFIG_BOARD_INITIALIZE - /* Board initialization already performed by board_initialize() */ +#ifdef CONFIG_BOARD_LATE_INITIALIZE + /* Board initialization already performed by board_late_initialize() */ return OK; #else diff --git a/configs/stm32l476-mdk/src/stm32_boot.c b/configs/stm32l476-mdk/src/stm32_boot.c index 271fa28cb4..e70cf26ce9 100644 --- a/configs/stm32l476-mdk/src/stm32_boot.c +++ b/configs/stm32l476-mdk/src/stm32_boot.c @@ -83,20 +83,20 @@ void stm32l4_board_initialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_intiialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform board-specific initialization */ diff --git a/configs/stm32l476-mdk/src/stm32l476-mdk.h b/configs/stm32l476-mdk/src/stm32l476-mdk.h index e2fd1f1cee..c4101078f9 100644 --- a/configs/stm32l476-mdk/src/stm32l476-mdk.h +++ b/configs/stm32l476-mdk/src/stm32l476-mdk.h @@ -150,10 +150,10 @@ extern struct spi_dev_s *g_spi2; * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ****************************************************************************/ diff --git a/configs/stm32l476vg-disco/src/stm32_boot.c b/configs/stm32l476vg-disco/src/stm32_boot.c index 56723d783d..e9a5f99258 100644 --- a/configs/stm32l476vg-disco/src/stm32_boot.c +++ b/configs/stm32l476vg-disco/src/stm32_boot.c @@ -92,20 +92,20 @@ void stm32l4_board_initialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_intiialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform NSH initialization here instead of from the NSH. This * alternative NSH initialization is necessary when NSH is ran in user-space diff --git a/configs/stm32l4r9ai-disco/src/stm32_boot.c b/configs/stm32l4r9ai-disco/src/stm32_boot.c index 7eff8eea13..4a573add40 100644 --- a/configs/stm32l4r9ai-disco/src/stm32_boot.c +++ b/configs/stm32l4r9ai-disco/src/stm32_boot.c @@ -88,20 +88,20 @@ void stm32l4_board_initialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_intiialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform NSH initialization here instead of from the NSH. This * alternative NSH initialization is necessary when NSH is ran in user-space diff --git a/configs/teensy-3.x/src/k20_boot.c b/configs/teensy-3.x/src/k20_boot.c index e6447871e6..a7dcda3ece 100644 --- a/configs/teensy-3.x/src/k20_boot.c +++ b/configs/teensy-3.x/src/k20_boot.c @@ -81,8 +81,8 @@ void kinetis_boardinitialize(void) #endif } -#if defined(CONFIG_BOARD_INITIALIZE) -void board_initialize(void) +#if defined(CONFIG_BOARD_LATE_INITIALIZE) +void board_late_initialize(void) { #if defined(CONFIG_KINETIS_I2C0) || defined(CONFIG_KINETIS_I2C1) kinetis_i2cdev_initialize(); diff --git a/configs/teensy-lc/src/kl_boardinitialize.c b/configs/teensy-lc/src/kl_boardinitialize.c index 576e941ee2..b4c23d6383 100644 --- a/configs/teensy-lc/src/kl_boardinitialize.c +++ b/configs/teensy-lc/src/kl_boardinitialize.c @@ -115,20 +115,20 @@ void kl_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_intitialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform NSH initialization here instead of from the NSH. This * alternative NSH initialization is necessary when NSH is ran in user-space diff --git a/configs/tm4c123g-launchpad/src/tm4c_appinit.c b/configs/tm4c123g-launchpad/src/tm4c_appinit.c index 433528659d..43909835ed 100644 --- a/configs/tm4c123g-launchpad/src/tm4c_appinit.c +++ b/configs/tm4c123g-launchpad/src/tm4c_appinit.c @@ -74,11 +74,11 @@ int board_app_initialize(uintptr_t arg) { - /* If CONFIG_BOARD_INITIALIZE is selected then board initialization was - * already performed in board_initialize. + /* If CONFIG_BOARD_LATE_INITIALIZE is selected then board initialization was + * already performed in board_late_initialize. */ -#ifndef CONFIG_BOARD_INITIALIZE +#ifndef CONFIG_BOARD_LATE_INITIALIZE return tm4c_bringup(); #else return OK; diff --git a/configs/tm4c123g-launchpad/src/tm4c_boot.c b/configs/tm4c123g-launchpad/src/tm4c_boot.c index 7dc1d38f77..7b15170a15 100644 --- a/configs/tm4c123g-launchpad/src/tm4c_boot.c +++ b/configs/tm4c123g-launchpad/src/tm4c_boot.c @@ -93,23 +93,23 @@ void tiva_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_intiialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform board initialization */ (void)tm4c_bringup(); } -#endif /* CONFIG_BOARD_INITIALIZE */ +#endif /* CONFIG_BOARD_LATE_INITIALIZE */ diff --git a/configs/tm4c1294-launchpad/src/tm4c_appinit.c b/configs/tm4c1294-launchpad/src/tm4c_appinit.c index f866e5e6a9..11c0dd8f44 100644 --- a/configs/tm4c1294-launchpad/src/tm4c_appinit.c +++ b/configs/tm4c1294-launchpad/src/tm4c_appinit.c @@ -76,11 +76,11 @@ int board_app_initialize(uintptr_t arg) { - /* If CONFIG_BOARD_INITIALIZE is selected then board initialization was - * already performed in board_initialize. + /* If CONFIG_BOARD_LATE_INITIALIZE is selected then board initialization was + * already performed in board_late_initialize. */ -#ifndef CONFIG_BOARD_INITIALIZE +#ifndef CONFIG_BOARD_LATE_INITIALIZE return tm4c_bringup(); #else return OK; diff --git a/configs/tm4c1294-launchpad/src/tm4c_boot.c b/configs/tm4c1294-launchpad/src/tm4c_boot.c index c2d00fb468..34f7d0e42e 100644 --- a/configs/tm4c1294-launchpad/src/tm4c_boot.c +++ b/configs/tm4c1294-launchpad/src/tm4c_boot.c @@ -93,23 +93,23 @@ void tiva_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_intiialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform board initialization */ (void)tm4c_bringup(); } -#endif /* CONFIG_BOARD_INITIALIZE */ +#endif /* CONFIG_BOARD_LATE_INITIALIZE */ diff --git a/configs/tms570ls31x-usb-kit/src/tms570_appinit.c b/configs/tms570ls31x-usb-kit/src/tms570_appinit.c index 8cc3d08ef8..aef95967a6 100644 --- a/configs/tms570ls31x-usb-kit/src/tms570_appinit.c +++ b/configs/tms570ls31x-usb-kit/src/tms570_appinit.c @@ -72,9 +72,9 @@ #ifdef CONFIG_LIB_BOARDCTL int board_app_initialize(uintptr_t arg) { -#ifndef CONFIG_BOARD_INITIALIZE +#ifndef CONFIG_BOARD_LATE_INITIALIZE /* Perform application level board initialization (if that was not already - * done in board_initialize(). + * done in board_late_initialize(). */ tms570_bringup(); diff --git a/configs/tms570ls31x-usb-kit/src/tms570_initialize.c b/configs/tms570ls31x-usb-kit/src/tms570_initialize.c index 7866ae1166..642fa007f8 100644 --- a/configs/tms570ls31x-usb-kit/src/tms570_initialize.c +++ b/configs/tms570ls31x-usb-kit/src/tms570_initialize.c @@ -106,20 +106,20 @@ void tms570_board_initialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_initialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform application level board initialization */ diff --git a/configs/twr-k64f120m/src/twrk64.h b/configs/twr-k64f120m/src/twrk64.h index 3f0ceb7733..8b98301a4b 100644 --- a/configs/twr-k64f120m/src/twrk64.h +++ b/configs/twr-k64f120m/src/twrk64.h @@ -284,7 +284,7 @@ void weak_function k64_usbinitialize(void); * ************************************************************************************/ -#if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_INITIALIZE) +#if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE) int k64_bringup(void); #endif diff --git a/configs/u-blox-c027/nsh/defconfig b/configs/u-blox-c027/nsh/defconfig index e091d23c31..f80a55a54a 100644 --- a/configs/u-blox-c027/nsh/defconfig +++ b/configs/u-blox-c027/nsh/defconfig @@ -6,7 +6,7 @@ CONFIG_ARCH_BOARD_U_BLOX_C027=y CONFIG_ARCH_CHIP_LPC1768=y CONFIG_ARCH_CHIP_LPC17XX=y CONFIG_ARCH_STACKDUMP=y -CONFIG_BOARD_INITIALIZE=y +CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=8079 CONFIG_BUILTIN=y CONFIG_CLOCK_MONOTONIC=y diff --git a/configs/u-blox-c027/src/lpc17_boot.c b/configs/u-blox-c027/src/lpc17_boot.c index f0c61633e2..4f20c35678 100644 --- a/configs/u-blox-c027/src/lpc17_boot.c +++ b/configs/u-blox-c027/src/lpc17_boot.c @@ -86,20 +86,20 @@ void lpc17_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_initialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { lpc17_ubxmdm_init(false); @@ -114,4 +114,4 @@ void board_initialize(void) lpc17_configgpio(C027_MDMUSBDET | GPIO_VALUE_ZERO); /* USB sense off */ #endif } -#endif /* CONFIG_BOARD_INITIALIZE */ +#endif /* CONFIG_BOARD_LATE_INITIALIZE */ diff --git a/configs/viewtool-stm32f107/src/stm32_appinit.c b/configs/viewtool-stm32f107/src/stm32_appinit.c index 48b3b81fbb..8d2d086855 100644 --- a/configs/viewtool-stm32f107/src/stm32_appinit.c +++ b/configs/viewtool-stm32f107/src/stm32_appinit.c @@ -82,8 +82,8 @@ int board_app_initialize(uintptr_t arg) { -#ifdef CONFIG_BOARD_INITIALIZE - /* Board initialization already performed by board_initialize() */ +#ifdef CONFIG_BOARD_LATE_INITIALIZE + /* Board initialization already performed by board_late_initialize() */ return OK; #else diff --git a/configs/viewtool-stm32f107/src/stm32_boot.c b/configs/viewtool-stm32f107/src/stm32_boot.c index bfd0382b42..6c35d460f9 100644 --- a/configs/viewtool-stm32f107/src/stm32_boot.c +++ b/configs/viewtool-stm32f107/src/stm32_boot.c @@ -89,20 +89,20 @@ void stm32_boardinitialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_initialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform board-specific initialization */ diff --git a/configs/viewtool-stm32f107/src/stm32_bringup.c b/configs/viewtool-stm32f107/src/stm32_bringup.c index 928601b9b1..92a83267a9 100644 --- a/configs/viewtool-stm32f107/src/stm32_bringup.c +++ b/configs/viewtool-stm32f107/src/stm32_bringup.c @@ -126,10 +126,10 @@ static int rtc_driver_initialize(void) * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ****************************************************************************/ diff --git a/configs/viewtool-stm32f107/src/viewtool_stm32f107.h b/configs/viewtool-stm32f107/src/viewtool_stm32f107.h index 42ddbe0c6c..b698f2161f 100644 --- a/configs/viewtool-stm32f107/src/viewtool_stm32f107.h +++ b/configs/viewtool-stm32f107/src/viewtool_stm32f107.h @@ -366,10 +366,10 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). + * CONFIG_BOARD_LATE_INITIALIZE=y : + * Called from board_late_initialize(). * - * CONFIG_BOARD_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : * Called from the NSH library * ****************************************************************************/ diff --git a/configs/xmc4500-relax/src/xmc4_appinit.c b/configs/xmc4500-relax/src/xmc4_appinit.c index ff79ddfc73..08061b99e8 100644 --- a/configs/xmc4500-relax/src/xmc4_appinit.c +++ b/configs/xmc4500-relax/src/xmc4_appinit.c @@ -76,11 +76,11 @@ int board_app_initialize(uintptr_t arg) { -#ifndef CONFIG_BOARD_INITIALIZE +#ifndef CONFIG_BOARD_LATE_INITIALIZE /* Perform board initialization */ return xmc4_bringup(); #else return OK; -#endif /* CONFIG_BOARD_INITIALIZE */ +#endif /* CONFIG_BOARD_LATE_INITIALIZE */ } diff --git a/configs/xmc4500-relax/src/xmc4_boot.c b/configs/xmc4500-relax/src/xmc4_boot.c index 5dccd23d4c..b4a4c895d9 100644 --- a/configs/xmc4500-relax/src/xmc4_boot.c +++ b/configs/xmc4500-relax/src/xmc4_boot.c @@ -72,24 +72,24 @@ void xmc4_board_initialize(void) } /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be + * function called board_late_initialize(). board_late_initialize() will be * called immediately after up_intitialize() is called and just before the * initial application is started. This additional initialization phase * may be used, for example, to initialize board-specific device drivers. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) { /* Perform board initialization */ (void)xmc4_bringup(); } -#endif /* CONFIG_BOARD_INITIALIZE */ +#endif /* CONFIG_BOARD_LATE_INITIALIZE */ diff --git a/include/nuttx/board.h b/include/nuttx/board.h index 581153492c..ebcc6af644 100644 --- a/include/nuttx/board.h +++ b/include/nuttx/board.h @@ -120,20 +120,53 @@ ****************************************************************************/ /**************************************************************************** - * Name: board_initialize + * Name: board_late_initialize * * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional + * If CONFIG_BOARD_DRIVER_INITIALIZE is selected, then an additional * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be - * called immediately after up_initialize() is called and just before the - * initial application is started. This additional initialization phase - * may be used, for example, to initialize board-specific device drivers. + * function called board_driver_initialize(). board_driver_initialize() + * will be called immediately after up_initialize() and well before + * board_driver_initialize() is called and the initial application is + * started. The context in which board_driver_initialize() executes is + * suitable for early initialization of most, simple device drivers and + * is a logical, board-specific extension of up_initialize(). + * + * board_driver_initialize() runs on the startup, initialization thread. + * Some initialization operations cannot be performed on the start-up, + * initialization thread. That is because the initialization thread + * cannot wait for event. Waiting may be required, for example, to + * mount a file system or or initialize a device such as an SD card. + * For this reason, such driver initialize must be deferred to + * board_late_initialize(). + + ****************************************************************************/ + +#ifdef CONFIG_BOARD_DRIVER_INITIALIZE +void board_driver_initialize(void); +#endif + +/**************************************************************************** + * Name: board_late_initialize + * + * Description: + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional + * initialization call will be performed in the boot-up sequence to a + * function called board_late_initialize(). board_late_initialize() will + * be called after up_initialize() and board_driver_initialize() and just + * before the initial application is started. This additional + * initialization phase may be used, for example, to initialize board- + * specific device drivers for which board_driver_initialize() is not + * suitable. + * + * Waiting for events, use of I2C, SPI, etc are permissable in the context + * of board_late_initialize(). That is because board_late_initialize() + * will run on a temporary, internal kernel thread. * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void); +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void); #endif /**************************************************************************** diff --git a/libs/libc/zoneinfo/README.txt b/libs/libc/zoneinfo/README.txt index 406d1cce58..365f6485d3 100644 --- a/libs/libc/zoneinfo/README.txt +++ b/libs/libc/zoneinfo/README.txt @@ -47,7 +47,7 @@ Example Configuration I have tested this using the sim/nsh configuration. Here are the modifications to the configuration that I used for testing: - CONFIG_BOARD_INITIALIZE=y + CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_LIBC_LOCALTIME=y CONFIG_LIBC_TZDIR="/share/zoneinfo" diff --git a/net/usrsock/usrsock_dev.c b/net/usrsock/usrsock_dev.c index 14bc239a54..96ccb176a3 100644 --- a/net/usrsock/usrsock_dev.c +++ b/net/usrsock/usrsock_dev.c @@ -1069,7 +1069,7 @@ static int usrsockdev_close(FAR struct file *filep) } /**************************************************************************** - * Name: pipecommon_poll + * Name: usrsockdev_poll ****************************************************************************/ #ifndef CONFIG_DISABLE_POLL diff --git a/sched/Kconfig b/sched/Kconfig index 16f1462aba..0aa7466449 100644 --- a/sched/Kconfig +++ b/sched/Kconfig @@ -1147,14 +1147,14 @@ endif # PRIORITY_INHERITANCE menu "RTOS hooks" -config BOARD_INITIALIZE - bool "Custom board/driver initialization" +config BOARD_DRIVER_INITIALIZE + bool "Custom board driver initialization" default n ---help--- By default, there are three points in time where you can insert custom initialization logic: - 1) _boardinitialize(): This function is used only for + 1) _board_initialize(): This function is used only for initialization of very low-level things like configuration of GPIO pins, power setting. The OS has not been initialized at this point, so you cannot allocate memory or initialize @@ -1165,24 +1165,85 @@ config BOARD_INITIALIZE The OS has been initialized at this point and it is okay to initialize drivers in this phase. - 3) And, finally, when the user application code starts. - - If BOARD_INITIALIZE is selected, then an additional initialization - call will be performed in the boot-up sequence to a function - called board_initialize(). board_initialize() will be - call between phases 2) and 3) above, immediately after - up_initialize() is called. This additional initialization - phase may be used, for example, to initialize board-specific - device drivers. + At this same point in time, the OS will also call a board- + specific initialization function named board_driver_initialize() + if CONFIG_BOARD_DRIVER_INITIALIZE is selectd. The context in + which board_driver_initialize() executes is suitable for early + initialization of most, simple device drivers and is a logical, + board-specific extension of up_initialize(). + board_driver_initialize() runs on the startup, initialization thread. Some initialization operations cannot be performed on the start-up, initialization thread. That is because the initialization thread cannot wait for event. Waiting may be required, for example, to mount a file system or or initialize a device such as an SD card. - For this reason, board initialize will run on a temporary, internal - kernel thread. + For this reason, such driver initialize must be deferred to + board_late_initialize(). -if BOARD_INITIALIZE + 3) And, finally, just before the user application code starts. + + If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional + initialization call will be performed in the boot-up sequence to a + function called board_late_initialize(). board_late_initialize() + will be called after up_initialize() is called and just before the + main application is started. This additional initialization + phase may be used, for example, to initialize more complex, + board-specific device drivers. + + Waiting for events, use of I2C, SPI, etc are permissable in the + context of board_late_initialize(). That is because + board_late_initialize() will run on a temporary, internal kernel + thread. + +config BOARD_LATE_INITIALIZE + bool "Custom board late initialization" + default n + ---help--- + By default, there are three points in time where you can insert + custom initialization logic: + + 1) _board_initialize(): This function is used only for + initialization of very low-level things like configuration of + GPIO pins, power setting. The OS has not been initialized + at this point, so you cannot allocate memory or initialize + device drivers at this phase. + + 2) The next level of initialization is performed by a call to + up_initialize() (in arch//src/common/up_initialize.c). + The OS has been initialized at this point and it is okay to + initialize drivers in this phase. + + At this same point in time, the OS will also call a board- + specific initialization function named board_driver_initialize() + if CONFIG_BOARD_DRIVER_INITIALIZE is selectd. The context in + which board_driver_initialize() executes is suitable for early + initialization of most, simple device drivers and is a logical, + board-specific extension of up_initialize(). + + board_driver_initialize() runs on the startup, initialization thread. + Some initialization operations cannot be performed on the start-up, + initialization thread. That is because the initialization thread + cannot wait for event. Waiting may be required, for example, to + mount a file system or or initialize a device such as an SD card. + For this reason, such driver initialize must be deferred to + board_late_initialize(). + + 3) And, finally, just before the user application code starts. + + If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional + initialization call will be performed in the boot-up sequence to a + function called board_late_initialize(). board_late_initialize() + will be called after up_initialize() is called and just before the + main application is started. This additional initialization + phase may be used, for example, to initialize more complex, + board-specific device drivers. + + Waiting for events, use of I2C, SPI, etc are permissable in the + context of board_late_initialize(). That is because + board_late_initialize() will run on a temporary, internal kernel + thread. + +if BOARD_LATE_INITIALIZE config BOARD_INITTHREAD_STACKSIZE int "Board initialization thread stack size" @@ -1200,7 +1261,7 @@ config BOARD_INITTHREAD_PRIORITY started until the board initialization is completed. Hence, there is very little competition for the CPU. -endif # BOARD_INITIALIZE +endif # BOARD_LATE_INITIALIZE config SCHED_STARTHOOK bool "Enable startup hook" diff --git a/sched/init/nx_bringup.c b/sched/init/nx_bringup.c index 27d39c3729..bd9ba6f6b0 100644 --- a/sched/init/nx_bringup.c +++ b/sched/init/nx_bringup.c @@ -245,12 +245,12 @@ static inline void nx_start_application(void) { int pid; -#ifdef CONFIG_BOARD_INITIALIZE +#ifdef CONFIG_BOARD_LATE_INITIALIZE /* Perform any last-minute, board-specific initialization, if so * configured. */ - board_initialize(); + board_late_initialize(); #endif /* Start the application initialization task. In a flat build, this is @@ -281,12 +281,12 @@ static inline void nx_start_application(void) { int ret; -#ifdef CONFIG_BOARD_INITIALIZE +#ifdef CONFIG_BOARD_LATE_INITIALIZE /* Perform any last-minute, board-specific initialization, if so * configured. */ - board_initialize(); + board_late_initialize(); #endif #ifdef CONFIG_INIT_MOUNT @@ -301,7 +301,7 @@ static inline void nx_start_application(void) /* Start the application initialization program from a program in a * mounted file system. Presumably the file system was mounted as part - * of the board_initialize() operation. + * of the board_late_initialize() operation. */ sinfo("Starting init task: %s\n", CONFIG_USER_INITPATH); @@ -336,7 +336,7 @@ static inline void nx_start_application(void) * ****************************************************************************/ -#ifdef CONFIG_BOARD_INITIALIZE +#ifdef CONFIG_BOARD_LATE_INITIALIZE static int nx_start_task(int argc, FAR char **argv) { /* Do the board/application initialization and exit */ @@ -365,7 +365,7 @@ static int nx_start_task(int argc, FAR char **argv) static inline void nx_create_initthread(void) { -#ifdef CONFIG_BOARD_INITIALIZE +#ifdef CONFIG_BOARD_LATE_INITIALIZE int pid; /* Do the board/application initialization on a separate thread of @@ -412,7 +412,7 @@ static inline void nx_create_initthread(void) * file system where we can expect to find the * initialization program. Presumably, this file system * was mounted by board-specific logic when - * board_initialize() was called. + * board_late_initialize() was called. * * Input Parameters: * None diff --git a/sched/init/nx_start.c b/sched/init/nx_start.c index 97837a9fa7..c48135678c 100644 --- a/sched/init/nx_start.c +++ b/sched/init/nx_start.c @@ -718,6 +718,15 @@ void nx_start(void) up_initialize(); +#ifdef CONFIG_BOARD_DRIVER_INITIALIZE + /* Call the board-specific up_initialize() extension to support + * early initialization of board-specific drivers and resources + * that cannot wait until board_late_initialize. + */ + + board_driver_initialize(); +#endif + /* Hardware resources are available */ g_nx_initstate = OSINIT_HARDWARE;