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

Rename TIMO -> ZEPHYR

Browse source 
Change-Id: Id44a129e275fb0cfe1fce6ec2a03c2d86ffe3995
Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2015-06-05 22:46:00 -04:00
parent 8accfcfb2c
commit b8823770d2
76 changed files with 165 additions and 165 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Makefile
View file

@ -339,9 +339,9 @@ STRIP = $(CROSS_COMPILE)strip
OBJCOPY = $(CROSS_COMPILE)objcopy
OBJDUMP = $(CROSS_COMPILE)objdump
AWK = awk
GENKSYMS = $(TIMO_BASE)/scripts/genksyms/genksyms
GENIDT = $(TIMO_BASE)/scripts/gen_idt/gen_idt
FIXDEP = $(TIMO_BASE)/scripts/basic/fixdep
GENKSYMS = $(ZEPHYR_BASE)/scripts/genksyms/genksyms
GENIDT = $(ZEPHYR_BASE)/scripts/gen_idt/gen_idt
FIXDEP = $(ZEPHYR_BASE)/scripts/basic/fixdep
PERL = perl
PYTHON = python
CHECK = sparse
@ -361,9 +361,9 @@ PROJECTINCLUDE := $(strip -I$(srctree)/include/microkernel \
-I$(CURDIR)/misc/generated/sysgen) \
$(USERINCLUDE)
# Use TIMOINCLUDE when you must reference the include/ directory.
# Use ZEPHYRINCLUDE when you must reference the include/ directory.
# Needed to be compatible with the O= option
TIMOINCLUDE := \
ZEPHYRINCLUDE := \
-I$(srctree)/arch/$(hdr-arch)/include \
$(if $(KBUILD_SRC), -I$(srctree)/include) \
-I$(srctree)/include \
@ -404,7 +404,7 @@ export CPP AR NM STRIP OBJCOPY OBJDUMP
export MAKE AWK GENKSYMS INSTALLKERNEL PERL PYTHON UTS_MACHINE GENIDT FIXDEP
export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS
export KBUILD_CPPFLAGS NOSTDINC_FLAGS TIMOINCLUDE OBJCOPYFLAGS LDFLAGS
export KBUILD_CPPFLAGS NOSTDINC_FLAGS ZEPHYRINCLUDE OBJCOPYFLAGS LDFLAGS
export KBUILD_CFLAGS CFLAGS_KERNEL CFLAGS_MODULE CFLAGS_GCOV
export KBUILD_AFLAGS AFLAGS_KERNEL AFLAGS_MODULE
export KBUILD_AFLAGS_MODULE KBUILD_CFLAGS_MODULE KBUILD_LDFLAGS_MODULE
@ -426,8 +426,8 @@ export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn \
# Basic helpers built in scripts/
PHONY += scripts_basic
scripts_basic:
$(Q)$(MAKE) -C $(TIMO_BASE) $(build)=scripts/basic
$(Q)$(MAKE) -C $(TIMO_BASE) $(build)=scripts/gen_idt
$(Q)$(MAKE) -C $(ZEPHYR_BASE) $(build)=scripts/basic
$(Q)$(MAKE) -C $(ZEPHYR_BASE) $(build)=scripts/gen_idt
$(Q)rm -f .tmp_quiet_recordmcount
# To avoid any implicit rule to kick in, define an empty command.
@ -513,10 +513,10 @@ include $(srctree)/arch/$(SRCARCH)/Makefile
export KBUILD_DEFCONFIG KBUILD_KCONFIG
config: scripts_basic outputmakefile FORCE
$(Q)$(MAKE) -C $(TIMO_BASE) $(build)=scripts/kconfig $@
$(Q)$(MAKE) -C $(ZEPHYR_BASE) $(build)=scripts/kconfig $@
%config: scripts_basic outputmakefile FORCE
$(Q)$(MAKE) -C $(TIMO_BASE) $(build)=scripts/kconfig $@
$(Q)$(MAKE) -C $(ZEPHYR_BASE) $(build)=scripts/kconfig $@
else
# ===========================================================================
@ -566,7 +566,7 @@ ifdef CONFIG_MINIMAL_LIBC
# Objects we will link into tinymountain / subdirs we need to visit
KLIBC_DIR := lib/libc/minimal
libs-y := $(KLIBC_DIR)/
TIMOINCLUDE += -I$(srctree)/lib/libc/minimal/include
ZEPHYRINCLUDE += -I$(srctree)/lib/libc/minimal/include
endif
ifdef CONFIG_TOOLCHAIN_NEWLIB
@ -778,14 +778,14 @@ libs-y := $(libs-y1) $(libs-y2)
# Externally visible symbols (used by link-tinymountain.sh)
DQUOTE = "
#This comment line is to fix the highlighting of some editors due the quote effect."
export KBUILD_TIMO_INIT := $(head-y) $(init-y)
export KBUILD_TIMO_MAIN := $(core-y) $(libs-y) $(drivers-y) $(bsp-y)
export KBUILD_ZEPHYR_INIT := $(head-y) $(init-y)
export KBUILD_ZEPHYR_MAIN := $(core-y) $(libs-y) $(drivers-y) $(bsp-y)
export KBUILD_LDS := $(srctree)/arch/$(SRCARCH)/$(subst $(DQUOTE),,$(CONFIG_BSP_DIR))/linker.cmd
export LDFLAGS_tinymountain
# used by scripts/pacmage/Makefile
export KBUILD_ALLDIRS := $(sort $(filter-out arch/%,$(tinymountain-alldirs)) arch Documentation include samples scripts tools virt)
tinymountain-deps := $(KBUILD_LDS) $(KBUILD_TIMO_INIT) $(KBUILD_TIMO_MAIN)
tinymountain-deps := $(KBUILD_LDS) $(KBUILD_ZEPHYR_INIT) $(KBUILD_ZEPHYR_MAIN)
ALL_LIBS += $(TOOLCHAIN_LIBS)
export ALL_LIBS

16
Makefile.inc
View file

