Since barebox does not support RK3399-based boards, let's
remove RK3399 support for now.
It can be easily added later if needed.
This change will help update the Rockchip CLK subsystem to
a more recent version from the kernel.
Signed-off-by: Alexander Shiyan <eagle.alexander...@gmail.com>
---
arch/arm/mach-rockchip/Kconfig | 9 -
arch/arm/mach-rockchip/atf.c | 5 -
drivers/clk/rockchip/Makefile | 1 -
drivers/clk/rockchip/clk-rk3399.c | 1660 -----------------------------
firmware/Makefile | 2 -
include/mach/rockchip/atf.h | 2 -
6 files changed, 1679 deletions(-)
delete mode 100644 drivers/clk/rockchip/clk-rk3399.c
diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
index bfbfa7367a..98dfd11c18 100644
--- a/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@ -27,15 +27,6 @@ config ARCH_ROCKCHIP_V8
select CPU_V8
select ARM_ATF
-config ARCH_RK3399
- bool
- select ARCH_ROCKCHIP_V8
- select ARCH_HAS_RESET_CONTROLLER
-
-config ARCH_RK3399PRO
- bool
- select ARCH_RK3399
-
config ARCH_RK3568
bool
select ARCH_ROCKCHIP_V8
diff --git a/arch/arm/mach-rockchip/atf.c b/arch/arm/mach-rockchip/atf.c
index 86a28c5101..d3a40e3c1b 100644
--- a/arch/arm/mach-rockchip/atf.c
+++ b/arch/arm/mach-rockchip/atf.c
@@ -132,11 +132,6 @@ static uintptr_t rk_load_optee(uintptr_t bl32, const void
*bl32_image,
SOC##_BAREBOX_LOAD_ADDRESS, (uintptr_t)fdt);
\
} while (0)
\
-void rk3399_atf_load_bl31(void *fdt)
-{
- rockchip_atf_load_bl31(RK3399, rk3399_bl31_bin, rk3399_bl32_bin, fdt);
-}
-
void rk3568_atf_load_bl31(void *fdt)
{
rockchip_atf_load_bl31(RK3568, rk3568_bl31_bin, rk3568_bl32_bin, fdt);
diff --git a/drivers/clk/rockchip/Makefile b/drivers/clk/rockchip/Makefile
index f01014da0c..02320025e5 100644
--- a/drivers/clk/rockchip/Makefile
+++ b/drivers/clk/rockchip/Makefile
@@ -3,6 +3,5 @@ obj-y += clk-cpu.o clk-pll.o clk.o clk-muxgrf.o clk-mmc-phase.o
clk-inverter.o
obj-$(CONFIG_RESET_CONTROLLER) += softrst.o
obj-$(CONFIG_ARCH_RK3188) += clk-rk3188.o
obj-$(CONFIG_ARCH_RK3288) += clk-rk3288.o
-obj-$(CONFIG_ARCH_RK3399) += clk-rk3399.o
obj-$(CONFIG_ARCH_RK3568) += clk-rk3568.o
obj-$(CONFIG_ARCH_RK3588) += clk-rk3588.o rst-rk3588.o
diff --git a/drivers/clk/rockchip/clk-rk3399.c
b/drivers/clk/rockchip/clk-rk3399.c
deleted file mode 100644
index 5954e9bebb..0000000000
diff --git a/firmware/Makefile b/firmware/Makefile
index 6b83bb4344..0bc502f3d4 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -25,13 +25,11 @@ fw-external-$(CONFIG_FIRMWARE_IMX93_OPTEE) +=
imx93-bl32.bin \
fw-external-$(CONFIG_FIRMWARE_IMX93_OPTEE_A0) += mx93a0-ahab-container.img
pbl-firmware-$(CONFIG_ARCH_RK3568) += rk3568-bl31.bin
pbl-firmware-$(CONFIG_ARCH_RK3588) += rk3588-bl31.bin
-pbl-firmware-$(CONFIG_ARCH_RK3399) += rk3399-bl31.bin
ifeq ($(CONFIG_ARCH_ROCKCHIP_OPTEE),y)
# We install BL31 & BL32 while already running in DRAM,
# so fw-external is not needed
pbl-firmware-$(CONFIG_ARCH_RK3568) += rk3568-bl32.bin
pbl-firmware-$(CONFIG_ARCH_RK3588) += rk3588-bl32.bin
-pbl-firmware-$(CONFIG_ARCH_RK3399) += rk3399-bl32.bin
endif
firmware-$(CONFIG_FIRMWARE_NEXT_IMAGE) += next-image.bin
diff --git a/include/mach/rockchip/atf.h b/include/mach/rockchip/atf.h
index db00dc7119..f4f819f4dc 100644
--- a/include/mach/rockchip/atf.h
+++ b/include/mach/rockchip/atf.h
@@ -38,11 +38,9 @@
#ifndef __ASSEMBLY__
#ifdef CONFIG_ARCH_ROCKCHIP_ATF
-void rk3399_atf_load_bl31(void *fdt);
void rk3568_atf_load_bl31(void *fdt);
void rk3588_atf_load_bl31(void *fdt);
#else
-static inline void rk3399_atf_load_bl31(void *fdt) { }
static inline void rk3568_atf_load_bl31(void *fdt) { }
static inline void rk3588_atf_load_bl31(void *fdt) { }
#endif
--
2.39.1
