From 1c77ea2b039c8cef01580c6ac4a7f3905567a941 Mon Sep 17 00:00:00 2001 From: Christian Helmuth Date: Fri, 12 Jul 2019 15:27:05 +0200 Subject: [PATCH] base-hw: remove other board libs from recipes --- repos/base-hw/recipes/src/base-hw-arndale/content.mk | 2 ++ repos/base-hw/recipes/src/base-hw-imx53_qsb/content.mk | 2 ++ repos/base-hw/recipes/src/base-hw-imx53_qsb_tz/content.mk | 2 ++ repos/base-hw/recipes/src/base-hw-imx6q_sabrelite/content.mk | 2 ++ repos/base-hw/recipes/src/base-hw-imx7d_sabre/content.mk | 2 ++ repos/base-hw/recipes/src/base-hw-imx8q_evk/content.mk | 2 ++ repos/base-hw/recipes/src/base-hw-muen/content.mk | 2 ++ repos/base-hw/recipes/src/base-hw-nit6_solox/content.mk | 2 ++ repos/base-hw/recipes/src/base-hw-odroid_xu/content.mk | 2 ++ repos/base-hw/recipes/src/base-hw-panda/content.mk | 2 ++ repos/base-hw/recipes/src/base-hw-pbxa9/content.mk | 2 ++ repos/base-hw/recipes/src/base-hw-pc/content.mk | 2 ++ repos/base-hw/recipes/src/base-hw-rpi/content.mk | 2 ++ repos/base-hw/recipes/src/base-hw-rpi3/content.mk | 2 ++ repos/base-hw/recipes/src/base-hw-zynq_qemu/content.mk | 2 ++ repos/base-hw/recipes/src/base-hw_content.inc | 5 ++++- 16 files changed, 34 insertions(+), 1 deletion(-) diff --git a/repos/base-hw/recipes/src/base-hw-arndale/content.mk b/repos/base-hw/recipes/src/base-hw-arndale/content.mk index 04169d6ad9..c8524b1634 100644 --- a/repos/base-hw/recipes/src/base-hw-arndale/content.mk +++ b/repos/base-hw/recipes/src/base-hw-arndale/content.mk @@ -1,3 +1,5 @@ +BOARD = arndale + include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc content: enable_board_spec 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 index ae699d23d4..7eb964b578 100644 --- a/repos/base-hw/recipes/src/base-hw-imx53_qsb/content.mk +++ b/repos/base-hw/recipes/src/base-hw-imx53_qsb/content.mk @@ -1,3 +1,5 @@ +BOARD = imx53_qsb + include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc content: enable_board_spec 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 index bd4c1df005..f6a19f67c6 100644 --- 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 @@ -1,3 +1,5 @@ +BOARD = imx53_qsb_tz + include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc content: enable_board_spec diff --git a/repos/base-hw/recipes/src/base-hw-imx6q_sabrelite/content.mk b/repos/base-hw/recipes/src/base-hw-imx6q_sabrelite/content.mk index 6943a963a7..6ecd480947 100644 --- a/repos/base-hw/recipes/src/base-hw-imx6q_sabrelite/content.mk +++ b/repos/base-hw/recipes/src/base-hw-imx6q_sabrelite/content.mk @@ -1,3 +1,5 @@ +BOARD = imx6q_sabrelite + include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc content: enable_board_spec diff --git a/repos/base-hw/recipes/src/base-hw-imx7d_sabre/content.mk b/repos/base-hw/recipes/src/base-hw-imx7d_sabre/content.mk index 04f84552f9..a5dfafd83d 100644 --- a/repos/base-hw/recipes/src/base-hw-imx7d_sabre/content.mk +++ b/repos/base-hw/recipes/src/base-hw-imx7d_sabre/content.mk @@ -1,3 +1,5 @@ +BOARD = imx7d_sabre + include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc content: enable_board_spec diff --git a/repos/base-hw/recipes/src/base-hw-imx8q_evk/content.mk b/repos/base-hw/recipes/src/base-hw-imx8q_evk/content.mk index 147e1d490e..8061530c64 100644 --- a/repos/base-hw/recipes/src/base-hw-imx8q_evk/content.mk +++ b/repos/base-hw/recipes/src/base-hw-imx8q_evk/content.mk @@ -1,3 +1,5 @@ +BOARD = imx8q_evk + include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc content: enable_board_spec diff --git a/repos/base-hw/recipes/src/base-hw-muen/content.mk b/repos/base-hw/recipes/src/base-hw-muen/content.mk index 288d02b6b4..209967bd4f 100644 --- a/repos/base-hw/recipes/src/base-hw-muen/content.mk +++ b/repos/base-hw/recipes/src/base-hw-muen/content.mk @@ -1,3 +1,5 @@ +BOARD = muen + include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc content: enable_board_spec diff --git a/repos/base-hw/recipes/src/base-hw-nit6_solox/content.mk b/repos/base-hw/recipes/src/base-hw-nit6_solox/content.mk index afc968f57b..a91e4962ee 100644 --- a/repos/base-hw/recipes/src/base-hw-nit6_solox/content.mk +++ b/repos/base-hw/recipes/src/base-hw-nit6_solox/content.mk @@ -1,3 +1,5 @@ +BOARD = nit6_solox + include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc content: enable_board_spec 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 index 2529b9737a..fcd89ae1c0 100644 --- a/repos/base-hw/recipes/src/base-hw-odroid_xu/content.mk +++ b/repos/base-hw/recipes/src/base-hw-odroid_xu/content.mk @@ -1,3 +1,5 @@ +BOARD = odroid_xu + include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc content: enable_board_spec diff --git a/repos/base-hw/recipes/src/base-hw-panda/content.mk b/repos/base-hw/recipes/src/base-hw-panda/content.mk index 3a3caa0eef..2a406f5b69 100644 --- a/repos/base-hw/recipes/src/base-hw-panda/content.mk +++ b/repos/base-hw/recipes/src/base-hw-panda/content.mk @@ -1,3 +1,5 @@ +BOARD = panda + include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc content: enable_board_spec diff --git a/repos/base-hw/recipes/src/base-hw-pbxa9/content.mk b/repos/base-hw/recipes/src/base-hw-pbxa9/content.mk index 5b400d346a..2e6b45c079 100644 --- a/repos/base-hw/recipes/src/base-hw-pbxa9/content.mk +++ b/repos/base-hw/recipes/src/base-hw-pbxa9/content.mk @@ -1,3 +1,5 @@ +BOARD = pbxa9 + include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc content: enable_board_spec diff --git a/repos/base-hw/recipes/src/base-hw-pc/content.mk b/repos/base-hw/recipes/src/base-hw-pc/content.mk index 31319dcaf1..aa6d5cb166 100644 --- a/repos/base-hw/recipes/src/base-hw-pc/content.mk +++ b/repos/base-hw/recipes/src/base-hw-pc/content.mk @@ -1 +1,3 @@ +BOARD = pc + include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc diff --git a/repos/base-hw/recipes/src/base-hw-rpi/content.mk b/repos/base-hw/recipes/src/base-hw-rpi/content.mk index e87537b9f3..481c815065 100644 --- a/repos/base-hw/recipes/src/base-hw-rpi/content.mk +++ b/repos/base-hw/recipes/src/base-hw-rpi/content.mk @@ -1,3 +1,5 @@ +BOARD = rpi + include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc content: enable_board_spec diff --git a/repos/base-hw/recipes/src/base-hw-rpi3/content.mk b/repos/base-hw/recipes/src/base-hw-rpi3/content.mk index c0767dcfe5..4a5ff6612b 100644 --- a/repos/base-hw/recipes/src/base-hw-rpi3/content.mk +++ b/repos/base-hw/recipes/src/base-hw-rpi3/content.mk @@ -1,3 +1,5 @@ +BOARD = rpi3 + include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc content: enable_board_spec diff --git a/repos/base-hw/recipes/src/base-hw-zynq_qemu/content.mk b/repos/base-hw/recipes/src/base-hw-zynq_qemu/content.mk index f55a4846dc..5629ba8747 100644 --- a/repos/base-hw/recipes/src/base-hw-zynq_qemu/content.mk +++ b/repos/base-hw/recipes/src/base-hw-zynq_qemu/content.mk @@ -1,3 +1,5 @@ +BOARD = zynq_qemu + include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc content: enable_board_spec diff --git a/repos/base-hw/recipes/src/base-hw_content.inc b/repos/base-hw/recipes/src/base-hw_content.inc index fb24ebcb98..0883e66219 100644 --- a/repos/base-hw/recipes/src/base-hw_content.inc +++ b/repos/base-hw/recipes/src/base-hw_content.inc @@ -5,7 +5,7 @@ content: src/bootstrap src/bootstrap: $(mirror_from_rep_dir) -content: generalize_target_names +content: generalize_target_names remove_other_board_libs generalize_target_names: lib/mk src/lib src/timer for spec in arm riscv x86_64; do \ @@ -14,3 +14,6 @@ generalize_target_names: lib/mk src/lib src/timer sed -i "s/ld-hw/ld/" src/lib/ld/hw/target.mk sed -i "s/hw_timer_drv/timer/" src/timer/hw/target.mk +remove_other_board_libs: lib/mk + find lib/mk/spec -name core-hw-*.mk -o -name bootstrap-hw-*.mk |\ + grep -v "hw-$(BOARD).mk" | xargs rm -rf