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

Rename up_boot to arm_boot

Browse Source
This commit is contained in:
Gregory Nutt
2016-05-12 13:42:19 -06:00
parent ba4ae6fdc4
commit 99e695398c
28 changed files with 44 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/a1x/a1x_boot.c
+2 -2
View File
@@ -289,7 +289,7 @@ static void a1x_copyvectorblock(void)
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: up_boot * Name: arm_boot
* *
* Description: * Description:
* Complete boot operations started in arm_head.S * Complete boot operations started in arm_head.S
@@ -305,7 +305,7 @@ static void a1x_copyvectorblock(void)
* *
****************************************************************************/ ****************************************************************************/
void up_boot(void) void arm_boot(void)
{ {
#ifndef CONFIG_ARCH_ROMPGTABLE #ifndef CONFIG_ARCH_ROMPGTABLE
/* __start provided the basic MMU mappings for SRAM. Now provide mappings /* __start provided the basic MMU mappings for SRAM. Now provide mappings
arch/arm/src/arm/up_head.S
+1 -1
View File
@@ -609,7 +609,7 @@ __start:
/* Perform early C-level, platform-specific initialization */ /* Perform early C-level, platform-specific initialization */
bl up_boot bl arm_boot
#ifdef CONFIG_STACK_COLORATION #ifdef CONFIG_STACK_COLORATION
/* Write a known value to the IDLE thread stack to support stack /* Write a known value to the IDLE thread stack to support stack
arch/arm/src/arm/up_pginitialize.c
+1 -1
View File
@@ -88,7 +88,7 @@ void up_pginitialize(void)
{ {
/* None needed at present. This file is just retained in case the need /* None needed at present. This file is just retained in case the need
* arises in the future. Nothing calls up_pginitialize() now. If needed, * arises in the future. Nothing calls up_pginitialize() now. If needed,
* if should be called early in up_boot.c to assure that all paging is * if should be called early in arm_boot.c to assure that all paging is
* ready. * ready.
*/ */
} }
arch/arm/src/armv7-a/arm_head.S
+4 -4
View File
@@ -630,18 +630,18 @@ __start:
#ifndef CONFIG_BOOT_SDRAM_DATA #ifndef CONFIG_BOOT_SDRAM_DATA
/* Initialize .bss and .data ONLY if .bss and .data lie in SRAM that is /* Initialize .bss and .data ONLY if .bss and .data lie in SRAM that is
* ready to use. Other memory, such as SDRAM, must be initialized before * ready to use. Other memory, such as SDRAM, must be initialized before
* it can be used. up_boot() will perform that memory initialization and * it can be used. arm_boot() will perform that memory initialization and
* .bss and .data can be initialized after up_boot() returns. * .bss and .data can be initialized after arm_boot() returns.
*/ */
bl arm_data_initialize bl arm_data_initialize
#endif #endif
/* Perform early C-level, platform-specific initialization. Logic /* Perform early C-level, platform-specific initialization. Logic
* within up_boot() must configure SDRAM and call arm_ram_initailize. * within arm_boot() must configure SDRAM and call arm_ram_initailize.
*/ */
bl up_boot bl arm_boot
#ifdef CONFIG_STACK_COLORATION #ifdef CONFIG_STACK_COLORATION
/* Write a known value to the IDLE thread stack to support stack /* Write a known value to the IDLE thread stack to support stack
arch/arm/src/armv7-a/arm_pghead.S
+6 -6
View File
@@ -650,8 +650,8 @@ __start:
/* Initialize .bss and .data ONLY if .bss and .data lie in SRAM that is /* Initialize .bss and .data ONLY if .bss and .data lie in SRAM that is
* ready to use. Other memory, such as SDRAM, must be initialized before * ready to use. Other memory, such as SDRAM, must be initialized before
* it can be used. up_boot() will perform that memory initialization and * it can be used. arm_boot() will perform that memory initialization and
* .bss and .data can be initialized after up_boot() returns. * .bss and .data can be initialized after arm_boot() returns.
*/ */
/* Set up the stack pointer and clear the frame pointer */ /* Set up the stack pointer and clear the frame pointer */
@@ -662,18 +662,18 @@ __start:
#ifndef CONFIG_BOOT_SDRAM_DATA #ifndef CONFIG_BOOT_SDRAM_DATA
/* Initialize .bss and .data ONLY if .bss and .data lie in SRAM that is /* Initialize .bss and .data ONLY if .bss and .data lie in SRAM that is
* ready to use. Other memory, such as SDRAM, must be initialized before * ready to use. Other memory, such as SDRAM, must be initialized before
* it can be used. up_boot() will perform that memory initialization and * it can be used. arm_boot() will perform that memory initialization and
* .bss and .data can be initialized after up_boot() returns. * .bss and .data can be initialized after arm_boot() returns.
*/ */
bl arm_data_initialize bl arm_data_initialize
#endif #endif
/* Perform early C-level, platform-specific initialization. Logic /* Perform early C-level, platform-specific initialization. Logic
* within up_boot() must configure SDRAM and call arm_ram_initailize. * within arm_boot() must configure SDRAM and call arm_ram_initailize.
*/ */
bl up_boot bl arm_boot
#ifdef CONFIG_STACK_COLORATION #ifdef CONFIG_STACK_COLORATION
/* Write a known value to the IDLE thread stack to support stack /* Write a known value to the IDLE thread stack to support stack
arch/arm/src/armv7-a/arm_pginitialize.c
+1 -1
View File
@@ -88,7 +88,7 @@ void up_pginitialize(void)
{ {
/* None needed at present. This file is just retained in case the need /* None needed at present. This file is just retained in case the need
* arises in the future. Nothing calls up_pginitialize() now. If needed, * arises in the future. Nothing calls up_pginitialize() now. If needed,
* if should be called early in up_boot.c to assure that all paging is * if should be called early in arm_boot.c to assure that all paging is
* ready. * ready.
*/ */
} }
arch/arm/src/common/up_internal.h
+1 -1
View File
@@ -331,7 +331,7 @@ EXTERN uint32_t _eramfuncs; /* Copy destination end address in RAM */
/* Low level initialization provided by board-level logic ******************/ /* Low level initialization provided by board-level logic ******************/
void up_boot(void); void arm_boot(void);
/* Context switching */ /* Context switching */
arch/arm/src/dm320/dm320_boot.c
+1 -1
View File
@@ -202,7 +202,7 @@ static void up_copyvectorblock(void)
* Public Functions * Public Functions
************************************************************************************/ ************************************************************************************/
void up_boot(void) void arm_boot(void)
{ {
/* __start provided the basic MMU mappings for SDRAM. Now provide mappings for all /* __start provided the basic MMU mappings for SDRAM. Now provide mappings for all
* IO regions (Including the vector region). * IO regions (Including the vector region).
arch/arm/src/imx1/imx_boot.c
+1 -1
View File
@@ -195,7 +195,7 @@ static void up_copyvectorblock(void)
* Public Functions * Public Functions
************************************************************************************/ ************************************************************************************/
void up_boot(void) void arm_boot(void)
{ {
/* __start provided the basic MMU mappings for SDRAM. Now provide mappings for all /* __start provided the basic MMU mappings for SDRAM. Now provide mappings for all
* IO regions (Including the vector region). * IO regions (Including the vector region).
arch/arm/src/imx6/imx_boot.c
+2 -2
View File
@@ -320,7 +320,7 @@ static inline void imx_wdtdisable(void)
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: up_boot * Name: arm_boot
* *
* Description: * Description:
* Complete boot operations started in arm_head.S * Complete boot operations started in arm_head.S
@@ -386,7 +386,7 @@ static inline void imx_wdtdisable(void)
* *
****************************************************************************/ ****************************************************************************/
void up_boot(void) void arm_boot(void)
{ {
#ifdef CONFIG_ARCH_RAMFUNCS #ifdef CONFIG_ARCH_RAMFUNCS
const uint32_t *src; const uint32_t *src;
arch/arm/src/lpc31xx/lpc31.h
+1 -1
View File
@@ -154,7 +154,7 @@ static inline void gpio_outputhigh(uint32_t ioconfig, uint32_t bit)
* Name: lpc31_lowsetup * Name: lpc31_lowsetup
* *
* Description: * Description:
* Called early in up_boot. Performs chip-common low level initialization. * Called early in arm_boot. Performs chip-common low level initialization.
* *
************************************************************************************/ ************************************************************************************/
arch/arm/src/lpc31xx/lpc31_boot.c
+2 -2
View File
@@ -333,14 +333,14 @@ static void up_copyvectorblock(void)
************************************************************************************/ ************************************************************************************/
/************************************************************************************ /************************************************************************************
* Name: up_boot * Name: arm_boot
* *
* Description: * Description:
* Complete boot operations started in up_head.S * Complete boot operations started in up_head.S
* *
************************************************************************************/ ************************************************************************************/
void up_boot(void) void arm_boot(void)
{ {
/* __start provided the basic MMU mappings for SRAM. Now provide mappings for all /* __start provided the basic MMU mappings for SRAM. Now provide mappings for all
* IO regions (Including the vector region). * IO regions (Including the vector region).
arch/arm/src/lpc31xx/lpc31_lowputc.c
+1 -1
View File
@@ -271,7 +271,7 @@ static inline void up_configbaud(void)
* Name: lpc31_lowsetup * Name: lpc31_lowsetup
* *
* Description: * Description:
* Called early in up_boot. Performs chip-common low level initialization. * Called early in arm_boot. Performs chip-common low level initialization.
* *
****************************************************************************/ ****************************************************************************/
arch/arm/src/sama5/sam_boot.c
+2 -2
View File
@@ -338,7 +338,7 @@ static inline void sam_wdtdisable(void)
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: up_boot * Name: arm_boot
* *
* Description: * Description:
* Complete boot operations started in arm_head.S * Complete boot operations started in arm_head.S
@@ -407,7 +407,7 @@ static inline void sam_wdtdisable(void)
* *
****************************************************************************/ ****************************************************************************/
void up_boot(void) void arm_boot(void)
{ {
#ifdef CONFIG_ARCH_RAMFUNCS #ifdef CONFIG_ARCH_RAMFUNCS
const uint32_t *src; const uint32_t *src;
arch/avr/src/common/up_internal.h
-1
View File
@@ -134,7 +134,6 @@ extern uint32_t _ebss; /* End+1 of .bss */
/* Defined in files with the same name as the function */ /* Defined in files with the same name as the function */
void up_boot(void);
void up_irqinitialize(void); void up_irqinitialize(void);
#ifdef CONFIG_ARCH_DMA #ifdef CONFIG_ARCH_DMA
void weak_function up_dmainitialize(void); void weak_function up_dmainitialize(void);
arch/hc/src/common/up_internal.h
-4
View File
@@ -157,10 +157,6 @@ extern uint32_t g_intstackbase;
* Public Functions * Public Functions
****************************************************************************/ ****************************************************************************/
/* Start-up functions */
void up_boot(void);
/* Context switching functions */ /* Context switching functions */
void up_copystate(uint8_t *dest, uint8_t *src); void up_copystate(uint8_t *dest, uint8_t *src);
arch/mips/src/pic32mx/pic32mx.h
+1 -1
View File
@@ -234,7 +234,7 @@ void pic32mx_uartconfigure(uintptr_t uart_base, uint32_t baudrate,
* *
* Description: * Description:
* This function must be provided by the board-specific logic in the directory * This function must be provided by the board-specific logic in the directory
* configs/<board-name>/up_boot.c. * configs/<board-name>/pic32_boot.c.
* *
************************************************************************************/ ************************************************************************************/
arch/sh/src/common/up_internal.h
-1
View File
@@ -155,7 +155,6 @@ extern uint32_t g_idle_topstack;
/* Defined in files with the same name as the function */ /* Defined in files with the same name as the function */
void up_boot(void);
void up_copystate(uint32_t *dest, uint32_t *src); void up_copystate(uint32_t *dest, uint32_t *src);
void up_dataabort(uint32_t *regs); void up_dataabort(uint32_t *regs);
void up_decodeirq(uint32_t *regs); void up_decodeirq(uint32_t *regs);
arch/x86/src/common/up_internal.h
-1
View File
@@ -192,7 +192,6 @@ void x86_boardinitialize(void);
/* Defined in files with the same name as the function */ /* Defined in files with the same name as the function */
void up_boot(void);
void up_copystate(uint32_t *dest, uint32_t *src); void up_copystate(uint32_t *dest, uint32_t *src);
void up_savestate(uint32_t *regs); void up_savestate(uint32_t *regs);
void up_decodeirq(uint32_t *regs); void up_decodeirq(uint32_t *regs);
configs/ea3131/locked/mklocked.sh
+3 -3
View File
@@ -140,9 +140,9 @@ fi
# consequence, the 1-time initialization code takes up precious memory # consequence, the 1-time initialization code takes up precious memory
# in the locked memory region. # in the locked memory region.
# #
# up_boot is a low-level initialization function called by __start: # arm_boot is a low-level initialization function called by __start:
echo "EXTERN(up_boot)" >>ld-locked.inc echo "EXTERN(arm_boot)" >>ld-locked.inc
# All of the initialization functions that are called by os_start up to # All of the initialization functions that are called by os_start up to
# the point where the page fill worker thread is started must also be # the point where the page fill worker thread is started must also be
@@ -150,7 +150,7 @@ echo "EXTERN(up_boot)" >>ld-locked.inc
answer=$(checkzero CONFIG_TASK_NAME_SIZE) answer=$(checkzero CONFIG_TASK_NAME_SIZE)
if [ "$answer" = n ]; then if [ "$answer" = n ]; then
echo "EXTERN(up_boot)" >>ld-locked.inc echo "EXTERN(arm_boot)" >>ld-locked.inc
fi fi
echo "EXTERN(dq_addfirst)" >>ld-locked.inc echo "EXTERN(dq_addfirst)" >>ld-locked.inc
configs/freedom-kl25z/src/kl_boardinitialize.c
+1 -2
View File
@@ -1,6 +1,5 @@
/************************************************************************************ /************************************************************************************
* configs/freedom-kl25z/src/up_boot.c * configs/freedom-kl25z/src/kl_boardinitialize.c
* arch/arm/src/board/up_boot.c
* *
* Copyright (C) 2013 Gregory Nutt. All rights reserved. * Copyright (C) 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
configs/freedom-kl26z/src/kl_boardinitialize.c
+1 -1
View File
@@ -1,5 +1,5 @@
/************************************************************************************ /************************************************************************************
* configs/freedom-kl26z/src/up_boot.c * configs/freedom-kl26z/src/kl_boardinitialize.c
* *
* Copyright (C) 2015 Gregory Nutt. All rights reserved. * Copyright (C) 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
configs/mirtoo/README.txt
+2 -2
View File
@@ -530,7 +530,7 @@ UART Usage
When mounted on the DTX1-4000L EV-kit1 board, serial output is avaiable through When mounted on the DTX1-4000L EV-kit1 board, serial output is avaiable through
an FT230X device via the FUNC0 and FUNC1 module outputs. If CONFIG_PIC32MX_UART2 an FT230X device via the FUNC0 and FUNC1 module outputs. If CONFIG_PIC32MX_UART2
is enabled, the src/up_boot will configure the UART2 pins as follows: is enabled, the src/pic32_boot will configure the UART2 pins as follows:
---------- ------ ----- ------ ------------------------- ---------- ------ ----- ------ -------------------------
BOARD MODULE PIN SIGNAL NOTES BOARD MODULE PIN SIGNAL NOTES
@@ -542,7 +542,7 @@ UART Usage
for UART2 if you are also debugging with the ICD3. In that case, you may need for UART2 if you are also debugging with the ICD3. In that case, you may need
to switch to UART1. to switch to UART1.
If CONFIG_PIC32MX_UART1 is enabled, the src/up_boot will configure the UART If CONFIG_PIC32MX_UART1 is enabled, the src/pic32_boot will configure the UART
pins as follows. This will support communictions (via an external RS-232 pins as follows. This will support communictions (via an external RS-232
driver) through X3 pins 4 and 5: driver) through X3 pins 4 and 5:
configs/mirtoo/src/pic32_boot.c
+2 -2
View File
@@ -70,7 +70,7 @@
* Description: * Description:
* When mounted on the DTX1-4000L EV-kit1 board, serial output is avaiable through * When mounted on the DTX1-4000L EV-kit1 board, serial output is avaiable through
* an FT230X device via the FUNC0 and FUNC1 module outputs. If CONFIG_PIC32MX_UART2 * an FT230X device via the FUNC0 and FUNC1 module outputs. If CONFIG_PIC32MX_UART2
* is enabled, the src/up_boot will configure the UART2 pins as follows. * is enabled, the src/pic32_boot will configure the UART2 pins as follows.
* *
* ---------- ------ ----- ------ ------------------------- * ---------- ------ ----- ------ -------------------------
* BOARD OUTPUT PIN SIGNAL NOTES * BOARD OUTPUT PIN SIGNAL NOTES
@@ -78,7 +78,7 @@
* FT230X RXD FUNC0 RPB11 U2RX UART2 RX (Also PGEC2) * FT230X RXD FUNC0 RPB11 U2RX UART2 RX (Also PGEC2)
* FT230X TXD FUNC1 RPB10 U2TX UART2 TX (Also PGED2) * FT230X TXD FUNC1 RPB10 U2TX UART2 TX (Also PGED2)
* *
* If CONFIG_PIC32MX_UART1 is enabled, the src/up_boot will configure the UART * If CONFIG_PIC32MX_UART1 is enabled, the src/pic32_boot will configure the UART
* pins as follows. This will support communictions (via an external RS-232 * pins as follows. This will support communictions (via an external RS-232
* driver) through X3 pins 4 and 5: * driver) through X3 pins 4 and 5:
* *
configs/nutiny-nuc120/src/nuc_boardinitialize.c
+1 -2
View File
@@ -1,6 +1,5 @@
/************************************************************************************ /************************************************************************************
* configs/nutiny-nuc120/src/up_boot.c * configs/nutiny-nuc120/src/nuc_boardinitialize.c
* arch/arm/src/board/up_boot.c
* *
* Copyright (C) 2013 Gregory Nutt. All rights reserved. * Copyright (C) 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
configs/pcduino-a10/nsh/pcduino-140107.patch
+5 -5
View File
@@ -2,7 +2,7 @@ diff --git a/nuttx/arch/arm/src/a1x/a1x_boot.c b/nuttx/arch/arm/src/a1x/a1x_boot
index 3cc6323..ad42790 100644 index 3cc6323..ad42790 100644
--- a/nuttx/arch/arm/src/a1x/a1x_boot.c --- a/nuttx/arch/arm/src/a1x/a1x_boot.c
+++ b/nuttx/arch/arm/src/a1x/a1x_boot.c +++ b/nuttx/arch/arm/src/a1x/a1x_boot.c
@@ -312,12 +312,14 @@ void up_boot(void) @@ -312,12 +312,14 @@ void arm_boot(void)
* for all IO regions (Including the vector region). * for all IO regions (Including the vector region).
*/ */
@@ -17,7 +17,7 @@ index 3cc6323..ad42790 100644
a1x_vectormapping(); a1x_vectormapping();
#endif /* CONFIG_ARCH_ROMPGTABLE */ #endif /* CONFIG_ARCH_ROMPGTABLE */
@@ -326,16 +328,19 @@ void up_boot(void) @@ -326,16 +328,19 @@ void arm_boot(void)
* arm_vector.S * arm_vector.S
*/ */
@@ -37,7 +37,7 @@ index 3cc6323..ad42790 100644
a1x_lowsetup(); a1x_lowsetup();
/* Perform early serial initialization if we are going to use the serial /* Perform early serial initialization if we are going to use the serial
@@ -343,6 +348,7 @@ void up_boot(void) @@ -343,6 +348,7 @@ void arm_boot(void)
*/ */
#ifdef USE_EARLYSERIALINIT #ifdef USE_EARLYSERIALINIT
@@ -45,7 +45,7 @@ index 3cc6323..ad42790 100644
up_earlyserialinit(); up_earlyserialinit();
#endif #endif
@@ -353,6 +359,7 @@ void up_boot(void) @@ -353,6 +359,7 @@ void arm_boot(void)
*/ */
#ifdef CONFIG_BUILD_PROTECTED #ifdef CONFIG_BUILD_PROTECTED
@@ -53,7 +53,7 @@ index 3cc6323..ad42790 100644
a1x_userspace(); a1x_userspace();
#endif #endif
@@ -362,5 +369,7 @@ void up_boot(void) @@ -362,5 +369,7 @@ void arm_boot(void)
* - Configuration of board specific resources (PIOs, LEDs, etc). * - Configuration of board specific resources (PIOs, LEDs, etc).
*/ */
configs/stm32ldiscovery/src/stm32_boot.c
+1 -1
View File
@@ -1,5 +1,5 @@
/************************************************************************************ /************************************************************************************
* configs/stm32ldiscovery/src/up_boot.c * configs/stm32ldiscovery/src/stm32_boot.c
* *
* Copyright (C) 2013, 2015 Gregory Nutt. All rights reserved. * Copyright (C) 2013, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
configs/teensy-lc/src/kl_boardinitialize.c
+1 -1
View File
@@ -1,5 +1,5 @@
/************************************************************************************ /************************************************************************************
* configs/teensy-lc/src/up_boot.c * configs/teensy-lc/src/kl_boardinitialize.c
* *
* Copyright (C) 2015 Gregory Nutt. All rights reserved. * Copyright (C) 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>