configs/: Rename ZDS-II start files from xxx_lowinit.c to xxx_boot.c; rename board initialization logic from xxx_lowinit() to xxx_board_initialize(). These changes make the ZDS-II configurations more similar to board initialization conventions to used for other architectures.
This commit is contained in:
parent
2c1e905aa6
commit
fbb6f6cde0
@ -652,12 +652,13 @@ extern "C"
|
|||||||
#define EXTERN extern
|
#define EXTERN extern
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* The following two routines are called from the low-level reset logic. z16f_lowinit()
|
/* The following two routines are called from the low-level reset logic.
|
||||||
* must be provided by the board-specific logic; z16f_lowuartinit() is called only if
|
* z16f_board_initialize() must be provided by the board-specific logic;
|
||||||
* debugging support for up_lowputc (or getc) is enabled.
|
* z16f_lowuartinit() is called only if debugging support for up_lowputc (or getc)
|
||||||
|
* is enabled.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
void z16f_lowinit(void);
|
void z16f_board_initialize(void);
|
||||||
#if defined(CONFIG_Z16_LOWPUTC) || defined(CONFIG_Z16_LOWGETC)
|
#if defined(CONFIG_Z16_LOWPUTC) || defined(CONFIG_Z16_LOWGETC)
|
||||||
void z16f_lowuartinit(void);
|
void z16f_lowuartinit(void);
|
||||||
#endif
|
#endif
|
||||||
|
@ -52,7 +52,7 @@
|
|||||||
**************************************************************************/
|
**************************************************************************/
|
||||||
|
|
||||||
xref _z16f_clkinit:EROM
|
xref _z16f_clkinit:EROM
|
||||||
xref _z16f_lowinit:EROM
|
xref _z16f_board_initialize:EROM
|
||||||
#ifdef CONFIG_ARCH_LEDS
|
#ifdef CONFIG_ARCH_LEDS
|
||||||
xref _board_autoled_initialize:EROM
|
xref _board_autoled_initialize:EROM
|
||||||
#endif
|
#endif
|
||||||
@ -213,7 +213,7 @@ _z16f_reset8:
|
|||||||
|
|
||||||
/* Perform low-level hardware initialization */
|
/* Perform low-level hardware initialization */
|
||||||
|
|
||||||
call _z16f_lowinit /* Perform low-level hardware initialization */
|
call _z16f_board_initialize /* Perform low-level hardware initialization */
|
||||||
|
|
||||||
#ifdef USE_EARLYSERIALINIT
|
#ifdef USE_EARLYSERIALINIT
|
||||||
/* Perform early serial initialization */
|
/* Perform early serial initialization */
|
||||||
|
@ -704,7 +704,7 @@ void up_earlyserialinit(void)
|
|||||||
uint8_t regval;
|
uint8_t regval;
|
||||||
|
|
||||||
/* Configure UART alternate pin functions. This may duplicate logic in
|
/* Configure UART alternate pin functions. This may duplicate logic in
|
||||||
* z16f_lowuartinit() or z16f_lowinit().
|
* z16f_lowuartinit() or z16f_board_initialize().
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifdef CONFIG_Z16F_UART0
|
#ifdef CONFIG_Z16F_UART0
|
||||||
|
@ -49,7 +49,7 @@
|
|||||||
xref _ez80_init
|
xref _ez80_init
|
||||||
xref _ez80_initvectors
|
xref _ez80_initvectors
|
||||||
xref _ez80_initsysclk
|
xref _ez80_initsysclk
|
||||||
xref _ez80_lowinit
|
xref _ez80_board_initialize
|
||||||
xref __low_bss ; Low address of bss segment
|
xref __low_bss ; Low address of bss segment
|
||||||
xref __len_bss ; Length of bss segment
|
xref __len_bss ; Length of bss segment
|
||||||
|
|
||||||
@ -114,6 +114,7 @@ _ez80_startup:
|
|||||||
_ez80_bssdone:
|
_ez80_bssdone:
|
||||||
|
|
||||||
; Copy the initialized data section
|
; Copy the initialized data section
|
||||||
|
|
||||||
ld bc, __len_data ; [bc] = data length
|
ld bc, __len_data ; [bc] = data length
|
||||||
ld a, __len_data >> 16 ; Check for non-zero length
|
ld a, __len_data >> 16 ; Check for non-zero length
|
||||||
or a, c
|
or a, c
|
||||||
@ -126,6 +127,7 @@ _ez80_datadone:
|
|||||||
|
|
||||||
; Copy CODE (which may be in FLASH) to RAM if the
|
; Copy CODE (which may be in FLASH) to RAM if the
|
||||||
; copy_code_to_ram symbol is set in the link control file
|
; copy_code_to_ram symbol is set in the link control file
|
||||||
|
|
||||||
ld a, __copy_code_to_ram
|
ld a, __copy_code_to_ram
|
||||||
or a, a
|
or a, a
|
||||||
jr z, _ez80_codedone
|
jr z, _ez80_codedone
|
||||||
@ -139,9 +141,9 @@ _ez80_datadone:
|
|||||||
ldir ; Copy the code section
|
ldir ; Copy the code section
|
||||||
_ez80_codedone:
|
_ez80_codedone:
|
||||||
|
|
||||||
; Perform board-specific initializeation
|
; Perform board-specific initialization
|
||||||
|
|
||||||
call _ez80_lowinit
|
call _ez80_board_initialize
|
||||||
|
|
||||||
; Then start NuttX
|
; Then start NuttX
|
||||||
|
|
||||||
@ -152,4 +154,3 @@ _ez80_codedone:
|
|||||||
_ez80_halt:
|
_ez80_halt:
|
||||||
halt ; We should never get here
|
halt ; We should never get here
|
||||||
jp _ez80_halt
|
jp _ez80_halt
|
||||||
|
|
||||||
|
@ -66,7 +66,7 @@
|
|||||||
**************************************************************************/
|
**************************************************************************/
|
||||||
|
|
||||||
xref _z16f_clkinit:ROM
|
xref _z16f_clkinit:ROM
|
||||||
xref _z16f_lowinit:ROM
|
xref _z16f_board_initialize:ROM
|
||||||
#ifdef CONFIG_ARCH_LEDS
|
#ifdef CONFIG_ARCH_LEDS
|
||||||
xref _board_autoled_initialize:ROM
|
xref _board_autoled_initialize:ROM
|
||||||
#endif
|
#endif
|
||||||
|
@ -36,6 +36,6 @@
|
|||||||
-include $(TOPDIR)/Make.defs
|
-include $(TOPDIR)/Make.defs
|
||||||
|
|
||||||
ASRCS =
|
ASRCS =
|
||||||
CSRCS = ez80_lowinit.c ez80_leds.c
|
CSRCS = ez80_boot.c ez80_leds.c
|
||||||
|
|
||||||
include $(TOPDIR)/configs/Board.mk
|
include $(TOPDIR)/configs/Board.mk
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* configs/ez80f910200zco/src/ez80_lowinit.c
|
* configs/ez80f910200kitg/src/ez80_boot.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
|
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
|
||||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||||
@ -59,7 +59,7 @@ static void ez80_gpioinit(void)
|
|||||||
* Public Functions
|
* Public Functions
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
void ez80_lowinit(void)
|
void ez80_board_initialize(void)
|
||||||
{
|
{
|
||||||
ez80_gpioinit();
|
ez80_gpioinit();
|
||||||
}
|
}
|
@ -36,7 +36,7 @@
|
|||||||
-include $(TOPDIR)/Make.defs
|
-include $(TOPDIR)/Make.defs
|
||||||
|
|
||||||
ASRCS =
|
ASRCS =
|
||||||
CSRCS = ez80_lowinit.c
|
CSRCS = ez80_boot.c
|
||||||
ifeq ($(CONFIG_ARCH_LEDS),y)
|
ifeq ($(CONFIG_ARCH_LEDS),y)
|
||||||
CSRCS += ez80_leds.c
|
CSRCS += ez80_leds.c
|
||||||
endif
|
endif
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* configs/ez80f910200kitg/src/ez80_lowinit.c
|
* configs/ez80f910200zco/src/ez80_boot.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
|
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
|
||||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||||
@ -59,7 +59,7 @@ static void ez80_gpioinit(void)
|
|||||||
* Public Functions
|
* Public Functions
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
void ez80_lowinit(void)
|
void ez80_board_initialize(void)
|
||||||
{
|
{
|
||||||
ez80_gpioinit();
|
ez80_gpioinit();
|
||||||
}
|
}
|
@ -36,7 +36,7 @@
|
|||||||
-include $(TOPDIR)/Make.defs
|
-include $(TOPDIR)/Make.defs
|
||||||
|
|
||||||
ASRCS =
|
ASRCS =
|
||||||
CSRCS = ez80_lowinit.c ez80_bringup.c
|
CSRCS = ez80_boot.c ez80_bringup.c
|
||||||
|
|
||||||
ifeq ($(CONFIG_LIB_BOARDCTL),y)
|
ifeq ($(CONFIG_LIB_BOARDCTL),y)
|
||||||
CSRCS += ez80_appinit.c
|
CSRCS += ez80_appinit.c
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* configs/makerlisp/src/ez80_lowinit.c
|
* configs/makerlisp/src/ez80_boot.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2019 Gregory Nutt. All rights reserved.
|
* Copyright (C) 2019 Gregory Nutt. All rights reserved.
|
||||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||||
@ -122,7 +122,7 @@ static void ez80_vga_initialize(void)
|
|||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* Name: ez80_lowinit
|
* Name: ez80_board_initialize
|
||||||
*
|
*
|
||||||
* Description:
|
* Description:
|
||||||
* All eZ80 architectures must provide the following entry point. This
|
* All eZ80 architectures must provide the following entry point. This
|
||||||
@ -131,7 +131,7 @@ static void ez80_vga_initialize(void)
|
|||||||
*
|
*
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
void ez80_lowinit(void)
|
void ez80_board_initialize(void)
|
||||||
{
|
{
|
||||||
register uint8_t regval;
|
register uint8_t regval;
|
||||||
|
|
@ -36,6 +36,6 @@
|
|||||||
-include $(TOPDIR)/Make.defs
|
-include $(TOPDIR)/Make.defs
|
||||||
|
|
||||||
ASRCS =
|
ASRCS =
|
||||||
CSRCS = z16f_lowinit.c z16f_leds.c
|
CSRCS = z16f_boot.c z16f_leds.c
|
||||||
|
|
||||||
include $(TOPDIR)/configs/Board.mk
|
include $(TOPDIR)/configs/Board.mk
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* configs/z16f2800100zcog/src/z16f_lowinit.c
|
* configs/z16f2800100zcog/src/z16f_boot.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2008, 2014 Gregory Nutt. All rights reserved.
|
* Copyright (C) 2008, 2014 Gregory Nutt. All rights reserved.
|
||||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||||
@ -88,7 +88,7 @@ static void z16f_gpioinit(void)
|
|||||||
* Public Functions
|
* Public Functions
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
void z16f_lowinit(void)
|
void z16f_board_initialize(void)
|
||||||
{
|
{
|
||||||
z16f_gpioinit();
|
z16f_gpioinit();
|
||||||
}
|
}
|
@ -75,7 +75,7 @@
|
|||||||
#ifdef CONFIG_ARCH_LEDS
|
#ifdef CONFIG_ARCH_LEDS
|
||||||
void board_autoled_initialize(void)
|
void board_autoled_initialize(void)
|
||||||
{
|
{
|
||||||
/* The following is performed up_lowinit() as well */
|
/* The following is performed up_board_initialize() as well */
|
||||||
|
|
||||||
putreg8(getreg8(Z16F_GPIOA_OUT) | 0x07, Z16F_GPIOA_OUT);
|
putreg8(getreg8(Z16F_GPIOA_OUT) | 0x07, Z16F_GPIOA_OUT);
|
||||||
putreg8(getreg8(Z16F_GPIOA_DD) & 0xF8, Z16F_GPIOA_DD);
|
putreg8(getreg8(Z16F_GPIOA_DD) & 0xF8, Z16F_GPIOA_DD);
|
||||||
|
@ -36,6 +36,6 @@
|
|||||||
-include $(TOPDIR)/Make.defs
|
-include $(TOPDIR)/Make.defs
|
||||||
|
|
||||||
ASRCS =
|
ASRCS =
|
||||||
CSRCS = z8_lowinit.c z8_leds.c
|
CSRCS = z8_boot.c z8_leds.c
|
||||||
|
|
||||||
include $(TOPDIR)/configs/Board.mk
|
include $(TOPDIR)/configs/Board.mk
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* configs/z8encore000zco/src/z8_lowinit.c
|
* configs/z8encore000zco/src/z8_boot.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
|
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
|
||||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||||
@ -59,7 +59,7 @@ static void z8_gpioinit(void)
|
|||||||
* Public Functions
|
* Public Functions
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
void z8_lowinit(void)
|
void z8_board_initialize(void)
|
||||||
{
|
{
|
||||||
z8_gpioinit();
|
z8_gpioinit();
|
||||||
}
|
}
|
@ -36,6 +36,6 @@
|
|||||||
-include $(TOPDIR)/Make.defs
|
-include $(TOPDIR)/Make.defs
|
||||||
|
|
||||||
ASRCS =
|
ASRCS =
|
||||||
CSRCS = z8_lowinit.c z8_leds.c
|
CSRCS = z8_boot.c z8_leds.c
|
||||||
|
|
||||||
include $(TOPDIR)/configs/Board.mk
|
include $(TOPDIR)/configs/Board.mk
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* configs/z8f64200100kit/src/z8_lowinit.c
|
* configs/z8f64200100kit/src/z8_boot.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
|
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
|
||||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||||
@ -59,7 +59,7 @@ static void z8_gpioinit(void)
|
|||||||
* Public Functions
|
* Public Functions
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
void z8_lowinit(void)
|
void z8_board_initialize(void)
|
||||||
{
|
{
|
||||||
z8_gpioinit();
|
z8_gpioinit();
|
||||||
}
|
}
|
Loading…
x
Reference in New Issue
Block a user