@ -48,7 +48,7 @@ else
endif
all: $(CONFIG_DEPS) $(O)/include/config/.dir
$(Q)$(MAKE) -C $(TIMO_BASE) O=$(O) \
$(Q)$(MAKE) -C $(ZEPHYR_BASE) O=$(O) \
PROJECT=$(PROJECT_BASE) SOURCE_DIR=$(SOURCE_DIR) CFLAGS=$(CFLAGS)
rm-files:= .config
@ -73,29 +73,29 @@ distclean: clean
mrproper: FORCE
$(call cmd_clean_inner_files)
$(Q)$(MAKE) -C $(TIMO_BASE) \
$(Q)$(MAKE) -C $(ZEPHYR_BASE) \
PROJECT=$(PROJECT_BASE) mrproper
%config: $(O)/include/config/.dir FORCE
$(Q)$(MAKE) $(S) -C $(TIMO_BASE) O=$(O) \
$(Q)$(MAKE) $(S) -C $(ZEPHYR_BASE) O=$(O) \
PROJECT=$(PROJECT_BASE) $@
qemu: $(CONFIG_DEPS) $(O)/include/config/.dir
$(Q)$(MAKE) -C $(TIMO_BASE) O=$(O) \
$(Q)$(MAKE) -C $(ZEPHYR_BASE) O=$(O) \
PROJECT=$(PROJECT_BASE) SOURCE_DIR=$(SOURCE_DIR) CFLAGS=$(CFLAGS) qemu
$(O)/.config: $(O)/include/config/.dir $(O)/include/generated/.dir
$(Q)cp $(TIMO_BASE)/arch/$(ARCH)/configs/$(KBUILD_DEFCONFIG) $(O)/.config
$(Q)cp $(ZEPHYR_BASE)/arch/$(ARCH)/configs/$(KBUILD_DEFCONFIG) $(O)/.config
$(O)/.initconfig: mergeconfig
$(Q)yes "" | $(MAKE) $(S) -C $(TIMO_BASE) O=$(O) \
$(Q)yes "" | $(MAKE) $(S) -C $(ZEPHYR_BASE) O=$(O) \
PROJECT=$(PROJECT_BASE) oldconfig
touch $@
ifneq (($strip $(CONF_FILE)),)
mergeconfig: $(O)/.config $(CONF_FILE)
$(Q)$(CONFIG_SHELL) $(TIMO_BASE)/scripts/kconfig/merge_config.sh \
$(Q)$(CONFIG_SHELL) $(ZEPHYR_BASE)/scripts/kconfig/merge_config.sh \
-q -m -O $(O) $(O)/.config $(CONF_FILE)
else
mergeconfig: defconfig $(CONF_FILE);
@ -109,7 +109,7 @@ $(CONF_FILE):;
$(Q)touch $@
help:
$(Q)$(MAKE) -C $(TIMO_BASE) help
$(Q)$(MAKE) -C $(ZEPHYR_BASE) help
PHONY += FORCE clean mrproper
FORCE:

4
doc/installation/installation_linux_steps_optional.rst
View file

@ -132,7 +132,7 @@ Create the Needed Build Tools
.. code-block:: bash
$ cd $TIMO_BASE
$ cd $ZEPHYR_BASE
#. Copy the toolchain configurations to the build directories by
typing the following commands in the console:
@ -264,7 +264,7 @@ Follow these steps to enable a customized build of QEMU:
.. code-block:: bash
$ git am $TIMO_BASE/scripts/0001-armv7m-support-basepri-primask-interrupt-locking.patch
$ git am $ZEPHYR_BASE/scripts/0001-armv7m-support-basepri-primask-interrupt-locking.patch
#. Update the submodules as needed, type:

14
doc/installation/installation_linux_steps_required.rst
View file

@ -149,7 +149,7 @@ To build a Tiny Mountain example follow these steps:
#. Go to the root directory of your foss-rtos checkout
#. Set the paths properly in the :file:`$TIMO_BASE` directory,
#. Set the paths properly in the :file:`$ZEPHYR_BASE` directory,
type:
.. code-block:: bash
@ -160,7 +160,7 @@ To build a Tiny Mountain example follow these steps:
.. code-block:: bash
$ cd $TIMO_BASE/samples/microkernel/apps/hello_world
$ cd $ZEPHYR_BASE/samples/microkernel/apps/hello_world
$ make pristine && make
@ -170,8 +170,8 @@ To build a Tiny Mountain example follow these steps:
You can override the default BSP with the one you want by adding
:makevar:`BSP=`. The complete options available for the BSP flag
can be found at :file:`$TIMO_BASE/arch` under the respective
architecture, for example :file:`$TIMO_BASE/arch/x86/generic_pc`.
can be found at :file:`$ZEPHYR_BASE/arch` under the respective
architecture, for example :file:`$ZEPHYR_BASE/arch/x86/generic_pc`.
You need to override the ARCH flag with the architecture that
corresponds to your BSP by adding :makevar:`ARCH=` and the options
you need to the make command, for example:
@ -179,13 +179,13 @@ To build a Tiny Mountain example follow these steps:
:command:`make BSP=generic_pc ARCH=x86`
The complete options available for the ARCH flag can be found at
:file:`$TIMO_BASE`, for example :file:`$TIMO_BASE/arch/x86`.
:file:`$ZEPHYR_BASE`, for example :file:`$ZEPHYR_BASE/arch/x86`.
The sample projects for the microkernel are found
at :file:`$TIMO_BASE/samples/microkernel/apps` and the results are at
at :file:`$ZEPHYR_BASE/samples/microkernel/apps` and the results are at
:file:`$SAMPLE_PROJECT/outdir/microkernel.{ bin | elf }`.
For sample projects in the :file:`$TIMO_BASE/samples/nanokernel/apps`
For sample projects in the :file:`$ZEPHYR_BASE/samples/nanokernel/apps`
directory, the results can be found at
:file:`$SAMPLE_PROJECT/outdir/nanokernel.{ bin | elf }`.

2
samples/bluetooth/beacon/Makefile
View file

@ -33,7 +33,7 @@
# DESCRIPTION
# Makefile for the Bluetooth beacon sample
include $(subst \,/,${TIMO_BASE})/make/env/defs.base
include $(subst \,/,${ZEPHYR_BASE})/make/env/defs.base
# default BSP
BSP ?= generic_pc

10
samples/bluetooth/bt_regression.sh
View file

@ -2,20 +2,20 @@
# Import common sanity check definitions
#
if [ -z ${TIMO_BASE} ]; then
if [ -z ${ZEPHYR_BASE} ]; then
echo "shell variables required to build Zephyr OS are not set"
exit 1
fi
if [ ! -d ${TIMO_BASE} ] ; then
echo "directory ${TIMO_BASE} not found"
if [ ! -d ${ZEPHYR_BASE} ] ; then
echo "directory ${ZEPHYR_BASE} not found"
exit 1
fi
source ${TIMO_BASE}/scripts/sanity_chk/common.defs
source ${ZEPHYR_BASE}/scripts/sanity_chk/common.defs
# Location of master project directory
#
PRJ_PATH=${TIMO_BASE}/samples
PRJ_PATH=${ZEPHYR_BASE}/samples
PRJ_LIST="\
nanokernel/apps/bluetooth/init <n> pentium4 \n\

