From patchwork Mon Feb 19 17:48:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trevor Woerner X-Patchwork-Id: 39733 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 A4E90C54764 for ; Mon, 19 Feb 2024 17:48:36 +0000 (UTC) Received: from mail-il1-f177.google.com (mail-il1-f177.google.com [209.85.166.177]) by mx.groups.io with SMTP id smtpd.web10.525.1708364912291013300 for ; Mon, 19 Feb 2024 09:48:32 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=UMwCub9+; spf=pass (domain: gmail.com, ip: 209.85.166.177, mailfrom: twoerner@gmail.com) Received: by mail-il1-f177.google.com with SMTP id e9e14a558f8ab-364f791a428so14373635ab.3 for ; Mon, 19 Feb 2024 09:48:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708364910; x=1708969710; 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=HU4dzeLfWMEsh+ciYODYGS1OkgTJ+RPSaYhzCySoS/M=; b=UMwCub9+jBYj6mny11kvuGqdGhgFR1pNfzvl/6J/E5LK2MiCj/vLIy4BhXPT2ivX8C h3GMkxS5fnN2TGmf7nKl4xyFqDqk1EftOs1EmrDlC0TpzJrGWKGOGC8sXBbHz6I4ymja eh+kfcjHtJ/ZSzZR7rBO+NmY7mvKSuDDle76buvECG6Wat7y+7id1V0GMKLO9h+Fevcr 6dyNHLhWa+NLSId5w6B464T7rej+3XSoQXli2Z0hSnb2470SrqjDiXGIWPX4lpYoANWv PwF8Gby8qw8OotA7MoOU3dkRSxEP57hppOCeiNGnjPv+Iyp5fcoRJxPSF6OLGon8r2sJ FHaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708364910; x=1708969710; 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=HU4dzeLfWMEsh+ciYODYGS1OkgTJ+RPSaYhzCySoS/M=; b=fl01Z2QIlUOdTtBK4U2wdGs0SIsfZroWYfMZKFTQzSX1WhR1aIzH8+Uii0mkzru3ox TG8VjfG3lEjtmmqG1lxngTgdwxGk3mHvoyrELZIDze7jG1lYr1YGE8je8Og1ouy2obxE Iy3EBzWrOAseBmb5LuGlwNMrJAiUlEncO7/T9tCH3yvhLMpux10SuCkkzmKPCiBQYk6+ CstKaHsKXVBAh512T2U2gCxedOMQC4fz/TIXvIzdhY/c0wxcPv59ErHegiHxdtr7GGwg QjJKWEDVOmWdtuO7ycOd63bEDPMe/AHELzG/BdJY2cFKKD2XC21X1Kh/4Y+tsIKv7j4g KyFw== X-Gm-Message-State: AOJu0YzkQbqHtHvD4PsEM9eIGs8mieJm+4zbnnoP4kfwC85DQa4pc2/K dsWKkZNrle50QAbR7T86TflejJCSDFDOUlfdiCJDjOz4mdJdEe86WitZ9sRl X-Google-Smtp-Source: AGHT+IF3QrAZuTa7RZhWNwf76XrP1XZ4qatLzk/VW6AfJui6DEwLFkpVlV0jfqSyeSVHrtKPuFyyFg== X-Received: by 2002:a05:6e02:12c5:b0:365:b41:213 with SMTP id i5-20020a056e0212c500b003650b410213mr13965087ilm.17.1708364910277; Mon, 19 Feb 2024 09:48:30 -0800 (PST) Received: from localhost.localdomain (pppoe-209-91-167-254.vianet.ca. [209.91.167.254]) by smtp.gmail.com with ESMTPSA id x5-20020a056e021ca500b00363ea5c0fb4sm2300208ill.70.2024.02.19.09.48.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Feb 2024 09:48:29 -0800 (PST) From: Trevor Woerner To: yocto@lists.yoctoproject.org Subject: [meta-rockchip][PATCH v3 1/5] rockchip.wks: specify offsets in sectors Date: Mon, 19 Feb 2024 12:48:21 -0500 Message-ID: <20240219174825.7084-1-twoerner@gmail.com> X-Mailer: git-send-email 2.43.0.76.g1a87c842ece3 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 ; Mon, 19 Feb 2024 17:48:36 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/62541 In WIC, size arguments can be optionally specified using one of a variety of suffixes (e.g. K, M, G, etc.) thanks to sizetype(). One such suffix being "s/S" for handling sector sizes which are assumed to be 512 bytes, rather than the other size suffixes which are multiples of 1024 bytes. Using the s/S sizetype allows the definition to match the documentation. Unfortunately we can not use the s/S suffix for --fixed-size. Signed-off-by: Trevor Woerner Reviewed-by: Quentin Schulz --- changes in v3: - new --- wic/rockchip.wks | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/wic/rockchip.wks b/wic/rockchip.wks index fac0b8f70112..804e84ceb316 100644 --- a/wic/rockchip.wks +++ b/wic/rockchip.wks @@ -5,8 +5,7 @@ # short-description: Create a disk image suitable for booting Rockchip from SD-card # long-description: Creates a disk image partitioned using GPT, suitable for Rockchip # Disk layout -# Note that the reference documentation refers to 512 byte disk sectors, but -# wic uses 1KB blocks. The following table uses 512 byte sectors: +# See: https://opensource.rock-chips.com/wiki_Partitions # # Partition Start Sector Number of Sectors # loader1 64 8000 (idbloader / U-Boot SPL) @@ -17,12 +16,12 @@ # boot 32768 229376 # root 262144 - (suggested) -part loader1 --offset 32 --fixed-size 4000K --source rawcopy --sourceparams="file=${SPL_BINARY}" -part reserved1 --offset 4032 --fixed-size 64K -part reserved2 --offset 4096 --fixed-size 4096K -part loader2 --offset 8192 --fixed-size 4096K --source rawcopy --sourceparams="file=u-boot.${UBOOT_SUFFIX}" -part atf --offset 12288 --fixed-size 4096K -part /boot --offset 16384 --size 114688K --active --source bootimg-partition --fstype=vfat --label boot --use-uuid --sourceparams="loader=u-boot" +part loader1 --offset 64s --fixed-size 4000K --source rawcopy --sourceparams="file=${SPL_BINARY}" +part reserved1 --offset 8064s --fixed-size 64K +part reserved2 --offset 8192s --fixed-size 4096K +part loader2 --offset 16384s --fixed-size 4096K --source rawcopy --sourceparams="file=u-boot.${UBOOT_SUFFIX}" +part atf --offset 24576s --fixed-size 4096K +part /boot --offset 32768s --size 114688K --active --source bootimg-partition --fstype=vfat --label boot --use-uuid --sourceparams="loader=u-boot" part / --source rootfs --fstype=ext4 --label root --use-uuid bootloader --ptable gpt --append="console=tty1 console=${RK_CONSOLE_DEVICE},${RK_CONSOLE_BAUD}n8 rw rootfstype=ext4 init=/sbin/init" From patchwork Mon Feb 19 17:48: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: 39732 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 A4DE9C48BF8 for ; Mon, 19 Feb 2024 17:48:36 +0000 (UTC) Received: from mail-il1-f175.google.com (mail-il1-f175.google.com [209.85.166.175]) by mx.groups.io with SMTP id smtpd.web10.527.1708364915329702477 for ; Mon, 19 Feb 2024 09:48:35 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=CAQZ6P5i; spf=pass (domain: gmail.com, ip: 209.85.166.175, mailfrom: twoerner@gmail.com) Received: by mail-il1-f175.google.com with SMTP id e9e14a558f8ab-3651d6dea15so6028525ab.1 for ; Mon, 19 Feb 2024 09:48:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708364913; x=1708969713; 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=mgDzwbbNaYad1gzcVnhpweCWM/sxQKLIO98rZl/FCgc=; b=CAQZ6P5iDW8gB6XmRARDNCHy2ca9Rpt3ei1mBHVIU+r9rMPkncaDpAcXbrHv4ZFZHp r2LCMiFgQi2cuy+Z1Pfn6mzWcSmFiWpZTd/7GCshTy+o+h9WCCttV9c3sJVL1nUAz0x9 2AaNwqj5I+ZzC3pCmaLHHugngCOOdnUmwMoFGFjMEROR1Atz2h2Sh0JgaEML75ZKw4zt /Qy5nJdwVzftC1kwk4ftj8yP/GPav8IQefeOTSAkRVmwX/sboATsyMVlPma5N5P808NK zztRap4SXh6yxkEDatjGolLZ4rwR7k2SODRd7S+B+bkEQQUbsd0CVC9SBmIoL0zhIUbD Sjlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708364913; x=1708969713; 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=mgDzwbbNaYad1gzcVnhpweCWM/sxQKLIO98rZl/FCgc=; b=wPmDb4/U9DQUukJTyAGdN0e4Gghu9hvyRYi0wSICwzq0DGkmDvfwUZ3RZr0bJioF45 ibZSNSIryMQD80Te0S4yhZPdtJD/TUEQZaRfVqNMpQ4hLJl/mjEpQoUNl+u4w+5nH+Ef 1cvpoJQasMEP2FLhajjCGCKe5jykypzX8GdvgRIo/iEuyDy+md1BIvUx5aWek/wqbP88 HA1R7aA3Tg+4ts+mwAmBPyTFR/Ul05zGXWR4ZBftuQ6LCxt0ScJck7HRe4ZVlL4jfpCN ZP6dlUYAAiyG+mvDRK6gb7LbftNPD6RhO/Pg5nsH6Z41c7z7KkmX4LpRsrAZZYMWL8ao RE4g== X-Gm-Message-State: AOJu0Yw7IQ7k2DGiSX+u5zeNecTKoqO/qlGJTCflr4ptf/rWjOR7r1/f 7Ku7KpKxCpLWDIdpvkRQd1g9xS937VjDWFxmsD+3dN6eiNo0vvD9gapHjjv+ X-Google-Smtp-Source: AGHT+IEzrGcQN151lnhEBMkZiVs1PMYzc4d8vCz4MkFtxF9LXQX16nqwWLUPpddG3dtqAYRfDXkwFA== X-Received: by 2002:a92:d384:0:b0:365:2399:2446 with SMTP id o4-20020a92d384000000b0036523992446mr4312982ilo.1.1708364912897; Mon, 19 Feb 2024 09:48:32 -0800 (PST) Received: from localhost.localdomain (pppoe-209-91-167-254.vianet.ca. [209.91.167.254]) by smtp.gmail.com with ESMTPSA id x5-20020a056e021ca500b00363ea5c0fb4sm2300208ill.70.2024.02.19.09.48.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Feb 2024 09:48:30 -0800 (PST) From: Trevor Woerner To: yocto@lists.yoctoproject.org Cc: Quentin Schulz Subject: [meta-rockchip][PATCH v3 2/5] rockchip.wks: specify fstype Date: Mon, 19 Feb 2024 12:48:22 -0500 Message-ID: <20240219174825.7084-2-twoerner@gmail.com> X-Mailer: git-send-email 2.43.0.76.g1a87c842ece3 In-Reply-To: <20240219174825.7084-1-twoerner@gmail.com> References: <20240219174825.7084-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 ; Mon, 19 Feb 2024 17:48:36 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/62542 If the wks file doesn't specify, the assumption is that each partition contains a vfat-formatted filesystem. Most of the partitions in the Rockchip layout don't have filesystems. Implicitly setting the fstype to vfat causes wic to format the partitions. It doesn't make sense to format the rawcopy partitions as vfat just to immediately overwrite them with binaries, and it wastes time formatting partitions that won't ever be used as filesystems. Reviewed-by: Quentin Schulz Signed-off-by: Trevor Woerner --- changes in v3: - tweak to accommodate offsets specified in sectors changes in v2: - reword the commit message to add clarity - add Quentin's tag --- wic/rockchip.wks | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/wic/rockchip.wks b/wic/rockchip.wks index 804e84ceb316..42b731ac47b2 100644 --- a/wic/rockchip.wks +++ b/wic/rockchip.wks @@ -16,12 +16,12 @@ # boot 32768 229376 # root 262144 - (suggested) -part loader1 --offset 64s --fixed-size 4000K --source rawcopy --sourceparams="file=${SPL_BINARY}" -part reserved1 --offset 8064s --fixed-size 64K -part reserved2 --offset 8192s --fixed-size 4096K -part loader2 --offset 16384s --fixed-size 4096K --source rawcopy --sourceparams="file=u-boot.${UBOOT_SUFFIX}" -part atf --offset 24576s --fixed-size 4096K -part /boot --offset 32768s --size 114688K --active --source bootimg-partition --fstype=vfat --label boot --use-uuid --sourceparams="loader=u-boot" -part / --source rootfs --fstype=ext4 --label root --use-uuid +part loader1 --offset 64s --fixed-size 4000K --fstype=none --source rawcopy --sourceparams="file=${SPL_BINARY}" +part reserved1 --offset 8064s --fixed-size 64K --fstype=none +part reserved2 --offset 8192s --fixed-size 4096K --fstype=none +part loader2 --offset 16384s --fixed-size 4096K --fstype=none --source rawcopy --sourceparams="file=u-boot.${UBOOT_SUFFIX}" +part atf --offset 24576s --fixed-size 4096K --fstype=none +part /boot --offset 32768s --size 114688K --fstype=vfat --active --source bootimg-partition --label boot --use-uuid --sourceparams="loader=u-boot" +part / --fstype=ext4 --source rootfs --label root --use-uuid bootloader --ptable gpt --append="console=tty1 console=${RK_CONSOLE_DEVICE},${RK_CONSOLE_BAUD}n8 rw rootfstype=ext4 init=/sbin/init" From patchwork Mon Feb 19 17:48: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: 39734 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 8942AC48BF8 for ; Mon, 19 Feb 2024 17:48:46 +0000 (UTC) Received: from mail-il1-f181.google.com (mail-il1-f181.google.com [209.85.166.181]) by mx.groups.io with SMTP id smtpd.web10.531.1708364918125547633 for ; Mon, 19 Feb 2024 09:48:38 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=TeVfVxYM; spf=pass (domain: gmail.com, ip: 209.85.166.181, mailfrom: twoerner@gmail.com) Received: by mail-il1-f181.google.com with SMTP id e9e14a558f8ab-364f794f237so19727205ab.1 for ; Mon, 19 Feb 2024 09:48:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708364916; x=1708969716; 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=Okg42sH8NiK/Br7uEECJ5PGEY6dmE8kscXniwodDk5Y=; b=TeVfVxYMap7WmuVZFbjhHpn8rIebfFmWqfZJeRnDIWLLZ51AxhG0NxRcsciAJw1/eD HpglCaoeRKL7UWPGUKONU3d0XIHiEYpbVGgz+M0YD8/eZlopvWmmfigE3ysAXSLcsm/r yCCzcGQ+56ODMAKi1PUS1sVRCkkQS3YdeDkrSM/aeu82jIfZvCojxz2JH1w9g1pMy3hw Xz1SSTMeoszUUajQnL8tfG+QRZ3r9FyjnTLQLqufzvMUzJ5O0+tRFnd54u22y/aUHsgq Z2GPOBae1xVFHFtSN4h5xbBmzQW5CnGdU4ChX1aXEQZPX2tfLqD2s/9Niz30W1+uELTn 7z+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708364916; x=1708969716; 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=Okg42sH8NiK/Br7uEECJ5PGEY6dmE8kscXniwodDk5Y=; b=W1XsJCDUfSd7V1rANvcIlUMizCns0l4P2/0kpteIGPq/+iwSNHnpXnhSjfyMJnG3In fGcK7QbFlSktO5cPFnrl53n2SaJC0oWMSF3BtLtk/CS8QQLhyysz9c3dESMVClO46R7r kFuYt7voa09w1ApP3zcPtgMXf10xKjUK/BpYiHGCUBT1xUUZlrnAPNxPSY8mC5Vsl0TD 4ZlvtEuS3nV9deZJTf5hL7fMLwmU4o9yehy76ih7tqkn6E0heNEHXUHl23rN6rQcWOXQ qyKxo2BZUMzrvKjHCzoDNXKKfiszvEYoIXuJxm87pC+EusEawOnKJnvWKi2VyLm8RbPK EZlw== X-Gm-Message-State: AOJu0YxIU264MCK/LVuZVD32UQFwuw3vwJ62Vx88p3lAiyUOrJ2L7z5v c6Awv6PQ/MnK0C52kXFIs5Bj+f7WHQDTanDHlhZhCNUqpmYe789VHQRVc7cM X-Google-Smtp-Source: AGHT+IES2OUV+BSd/lGSb6PF6s3wSrS8KqqewmnOLHz1sfdDIGq0KrEIgUSMz0QF+5iOE3RiWITihg== X-Received: by 2002:a05:6e02:4ce:b0:363:d9eb:c2e0 with SMTP id f14-20020a056e0204ce00b00363d9ebc2e0mr10636377ils.28.1708364915970; Mon, 19 Feb 2024 09:48:35 -0800 (PST) Received: from localhost.localdomain (pppoe-209-91-167-254.vianet.ca. [209.91.167.254]) by smtp.gmail.com with ESMTPSA id x5-20020a056e021ca500b00363ea5c0fb4sm2300208ill.70.2024.02.19.09.48.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Feb 2024 09:48:33 -0800 (PST) From: Trevor Woerner To: yocto@lists.yoctoproject.org Cc: Quentin Schulz Subject: [meta-rockchip][PATCH v3 3/5] rockchip.wks: add most Rockchip partitions Date: Mon, 19 Feb 2024 12:48:23 -0500 Message-ID: <20240219174825.7084-3-twoerner@gmail.com> X-Mailer: git-send-email 2.43.0.76.g1a87c842ece3 In-Reply-To: <20240219174825.7084-1-twoerner@gmail.com> References: <20240219174825.7084-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 ; Mon, 19 Feb 2024 17:48:46 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/62543 Rockchip defines the expected layout/map of the default storage device. Fill out the wks description so it matches. https://opensource.rock-chips.com/wiki_Partitions There are 2 partitions at the start that can not be specified in rockchip.wks due to a limitation in wic which assumes all sizes (e.g. --size or --fixed-size) are specified in units of 1024 bytes. Due to the fact these partitions don't fall on 1024-byte boundaries, they can not be specified at this time. Note: in the Rockchip layout, not all partitions are expected to show up in the gpt partition table. This patch uses "--no-table" to only number the partitions that are numbered in the Rockchip wiki, as well as to give these partitions the partition numbers indicated in the wiki. Note: there is a mistake in the Rockchip table (which I've copied verbatim here in this commit message but corrected in rockchip.wks). Going by the values of the "Start Sector", the size of the "reserved1" partition is listed as being 2x its actual size/number of sectors. Expected: Partition Start Sector Number of Sectors Partition Size PartNum in GPT Requirements MBR 0 00000000 1 00000001 512 0.5KB Primary GPT 1 00000001 63 0000003F 32256 31.5KB loader1 64 00000040 7104 00001bc0 4096000 2.5MB 1 preloader (miniloader or U-Boot SPL) Vendor Storage 7168 00001c00 512 00000200 262144 256KB SN, MAC and etc. Reserved Space 7680 00001e00 384 00000180 196608 192KB Not used reserved1 8064 00001f80 128 00000080 65536 64KB legacy DRM key U-Boot ENV 8128 00001fc0 64 00000040 32768 32KB reserved2 8192 00002000 8192 00002000 4194304 4MB legacy parameter loader2 16384 00004000 8192 00002000 4194304 4MB 2 U-Boot or UEFI trust 24576 00006000 8192 00002000 4194304 4MB 3 trusted-os like ATF, OP-TEE boot 32768 00008000 229376 00038000 117440512 112MB 4 kernel, dtb, extlinux.conf, ramdisk rootfs 262144 00040000 - - - -MB 5 Linux system Prior to this patch: # fdisk -l /dev/mmcblk1 GPT PMBR size mismatch (1504727 != 30375935) will be corrected by write. The backup GPT table is not on the end of the device. Disk /dev/mmcblk1: 14.48 GiB, 15552479232 bytes, 30375936 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / 512 bytes Disklabel type: gpt Disk identifier: 00000000-0000-0000-0000-00004D9B9EF0 Device Start End Sectors Size Type /dev/mmcblk1p1 64 8063 8000 3.9M Microsoft basic data /dev/mmcblk1p2 8064 8191 128 64K Microsoft basic data /dev/mmcblk1p3 8192 16383 8192 4M Microsoft basic data /dev/mmcblk1p4 16384 24575 8192 4M Microsoft basic data /dev/mmcblk1p5 24576 32767 8192 4M Microsoft basic data /dev/mmcblk1p6 32768 330955 298188 145.6M Microsoft basic data /dev/mmcblk1p7 330956 1504693 1173738 573.1M Linux filesystem New: # fdisk -l /dev/mmcblk1 GPT PMBR size mismatch (1504727 != 30375935) will be corrected by write. The backup GPT table is not on the end of the device. Disk /dev/mmcblk1: 14.48 GiB, 15552479232 bytes, 30375936 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / 512 bytes Disklabel type: gpt Disk identifier: 00000000-0000-0000-0000-00004D9B9EF0 Device Start End Sectors Size Type /dev/mmcblk1p1 64 7167 7104 3.5M Linux filesystem /dev/mmcblk1p2 16384 24575 8192 4M Linux filesystem /dev/mmcblk1p3 24576 32767 8192 4M Linux filesystem /dev/mmcblk1p4 32768 330955 298188 145.6M Microsoft basic data /dev/mmcblk1p5 330956 1504693 1173738 573.1M Linux filesystem Reviewed-by: Quentin Schulz Signed-off-by: Trevor Woerner --- changes in v3: - tweaked to accommodate offsets specified in sectors - clarified that the first 2 partitions can not be added - change name of vstorage to v_storage - fixed typo (ATR -> ATF) - added Quentin's tag changes in v2: - expand the commit message to show past, expected, and new behaviour - spell out that vstorage stands for "vendor storage" --- wic/rockchip.wks | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/wic/rockchip.wks b/wic/rockchip.wks index 42b731ac47b2..b557f8137af1 100644 --- a/wic/rockchip.wks +++ b/wic/rockchip.wks @@ -8,17 +8,23 @@ # See: https://opensource.rock-chips.com/wiki_Partitions # # Partition Start Sector Number of Sectors -# loader1 64 8000 (idbloader / U-Boot SPL) -# reserved1 8064 128 -# reserved2 8192 8192 +# loader1 64 7104 (idbloader / U-Boot SPL) +# v_storage 7168 512 (vendor storage: e.g. serial number, MAC address, etc) +# reserved 7680 384 (not used) +# reserved1 8064 64 (legacy DRM key) +# uboot_env 8128 64 (U-Boo environment) +# reserved2 8192 8192 (legacy parameters, ATAGS, etc) # loader2 16384 8192 (U-Boot proper) -# atf 24576 8192 +# atf 24576 8192 (trusted OS e.g. ATF, OP-TEE, etc) # boot 32768 229376 # root 262144 - (suggested) -part loader1 --offset 64s --fixed-size 4000K --fstype=none --source rawcopy --sourceparams="file=${SPL_BINARY}" -part reserved1 --offset 8064s --fixed-size 64K --fstype=none -part reserved2 --offset 8192s --fixed-size 4096K --fstype=none +part loader1 --offset 64s --fixed-size 3552K --fstype=none --source rawcopy --sourceparams="file=${SPL_BINARY}" +part v_storage --offset 7168s --fixed-size 256K --fstype=none --no-table +part reserved --offset 7680s --fixed-size 192K --fstype=none --no-table +part reserved1 --offset 8064s --fixed-size 32K --fstype=none --no-table +part uboot_env --offset 8128s --fixed-size 32K --fstype=none --no-table +part reserved2 --offset 8192s --fixed-size 4096K --fstype=none --no-table part loader2 --offset 16384s --fixed-size 4096K --fstype=none --source rawcopy --sourceparams="file=u-boot.${UBOOT_SUFFIX}" part atf --offset 24576s --fixed-size 4096K --fstype=none part /boot --offset 32768s --size 114688K --fstype=vfat --active --source bootimg-partition --label boot --use-uuid --sourceparams="loader=u-boot" From patchwork Mon Feb 19 17:48: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: 39735 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 89468C54764 for ; Mon, 19 Feb 2024 17:48:46 +0000 (UTC) Received: from mail-il1-f171.google.com (mail-il1-f171.google.com [209.85.166.171]) by mx.groups.io with SMTP id smtpd.web10.532.1708364921267627778 for ; Mon, 19 Feb 2024 09:48:41 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=c2zwsNq0; spf=pass (domain: gmail.com, ip: 209.85.166.171, mailfrom: twoerner@gmail.com) Received: by mail-il1-f171.google.com with SMTP id e9e14a558f8ab-365337ad3e7so2895565ab.0 for ; Mon, 19 Feb 2024 09:48:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708364919; x=1708969719; 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=VyYb4wWfi9qLFSpsrO+bp4aVGyiaqTjMCDj3HHZ4+eM=; b=c2zwsNq0XzoCSOrTAXo/88ih1vgzcXTzO+Lb/EimSb6VlAWNh3dmpjdu0dtwTO3Sx+ NM8yl/FBYVZqyoM7iFhS8zXWjyJAwRiq3XMpzNNPcWBz3kE6vXp6ESNrwk6bGNttDuST GQpGXKvtbnVAJokfYyguUxFM/0NoWoytNbW/6W4BdZCgjBdlQsfoptzeD0LpaAZUnWSc Fe5U/115J0MdOsTnRDnJNy8d/7MKKkDI05GFgsLPygKqo/Y4BejWUt+we2U4nY2obZd8 UyYYL12+PcrqajfBG38r/ctf0MJY0phKP2M02032VNp8A4NywDZ2Yi/MyieEC6NhKDJG asLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708364919; x=1708969719; 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=VyYb4wWfi9qLFSpsrO+bp4aVGyiaqTjMCDj3HHZ4+eM=; b=RLXvyH9loRpFvwu23AXnDvJDZeEYJa8ImsFuo85S+XaI2FMMfPwzm7crXuC/kf3tp8 qxoZf5qQaS8kXm17BcZAiVkrycV9yX1LsO+bOQKBqAAnd/e2NWcqEEdY7w2CQq+rFrEh 1ID/QEp6fW/sISsIuJwlXSRbog2PisjZB+f3/uR3KQeDu7YpyQte88tt5L6Wwnw1yggV vlCw6vdu+zxFUBLavkdsu9mvNbVXTz4NuJ3DPjzlWzaBTEGcebwYQcV8utPlKm1/hx2S feiCuNI31JCqtUfrPU0khBIRzhok5NV2o/cmOPcaz/pPtY1ljQ9CDdaRJ4b8nr2iK6ZY xRUQ== X-Gm-Message-State: AOJu0YziaajpTLOxuu87u9jIHJBVllw4JTF32RhCeMpa8dmCPBpFjA9q jCqS2vwUH+HhmuhgEMyJqmV4m/qQD3py3VZJZIEMSD+9y55iOWBcaMaE/O6R X-Google-Smtp-Source: AGHT+IF5fufCTWmMpojgIVklXbRveeJrG8fyX/fVJZb3AFIdNSGK+2FNCU64whhRSGbTywV98Yr5Eg== X-Received: by 2002:a92:d84f:0:b0:365:17cf:f759 with SMTP id h15-20020a92d84f000000b0036517cff759mr8451450ilq.14.1708364919215; Mon, 19 Feb 2024 09:48:39 -0800 (PST) Received: from localhost.localdomain (pppoe-209-91-167-254.vianet.ca. [209.91.167.254]) by smtp.gmail.com with ESMTPSA id x5-20020a056e021ca500b00363ea5c0fb4sm2300208ill.70.2024.02.19.09.48.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Feb 2024 09:48:36 -0800 (PST) From: Trevor Woerner To: yocto@lists.yoctoproject.org Subject: [meta-rockchip][PATCH v3 4/5] remove /boot partition Date: Mon, 19 Feb 2024 12:48:24 -0500 Message-ID: <20240219174825.7084-4-twoerner@gmail.com> X-Mailer: git-send-email 2.43.0.76.g1a87c842ece3 In-Reply-To: <20240219174825.7084-1-twoerner@gmail.com> References: <20240219174825.7084-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 ; Mon, 19 Feb 2024 17:48:46 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/62544 In order to boot successfully, most Rockchip SoCs require a specific partitioning scheme which was defined many years (and many SoCs) ago. That partitioning scheme places the SPL and U-Boot at specific offsets at the start of the boot block device: https://opensource.rock-chips.com/wiki_Partitions The Rockchip partitioning scheme goes on to also define the locations of a number of additional partitions, including the "boot" and "root" partitions. Since both the SPL and U-Boot have already been placed on the block device, the "boot" partition only contains the extlinux config file and the kernel+dtb/fitImage; it doesn't contain any bootloader artifacts (other than the extlinux config). The location of the SPL partition is a hard dependency since the BOOTROM etched inside the Rockchip SoCs is programmed to load and run a validated binary it finds at this location. The locations of the "boot" and "root" partitions are not so rigid since it is U-Boot which interacts with them. U-Boot is very flexible with how it finds boot components, and in its support for various devices, filesystems, sizes, etc. Both oe-core's U-Boot metadata and wic's bootimg-partition script contain logic to generate the extlinux pieces required for a bootloader to boot a Linux system. If both are enabled, the wic pieces silently clobber the U-Boot pieces. However, the mechanisms contained in the U-Boot metadata are much more flexible, from a user's point of view, than the mechanisms in wic's bootimg-partition. If a user wishes to setup some sort of A/B redundant update mechanism, they must have redundant root partitions (in order to update their filesystem contents) but they also need to have redundant boot partitions if they wish to update the kernel as part of their update mechanism. Pairing redundant kernel partitions with redundant filesystem partitions becomes unnecessarily complicated. Therefore it makes sense to combine the kernel and the filesystem into the same partition so that both the kernel and filesystem are updated, or rolled back, in lock-step as one unit. Specific kernel versions and configurations often have dependencies on user-space components and versions. The /boot location is not going away. This patch simply transfers responsibility for its creation to the more flexible U-Boot mechanism and includes the kernel as part of the same partition as the root filesystem. Not only does it add flexibility, it also makes update schemes more straightforward. Although having a separate /boot partition is a "requirement" of the Rockchip partitioning scheme, it is not an actual hard requirement when using a flexible, open-source bootloader (such as U-Boot) instead of using Rockchip's proprietary miniloader, preloader, and trust.img. Build-tested for all boards. Run-tested on: nanopi-m4-2gb, nanopi-m4b, nanopi-r2s, nanopi-r4s, roc-rk3328-cc, rock-3a, rock-5a, rock-5b, rock-pi-4b, rock-pi-e, rock-pi-s, rock64 Signed-off-by: Trevor Woerner Reviewed-by: Quentin Schulz --- changes in v3: - add back the comment explaining the need for NONFITDT - change the inclusion of the u-boot-extlinux package from RRECOMMENDS to RDEPENDS - clarify the commit message to remove the un-true statement that sizes are hard requirements - add back the "--ptable gpt" line to rockchip.wks changes in v2: - add UBOOT_EXTLINUX_FDT and tweak UBOOT_EXTLINUX_FDTDIR to modify their behaviour based on whether or not KERNEL_IMAGETYPE is fitImage - remove extraneous WKS_FILE_DEPENDS - remove "--ptable gpt" from wks - move newly added "earlycon" to UBOOT_EXTLINUX_CONSOLE - re-word the commit message to better explain the behaviour of the Rockchip BootROM --- conf/machine/include/rockchip-defaults.inc | 2 ++ conf/machine/include/rockchip-extlinux.inc | 24 ++++++++++++++++++++++ conf/machine/include/rockchip-wic.inc | 20 ++---------------- wic/rockchip.wks | 12 +++++------ 4 files changed, 33 insertions(+), 25 deletions(-) create mode 100644 conf/machine/include/rockchip-extlinux.inc diff --git a/conf/machine/include/rockchip-defaults.inc b/conf/machine/include/rockchip-defaults.inc index 3ce2e246ab0b..2387eb909934 100644 --- a/conf/machine/include/rockchip-defaults.inc +++ b/conf/machine/include/rockchip-defaults.inc @@ -19,3 +19,5 @@ XSERVER = " \ # misc SERIAL_CONSOLES ?= "1500000;ttyS2" +RK_CONSOLE_BAUD ?= "${@d.getVar('SERIAL_CONSOLES').split(';')[0]}" +RK_CONSOLE_DEVICE ?= "${@d.getVar('SERIAL_CONSOLES').split(';')[1].split()[0]}" diff --git a/conf/machine/include/rockchip-extlinux.inc b/conf/machine/include/rockchip-extlinux.inc new file mode 100644 index 000000000000..ca33f4c7f42a --- /dev/null +++ b/conf/machine/include/rockchip-extlinux.inc @@ -0,0 +1,24 @@ +# KERNEL_DEVICETREE follows the pattern of +# 'rockchip/${SOC_FAMILY}-${BOARD}.dtb' which is required when compiling +# the kernel so the kernel's Makefile can find the device tree +# +# when using extlinux with a fitImage the device tree is contained in the +# fitImage +# +# however for non-fitImages it is not found at +# $UBOOT_EXTLINUX_FDTDIR/rockchip/$KERNEL_DEVICETREE but rather at +# $UBOOT_EXTLINUX_FDTDIR/$KERNEL_DEVICETREE therefore we need to strip off +# the 'rockchip/' part for extlinux non-fitImage builds +NONFITDT ?= "${@d.getVar('KERNEL_DEVICETREE').split('/')[1]}" + +UBOOT_EXTLINUX ?= "1" +UBOOT_EXTLINUX_ROOT ?= "root=PARTLABEL=root" +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" +UBOOT_EXTLINUX_KERNEL_ARGS ?= "rootwait rw rootfstype=ext4" +UBOOT_EXTLINUX_KERNEL_IMAGE ?= "/boot/${KERNEL_IMAGETYPE}" +UBOOT_EXTLINUX_LABELS ?= "default" +UBOOT_EXTLINUX_MENU_DESCRIPTION:default ?= "${MACHINE}" + +MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "u-boot-extlinux" diff --git a/conf/machine/include/rockchip-wic.inc b/conf/machine/include/rockchip-wic.inc index 67a8310f7d6a..147a36685d7d 100644 --- a/conf/machine/include/rockchip-wic.inc +++ b/conf/machine/include/rockchip-wic.inc @@ -1,33 +1,17 @@ # common meta-rockchip wic/wks items +require conf/machine/include/rockchip-extlinux.inc + SPL_BINARY ?= "idbloader.img" IMAGE_FSTYPES += "wic wic.bmap" WKS_FILE ?= "rockchip.wks" WKS_FILE_DEPENDS ?= " \ - mtools-native \ - dosfstools-native \ e2fsprogs-native \ virtual/bootloader \ - virtual/kernel \ - " -# KERNEL_DEVICETREE follows the pattern of 'rockchip/${SOC_FAMILY}-${BOARD}.dtb' -# but is placed in the deploy directory as simply '${SOC_FAMILY}-${BOARD}.dtb' -# therefore we have to strip off the 'rockchip/' for IMAGE_BOOT_FILES -NONFITDT="${@d.getVar('KERNEL_DEVICETREE').split('/')[1]}" -IMAGE_BOOT_FILES = " \ - ${KERNEL_IMAGETYPE} \ - ${@bb.utils.contains('KERNEL_IMAGETYPE', 'fitImage', '', '${NONFITDT}', d)} \ " -# use the first-defined ; pair in SERIAL_CONSOLES -# for the console parameter in the wks files -RK_CONSOLE_BAUD ?= "${@d.getVar('SERIAL_CONSOLES').split(';')[0]}" -RK_CONSOLE_DEVICE ?= "${@d.getVar('SERIAL_CONSOLES').split(';')[1].split()[0]}" - WICVARS:append = " \ - RK_CONSOLE_BAUD \ - RK_CONSOLE_DEVICE \ SPL_BINARY \ UBOOT_SUFFIX \ " diff --git a/wic/rockchip.wks b/wic/rockchip.wks index b557f8137af1..e8f0251272c1 100644 --- a/wic/rockchip.wks +++ b/wic/rockchip.wks @@ -16,18 +16,16 @@ # reserved2 8192 8192 (legacy parameters, ATAGS, etc) # loader2 16384 8192 (U-Boot proper) # atf 24576 8192 (trusted OS e.g. ATF, OP-TEE, etc) -# boot 32768 229376 -# root 262144 - (suggested) +# root 32768 - -part loader1 --offset 64s --fixed-size 3552K --fstype=none --source rawcopy --sourceparams="file=${SPL_BINARY}" +part loader1 --offset 64s --fixed-size 3552K --fstype=none --source rawcopy --sourceparams="file=${SPL_BINARY}" part v_storage --offset 7168s --fixed-size 256K --fstype=none --no-table part reserved --offset 7680s --fixed-size 192K --fstype=none --no-table part reserved1 --offset 8064s --fixed-size 32K --fstype=none --no-table part uboot_env --offset 8128s --fixed-size 32K --fstype=none --no-table part reserved2 --offset 8192s --fixed-size 4096K --fstype=none --no-table -part loader2 --offset 16384s --fixed-size 4096K --fstype=none --source rawcopy --sourceparams="file=u-boot.${UBOOT_SUFFIX}" +part loader2 --offset 16384s --fixed-size 4096K --fstype=none --source rawcopy --sourceparams="file=u-boot.${UBOOT_SUFFIX}" part atf --offset 24576s --fixed-size 4096K --fstype=none -part /boot --offset 32768s --size 114688K --fstype=vfat --active --source bootimg-partition --label boot --use-uuid --sourceparams="loader=u-boot" -part / --fstype=ext4 --source rootfs --label root --use-uuid +part / --offset 32768s --fstype=ext4 --active --source rootfs --label root -bootloader --ptable gpt --append="console=tty1 console=${RK_CONSOLE_DEVICE},${RK_CONSOLE_BAUD}n8 rw rootfstype=ext4 init=/sbin/init" +bootloader --ptable gpt From patchwork Mon Feb 19 17:48:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trevor Woerner X-Patchwork-Id: 39736 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 9697EC54766 for ; Mon, 19 Feb 2024 17:48:46 +0000 (UTC) Received: from mail-il1-f177.google.com (mail-il1-f177.google.com [209.85.166.177]) by mx.groups.io with SMTP id smtpd.web11.609.1708364923462599257 for ; Mon, 19 Feb 2024 09:48:43 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=fepTObtE; spf=pass (domain: gmail.com, ip: 209.85.166.177, mailfrom: twoerner@gmail.com) Received: by mail-il1-f177.google.com with SMTP id e9e14a558f8ab-3651607db16so8899595ab.0 for ; Mon, 19 Feb 2024 09:48:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708364922; x=1708969722; 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=t+K0f8HlKuvjsvuIUdjC0ppksUxTFs7xLt6VhcbzWk0=; b=fepTObtEimUkdwdQUDglrg5xNCajJKelVAmq8cZhGlTFlcyK0XH0jHwjOL+V/uFnzI IJO6wpEWB10d3QJjXKTKdcFBXx9uZ/NW72c7W+AAFWlBiQB3nVnlifevDDVfuaISuEHg IchVE+Hh9uHNOSLBO1cCRdd/K57+L2g6hxtlLHPjMkijD5dgPSEkL2rUHGa1N7UTEQne jmzLgvnc61j7dCUMdAZH1hpAaN7fOaM4nxensuR6/mchF+5av4EvQ+nKrvXs8v1YBtSx hsPwHR0hZMTbMkFLqVG0YQHvSz1Z7vP5/qRkquoqIjhsVbM8Vkd6PKhtw7Fngx/zUEar Seqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708364922; x=1708969722; 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=t+K0f8HlKuvjsvuIUdjC0ppksUxTFs7xLt6VhcbzWk0=; b=Dh4CTXwn0narlPyolUgJN2g4hKfQn3IQdV3Kj4rx0QTlhlGD+SS65wuGY2JbT9E2A6 FKja51YHHr8cM31LgbSnHu93JD+Xp40cL67G0xgGRb44Vkfc1u8IsEkmJKWMei8PD5Ak 6DkNA7eQ446dTbK6zJBnHDqS152T22ZydWVzTl+8374TXdlCGfe/b+CwV6scyfIDZdRI f+LF2RBDKgIYesBXjkVHs7rCWRf+B5rtAz2yRiUdrMVYBBt90sXGcNO5Vo5+SWYq0xFD tvqOvvyq4XHKh4B+lbFnwUQQmQ23V60X/SCfNxgCSAHrE7hckEW8EglRbTndSD09rJVG W6iw== X-Gm-Message-State: AOJu0YyKp/AgaClGj8A1Wpiorja9F+I7GefLxMO/HL36nzRH6PzwZHf7 iA/cxlzcS7SxL1uELsLnt9D9w1EJlnRbWsJ2DBXo4ISfbuO7hhy0Hq/u36PU X-Google-Smtp-Source: AGHT+IFbKzUGpbzGaTeU/ypmPVxLXuNXwI5gan6hthtN7yF4Imh5hTtl/ZufCva6GzAzmuqWtnERsQ== X-Received: by 2002:a05:6e02:1a0c:b0:365:b73:9f3b with SMTP id s12-20020a056e021a0c00b003650b739f3bmr9060016ild.12.1708364921761; Mon, 19 Feb 2024 09:48:41 -0800 (PST) Received: from localhost.localdomain (pppoe-209-91-167-254.vianet.ca. [209.91.167.254]) by smtp.gmail.com with ESMTPSA id x5-20020a056e021ca500b00363ea5c0fb4sm2300208ill.70.2024.02.19.09.48.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Feb 2024 09:48:39 -0800 (PST) From: Trevor Woerner To: yocto@lists.yoctoproject.org Cc: Quentin Schulz Subject: [meta-rockchip][PATCH v3 5/5] rockchip.wks: wks file cleanup Date: Mon, 19 Feb 2024 12:48:25 -0500 Message-ID: <20240219174825.7084-5-twoerner@gmail.com> X-Mailer: git-send-email 2.43.0.76.g1a87c842ece3 In-Reply-To: <20240219174825.7084-1-twoerner@gmail.com> References: <20240219174825.7084-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 ; Mon, 19 Feb 2024 17:48:46 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/62545 Cleanup the elements of the wic/rockchip.wks file so that they take up less horizontal space. Reviewed-by: Quentin Schulz Signed-off-by: Trevor Woerner --- changes in v3: - tweaks to accommodate the existing changes changes in v2: - add Quentin's tag --- wic/rockchip.wks | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/wic/rockchip.wks b/wic/rockchip.wks index e8f0251272c1..0e929bc0749a 100644 --- a/wic/rockchip.wks +++ b/wic/rockchip.wks @@ -18,14 +18,14 @@ # atf 24576 8192 (trusted OS e.g. ATF, OP-TEE, etc) # root 32768 - -part loader1 --offset 64s --fixed-size 3552K --fstype=none --source rawcopy --sourceparams="file=${SPL_BINARY}" -part v_storage --offset 7168s --fixed-size 256K --fstype=none --no-table -part reserved --offset 7680s --fixed-size 192K --fstype=none --no-table -part reserved1 --offset 8064s --fixed-size 32K --fstype=none --no-table -part uboot_env --offset 8128s --fixed-size 32K --fstype=none --no-table -part reserved2 --offset 8192s --fixed-size 4096K --fstype=none --no-table -part loader2 --offset 16384s --fixed-size 4096K --fstype=none --source rawcopy --sourceparams="file=u-boot.${UBOOT_SUFFIX}" -part atf --offset 24576s --fixed-size 4096K --fstype=none -part / --offset 32768s --fstype=ext4 --active --source rootfs --label root +part loader1 --offset 64s --fixed-size 3552K --fstype=none --source rawcopy --sourceparams="file=${SPL_BINARY}" +part v_storage --offset 7168s --fixed-size 256K --fstype=none --no-table +part reserved --offset 7680s --fixed-size 192K --fstype=none --no-table +part reserved1 --offset 8064s --fixed-size 32K --fstype=none --no-table +part uboot_env --offset 8128s --fixed-size 32K --fstype=none --no-table +part reserved2 --offset 8192s --fixed-size 4096K --fstype=none --no-table +part loader2 --offset 16384s --fixed-size 4096K --fstype=none --source rawcopy --sourceparams="file=u-boot.${UBOOT_SUFFIX}" +part atf --offset 24576s --fixed-size 4096K --fstype=none +part / --label root --active --fstype=ext4 --source rootfs bootloader --ptable gpt