From patchwork Fri May 24 02:37:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trevor Woerner X-Patchwork-Id: 44112 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A78F0C25B75 for ; Fri, 24 May 2024 02:37:37 +0000 (UTC) Received: from mail-qk1-f173.google.com (mail-qk1-f173.google.com [209.85.222.173]) by mx.groups.io with SMTP id smtpd.web10.7257.1716518255445677771 for ; Thu, 23 May 2024 19:37:35 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=AHW7dNM5; spf=pass (domain: gmail.com, ip: 209.85.222.173, mailfrom: twoerner@gmail.com) Received: by mail-qk1-f173.google.com with SMTP id af79cd13be357-7949747a23fso207915785a.0 for ; Thu, 23 May 2024 19:37:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716518253; x=1717123053; darn=lists.yoctoproject.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=Vtf796DSW2awKuy/HlnBUnpntld+cs0FPQM9VQctunQ=; b=AHW7dNM5oAWiRYTzTYp8BTJB+l1p7HHBwL9xIjgw7JZFUo7hEjuICPUrgrbiox1zBs DsX+Fd05NJNX3zzG/LYhscZyePtnvDFT60xlyQ1gauV+tO3rCoF5W0pFLUd2/6VggH3I hfUhu22ytlxLv8pYdsu2rJlfDctVxhANKRNLqYhJG/8A0sTCffCeesj++fy/RUOXUAFs B/mU+1uOhds30kSINwdcTtpjFZWc+2yiPqtPHT2RI4ItZT/pfqCCHXeJxIUew6mmAyPr 4M2B78t4kf8tRu+j5/a6OmGpjcbyxjdPcsSZpVC9QwuIE4sFQGExKbdM3oDg8UHNj00W Q7Tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716518253; x=1717123053; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Vtf796DSW2awKuy/HlnBUnpntld+cs0FPQM9VQctunQ=; b=M7xd46Kvj3cGYU8we/8RGZ1JHDT8BUzRl365qwpzrigugAB4eauhignnc43UDhiQ+x JMSOkZeB/bWqozZNryDgnF/Bcci2Mbv8c1rjBJfP0KrRtbMSMBNflqTZGtEaF/P5SKsI 7PVlV58SDJgyPUXwUyy4sMPedyruugydT0kEVgqpzQOz/2CEWWcakt8Hp7MBFkyWQHBh +KIFO2ImSJkCWJ2yVPst+P0t1wiK21v0dmkM3gVjudVfx0YrxwdDP/V9TB709ZHSmTwz DHkGbWI6tZx/+EWryVus2dFBa+O0RbuvtAcHh8wyp2CW2nCMDJT8/nPv7O4yOfqP9r7v UX2g== X-Gm-Message-State: AOJu0YyLiqFQyfqfs86WGlbfa50LpJ8ODyJYnHqFjwBXREOd0Hf6bwht XmrAR1G932F4avVKpjNiNV5ws1upNmXvUdO6s7Qmm4DjgQwBHgQV0eTOfQ== X-Google-Smtp-Source: AGHT+IGBGIxLDsDq6O3B6747q62My0R3b8sXyaAJKXunpxVIx9/Gc82BNBbWidVN55H9pQ/Yhm4jew== X-Received: by 2002:a05:620a:1448:b0:792:9148:96a with SMTP id af79cd13be357-794ab099fb8mr96771785a.41.1716518252824; Thu, 23 May 2024 19:37:32 -0700 (PDT) Received: from localhost.localdomain (pppoe-209-91-167-254.vianet.ca. [209.91.167.254]) by smtp.gmail.com with ESMTPSA id af79cd13be357-794abca6357sm23285485a.15.2024.05.23.19.37.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 May 2024 19:37:32 -0700 (PDT) From: Trevor Woerner To: yocto-patches@lists.yoctoproject.org Subject: [meta-rockchip][PATCH v2 1/3] rename root partition Date: Thu, 23 May 2024 22:37:22 -0400 Message-ID: <20240524023724.20109-1-twoerner@gmail.com> X-Mailer: git-send-email 2.44.0.501.g19981daefd7c MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 24 May 2024 02:37:37 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/184 Rename the root partition to "rootfsA" in the off-chance the user may someday be interested in implementing some sort of whole-partition update mechanism. Signed-off-by: Trevor Woerner --- v2 changes: - (none) --- conf/machine/include/rockchip-extlinux.inc | 2 +- wic/rockchip.wks | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/machine/include/rockchip-extlinux.inc b/conf/machine/include/rockchip-extlinux.inc index ca33f4c7f42a..ab46b76d33a1 100644 --- a/conf/machine/include/rockchip-extlinux.inc +++ b/conf/machine/include/rockchip-extlinux.inc @@ -12,7 +12,7 @@ NONFITDT ?= "${@d.getVar('KERNEL_DEVICETREE').split('/')[1]}" UBOOT_EXTLINUX ?= "1" -UBOOT_EXTLINUX_ROOT ?= "root=PARTLABEL=root" +UBOOT_EXTLINUX_ROOT ?= "root=PARTLABEL=rootfsA" UBOOT_EXTLINUX_FDTDIR ?= "${@bb.utils.contains('KERNEL_IMAGETYPE', 'fitImage', '', '/boot', d)}" UBOOT_EXTLINUX_FDT ?= "${@bb.utils.contains('KERNEL_IMAGETYPE', 'fitImage', '', '${NONFITDT}', d)}" UBOOT_EXTLINUX_CONSOLE ?= "earlycon console=tty1 console=${RK_CONSOLE_DEVICE},${RK_CONSOLE_BAUD}n8" diff --git a/wic/rockchip.wks b/wic/rockchip.wks index bc65f73b0cf3..e1d74d9983ab 100644 --- a/wic/rockchip.wks +++ b/wic/rockchip.wks @@ -26,6 +26,6 @@ part uboot_env --offset 8128s --fixed-size 32K --fstype=none --part-name uboo part reserved2 --offset 8192s --fixed-size 4096K --fstype=none --part-name reserved2 part loader2 --offset 16384s --fixed-size 4096K --fstype=none --part-name loader2 --source rawcopy --sourceparams="file=u-boot.${UBOOT_SUFFIX}" part atf --offset 24576s --fixed-size 4096K --fstype=none --part-name atf -part / --label root --active --fstype=ext4 --part-name root --source rootfs +part / --label rootfsA --active --fstype=ext4 --part-name rootfsA --source rootfs bootloader --ptable gpt From patchwork Fri May 24 02:37:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trevor Woerner X-Patchwork-Id: 44113 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id DC854C25B7D for ; Fri, 24 May 2024 02:37:37 +0000 (UTC) Received: from mail-qk1-f182.google.com (mail-qk1-f182.google.com [209.85.222.182]) by mx.groups.io with SMTP id smtpd.web10.7258.1716518256372710377 for ; Thu, 23 May 2024 19:37:36 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=hdBPzkhk; spf=pass (domain: gmail.com, ip: 209.85.222.182, mailfrom: twoerner@gmail.com) Received: by mail-qk1-f182.google.com with SMTP id af79cd13be357-7931a0a4d8fso540873285a.1 for ; Thu, 23 May 2024 19:37:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716518254; x=1717123054; darn=lists.yoctoproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=4iJamAmmRWrwV6kI0fPsFgADYhzoKl9bl+JKsq/Fnyc=; b=hdBPzkhkODODYR04JYP5wY2VHgaP4/L5WJ3de27zQ/2URooLHTeSEFmQxdZOppaJX7 mrjOtYUiPMleootlnhaJuAzI83WSlZt8ghB6V9Dn5ANxn3kNx2VDGzxshC/Eaf/tj3iP 3yw28O4XY8BFEneLaaFZVZTb+pGRaCQMxTEalG0O1aCOTT51WKgdW8EmHS4L4GUpgvyG x8WbQoBdi6k5d4ibVEUXQI7Z4oXSCNEU++MbcYCpwzwh/PC1HpgZvk0EwG5n2OvaZUII k925Ro3wcLvceLTGgMUnxeidrz8014f2vOjh6weewwOl6fYWOR/rT5ZuYWP5LK03p0Tf c9YQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716518254; x=1717123054; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4iJamAmmRWrwV6kI0fPsFgADYhzoKl9bl+JKsq/Fnyc=; b=TD5xSNTEbmyl0Tbpwyk5/MWtIGr9sCjpc+4KDYL7otoaoZJnfjiNUV80Q1KIYzKxOq Z567DBBLh9wBdWNeEk4RqmA4QDFWNgb30Ohw3MFJtptBr6bVzW79f3iVcWB0IBly3FV6 kvFNWb6atC2borxJpS3MyjaaQORatVwVMfuJ5FXxMmWhcF3qeHZsFokQrSkuOn4/vZxf vbTzfUlcwOgzWFM49kEHcpvzRnqcUM+rTJrkGu5b6Kn3eU6s7/p0TGLszoWYZGM4G0A5 oTl9Ko/a6NNGg5zdRYbFns65SBfy0cm/PYTp5S52H6Hsl+SudjMIldSJCcXHu8UrQBrA hzjA== X-Gm-Message-State: AOJu0Yx6mxxW60Wvv2ndIOduQS3bQEEhA3gGbUoIsuQzha5f3YvbnCoc q5PWZrEbFtg4vpPYTOmar1JJ7l1pIKlGT/0hYDENyrIxZuogPfrRV2s5tw== X-Google-Smtp-Source: AGHT+IEyhrJzzfIn3zi699Os2Ao+EP+2rpWHNBu33DO2/LYcAsZTLAbR0nvWsQvIijvSoEEBpTskNQ== X-Received: by 2002:a05:620a:4787:b0:790:98ba:67c5 with SMTP id af79cd13be357-794ab0acf2emr109055685a.33.1716518253833; Thu, 23 May 2024 19:37:33 -0700 (PDT) Received: from localhost.localdomain (pppoe-209-91-167-254.vianet.ca. [209.91.167.254]) by smtp.gmail.com with ESMTPSA id af79cd13be357-794abca6357sm23285485a.15.2024.05.23.19.37.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 May 2024 19:37:33 -0700 (PDT) From: Trevor Woerner To: yocto-patches@lists.yoctoproject.org Subject: [meta-rockchip][PATCH v2 2/3] specify root partition type Date: Thu, 23 May 2024 22:37:23 -0400 Message-ID: <20240524023724.20109-2-twoerner@gmail.com> X-Mailer: git-send-email 2.44.0.501.g19981daefd7c In-Reply-To: <20240524023724.20109-1-twoerner@gmail.com> References: <20240524023724.20109-1-twoerner@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 24 May 2024 02:37:37 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/185 Specify the root partition's type according to the Discoverable Partitions Specification: 32-bit ARM: 69dad710-2ce4-4e3c-b16c-21a1d49abed3 64-bit ARM: b921b045-1df0-41c3-af44-4c6f280d3fae Link: https://uapi-group.org/specifications/specs/discoverable_partitions_specification/ Signed-off-by: Trevor Woerner --- v2 changes: - use lower-case for both partition identifiers (in code and in commit msg) - use Arm overrides instead of MACHINE overrides to identify which identifiers are used for which builds, this clarifies why the 2 identifiers are needed --- conf/machine/include/rockchip-defaults.inc | 4 ++++ conf/machine/include/rockchip-wic.inc | 1 + wic/rockchip.wks | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/conf/machine/include/rockchip-defaults.inc b/conf/machine/include/rockchip-defaults.inc index 2387eb909934..e33a25c07b5a 100644 --- a/conf/machine/include/rockchip-defaults.inc +++ b/conf/machine/include/rockchip-defaults.inc @@ -21,3 +21,7 @@ XSERVER = " \ SERIAL_CONSOLES ?= "1500000;ttyS2" RK_CONSOLE_BAUD ?= "${@d.getVar('SERIAL_CONSOLES').split(';')[0]}" RK_CONSOLE_DEVICE ?= "${@d.getVar('SERIAL_CONSOLES').split(';')[1].split()[0]}" + +# Discoverable Partitions Specification (DPS) +ROOT_DPS:arm = "69dad710-2ce4-4e3c-b16c-21a1d49abed3" +ROOT_DPS:aarch64 = "b921b045-1df0-41c3-af44-4c6f280d3fae" diff --git a/conf/machine/include/rockchip-wic.inc b/conf/machine/include/rockchip-wic.inc index b5ee6e0c2724..dab61d83ed2c 100644 --- a/conf/machine/include/rockchip-wic.inc +++ b/conf/machine/include/rockchip-wic.inc @@ -19,6 +19,7 @@ RK_UBOOT_ENV:rk-u-boot-env = "${@ '--source rawcopy --sourceparams=file=u-boot.e WICVARS:append = " \ RK_UBOOT_ENV \ + ROOT_DPS \ SPL_BINARY \ UBOOT_SUFFIX \ " diff --git a/wic/rockchip.wks b/wic/rockchip.wks index e1d74d9983ab..cabdb6559550 100644 --- a/wic/rockchip.wks +++ b/wic/rockchip.wks @@ -26,6 +26,6 @@ part uboot_env --offset 8128s --fixed-size 32K --fstype=none --part-name uboo part reserved2 --offset 8192s --fixed-size 4096K --fstype=none --part-name reserved2 part loader2 --offset 16384s --fixed-size 4096K --fstype=none --part-name loader2 --source rawcopy --sourceparams="file=u-boot.${UBOOT_SUFFIX}" part atf --offset 24576s --fixed-size 4096K --fstype=none --part-name atf -part / --label rootfsA --active --fstype=ext4 --part-name rootfsA --source rootfs +part / --label rootfsA --active --fstype=ext4 --part-name rootfsA --source rootfs --part-type ${ROOT_DPS} bootloader --ptable gpt From patchwork Fri May 24 02:37:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trevor Woerner X-Patchwork-Id: 44114 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7843FC25B75 for ; Fri, 24 May 2024 02:37:47 +0000 (UTC) Received: from mail-qk1-f177.google.com (mail-qk1-f177.google.com [209.85.222.177]) by mx.groups.io with SMTP id smtpd.web11.7336.1716518258329144533 for ; Thu, 23 May 2024 19:37:38 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=MWben/5q; spf=pass (domain: gmail.com, ip: 209.85.222.177, mailfrom: twoerner@gmail.com) Received: by mail-qk1-f177.google.com with SMTP id af79cd13be357-792d65cd7a8so345621385a.1 for ; Thu, 23 May 2024 19:37:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716518257; x=1717123057; darn=lists.yoctoproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9W1nmeMNRigqjZUejhutH2j96GZPEnF1samUuchFJdw=; b=MWben/5qY3yDq6ziwUpyG/3nT8qiD8803Fh1Eb9hmxebkWMlirWJnQrXO/GLkF3rPy 0O7EADYvyMDmT+txZfDXgqdYwvshqByhDhv4rESSoA6We4ULPXynzQCYuafAPnXyQ/M3 iwqpXqvf21FAS7L81Au4NE9JSvJomzQOizgkGlpSPNXJByo8Q/AV/fhK1Ht5aORfF6sU FoxDCeeC3NkCA0jUUwNSnDA89knYzQyv/pkJ9cGfYcA6YM3eRdqlS9H4k3WTkaKnDOFU k6Pg4YXQiNuwOXnhCVMw16I/n9Hd75Zk0gWivR4/9uxDrJikO+NFPgcC/XFuiM2tkRHh 0pYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716518257; x=1717123057; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9W1nmeMNRigqjZUejhutH2j96GZPEnF1samUuchFJdw=; b=uTNZI2cV8ZAVkVjrtKi/k4TOZETU8ZRWdDaPwfiIuibQC9eW8SWjbNh5Uvsg/slnAU Z5+rC4nCnCTbbYKiWD8w7Q6AKAnLoHT5pb82mcaFlPT3dUgM5MQ+pkX4l/DaneHQvWuR NakJA5PkEebZnTybr2vDxD9VRrfa5bailbF3rIadtpM2nOMg014uGbvJeSZotudkfKdX HNb9xO3EJbDW5q+26E2nLsbpzVwohsoLiY+8IcAbdiAhuX/zDZ7BA+nobhnC5GGRcWI6 5KVYRbTpFxSBZts3nMMg14dPJ5izryMWHsmmaYGsWPGg1xBzsyUzuBsFVQKrZ5OdJKoE LFYg== X-Gm-Message-State: AOJu0Yxqc9OZRhOXYDFA6dSBx3nZqxxD3jN9T7N7VHteJapAailoqvQv TlR8vnyMqXiF91ctrf2Sc7RresqhLke9yCqNMZRBorUllJAKLEDDNyLx0Q== X-Google-Smtp-Source: AGHT+IHhQDV/nv+jOi8PsyWkkyPbQrWh4eXVWjdMLxd4bMq+74Z9s8Emv005+LKHKKkuwbSpZdXC6A== X-Received: by 2002:a05:620a:56d9:b0:792:bf91:3d41 with SMTP id af79cd13be357-794ab048955mr97571785a.15.1716518256727; Thu, 23 May 2024 19:37:36 -0700 (PDT) Received: from localhost.localdomain (pppoe-209-91-167-254.vianet.ca. [209.91.167.254]) by smtp.gmail.com with ESMTPSA id af79cd13be357-794abca6357sm23285485a.15.2024.05.23.19.37.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 May 2024 19:37:34 -0700 (PDT) From: Trevor Woerner To: yocto-patches@lists.yoctoproject.org Cc: Quentin Schulz Subject: [meta-rockchip][PATCH v2 3/3] u-boot: remove upstreamed dependency Date: Thu, 23 May 2024 22:37:24 -0400 Message-ID: <20240524023724.20109-3-twoerner@gmail.com> X-Mailer: git-send-email 2.44.0.501.g19981daefd7c In-Reply-To: <20240524023724.20109-1-twoerner@gmail.com> References: <20240524023724.20109-1-twoerner@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 24 May 2024 02:37:47 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/186 The dependency on pyelftools is now in upstream oe-core making this one redundant. oe-core: 70eca6a5ccf4 ("u-boot: add missing dependency on pyelftools-native") Reviewed-by: Quentin Schulz Signed-off-by: Trevor Woerner --- v2 changes: - add a git fixes-style link pointing to the upstream oe-core commit mentioned in the commit message - added Reviewed-by tag --- recipes-bsp/u-boot/u-boot_%.bbappend | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipes-bsp/u-boot/u-boot_%.bbappend b/recipes-bsp/u-boot/u-boot_%.bbappend index 33b521021a1c..5c9e442cca8d 100644 --- a/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/recipes-bsp/u-boot/u-boot_%.bbappend @@ -3,8 +3,6 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI:append:rk-u-boot-env = " file://rockchip-enable-environment-mmc.cfg" SRCREV:rk-u-boot-env = "cdfcc37428e06f4730ab9a17cc084eeb7676ea1a" -# various machines require the pyelftools library for parsing dtb files -DEPENDS:append = " python3-pyelftools-native" DEPENDS:append:rk3308 = " u-boot-tools-native" DEPENDS:append:rock-pi-4 = " gnutls-native" DEPENDS:append:rk-u-boot-env = " u-boot-mkenvimage-native"