2
samples/bluetooth/central/Makefile
View file

@ -38,4 +38,4 @@ KERNEL_TYPE = micro
CONF_FILE = prj_$(ARCH).conf
QEMU_EXTRA_FLAGS = -serial unix:/tmp/bt-server-bredr
include $(TIMO_BASE)/Makefile.inc
include $(ZEPHYR_BASE)/Makefile.inc

2
samples/bluetooth/init/Makefile
View file

@ -4,4 +4,4 @@ KERNEL_TYPE = micro
CONF_FILE = prj_$(ARCH).conf
QEMU_EXTRA_FLAGS = -serial unix:/tmp/bt-server-bredr
include $(TIMO_BASE)/Makefile.inc
include $(ZEPHYR_BASE)/Makefile.inc

2
samples/bluetooth/peripheral/Makefile
View file

@ -4,4 +4,4 @@ KERNEL_TYPE = micro
CONF_FILE = prj_$(ARCH).conf
QEMU_EXTRA_FLAGS = -serial unix:/tmp/bt-server-bredr
include $(TIMO_BASE)/Makefile.inc
include $(ZEPHYR_BASE)/Makefile.inc

4
samples/bluetooth/shell/Makefile
View file

@ -38,7 +38,7 @@ KERNEL_TYPE = micro
CONF_FILE = prj_$(ARCH).conf
QEMU_EXTRA_FLAGS = -serial unix:/tmp/bt-server-bredr
PRJ_INCPATH += ${TIMO_BASE}/include/drivers
PRJ_INCPATH += ${ZEPHYR_BASE}/include/drivers
include $(TIMO_BASE)/Makefile.inc
include $(ZEPHYR_BASE)/Makefile.inc
# console handler

2
samples/libc/Makefile
View file

@ -28,7 +28,7 @@
# POSSIBILITY OF SUCH DAMAGE.
#
include $(subst \,/,${TIMO_BASE})/make/env/defs.base
include $(subst \,/,${ZEPHYR_BASE})/make/env/defs.base
.PHONY: all clean
all:

2
samples/microkernel/apps/hello_world/Makefile
View file

@ -3,4 +3,4 @@ MDEF_FILE = prj.mdef
KERNEL_TYPE = micro
CONF_FILE = prj_$(ARCH).conf
include ${TIMO_BASE}/Makefile.inc
include ${ZEPHYR_BASE}/Makefile.inc

2
samples/microkernel/apps/philosophers/Makefile
View file

@ -3,4 +3,4 @@ MDEF_FILE = prj.mdef
KERNEL_TYPE = micro
CONF_FILE = prj_$(ARCH).conf
include ${TIMO_BASE}/Makefile.inc
include ${ZEPHYR_BASE}/Makefile.inc

2
samples/microkernel/benchmark/app_kernel/Makefile
View file

@ -5,4 +5,4 @@ MDEF_FILE = prj.mdef
KERNEL_TYPE = micro
CONF_FILE = prj_console_float_$(if $(filter $(BSP),$(PC8253_BSP_VARIANTS)),pc8253,generic).conf
include ${TIMO_BASE}/Makefile.inc
include ${ZEPHYR_BASE}/Makefile.inc

2
samples/microkernel/benchmark/boot_time/Makefile
View file

