From: Petr Benes Date: Wed, 30 Mar 2011 13:34:14 +0000 (+0200) Subject: Directory rtems-omk-template renamed to src X-Git-Url: http://rtime.felk.cvut.cz/gitweb/rtems-pluggable-edf.git/commitdiff_plain/75b254581af4e56e3dca7e14b71489364a83b3eb Directory rtems-omk-template renamed to src --- diff --git a/rtems-omk-template/config.omk b/rtems-omk-template/config.omk deleted file mode 100644 index d57fc65..0000000 --- a/rtems-omk-template/config.omk +++ /dev/null @@ -1,3 +0,0 @@ -#RTEMS_MAKEFILE_PATH=/home/petr/git/rtems/b-rtems-icecube/powerpc-rtems4.10/icecube -RTEMS_MAKEFILE_PATH=/home/petr/git/rtems/b-rtems-i386/i386-rtems4.11/pc386 - \ No newline at end of file diff --git a/rtems-omk-template/.gitignore b/src/.gitignore similarity index 100% rename from rtems-omk-template/.gitignore rename to src/.gitignore diff --git a/rtems-omk-template/Makefile b/src/Makefile similarity index 100% rename from rtems-omk-template/Makefile rename to src/Makefile diff --git a/rtems-omk-template/Makefile.omk b/src/Makefile.omk similarity index 100% rename from rtems-omk-template/Makefile.omk rename to src/Makefile.omk diff --git a/rtems-omk-template/Makefile.rules b/src/Makefile.rules similarity index 100% rename from rtems-omk-template/Makefile.rules rename to src/Makefile.rules diff --git a/rtems-omk-template/README.makerules b/src/README.makerules similarity index 100% rename from rtems-omk-template/README.makerules rename to src/README.makerules diff --git a/rtems-omk-template/appfoo/Makefile b/src/appfoo/Makefile similarity index 100% rename from rtems-omk-template/appfoo/Makefile rename to src/appfoo/Makefile diff --git a/rtems-omk-template/appfoo/Makefile.omk b/src/appfoo/Makefile.omk similarity index 100% rename from rtems-omk-template/appfoo/Makefile.omk rename to src/appfoo/Makefile.omk diff --git a/rtems-omk-template/appfoo/app_def.h b/src/appfoo/app_def.h similarity index 100% rename from rtems-omk-template/appfoo/app_def.h rename to src/appfoo/app_def.h diff --git a/rtems-omk-template/appfoo/init.c b/src/appfoo/init.c similarity index 100% rename from rtems-omk-template/appfoo/init.c rename to src/appfoo/init.c diff --git a/rtems-omk-template/appfoo/system.h b/src/appfoo/system.h similarity index 100% rename from rtems-omk-template/appfoo/system.h rename to src/appfoo/system.h diff --git a/rtems-omk-template/appfoo/task_1.c b/src/appfoo/task_1.c similarity index 100% rename from rtems-omk-template/appfoo/task_1.c rename to src/appfoo/task_1.c diff --git a/rtems-omk-template/appfoo/task_2.c b/src/appfoo/task_2.c similarity index 100% rename from rtems-omk-template/appfoo/task_2.c rename to src/appfoo/task_2.c diff --git a/src/config.omk-default b/src/config.omk-default new file mode 100644 index 0000000..33d23fa --- /dev/null +++ b/src/config.omk-default @@ -0,0 +1,10 @@ +# Start of OMK config file +# This file should not be altered manually +# Overrides should be stored in file config.omk + +# Config for system_opt +# Config for libbar +# Config for appfoo +CONFIG_OC_BUILD4RTEMS=y +CONFIG_OC_GDBSTUB=n +# Config for diff --git a/src/config.target b/src/config.target new file mode 100644 index 0000000..1d83396 --- /dev/null +++ b/src/config.target @@ -0,0 +1,81 @@ +# -*- makefile-gmake -*- +# Config file for compilation by OMK for RTEMS OS target + +# You can override these variables in config.omk +AQUOSA_ROOT ?= $(wildcard /usr/local/aquosa) +QTDIR ?= $(wildcard /usr/share/qt4) + +test: wvtest +.PHONY: test + +# Platform name as preprocessor symbol +export PLATFORM=rtems +# Platform name as used in file names +export PLATFORM_FN=rtems + +# Create symbolic links to headers instead of copying them. Useful +# during development. +LN_HEADERS=y + +# We do not want to overwrite original FRESCOR Makefiles +USE_LEAF_MAKEFILES=n + +OMIT_KERNEL_PASSES=y + +######################################## +# Setting of compiler +######################################## + +# Instead, we call normal gcc with parameters which mgcc adds + +CFLAGS=$(ARCH_GCC_OPTS) -fpic -Wall -Wuninitialized -g -O1 -D_REENTRANT -D$(PLATFORM) -D_XOPEN_SOURCE=600 -D_BSD_SOURCE +LDFLAGS=$(ARCH_LD_OPTS) $(LIBS_PATH) $(LIBS) +LDFLAGS += '-Wl,-rpath,$$ORIGIN/../lib' -z origin --enable-new-dtags + +IDL_COMPILER = $(OUTPUT_DIR)/_compiled/bin/forb-idl + +# Other config +FRSH_DISTRIBUTED_MODULE_SUPPORTED=true +CONFIG_FORB_PROTO_UNIX=n +CONFIG_FORB_PROTO_INET_DEFAULT=y + +# Disable tests which do not compile with FRSH_FORB + +CONFIG_FRSH_TEST_context_switch=n # Needs timespec_operations.h and frsh_os_compatibility.h +CONFIG_FRSH_TEST_demo_september2007=n # Needs frsh_thread_get_vres_id() +CONFIG_FRSH_TEST_demo_september2007_with_signals=n # Some problem with signal constants and non-int vres_id +CONFIG_FRSH_TEST_dl_test=n # Needs different Makefile.omk +CONFIG_FRSH_TEST_example_d-ac1_frescor=n # Needs int vres_id +CONFIG_FRSH_TEST_frsh_shared_obj_test=n # Needs eat.h and timespec_operations.h +CONFIG_FRSH_TEST_functions=n # Needs timespec_operations.h and frsh_os_compatibility.h +CONFIG_FRSH_TEST_jitter_test=n # Needs timespec_operations.h and frsh_os_compatibility.h +CONFIG_FRSH_TEST_sharedobj_prototype=n # Needs frsh_sharedobj_XXX +CONFIG_FRSH_TEST_test_bind=n # Needs eat.h and timespec_operations.h +CONFIG_FRSH_TEST_test_contract_labels=n # Needs eat.h and timespec_operations.h +CONFIG_FRSH_TEST_test_eat=n # Needs eat.h +CONFIG_FRSH_TEST_test_frsh_performance=n # Needs more frsh api - todo +CONFIG_FRSH_TEST_test_frsh_renegotiate_async=n # Needs eat.h and timespec_operations.h +CONFIG_FRSH_TEST_test_frsh_synch_obj=n # Needs frsh_thread_id_t to be simple type - Aquosa declares it as structure +CONFIG_FRSH_TEST_test_memory=n # Needs different Makefile.omk and then we will see :) +CONFIG_FRSH_TEST_demo_sept07_negotiate_and_send=n # Needs RTEP +CONFIG_FRSH_TEST_demo_sept07_negotiations_limit=n # Needs RTEP +CONFIG_FRSH_TEST_demo_sept07_renegotiate_and_send=n # Needs RTEP +CONFIG_FRSH_TEST_test_endpoints=n # Needs RTEP +CONFIG_FRSH_TEST_test_frsh_distributed_contract_negotiate=n # Nedds vres_id to be int +CONFIG_FRSH_TEST_test_frsh_distributed_contract_renegotiate=n # Needs RTEP +CONFIG_FRSH_TEST_test_frsh_distributed_init=n # Needs THE_FRSH_CPU_ID +CONFIG_FRSH_TEST_test_frsh_marshal=n # Accesses frsh_contract_t fields directly +CONFIG_FRSH_TEST_test_frsh_send_receive_basic=n # Needs RTEP +CONFIG_FRSH_TEST_test_get_network_info=n # Needs RTEP +CONFIG_FRSH_TEST_test_self_bind=n # Needs eat.h and timespec_operations.h +CONFIG_FRSH_TEST_test_sizes=n # Needs frsh_internal.h - TODO +CONFIG_FRSH_TEST_test_spare_capacity=n # Needs more frsh api - TODO +CONFIG_FRSH_TEST_test_timespec_operations=n # Needs timespec_operations.h +CONFIG_FRSH_TEST_test_vres_id_bits=n # Depends on bit-fields in integer vres_id +CONFIG_FSA_TESTS=n # Depends on bit-fields in integer vres_id + +# Define the RTEMS installation directory in your config.omk +RTEMS_MAKEFILE_PATH = /opt/rtems/i386-rtems4.10/pc586 + +# NOTE: If the install as root fails due to not having RTEMS tools in your PATH, +# you will have to "export PATH=/opt/rtems-4.10/bin:$PATH" as well. diff --git a/rtems-omk-template/config/config.csb336 b/src/config/config.csb336 similarity index 100% rename from rtems-omk-template/config/config.csb336 rename to src/config/config.csb336 diff --git a/rtems-omk-template/config/config.ec555 b/src/config/config.ec555 similarity index 100% rename from rtems-omk-template/config/config.ec555 rename to src/config/config.ec555 diff --git a/rtems-omk-template/config/config.mo376 b/src/config/config.mo376 similarity index 100% rename from rtems-omk-template/config/config.mo376 rename to src/config/config.mo376 diff --git a/rtems-omk-template/edf/Makefile b/src/edf/Makefile similarity index 100% rename from rtems-omk-template/edf/Makefile rename to src/edf/Makefile diff --git a/rtems-omk-template/edf/Makefile.omk b/src/edf/Makefile.omk similarity index 100% rename from rtems-omk-template/edf/Makefile.omk rename to src/edf/Makefile.omk diff --git a/rtems-omk-template/edf/edf_types.h b/src/edf/edf_types.h similarity index 100% rename from rtems-omk-template/edf/edf_types.h rename to src/edf/edf_types.h diff --git a/rtems-omk-template/edf/rbtree.c b/src/edf/rbtree.c similarity index 100% rename from rtems-omk-template/edf/rbtree.c rename to src/edf/rbtree.c diff --git a/rtems-omk-template/edf/rbtree.h b/src/edf/rbtree.h similarity index 100% rename from rtems-omk-template/edf/rbtree.h rename to src/edf/rbtree.h diff --git a/rtems-omk-template/edf/scheduler_edf.c b/src/edf/scheduler_edf.c similarity index 100% rename from rtems-omk-template/edf/scheduler_edf.c rename to src/edf/scheduler_edf.c diff --git a/rtems-omk-template/edf/scheduler_edf.h b/src/edf/scheduler_edf.h similarity index 100% rename from rtems-omk-template/edf/scheduler_edf.h rename to src/edf/scheduler_edf.h diff --git a/rtems-omk-template/libbar/Makefile b/src/libbar/Makefile similarity index 100% rename from rtems-omk-template/libbar/Makefile rename to src/libbar/Makefile diff --git a/rtems-omk-template/libbar/Makefile.omk b/src/libbar/Makefile.omk similarity index 100% rename from rtems-omk-template/libbar/Makefile.omk rename to src/libbar/Makefile.omk diff --git a/rtems-omk-template/libbar/bar.h b/src/libbar/bar.h similarity index 100% rename from rtems-omk-template/libbar/bar.h rename to src/libbar/bar.h diff --git a/rtems-omk-template/libbar/function1.c b/src/libbar/function1.c similarity index 100% rename from rtems-omk-template/libbar/function1.c rename to src/libbar/function1.c diff --git a/rtems-omk-template/libbar/function2.c b/src/libbar/function2.c similarity index 100% rename from rtems-omk-template/libbar/function2.c rename to src/libbar/function2.c diff --git a/rtems-omk-template/system_opt/Makefile b/src/system_opt/Makefile similarity index 100% rename from rtems-omk-template/system_opt/Makefile rename to src/system_opt/Makefile diff --git a/rtems-omk-template/system_opt/Makefile.omk b/src/system_opt/Makefile.omk similarity index 100% rename from rtems-omk-template/system_opt/Makefile.omk rename to src/system_opt/Makefile.omk diff --git a/rtems-omk-template/system_opt/system_def.h b/src/system_opt/system_def.h similarity index 100% rename from rtems-omk-template/system_opt/system_def.h rename to src/system_opt/system_def.h