qemu, qemu_v8: use soc_term.py
Use soc_term.py instead of the C version and stop building the soc_term
project.
Signed-off-by: Jerome Forissier <jerome@forissier.org>
Acked-by: Jens Wiklander <jens.wiklander@linaro.org>
Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>
diff --git a/common.mk b/common.mk
index fdda328..cd62a1e 100644
--- a/common.mk
+++ b/common.mk
@@ -454,7 +454,7 @@
ifneq (, $(LAUNCH_TERMINAL))
define launch-terminal
@nc -z 127.0.0.1 $(1) || \
- $(LAUNCH_TERMINAL) "$(SOC_TERM_PATH)/soc_term $(1)" &
+ $(LAUNCH_TERMINAL) "$(BUILD_PATH)/soc_term.py $(1)" &
endef
else
gnome-terminal := $(shell command -v gnome-terminal 2>/dev/null)
@@ -462,13 +462,13 @@
ifdef gnome-terminal
define launch-terminal
@nc -z 127.0.0.1 $(1) || \
- $(gnome-terminal) -x $(SOC_TERM_PATH)/soc_term $(1) &
+ $(gnome-terminal) -x $(BUILD_PATH)/soc_term.py $(1) &
endef
else
ifdef xterm
define launch-terminal
@nc -z 127.0.0.1 $(1) || \
- $(xterm) -title $(2) -e $(BASH) -c "$(SOC_TERM_PATH)/soc_term $(1)" &
+ $(xterm) -title $(2) -e $(BASH) -c "$(BUILD_PATH)/soc_term.py $(1)" &
endef
else
check-terminal := @echo "Error: could not find gnome-terminal nor xterm" ; false
diff --git a/qemu.mk b/qemu.mk
index b663831..bee7a25 100644
--- a/qemu.mk
+++ b/qemu.mk
@@ -24,16 +24,15 @@
U-BOOT_PATH ?= $(ROOT)/u-boot
QEMU_PATH ?= $(ROOT)/qemu
QEMU_BUILD ?= $(QEMU_PATH)/build
-SOC_TERM_PATH ?= $(ROOT)/soc_term
DEBUG = 1
################################################################################
# Targets
################################################################################
-all: arm-tf u-boot buildroot linux optee-os qemu soc-term
+all: arm-tf u-boot buildroot linux optee-os qemu
clean: arm-tf-clean u-boot-clean buildroot-clean linux-clean optee-os-clean \
- qemu-clean soc-term-clean check-clean
+ qemu-clean check-clean
include toolchain.mk
@@ -148,15 +147,6 @@
optee-os-clean: optee-os-clean-common
################################################################################
-# Soc-term
-################################################################################
-soc-term:
- $(MAKE) -C $(SOC_TERM_PATH)
-
-soc-term-clean:
- $(MAKE) -C $(SOC_TERM_PATH) clean
-
-################################################################################
# Run targets
################################################################################
.PHONY: run
diff --git a/qemu_v8.mk b/qemu_v8.mk
index 24cd3da..69b65a4 100644
--- a/qemu_v8.mk
+++ b/qemu_v8.mk
@@ -56,7 +56,6 @@
EDK2_BIN ?= $(EDK2_PATH)/Build/ArmVirtQemuKernel-$(EDK2_ARCH)/$(EDK2_BUILD)_$(EDK2_TOOLCHAIN)/FV/QEMU_EFI.fd
QEMU_PATH ?= $(ROOT)/qemu
QEMU_BUILD ?= $(QEMU_PATH)/build
-SOC_TERM_PATH ?= $(ROOT)/soc_term
MODULE_OUTPUT ?= $(ROOT)/out/kernel_modules
UBOOT_PATH ?= $(ROOT)/u-boot
UBOOT_BIN ?= $(UBOOT_PATH)/u-boot.bin
@@ -100,9 +99,9 @@
################################################################################
# Targets
################################################################################
-TARGET_DEPS := arm-tf buildroot linux optee-os qemu soc-term
+TARGET_DEPS := arm-tf buildroot linux optee-os qemu
TARGET_CLEAN := arm-tf-clean buildroot-clean linux-clean optee-os-clean \
- qemu-clean soc-term-clean check-clean
+ qemu-clean check-clean
TARGET_DEPS += $(BL33_DEPS)
@@ -289,15 +288,6 @@
optee-os-clean: optee-os-clean-common
################################################################################
-# Soc-term
-################################################################################
-soc-term:
- $(MAKE) -C $(SOC_TERM_PATH)
-
-soc-term-clean:
- $(MAKE) -C $(SOC_TERM_PATH) clean
-
-################################################################################
# mkimage - create images to be loaded by U-Boot
################################################################################
# Without the objcopy, the uImage will be 10x bigger.