From patchwork Mon Jan 25 08:11:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 1431113 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=kJ7AMBTh; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DPMyj3wF8z9sT6 for ; Mon, 25 Jan 2021 19:11:41 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 600CC86FF3; Mon, 25 Jan 2021 08:11:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id I2ft1NYdouLd; Mon, 25 Jan 2021 08:11:38 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 7E4DF86FD0; Mon, 25 Jan 2021 08:11:38 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 1460E1BF30D for ; Mon, 25 Jan 2021 08:11:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1075485C86 for ; Mon, 25 Jan 2021 08:11:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZAPc2b0r3qKl for ; Mon, 25 Jan 2021 08:11:36 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) by fraxinus.osuosl.org (Postfix) with ESMTPS id B697285C00 for ; Mon, 25 Jan 2021 08:11:35 +0000 (UTC) Received: by mail-ej1-f44.google.com with SMTP id by1so16711189ejc.0 for ; Mon, 25 Jan 2021 00:11:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=GLq2qFwrASwBj8dqe6oxPgi0S9fbMyeyz94r3ogO6OA=; b=kJ7AMBTheMDHfzbdnnAHsyGaEP3GC0OfJsSsmm4mLF6YwKcKh4YnwWtyvQQRTGM1Tj gBgQN/wb27S6VeVWnunmtwndVYZkuYuJ1rAbQVDzefYIe9qVPs3k0EzlVRGkygV8L2FO GN7aiq0veV8ia5IOXDzXM9a4BSN2go2ZPf3VRxk6Rd5I8tWuJgNUCasHRSMohZ1yOxWC lQBHmkwBMl79G9WzfpdRr93RITpXgVckBVwU4FwKyY4ooavA1i0ol2EHJlnmdRM2e5oe RR7LJC4fkfkCReh8RRHhHCjGchmWA6R0NV17UFCGVuQzJEgDDoMh1f+41W7FTZW1F48i +6xA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=GLq2qFwrASwBj8dqe6oxPgi0S9fbMyeyz94r3ogO6OA=; b=jAL8CnsmIy9hiiYjjXhifoDdQlZMqDQtzQh/Ffnbaa+m7wIqKmMjOVEZe5WUZxlJg8 2tk+/XQE5p3KohjyFj1jvuqq3/wn4Hmt3iY9IvgaM1Mzb4UIb7YCE+Xs5Ud5yRDpLTwg jksIqDgZtiEhirs4U1d7tULiKClnzJaziXbsXcGkYI6X4EmlswbsAvmu5DdOtGYJDAlv bPDmcrkmrYemtp1ByCRMxEHOUuURDMvMH0Fo/R2ljaejfPE+rWoEwakgldjuuVpt6aDM I3cC3U7PfQzqIqQT0RlmFpc+Nb+5tW9tKXy9Y11dXsZxW0Q2QI6Q+HeJkRSVxIjcJgUA TITw== X-Gm-Message-State: AOAM5310L5xa7rXoVTi1YSu6hdLky0fVCfTyTfni9Pan8MZ4+8+WLTy8 CTYxf2QP1/Gqc+VJL2eJu+OXiIgEzGU= X-Google-Smtp-Source: ABdhPJySNXIcO0GvadHO38HmOaFoR8T82NewHHAhrRBdS8D/kbHA2Rg7r0MSxQdQj6XZvx0dfruLlg== X-Received: by 2002:a17:906:7c57:: with SMTP id g23mr2794160ejp.364.1611562294314; Mon, 25 Jan 2021 00:11:34 -0800 (PST) Received: from dell.be.48ers.dk (d51A5BC31.access.telenet.be. [81.165.188.49]) by smtp.gmail.com with ESMTPSA id w6sm7930462ejj.116.2021.01.25.00.11.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Jan 2021 00:11:33 -0800 (PST) Received: from peko by dell.be.48ers.dk with local (Exim 4.92) (envelope-from ) id 1l3wyC-0002a5-Sw; Mon, 25 Jan 2021 09:11:32 +0100 From: Peter Korsgaard To: buildroot@buildroot.org Date: Mon, 25 Jan 2021 09:11:30 +0100 Message-Id: <20210125081131.9875-1-peter@korsgaard.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] configs/orangepi_r1_defconfig: change to GPT partitions for root=PARTLABEL support X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Korsgaard Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" GPT provides partition labels, which can be used to tell the kernel to find the rootfs based on it (root=PARTLABEL=rootfs) as a nicer/more extensible solution than the MBR disk signature / PARTUUID. The default GPT partition table location unfortunately conflicts with the SPL location, so move the 16KB GPT table after it. Signed-off-by: Peter Korsgaard --- board/orangepi/orangepi-r1/boot.cmd | 2 +- board/orangepi/orangepi-r1/genimage.cfg | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/board/orangepi/orangepi-r1/boot.cmd b/board/orangepi/orangepi-r1/boot.cmd index e62e31a3e4..50745f7e5e 100644 --- a/board/orangepi/orangepi-r1/boot.cmd +++ b/board/orangepi/orangepi-r1/boot.cmd @@ -1,6 +1,6 @@ setenv fdt_high ffffffff -setenv bootargs console=ttyS0,115200 earlyprintk root=PARTUUID=feedc0de-02 rootwait +setenv bootargs console=ttyS0,115200 earlyprintk root=PARTLABEL=rootfs rootwait fatload mmc 0 $kernel_addr_r zImage fatload mmc 0 $fdt_addr_r sun8i-h2-plus-orangepi-r1.dtb diff --git a/board/orangepi/orangepi-r1/genimage.cfg b/board/orangepi/orangepi-r1/genimage.cfg index 3496383573..0f44b368f0 100644 --- a/board/orangepi/orangepi-r1/genimage.cfg +++ b/board/orangepi/orangepi-r1/genimage.cfg @@ -13,15 +13,17 @@ image boot.vfat { image sdcard.img { hdimage { - # for root=PARTUUID=feedc0de-02 support - disk-signature = 0xfeedc0de + # for root=PARTLABEL support + gpt = true + # default GPT location conflicts with spl, move it after + gpt-location = 1M } partition u-boot { in-partition-table = "no" image = "u-boot-sunxi-with-spl.bin" offset = 8192 - size = 1040384 # 1MB - 8192 + size = 1056768 # 1MB - 8192 + 16384 (GPT) } partition boot {