From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (NAM11-DM6-obe.outbound.protection.outlook.com [40.107.223.42]) by mx.groups.io with SMTP id smtpd.web10.2416.1631575141300906950 for ; Mon, 13 Sep 2021 16:19:01 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@nvidia.com header.s=selector2 header.b=HSc3zX4M; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: nvidia.com, ip: 40.107.223.42, mailfrom: jbrasen@nvidia.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hrcMewSSeIPG0mcvqOTnIDI6xoiql1vPAwN09CFvp2dfSKYjhKBE1vsJ9CcFq45eGHsrczMzMl78ILuBgGZmoU4I5Bz29MwxLjBkT81EFawy/KVBIgjYXOB47JTmMPhJB/kzDrk4X0tXO30R2GseNnOB1BAEaveHoCkKtz2u7RT2Y3drkC5PYuze+KzSKba1DvUZCqy2uptIoyMKyDn4aZjmDxkwhgFh5PCpq+xzzi2NoAxTN6iMAxIY+p1EZ54XGdBId2rdL1Gzdx8m5ML5czkOiqlQCxT/mlgq+fsMzvJwqv7s7f5DKfZzUk7RoMZqs2RzdiSFTV9TEH02zPCT8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=6XmkdmNRdtJZrFP8AFNK3NbLrHzMTMUmaK6x0gkKTig=; b=DM/sS7Y8bV8DVZzRIPQ66Q0T/Wi0fNLh8j59qSV/uy22skWVBKwOMZpUN2V6PNPwprIt3Ygq5lQnRYLX6lKHsid96VNNQFXhgawbedsWyf+C1JCq0WrBx5uRrZac0Rx3mWMGZKQ62r6So8MXQPqiVnJFtdQPe1m/ueaoOllTY7fa4YU0NH92RL/f3iQcsann21JoIceSxu4R/mcj2duZ6z8gCsiZEzCdL9YnrnN+LLzUFAqiQKCj+r3++r0KgHop+UkSrFKyYev/SNqZBbi+le5RM5FwQ8GM+zQbvwJw7XWfObl99bzTl1t7MDH+4Wwogag1ZpaxjxWRKjNp/C9oFw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=kernel.org smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=6XmkdmNRdtJZrFP8AFNK3NbLrHzMTMUmaK6x0gkKTig=; b=HSc3zX4M2HBnnyN8csx5oZu3Dc65qCGvEn4QVBEjmBZWXE58jt2rmOv0O3jeLp2AOmZW0PDd+9sVGba4VG9YJAv1WGwyH+UZWwJc3lvTS9GeBiB1f/3E0oXP6ltjy1CpJ2JzpSKKL6XE17IDUSpxIEuqWbKzkkEyUCyC0zUA6LPPWQQCdAK4JEu6yg+id3Us5YjI/w8Zqxqubl8M1rOYCjv6l5aYeIvsthaChRBYzddcgPm+jJd0nJ3SBlqJ2vypHLQCl53x+L2BqKdPXYxeImP138PBP/3NjwGIzI3VAHifYYfcuyJRY6ulkT6Dmgz0XVK+bZSs8fOZJUocZuE0kQ== Received: from MWHPR11CA0004.namprd11.prod.outlook.com (2603:10b6:301:1::14) by DM5PR1201MB2555.namprd12.prod.outlook.com (2603:10b6:3:ea::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14; Mon, 13 Sep 2021 23:19:00 +0000 Received: from CO1NAM11FT030.eop-nam11.prod.protection.outlook.com (2603:10b6:301:1:cafe::ff) by MWHPR11CA0004.outlook.office365.com (2603:10b6:301:1::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Mon, 13 Sep 2021 23:19:00 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; kernel.org; dkim=none (message not signed) header.d=none;kernel.org; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by CO1NAM11FT030.mail.protection.outlook.com (10.13.174.125) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4500.14 via Frontend Transport; Mon, 13 Sep 2021 23:18:59 +0000 Received: from HQMAIL111.nvidia.com (172.20.187.18) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Mon, 13 Sep 2021 23:18:59 +0000 Received: from build-jbrasen-20210913T102602203.nvidia.com (172.20.187.5) by mail.nvidia.com (172.20.187.18) with Microsoft SMTP Server id 15.0.1497.18 via Frontend Transport; Mon, 13 Sep 2021 23:18:59 +0000 From: "Jeff Brasen" To: CC: , , , , Jeff Brasen Subject: [PATCH v3 3/4] EmbeddedPkg: Install FDT if UpdateDtb is not present Date: Mon, 13 Sep 2021 23:18:50 +0000 Message-ID: <526fa9e66249647ee98ca58946168a912eb755dd.1631574815.git.jbrasen@nvidia.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 In-Reply-To: References: X-NVConfidentiality: public Return-Path: jbrasen@nvidia.com X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 59950e3f-318d-45e0-c3e1-08d9770cde29 X-MS-TrafficTypeDiagnostic: DM5PR1201MB2555: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1247; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5iVFcpkb6Xla7haa+4iVNmifhg9QyPzntg34plWye3e5N8CMuWQXfweRhcy0llipKZT4XOsZm8VOJFtTbdVnGKGXlXod7SZd5ifL+aZqWf/ag9ImkIT0Apm309K4RbKRM8U3buZvY/VQvMHal7XzzkgDqIh/5SiDPRSktT1kNcZDiFAiuGAR4/rfeKKqtCQYQNOagkl6PsuWwxLaZ9gBXURiTsMr5TTRuab5H0hSz5AjjlNJH2DqJwffpF1+dx06Or3ss05dVszAfChQn6Zbe5Uq77hMNIQC17WeSJ1SOtzjLlVEKpPEclK/hbXK4G3HXu560RhFfJ6fYR/cPmSd8oMzuTUhcwg2vHFUmkcO43lryiCweyD4A2doMsB2vSc4lDnYJIgCGJLFGAos3EimydLIO71ofLUQCZn+jgUkN+ctG0KuHO7cCa6qPmadSMwUbKDn5wFQWu9OwFezA9Xzu7Q09J8T62E3i41g1K1LfHwBQ8WAhLKkbV+xf3PJJ1TbmSlTwl1FgwhH+hmQ4LxGpePoikvqfRB+zW/VLqkF4SaXbO2XlOHJ+dCxN8mcIO0Fm/6k6zDts1Vm+Ez35SIfwlwNblVuyFBA/k5zdCpJvCE28kBBOtc8g4KdpQRLejObr8U8FrfRwPuMukt0JajMzTabZbhObfLEc/Ys1KVRLPeHvQK2JvbVTqp0yTwClYEkUAow0M6L1GPABYE5Ztw4CQ== X-Forefront-Antispam-Report: CIP:216.228.112.34;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:schybrid03.nvidia.com;CAT:NONE;SFS:(4636009)(396003)(39860400002)(346002)(136003)(376002)(46966006)(36840700001)(336012)(26005)(82310400003)(47076005)(36860700001)(83380400001)(4326008)(107886003)(82740400003)(356005)(15650500001)(7636003)(70586007)(316002)(2616005)(54906003)(36906005)(186003)(5660300002)(478600001)(2906002)(426003)(6666004)(6916009)(8676002)(7696005)(36756003)(70206006)(86362001)(4744005)(8936002);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2021 23:18:59.9168 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 59950e3f-318d-45e0-c3e1-08d9770cde29 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.112.34];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT030.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR1201MB2555 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain Currently if mAndroidBootImg->UpdateDtb is not supported on the platform the device tree updates of the initrd are not made. Signed-off-by: Jeff Brasen --- .../Library/AndroidBootImgLib/AndroidBootImgLib.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c b/Em= beddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c index 324933013d91..4f8ff5b261ca 100644 --- a/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c +++ b/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c @@ -349,12 +349,13 @@ AndroidBootImgUpdateFdt ( if (EFI_ERROR (Status)) { goto Fdt_Exit; } - - Status =3D gBS->InstallConfigurationTable ( - &gFdtTableGuid, - (VOID *)(UINTN)NewFdtBase - ); + } else { + NewFdtBase =3D UpdatedFdtBase; } + Status =3D gBS->InstallConfigurationTable ( + &gFdtTableGuid, + (VOID *)(UINTN)NewFdtBase + ); =20 if (!EFI_ERROR (Status)) { return EFI_SUCCESS; --=20 2.17.1