201 lines
6.0 KiB
Diff
201 lines
6.0 KiB
Diff
From e27621a7c2c0e090977c17f604093c720ca01fe4 Mon Sep 17 00:00:00 2001
|
|
From: Peter Robinson <pbrobinson@gmail.com>
|
|
Date: Mon, 8 Jun 2020 20:31:33 +0100
|
|
Subject: [PATCH 1/3] rockchip: Pinebook Pro: 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-pinebook-pro-u-boot.dtsi | 4 ++++
|
|
arch/arm/dts/rk3399-rockpro64-u-boot.dtsi | 4 ++++
|
|
configs/pinebook-pro-rk3399_defconfig | 2 ++
|
|
3 files changed, 10 insertions(+)
|
|
|
|
diff --git a/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi b/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
|
|
index 1a2e24d3ef..296321d697 100644
|
|
--- a/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
|
|
+++ b/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
|
|
@@ -24,6 +24,10 @@
|
|
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 bac09df4a3..cb8991aa25 100644
|
|
--- a/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi
|
|
+++ b/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi
|
|
@@ -19,6 +19,10 @@
|
|
};
|
|
};
|
|
|
|
+&rng {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&spi1 {
|
|
spi_flash: flash@0 {
|
|
u-boot,dm-pre-reloc;
|
|
diff --git a/configs/pinebook-pro-rk3399_defconfig b/configs/pinebook-pro-rk3399_defconfig
|
|
index 0c129b9aeb..21eecf477c 100644
|
|
--- a/configs/pinebook-pro-rk3399_defconfig
|
|
+++ b/configs/pinebook-pro-rk3399_defconfig
|
|
@@ -54,6 +54,8 @@ CONFIG_DM_PMIC_FAN53555=y
|
|
CONFIG_PMIC_RK8XX=y
|
|
CONFIG_REGULATOR_PWM=y
|
|
CONFIG_REGULATOR_RK8XX=y
|
|
+CONFIG_DM_RNG=y
|
|
+CONFIG_RNG_ROCKCHIP=y
|
|
CONFIG_PWM_ROCKCHIP=y
|
|
CONFIG_RAM_RK3399_LPDDR4=y
|
|
CONFIG_DM_RESET=y
|
|
--
|
|
2.26.2
|
|
|
|
From 99a3c9ba5a8ab7a94aa700649e031f53d498e857 Mon Sep 17 00:00:00 2001
|
|
From: Peter Robinson <pbrobinson@gmail.com>
|
|
Date: Mon, 8 Jun 2020 22:23:05 +0100
|
|
Subject: [PATCH 2/3] rockchip: Pinebook Pro: Fix USB and the USB attached
|
|
keyboard
|
|
|
|
The built in keyboard on the Pinebook Pro is attached via USB so
|
|
fix this up to ensure USB works as expected.
|
|
|
|
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
|
---
|
|
configs/pinebook-pro-rk3399_defconfig | 5 +++++
|
|
include/configs/pinebook-pro-rk3399.h | 3 +++
|
|
2 files changed, 8 insertions(+)
|
|
|
|
diff --git a/configs/pinebook-pro-rk3399_defconfig b/configs/pinebook-pro-rk3399_defconfig
|
|
index 21eecf477c..733463556a 100644
|
|
--- a/configs/pinebook-pro-rk3399_defconfig
|
|
+++ b/configs/pinebook-pro-rk3399_defconfig
|
|
@@ -61,6 +61,8 @@ CONFIG_RAM_RK3399_LPDDR4=y
|
|
CONFIG_DM_RESET=y
|
|
CONFIG_BAUDRATE=1500000
|
|
CONFIG_DEBUG_UART_SHIFT=2
|
|
+CONFIG_USE_PREBOOT=y
|
|
+CONFIG_PREBOOT="usb start"
|
|
CONFIG_ROCKCHIP_SPI=y
|
|
CONFIG_SYSRESET=y
|
|
CONFIG_USB=y
|
|
@@ -68,8 +70,11 @@ CONFIG_USB_XHCI_HCD=y
|
|
CONFIG_USB_XHCI_DWC3=y
|
|
CONFIG_USB_EHCI_HCD=y
|
|
CONFIG_USB_EHCI_GENERIC=y
|
|
+CONFIG_USB_OHCI_HCD=y
|
|
+CONFIG_USB_OHCI_GENERIC=y
|
|
CONFIG_USB_DWC3=y
|
|
CONFIG_ROCKCHIP_USB2_PHY=y
|
|
+CONFIG_DM_KEYBOARD=y
|
|
CONFIG_USB_KEYBOARD=y
|
|
CONFIG_USB_HOST_ETHER=y
|
|
CONFIG_USB_ETHER_ASIX=y
|
|
diff --git a/include/configs/pinebook-pro-rk3399.h b/include/configs/pinebook-pro-rk3399.h
|
|
index 4bc8802d11..d910830582 100644
|
|
--- a/include/configs/pinebook-pro-rk3399.h
|
|
+++ b/include/configs/pinebook-pro-rk3399.h
|
|
@@ -25,4 +25,7 @@
|
|
|
|
#define SDRAM_BANK_SIZE (2UL << 30)
|
|
|
|
+#define CONFIG_USB_OHCI_NEW
|
|
+#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2
|
|
+
|
|
#endif
|
|
--
|
|
2.26.2
|
|
|
|
From 64d43a4f0a135486a9a524b107c853831e492eb6 Mon Sep 17 00:00:00 2001
|
|
From: Peter Robinson <pbrobinson@gmail.com>
|
|
Date: Mon, 8 Jun 2020 23:41:50 +0100
|
|
Subject: [PATCH 3/3] rockchip: Pinebook Pro: Fix SPI flash and store env on it
|
|
|
|
Some minor fixes for SPI flash on the Pinebook Pro and also
|
|
default to saving environment to the SPI flash as it's
|
|
guaranteed to be on board.
|
|
|
|
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
|
---
|
|
arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi | 6 +++++-
|
|
configs/pinebook-pro-rk3399_defconfig | 3 +++
|
|
include/configs/pinebook-pro-rk3399.h | 9 ---------
|
|
3 files changed, 8 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi b/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
|
|
index 296321d697..ded7db0aef 100644
|
|
--- a/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
|
|
+++ b/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
|
|
@@ -12,7 +12,11 @@
|
|
};
|
|
|
|
chosen {
|
|
- u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
|
|
+ u-boot,spl-boot-order = "same-as-spl", &sdhci, &spiflash, &sdmmc;
|
|
+ };
|
|
+
|
|
+ config {
|
|
+ u-boot,spl-payload-offset = <0x60000>; /* @ 384KB */
|
|
};
|
|
};
|
|
|
|
diff --git a/configs/pinebook-pro-rk3399_defconfig b/configs/pinebook-pro-rk3399_defconfig
|
|
index 733463556a..18b2d74253 100644
|
|
--- a/configs/pinebook-pro-rk3399_defconfig
|
|
+++ b/configs/pinebook-pro-rk3399_defconfig
|
|
@@ -1,6 +1,7 @@
|
|
CONFIG_ARM=y
|
|
CONFIG_ARCH_ROCKCHIP=y
|
|
CONFIG_SYS_TEXT_BASE=0x00200000
|
|
+CONFIG_ENV_SIZE=0x8000
|
|
CONFIG_ROCKCHIP_RK3399=y
|
|
CONFIG_TARGET_PINEBOOK_PRO_RK3399=y
|
|
CONFIG_NR_DRAM_BANKS=1
|
|
@@ -17,6 +18,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y
|
|
CONFIG_SPL_STACK_R=y
|
|
CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000
|
|
CONFIG_SPL_MTD_SUPPORT=y
|
|
+CONFIG_SPL_SPI_LOAD=y
|
|
CONFIG_TPL=y
|
|
CONFIG_CMD_BOOTZ=y
|
|
CONFIG_CMD_GPIO=y
|
|
@@ -32,6 +34,7 @@ CONFIG_CMD_REGULATOR=y
|
|
CONFIG_SPL_OF_CONTROL=y
|
|
CONFIG_DEFAULT_DEVICE_TREE="rk3399-pinebook-pro"
|
|
CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
|
|
+CONFIG_ENV_IS_IN_SPI_FLASH=y
|
|
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
|
CONFIG_ROCKCHIP_GPIO=y
|
|
CONFIG_SYS_I2C_ROCKCHIP=y
|
|
diff --git a/include/configs/pinebook-pro-rk3399.h b/include/configs/pinebook-pro-rk3399.h
|
|
index d910830582..d478b19917 100644
|
|
--- a/include/configs/pinebook-pro-rk3399.h
|
|
+++ b/include/configs/pinebook-pro-rk3399.h
|
|
@@ -14,15 +14,6 @@
|
|
|
|
#include <configs/rk3399_common.h>
|
|
|
|
-#if defined(CONFIG_ENV_IS_IN_MMC)
|
|
-#define CONFIG_SYS_MMC_ENV_DEV 0
|
|
-#elif defined(CONFIG_ENV_IS_IN_SPI_FLASH)
|
|
-#define CONFIG_ENV_SECT_SIZE (8 * 1024)
|
|
-#endif
|
|
-
|
|
-#undef CONFIG_SYS_SPI_U_BOOT_OFFS
|
|
-#define CONFIG_SYS_SPI_U_BOOT_OFFS 1024 * 512
|
|
-
|
|
#define SDRAM_BANK_SIZE (2UL << 30)
|
|
|
|
#define CONFIG_USB_OHCI_NEW
|
|
--
|
|
2.26.2
|
|
|