From patchwork Mon Aug 28 16:54:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 806661 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 3xgyZc5ZMZz9s7m for ; Tue, 29 Aug 2017 02:55:52 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 84BDCC2256B; Mon, 28 Aug 2017 16:55:15 +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 732DDC22572; Mon, 28 Aug 2017 16:55:12 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id DFD65C2257A; Mon, 28 Aug 2017 16:55:02 +0000 (UTC) Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) by lists.denx.de (Postfix) with ESMTPS id A412DC2256F for ; Mon, 28 Aug 2017 16:55:00 +0000 (UTC) Received: from workstation4.fritz.box ([84.118.154.110]) by mail.gmx.com (mrgmx003 [212.227.17.184]) with ESMTPSA (Nemesis) id 0LeMWL-1dAL0B1EMv-00qA6G; Mon, 28 Aug 2017 18:54:58 +0200 From: Heinrich Schuchardt To: Alexander Graf Date: Mon, 28 Aug 2017 18:54:30 +0200 Message-Id: <20170828165430.6139-1-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.11.0 X-Provags-ID: V03:K0:ZRzV+PoUp2En+pBWubgA/gr8wdZ0PyjFbKv0qeomwLcXNpxe47N 9vUA10/UskeMiU0j4yoMZY5yllUvCG02tVUyycjLooEf1Rl53F7y7FxAnSyiSF5pQ5D27tO UCmZZhc3C+3Pw/EzdBNzfaRfWp6/y9zDMQuxG/zaHOLgNcd2VkMutJftiTADlJJrUbNDSRP bAtIZbqniiSfRNV/20qXA== X-UI-Out-Filterresults: notjunk:1; V01:K0:UV8MTN318Rw=:ukR2StBJ7ZV8oF45ONklol Qf6wp5DTlzLKjNjD1N5URdYhhekorxrNMR/SWjRZGAPovzBAeUlRV4kQF+Ai99ox+h4PXA/sl nJ+sMUeocTshinZ+65aPgm+5La0aGAZgo6YViMfCVrY+GwkCOojm1XhK1wjpu7N48oFowzEdB fQuFiqeOtMMZYFyq45bNHp6eoRg1ZXlnnW+uTVMcOqaCME+WJ1jA4Z37YOhmdcbN6gcnBT4Wv 5UEgAFdnVeFoSKklDMt6lwZk9jXEG+BTnpsiZ0MBPbGd6iQ/IQ1GfoYvgbmbvnd7ELHBJjdnb CDe///7UbHkf25HvodtmAApDdeRgjFB+/jkbdnBFFKib8xQOGcWqnw7tIbrJURCwtAcOPX1Lx nJRSNIapRhUhjymIGT1khbcX3HysH3hw1OvAtpd8nXTh7ux2zex2BnT5FStk10n860xvkLlRM BIJzYJ04/9s1nHcYwALA5EA7g4QWJafA8AYxVZd3mrsSHtztSjocXf3rW5wNJuniW9d+WD4wx k7ptC5B4H7ww3QVfso3lO1J35mSr63mu4DBs+GSKCqZiSX5TZgSz22b6l8aYLo8OYwYie8ZXT QFqrfWwVValYgJnK3lcWx1e/ehJ/PeM9yxkgsqn1yZopc6StHd+a8YF2jaQm06JhDN2rn//HP k4KUorp08VEwFztLsVZFW0t4LqJE4ol6ZP8rc83BB8F2e0Zir9YntSs39VCrUslaJqLfCnRUm O02WaVeOZxa3QwARivwdo4cCwXPxCZCJw7RCpXyKkVZa0OZYfk5h85yUnMZ5ZnMEuMQVupgwu 3//VsJkOUS6pXP1rti8cXOBMo7crg== Cc: u-boot@lists.denx.de, Heinrich Schuchardt Subject: [U-Boot] [PATCH 1/1] efi_loader: bootefi hello should use loadaddr 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" Command 'bootefi hello' currently uses CONFIG_SYS_LOAD_ADDR as loading address. qemu machines have by default 128 MiB RAM. CONFIG_SYS_LOAD_ADDR for x86 is 0x20000000 (512 MiB). This causes 'bootefi hello' to fail. We should use the environment variable loadaddr if available. It defaults to 0x1000000 (16 MiB) on qemu_x86. Signed-off-by: Heinrich Schuchardt --- cmd/bootefi.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cmd/bootefi.c b/cmd/bootefi.c index 47771f87cc..a3768158a2 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -300,7 +300,11 @@ static int do_bootefi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) if (!strcmp(argv[1], "hello")) { ulong size = __efi_hello_world_end - __efi_hello_world_begin; - addr = CONFIG_SYS_LOAD_ADDR; + saddr = env_get("loadaddr"); + if (saddr) + addr = simple_strtoul(saddr, NULL, 16); + else + addr = CONFIG_SYS_LOAD_ADDR; memcpy((char *)addr, __efi_hello_world_begin, size); } else #endif