Skip to content

Commit 3211a97

Browse files
aiamadeusaiamadeus
committed
rockchip: drop most ugly hack code
Delete these ugly hack code until someone who make money with this don't be so perfunctory.
1 parent c7ce44a commit 3211a97

12 files changed

+2
-179
lines changed

‎target/linux/rockchip/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ endef
1616

1717
include $(INCLUDE_DIR)/target.mk
1818

19-
DEFAULT_PACKAGES += uboot-envtools partx-utils e2fsprogs mkf2fs kmod-gpio-button-hotplug kmod-crypto-hw-rockchip \
19+
DEFAULT_PACKAGES += uboot-envtools partx-utils e2fsprogs mkf2fs kmod-gpio-button-hotplug \
2020
automount autocore-arm autosamba fdisk cfdisk e2fsprogs ethtool haveged htop \
2121
luci-app-zerotier luci-app-ipsec-vpnd luci-app-diskman usbutils
2222

‎target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3399-guangmiao-g4c.dts

+1-3
Original file line numberDiff line numberDiff line change
@@ -79,16 +79,14 @@
7979

8080
gpio-keys {
8181
compatible = "gpio-keys";
82-
autorepeat;
8382
pinctrl-names = "default";
8483
pinctrl-0 = <&reset_button_pin>;
8584

8685
reset {
86+
label = "reset";
8787
debounce-interval = <100>;
8888
gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;
89-
label = "reset";
9089
linux,code = <KEY_RESTART>;
91-
wakeup-source;
9290
};
9391
};
9492

‎target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4se.dts

-10
Original file line numberDiff line numberDiff line change
@@ -109,16 +109,6 @@
109109
};
110110
};
111111

112-
&emmc_phy {
113-
status = "okay";
114-
};
115-
116-
&sdhci {
117-
bus-width = <8>;
118-
non-removable;
119-
status = "okay";
120-
};
121-
122112
&sdio0 {
123113
status = "disabled";
124114
};

‎target/linux/rockchip/image/armv8.mk

-10
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,6 @@ define Device/embedfire_doornet2
2222
endef
2323
TARGET_DEVICES += embedfire_doornet2
2424

25-
define Device/embedfire_doornet2-4gb
26-
DEVICE_VENDOR := EmbedFire
27-
DEVICE_MODEL := DoorNet2 4GB
28-
SOC := rk3399
29-
UBOOT_DEVICE_NAME := guangmiao-g4c-rk3399
30-
IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r4s | pine64-img | gzip | append-metadata
31-
DEVICE_PACKAGES := kmod-r8168 -urngd
32-
endef
33-
TARGET_DEVICES += embedfire_doornet2-4gb
34-
3525
define Device/friendlyarm_nanopi-neo3
3626
DEVICE_VENDOR := FriendlyARM
3727
DEVICE_MODEL := NanoPi NEO3

‎target/linux/rockchip/patches-5.10/801-char-add-support-for-rockchip-hardware-random-number.patch

-12
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,3 @@ Signed-off-by: wevsty <[email protected]>
4343
obj-$(CONFIG_HW_RANDOM_PIC32) += pic32-rng.o
4444
obj-$(CONFIG_HW_RANDOM_MESON) += meson-rng.o
4545
obj-$(CONFIG_HW_RANDOM_CAVIUM) += cavium-rng.o cavium-rng-vf.o
46-
47-
--- a/arch/arm64/boot/dts/rockchip/Makefile
48-
+++ b/arch/arm64/boot/dts/rockchip/Makefile
49-
@@ -22,6 +22,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-orion-r68-meta.dtb
50-
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-px5-evb.dtb
51-
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-r88.dtb
52-
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-doornet2.dtb
53-
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-doornet2-4gb.dtb
54-
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-evb.dtb
55-
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-ficus.dtb
56-
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-firefly.dtb
57-

‎target/linux/rockchip/patches-5.10/911-kernel-dma-adjust-default-coherent_pool-to-2MiB.patch

-28
This file was deleted.

‎target/linux/rockchip/patches-5.15/105-rockchip-rock-pi-4.patch ‎target/linux/rockchip/patches-5.15/108-rockchip-rock-pi-4.patch

File renamed without changes.

‎target/linux/rockchip/patches-5.15/208-rockchip-rk3399-add-support-for-GuangMiao-G4C.patch

-12
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,3 @@
88
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-hugsun-x99.dtb
99
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge.dtb
1010
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge-captain.dtb
11-
12-
--- a/arch/arm64/boot/dts/rockchip/Makefile
13-
+++ b/arch/arm64/boot/dts/rockchip/Makefile
14-
@@ -26,6 +26,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-orion-r68-meta.dtb
15-
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-px5-evb.dtb
16-
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-r88.dtb
17-
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-doornet2.dtb
18-
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-doornet2-4gb.dtb
19-
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-evb.dtb
20-
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-ficus.dtb
21-
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-firefly.dtb
22-

‎target/linux/rockchip/patches-5.15/911-kernel-dma-adjust-default-coherent_pool-to-2MiB.patch

-28
This file was deleted.

‎target/linux/rockchip/patches-5.18/801-fix-stmmac_mdio.patch

-43
This file was deleted.

‎target/linux/rockchip/patches-5.4/801-char-add-support-for-rockchip-hardware-random-number.patch

-12
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,3 @@ Signed-off-by: wevsty <[email protected]>
4343
obj-$(CONFIG_HW_RANDOM_PIC32) += pic32-rng.o
4444
obj-$(CONFIG_HW_RANDOM_MESON) += meson-rng.o
4545
obj-$(CONFIG_HW_RANDOM_CAVIUM) += cavium-rng.o cavium-rng-vf.o
46-
47-
--- a/arch/arm64/boot/dts/rockchip/Makefile
48-
+++ b/arch/arm64/boot/dts/rockchip/Makefile
49-
@@ -17,6 +17,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-orion-r68-meta.dtb
50-
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-px5-evb.dtb
51-
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-r88.dtb
52-
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-doornet2.dtb
53-
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-doornet2-4gb.dtb
54-
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-evb.dtb
55-
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-ficus.dtb
56-
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-firefly.dtb
57-

‎target/linux/rockchip/patches-5.4/911-kernel-dma-adjust-default-coherent_pool-to-2MiB.patch

-20
This file was deleted.

0 commit comments

Comments
 (0)