From patchwork Wed Mar 6 10:11:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Etienne Carriere X-Patchwork-Id: 1052230 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="wUpD9dcV"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44DqLX2ZD4z9s9N for ; Wed, 6 Mar 2019 21:12:03 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 781D784C2A; Wed, 6 Mar 2019 10:11:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NnBpwFcyGLwv; Wed, 6 Mar 2019 10:11:56 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id C19B184AAD; Wed, 6 Mar 2019 10:11:56 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 3E2EC1BF2CD for ; Wed, 6 Mar 2019 10:11:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3B1C38499E for ; Wed, 6 Mar 2019 10:11:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id aZwLh9aeRxyo for ; Wed, 6 Mar 2019 10:11:53 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by fraxinus.osuosl.org (Postfix) with ESMTPS id D401684974 for ; Wed, 6 Mar 2019 10:11:52 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id o17so12719943wrw.3 for ; Wed, 06 Mar 2019 02:11:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=NLoiXr950GckCEPdJo5juvLAL+a+8R3Eept9csPyTdE=; b=wUpD9dcVW2TsN8V8W+pbNEM8D5qQzgPre3G9K7B+rocWxHt9qWixc0c25Ekr5t/BzR hd1ekEdG60atsASm6P5VF80Vfxb5KT/a0pkJhhh2FXROVtm31KIkIKQZIracE+NZPtZj qCTgw+2427/JEd/SLwn0hDBvZ0OjDenxjD9Y2HgEBO67q1mmbx+Yc75i+UVi099QnW5W YkpsFonwoISDIZWcVISBGdv029gn8WCjY2kea2G93E6MJJ6nqSxg8Gen7woZgPUk5xnm uBg23TV05wnVKurYGIJQRgE96JtAlUcduxSFeVyti8KFXLRwXOZvak26N9txfixfInFi IN2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=NLoiXr950GckCEPdJo5juvLAL+a+8R3Eept9csPyTdE=; b=oCUimZTbPhZJ1zYQ93wPnEb5QLCF+xv45g66FAECye+ZSh+tJqjCVj/9OrVEtrDWQh Y8g3JdTdOa4HFNG5MyISRD2MlJrRQM4CEPeBoO+IA3pqwxFOlSHTjZGFC1tH7TKAwQRW vRYtKPjmfA9S34rVeVSwmSxBT/OxYxyqi0Zz9Ihc9p+Ex+J2xyoVRU1cQdaXkqmHiW8X Lh1ZuCdcnUlKzSCW6brfjB23Hmju3Bs8T/mv0Fq0k2sYpyb9QaJ2AYTM+M2AEkDQ5L4j AQ3MZtUESPdpn7cY5r4P0UiwyyiWIN8ywYF7HokVsfeI0wtJRbTgbnEpSe/3Y0cfRMhB ih4Q== X-Gm-Message-State: APjAAAXQ0RBE6otTpIBHXQ7QSCFtD9qfaeF6rXld/92Ruv1v1Q7ZozDa 9aySGEsQQ6KCG2wCxZugDo3Sn6XrFMBOTw== X-Google-Smtp-Source: APXvYqwSnsgw+lM2amG6a2Thj7AOqzWbvAy/qXBwdc5AdrP3OEYmOrCYFlJyJPTk26s5yi/xJDFzEA== X-Received: by 2002:adf:f3d0:: with SMTP id g16mr2330635wrp.29.1551867111168; Wed, 06 Mar 2019 02:11:51 -0800 (PST) Received: from lmenx29q.lme.st.com. (koe67-h04-176-179-143-225.dsl.sta.abo.bbox.fr. [176.179.143.225]) by smtp.gmail.com with ESMTPSA id f4sm1648464wrx.68.2019.03.06.02.11.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 06 Mar 2019 02:11:50 -0800 (PST) From: Etienne Carriere To: buildroot@buildroot.org Date: Wed, 6 Mar 2019 11:11:37 +0100 Message-Id: X-Mailer: git-send-email 1.9.1 In-Reply-To: <7f15bfd5388e2171b13b44722b84149d9f361551.1551866509.git.etienne.carriere@linaro.org> References: <7f15bfd5388e2171b13b44722b84149d9f361551.1551866509.git.etienne.carriere@linaro.org> In-Reply-To: <7f15bfd5388e2171b13b44722b84149d9f361551.1551866509.git.etienne.carriere@linaro.org> References: <7f15bfd5388e2171b13b44722b84149d9f361551.1551866509.git.etienne.carriere@linaro.org> Subject: [Buildroot] [PATCH 3/6] boot/arm-trusted-firmware: support debug mode X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: etienne.carriere@linaro.org, Ricardo Martincoski , Sergey Matyukevich MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" When the trusted firmware is built with debug support (DEBUG defined), the generated images are located at a specific path. The non debug images are located in generated directory build//release/ while the debug images are located in generated directory build//debug/. This change introduces boolean BR2_TARGET_ARM_TRUSTED_FIRMWARE_DEBUG to define whether the release or debug configuration is used to build trusted firmware. Note that enabling trusted firmware debug support, i.e BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="... DEBUG=1 ..." without enabling BR2_TARGET_ARM_TRUSTED_FIRMWARE_DEBUG will fail since Buildroot will get generated files from the wrong path. Signed-off-by: Etienne Carriere --- boot/arm-trusted-firmware/Config.in | 7 +++++++ boot/arm-trusted-firmware/arm-trusted-firmware.mk | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in index a1a0c54..9a152b9 100644 --- a/boot/arm-trusted-firmware/Config.in +++ b/boot/arm-trusted-firmware/Config.in @@ -136,4 +136,11 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES Additional parameters for the ATF build E.G. 'DEBUG=1 LOG_LEVEL=20' +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_DEBUG + bool "Debug mode of the trusted firmware" + default n + help + Enable this directive if trusted firmware is built in debug + mode. + endif diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk index 0f67d10..89d9db3 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -28,7 +28,13 @@ endif ARM_TRUSTED_FIRMWARE_INSTALL_IMAGES = YES ARM_TRUSTED_FIRMWARE_PLATFORM = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM)) + +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_DEBUG),y) +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += DEBUG=1 +ARM_TRUSTED_FIRMWARE_IMG_DIR = $(@D)/build/$(ARM_TRUSTED_FIRMWARE_PLATFORM)/debug +else ARM_TRUSTED_FIRMWARE_IMG_DIR = $(@D)/build/$(ARM_TRUSTED_FIRMWARE_PLATFORM)/release +endif ARM_TRUSTED_FIRMWARE_MAKE_OPTS += \ CROSS_COMPILE="$(TARGET_CROSS)" \