136 lines
3.9 KiB
Diff
136 lines
3.9 KiB
Diff
From 5cb3ca7ebd46c1983d0929b5ba027a03c1f5e51e Mon Sep 17 00:00:00 2001
|
|
From: Peter Robinson <pbrobinson@gmail.com>
|
|
Date: Wed, 16 Dec 2020 15:22:34 +0000
|
|
Subject: [PATCH 1/2] arm: dts: rockchip: rk3399: enable rng at the SoC level
|
|
|
|
The rng is embedded in the SoC so enable it in the device tree
|
|
universally, the use of it can be controlled by enabling/disabling
|
|
at the device config level.
|
|
|
|
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
|
---
|
|
arch/arm/dts/rk3399-evb-u-boot.dtsi | 4 ----
|
|
arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi | 4 ----
|
|
arch/arm/dts/rk3399-rockpro64-u-boot.dtsi | 4 ----
|
|
arch/arm/dts/rk3399-u-boot.dtsi | 2 +-
|
|
4 files changed, 1 insertion(+), 13 deletions(-)
|
|
|
|
diff --git a/arch/arm/dts/rk3399-evb-u-boot.dtsi b/arch/arm/dts/rk3399-evb-u-boot.dtsi
|
|
index 8056dc843e..398b205ec2 100644
|
|
--- a/arch/arm/dts/rk3399-evb-u-boot.dtsi
|
|
+++ b/arch/arm/dts/rk3399-evb-u-boot.dtsi
|
|
@@ -13,10 +13,6 @@
|
|
};
|
|
};
|
|
|
|
-&rng {
|
|
- status = "okay";
|
|
-};
|
|
-
|
|
&i2c0 {
|
|
u-boot,dm-pre-reloc;
|
|
};
|
|
diff --git a/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi b/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
|
|
index ded7db0aef..c3e866a779 100644
|
|
--- a/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
|
|
+++ b/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
|
|
@@ -28,10 +28,6 @@
|
|
u-boot,dm-pre-reloc;
|
|
};
|
|
|
|
-&rng {
|
|
- status = "okay";
|
|
-};
|
|
-
|
|
&sdhci {
|
|
max-frequency = <25000000>;
|
|
u-boot,dm-pre-reloc;
|
|
diff --git a/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi b/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi
|
|
index 6317b47e41..37dff04adf 100644
|
|
--- a/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi
|
|
+++ b/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi
|
|
@@ -15,10 +15,6 @@
|
|
};
|
|
};
|
|
|
|
-&rng {
|
|
- status = "okay";
|
|
-};
|
|
-
|
|
&spi1 {
|
|
spi_flash: flash@0 {
|
|
u-boot,dm-pre-reloc;
|
|
diff --git a/arch/arm/dts/rk3399-u-boot.dtsi b/arch/arm/dts/rk3399-u-boot.dtsi
|
|
index ecd230c720..73922c328a 100644
|
|
--- a/arch/arm/dts/rk3399-u-boot.dtsi
|
|
+++ b/arch/arm/dts/rk3399-u-boot.dtsi
|
|
@@ -32,7 +32,7 @@
|
|
rng: rng@ff8b8000 {
|
|
compatible = "rockchip,cryptov1-rng";
|
|
reg = <0x0 0xff8b8000 0x0 0x1000>;
|
|
- status = "disabled";
|
|
+ status = "okay";
|
|
};
|
|
|
|
dmc: dmc {
|
|
--
|
|
2.29.2
|
|
|
|
From 62093137fcbe760d009cf2757feda7ccf328fbb7 Mon Sep 17 00:00:00 2001
|
|
From: Peter Robinson <pbrobinson@gmail.com>
|
|
Date: Wed, 16 Dec 2020 15:37:21 +0000
|
|
Subject: [PATCH 2/2] configs: rk3399: enable rng on firefly/rock960/rockpro64
|
|
|
|
Enable the RNG on the Firefly, rock960 and RockPro64 devices
|
|
to enable KASLR on devices that support it.
|
|
|
|
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
|
---
|
|
configs/firefly-rk3399_defconfig | 2 ++
|
|
configs/rock960-rk3399_defconfig | 2 ++
|
|
configs/rockpro64-rk3399_defconfig | 2 ++
|
|
3 files changed, 6 insertions(+)
|
|
|
|
diff --git a/configs/firefly-rk3399_defconfig b/configs/firefly-rk3399_defconfig
|
|
index c453b82dc5..cfbaae40aa 100644
|
|
--- a/configs/firefly-rk3399_defconfig
|
|
+++ b/configs/firefly-rk3399_defconfig
|
|
@@ -35,6 +35,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_SF_DEFAULT_SPEED=20000000
|
|
CONFIG_DM_ETH=y
|
|
CONFIG_ETH_DESIGNWARE=y
|
|
diff --git a/configs/rock960-rk3399_defconfig b/configs/rock960-rk3399_defconfig
|
|
index 65dce3cd73..aadbc55f57 100644
|
|
--- a/configs/rock960-rk3399_defconfig
|
|
+++ b/configs/rock960-rk3399_defconfig
|
|
@@ -39,6 +39,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 575b7a20d5..f78dfcc8f7 100644
|
|
--- a/configs/rockpro64-rk3399_defconfig
|
|
+++ b/configs/rockpro64-rk3399_defconfig
|
|
@@ -42,6 +42,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_SF_DEFAULT_BUS=1
|
|
CONFIG_SPI_FLASH_GIGADEVICE=y
|
|
CONFIG_DM_ETH=y
|
|
--
|
|
2.29.2
|
|
|