diff --git a/repos/base-foc/recipes/src/base-foc/README b/repos/base-foc/recipes/src/base-foc-arndale/README similarity index 100% rename from repos/base-foc/recipes/src/base-foc/README rename to repos/base-foc/recipes/src/base-foc-arndale/README diff --git a/repos/base-foc/recipes/src/base-foc-arndale/base-foc-pbxa9/README b/repos/base-foc/recipes/src/base-foc-arndale/base-foc-pbxa9/README new file mode 100644 index 000000000..c19a0dd5b --- /dev/null +++ b/repos/base-foc/recipes/src/base-foc-arndale/base-foc-pbxa9/README @@ -0,0 +1,7 @@ +This archive contains the Fiasco.OC-specific part of Genode. + +It also contains the source code of the Fiasco.OC kernel in the +'src/kernel/foc' directory. + +Please note that Fiasco.OC has a license distinct from Genode. Fiasco.OC's +license can be found at 'src/kernel/foc/COPYING-GPL-2'. diff --git a/repos/base-foc/recipes/src/base-foc-arndale/base-foc-pbxa9/content.mk b/repos/base-foc/recipes/src/base-foc-arndale/base-foc-pbxa9/content.mk new file mode 100644 index 000000000..e63b0c0a7 --- /dev/null +++ b/repos/base-foc/recipes/src/base-foc-arndale/base-foc-pbxa9/content.mk @@ -0,0 +1,7 @@ +RECIPE_DIR := $(REP_DIR)/recipes/src/base-foc-pbxa9 + +include $(GENODE_DIR)/repos/base-foc/recipes/src/base-foc_content.inc + +content: enable_board_spec +enable_board_spec: etc/specs.conf + echo "SPECS += pbxa9" >> etc/specs.conf diff --git a/repos/base-foc/recipes/src/base-foc-arndale/base-foc-pbxa9/hash b/repos/base-foc/recipes/src/base-foc-arndale/base-foc-pbxa9/hash new file mode 100644 index 000000000..82a870c72 --- /dev/null +++ b/repos/base-foc/recipes/src/base-foc-arndale/base-foc-pbxa9/hash @@ -0,0 +1 @@ +2018-11-06-b 778d83a4be78dcd6d1e4d45f1ca103def7b298a5 diff --git a/repos/base-foc/recipes/src/base-foc/used_apis b/repos/base-foc/recipes/src/base-foc-arndale/base-foc-pbxa9/used_apis similarity index 100% rename from repos/base-foc/recipes/src/base-foc/used_apis rename to repos/base-foc/recipes/src/base-foc-arndale/base-foc-pbxa9/used_apis diff --git a/repos/base-foc/recipes/src/base-foc-arndale/content.mk b/repos/base-foc/recipes/src/base-foc-arndale/content.mk new file mode 100644 index 000000000..aa745520b --- /dev/null +++ b/repos/base-foc/recipes/src/base-foc-arndale/content.mk @@ -0,0 +1,7 @@ +RECIPE_DIR := $(REP_DIR)/recipes/src/base-foc-arndale + +include $(GENODE_DIR)/repos/base-foc/recipes/src/base-foc_content.inc + +content: enable_board_spec +enable_board_spec: etc/specs.conf + echo "SPECS += arndale" >> etc/specs.conf diff --git a/repos/base-foc/recipes/src/base-foc-arndale/hash b/repos/base-foc/recipes/src/base-foc-arndale/hash new file mode 100644 index 000000000..6768d126a --- /dev/null +++ b/repos/base-foc/recipes/src/base-foc-arndale/hash @@ -0,0 +1 @@ +2018-11-06-c 9c3d5c2a4be6f1da2b8e76c2bb212959200119d8 diff --git a/repos/base-foc/recipes/src/base-foc-arndale/used_apis b/repos/base-foc/recipes/src/base-foc-arndale/used_apis new file mode 100644 index 000000000..df967b96a --- /dev/null +++ b/repos/base-foc/recipes/src/base-foc-arndale/used_apis @@ -0,0 +1 @@ +base diff --git a/repos/base-foc/recipes/src/base-foc-pbxa9/README b/repos/base-foc/recipes/src/base-foc-pbxa9/README new file mode 100644 index 000000000..c19a0dd5b --- /dev/null +++ b/repos/base-foc/recipes/src/base-foc-pbxa9/README @@ -0,0 +1,7 @@ +This archive contains the Fiasco.OC-specific part of Genode. + +It also contains the source code of the Fiasco.OC kernel in the +'src/kernel/foc' directory. + +Please note that Fiasco.OC has a license distinct from Genode. Fiasco.OC's +license can be found at 'src/kernel/foc/COPYING-GPL-2'. diff --git a/repos/base-foc/recipes/src/base-foc-pbxa9/content.mk b/repos/base-foc/recipes/src/base-foc-pbxa9/content.mk new file mode 100644 index 000000000..e63b0c0a7 --- /dev/null +++ b/repos/base-foc/recipes/src/base-foc-pbxa9/content.mk @@ -0,0 +1,7 @@ +RECIPE_DIR := $(REP_DIR)/recipes/src/base-foc-pbxa9 + +include $(GENODE_DIR)/repos/base-foc/recipes/src/base-foc_content.inc + +content: enable_board_spec +enable_board_spec: etc/specs.conf + echo "SPECS += pbxa9" >> etc/specs.conf diff --git a/repos/base-foc/recipes/src/base-foc-pbxa9/hash b/repos/base-foc/recipes/src/base-foc-pbxa9/hash new file mode 100644 index 000000000..82a870c72 --- /dev/null +++ b/repos/base-foc/recipes/src/base-foc-pbxa9/hash @@ -0,0 +1 @@ +2018-11-06-b 778d83a4be78dcd6d1e4d45f1ca103def7b298a5 diff --git a/repos/base-foc/recipes/src/base-foc-pbxa9/used_apis b/repos/base-foc/recipes/src/base-foc-pbxa9/used_apis new file mode 100644 index 000000000..df967b96a --- /dev/null +++ b/repos/base-foc/recipes/src/base-foc-pbxa9/used_apis @@ -0,0 +1 @@ +base diff --git a/repos/base-foc/recipes/src/base-foc-pc/README b/repos/base-foc/recipes/src/base-foc-pc/README new file mode 100644 index 000000000..c19a0dd5b --- /dev/null +++ b/repos/base-foc/recipes/src/base-foc-pc/README @@ -0,0 +1,7 @@ +This archive contains the Fiasco.OC-specific part of Genode. + +It also contains the source code of the Fiasco.OC kernel in the +'src/kernel/foc' directory. + +Please note that Fiasco.OC has a license distinct from Genode. Fiasco.OC's +license can be found at 'src/kernel/foc/COPYING-GPL-2'. diff --git a/repos/base-foc/recipes/src/base-foc-pc/content.mk b/repos/base-foc/recipes/src/base-foc-pc/content.mk new file mode 100644 index 000000000..645d61d72 --- /dev/null +++ b/repos/base-foc/recipes/src/base-foc-pc/content.mk @@ -0,0 +1,3 @@ +RECIPE_DIR := $(REP_DIR)/recipes/src/base-foc-pc + +include $(GENODE_DIR)/repos/base-foc/recipes/src/base-foc_content.inc diff --git a/repos/base-foc/recipes/src/base-foc-pc/hash b/repos/base-foc/recipes/src/base-foc-pc/hash new file mode 100644 index 000000000..8ffcfe569 --- /dev/null +++ b/repos/base-foc/recipes/src/base-foc-pc/hash @@ -0,0 +1 @@ +2018-11-06-j f0d5882cc063d09f7653d785dc768c1c022628c9 diff --git a/repos/base-foc/recipes/src/base-foc-pc/used_apis b/repos/base-foc/recipes/src/base-foc-pc/used_apis new file mode 100644 index 000000000..df967b96a --- /dev/null +++ b/repos/base-foc/recipes/src/base-foc-pc/used_apis @@ -0,0 +1 @@ +base diff --git a/repos/base-foc/recipes/src/base-foc/hash b/repos/base-foc/recipes/src/base-foc/hash deleted file mode 100644 index c8bbfbbb2..000000000 --- a/repos/base-foc/recipes/src/base-foc/hash +++ /dev/null @@ -1 +0,0 @@ -2018-10-28 6ebb0b309d21f4ae6b3d267fd03c86f18aa616c2 diff --git a/repos/base-foc/recipes/src/base-foc/content.mk b/repos/base-foc/recipes/src/base-foc_content.inc similarity index 95% rename from repos/base-foc/recipes/src/base-foc/content.mk rename to repos/base-foc/recipes/src/base-foc_content.inc index bc6b61a15..7e6cd81f0 100644 --- a/repos/base-foc/recipes/src/base-foc/content.mk +++ b/repos/base-foc/recipes/src/base-foc_content.inc @@ -24,7 +24,7 @@ include/spec/%/trace/timestamp.h: content: README README: - cp $(REP_DIR)/recipes/src/base-foc/README $@ + cp $(RECIPE_DIR)/README $@ content: lib/import config etc lib/import config etc: diff --git a/repos/base/recipes/src/base_content.inc b/repos/base/recipes/src/base_content.inc index 455c015e3..fbc04f4b0 100644 --- a/repos/base/recipes/src/base_content.inc +++ b/repos/base/recipes/src/base_content.inc @@ -17,7 +17,7 @@ content: etc/specs.conf etc/specs.conf: $(mirror_from_rep_dir) -MIRRORED_FROM_OS := $(addprefix lib/mk/,timeout.mk alarm.mk timed_semaphore.mk)\ +MIRRORED_FROM_OS := $(addprefix lib/mk/,timeout.mk timeout-arm.mk alarm.mk timed_semaphore.mk)\ $(addprefix src/lib/,timeout alarm timed_semaphore) \ $(addprefix include/os/,alarm.h duration.h timed_semaphore.h) \ include/timer/timeout.h \ diff --git a/tool/run/boot_dir/foc b/tool/run/boot_dir/foc index 1ea219148..abbec37e5 100644 --- a/tool/run/boot_dir/foc +++ b/tool/run/boot_dir/foc @@ -219,7 +219,9 @@ proc run_boot_dir {binaries} { # proc base_src { } { - if {[have_spec x86]} { return base-foc } + if {[have_spec x86]} { return base-foc-pc } + if {[have_spec pbxa9]} { return base-foc-pbxa9 } + if {[have_spec arndale]} { return base-foc-arndale } global specs