mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
rockchip: drop most ugly hack code
Delete these ugly hack code until someone who make money with this don't be so perfunctory.
This commit is contained in:
parent
c7ce44ab41
commit
3211a973de
@ -16,7 +16,7 @@ endef
|
|||||||
|
|
||||||
include $(INCLUDE_DIR)/target.mk
|
include $(INCLUDE_DIR)/target.mk
|
||||||
|
|
||||||
DEFAULT_PACKAGES += uboot-envtools partx-utils e2fsprogs mkf2fs kmod-gpio-button-hotplug kmod-crypto-hw-rockchip \
|
DEFAULT_PACKAGES += uboot-envtools partx-utils e2fsprogs mkf2fs kmod-gpio-button-hotplug \
|
||||||
automount autocore-arm autosamba fdisk cfdisk e2fsprogs ethtool haveged htop \
|
automount autocore-arm autosamba fdisk cfdisk e2fsprogs ethtool haveged htop \
|
||||||
luci-app-zerotier luci-app-ipsec-vpnd luci-app-diskman usbutils
|
luci-app-zerotier luci-app-ipsec-vpnd luci-app-diskman usbutils
|
||||||
|
|
||||||
|
@ -79,16 +79,14 @@
|
|||||||
|
|
||||||
gpio-keys {
|
gpio-keys {
|
||||||
compatible = "gpio-keys";
|
compatible = "gpio-keys";
|
||||||
autorepeat;
|
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
pinctrl-0 = <&reset_button_pin>;
|
pinctrl-0 = <&reset_button_pin>;
|
||||||
|
|
||||||
reset {
|
reset {
|
||||||
|
label = "reset";
|
||||||
debounce-interval = <100>;
|
debounce-interval = <100>;
|
||||||
gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;
|
gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;
|
||||||
label = "reset";
|
|
||||||
linux,code = <KEY_RESTART>;
|
linux,code = <KEY_RESTART>;
|
||||||
wakeup-source;
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -109,16 +109,6 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
&emmc_phy {
|
|
||||||
status = "okay";
|
|
||||||
};
|
|
||||||
|
|
||||||
&sdhci {
|
|
||||||
bus-width = <8>;
|
|
||||||
non-removable;
|
|
||||||
status = "okay";
|
|
||||||
};
|
|
||||||
|
|
||||||
&sdio0 {
|
&sdio0 {
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
@ -22,16 +22,6 @@ define Device/embedfire_doornet2
|
|||||||
endef
|
endef
|
||||||
TARGET_DEVICES += embedfire_doornet2
|
TARGET_DEVICES += embedfire_doornet2
|
||||||
|
|
||||||
define Device/embedfire_doornet2-4gb
|
|
||||||
DEVICE_VENDOR := EmbedFire
|
|
||||||
DEVICE_MODEL := DoorNet2 4GB
|
|
||||||
SOC := rk3399
|
|
||||||
UBOOT_DEVICE_NAME := guangmiao-g4c-rk3399
|
|
||||||
IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r4s | pine64-img | gzip | append-metadata
|
|
||||||
DEVICE_PACKAGES := kmod-r8168 -urngd
|
|
||||||
endef
|
|
||||||
TARGET_DEVICES += embedfire_doornet2-4gb
|
|
||||||
|
|
||||||
define Device/friendlyarm_nanopi-neo3
|
define Device/friendlyarm_nanopi-neo3
|
||||||
DEVICE_VENDOR := FriendlyARM
|
DEVICE_VENDOR := FriendlyARM
|
||||||
DEVICE_MODEL := NanoPi NEO3
|
DEVICE_MODEL := NanoPi NEO3
|
||||||
|
@ -43,15 +43,3 @@ Signed-off-by: wevsty <ty@wevs.org>
|
|||||||
obj-$(CONFIG_HW_RANDOM_PIC32) += pic32-rng.o
|
obj-$(CONFIG_HW_RANDOM_PIC32) += pic32-rng.o
|
||||||
obj-$(CONFIG_HW_RANDOM_MESON) += meson-rng.o
|
obj-$(CONFIG_HW_RANDOM_MESON) += meson-rng.o
|
||||||
obj-$(CONFIG_HW_RANDOM_CAVIUM) += cavium-rng.o cavium-rng-vf.o
|
obj-$(CONFIG_HW_RANDOM_CAVIUM) += cavium-rng.o cavium-rng-vf.o
|
||||||
|
|
||||||
--- a/arch/arm64/boot/dts/rockchip/Makefile
|
|
||||||
+++ b/arch/arm64/boot/dts/rockchip/Makefile
|
|
||||||
@@ -22,6 +22,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-orion-r68-meta.dtb
|
|
||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-px5-evb.dtb
|
|
||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-r88.dtb
|
|
||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-doornet2.dtb
|
|
||||||
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-doornet2-4gb.dtb
|
|
||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-evb.dtb
|
|
||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-ficus.dtb
|
|
||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-firefly.dtb
|
|
||||||
|
|
@ -1,28 +0,0 @@
|
|||||||
From 16bdf3e76fec6ddb44f1fcf221139fb39d225031 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Igor Pecovnik <igor.pecovnik@gmail.com>
|
|
||||||
Date: Sat, 2 Jan 2021 05:23:55 +0000
|
|
||||||
Subject: [PATCH] kernel: dma: adjust default coherent_pool to 2MiB
|
|
||||||
|
|
||||||
---
|
|
||||||
kernel/dma/pool.c | 8 +++-----
|
|
||||||
1 file changed, 3 insertions(+), 5 deletions(-)
|
|
||||||
|
|
||||||
--- a/kernel/dma/pool.c
|
|
||||||
+++ b/kernel/dma/pool.c
|
|
||||||
@@ -192,13 +192,11 @@ static int __init dma_atomic_pool_init(v
|
|
||||||
int ret = 0;
|
|
||||||
|
|
||||||
/*
|
|
||||||
- * If coherent_pool was not used on the command line, default the pool
|
|
||||||
- * sizes to 128KB per 1GB of memory, min 128KB, max MAX_ORDER-1.
|
|
||||||
+ * Always use 2MiB as default pool size.
|
|
||||||
+ * See: https://forum.armbian.com/topic/4811-uas-mainline-kernel-coherent-pool-memory-size/
|
|
||||||
*/
|
|
||||||
if (!atomic_pool_size) {
|
|
||||||
- unsigned long pages = totalram_pages() / (SZ_1G / SZ_128K);
|
|
||||||
- pages = min_t(unsigned long, pages, MAX_ORDER_NR_PAGES);
|
|
||||||
- atomic_pool_size = max_t(size_t, pages << PAGE_SHIFT, SZ_128K);
|
|
||||||
+ atomic_pool_size = SZ_2M;
|
|
||||||
}
|
|
||||||
INIT_WORK(&atomic_pool_work, atomic_pool_work_fn);
|
|
||||||
|
|
@ -8,15 +8,3 @@
|
|||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-hugsun-x99.dtb
|
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-hugsun-x99.dtb
|
||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge.dtb
|
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge.dtb
|
||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge-captain.dtb
|
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge-captain.dtb
|
||||||
|
|
||||||
--- a/arch/arm64/boot/dts/rockchip/Makefile
|
|
||||||
+++ b/arch/arm64/boot/dts/rockchip/Makefile
|
|
||||||
@@ -26,6 +26,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-orion-r68-meta.dtb
|
|
||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-px5-evb.dtb
|
|
||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-r88.dtb
|
|
||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-doornet2.dtb
|
|
||||||
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-doornet2-4gb.dtb
|
|
||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-evb.dtb
|
|
||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-ficus.dtb
|
|
||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-firefly.dtb
|
|
||||||
|
|
@ -1,28 +0,0 @@
|
|||||||
From 16bdf3e76fec6ddb44f1fcf221139fb39d225031 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Igor Pecovnik <igor.pecovnik@gmail.com>
|
|
||||||
Date: Sat, 2 Jan 2021 05:23:55 +0000
|
|
||||||
Subject: [PATCH] kernel: dma: adjust default coherent_pool to 2MiB
|
|
||||||
|
|
||||||
---
|
|
||||||
kernel/dma/pool.c | 8 +++-----
|
|
||||||
1 file changed, 3 insertions(+), 5 deletions(-)
|
|
||||||
|
|
||||||
--- a/kernel/dma/pool.c
|
|
||||||
+++ b/kernel/dma/pool.c
|
|
||||||
@@ -189,13 +189,11 @@ static int __init dma_atomic_pool_init(v
|
|
||||||
int ret = 0;
|
|
||||||
|
|
||||||
/*
|
|
||||||
- * If coherent_pool was not used on the command line, default the pool
|
|
||||||
- * sizes to 128KB per 1GB of memory, min 128KB, max MAX_ORDER-1.
|
|
||||||
+ * Always use 2MiB as default pool size.
|
|
||||||
+ * See: https://forum.armbian.com/topic/4811-uas-mainline-kernel-coherent-pool-memory-size/
|
|
||||||
*/
|
|
||||||
if (!atomic_pool_size) {
|
|
||||||
- unsigned long pages = totalram_pages() / (SZ_1G / SZ_128K);
|
|
||||||
- pages = min_t(unsigned long, pages, MAX_ORDER_NR_PAGES);
|
|
||||||
- atomic_pool_size = max_t(size_t, pages << PAGE_SHIFT, SZ_128K);
|
|
||||||
+ atomic_pool_size = SZ_2M;
|
|
||||||
}
|
|
||||||
INIT_WORK(&atomic_pool_work, atomic_pool_work_fn);
|
|
||||||
|
|
@ -1,43 +0,0 @@
|
|||||||
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
|
|
||||||
@@ -498,6 +498,11 @@ int stmmac_mdio_register(struct net_devi
|
|
||||||
if (priv->plat->has_xgmac)
|
|
||||||
stmmac_xgmac2_mdio_read(new_bus, 0, MII_ADDR_C45);
|
|
||||||
|
|
||||||
+ stmmac_mdio_write(new_bus,0,31,2627);
|
|
||||||
+ stmmac_mdio_write(new_bus,0,25,0x1801);
|
|
||||||
+ stmmac_mdio_write(new_bus,0,31,0);
|
|
||||||
+ stmmac_mdio_write(new_bus,0,0,0x8000);
|
|
||||||
+
|
|
||||||
if (priv->plat->phy_node || mdio_node)
|
|
||||||
goto bus_register_done;
|
|
||||||
|
|
||||||
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
|
|
||||||
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
|
|
||||||
@@ -498,6 +498,16 @@ int stmmac_mdio_register(struct net_devi
|
|
||||||
if (priv->plat->has_xgmac)
|
|
||||||
stmmac_xgmac2_mdio_read(new_bus, 0, MII_ADDR_C45);
|
|
||||||
|
|
||||||
+ stmmac_mdio_write(new_bus,0,31,2627);
|
|
||||||
+ stmmac_mdio_write(new_bus,0,25,0x1801);
|
|
||||||
+ stmmac_mdio_write(new_bus,0,31,0);
|
|
||||||
+ stmmac_mdio_write(new_bus,0,0,0x8000);
|
|
||||||
+
|
|
||||||
+ stmmac_mdio_write(new_bus,0,31,2627);
|
|
||||||
+ stmmac_mdio_write(new_bus,0,25,0x1801);
|
|
||||||
+ stmmac_mdio_write(new_bus,0,31,0);
|
|
||||||
+ stmmac_mdio_write(new_bus,0,0,0x8000);
|
|
||||||
+
|
|
||||||
if (priv->plat->phy_node || mdio_node)
|
|
||||||
goto bus_register_done;
|
|
||||||
|
|
||||||
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
|
|
||||||
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
|
|
||||||
@@ -2852,6 +2852,8 @@ static int stmmac_init_dma_engine(struct
|
|
||||||
if (priv->extend_desc && (priv->mode == STMMAC_RING_MODE))
|
|
||||||
atds = 1;
|
|
||||||
|
|
||||||
+ msleep(1500);
|
|
||||||
+
|
|
||||||
ret = stmmac_reset(priv, priv->ioaddr);
|
|
||||||
if (ret) {
|
|
||||||
dev_err(priv->device, "Failed to reset the dma\n");
|
|
@ -43,15 +43,3 @@ Signed-off-by: wevsty <ty@wevs.org>
|
|||||||
obj-$(CONFIG_HW_RANDOM_PIC32) += pic32-rng.o
|
obj-$(CONFIG_HW_RANDOM_PIC32) += pic32-rng.o
|
||||||
obj-$(CONFIG_HW_RANDOM_MESON) += meson-rng.o
|
obj-$(CONFIG_HW_RANDOM_MESON) += meson-rng.o
|
||||||
obj-$(CONFIG_HW_RANDOM_CAVIUM) += cavium-rng.o cavium-rng-vf.o
|
obj-$(CONFIG_HW_RANDOM_CAVIUM) += cavium-rng.o cavium-rng-vf.o
|
||||||
|
|
||||||
--- a/arch/arm64/boot/dts/rockchip/Makefile
|
|
||||||
+++ b/arch/arm64/boot/dts/rockchip/Makefile
|
|
||||||
@@ -17,6 +17,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-orion-r68-meta.dtb
|
|
||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-px5-evb.dtb
|
|
||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-r88.dtb
|
|
||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-doornet2.dtb
|
|
||||||
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-doornet2-4gb.dtb
|
|
||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-evb.dtb
|
|
||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-ficus.dtb
|
|
||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-firefly.dtb
|
|
||||||
|
|
@ -1,20 +0,0 @@
|
|||||||
From 16bdf3e76fec6ddb44f1fcf221139fb39d225031 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Igor Pecovnik <igor.pecovnik@gmail.com>
|
|
||||||
Date: Sat, 2 Jan 2021 05:23:55 +0000
|
|
||||||
Subject: [PATCH] kernel: dma: adjust default coherent_pool to 2MiB
|
|
||||||
|
|
||||||
---
|
|
||||||
kernel/dma/remap.c | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
--- a/kernel/dma/remap.c
|
|
||||||
+++ b/kernel/dma/remap.c
|
|
||||||
@@ -101,7 +101,7 @@ void dma_common_free_remap(void *cpu_add
|
|
||||||
#ifdef CONFIG_DMA_DIRECT_REMAP
|
|
||||||
static struct gen_pool *atomic_pool __ro_after_init;
|
|
||||||
|
|
||||||
-#define DEFAULT_DMA_COHERENT_POOL_SIZE SZ_256K
|
|
||||||
+#define DEFAULT_DMA_COHERENT_POOL_SIZE SZ_2M
|
|
||||||
static size_t atomic_pool_size __initdata = DEFAULT_DMA_COHERENT_POOL_SIZE;
|
|
||||||
|
|
||||||
static int __init early_coherent_pool(char *p)
|
|
Loading…
Reference in New Issue
Block a user