@ -22,4 +22,4 @@ $(if $(filter $(BSP)/prj.conf,$(CONF_FILE)),$(warning *** $(NO_QUALIFIED_PRJ_CON
$(info using CONF_FILE = $(CONF_FILE))
include ${TIMO_BASE}/Makefile.inc
include ${ZEPHYR_BASE}/Makefile.inc

2
samples/microkernel/benchmark/footprint/Makefile
View file

@ -7,7 +7,7 @@ KERNEL_TYPE = micro
CONF_FILE = prj_$(TEST)_$(ARCH).conf
CFLAGS += -DTEST_${TEST}
include ${TIMO_BASE}/Makefile.inc
include ${ZEPHYR_BASE}/Makefile.inc
ifeq ($(ARCH),ARM)
ifneq ($(TEST),min)

2
samples/microkernel/benchmark/latency_measure/Makefile
View file

@ -5,4 +5,4 @@ MDEF_FILE = prj.mdef
KERNEL_TYPE = micro
CONF_FILE = prj_$(if $(filter $(BSP),$(PC8253_BSP_VARIANTS)),pc8253,generic).conf
include ${TIMO_BASE}/Makefile.inc
include ${ZEPHYR_BASE}/Makefile.inc

4
samples/microkernel/benchmark/sys_kernel/Makefile
View file

@ -4,6 +4,6 @@ BSP ?= generic_pc
MDEF_FILE = prj.mdef
KERNEL_TYPE = micro
CONF_FILE = prj_console_$(if $(filter $(BSP),$(PC8253_BSP_VARIANTS)),pc8253,generic).conf
SOURCE_DIR = $(TIMO_BASE)/samples/nanokernel/benchmark/sys_kernel/src/
SOURCE_DIR = $(ZEPHYR_BASE)/samples/nanokernel/benchmark/sys_kernel/src/
include ${TIMO_BASE}/Makefile.inc
include ${ZEPHYR_BASE}/Makefile.inc

2
samples/microkernel/klibs/klibs_events/Makefile
View file

@ -30,7 +30,7 @@
BSP ?= generic_pc
include $(subst \,/,${TIMO_BASE})/make/env/defs.base
include $(subst \,/,${ZEPHYR_BASE})/make/env/defs.base
PRJ_SRCPATH = ${vBASE}/samples/microkernel/test/test_events/src

2
samples/microkernel/klibs/klibs_sema/Makefile
View file

@ -30,7 +30,7 @@
BSP ?= generic_pc
include $(subst \,/,${TIMO_BASE})/make/env/defs.base
include $(subst \,/,${ZEPHYR_BASE})/make/env/defs.base
PRJ_SRCPATH = ${vBASE}/samples/microkernel/test/test_sema/src

4
samples/microkernel/test/test_bluetooth/Makefile
View file

@ -2,6 +2,6 @@ BSP ?= generic_pc
MDEF_FILE = prj.mdef
KERNEL_TYPE = micro
CONF_FILE = prj_$(ARCH).conf
SOURCE_DIR = $(TIMO_BASE)/samples/bluetooth/test_bluetooth/
SOURCE_DIR = $(ZEPHYR_BASE)/samples/bluetooth/test_bluetooth/
include $(TIMO_BASE)/Makefile.inc
include $(ZEPHYR_BASE)/Makefile.inc

2
samples/microkernel/test/test_critical/Makefile
View file

@ -3,4 +3,4 @@ MDEF_FILE = prj.mdef
KERNEL_TYPE = micro
CONF_FILE = prj_$(ARCH).conf
include ${TIMO_BASE}/Makefile.inc
include ${ZEPHYR_BASE}/Makefile.inc

2
samples/microkernel/test/test_events/Makefile
View file

@ -3,4 +3,4 @@ MDEF_FILE = prj.mdef
KERNEL_TYPE = micro
CONF_FILE = prj_$(ARCH).conf
include ${TIMO_BASE}/Makefile.inc
include ${ZEPHYR_BASE}/Makefile.inc

2
samples/microkernel/test/test_fifo/Makefile
View file

@ -3,4 +3,4 @@ MDEF_FILE = prj.mdef
KERNEL_TYPE = micro
CONF_FILE = prj_$(ARCH).conf
include ${TIMO_BASE}/Makefile.inc
include ${ZEPHYR_BASE}/Makefile.inc

2
samples/microkernel/test/test_fp_sharing/Makefile
View file

@ -3,4 +3,4 @@ MDEF_FILE = prj.mdef
KERNEL_TYPE = micro
CONF_FILE = prj_$(ARCH).conf
include ${TIMO_BASE}/Makefile.inc
include ${ZEPHYR_BASE}/Makefile.inc

2
samples/microkernel/test/test_libs/Makefile
View file

@ -3,4 +3,4 @@ MDEF_FILE = prj.mdef
KERNEL_TYPE = micro
CONF_FILE = prj_$(ARCH).conf
include ${TIMO_BASE}/Makefile.inc
include ${ZEPHYR_BASE}/Makefile.inc

2
samples/microkernel/test/test_mail/Makefile
View file

@ -3,4 +3,4 @@ MDEF_FILE = prj.mdef
KERNEL_TYPE = micro
CONF_FILE = prj_$(ARCH).conf
include ${TIMO_BASE}/Makefile.inc
include ${ZEPHYR_BASE}/Makefile.inc

2
samples/microkernel/test/test_map/Makefile
View file

@ -3,4 +3,4 @@ MDEF_FILE = prj.mdef
KERNEL_TYPE = micro
CONF_FILE = prj_$(ARCH).conf
include ${TIMO_BASE}/Makefile.inc
include ${ZEPHYR_BASE}/Makefile.inc

2
samples/microkernel/test/test_mutex/Makefile
View file

@ -3,4 +3,4 @@ MDEF_FILE = prj.mdef
KERNEL_TYPE = micro
CONF_FILE = prj_$(ARCH).conf
include ${TIMO_BASE}/Makefile.inc
include ${ZEPHYR_BASE}/Makefile.inc

2
samples/microkernel/test/test_pipe/Makefile
View file

@ -3,4 +3,4 @@ MDEF_FILE = prj.mdef
KERNEL_TYPE = micro
CONF_FILE = prj_$(ARCH).conf
include ${TIMO_BASE}/Makefile.inc
include ${ZEPHYR_BASE}/Makefile.inc

2
samples/microkernel/test/test_pool/Makefile
View file

@ -3,4 +3,4 @@ MDEF_FILE = prj.mdef
KERNEL_TYPE = micro
CONF_FILE = prj_$(ARCH).conf
include ${TIMO_BASE}/Makefile.inc
include ${ZEPHYR_BASE}/Makefile.inc

2
samples/microkernel/test/test_rand32/Makefile
View file

@ -33,4 +33,4 @@ MDEF_FILE = prj.mdef
KERNEL_TYPE = micro
CONF_FILE = prj.conf
include ${TIMO_BASE}/Makefile.inc
include ${ZEPHYR_BASE}/Makefile.inc

2
samples/microkernel/test/test_sema/Makefile
View file

@ -3,4 +3,4 @@ MDEF_FILE = prj.mdef
KERNEL_TYPE = micro
CONF_FILE = prj_$(ARCH).conf
include ${TIMO_BASE}/Makefile.inc
include ${ZEPHYR_BASE}/Makefile.inc

2
samples/microkernel/test/test_sprintf/Makefile
View file

@ -3,4 +3,4 @@ MDEF_FILE = prj.mdef
KERNEL_TYPE = micro
CONF_FILE = prj_$(ARCH).conf
include ${TIMO_BASE}/Makefile.inc
include ${ZEPHYR_BASE}/Makefile.inc

2
samples/microkernel/test/test_stackprot/Makefile
View file

@ -3,4 +3,4 @@ MDEF_FILE = prj.mdef
KERNEL_TYPE = micro
CONF_FILE = prj_$(ARCH).conf
include ${TIMO_BASE}/Makefile.inc
include ${ZEPHYR_BASE}/Makefile.inc

2
samples/microkernel/test/test_static_idt/Makefile
View file

@ -3,4 +3,4 @@ MDEF_FILE = prj.mdef
KERNEL_TYPE = micro
CONF_FILE = prj_$(ARCH).conf
include ${TIMO_BASE}/Makefile.inc
include ${ZEPHYR_BASE}/Makefile.inc

2
samples/microkernel/test/test_task/Makefile
View file

@ -3,4 +3,4 @@ MDEF_FILE = prj.mdef
KERNEL_TYPE = micro
CONF_FILE = prj_$(ARCH).conf
include ${TIMO_BASE}/Makefile.inc
include ${ZEPHYR_BASE}/Makefile.inc

2
samples/microkernel/test/test_task_irq/Makefile
View file

@ -3,4 +3,4 @@ MDEF_FILE = prj.mdef
KERNEL_TYPE = micro
CONF_FILE = prj_$(ARCH).conf
include ${TIMO_BASE}/Makefile.inc
include ${ZEPHYR_BASE}/Makefile.inc

2
samples/microkernel/test/test_tickless/Makefile
View file

@ -3,4 +3,4 @@ MDEF_FILE = prj.mdef
KERNEL_TYPE = micro
CONF_FILE = prj_$(ARCH).conf
include ${TIMO_BASE}/Makefile.inc
include ${ZEPHYR_BASE}/Makefile.inc

2
samples/microkernel/test/test_timer/Makefile
View file

@ -3,4 +3,4 @@ MDEF_FILE = prj.mdef
KERNEL_TYPE = micro
CONF_FILE = prj_$(ARCH).conf
include ${TIMO_BASE}/Makefile.inc
include ${ZEPHYR_BASE}/Makefile.inc

2
samples/microkernel/test/test_xip/Makefile
View file

@ -3,4 +3,4 @@ MDEF_FILE = prj.mdef
KERNEL_TYPE = micro
CONF_FILE = prj.conf
include ${TIMO_BASE}/Makefile.inc
include ${ZEPHYR_BASE}/Makefile.inc

4
samples/nanokernel/apps/bluetooth/init/Makefile
View file

@ -1,7 +1,7 @@
BSP ?= generic_pc
KERNEL_TYPE = nano
CONF_FILE = prj_$(ARCH).conf
SOURCE_DIR = $(TIMO_BASE)/samples/bluetooth/init/src/
SOURCE_DIR = $(ZEPHYR_BASE)/samples/bluetooth/init/src/
QEMU_EXTRA_FLAGS = -serial unix:/tmp/bt-server-bredr
include $(TIMO_BASE)/Makefile.inc
include $(ZEPHYR_BASE)/Makefile.inc

4
samples/nanokernel/apps/bluetooth/shell/Makefile
View file

@ -36,6 +36,6 @@ BSP ?= generic_pc
KERNEL_TYPE = nano
CONF_FILE = prj_$(ARCH).conf
QEMU_EXTRA_FLAGS = -serial unix:/tmp/bt-server-bredr
SOURCE_DIR = $(TIMO_BASE)/samples/bluetooth/shell/src/
SOURCE_DIR = $(ZEPHYR_BASE)/samples/bluetooth/shell/src/
include $(TIMO_BASE)/Makefile.inc
include $(ZEPHYR_BASE)/Makefile.inc

4
samples/nanokernel/apps/hello_world/Makefile
View file

@ -1,6 +1,6 @@
BSP ?= generic_pc
KERNEL_TYPE = nano
SOURCE_DIR = $(TIMO_BASE)/samples/microkernel/apps/hello_world/src/
SOURCE_DIR = $(ZEPHYR_BASE)/samples/microkernel/apps/hello_world/src/
include ${TIMO_BASE}/Makefile.inc
include ${ZEPHYR_BASE}/Makefile.inc

4
samples/nanokernel/apps/philosophers/Makefile
View file

@ -1,5 +1,5 @@
BSP ?= generic_pc
KERNEL_TYPE = nano
SOURCE_DIR = $(TIMO_BASE)/samples/microkernel/apps/philosophers/src/
SOURCE_DIR = $(ZEPHYR_BASE)/samples/microkernel/apps/philosophers/src/
include ${TIMO_BASE}/Makefile.inc
include ${ZEPHYR_BASE}/Makefile.inc

4
samples/nanokernel/benchmark/boot_time/Makefile
View file

@ -9,9 +9,9 @@ CONF_quark = quark/prj.conf
KERNEL_TYPE = nano
CONF_FILE = $(CONF_$(BSP))
SOURCE_DIR = $(TIMO_BASE)/samples/microkernel/benchmark/boot_time/src/
SOURCE_DIR = $(ZEPHYR_BASE)/samples/microkernel/benchmark/boot_time/src/
include $(TIMO_BASE)/Makefile.inc
include $(ZEPHYR_BASE)/Makefile.inc
$(if $(CONF_FILE),,$(error no prj.conf file available))
$(if $(wildcard $(CONF_FILE)),,$(error no $(CONF_FILE) file available))

2
samples/nanokernel/benchmark/footprint/Makefile
View file

@ -6,7 +6,7 @@ KERNEL_TYPE = nano
CONF_FILE = prj_$(TEST)_$(ARCH).conf
CFLAGS += -DTEST_$(TEST)
include $(TIMO_BASE)/Makefile.inc
include $(ZEPHYR_BASE)/Makefile.inc
ifeq ($(ARCH),ARM)
ifneq ($(TEST),min)

4
samples/nanokernel/benchmark/latency_measure/Makefile
View file

@ -3,6 +3,6 @@ PC8253_BSP_VARIANTS=generic_pc pentium4 minuteia
BSP ?= generic_pc
KERNEL_TYPE = nano
CONF_FILE = prj.conf
SOURCE_DIR = $(TIMO_BASE)/samples/microkernel/benchmark/latency_measure/src/
SOURCE_DIR = $(ZEPHYR_BASE)/samples/microkernel/benchmark/latency_measure/src/
include $(TIMO_BASE)/Makefile.inc
include $(ZEPHYR_BASE)/Makefile.inc

2
samples/nanokernel/benchmark/sys_kernel/Makefile
View file

@ -2,4 +2,4 @@ BSP ?= generic_pc
KERNEL_TYPE = nano
CONF_FILE = prj_console.conf
include $(TIMO_BASE)/Makefile.inc
include $(ZEPHYR_BASE)/Makefile.inc

2
samples/nanokernel/klibs/klibs_lifo/Makefile
View file

@ -28,7 +28,7 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
include $(subst \,/,${TIMO_BASE})/make/env/defs.base
include $(subst \,/,${ZEPHYR_BASE})/make/env/defs.base
# default BSP
BSP ?= generic_pc

2
samples/nanokernel/klibs/klibs_sema/Makefile
View file

@ -28,7 +28,7 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
include $(subst \,/,${TIMO_BASE})/make/env/defs.base
include $(subst \,/,${ZEPHYR_BASE})/make/env/defs.base
# default BSP
BSP ?= generic_pc

2
samples/nanokernel/test/test_arm_m3_irq_vector_table/Makefile
View file

@ -2,4 +2,4 @@ BSP ?= ti_lm3s6965
KERNEL_TYPE = nano
CONF_FILE = prj.conf
include $(TIMO_BASE)/Makefile.inc
include $(ZEPHYR_BASE)/Makefile.inc

4
samples/nanokernel/test/test_bluetooth/Makefile
View file

@ -1,6 +1,6 @@
BSP ?= generic_pc
KERNEL_TYPE = nano
CONF_FILE = prj_$(ARCH).conf
SOURCE_DIR = $(TIMO_BASE)/samples/bluetooth/test_bluetooth/
SOURCE_DIR = $(ZEPHYR_BASE)/samples/bluetooth/test_bluetooth/
include $(TIMO_BASE)/Makefile.inc
include $(ZEPHYR_BASE)/Makefile.inc

2
samples/nanokernel/test/test_context/Makefile
View file

@ -2,4 +2,4 @@ BSP ?= generic_pc
KERNEL_TYPE = nano
CONF_FILE = prj_$(ARCH).conf
include $(TIMO_BASE)/Makefile.inc
include $(ZEPHYR_BASE)/Makefile.inc

2
samples/nanokernel/test/test_fifo/Makefile
View file

@ -2,4 +2,4 @@ BSP ?= generic_pc
KERNEL_TYPE = nano
CONF_FILE = prj_$(ARCH).conf
include $(TIMO_BASE)/Makefile.inc
include $(ZEPHYR_BASE)/Makefile.inc

4
samples/nanokernel/test/test_fp_sharing/Makefile
View file

@ -1,6 +1,6 @@
BSP ?= generic_pc
KERNEL_TYPE = nano
CONF_FILE = prj_$(ARCH).conf
SOURCE_DIR = $(TIMO_BASE)/samples/microkernel/test/test_fp_sharing/src/
SOURCE_DIR = $(ZEPHYR_BASE)/samples/microkernel/test/test_fp_sharing/src/
include $(TIMO_BASE)/Makefile.inc
include $(ZEPHYR_BASE)/Makefile.inc

2
samples/nanokernel/test/test_lifo/Makefile
View file

@ -2,4 +2,4 @@ BSP ?= generic_pc
KERNEL_TYPE = nano
CONF_FILE = prj_$(ARCH).conf
include $(TIMO_BASE)/Makefile.inc
include $(ZEPHYR_BASE)/Makefile.inc

2
samples/nanokernel/test/test_sema/Makefile
View file

@ -2,4 +2,4 @@ BSP ?= generic_pc
KERNEL_TYPE = nano
CONF_FILE = prj_$(ARCH).conf
include $(TIMO_BASE)/Makefile.inc
include $(ZEPHYR_BASE)/Makefile.inc

2
samples/nanokernel/test/test_stack/Makefile
View file

@ -2,4 +2,4 @@ BSP ?= generic_pc
KERNEL_TYPE = nano
CONF_FILE = prj_$(ARCH).conf
include $(TIMO_BASE)/Makefile.inc
include $(ZEPHYR_BASE)/Makefile.inc

4
samples/nanokernel/test/test_stackprot/Makefile
View file

@ -1,6 +1,6 @@
BSP ?= generic_pc
KERNEL_TYPE = nano
CONF_FILE = prj_$(ARCH).conf
SOURCE_DIR = $(TIMO_BASE)/samples/microkernel/test/test_stackprot/src/
SOURCE_DIR = $(ZEPHYR_BASE)/samples/microkernel/test/test_stackprot/src/
include $(TIMO_BASE)/Makefile.inc
include $(ZEPHYR_BASE)/Makefile.inc

4
samples/nanokernel/test/test_static_idt/Makefile
View file

@ -1,6 +1,6 @@
BSP ?= generic_pc
KERNEL_TYPE = nano
CONF_FILE = prj_$(ARCH).conf
SOURCE_DIR = $(TIMO_BASE)/samples/microkernel/test/test_static_idt/src/
SOURCE_DIR = $(ZEPHYR_BASE)/samples/microkernel/test/test_static_idt/src/
include $(TIMO_BASE)/Makefile.inc
include $(ZEPHYR_BASE)/Makefile.inc

2
samples/nanokernel/test/test_timer/Makefile
View file

@ -2,4 +2,4 @@ BSP ?= generic_pc
KERNEL_TYPE = nano
CONF_FILE = prj_$(ARCH).conf
include $(TIMO_BASE)/Makefile.inc
include $(ZEPHYR_BASE)/Makefile.inc

4
samples/nanokernel/test/test_xip/Makefile
View file

@ -1,6 +1,6 @@
BSP ?= generic_pc
KERNEL_TYPE = nano
CONF_FILE = prj_$(ARCH).conf
SOURCE_DIR = $(TIMO_BASE)/samples/microkernel/test/test_xip/src/
SOURCE_DIR = $(ZEPHYR_BASE)/samples/microkernel/test/test_xip/src/
include $(TIMO_BASE)/Makefile.inc
include $(ZEPHYR_BASE)/Makefile.inc

6
scripts/Makefile.lib
View file

@ -139,14 +139,14 @@ __a_flags = $(call flags,_a_flags)
__cpp_flags = $(call flags,_cpp_flags)
endif
c_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(TIMOINCLUDE) \
c_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(ZEPHYRINCLUDE) \
$(__c_flags) $(modkern_cflags) \
-D"KBUILD_STR(s)=\#s" $(basename_flags) $(modname_flags)
a_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(TIMOINCLUDE) \
a_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(ZEPHYRINCLUDE) \
$(__a_flags) $(modkern_aflags)
cpp_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(TIMOINCLUDE) \
cpp_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(ZEPHYRINCLUDE) \
$(__cpp_flags)
ld_flags = $(LDFLAGS) $(ldflags-y)

6
scripts/check_known_checkpatch_issues.sh
View file

@ -39,8 +39,8 @@
exe_name=$(basename $0)
do_checkpatch_bin=${TIMO_BASE}/scripts/do_checkpatch.sh
timestamp_bin=${TIMO_BASE}/scripts/timestamp
do_checkpatch_bin=${ZEPHYR_BASE}/scripts/do_checkpatch.sh
timestamp_bin=${ZEPHYR_BASE}/scripts/timestamp
declare update=n
declare quiet=n
@ -89,7 +89,7 @@ uid=$(id -u)
pid=$$
suffix=${uid}-${pid}-${ts}
checkpatch_results=/tmp/checkpatch.results-${suffix}
known_checkpatch_issues=${TIMO_BASE}/scripts/known_checkpatch_issues
known_checkpatch_issues=${ZEPHYR_BASE}/scripts/known_checkpatch_issues
checkpatch_issues=/tmp/checkpatch_issues-${suffix}
git_log_params="\
--abbrev=8 \

2
scripts/do_checkpatch.sh
View file

@ -37,7 +37,7 @@
dirs_to_check="arch drivers include kernel lib"
files=$(for d in ${dirs_to_check}; do find $d/ -type f -name '*.[ch]'; done)
for i in $files; do
${TIMO_BASE}/scripts/checkpatch.pl --mailback --no-tree -f --emacs --summary-file --show-types --ignore BRACES,PRINTK_WITHOUT_KERN_LEVEL,SPLIT_STRING --max-line-length=100 $i >> $1
${ZEPHYR_BASE}/scripts/checkpatch.pl --mailback --no-tree -f --emacs --summary-file --show-types --ignore BRACES,PRINTK_WITHOUT_KERN_LEVEL,SPLIT_STRING --max-line-length=100 $i >> $1
done
grep ERROR: $1 |cut -d : -f 3,4 |sort -u > $1_error.types
grep WARNING: $1 |cut -d : -f 3,4 |sort -u > $1_warning.types

14
scripts/link-tinymountain.sh
View file

@ -2,18 +2,18 @@
#
# link tinymountain
#
# tinymountain is linked from the objects selected by $(KBUILD_TIMO_INIT) and
# $(KBUILD_TIMO_MAIN). Most are built-in.o files from top-level directories
# zephyr is linked from the objects selected by $(KBUILD_ZEPHYR_INIT) and
# $(KBUILD_ZEPHYR_MAIN). Most are built-in.o files from top-level directories
# in the kernel tree, others are specified in arch/$(ARCH)/Makefile.
# Ordering when linking is important, and $(KBUILD_TIMO_INIT) must be first.
# Ordering when linking is important, and $(KBUILD_ZEPHYR_INIT) must be first.
#
# tinymountain
# ^
# |
# +-< $(KBUILD_TIMO_INIT)
# +-< $(KBUILD_ZEPHYR_INIT)
# | +--< init/version.o + more
# |
# +--< $(KBUILD_TIMO_MAIN)
# +--< $(KBUILD_ZEPHYR_MAIN)
# | +--< drivers/built-in.o mm/built-in.o + more
# |
# +-< ${kallsymso} (see description in KALLSYMS section)
@ -49,7 +49,7 @@ linker_params()
echo "-L ${objtree}/include/generated" >> ${1}
echo "-u _OffsetAbsSyms -u _ConfigAbsSyms" >> ${1}
echo "-e __start" >> ${1}
echo "--start-group ${KBUILD_TIMO_MAIN}" >> ${1}
echo "--start-group ${KBUILD_ZEPHYR_MAIN}" >> ${1}
echo "${objtree}/include/generated/offsets.o" >> ${1}
echo "--end-group" >> ${1}
echo "${LIB_INCLUDE_DIR} ${LIBS}" >> ${1}
@ -133,7 +133,7 @@ kallsyms()
fi
local aflags="${KBUILD_AFLAGS} ${KBUILD_AFLAGS_KERNEL} \
${NOSTDINC_FLAGS} ${TIMOINCLUDE} ${KBUILD_CPPFLAGS}"
${NOSTDINC_FLAGS} ${ZEPHYRINCLUDE} ${KBUILD_CPPFLAGS}"
${NM} -n ${1} | \
scripts/kallsyms ${kallsymopt} | \

4
scripts/maintainer-checkpatch.bash
View file

@ -48,9 +48,9 @@ checkpatch_switches="\
"
ignore_list=BRACES,PRINTK_WITHOUT_KERN_LEVEL,SPLIT_STRING,FILE_PATH_CHANGES
timestamp_bin=${TIMO_BASE}/scripts/timestamp
timestamp_bin=${ZEPHYR_BASE}/scripts/timestamp
timestamp="${timestamp_bin} -u"
checkpatch_bin=${TIMO_BASE}/scripts/checkpatch.pl
checkpatch_bin=${ZEPHYR_BASE}/scripts/checkpatch.pl
checkpatch="${checkpatch_bin} ${checkpatch_switches} --ignore ${ignore_list}"
ts=$(${timestamp})

12
scripts/sanity_chk/common-klibs_chk
View file

@ -33,20 +33,20 @@
# Import common sanity check definitions
#
if [ -z ${TIMO_BASE} ]; then
if [ -z ${ZEPHYR_BASE} ]; then
echo "shell variables required to build Zephyr OS are not set"
exit 1
fi
if [ ! -d ${TIMO_BASE} ] ; then
echo "directory ${TIMO_BASE} not found"
if [ ! -d ${ZEPHYR_BASE} ] ; then
echo "directory ${ZEPHYR_BASE} not found"
exit 1
fi
source ${TIMO_BASE}/scripts/sanity_chk/common.defs
source ${ZEPHYR_BASE}/scripts/sanity_chk/common.defs
# Location of master project directory
#
PRJ_PATH=${TIMO_BASE}/samples
KLIBS_PRJ_PATH=${TIMO_BASE}/samples
PRJ_PATH=${ZEPHYR_BASE}/samples
KLIBS_PRJ_PATH=${ZEPHYR_BASE}/samples
TEST_PRJ_PATH=./
# Pseudo-file describing sample projects to be sanitized

8
scripts/sanity_chk/common.defs
View file

@ -60,12 +60,12 @@ KEEP_LOGS=0
SANITY_CHK_LOG="sanity_chk.log"
# directory containing code coverage results
CC_DIR=${TIMO_BASE}/codecoverage/`${BASENAME} $0`/
HTML_CC_DIR=${TIMO_BASE}/codecoverage_html/`${BASENAME} $0`/
CC_DIR=${ZEPHYR_BASE}/codecoverage/`${BASENAME} $0`/
HTML_CC_DIR=${ZEPHYR_BASE}/codecoverage_html/`${BASENAME} $0`/
# temporary files used when selecting projects to be sanitized
TEMP_AWK_PROG="${TIMO_BASE}/.tempawkprog"
TEMP_PRJ_LIST="${TIMO_BASE}/.tempprojlist"
TEMP_AWK_PROG="${ZEPHYR_BASE}/.tempawkprog"
TEMP_PRJ_LIST="${ZEPHYR_BASE}/.tempprojlist"
# maximum time (in seconds) to allow QEMU to execute a project
QEMU_TIME_LIMIT=300

12
scripts/sanity_chk/footprint_chk
View file

@ -33,22 +33,22 @@
# Import common sanity check definitions
#
if [ -z ${TIMO_BASE} ]; then
if [ -z ${ZEPHYR_BASE} ]; then
echo "shell variables required to build Zephyr OS are not set"
exit 1
fi
if [ ! -d ${TIMO_BASE} ] ; then
echo "directory ${TIMO_BASE} not found"
if [ ! -d ${ZEPHYR_BASE} ] ; then
echo "directory ${ZEPHYR_BASE} not found"
exit 1
fi
source ${TIMO_BASE}/scripts/sanity_chk/common.defs
source ${ZEPHYR_BASE}/scripts/sanity_chk/common.defs
# Additional commands used in script
SIZE="${TIMO_BASE}/scripts/truesize"
SIZE="${ZEPHYR_BASE}/scripts/truesize"
# Location of master project directory
#
PRJ_PATH=${TIMO_BASE}/samples
PRJ_PATH=${ZEPHYR_BASE}/samples
# Pseudo-file describing sample projects to be characterized
#

20
scripts/sanity_chk/out-of-tree_chk
View file

@ -36,18 +36,18 @@ exit 0
# Import common sanity check definitions
#
if [ -z ${TIMO_BASE} ]; then
if [ -z ${ZEPHYR_BASE} ]; then
echo "shell variables required to build Zephyr OS are not set"
exit 1
fi
if [ ! -d ${TIMO_BASE} ] ; then
echo "directory ${TIMO_BASE} not found"
if [ ! -d ${ZEPHYR_BASE} ] ; then
echo "directory ${ZEPHYR_BASE} not found"
exit 1
fi
source ${TIMO_BASE}/scripts/sanity_chk/common.defs
source ${ZEPHYR_BASE}/scripts/sanity_chk/common.defs
# Out of tree location
OUT_OF_TREE_BASE_REL=${TIMO_BASE}/../$(basename ${TIMO_BASE})-sanity
OUT_OF_TREE_BASE_REL=${ZEPHYR_BASE}/../$(basename ${ZEPHYR_BASE})-sanity
OUT_OF_TREE_BASE=$(${ABS_PATH} ${OUT_OF_TREE_BASE_REL})
# Location of master project directory
@ -132,8 +132,8 @@ possible; if desired the script can be instructed to skip the QEMU execution
step.
BSPs and samples are copied to:
TIMO_BASE/../sanity/bsp
TIMO_BASE/../sanity/samples
ZEPHYR_BASE/../sanity/bsp
ZEPHYR_BASE/../sanity/samples
The script returns 0 on success. If an error is encountered at any point
the script returns the exit value of the command that failed, the function
@ -246,13 +246,13 @@ main() {
${MKDIR} -p ${OUT_OF_TREE_BASE}
# copy the BSPs
${CP} -r ${TIMO_BASE}/target/bsp ${OUT_OF_TREE_BASE}
${CP} -r ${ZEPHYR_BASE}/target/bsp ${OUT_OF_TREE_BASE}
[ $? -eq 0 ] || fail_exit $? $FUNCNAME $LINENO
# copy the samples/include directory used by certain projects
${MKDIR} -p ${PRJ_PATH}
[ $? -eq 0 ] || fail_exit $? $FUNCNAME $LINENO
${CP} -r ${TIMO_BASE}/samples/include ${PRJ_PATH}
${CP} -r ${ZEPHYR_BASE}/samples/include ${PRJ_PATH}
[ $? -eq 0 ] || fail_exit $? $FUNCNAME $LINENO
# build (and optionally execute) projects
@ -271,7 +271,7 @@ main() {
${MKDIR} -p ${PRJ_PATH}/${PRJ_NAME[${cur_proj}]}
[ $? -eq 0 ] || fail_exit $? $FUNCNAME $LINENO
${CP} -r ${TIMO_BASE}/samples/${PRJ_NAME[${cur_proj}]}/* ${PRJ_PATH}/${PRJ_NAME[${cur_proj}]}
${CP} -r ${ZEPHYR_BASE}/samples/${PRJ_NAME[${cur_proj}]}/* ${PRJ_PATH}/${PRJ_NAME[${cur_proj}]}
[ $? -eq 0 ] || fail_exit $? $FUNCNAME $LINENO
# build project

10
scripts/sanity_chk/regression_chk
View file

@ -33,19 +33,19 @@
# Import common sanity check definitions
#
if [ -z ${TIMO_BASE} ]; then
if [ -z ${ZEPHYR_BASE} ]; then
echo "shell variables required to build Zephyr OS are not set"
exit 1
fi
if [ ! -d ${TIMO_BASE} ] ; then
echo "directory ${TIMO_BASE} not found"
if [ ! -d ${ZEPHYR_BASE} ] ; then
echo "directory ${ZEPHYR_BASE} not found"
exit 1
fi
source ${TIMO_BASE}/scripts/sanity_chk/common.defs
source ${ZEPHYR_BASE}/scripts/sanity_chk/common.defs
# Location of master project directory
#
PRJ_PATH=${TIMO_BASE}/samples
PRJ_PATH=${ZEPHYR_BASE}/samples
# Pseudo-file describing sample projects to be sanitized
#

12
scripts/sanity_chk/sanity_chk
View file

@ -33,20 +33,20 @@
# Import common sanity check definitions
#
if [ -z ${TIMO_BASE} ]; then
if [ -z ${ZEPHYR_BASE} ]; then
echo "shell variables required to build Zephyr OS are not set"
exit 1
fi
if [ ! -d ${TIMO_BASE} ] ; then
echo "directory ${TIMO_BASE} not found"
if [ ! -d ${ZEPHYR_BASE} ] ; then
echo "directory ${ZEPHYR_BASE} not found"
exit 1
fi
source ${TIMO_BASE}/scripts/sanity_chk/common.defs
source ${ZEPHYR_BASE}/scripts/sanity_chk/common.defs
# Symbols used in this script only
#
SCRIPT_PATH=${TIMO_BASE}/scripts/sanity_chk
HOST_TOOLS_SRC_PATH=${TIMO_BASE}/host/src
SCRIPT_PATH=${ZEPHYR_BASE}/scripts/sanity_chk
HOST_TOOLS_SRC_PATH=${ZEPHYR_BASE}/host/src
# print script usage
#

4
scripts/sysgen.py
View file

@ -1052,7 +1052,7 @@ def kernel_main_h_generate():
subprocess.check_call([
"cp",
"-f",
os.environ["TIMO_BASE"] +
os.environ["ZEPHYR_BASE"] +
"/kernel/microkernel/include/kernel_main.h",
output_dir])
@ -1070,7 +1070,7 @@ def kernel_struct_h_generate():
subprocess.check_call([
"cp",
"-f",
os.environ["TIMO_BASE"] +
os.environ["ZEPHYR_BASE"] +
"/kernel/microkernel/include/kernel_struct.h",
output_dir])

4
timo-env.sh
View file

@ -9,9 +9,9 @@ fi
# run (if it exists) by this script.
# identify OS source tree root directory
export TIMO_BASE=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
export ZEPHYR_BASE=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
scripts_path=${TIMO_BASE}/scripts
scripts_path=${ZEPHYR_BASE}/scripts
echo "${PATH}" | grep -q "${scripts_path}"
[ $? != 0 ] && export PATH=${scripts_path}:${PATH}
unset scripts_path