patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

Remove remaining references to NLI

Browse source 
NLI files are not supported.

Change-Id: Id9bb1b083051e8ed65b854b4293f2848a46b1589
Signed-off-by: Peter Mitsis <peter.mitsis@windriver.com>
This commit is contained in:
Peter Mitsis 2015-04-24 10:04:56 -04:00 committed by Anas Nashif
parent a8264180d8
commit bf2e1d3017
12 changed files with 1 additions and 399 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/x86/timer/hpet.c
View file

@ -568,11 +568,7 @@ void timer_driver(int priority /* priority parameter is ignored by this driver
counterLoadValue = (uint32_t)(tickFempto / hpetClockPeriod);
/*
* Initialize "sys_clock_hw_cycles_per_tick"
* (Note: This overrides any value that the host tools may have computed
* at build time using BSP information, such as that in the NLI file.)
*/
/* Initialize "sys_clock_hw_cycles_per_tick" */
sys_clock_hw_cycles_per_tick = counterLoadValue;

85
make/target/kconfig/modules/nli.kconf
View file

@ -1,85 +0,0 @@
# nli.kconf - NLI file configuration options
#
# Copyright (c) 2014 Wind River Systems, Inc.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# 1) Redistributions of source code must retain the above copyright notice,
# this list of conditions and the following disclaimer.
#
# 2) Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
#
# 3) Neither the name of Wind River Systems nor the names of its contributors
# may be used to endorse or promote products derived from this software without
# specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
menu "Network Loading Information (NLI) setup"
menu "Common settings"
config NLI_BOARD_TYPE
string
prompt "Board type"
default "GENERIC_SERVERBOARD" if MICROKERNEL
default "GENERIC_SERVERBOARD" if NANOKERNEL
help
Board type.
Available values: GenericMTS_RS232, Generic_RS232, GENERIC_SERVERBOARD
config NLI_KCONF_FILE_GENERIC_SERVERBOARD
bool
# no prompt
default y if NLI_BOARD_TYPE="GENERIC_SERVER_BOARD"
default n
config NLI_KCONF_FILE_RS232
bool
# no prompt
default n if NLI_BOARD_TYPE="GenericMTS_RS232"
default n if NLI_BOARD_TYPE="Generic_RS232"
default n
config NLI_CPU_FREQ_MHZ
string
prompt "CPU frequency in Mhz"
# default set by BSP
help
CPU frequency in MHz.
config NLI_TIMER_FREQ_MHZ
string
prompt "Timer frequency in Mhz"
# default set by BSP
help
Hardware timer frequency in MHz.
config NLI_IMAGE_FILE_TYPE
string
# no prompt, overriden by BSP if needed
default "elf"
help
Bootable image file type.
endmenu
if NLI_KCONF_FILE_RS232=y
source "nli_RS232.kconf"
endif
endmenu

84
make/target/kconfig/modules/nli_RS232.kconf
View file

@ -1,84 +0,0 @@
# nli_RS232.kconf - microkernel configuration options
#
# Copyright (c) 2014 Wind River Systems, Inc.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# 1) Redistributions of source code must retain the above copyright notice,
# this list of conditions and the following disclaimer.
#
# 2) Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
#
# 3) Neither the name of Wind River Systems nor the names of its contributors
# may be used to endorse or promote products derived from this software without
# specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
menu "RS232 NLI file configuration"
config NLI_HOST_COM_PORT
int
prompt "Host COM port"
default 9
help
Host COM port.
config NLI_HOST_BOOT_BAUD_RATE
int
prompt "Host boot baud rate"
default 115200
help
Baud rate used to boot targets.
config NLI_HOST_BAUD_RATE
int
prompt "Host baud rate"
default 115200
help
Baud rate for host link.
config NLI_BITS_PER_FRAME
int
prompt "Bits per frame"
default 8
help
Bits per frame.
config NLI_PARITY
int
prompt "Parity"
default 0
help
Parity.
config NLI_STOPBITS
int
prompt "Stop bits"
default 0
help
Stop bits.
config NLI_SWITCH_DETECTION_DELAY
int
# omit prompt to signify a "hidden" option
default 0
help
Switch detection delay.
endmenu

3
make/target/kconfig/nkernel.kconf
View file

@ -59,8 +59,5 @@ source "bsp.kconf"
source "build.kconf"
# This is for creating the NLI files on-the-fly
source "nli.kconf"
# Include Bluetooth configuration
source "bluetooth.kconf"

1
make/target/kconfig/ukernel.kconf
View file

@ -63,5 +63,4 @@ source "product.kconf"
source "kernel-core.kconf"
source "bsp.kconf"
source "build.kconf"
source "nli.kconf"
source "bluetooth.kconf"

2
make/target/kernel/defs.nkbuild
View file

@ -36,8 +36,6 @@ vKTYPE = nkernel
override NUM_NODES = 1
override NODES = 1
iNLI_OUT = ${vOUT_DIR}/nli
include ${vMAKE}/target/kernel/defs.kbuild
#####

1
make/target/kernel/defs.ukbuild
View file

@ -46,7 +46,6 @@ iCFG_ORIG_VPF = ${iCFG_ORIG_STEM}.vpf
# sysgen
iSYSGEN_OUT = ${vOUT_DIR}/sysgen
iNLI_OUT = ${iSYSGEN_OUT}
iVXMICRO_H = ${iSYSGEN_OUT}/vxmicro.$h
iMICROKERNEL_OBJECTS_H = ${iSYSGEN_OUT}/microkernel_objects.$h

42
make/target/kernel/nli/rules.board.GENERIC_SERVERBOARD
View file

@ -1,42 +0,0 @@
# nli/rules.board.Generic_RS232 - build system
#
# Copyright (c) 2014 Wind River Systems, Inc.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# 1) Redistributions of source code must retain the above copyright notice,
# this list of conditions and the following disclaimer.
#
# 2) Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
#
# 3) Neither the name of Wind River Systems nor the names of its contributors
# may be used to endorse or promote products derived from this software without
# specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
iNLI_BOARD_STR = $(strip \
${CONFIG_NLI_BOARD_TYPE} \
BOARD_0 \
)
# blank line is needed
define Nli_board_recipe
$q${HOS_Echo} ${iNLI_BOARD_STR} >> $1
endef

33
make/target/kernel/nli/rules.board.GenericMTS_RS232
View file

@ -1,33 +0,0 @@
# nli/rules.board.GenericMTS_RS232 - build system
#
# Copyright (c) 2014 Wind River Systems, Inc.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# 1) Redistributions of source code must retain the above copyright notice,
# this list of conditions and the following disclaimer.
#
# 2) Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
#
# 3) Neither the name of Wind River Systems nor the names of its contributors
# may be used to endorse or promote products derived from this software without
# specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
include ${vMAKE}/target/kernel/nli/rules.board.Generic_RS232

49
make/target/kernel/nli/rules.board.Generic_RS232
View file

@ -1,49 +0,0 @@
# nli/rules.board.Generic_RS232 - build system
#
# Copyright (c) 2014 Wind River Systems, Inc.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# 1) Redistributions of source code must retain the above copyright notice,
# this list of conditions and the following disclaimer.
#
# 2) Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
#
# 3) Neither the name of Wind River Systems nor the names of its contributors
# may be used to endorse or promote products derived from this software without
# specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
iNLI_BOARD_STR = $(strip \
${CONFIG_NLI_BOARD_TYPE} \
BOARD_0 \
${CONFIG_NLI_HOST_COM_PORT} \
${CONFIG_NLI_HOST_BOOT_BAUD_RATE} \
${CONFIG_NLI_HOST_BAUD_RATE} \
${CONFIG_NLI_BITS_PER_FRAME} \
${CONFIG_NLI_PARITY} \
${CONFIG_NLI_STOPBITS} \
${CONFIG_NLI_SWITCH_DETECTION_DELAY} \
)
# blank line is needed
define Nli_board_recipe
$q${HOS_Echo} ${iNLI_BOARD_STR} >> $1
endef

93
make/target/kernel/nli/rules.nodes
View file

@ -1,93 +0,0 @@
# nli/rules.nodes - build system
#
# Copyright (c) 2014 Wind River Systems, Inc.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# 1) Redistributions of source code must retain the above copyright notice,
# this list of conditions and the following disclaimer.
#
# 2) Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
#
# 3) Neither the name of Wind River Systems nor the names of its contributors
# may be used to endorse or promote products derived from this software without
# specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
define Nli_node_str
iNLI_NODE_STR_$1 = $(strip \
${vARCH} \
NODE$1 \
${CONFIG_NLI_CPU_FREQ_MHZ} \
BOARD_0 \
$1 \
${CONFIG_NLI_TIMER_FREQ_MHZ} \
NODE$1.${CONFIG_NLI_IMAGE_FILE_TYPE} \
)
endef
$(foreach node,${NODES},$(eval $(call Nli_node_str,${node})))
define Nli_node_recipe
$q${HOS_Echo} ${iNLI_NODE_STR_$2} >> $1
endef
sinclude ${vMAKE}/target/kernel/nli/rules.board.${CONFIG_NLI_BOARD_TYPE}
# format of the NLI file:
## ----- Network loading information ----------
## Development board : Quark
## Number of active nodes : 2
## Driver on host : N/A
## --------------------------------------------
## Board parameter list
## -------------------------------
## 1. BoardType
## 2. BoardName
## 3. CommPortNr from the host's point-of-view
## (qemu uses com8 side, host uses com9 side)
## 4. Boot BaudRate
## 5. Serve BaudRate
## 6. Bits per frame
## 7. Parity
## 8. Stopbits
## 9. Switch direction delay
## 10. Pre-Netload string (optional)
## 11. Post-Netload string (optional)
## 12. Board declaration string (optional)
## 13. Host driver init call (optional)
#################################
## 1 2 3 4 5 6 7 8 9
##-|-----------------|--------|--|-------|-------|--|--|--|-
## V V V V V V V V V
# GenericMTS_RS232 BOARD_0 9 115200 115200 8 0 0 0
## NodeType # NodeName # Freq # BoardName # Site # Timerfreq # Image
##------------------------------------------------------------------------
#x86 NODE1 400.0 BOARD_0 0 25.00 NODE1.elf
#x86 NODE2 400.0 BOARD_0 1 25.00 NODE2.elf
#
#ROOTNODE NODE1
#
## Remove the boot method for now. Rely on user starting both nodes
## NODE PORT NODE PORT
##------------------------------------
## BOOTLINK NODE1 1 NODE2 1

1
make/target/kernel/rules.kbuild
View file

@ -57,7 +57,6 @@ include ${vMAKE}/target/headers/rules.kver
ifeq (${vGOAL_NEEDS_TARGET_SETUP},y)
include ${vMAKE}/target/toolchain/${vTOOL}/rules.${vTOOL}
include ${vMAKE}/target/toolchain/${vTOOL}/rules.kernel-bin
include ${vMAKE}/target/kernel/nli/rules.nodes
endif
${vKLIB_DIR}/configs.c: ${vAUTOCONF_H} | $$(dir $$@).dir