From patchwork Tue Nov 24 12:48:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Fiergolski X-Patchwork-Id: 1405583 X-Patchwork-Delegate: monstr@monstr.eu Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=fastree3d.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=fastree3d-com.20150623.gappssmtp.com header.i=@fastree3d-com.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=W+3bh+Av; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CgQXS4D4rz9sRR for ; Wed, 25 Nov 2020 00:55:47 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 93A99825C4; Tue, 24 Nov 2020 14:55:34 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=fastree3d.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=fastree3d-com.20150623.gappssmtp.com header.i=@fastree3d-com.20150623.gappssmtp.com header.b="W+3bh+Av"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A93A9822C7; Tue, 24 Nov 2020 13:49:22 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 14C58822C7 for ; Tue, 24 Nov 2020 13:49:20 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=fastree3d.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=adrian.fiergolski@fastree3d.com Received: by mail-wr1-x442.google.com with SMTP id g14so6999293wrm.13 for ; Tue, 24 Nov 2020 04:49:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastree3d-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ql+liVMvNdHFnI4AKwxCcM65mp8kS4UNinOPR4clLa4=; b=W+3bh+Avj79QFb8OrHnOlFel60YT3y5HEmtVfWv53MFxbfZHx7wev+XsRte7lkKle8 SV6A6TJOrUnaJ1rFFY18Nf6Ha7lI3VZXJoyiK4u8tZNg7d9IyZlU3xcPAfGya/EIh3Am PD91mB7jD0FETpz9X8bISEamsljKUhQm4vRVRVA/sfTL595sRGiWXy8x4K/M7dkrsD/2 atxmkZt++lInwJ75q1Bu2KdI04kXNZOt6qeqE/b/O0cuD/dPGKM6P5SXB7dkOBgu48Xy IR82a2rmeBHG4cvy6Zxpk7QlaKy6peAYgkPq68nEMG1E2pJ2hBEYorEU0/L7ABXKcuxl IXBQ== 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:mime-version :content-transfer-encoding; bh=ql+liVMvNdHFnI4AKwxCcM65mp8kS4UNinOPR4clLa4=; b=QCqPpNoXv0BXgejpR+R/K7W3XV/lyDU2oSj6YN28F0hpQRzmIBYPFO1j3ZW5ZP8ksu kDBYLp15BC1+JL9MFZbmg0QJ8bGv977o20Hbt+Svl5TO0ASCFN9ACPZ9fwOk0ZcEbHeh 1VcWEaE6KkQ/z2aJda25KEJZ0w8r7RNq3RfbL892+m3+T+NAl3jrcNVakC4IhtQm6i3G D8tPn2M4fXS90/bX+5t0GOZ4TBfQT29xJfptvfFoADFmPMkBz+5+xM/WCBo7PfPAVL9+ pn5iOrxTbm/80sCRTGrk/BfGW0/nvgd69Cm/Z6vDkDAkKmom12qssQyKIzZPKEujUpZe XyuQ== X-Gm-Message-State: AOAM530ZyXYSslCV3hovq4cX8gTs2grzGS55qse4A5WQHTCklOzAzU4n Mh/FyV2JdPf/EgZVTKezoPBj2d8rbEnD X-Google-Smtp-Source: ABdhPJzQD5KYJG2r1THg8MkRFT7F1mSJ5MCEIHsPgZ3eSdF8QNm/26ms9Pe9B4NVbPjXSRNPdEf3UQ== X-Received: by 2002:adf:f6c2:: with SMTP id y2mr5365118wrp.41.1606222159329; Tue, 24 Nov 2020 04:49:19 -0800 (PST) Received: from adrian-laptop.lan (92.234.197.178.dynamic.wless.lssmb00p-cgnat.res.cust.swisscom.ch. [178.197.234.92]) by smtp.gmail.com with ESMTPSA id s4sm2099758wru.56.2020.11.24.04.49.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Nov 2020 04:49:18 -0800 (PST) From: Adrian Fiergolski To: u-boot@lists.denx.de Cc: luca@lucaceresoli.net, michal.simek@xilinx.com, Adrian Fiergolski Subject: [PATCH] tools: The XPm_ConfigObject array definition generated by Vitis 2020.1 differs from previous Vivado versions (before 2019.2). Date: Tue, 24 Nov 2020 13:48:41 +0100 Message-Id: <20201124124841.99607-1-adrian.fiergolski@fastree3d.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-Mailman-Approved-At: Tue, 24 Nov 2020 14:55:32 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean -const u32 XPm_ConfigObject[] __attribute__((used, section(".sys_cfg_data"))) = { +const u32 XPm_ConfigObject[] __attribute__((used, section(".sys_cfg_data"))) = +#elif defined (__ICCARM__) +#pragma location = ".sys_cfg_data" +__root const u32 XPm_ConfigObject[] = +#endif +{ Change the matching regex to handle both cases. Signed-off-by: Adrian Fiergolski --- tools/zynqmp_pm_cfg_obj_convert.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/zynqmp_pm_cfg_obj_convert.py b/tools/zynqmp_pm_cfg_obj_convert.py index dd27f47921..0a44710e1e 100755 --- a/tools/zynqmp_pm_cfg_obj_convert.py +++ b/tools/zynqmp_pm_cfg_obj_convert.py @@ -289,7 +289,7 @@ code = in_file.read() code = re.sub('//.*?\n|/\*.*?\*/', '', code, flags=re.DOTALL) # remove everything outside the XPm_ConfigObject array definition -code = re.search('const u32 XPm_ConfigObject.*= {\n(.*)};', +code = re.search('const u32 XPm_ConfigObject.*=.*{\n(.*)};', code, flags=re.DOTALL).group(1) # Process each comma-separated array item