Ported from the asahi-quattro lane. Both are pinned by hand like linux-aurora and restricted to aarch64 and the edge channel from their first merge, since merging publishes. pkgrel sits one above the fork lanes' builds so the same filename never carries two sets of bytes.
235 lines
15 KiB
Diff
235 lines
15 KiB
Diff
From patchwork Tue Aug 11 13:34:33 2026
|
|
Content-Type: text/plain; charset="utf-8"
|
|
MIME-Version: 1.0
|
|
Content-Transfer-Encoding: 8bit
|
|
X-Patchwork-Submitter: Jaipaul Cheernam <jaipaul.cheernam@est.tech>
|
|
X-Patchwork-Id: 2283713
|
|
Return-Path: <u-boot-bounces@lists.u-boot-project.org>
|
|
X-Original-To: incoming@patchwork.ozlabs.org
|
|
Delivered-To: patchwork-incoming@legolas.ozlabs.org
|
|
Authentication-Results: legolas.ozlabs.org;
|
|
dkim=fail reason="signature verification failed" (2048-bit key;
|
|
unprotected) header.d=lists.u-boot-project.org
|
|
header.i=@lists.u-boot-project.org header.a=rsa-sha256 header.s=default
|
|
header.b=N2mjzMfT;
|
|
dkim-atps=neutral
|
|
Authentication-Results: legolas.ozlabs.org;
|
|
spf=pass (sender SPF authorized) smtp.mailfrom=lists.u-boot-project.org
|
|
(client-ip=140.211.166.137; helo=smtp4.osuosl.org;
|
|
envelope-from=u-boot-bounces@lists.u-boot-project.org;
|
|
receiver=patchwork.ozlabs.org)
|
|
Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137])
|
|
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
|
|
key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384)
|
|
(No client certificate requested)
|
|
by legolas.ozlabs.org (Postfix) with ESMTPS id 4hKCMS4PSRz1xtl
|
|
for <incoming@patchwork.ozlabs.org>; Tue, 11 Aug 2026 23:36:36 +1000 (AEST)
|
|
Received: from localhost (localhost [127.0.0.1])
|
|
by smtp4.osuosl.org (Postfix) with ESMTP id A0013402ED;
|
|
Tue, 11 Aug 2026 13:36:34 +0000 (UTC)
|
|
X-Virus-Scanned: amavis at osuosl.org
|
|
Received: from smtp4.osuosl.org ([127.0.0.1])
|
|
by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP
|
|
id p3bOda34E2S1; Tue, 11 Aug 2026 13:36:34 +0000 (UTC)
|
|
X-Comment: SPF check N/A for local connections - client-ip=140.211.166.142;
|
|
helo=lists1.osuosl.org;
|
|
envelope-from=u-boot-bounces@lists.u-boot-project.org; receiver=<UNKNOWN>
|
|
DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org C8D6040520
|
|
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
|
|
d=lists.u-boot-project.org ; s=default; t=1786455393;
|
|
bh=cBVuDcRfAz5FmVboiaFLD22qM9rj4tnKRC4LViq6X68=;
|
|
h=From:To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive:
|
|
List-Post:List-Help:List-Subscribe:From;
|
|
b=N2mjzMfTYSqmTzk5FULwaFpMrGP5bVx/I9fHulmwzUjiqqJ9tTuxFgg7YCzUy5gHA
|
|
nOaWzLi5SSXsmRZgFXcjHu42Dlk9xTHR2qq/4dS0Jbc0rahx6+PQT1YjAWBHDpsl26
|
|
WZH2MDE/Gv/VVK7wjRp2lYfVtOs39dZAWUSyvYaH8vRwIKUb696ujmQYkGRa4RSkVO
|
|
WoL+nEFC1B1XaZWlY7HLMogdXPKXD4VqvBU86Oc/lzjf/NAZAjtkKnBLCG8TC2l2AY
|
|
E/TYLlN3XJYwSxHLzMqMCU0/TSwwT1z4kgibHFNq8XUpt1VwMloPxSTvHz9JvZNYOs
|
|
wwM5F4y6KhaDw==
|
|
Received: from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142])
|
|
by smtp4.osuosl.org (Postfix) with ESMTP id C8D6040520;
|
|
Tue, 11 Aug 2026 13:36:33 +0000 (UTC)
|
|
X-Original-To: u-boot@lists.u-boot-project.org
|
|
Delivered-To: u-boot@lists.u-boot-project.org
|
|
Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136])
|
|
by lists1.osuosl.org (Postfix) with ESMTP id 38B5E259
|
|
for <u-boot@lists.u-boot-project.org>; Tue, 11 Aug 2026 13:34:51 +0000 (UTC)
|
|
Received: from localhost (localhost [127.0.0.1])
|
|
by smtp3.osuosl.org (Postfix) with ESMTP id 2B001607C7
|
|
for <u-boot@lists.u-boot-project.org>; Tue, 11 Aug 2026 13:34:51 +0000 (UTC)
|
|
X-Virus-Scanned: amavis at osuosl.org
|
|
Received: from smtp3.osuosl.org ([127.0.0.1])
|
|
by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP
|
|
id eGFQZMQurFKG for <u-boot@lists.u-boot-project.org>;
|
|
Tue, 11 Aug 2026 13:34:50 +0000 (UTC)
|
|
X-Comment: SPF check N/A for local connections - client-ip=85.214.62.61;
|
|
helo=phobos.denx.de; envelope-from=jaipaul.cheernam@est.tech;
|
|
receiver=<UNKNOWN>
|
|
DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org DCF5E607BD
|
|
DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org DCF5E607BD
|
|
Received: from phobos.denx.de (phobos.denx.de [85.214.62.61])
|
|
by smtp3.osuosl.org (Postfix) with ESMTPS id DCF5E607BD
|
|
for <u-boot@lists.u-boot-project.org>; Tue, 11 Aug 2026 13:34:49 +0000 (UTC)
|
|
Received: by phobos.denx.de (Postfix, from userid 109)
|
|
id 1444784A30; Tue, 11 Aug 2026 15:34:47 +0200 (CEST)
|
|
Received: from MRWPR03CU001.outbound.protection.outlook.com
|
|
(mail-francesouthazlp170110003.outbound.protection.outlook.com
|
|
[IPv6:2a01:111:f403:c207::3])
|
|
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
|
|
(No client certificate requested)
|
|
by phobos.denx.de (Postfix) with ESMTPS id D7A5C849A1
|
|
for <u-boot@lists.denx.de>; Tue, 11 Aug 2026 15:34:44 +0200 (CEST)
|
|
ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none;
|
|
b=F/iYm8I1iNna6pUS6fgZzFjCemWpknd0tJi480HHtcO6J5oiHNQHuS8TUlSvhc+RIG6xiOAg2WmQnvfUJCgjWzvLxQdJ8wGHLOg/TvimuL/XDMdwtYzqUN6b4PC3SYhJZk3sRSEZj6+3q5TRszIXJDsKEPqWkQE5oOVP9n1FY9ysY6EsjQMakTDpQ/RpkUkYgn50oLOyLLsDl3H0VSmZGfHqX0QOkwYIW/T8k3Fx/sLrlSiTfKiCPwrdnhwz7ABjlA79EvSU6/TvI/nefnSXeyUhYj0S6rPUadLIvlHFLjaFZ93ldV9COTfx96z44ltNtyAmvkIlMc6g22V3Dv8hAg==
|
|
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;
|
|
s=arcselector10001;
|
|
h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1;
|
|
bh=cBVuDcRfAz5FmVboiaFLD22qM9rj4tnKRC4LViq6X68=;
|
|
b=kO0F3iz0TnoDLl3Fiv7ulw2CObdD+lulFmKuohamR8N6FEc5UzGf7TInNwu6ce7RXGSVuFd7hfaEsq6r/o3PhBgHar8MJtVXKc+dvUPG5YuOV7nTz6qTe9trkJKfQmaFIuzBrRusEp8J4y32eMnjVSFzFXNV2eI9S3+WCoakNjmNFR8JoZWsaeqgxsTl6CGsWOYvktuUErx0GcRg4AgQmZU2EiDiD3VVrXKk+AlQY4GOTcgDJSHsqmrqn/xlr1O+9o2xvoc0RJMvz9upXok7Jo2eNeoty0UCLuSLzfxRnVJJriUkIOxFFdTQjuVzoeQMNSB7k6iXu8tgDwbcBiyzkg==
|
|
ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass
|
|
smtp.mailfrom=est.tech; dmarc=pass action=none header.from=est.tech;
|
|
dkim=pass header.d=est.tech; arc=none
|
|
Received: from DU7PPF66507B2D7.EURP189.PROD.OUTLOOK.COM (2603:10a6:18:3::ad4)
|
|
by VI1P18901MB0623.EURP189.PROD.OUTLOOK.COM (2603:10a6:800:125::14)
|
|
with Microsoft SMTP Server (version=TLS1_2,
|
|
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.315.11; Tue, 11 Aug
|
|
2026 13:34:41 +0000
|
|
Received: from DU7PPF66507B2D7.EURP189.PROD.OUTLOOK.COM
|
|
([fe80::7ab2:c6af:6760:5c85]) by DU7PPF66507B2D7.EURP189.PROD.OUTLOOK.COM
|
|
([fe80::7ab2:c6af:6760:5c85%7]) with mapi id 15.21.0315.008; Tue, 11 Aug 2026
|
|
13:34:41 +0000
|
|
From: Jaipaul Cheernam <jaipaul.cheernam@est.tech>
|
|
To: u-boot@lists.denx.de
|
|
Cc: Jaipaul Cheernam <jaipaul.cheernam@est.tech>
|
|
Subject: [PATCH] pylibfdt: Replace removed SWIG Python 2 compatibility macros
|
|
Date: Tue, 11 Aug 2026 15:34:33 +0200
|
|
Message-Id: <20260811133433.18852-1-jaipaul.cheernam@est.tech>
|
|
X-Mailer: git-send-email 2.39.5 (Apple Git-154)
|
|
X-ClientProxiedBy: LO4P265CA0183.GBRP265.PROD.OUTLOOK.COM
|
|
(2603:10a6:600:311::6) To DU7PPF66507B2D7.EURP189.PROD.OUTLOOK.COM
|
|
(2603:10a6:18:3::ad4)
|
|
MIME-Version: 1.0
|
|
X-MS-PublicTrafficType: Email
|
|
X-MS-TrafficTypeDiagnostic: DU7PPF66507B2D7:EE_|VI1P18901MB0623:EE_
|
|
X-MS-Office365-Filtering-Correlation-Id: 8a2304be-1609-4ac3-d596-08def7ad4c24
|
|
X-MS-Exchange-SenderADCheck: 1
|
|
X-MS-Exchange-AntiSpam-Relay: 0
|
|
X-Microsoft-Antispam: BCL:0;
|
|
ARA:13230040|366016|23010399003|376014|1800799024|6133799003|10067099003|56012099006|11063799006|18002099003;
|
|
X-Microsoft-Antispam-Message-Info:
|
|
ADZCK8hJVm6F3wH0lN+1CH3ycpX/oWr0C7rdxob6unX1/P+tCnAEcRYEgIIPZwnHqbQDW5p6JD2T3EG67ZpnAdgv+1d2HZMQepsfe3LElh3IHx0BPlzA3Vty6psoCgoWs4SMcNTrIVV3UqBrl3s/ttqDI2opVebhHDoAf8Z50f5xlclKz2O8gSMv8FOB9NyfaRUwtlAVgkE428WD6Wia/D/e92aD33o3Z4r2Pz7UzkUhLPLrNeVcSYh94xaUrbMlilcRmFygJWWpgeZsh+7a8kFV/eb42A37qzZ5DcE2yO5PZaA4ckohcSQ2QCA+BnKRUKh3rxkKmCeVglTgdpKg9qvpxmE+Ndzo97z6t8EimCMtdnMQxkDIA6yZiqO7xc2qjdfQ7azC4KZ3h0xq4J04c+HxOzwrQ6t/1IZd0XkN9IrgCyVRhOPL593gaeMD9Iapy4fOTZuQTL6PmUjCMNC7KNiyzyg2gtgWYist7MODeGSDNRUBR3X4hOON3nYYRXl/t+WsxRKhD5ykRF0EUEGh140FdrrFz00eXO6LIIbJUyaf1ud/SBpIw15warKR5ojDTyGUIuhg+toVhwib8/OGuFI5VxDdfgfCPVncMzarvbqXd3nx8r/NAjbPGYY9yKoOEoJ4CVfWa5NbVK3z/aCJlrnBCNTiYc8m29cvV3Ch808=
|
|
X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;
|
|
IPV:NLI; SFV:NSPM; H:DU7PPF66507B2D7.EURP189.PROD.OUTLOOK.COM; PTR:;
|
|
CAT:NONE;
|
|
SFS:(13230040)(366016)(23010399003)(376014)(1800799024)(6133799003)(10067099003)(56012099006)(11063799006)(18002099003);
|
|
DIR:OUT; SFP:1101;
|
|
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
|
|
X-MS-Exchange-AntiSpam-MessageData-0:
|
|
v1SJ9iF1FZ4Ddch8PL37hr0CiYoSTtojtB+aom++qNSm/JaqntarQvycHwKOYPL0X3VIS0vCDGJSC3b6gdCPlWLoGPlNDQJYLlTHOfds4mIdrbG5HCQ8X4EoM9uDG/9vWdsUSeRJnh1D8Q1gwPU2JRfArF7684CnJny/jZyepPyTurvWXmjo6skYOwzuRosHH9ZCocSL2xHtHu2N0HirNE+qvbo53SlhzUhQzvvoLlOHVHnSdJDTDRUfPTF3lginIWrs2IzeZkaZIbuV4+/dW5CfSJWX0Y/tHWJZ5Ny7Lbc+uG5kOidZBfaCN8UfKqZ5RTC1dkx0X6BKwkuKC3/unMfJIZAQg8Q5QmhF1uftv3XcyCrH0gNCyyVAl7lLegxBbzWJdGZPbfLh2STTurHhzeJ3hJtClRfwKE03a+TYu+44Ekc0nUdTCdn7Hpf6hnBnTmScp1QWP/toxL70lv4JhkNeZLia+I7vw7Elk6PIK1KWHY2Wlm1sGSiI2jlDnRBpPSDakUhEPWcFI+jz2XzJZ9+sBh/bzsmPqLeH71fS1cDiOyQG5lG0OWoewtDfmk4QE1ViS8UTY6oeE1lL7RNarDf+KoDL75rAwUtJATqdEqfaY1fxnRrVfaawTZIL4jYe56ITk7NiAhZ2aJXJ9WvxvXsu2Q4f+RMBoMuYSuf/B4Eil873iPGk7f9KcFV0F9e7xVcnb6bMZ2xOOxFcuZ/FVblgRYviX75D9uroJan3ZJIBqmgQL1Mq2rfIAMctUIcTYWBg8qFOVymFr22cxfzoD/puCigGWDWKl2bRk8s4WaN7PuznMXOrdvs3d9FMEQfy5oyxE4dpv/527M2l0Lqa5bGEK4y20y7FYfu/js6Ja5t38S1ZgQV3SIEqvAzCHWbYOBgMg/969p32OF20GFx7ZxF+rWXJ5QLbfimyrZ0jw+nuPvaA1BmvtjCgBLM24eIvdJuHhRjEqaCBEGwGutPeikNcxQ2x45eMlXc1OPZymG5DLgq2FMyUyQAoCrZ70YMCO3yNThR+Vfh8qc/qNpl7pLwIqvT7/5x9ZYPBINAjWwOuutEdBTH2D15WAsKB8IcxVMpjpEhaNNAMEEr3qaahViyCwFhx8GZY39yQRdbyb7dweQK/2hPFY/M2TSiGPLbxGIVOxu048L2ePB1ZMCT9v6/7pzft7L9LKOAmj5fj7zMIm9IzfaYRiPbT9KkGvcbOQ85BMLZdw4QJYUpUt9PKf6zxidBmSUfD8WAObbMF8wW9NFRSEeEdh5CMh1lRyEnFsvCFJov8+CJAcK0kYeXjJwcbaDiAKIWGk8MF8lPWIZk/cFpbsetUN6W5LQT+oxa4qttRPpjixTvJFK9i8NUHuPtZzJ0Knv9rt/4VmG7oziwVngajIkj5ByXT21gg1iX8EEqLJznzX5pHeKWV9UAvgm+fmT+zhrgV4LL+ySkPaSSNJz9eBvp3qxU4486MXyw0ISCob64j6LkZ2tYGULV2PF8caUN+J5l1cUu2ySXr7Pt4LyoMKMk/7QEJgUqzxB4T//af1ASXB0//pNSTXgPbo4eCPFtqTkVDD+KxXRJsNyGVmSJGfDE67Y7mF28SQidNW7gguYRcn7DJHFxNm1/Co6kVsDf4Xp9BOQ2HROs67mxZqicBzEqifFMBNigrr4qcA9Qcaqpkewrz9/7zW8TBs/5v6KWQHbMKffzp6PPtnwX/rVrK3VBd8TusgBYky7Q2scVbONq4qDA/ErH5tWob1bBCIPdzl9ngXrCgsknnFHs=
|
|
X-OriginatorOrg: est.tech
|
|
X-MS-Exchange-CrossTenant-Network-Message-Id:
|
|
8a2304be-1609-4ac3-d596-08def7ad4c24
|
|
X-MS-Exchange-CrossTenant-AuthSource: DU7PPF66507B2D7.EURP189.PROD.OUTLOOK.COM
|
|
X-MS-Exchange-CrossTenant-AuthAs: Internal
|
|
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2026 13:34:41.3741 (UTC)
|
|
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
|
|
X-MS-Exchange-CrossTenant-Id: d2585e63-66b9-44b6-a76e-4f4b217d97fd
|
|
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
|
|
X-MS-Exchange-CrossTenant-UserPrincipalName:
|
|
9S3MTmbV8NoDKIO+2csvXOXSX+h+vv/3+dsv/aYgYwFK6nBqKPXaQTK18nwZ9STbTS8eocOH32TrCptEz96k1m5bWAyhRvMPyQD1xqNBHC4=
|
|
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1P18901MB0623
|
|
X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de
|
|
X-Virus-Status: Clean
|
|
X-Mailman-Approved-At: Tue, 11 Aug 2026 13:36:32 +0000
|
|
X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
|
|
d=est.tech; s=selector1;
|
|
h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
|
|
bh=cBVuDcRfAz5FmVboiaFLD22qM9rj4tnKRC4LViq6X68=;
|
|
b=pqeWauqz6d5LeBvZqnf0Vhya3rUJMPVJBkYn0KjHe11y8MAnCj2YKA4NsHfxYgJwkrtzBngWWBmMuUwulnTUPfh3czsocU/HiR1U+jCVAcvcPj55A0JETJ4yzxa5edLmeRYJuzsnnkbx/PCnabanIJQNikIQiZPSYzLujjk5w+8uDoqw9b5fy+0DrexXTt4ygBBpl5++UWUu/ZM79h7yIW1OIMNbg9SdLZVbjdgFl1jrxU0e8eJEGgOVWAwAHQ4vChd/Fanm6NkU/8YU99cRqrLXjjOZedJF5ZbuxnLqfQev0dTeHnqf7PnTtRKIXcexkdiggESk1fsx72bytELfag==
|
|
X-Mailman-Original-Authentication-Results: smtp3.osuosl.org;
|
|
dmarc=none (p=none dis=none)
|
|
header.from=est.tech
|
|
X-Mailman-Original-Authentication-Results: smtp3.osuosl.org;
|
|
spf=fail smtp.mailfrom=est.tech
|
|
X-Mailman-Original-Authentication-Results: smtp3.osuosl.org;
|
|
dkim=pass (2048-bit key,
|
|
unprotected) header.d=est.tech header.i=@est.tech header.a=rsa-sha256
|
|
header.s=selector1 header.b=pqeWauqz
|
|
X-Mailman-Original-Authentication-Results: phobos.denx.de;
|
|
dmarc=none (p=none dis=none)
|
|
header.from=est.tech
|
|
X-Mailman-Original-Authentication-Results: phobos.denx.de; spf=pass
|
|
smtp.mailfrom=jaipaul.cheernam@est.tech
|
|
X-Mailman-Original-Authentication-Results: phobos.denx.de;
|
|
dkim=pass (2048-bit key;
|
|
unprotected) header.d=est.tech header.i=@est.tech header.b="pqeWauqz";
|
|
dkim-atps=neutral
|
|
X-Mailman-Original-Authentication-Results: dkim=none (message not signed)
|
|
header.d=none;dmarc=none action=none header.from=est.tech;
|
|
X-BeenThere: u-boot@lists.u-boot-project.org
|
|
X-Mailman-Version: 2.1.30
|
|
Precedence: list
|
|
List-Id: U-Boot discussion <u-boot.lists.u-boot-project.org>
|
|
List-Unsubscribe: <https://lists.u-boot-project.org/mailman/options/u-boot>,
|
|
<mailto:u-boot-request@lists.u-boot-project.org?subject=unsubscribe>
|
|
List-Archive: <http://lists.u-boot-project.org/pipermail/u-boot/>
|
|
List-Post: <mailto:u-boot@lists.u-boot-project.org>
|
|
List-Help: <mailto:u-boot-request@lists.u-boot-project.org?subject=help>
|
|
List-Subscribe: <https://lists.u-boot-project.org/mailman/listinfo/u-boot>,
|
|
<mailto:u-boot-request@lists.u-boot-project.org?subject=subscribe>
|
|
Errors-To: u-boot-bounces@lists.u-boot-project.org
|
|
Sender: "U-Boot" <u-boot-bounces@lists.u-boot-project.org>
|
|
|
|
SWIG 4.5.0 removed Python 2 compatibility macros (PyInt_*, PyString_*)
|
|
from its runtime header pyhead.swg (see commit 79f7a2b7cb7d). Replace
|
|
them with their Python 3 C API equivalents:
|
|
|
|
- PyString_FromString -> PyUnicode_FromString
|
|
- PyString_AsString -> PyBytes_AsString
|
|
- PyInt_AsLong -> PyLong_AsLong
|
|
|
|
The replacements are safe since the macros were already aliased to
|
|
these exact functions in SWIG's Python 3 code path.
|
|
|
|
This is a backport of dtc commit 5008d1d6a356 ("pylibfdt: Replace
|
|
removed SWIG Python 2 compatibility macros").
|
|
|
|
Signed-off-by: Jaipaul Cheernam <jaipaul.cheernam@est.tech>
|
|
Reviewed-by: Jérémie Dautheribes <jeremie.dautheribes@bootlin.com>
|
|
Tested-by: Jérémie Dautheribes <jeremie.dautheribes@bootlin.com>
|
|
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
|
Reviewed-by: Peter Robinson <pbrobinson@gmail.com>
|
|
---
|
|
scripts/dtc/pylibfdt/libfdt.i_shipped | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/scripts/dtc/pylibfdt/libfdt.i_shipped b/scripts/dtc/pylibfdt/libfdt.i_shipped
|
|
index e4659489..326a15c7 100644
|
|
--- a/scripts/dtc/pylibfdt/libfdt.i_shipped
|
|
+++ b/scripts/dtc/pylibfdt/libfdt.i_shipped
|
|
@@ -1033,7 +1033,7 @@ typedef uint32_t fdt32_t;
|
|
PyObject *buff;
|
|
|
|
if ($1) {
|
|
- resultobj = PyString_FromString(
|
|
+ resultobj = PyUnicode_FromString(
|
|
fdt_string(fdt1, fdt32_to_cpu($1->nameoff)));
|
|
buff = PyByteArray_FromStringAndSize(
|
|
(const char *)($1 + 1), fdt32_to_cpu($1->len));
|
|
@@ -1064,13 +1064,13 @@ typedef uint32_t fdt32_t;
|
|
}
|
|
$1 = PyBytes_AsString($input);
|
|
%#else
|
|
- $1 = PyString_AsString($input); /* char *str */
|
|
+ $1 = PyBytes_AsString($input); /* char *str */
|
|
%#endif
|
|
}
|
|
|
|
/* typemaps used for fdt_next_node() */
|
|
%typemap(in, numinputs=1) int *depth (int depth) {
|
|
- depth = (int) PyInt_AsLong($input);
|
|
+ depth = (int) PyLong_AsLong($input);
|
|
$1 = &depth;
|
|
}
|
|
|