From patchwork Tue Feb 25 17:22:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kristian Amlie X-Patchwork-Id: 1244424 X-Patchwork-Delegate: trini@ti.com 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=northern.tech Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=northern.tech header.i=@northern.tech header.a=rsa-sha256 header.s=google header.b=JLsXAKYq; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48RmLw6K0Xz9sPR for ; Wed, 26 Feb 2020 04:36:21 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 76233801F1; Tue, 25 Feb 2020 18:36:09 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=northern.tech 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=northern.tech header.i=@northern.tech header.b="JLsXAKYq"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 87AC680246; Tue, 25 Feb 2020 18:22: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.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_SBL_CSS, SPF_HELO_NONE, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from mail-lj1-x241.google.com (mail-lj1-x241.google.com [IPv6:2a00:1450:4864:20::241]) (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 303D2801A0 for ; Tue, 25 Feb 2020 18:22:19 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=northern.tech Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=kristian.amlie@northern.tech Received: by mail-lj1-x241.google.com with SMTP id n18so14928264ljo.7 for ; Tue, 25 Feb 2020 09:22:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=northern.tech; s=google; h=from:to:subject:date:message-id; bh=+8XMTDDyLyE47khCS1IJK9V7Wvil1B2QjY7UVn5It1s=; b=JLsXAKYqsQ/OGvIZLIwy4P/LHaJvRe6PyFWLCmy1hJRD0O6OwCisxGOFI056AyK5B5 b7f8yWvA9Y/PV59hjFPZpVJL3mm3lxuUK8kv4J6wRuRZsm09gqkYstpSdoG/uAfZiedR vW4fjD/fSZdZqbw7CL483KXefUOBsE0sBtEFtLYnJAXqW+t1LVCoBbTELxKwadYGam19 whbD6rqooCchaP2Xj/AoWWsOXFwOFFURqBS/5R3gXDBRcejMECZwoequrtvb+UtFTtIF SvUYFhN7Bm8ZUkL75c9Ih/pdYyY7jj6sa7VdBsbV+OyLGbPLGE5NjEtvWJ6fCq7wNoYF IKcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=+8XMTDDyLyE47khCS1IJK9V7Wvil1B2QjY7UVn5It1s=; b=J57kmgfCE/W91IuAU9rOL9ur5J0A/Vi2CrXD/nRiEmDL0cShHAs5xWwKVRmB1EFEDk C4FaXoORPLgSH8hlPja9MHm0K9Gmk5DxxuvvbJgu+uBsAn4iGlHpT24M4seBtjAAXIsC LTJZRIte6Hjf8eeVZyXWsa7gP4UiaakXqT0JXocm9O8F52YrOEa9U1dlCEfTXfLJL2FC 6xMm/xzccOocG3ewDHFj5wm7Oxq/xbQmrJAOimxJkgFVUbLN6dk8Nx9lXmJBrUj1KPSj JVEYMz6QT4hk7BFAS7sNsPFjA9I3O1k94UPKJOY7ANwO7CrYlVHeXSbERyCgUnIGvjfF ox9w== X-Gm-Message-State: APjAAAWXDhM/PESDNqoI3pnyMdHr/8il3UcgVNGRgi+hySLg0tq+LNpe H1QwgO4gqv0BRuH5UifiMi1N9awj7vo= X-Google-Smtp-Source: APXvYqz6049jobpUveImTN05parh475MQUO09uTwUurNfUysZ3zReZk37aVydud7TWFuyL3bDddR8g== X-Received: by 2002:a2e:90f:: with SMTP id 15mr67679ljj.120.1582651338096; Tue, 25 Feb 2020 09:22:18 -0800 (PST) Received: from localhost.localdomain (195-159-234-190.customer.powertech.no. [195.159.234.190]) by smtp.googlemail.com with ESMTPSA id q24sm7753620lfm.78.2020.02.25.09.22.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2020 09:22:17 -0800 (PST) From: Kristian Amlie To: u-boot@lists.denx.de Subject: [PATCH 1/1] vexpress_ca9x4: Enable use of correct DTB file and restore EFI loader. Date: Tue, 25 Feb 2020 18:22:16 +0100 Message-Id: <20200225172216.28472-1-kristian.amlie@northern.tech> X-Mailer: git-send-email 2.17.1 X-Mailman-Approved-At: Tue, 25 Feb 2020 18:36:07 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.2 at phobos.denx.de X-Virus-Status: Clean EFI was disabled in f95b8a4b5f64f because of the missing DTB file, and indeed, the DTB file is required to load recent versions of GRUB (2.04) correctly. Signed-off-by: Kristian Amlie --- configs/vexpress_ca9x4_defconfig | 2 +- include/configs/vexpress_common.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configs/vexpress_ca9x4_defconfig b/configs/vexpress_ca9x4_defconfig index 2119df6b10..6bd1f253b6 100644 --- a/configs/vexpress_ca9x4_defconfig +++ b/configs/vexpress_ca9x4_defconfig @@ -34,4 +34,4 @@ CONFIG_SMC911X_32_BIT=y CONFIG_BAUDRATE=38400 CONFIG_CONS_INDEX=0 CONFIG_OF_LIBFDT=y -# CONFIG_EFI_LOADER is not set +CONFIG_DEFAULT_FDT_FILE="vexpress-v2p-ca9.dtb" diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h index 7f215a6707..e73658a9e6 100644 --- a/include/configs/vexpress_common.h +++ b/include/configs/vexpress_common.h @@ -207,7 +207,8 @@ "devtmpfs.mount=0 vmalloc=256M\0" \ "bootflash=run flashargs; " \ "cp ${ramdisk_addr} ${ramdisk_addr_r} ${maxramdisk}; " \ - "bootm ${kernel_addr} ${ramdisk_addr_r}\0" + "bootm ${kernel_addr} ${ramdisk_addr_r}\0" \ + "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" /* FLASH and environment organization */ #define PHYS_FLASH_SIZE 0x04000000 /* 64MB */