From 655fbbd984747363f3de4ca4a854c9e0ab7d59ae Mon Sep 17 00:00:00 2001 From: Martin Stein Date: Mon, 5 Nov 2018 12:53:12 +0100 Subject: [PATCH] base-hw: recipes for ARMv7a platforms * To base-hw/recipes/src add base-hw-arndale, base-hw-imx53_qsb, base-hw-imx53_qsb_tz, base-hw-odroid_xu, base-hw-panda, base-hw-rpi, base-hw-wand_quad * Ensure that the correct base-hw recipe is choosen by the run module 'boot_dir/hw' --- repos/base-hw/recipes/src/base-hw-arndale/content.mk | 5 +++++ repos/base-hw/recipes/src/base-hw-arndale/hash | 1 + repos/base-hw/recipes/src/base-hw-arndale/used_apis | 2 ++ .../base-hw/recipes/src/base-hw-imx53_qsb/content.mk | 5 +++++ repos/base-hw/recipes/src/base-hw-imx53_qsb/hash | 1 + repos/base-hw/recipes/src/base-hw-imx53_qsb/used_apis | 2 ++ .../recipes/src/base-hw-imx53_qsb_tz/content.mk | 5 +++++ repos/base-hw/recipes/src/base-hw-imx53_qsb_tz/hash | 1 + .../recipes/src/base-hw-imx53_qsb_tz/used_apis | 2 ++ .../base-hw/recipes/src/base-hw-odroid_xu/content.mk | 5 +++++ repos/base-hw/recipes/src/base-hw-odroid_xu/hash | 1 + repos/base-hw/recipes/src/base-hw-odroid_xu/used_apis | 2 ++ repos/base-hw/recipes/src/base-hw-panda/content.mk | 5 +++++ repos/base-hw/recipes/src/base-hw-panda/hash | 1 + repos/base-hw/recipes/src/base-hw-panda/used_apis | 2 ++ repos/base-hw/recipes/src/base-hw-rpi/content.mk | 5 +++++ repos/base-hw/recipes/src/base-hw-rpi/hash | 1 + repos/base-hw/recipes/src/base-hw-rpi/used_apis | 2 ++ .../base-hw/recipes/src/base-hw-wand_quad/content.mk | 5 +++++ repos/base-hw/recipes/src/base-hw-wand_quad/hash | 1 + repos/base-hw/recipes/src/base-hw-wand_quad/used_apis | 2 ++ tool/run/boot_dir/hw | 11 +++++++++-- 22 files changed, 65 insertions(+), 2 deletions(-) create mode 100644 repos/base-hw/recipes/src/base-hw-arndale/content.mk create mode 100644 repos/base-hw/recipes/src/base-hw-arndale/hash create mode 100644 repos/base-hw/recipes/src/base-hw-arndale/used_apis create mode 100644 repos/base-hw/recipes/src/base-hw-imx53_qsb/content.mk create mode 100644 repos/base-hw/recipes/src/base-hw-imx53_qsb/hash create mode 100644 repos/base-hw/recipes/src/base-hw-imx53_qsb/used_apis create mode 100644 repos/base-hw/recipes/src/base-hw-imx53_qsb_tz/content.mk create mode 100644 repos/base-hw/recipes/src/base-hw-imx53_qsb_tz/hash create mode 100644 repos/base-hw/recipes/src/base-hw-imx53_qsb_tz/used_apis create mode 100644 repos/base-hw/recipes/src/base-hw-odroid_xu/content.mk create mode 100644 repos/base-hw/recipes/src/base-hw-odroid_xu/hash create mode 100644 repos/base-hw/recipes/src/base-hw-odroid_xu/used_apis create mode 100644 repos/base-hw/recipes/src/base-hw-panda/content.mk create mode 100644 repos/base-hw/recipes/src/base-hw-panda/hash create mode 100644 repos/base-hw/recipes/src/base-hw-panda/used_apis create mode 100644 repos/base-hw/recipes/src/base-hw-rpi/content.mk create mode 100644 repos/base-hw/recipes/src/base-hw-rpi/hash create mode 100644 repos/base-hw/recipes/src/base-hw-rpi/used_apis create mode 100644 repos/base-hw/recipes/src/base-hw-wand_quad/content.mk create mode 100644 repos/base-hw/recipes/src/base-hw-wand_quad/hash create mode 100644 repos/base-hw/recipes/src/base-hw-wand_quad/used_apis diff --git a/repos/base-hw/recipes/src/base-hw-arndale/content.mk b/repos/base-hw/recipes/src/base-hw-arndale/content.mk new file mode 100644 index 0000000000..04169d6ad9 --- /dev/null +++ b/repos/base-hw/recipes/src/base-hw-arndale/content.mk @@ -0,0 +1,5 @@ +include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc + +content: enable_board_spec +enable_board_spec: etc/specs.conf + echo "SPECS += arndale" >> etc/specs.conf diff --git a/repos/base-hw/recipes/src/base-hw-arndale/hash b/repos/base-hw/recipes/src/base-hw-arndale/hash new file mode 100644 index 0000000000..ab784a62d9 --- /dev/null +++ b/repos/base-hw/recipes/src/base-hw-arndale/hash @@ -0,0 +1 @@ +2018-11-05-a 8f4d0a6154d84e0c92b67f64ba3fed2bb4bfa1f0 diff --git a/repos/base-hw/recipes/src/base-hw-arndale/used_apis b/repos/base-hw/recipes/src/base-hw-arndale/used_apis new file mode 100644 index 0000000000..ed9b772565 --- /dev/null +++ b/repos/base-hw/recipes/src/base-hw-arndale/used_apis @@ -0,0 +1,2 @@ +base-hw +base diff --git a/repos/base-hw/recipes/src/base-hw-imx53_qsb/content.mk b/repos/base-hw/recipes/src/base-hw-imx53_qsb/content.mk new file mode 100644 index 0000000000..ae699d23d4 --- /dev/null +++ b/repos/base-hw/recipes/src/base-hw-imx53_qsb/content.mk @@ -0,0 +1,5 @@ +include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc + +content: enable_board_spec +enable_board_spec: etc/specs.conf + echo "SPECS += imx53_qsb" >> etc/specs.conf diff --git a/repos/base-hw/recipes/src/base-hw-imx53_qsb/hash b/repos/base-hw/recipes/src/base-hw-imx53_qsb/hash new file mode 100644 index 0000000000..20a5a47a52 --- /dev/null +++ b/repos/base-hw/recipes/src/base-hw-imx53_qsb/hash @@ -0,0 +1 @@ +2018-11-05 9eddbddd66c217e3e11e8a9201113cb74d8f8928 diff --git a/repos/base-hw/recipes/src/base-hw-imx53_qsb/used_apis b/repos/base-hw/recipes/src/base-hw-imx53_qsb/used_apis new file mode 100644 index 0000000000..ed9b772565 --- /dev/null +++ b/repos/base-hw/recipes/src/base-hw-imx53_qsb/used_apis @@ -0,0 +1,2 @@ +base-hw +base diff --git a/repos/base-hw/recipes/src/base-hw-imx53_qsb_tz/content.mk b/repos/base-hw/recipes/src/base-hw-imx53_qsb_tz/content.mk new file mode 100644 index 0000000000..bd4c1df005 --- /dev/null +++ b/repos/base-hw/recipes/src/base-hw-imx53_qsb_tz/content.mk @@ -0,0 +1,5 @@ +include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc + +content: enable_board_spec +enable_board_spec: etc/specs.conf + echo "SPECS += imx53_qsb trustzone" >> etc/specs.conf diff --git a/repos/base-hw/recipes/src/base-hw-imx53_qsb_tz/hash b/repos/base-hw/recipes/src/base-hw-imx53_qsb_tz/hash new file mode 100644 index 0000000000..d516331161 --- /dev/null +++ b/repos/base-hw/recipes/src/base-hw-imx53_qsb_tz/hash @@ -0,0 +1 @@ +2018-11-05-a 1f2f1bdd1c00bab607fb94241f43425720129b73 diff --git a/repos/base-hw/recipes/src/base-hw-imx53_qsb_tz/used_apis b/repos/base-hw/recipes/src/base-hw-imx53_qsb_tz/used_apis new file mode 100644 index 0000000000..ed9b772565 --- /dev/null +++ b/repos/base-hw/recipes/src/base-hw-imx53_qsb_tz/used_apis @@ -0,0 +1,2 @@ +base-hw +base diff --git a/repos/base-hw/recipes/src/base-hw-odroid_xu/content.mk b/repos/base-hw/recipes/src/base-hw-odroid_xu/content.mk new file mode 100644 index 0000000000..2529b9737a --- /dev/null +++ b/repos/base-hw/recipes/src/base-hw-odroid_xu/content.mk @@ -0,0 +1,5 @@ +include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc + +content: enable_board_spec +enable_board_spec: etc/specs.conf + echo "SPECS += odroid_xu" >> etc/specs.conf diff --git a/repos/base-hw/recipes/src/base-hw-odroid_xu/hash b/repos/base-hw/recipes/src/base-hw-odroid_xu/hash new file mode 100644 index 0000000000..14a9a4f968 --- /dev/null +++ b/repos/base-hw/recipes/src/base-hw-odroid_xu/hash @@ -0,0 +1 @@ +2018-11-05 106bf65f6cc4d96351e95dd4af254285a31d07c1 diff --git a/repos/base-hw/recipes/src/base-hw-odroid_xu/used_apis b/repos/base-hw/recipes/src/base-hw-odroid_xu/used_apis new file mode 100644 index 0000000000..ed9b772565 --- /dev/null +++ b/repos/base-hw/recipes/src/base-hw-odroid_xu/used_apis @@ -0,0 +1,2 @@ +base-hw +base diff --git a/repos/base-hw/recipes/src/base-hw-panda/content.mk b/repos/base-hw/recipes/src/base-hw-panda/content.mk new file mode 100644 index 0000000000..3a3caa0eef --- /dev/null +++ b/repos/base-hw/recipes/src/base-hw-panda/content.mk @@ -0,0 +1,5 @@ +include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc + +content: enable_board_spec +enable_board_spec: etc/specs.conf + echo "SPECS += panda" >> etc/specs.conf diff --git a/repos/base-hw/recipes/src/base-hw-panda/hash b/repos/base-hw/recipes/src/base-hw-panda/hash new file mode 100644 index 0000000000..0dcf5215d2 --- /dev/null +++ b/repos/base-hw/recipes/src/base-hw-panda/hash @@ -0,0 +1 @@ +2018-11-05 c7a0234caa08656fde40fd3a66006af1bc77bb22 diff --git a/repos/base-hw/recipes/src/base-hw-panda/used_apis b/repos/base-hw/recipes/src/base-hw-panda/used_apis new file mode 100644 index 0000000000..ed9b772565 --- /dev/null +++ b/repos/base-hw/recipes/src/base-hw-panda/used_apis @@ -0,0 +1,2 @@ +base-hw +base diff --git a/repos/base-hw/recipes/src/base-hw-rpi/content.mk b/repos/base-hw/recipes/src/base-hw-rpi/content.mk new file mode 100644 index 0000000000..e87537b9f3 --- /dev/null +++ b/repos/base-hw/recipes/src/base-hw-rpi/content.mk @@ -0,0 +1,5 @@ +include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc + +content: enable_board_spec +enable_board_spec: etc/specs.conf + echo "SPECS += rpi" >> etc/specs.conf diff --git a/repos/base-hw/recipes/src/base-hw-rpi/hash b/repos/base-hw/recipes/src/base-hw-rpi/hash new file mode 100644 index 0000000000..35765e3397 --- /dev/null +++ b/repos/base-hw/recipes/src/base-hw-rpi/hash @@ -0,0 +1 @@ +2018-10-28 7be1865a9d95b419d3a8495bb485c514b6c260d1 diff --git a/repos/base-hw/recipes/src/base-hw-rpi/used_apis b/repos/base-hw/recipes/src/base-hw-rpi/used_apis new file mode 100644 index 0000000000..ed9b772565 --- /dev/null +++ b/repos/base-hw/recipes/src/base-hw-rpi/used_apis @@ -0,0 +1,2 @@ +base-hw +base diff --git a/repos/base-hw/recipes/src/base-hw-wand_quad/content.mk b/repos/base-hw/recipes/src/base-hw-wand_quad/content.mk new file mode 100644 index 0000000000..dec9bb767e --- /dev/null +++ b/repos/base-hw/recipes/src/base-hw-wand_quad/content.mk @@ -0,0 +1,5 @@ +include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc + +content: enable_board_spec +enable_board_spec: etc/specs.conf + echo "SPECS += wand_quad" >> etc/specs.conf diff --git a/repos/base-hw/recipes/src/base-hw-wand_quad/hash b/repos/base-hw/recipes/src/base-hw-wand_quad/hash new file mode 100644 index 0000000000..03d25e0362 --- /dev/null +++ b/repos/base-hw/recipes/src/base-hw-wand_quad/hash @@ -0,0 +1 @@ +2018-11-05 78cc4d50bda30536bbda5bb03bf8410115424def diff --git a/repos/base-hw/recipes/src/base-hw-wand_quad/used_apis b/repos/base-hw/recipes/src/base-hw-wand_quad/used_apis new file mode 100644 index 0000000000..ed9b772565 --- /dev/null +++ b/repos/base-hw/recipes/src/base-hw-wand_quad/used_apis @@ -0,0 +1,2 @@ +base-hw +base diff --git a/tool/run/boot_dir/hw b/tool/run/boot_dir/hw index 7bda254db3..25b8d02fb3 100644 --- a/tool/run/boot_dir/hw +++ b/tool/run/boot_dir/hw @@ -205,8 +205,15 @@ proc run_boot_dir {binaries} { # proc base_src { } { - if {[have_spec x86_64] && ![have_spec muen]} { return base-hw-pc } - if {[have_spec pbxa9]} { return base-hw-pbxa9 } + if {[have_spec x86_64] && ![have_spec muen]} { return base-hw-pc } + if {[have_spec pbxa9]} { return base-hw-pbxa9 } + if {[have_spec rpi]} { return base-hw-rpi } + if {[have_spec wand_quad]} { return base-hw-wand_quad } + if {[have_spec odroid_xu]} { return base-hw-odroid_xu } + if {[have_spec imx53_qsb] && ![have_spec trustzone]} { return base-hw-imx53_qsb } + if {[have_spec imx53_qsb] && [have_spec trustzone]} { return base-hw-imx53_qsb_tz } + if {[have_spec arndale]} { return base-hw-arndale } + if {[have_spec panda]} { return base-hw-panda } global specs