GitHub-Mirror/build
2
0
Fork 0
mirror of https://github.com/Fishwaldo/build.git synced 2025-05-30 19:01:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

switch RK3399 to 5.0.y

Browse source
This commit is contained in:
Martin Ayotte 2019-03-15 18:46:14 -04:00
parent e71c0aa63d
commit 53bcf26db6
6 changed files with 36 additions and 54017 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config/sources/rk3399.conf
View file

@ -11,7 +11,7 @@ UBOOT_USE_GCC='> 7.0'
BOOTSOURCE='https://github.com/u-boot/u-boot.git'
BOOTDIR='u-boot-rk3399'
BOOTPATCHDIR="u-boot-rk3399"
BOOTBRANCH='tag:v2018.11'
BOOTBRANCH='tag:v2019.01'
BOOTDELAY=0
@ -40,7 +40,7 @@ case $BRANCH in
dev)
KERNELSOURCE='https://github.com/ayufan-rock64/linux-mainline-kernel'
KERNELBRANCH='tag:tag:4.20.0-1090-ayufan'
KERNELBRANCH='tag:tag:5.0.0-1092-ayufan'
KERNELDIR='linux-rockchip64'
KERNELPATCHDIR='rockchip64-dev'
LINUXCONFIG='linux-rockchip64-dev'

4
config/sources/rockchip64.conf
View file

@ -9,9 +9,11 @@ UBOOT_TARGET_MAP=";;idbloader.bin uboot.img trust.bin"
UBOOT_USE_GCC='> 7.0'
BOOTSOURCE='https://github.com/ayufan-rock64/linux-u-boot'
#BOOTSOURCE='https://github.com/u-boot/u-boot.git'
BOOTDIR='u-boot-rockchip64'
BOOTPATCHDIR="u-boot-rockchip64-${BRANCH}"
BOOTBRANCH='branch:rockchip-master'
#BOOTBRANCH='tag:v2019.01'
BOOTDELAY=0
HAS_UUID_SUPPORT=yes
@ -50,7 +52,7 @@ case $BRANCH in
dev)
KERNELSOURCE='https://github.com/ayufan-rock64/linux-mainline-kernel'
KERNELBRANCH='tag:4.20.0-1090-ayufan'
KERNELBRANCH='tag:5.0.0-1092-ayufan'
KERNELDIR='linux-rockchip64'
KERNEL_USE_GCC='> 7.0'
;;

6
patch/kernel/rockchip64-dev/nanopi4-dts.patch
View file

@ -2,10 +2,10 @@ diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchi
index d08b7eda28d2..cb3105ca4a1c 100644
--- a/arch/arm64/boot/dts/rockchip/Makefile
+++ b/arch/arm64/boot/dts/rockchip/Makefile
@@ -14,6 +14,9 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-ficus.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-firefly.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-bob.dtb
@@ -16,6 +16,9 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-ficus.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-kevin.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-scarlet-inx.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-scarlet-kd.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi4-rev00.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi4-rev01.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi4-rev04.dtb

11
patch/kernel/rockchip64-dev/orangepi-rk3399-dts.patch
View file

@ -15,7 +15,7 @@ new file mode 100644
index 000000000000..9a7887220551
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts
@@ -0,0 +1,927 @@
@@ -0,0 +1,932 @@
+/*
+ * Copyright (c) 2016 Fuzhou Rockchip Electronics Co., Ltd
+ *
@ -69,6 +69,11 @@ index 000000000000..9a7887220551
+ compatible = "xulung,orangepi-rk3399",
+ "rockchip,rk3399";
+
+ chosen {
+ bootargs = "mmc_cmdqueue=0 earlycon=uart8250,mmio32,0xff1a0000";
+ stdout-path = "serial2:1500000n8";
+ };
+
+ cpuinfo {
+ compatible = "rockchip,cpuinfo";
+ };
@ -724,11 +729,11 @@ index 000000000000..9a7887220551
+};
+
+&pcie_phy {
+ status = "okay";
+ status = "disabled";
+};
+
+&pcie0 {
+ status = "okay";
+ status = "disabled";
+ ep-gpios = <&gpio2 4 GPIO_ACTIVE_HIGH>;
+ num-lanes = <4>;
+};

54008
patch/kernel/rockchip64-dev/patch-4.20.13.patch
View file

File diff suppressed because it is too large Load diff

20
patch/kernel/rockchip64-dev/timekeeping32-tweaks-for-5.0.y.patch Normal file
View file

@ -0,0 +1,20 @@
diff --git a/include/linux/timekeeping32.h b/include/linux/timekeeping32.h
index cc59cc9..a0f5143 100644
--- a/include/linux/timekeeping32.h
+++ b/include/linux/timekeeping32.h
@@ -43,4 +43,15 @@ static inline void getboottime(struct timespec *ts)
*ts = timespec64_to_timespec(ts64);
}
+static inline void get_monotonic_boottime(struct timespec *ts)
+{
+ *ts = ktime_to_timespec(ktime_get_boottime());
+}
+
+static inline void timekeeping_clocktai(struct timespec *ts)
+{
+ *ts = ktime_to_timespec(ktime_get_clocktai());
+}
+
+
#endif