From c7752f4a3223e10fa6ac66874e25d5dcfe23eb8f Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 19 Aug 2023 12:52:49 +0100 Subject: [PATCH] 2023.10 RC2 --- 0001-disable-NFS-support-by-default.patch | 35 -- disable-VBE-by-default.patch | 28 ++ enable-bootmenu-by-default.patch | 49 +++ fix-release-rev.patch | 11 - rock64-small-fixes.patch | 476 ++++++++++++++++++++++ sources | 2 +- uboot-tools.spec | 16 +- 7 files changed, 564 insertions(+), 53 deletions(-) delete mode 100644 0001-disable-NFS-support-by-default.patch create mode 100644 disable-VBE-by-default.patch create mode 100644 enable-bootmenu-by-default.patch delete mode 100644 fix-release-rev.patch create mode 100644 rock64-small-fixes.patch diff --git a/0001-disable-NFS-support-by-default.patch b/0001-disable-NFS-support-by-default.patch deleted file mode 100644 index b520b15..0000000 --- a/0001-disable-NFS-support-by-default.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 31dc49dee987500b0d5b5b536b6da2f3fbfd5b59 Mon Sep 17 00:00:00 2001 -From: Peter Robinson -Date: Tue, 13 Jun 2023 09:36:50 +0100 -Subject: [v1] disable NFS support by default - -While NFS is widely used in data centres, and private -networks it's quite a nuanced usecase for device firmware. -A lot of devices already disable it. - -Various network protocols should really be opt in, not opt -out, because they add extra size and are potential attack -vectors from a security PoV. In the NFS case it doesn't -really make sense for a lot of devices like tables, SBCs etc. -It's also something we don't really want for SystemReady-IR -due to security concerns. - -Signed-off-by: Peter Robinson ---- - -v1: drop RFC tag - - cmd/Kconfig | 1 - - -diff --git a/cmd/Kconfig b/cmd/Kconfig -index 365371fb511..a193929cec4 100644 ---- a/cmd/Kconfig -+++ b/cmd/Kconfig -@@ -1848,7 +1848,6 @@ config CMD_RARP - - config CMD_NFS - bool "nfs" -- default y - help - Boot image via network using NFS protocol. - diff --git a/disable-VBE-by-default.patch b/disable-VBE-by-default.patch new file mode 100644 index 0000000..dffa9fc --- /dev/null +++ b/disable-VBE-by-default.patch @@ -0,0 +1,28 @@ +From 02513d9ecc38d11ffc051ed59529e11f82164785 Mon Sep 17 00:00:00 2001 +From: Peter Robinson +Date: Fri, 18 Aug 2023 13:28:05 +0100 +Subject: [PATCH] disable VBE by default + +Fedora doesn't support the VBE boot method, disable it +to reduce size and remove a possible boot attack vector. + +Signed-off-by: Peter Robinson +--- + boot/Kconfig | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/boot/Kconfig b/boot/Kconfig +index e8fb03b8016..467b09e2350 100644 +--- a/boot/Kconfig ++++ b/boot/Kconfig +@@ -526,7 +526,6 @@ config BOOTMETH_EFILOADER + config BOOTMETH_VBE + bool "Bootdev support for Verified Boot for Embedded" + depends on FIT +- default y + select BOOTMETH_GLOBAL + select EVENT + help +-- +2.41.0 + diff --git a/enable-bootmenu-by-default.patch b/enable-bootmenu-by-default.patch new file mode 100644 index 0000000..1ecd514 --- /dev/null +++ b/enable-bootmenu-by-default.patch @@ -0,0 +1,49 @@ +From a956480a6d52ae90ef4a46275c2ee29a4074de36 Mon Sep 17 00:00:00 2001 +From: Peter Robinson +Date: Fri, 18 Aug 2023 23:10:42 +0100 +Subject: [PATCH] enable bootmenu by default + +We want the boot menu on all Fedora devices as it makes +it a whole lot more user friendly. + +Signed-off-by: Peter Robinson +--- + boot/Kconfig | 2 ++ + cmd/Kconfig | 1 + + 2 files changed, 3 insertions(+) + +diff --git a/boot/Kconfig b/boot/Kconfig +index 467b09e2350..ad67b1f65a6 100644 +--- a/boot/Kconfig ++++ b/boot/Kconfig +@@ -1281,6 +1281,7 @@ config BOOTDELAY + + config AUTOBOOT_KEYED + bool "Stop autobooting via specific input key / string" ++ default y + help + This option enables stopping (aborting) of the automatic + boot feature only by issuing a specific input key or +@@ -1433,6 +1434,7 @@ config AUTOBOOT_MENUKEY + + config AUTOBOOT_MENU_SHOW + bool "Show a menu on boot" ++ default y + depends on CMD_BOOTMENU + help + This enables the boot menu, controlled by environment variables +diff --git a/cmd/Kconfig b/cmd/Kconfig +index 43ca10f69cc..3d39f2914cc 100644 +--- a/cmd/Kconfig ++++ b/cmd/Kconfig +@@ -413,6 +413,7 @@ source lib/efi_selftest/Kconfig + + config CMD_BOOTMENU + bool "bootmenu" ++ default y + select MENU + select CHARSET + help +-- +2.41.0 + diff --git a/fix-release-rev.patch b/fix-release-rev.patch deleted file mode 100644 index ad78eeb..0000000 --- a/fix-release-rev.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- u-boot-2023.07/Makefile.orig 2023-07-11 11:47:16.996315851 +0100 -+++ u-boot-2023.07/Makefile 2023-07-11 11:47:31.049391730 +0100 -@@ -3,7 +3,7 @@ - VERSION = 2023 - PATCHLEVEL = 07 - SUBLEVEL = --EXTRAVERSION = -rc6 -+EXTRAVERSION = - NAME = - - # *DOCUMENTATION* diff --git a/rock64-small-fixes.patch b/rock64-small-fixes.patch new file mode 100644 index 0000000..5ea77fb --- /dev/null +++ b/rock64-small-fixes.patch @@ -0,0 +1,476 @@ +From patchwork Wed Jun 14 12:43:12 2023 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: Peter Robinson +X-Patchwork-Id: 1794950 +X-Patchwork-Delegate: ykai007@gmail.com +Return-Path: +X-Original-To: incoming@patchwork.ozlabs.org +Delivered-To: patchwork-incoming@legolas.ozlabs.org +Authentication-Results: legolas.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: legolas.ozlabs.org; + dkim=pass (2048-bit key; + unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 + header.s=20221208 header.b=FZFn9vAY; + 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 ECDSA (P-384)) + (No client certificate requested) + by legolas.ozlabs.org (Postfix) with ESMTPS id 4Qh4qN0nXtz20WR + for ; Wed, 14 Jun 2023 22:44:00 +1000 (AEST) +Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) + by phobos.denx.de (Postfix) with ESMTP id E188F86167; + Wed, 14 Jun 2023 14:43:40 +0200 (CEST) +Authentication-Results: phobos.denx.de; + dmarc=pass (p=none dis=none) header.from=gmail.com +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=gmail.com header.i=@gmail.com header.b="FZFn9vAY"; + dkim-atps=neutral +Received: by phobos.denx.de (Postfix, from userid 109) + id 4CE61860AA; Wed, 14 Jun 2023 14:43:37 +0200 (CEST) +X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de +X-Spam-Level: +X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, + DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, + SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no + version=3.4.2 +Received: from mail-lf1-x133.google.com (mail-lf1-x133.google.com + [IPv6:2a00:1450:4864:20::133]) + (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 BEECA860C3 + for ; Wed, 14 Jun 2023 14:43:34 +0200 (CEST) +Authentication-Results: phobos.denx.de; + dmarc=pass (p=none dis=none) header.from=gmail.com +Authentication-Results: phobos.denx.de; + spf=pass smtp.mailfrom=pbrobinson@gmail.com +Received: by mail-lf1-x133.google.com with SMTP id + 2adb3069b0e04-4f642a24568so8546568e87.2 + for ; Wed, 14 Jun 2023 05:43:34 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=gmail.com; s=20221208; t=1686746614; x=1689338614; + 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=sjzdpxK2W2UaYKf4Dbb6vo2R4h51tHoSQv2PLAL+ytA=; + b=FZFn9vAYzx95g5Cma3VU7TW3RzrwGrr2DTEZogYSk3tr58CXaHbRCJAD8suFJLbB18 + 4Uh25vZecFfXajC8z3+nGc/G+yLjO4p+uHq9laCmR1d/OjJadseCHzdHF2vgrMFi4x3U + c2A7F/JYazfKq/1McGMyMsI899Ot9xB8lffElanhTShEGmUwMjSzvalWbJA9ZUkisJvX + 1lfsoPk+26gamlPG4QftIFmXpxUf5pcRqA7pSzgOWyGcPSb8e5HBvcMnMTlNaRSNcjKs + k+TnZww3gSKjD+VxWck1VwgeEK8X4cPgV6HyI4TSSnjWSn2qjy6YW8eJWS4K/h+48RWn + 5VKA== +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20221208; t=1686746614; x=1689338614; + 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=sjzdpxK2W2UaYKf4Dbb6vo2R4h51tHoSQv2PLAL+ytA=; + b=TIUdzRnLC89Ao7oVBZZH1iJgNXJg4bFp54s574ftCbOZSDxA49ZHH8ULPGzHpCG0ze + ffGZYszi+DbRLFr92kxE5wgmGjiMapn8MfDaNs5tFm31rBk7QeHIwNH2WwHmmERtGSfi + NbA6vIBYmQFUgdc2GxAfmwQkmyEqnlZUwxz43Goz6W7OnoYofitm9fM2P5JAjVEC9B4g + 3zqxZDCIEJmgTHUpPWgqM1QwJtQA9trNTMJESxsTocqABFS+cCPJCj9HitbWYe3TNGeG + JT6Ma3umJF+whshi0h/4csqV5wCXy5FHEC0nx/p88Tq+o/zCveJu1f16B8PQ3baaIw6n + Bj3Q== +X-Gm-Message-State: AC+VfDwm3GSwcQOMRo9W3rdlJIQd8KXeHulIsQkeI3v53WVLSbA4UQji + Er6vsMhWXQhyhjlcr1WdCnc= +X-Google-Smtp-Source: + ACHHUZ6pFh8GXXZTuMA7izeqjUHeS1gbvk8BisDz2HsWH0v5R9/HJDxhuCGwt4wFH7TA2hi2Y/haJg== +X-Received: by 2002:a19:4359:0:b0:4f3:b4a9:a619 with SMTP id + m25-20020a194359000000b004f3b4a9a619mr7072659lfj.40.1686746613623; + Wed, 14 Jun 2023 05:43:33 -0700 (PDT) +Received: from morpheus.home.roving-it.com + (3.e.2.0.0.0.0.0.0.0.0.0.0.0.0.0.1.8.6.2.1.1.b.f.0.b.8.0.1.0.0.2.ip6.arpa. + [2001:8b0:fb11:2681::2e3]) by smtp.googlemail.com with ESMTPSA id + g26-20020a7bc4da000000b003f60e143d38sm17329161wmk.11.2023.06.14.05.43.33 + (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); + Wed, 14 Jun 2023 05:43:33 -0700 (PDT) +From: Peter Robinson +To: "Matwey V. Kornilov" , + Simon Glass , Philipp Tomsich , + Kever Yang , u-boot@lists.denx.de +Cc: Peter Robinson +Subject: [PATCH 2/4] config: rock64: enable efuse for stable mac addr +Date: Wed, 14 Jun 2023 13:43:12 +0100 +Message-ID: <20230614124329.244462-2-pbrobinson@gmail.com> +X-Mailer: git-send-email 2.41.0 +In-Reply-To: <20230614124329.244462-1-pbrobinson@gmail.com> +References: <20230614124329.244462-1-pbrobinson@gmail.com> +MIME-Version: 1.0 +X-BeenThere: u-boot@lists.denx.de +X-Mailman-Version: 2.1.39 +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.103.8 at phobos.denx.de +X-Virus-Status: Clean + +Enable the rockchip efuse driver on the Rock64 to +provide a stable ethernet address on the device. + +Signed-off-by: Peter Robinson +Reviewed-by: Kever Yang +--- + +While the rockchip efuse driver currently has issues on rk3328 due to, I believe, it +not being properly initialised in ATF, enabling it at least provides a stable MAC +adress on the NIC which I think makes it worthwhile + + configs/rock64-rk3328_defconfig | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configs/rock64-rk3328_defconfig b/configs/rock64-rk3328_defconfig +index 1da9b0545a5..97ac8734d1b 100644 +--- a/configs/rock64-rk3328_defconfig ++++ b/configs/rock64-rk3328_defconfig +@@ -74,6 +74,7 @@ CONFIG_FASTBOOT_CMD_OEM_FORMAT=y + CONFIG_ROCKCHIP_GPIO=y + CONFIG_SYS_I2C_ROCKCHIP=y + CONFIG_MISC=y ++CONFIG_ROCKCHIP_EFUSE=y + CONFIG_MMC_DW=y + CONFIG_MMC_DW_ROCKCHIP=y + CONFIG_SPI_FLASH_GIGADEVICE=y + +From patchwork Wed Jun 14 12:43:13 2023 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: Peter Robinson +X-Patchwork-Id: 1794951 +X-Patchwork-Delegate: ykai007@gmail.com +Return-Path: +X-Original-To: incoming@patchwork.ozlabs.org +Delivered-To: patchwork-incoming@legolas.ozlabs.org +Authentication-Results: legolas.ozlabs.org; + spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de + (client-ip=85.214.62.61; helo=phobos.denx.de; + envelope-from=u-boot-bounces@lists.denx.de; receiver=) +Authentication-Results: legolas.ozlabs.org; + dkim=pass (2048-bit key; + unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 + header.s=20221208 header.b=WIV1zbyE; + dkim-atps=neutral +Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) + (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) + key-exchange X25519 server-signature ECDSA (P-384)) + (No client certificate requested) + by legolas.ozlabs.org (Postfix) with ESMTPS id 4Qh4qf6BLXz20WR + for ; Wed, 14 Jun 2023 22:44:14 +1000 (AEST) +Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) + by phobos.denx.de (Postfix) with ESMTP id 5B12B86146; + Wed, 14 Jun 2023 14:43:44 +0200 (CEST) +Authentication-Results: phobos.denx.de; + dmarc=pass (p=none dis=none) header.from=gmail.com +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=gmail.com header.i=@gmail.com header.b="WIV1zbyE"; + dkim-atps=neutral +Received: by phobos.denx.de (Postfix, from userid 109) + id 5200686146; Wed, 14 Jun 2023 14:43:39 +0200 (CEST) +X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de +X-Spam-Level: +X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, + DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, + SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no + version=3.4.2 +Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com + [IPv6:2a00:1450:4864:20::336]) + (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 0F3CC860FE + for ; Wed, 14 Jun 2023 14:43:35 +0200 (CEST) +Authentication-Results: phobos.denx.de; + dmarc=pass (p=none dis=none) header.from=gmail.com +Authentication-Results: phobos.denx.de; + spf=pass smtp.mailfrom=pbrobinson@gmail.com +Received: by mail-wm1-x336.google.com with SMTP id + 5b1f17b1804b1-3f8c74af64fso5587725e9.1 + for ; Wed, 14 Jun 2023 05:43:35 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=gmail.com; s=20221208; t=1686746614; x=1689338614; + 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=Jne9SqWnJdgDpj5mkPbP6jWrorHm2Ewr8ivuyd1zKBQ=; + b=WIV1zbyEf76/AZV4av4Ab6kytOWNx4Cgr8LFRAVy0DIDj6GKOPyPg7yVsSUOtkkQPR + 4plpstbCTo2xN/epjgrDc70Y2XNal4Y8c8EZIDkfSPn7mVN3vBZscIpajCVK9oMY006G + hQ/3lRYirYKtJbAOt5oRXWqGqXdlrfXMqhDA9dRla5l3J1Px77QZiE7/czqNeryTcrSC + nQJKPLOKXZZwzI7Dcv4QtfBMI2zpkStKYCHynOnD96H1Fm/CRfc4RmKiW3UgJVfCn5eC + 5QHH+onIEDk91Izuk4qry+RAGnMwqv7WthL3hMJY2+gMuJiGbTyNsQZ2VAoD1qgVHXY9 + p/mg== +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20221208; t=1686746614; x=1689338614; + 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=Jne9SqWnJdgDpj5mkPbP6jWrorHm2Ewr8ivuyd1zKBQ=; + b=bPn3UB+Nr7fgBm9Vrhg5MVBNiRLiVAR6TPvKWbUGhJ4kytAVtZPyUZrO2FJgbWkSay + uQG5vH7K+ytlJdki06QVI8h99N241iYpSqqA2GjEMWCkes4ATEyMuC112uBb66PpjHJR + 44wpSYTUdxyNSVbtOC5svYFBrcOtrWn3XptxoCrPswBAXXMloirTxyh3TqUOond2NNDc + 7cgEcz1aIYnW2s9BPIZSuCrTO491tBU3Rcd1ubL+7gbMX/Z4hG0fgUdPU6pf4oxQNZ78 + kYue8TdOqV/ksCbzxgMFPXPrwmAVAuodAoaRpDH449SvEr9TNT+k1SJEve21VwZCyZAN + k/3w== +X-Gm-Message-State: AC+VfDz+euUQ/kYf5v84y5arXPpq6LOLBmbUqMFIVVB7/TmpcGsagHMr + v64fxEF0CGVXk4pqvA+7upE= +X-Google-Smtp-Source: + ACHHUZ47g7ktmMWUGnTvkK4deYzNa9InQuYnEmy91+AuY7+Avu9rVE/HmGTqh7XE7FzZF8tB2Wscww== +X-Received: by 2002:a05:600c:364f:b0:3f6:c8c:7048 with SMTP id + y15-20020a05600c364f00b003f60c8c7048mr10715141wmq.20.1686746614238; + Wed, 14 Jun 2023 05:43:34 -0700 (PDT) +Received: from morpheus.home.roving-it.com + (3.e.2.0.0.0.0.0.0.0.0.0.0.0.0.0.1.8.6.2.1.1.b.f.0.b.8.0.1.0.0.2.ip6.arpa. + [2001:8b0:fb11:2681::2e3]) by smtp.googlemail.com with ESMTPSA id + g26-20020a7bc4da000000b003f60e143d38sm17329161wmk.11.2023.06.14.05.43.33 + (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); + Wed, 14 Jun 2023 05:43:33 -0700 (PDT) +From: Peter Robinson +To: "Matwey V. Kornilov" , + Simon Glass , Philipp Tomsich , + Kever Yang , u-boot@lists.denx.de +Cc: Peter Robinson +Subject: [PATCH 3/4] rockchip: dts: rk3328: Add rng details to u-boot.dtsi +Date: Wed, 14 Jun 2023 13:43:13 +0100 +Message-ID: <20230614124329.244462-3-pbrobinson@gmail.com> +X-Mailer: git-send-email 2.41.0 +In-Reply-To: <20230614124329.244462-1-pbrobinson@gmail.com> +References: <20230614124329.244462-1-pbrobinson@gmail.com> +MIME-Version: 1.0 +X-BeenThere: u-boot@lists.denx.de +X-Mailman-Version: 2.1.39 +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.103.8 at phobos.denx.de +X-Virus-Status: Clean + +Add the rk3328 rng details to the u-boot.dtsi and +enable the RNG on the Rock64 to be able to provide +a rnadom seed via UEFI. + +Signed-off-by: Peter Robinson +--- + +The DT snippet will allow this to be enabled on other rk3328 devices but +I only have the Rock54 to test on. + + arch/arm/dts/rk3328-u-boot.dtsi | 6 ++++++ + configs/rock64-rk3328_defconfig | 2 ++ + 2 files changed, 8 insertions(+) + +diff --git a/arch/arm/dts/rk3328-u-boot.dtsi b/arch/arm/dts/rk3328-u-boot.dtsi +index ce96ce40a73..a9f2536de2a 100644 +--- a/arch/arm/dts/rk3328-u-boot.dtsi ++++ b/arch/arm/dts/rk3328-u-boot.dtsi +@@ -26,6 +26,12 @@ + 0x0 0xff720000 0x0 0x1000 + 0x0 0xff798000 0x0 0x1000>; + }; ++ ++ rng: rng@ff060000 { ++ compatible = "rockchip,cryptov1-rng"; ++ reg = <0x0 0xff060000 0x0 0x4000>; ++ status = "okay"; ++ }; + }; + + &cru { +diff --git a/configs/rock64-rk3328_defconfig b/configs/rock64-rk3328_defconfig +index 97ac8734d1b..1820deee373 100644 +--- a/configs/rock64-rk3328_defconfig ++++ b/configs/rock64-rk3328_defconfig +@@ -77,6 +77,8 @@ CONFIG_MISC=y + CONFIG_ROCKCHIP_EFUSE=y + CONFIG_MMC_DW=y + CONFIG_MMC_DW_ROCKCHIP=y ++CONFIG_DM_RNG=y ++CONFIG_RNG_ROCKCHIP=y + CONFIG_SPI_FLASH_GIGADEVICE=y + CONFIG_ETH_DESIGNWARE=y + CONFIG_GMAC_ROCKCHIP=y + +From patchwork Wed Jun 14 12:43:14 2023 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: Peter Robinson +X-Patchwork-Id: 1794952 +X-Patchwork-Delegate: ykai007@gmail.com +Return-Path: +X-Original-To: incoming@patchwork.ozlabs.org +Delivered-To: patchwork-incoming@legolas.ozlabs.org +Authentication-Results: legolas.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: legolas.ozlabs.org; + dkim=pass (2048-bit key; + unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 + header.s=20221208 header.b=Fk8Gn/bp; + 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 ECDSA (P-384) server-digest SHA384) + (No client certificate requested) + by legolas.ozlabs.org (Postfix) with ESMTPS id 4Qh4qx1cDFz20WR + for ; Wed, 14 Jun 2023 22:44:29 +1000 (AEST) +Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) + by phobos.denx.de (Postfix) with ESMTP id 42BE586140; + Wed, 14 Jun 2023 14:43:47 +0200 (CEST) +Authentication-Results: phobos.denx.de; + dmarc=pass (p=none dis=none) header.from=gmail.com +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=gmail.com header.i=@gmail.com header.b="Fk8Gn/bp"; + dkim-atps=neutral +Received: by phobos.denx.de (Postfix, from userid 109) + id 5363386119; Wed, 14 Jun 2023 14:43:40 +0200 (CEST) +X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de +X-Spam-Level: +X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, + DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, + SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no + version=3.4.2 +Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com + [IPv6:2a00:1450:4864:20::432]) + (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 92EA186130 + for ; Wed, 14 Jun 2023 14:43:35 +0200 (CEST) +Authentication-Results: phobos.denx.de; + dmarc=pass (p=none dis=none) header.from=gmail.com +Authentication-Results: phobos.denx.de; + spf=pass smtp.mailfrom=pbrobinson@gmail.com +Received: by mail-wr1-x432.google.com with SMTP id + ffacd0b85a97d-31110aea814so555f8f.2 + for ; Wed, 14 Jun 2023 05:43:35 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=gmail.com; s=20221208; t=1686746615; x=1689338615; + 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=GunsDF8pMC87eoXzdmDNRZz8DMTMTGTC8JJJKs0JxI4=; + b=Fk8Gn/bpnLP7olTGYnvDxvwbEfNNa1rl1mPZ4QelJXPFqGN4+shTjFbREgSRC/dMtW + yRez1jgUlJRK7lz8uY+O+exV8NdCbcHbzvdQtHDCDnQqLKjgIPVMjLyH5VIJECxjXc8/ + FuocNJXIdjBBfLC1msErM2xm850WcNYbIZ+hPDOwpMTYitpqvM3xhwL6vIJlsBw6BqaC + C5MKw4jWH3KCYzU6kqLsP3reuse4YwOUK8BoRfC130ebJzm2MhRdj1xfOvTMNGNNKO9b + Ii5zq3BB7VZqdM3vFNWva7lFwc6nzvSx026CBWC04UbxKmp2qd8WgU/GHTgnV8lcL/sz + 5uBQ== +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20221208; t=1686746615; x=1689338615; + 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=GunsDF8pMC87eoXzdmDNRZz8DMTMTGTC8JJJKs0JxI4=; + b=ZU+X/vMacHAmhpPxEEwUnlvwe6qSQQDPnUVljh0mCFS+0MlJyOgFlaJdQKr4qZ9028 + 5HU/u7kr7mvPN4LvU1sVBZ4QlyI8rrgzMl576uvBb3rZ8AQ5aQJCvUrYOPUilPyNbhWq + lDMZCjWuHeKLpwutkyLveGg0yVgYz8i4STe35fH7B3q60K/v+y9G8wFJUdN+XV8c2+Gx + MTSE42FF8tOnHkXPIFXmh4LKO5BQWAHQuYadILsFo2pUahMfroOaCT2xVQzDmC+Ur76L + Bw1TPPC/b69/qHFZwuG0/5e6ansfMs1oO6DCGOIMxLzJch7c6VC/WJql/xOnO/c4os12 + swLw== +X-Gm-Message-State: AC+VfDy9BKAtjnGx6ud2kU6GAYtOOxIFuTpeAhT+l9wtZ+C3zpK6T+ld + CD+kjgM7Fs3oCfEFfoOLmJE= +X-Google-Smtp-Source: + ACHHUZ6WCesQBbBQ0kQoCj860p1GMKM0o6UKw7uiH/CWAXkwqPWFIEw+YhmaoR6ynnvAzLDQ3IbsCw== +X-Received: by 2002:adf:fec4:0:b0:30f:ce9a:7632 with SMTP id + q4-20020adffec4000000b0030fce9a7632mr3527925wrs.67.1686746614858; + Wed, 14 Jun 2023 05:43:34 -0700 (PDT) +Received: from morpheus.home.roving-it.com + (3.e.2.0.0.0.0.0.0.0.0.0.0.0.0.0.1.8.6.2.1.1.b.f.0.b.8.0.1.0.0.2.ip6.arpa. + [2001:8b0:fb11:2681::2e3]) by smtp.googlemail.com with ESMTPSA id + g26-20020a7bc4da000000b003f60e143d38sm17329161wmk.11.2023.06.14.05.43.34 + (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); + Wed, 14 Jun 2023 05:43:34 -0700 (PDT) +From: Peter Robinson +To: "Matwey V. Kornilov" , + Simon Glass , Philipp Tomsich , + Kever Yang , u-boot@lists.denx.de +Cc: Peter Robinson +Subject: [PATCH 4/4] rockchip: dts: rk3328: rock64: Align spi flash entry +Date: Wed, 14 Jun 2023 13:43:14 +0100 +Message-ID: <20230614124329.244462-4-pbrobinson@gmail.com> +X-Mailer: git-send-email 2.41.0 +In-Reply-To: <20230614124329.244462-1-pbrobinson@gmail.com> +References: <20230614124329.244462-1-pbrobinson@gmail.com> +MIME-Version: 1.0 +X-BeenThere: u-boot@lists.denx.de +X-Mailman-Version: 2.1.39 +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.103.8 at phobos.denx.de +X-Virus-Status: Clean + +Align the SPI flash entry with upstream. There's no need +to diverge here. + +Signed-off-by: Peter Robinson +Reviewed-by: Kever Yang +--- + arch/arm/dts/rk3328-rock64-u-boot.dtsi | 2 +- + arch/arm/dts/rk3328-rock64.dts | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/arm/dts/rk3328-rock64-u-boot.dtsi b/arch/arm/dts/rk3328-rock64-u-boot.dtsi +index 849854302ee..6904515b969 100644 +--- a/arch/arm/dts/rk3328-rock64-u-boot.dtsi ++++ b/arch/arm/dts/rk3328-rock64-u-boot.dtsi +@@ -54,7 +54,7 @@ + }; + + &spi0 { +- spi_flash: spiflash@0 { ++ spi_flash: flash@0 { + bootph-all; + }; + }; +diff --git a/arch/arm/dts/rk3328-rock64.dts b/arch/arm/dts/rk3328-rock64.dts +index 1b0f7e4551e..f69a38f42d2 100644 +--- a/arch/arm/dts/rk3328-rock64.dts ++++ b/arch/arm/dts/rk3328-rock64.dts +@@ -345,7 +345,7 @@ + &spi0 { + status = "okay"; + +- spiflash@0 { ++ flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + diff --git a/sources b/sources index 150374f..1504d9e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (u-boot-2023.07.tar.bz2) = c11c2dd8e44babf7d5c15c28587139f0fa7e73833bf6d4902b46780a6ed2199d007db4fec579f10b041da478dfa8c6c21e6cee76cfd65ec6cc6860c116bbc0fb +SHA512 (u-boot-2023.10-rc2.tar.bz2) = cc3cd85c84e1d7d8e45244f330709ad5ecf918ee42aac4de565ca5e1e1cde25e89b1a8672aaac04c0bf830e36192a72caabfde3baf6633c68fa76103768be201 diff --git a/uboot-tools.spec b/uboot-tools.spec index dae5485..5774bc2 100644 --- a/uboot-tools.spec +++ b/uboot-tools.spec @@ -1,4 +1,4 @@ -#global candidate rc0 +%global candidate rc2 %if 0%{?rhel} %bcond_with toolsonly %else @@ -6,8 +6,8 @@ %endif Name: uboot-tools -Version: 2023.07 -Release: 2%{?candidate:.%{candidate}}%{?dist} +Version: 2023.10 +Release: 0.1%{?candidate:.%{candidate}}%{?dist} Summary: U-Boot utilities License: GPLv2+ BSD LGPL-2.1+ LGPL-2.0+ URL: http://www.denx.de/wiki/U-Boot @@ -20,15 +20,16 @@ Source1: aarch64-boards # Needed to find DT on boot partition that's not the first partition Patch1: uefi-distro-load-FDT-from-any-partition-on-boot-device.patch Patch2: smbios-Simplify-reporting-of-unknown-values.patch -Patch3: 0001-disable-NFS-support-by-default.patch -Patch4: fix-release-rev.patch +Patch3: disable-VBE-by-default.patch +Patch4: enable-bootmenu-by-default.patch # Board fixes and enablement # RPi - uses RPI firmware device tree for HAT support Patch5: rpi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch # Rockchips improvements Patch6: rockchip-Add-initial-support-for-the-PinePhone-Pro.patch -Patch7: 0001-Revert-rockchip-rockpro64-Build-u-boot-rockchip-spi..patch +Patch7: rock64-small-fixes.patch +#Patch7: 0001-Revert-rockchip-rockpro64-Build-u-boot-rockchip-spi..patch BuildRequires: bc BuildRequires: bison @@ -213,6 +214,9 @@ cp -p board/sunxi/README.nand builds/docs/README.sunxi-nand %endif %changelog +* Fri Aug 18 2023 Peter Robinson - 2023.10-0.1.rc2 +- Update to 2023.10 RC2 + * Sat Jul 22 2023 Fedora Release Engineering - 2023.07-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild