From d50341175c8d3ec9f699428c3c9f0bd3d4605908 Mon Sep 17 00:00:00 2001 From: Igor Opaniuk <igor.opaniuk@linaro.org> Date: Mon, 4 Sep 2017 23:46:42 +0300 Subject: [PATCH] build: fix rpi3 and hikey960 builds Replace hello-world target with new optee-examples Replace u-boot-jtag-bin target with u-boot-rpi-bin Acked-by: Victor Chong <victor.chong@linaro.org> Reviewed-by: Joakim Bech <joakim.bech@linaro.org> Signed-off-by: Igor Opaniuk <igor.opaniuk@linaro.org> --- hikey960.mk | 14 ++++++++------ rpi3.mk | 4 ++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/hikey960.mk b/hikey960.mk index f187bb1..3df5e05 100644 --- a/hikey960.mk +++ b/hikey960.mk @@ -61,7 +61,9 @@ STRACE_PATH ?=$(ROOT)/strace all: arm-tf boot-img lloader strace .PHONY: clean -clean: arm-tf-clean busybox-clean edk2-clean linux-clean optee-os-clean optee-client-clean xtest-clean helloworld-clean strace-clean update_rootfs-clean boot-img-clean lloader-clean grub-clean +clean: arm-tf-clean busybox-clean edk2-clean linux-clean optee-os-clean \ + optee-client-clean xtest-clean optee-examples-clean strace-clean \ + update_rootfs-clean boot-img-clean lloader-clean grub-clean .PHONY: cleaner cleaner: clean prepare-cleaner busybox-cleaner linux-cleaner strace-cleaner grub-cleaner @@ -228,13 +230,13 @@ xtest-clean: xtest-clean-common xtest-patch: xtest-patch-common ################################################################################ -# hello_world +# Sample applications / optee_examples ################################################################################ -.PHONY: helloworld -helloworld: helloworld-common +.PHONY: optee-examples +optee-examples: optee-examples-common -.PHONY: helloworld-clean -helloworld-clean: helloworld-clean-common +.PHONY: optee-examples-clean +optee-examples-clean: optee-examples-clean-common ################################################################################ # strace diff --git a/rpi3.mk b/rpi3.mk index 14b2576..3579556 100644 --- a/rpi3.mk +++ b/rpi3.mk @@ -61,9 +61,9 @@ ifeq ($(CFG_TEE_BENCHMARK),y) all: benchmark-app clean: benchmark-app-clean endif -all: rpi3-firmware arm-tf optee-os optee-client xtest u-boot u-boot-jtag-bin\ +all: rpi3-firmware arm-tf optee-os optee-client xtest u-boot u-boot-rpi-bin\ linux update_rootfs optee-examples -clean: arm-tf-clean busybox-clean u-boot-clean u-boot-jtag-bin-clean \ +clean: arm-tf-clean busybox-clean u-boot-clean u-boot-rpi-bin-clean \ optee-os-clean optee-client-clean rpi3-firmware-clean head-bin-clean \ optee-examples-clean -- GitLab