From patchwork Fri Aug 11 19:19:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 800728 X-Patchwork-Delegate: agraf@suse.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xTZb522NFz9sNv for ; Sat, 12 Aug 2017 05:20:15 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id BA134C21DD1; Fri, 11 Aug 2017 19:20:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 8C0DFC21D70; Fri, 11 Aug 2017 19:20:02 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id ABFFEC21D63; Fri, 11 Aug 2017 19:20:01 +0000 (UTC) Received: from mout.gmx.net (mout.gmx.net [212.227.15.18]) by lists.denx.de (Postfix) with ESMTPS id 5FAE5C21C26 for ; Fri, 11 Aug 2017 19:20:01 +0000 (UTC) Received: from workstation4.fritz.box ([84.118.154.110]) by mail.gmx.com (mrgmx001 [212.227.17.184]) with ESMTPSA (Nemesis) id 0MCLQ1-1dpMA23cEz-0098Z0; Fri, 11 Aug 2017 21:19:59 +0200 From: Heinrich Schuchardt To: Alexander Graf Date: Fri, 11 Aug 2017 21:19:25 +0200 Message-Id: <20170811191925.27581-1-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.11.0 X-Provags-ID: V03:K0:n8t2HUNDmuddvfofp74WrOI/ucvmtPCDnHULcbnER4qkuFdlIcK 0eXL4q3KzIzKoHJ+3Favy3nlvTyLebaevDFFxgW4lae4I+Juw5XQjgBIGsH1QUZVdXOCBvR uf3hFnupsZ5F1c+o4clsK7zmbP9NQ2KhtXJoJ7CQwMAZEAP3xczr8Sg8qDoHWkox6M3qFlb R5+6a2FaKBH32UevpTE0w== X-UI-Out-Filterresults: notjunk:1; V01:K0:Co7iFZPNTeI=:FIaFOC730Gz69H3eP2Kmjv paJ6VWywewmrymEUUvbVEgXRE6l969KaqWgrRr8RU6A1jauEDRZPJp2RSKg3MiGPD4HejaPEx BaIFBaT4l58XpQLCWr+VMGO4h8kp2HNHrljrJ+JeHay5o3DnVzhHtWBJwSi8DT3B6eSexFKR3 PiNxFE/L/9XW/S/XHjl6IyRSCywfq3xqkEBfk6upw/JwdfwWfleHmGgmJHK6KaiSiBihatMvK CrblZ4u7wPqfoVZ8FH6pdlEsLEW/fhlFE0fTXHtkDtzNh0XLyd0v3PiLkyGYdvGGu71im1R7p tKPFRIJ6C0393L7qKvavVlcfCQMXnWOL+YYWYLNoyoX32oEdoCc//VVWG4FNAgOXtn9yi+kUc m2itHt/rKtxmeWtiwLVaBGtK5CWOZSmXHTnOgFtoMnBLI8+mjBQKxCcxJPd8CV3cNaFsZBv7R 8uW9Hj5hWAPlDYlY4L4GoBft/Xux53iaTEp8QnymoxVI/5PemPiZspQNg/4JSJd+9a1bpFZjm 3jFgPt4oreDQEndqhKa5aUXiSO0di2iMqL0m5nngQvo2fK3jAR/h6n0GZXA9EJ10cG6onImR9 O/ucY5mjVAnX0VTfpfeznwo/T4wyicjvBXLlZvFBgumiJIxW3BrpsBpXZcmChuq8XVG8XqEms myXsFHYxb2NcRySAnnK4LCpBKILNVty9ZUw8cPu7Sb2pbh7FIPW+4ZHhV+Njx8yiU1Kw9Yj/1 iBMakLv7TqfNHKNx1FK97UdrWqyUTWDJLfy1lzU2BoVq/jSg5qBL/U6gmICrwi/cWZWoxRNiu NXUxHgEnl7tpjG0T4WSoU9bPQClfA== Cc: u-boot@lists.denx.de, Heinrich Schuchardt Subject: [U-Boot] [PATCH 1/1] efi_loader: use EFI_PAGE_SIZE instead of 4096 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" We should use constant EFI_PAGE_SIZE instead of 4096 where the coding relies on 4096 being EFI_PAGE_SIZE. Signed-off-by: Heinrich Schuchardt --- cmd/bootefi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/bootefi.c b/cmd/bootefi.c index d20775eccd..3196d86040 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -158,7 +158,7 @@ static void *copy_fdt(void *fdt) } /* Give us at least 4kb breathing room */ - fdt_size = ALIGN(fdt_size + 4096, 4096); + fdt_size = ALIGN(fdt_size + 4096, EFI_PAGE_SIZE); fdt_pages = fdt_size >> EFI_PAGE_SHIFT; /* Safe fdt location is at 128MB */ @@ -166,7 +166,7 @@ static void *copy_fdt(void *fdt) if (efi_allocate_pages(1, EFI_BOOT_SERVICES_DATA, fdt_pages, &new_fdt_addr) != EFI_SUCCESS) { /* If we can't put it there, put it somewhere */ - new_fdt_addr = (ulong)memalign(4096, fdt_size); + new_fdt_addr = (ulong)memalign(EFI_PAGE_SIZE, fdt_size); if (efi_allocate_pages(1, EFI_BOOT_SERVICES_DATA, fdt_pages, &new_fdt_addr) != EFI_SUCCESS) { printf("ERROR: Failed to reserve space for FDT\n");