Minor patch updates and cleanups
This commit is contained in:
parent
4a13ab93a8
commit
609e2fbd01
|
@ -1,17 +1,87 @@
|
||||||
From 88725c4d036bab25c900cc3c962fc42d94e0ab69 Mon Sep 17 00:00:00 2001
|
From c206a750c80dc4aaa8e7eade50199b3198a3e288 Mon Sep 17 00:00:00 2001
|
||||||
From: Peter Robinson <pbrobinson@gmail.com>
|
From: Peter Robinson <pbrobinson@gmail.com>
|
||||||
Date: Wed, 10 Jun 2020 13:26:43 +0100
|
Date: Wed, 19 Aug 2020 15:49:25 +0100
|
||||||
Subject: [PATCH] arm: rk3399: enable rng on rock960 and firefly3399
|
Subject: [PATCH 1/3] rockchip: RockPro64: enable rng to provide an entropy
|
||||||
|
source
|
||||||
|
|
||||||
|
Enable the rng so UEFI can provide entropy for KASLR
|
||||||
|
|
||||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||||
---
|
---
|
||||||
arch/arm/dts/rk3399-firefly-u-boot.dtsi | 4 ++++
|
configs/rockpro64-rk3399_defconfig | 2 ++
|
||||||
arch/arm/dts/rk3399-rock960-u-boot.dtsi | 4 ++++
|
1 file changed, 2 insertions(+)
|
||||||
arch/arm/dts/rk3399-rockpro64-u-boot.dtsi | 4 ++++
|
|
||||||
configs/firefly-rk3399_defconfig | 2 ++
|
diff --git a/configs/rockpro64-rk3399_defconfig b/configs/rockpro64-rk3399_defconfig
|
||||||
configs/rock960-rk3399_defconfig | 2 ++
|
index a6e2c3d71d..9b1ba04b9e 100644
|
||||||
configs/rockpro64-rk3399_defconfig | 2 ++
|
--- a/configs/rockpro64-rk3399_defconfig
|
||||||
6 files changed, 18 insertions(+)
|
+++ b/configs/rockpro64-rk3399_defconfig
|
||||||
|
@@ -41,6 +41,8 @@ CONFIG_MMC_DW=y
|
||||||
|
CONFIG_MMC_DW_ROCKCHIP=y
|
||||||
|
CONFIG_MMC_SDHCI=y
|
||||||
|
CONFIG_MMC_SDHCI_ROCKCHIP=y
|
||||||
|
+CONFIG_DM_RNG=y
|
||||||
|
+CONFIG_RNG_ROCKCHIP=y
|
||||||
|
CONFIG_SPI_FLASH_GIGADEVICE=y
|
||||||
|
CONFIG_DM_ETH=y
|
||||||
|
CONFIG_ETH_DESIGNWARE=y
|
||||||
|
--
|
||||||
|
2.26.2
|
||||||
|
|
||||||
|
From 91db3a7baa4cfc8f1f8879b4bdafeb05902f2114 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Robinson <pbrobinson@gmail.com>
|
||||||
|
Date: Wed, 19 Aug 2020 15:52:15 +0100
|
||||||
|
Subject: [PATCH 2/3] rockchip: Rock960: enable rng to provide an entropy
|
||||||
|
source
|
||||||
|
|
||||||
|
Enable the rng so UEFI can provide entropy for KASLR
|
||||||
|
|
||||||
|
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||||
|
---
|
||||||
|
arch/arm/dts/rk3399-rock960-u-boot.dtsi | 4 ++++
|
||||||
|
configs/rock960-rk3399_defconfig | 2 ++
|
||||||
|
2 files changed, 6 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/dts/rk3399-rock960-u-boot.dtsi b/arch/arm/dts/rk3399-rock960-u-boot.dtsi
|
||||||
|
index c190089e26..08292dbd39 100644
|
||||||
|
--- a/arch/arm/dts/rk3399-rock960-u-boot.dtsi
|
||||||
|
+++ b/arch/arm/dts/rk3399-rock960-u-boot.dtsi
|
||||||
|
@@ -24,3 +24,7 @@
|
||||||
|
};
|
||||||
|
|
||||||
|
};
|
||||||
|
+
|
||||||
|
+&rng {
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
||||||
|
diff --git a/configs/rock960-rk3399_defconfig b/configs/rock960-rk3399_defconfig
|
||||||
|
index 1d997847c2..9c4d8871b7 100644
|
||||||
|
--- a/configs/rock960-rk3399_defconfig
|
||||||
|
+++ b/configs/rock960-rk3399_defconfig
|
||||||
|
@@ -38,6 +38,8 @@ CONFIG_MMC_DW_ROCKCHIP=y
|
||||||
|
CONFIG_MMC_SDHCI=y
|
||||||
|
CONFIG_MMC_SDHCI_SDMA=y
|
||||||
|
CONFIG_MMC_SDHCI_ROCKCHIP=y
|
||||||
|
+CONFIG_DM_RNG=y
|
||||||
|
+CONFIG_RNG_ROCKCHIP=y
|
||||||
|
CONFIG_DM_ETH=y
|
||||||
|
CONFIG_NVME=y
|
||||||
|
CONFIG_PCI=y
|
||||||
|
--
|
||||||
|
2.26.2
|
||||||
|
|
||||||
|
From ac0793c7c4ee032da11bddbd0bdefee2322bb621 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Robinson <pbrobinson@gmail.com>
|
||||||
|
Date: Wed, 19 Aug 2020 15:53:58 +0100
|
||||||
|
Subject: [PATCH 3/3] rockchip: firefly-rk3399: enable rng to provide an
|
||||||
|
entropy source
|
||||||
|
|
||||||
|
Enable the rng so UEFI can provide entropy for KASLR
|
||||||
|
|
||||||
|
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||||
|
---
|
||||||
|
arch/arm/dts/rk3399-firefly-u-boot.dtsi | 4 ++++
|
||||||
|
configs/firefly-rk3399_defconfig | 2 ++
|
||||||
|
2 files changed, 6 insertions(+)
|
||||||
|
|
||||||
diff --git a/arch/arm/dts/rk3399-firefly-u-boot.dtsi b/arch/arm/dts/rk3399-firefly-u-boot.dtsi
|
diff --git a/arch/arm/dts/rk3399-firefly-u-boot.dtsi b/arch/arm/dts/rk3399-firefly-u-boot.dtsi
|
||||||
index 38e0897db9..a6c7b913da 100644
|
index 38e0897db9..a6c7b913da 100644
|
||||||
|
@ -25,35 +95,8 @@ index 38e0897db9..a6c7b913da 100644
|
||||||
+&rng {
|
+&rng {
|
||||||
+ status = "okay";
|
+ status = "okay";
|
||||||
+};
|
+};
|
||||||
diff --git a/arch/arm/dts/rk3399-rock960-u-boot.dtsi b/arch/arm/dts/rk3399-rock960-u-boot.dtsi
|
|
||||||
index c190089e26..08292dbd39 100644
|
|
||||||
--- a/arch/arm/dts/rk3399-rock960-u-boot.dtsi
|
|
||||||
+++ b/arch/arm/dts/rk3399-rock960-u-boot.dtsi
|
|
||||||
@@ -24,3 +24,7 @@
|
|
||||||
};
|
|
||||||
|
|
||||||
};
|
|
||||||
+
|
|
||||||
+&rng {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
diff --git a/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi b/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi
|
|
||||||
index bac09df4a3..38fe3bb0ec 100644
|
|
||||||
--- a/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi
|
|
||||||
+++ b/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi
|
|
||||||
@@ -25,6 +25,10 @@
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
+&rng {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
&vdd_center {
|
|
||||||
regulator-min-microvolt = <950000>;
|
|
||||||
regulator-max-microvolt = <950000>;
|
|
||||||
diff --git a/configs/firefly-rk3399_defconfig b/configs/firefly-rk3399_defconfig
|
diff --git a/configs/firefly-rk3399_defconfig b/configs/firefly-rk3399_defconfig
|
||||||
index 5bb54f5835..551687d6d0 100644
|
index ea4a30ebf3..e242ee5009 100644
|
||||||
--- a/configs/firefly-rk3399_defconfig
|
--- a/configs/firefly-rk3399_defconfig
|
||||||
+++ b/configs/firefly-rk3399_defconfig
|
+++ b/configs/firefly-rk3399_defconfig
|
||||||
@@ -35,6 +35,8 @@ CONFIG_MMC_DW=y
|
@@ -35,6 +35,8 @@ CONFIG_MMC_DW=y
|
||||||
|
@ -65,32 +108,6 @@ index 5bb54f5835..551687d6d0 100644
|
||||||
CONFIG_SF_DEFAULT_SPEED=20000000
|
CONFIG_SF_DEFAULT_SPEED=20000000
|
||||||
CONFIG_DM_ETH=y
|
CONFIG_DM_ETH=y
|
||||||
CONFIG_ETH_DESIGNWARE=y
|
CONFIG_ETH_DESIGNWARE=y
|
||||||
diff --git a/configs/rock960-rk3399_defconfig b/configs/rock960-rk3399_defconfig
|
|
||||||
index 59a85c78a1..f31cb92884 100644
|
|
||||||
--- a/configs/rock960-rk3399_defconfig
|
|
||||||
+++ b/configs/rock960-rk3399_defconfig
|
|
||||||
@@ -37,6 +37,8 @@ CONFIG_MMC_DW_ROCKCHIP=y
|
|
||||||
CONFIG_MMC_SDHCI=y
|
|
||||||
CONFIG_MMC_SDHCI_SDMA=y
|
|
||||||
CONFIG_MMC_SDHCI_ROCKCHIP=y
|
|
||||||
+CONFIG_DM_RNG=y
|
|
||||||
+CONFIG_RNG_ROCKCHIP=y
|
|
||||||
CONFIG_DM_ETH=y
|
|
||||||
CONFIG_NVME=y
|
|
||||||
CONFIG_PCI=y
|
|
||||||
diff --git a/configs/rockpro64-rk3399_defconfig b/configs/rockpro64-rk3399_defconfig
|
|
||||||
index 807747485a..f778f0b640 100644
|
|
||||||
--- a/configs/rockpro64-rk3399_defconfig
|
|
||||||
+++ b/configs/rockpro64-rk3399_defconfig
|
|
||||||
@@ -40,6 +40,8 @@ CONFIG_MMC_DW=y
|
|
||||||
CONFIG_MMC_DW_ROCKCHIP=y
|
|
||||||
CONFIG_MMC_SDHCI=y
|
|
||||||
CONFIG_MMC_SDHCI_ROCKCHIP=y
|
|
||||||
+CONFIG_DM_RNG=y
|
|
||||||
+CONFIG_RNG_ROCKCHIP=y
|
|
||||||
CONFIG_SPI_FLASH_GIGADEVICE=y
|
|
||||||
CONFIG_DM_ETH=y
|
|
||||||
CONFIG_ETH_DESIGNWARE=y
|
|
||||||
--
|
--
|
||||||
2.26.2
|
2.26.2
|
||||||
|
|
||||||
|
|
|
@ -21,8 +21,7 @@ Patch1: uefi-distro-load-FDT-from-any-partition-on-boot-device.patch
|
||||||
Patch2: uefi-use-Fedora-specific-path-name.patch
|
Patch2: uefi-use-Fedora-specific-path-name.patch
|
||||||
|
|
||||||
# Board fixes and enablement
|
# Board fixes and enablement
|
||||||
Patch3: usb-kbd-fixes.patch
|
# Patch4: dragonboard-fixes.patch
|
||||||
Patch4: dragonboard-fixes.patch
|
|
||||||
|
|
||||||
# Tegra improvements
|
# Tegra improvements
|
||||||
Patch10: arm-tegra-define-fdtfile-option-for-distro-boot.patch
|
Patch10: arm-tegra-define-fdtfile-option-for-distro-boot.patch
|
||||||
|
|
Loading…
Reference in New Issue