From 01c6c01c5d69eca1469b909a118849f3d77ff150 Mon Sep 17 00:00:00 2001 From: meilimao Date: Mon, 15 Dec 2025 18:01:47 +0000 Subject: [PATCH] arm64: dts: rockchip: overlays: Remove the uboot SCR script For platforms specific to using mainline U-Boot, we have removed the content related to the U-boot src script to avoid problems during the build process. Signed-off-by: meilimao --- arch/arm64/boot/dts/rockchip/overlay/Makefile | 10 ++- .../dts/rockchip/overlay/rk3588-fixup.scr-cmd | 62 ------------------- 2 files changed, 4 insertions(+), 68 deletions(-) delete mode 100644 arch/arm64/boot/dts/rockchip/overlay/rk3588-fixup.scr-cmd diff --git a/arch/arm64/boot/dts/rockchip/overlay/Makefile b/arch/arm64/boot/dts/rockchip/overlay/Makefile index 90dddfdf35ee..43a9cae85f46 100644 --- a/arch/arm64/boot/dts/rockchip/overlay/Makefile +++ b/arch/arm64/boot/dts/rockchip/overlay/Makefile @@ -1,3 +1,4 @@ + # SPDX-License-Identifier: GPL-2.0 dtbo-$(CONFIG_ARCH_ROCKCHIP) += \ rk3588-i2c1-m2.dtbo \ @@ -110,13 +111,10 @@ dtbo-$(CONFIG_ARCH_ROCKCHIP) += \ rk3588-opicm5-tablet-lcd.dtbo \ rk3588-opicm5-tablet-disable-leds.dtbo -scr-$(CONFIG_ARCH_ROCKCHIP) += \ - rk3588-fixup.scr - dtbotxt-$(CONFIG_ARCH_ROCKCHIP) += \ README.rockchip-overlays -targets += $(dtbo-y) $(scr-y) $(dtbotxt-y) +targets += $(dtbo-y) $(dtbotxt-y) -always-y := $(dtbo-y) $(scr-y) $(dtbotxt-y) -clean-files := *.dtbo *.scr +always-y := $(dtbo-y) $(dtbotxt-y) +clean-files := *.dtbo diff --git a/arch/arm64/boot/dts/rockchip/overlay/rk3588-fixup.scr-cmd b/arch/arm64/boot/dts/rockchip/overlay/rk3588-fixup.scr-cmd deleted file mode 100644 index 1768b54448d6..000000000000 --- a/arch/arm64/boot/dts/rockchip/overlay/rk3588-fixup.scr-cmd +++ /dev/null @@ -1,62 +0,0 @@ -# overlays fixup script -# implements (or rather substitutes) overlay arguments functionality -# using u-boot scripting, environment variables and "fdt" command - -#setenv decompose_pin 'setexpr tmp_pinctrl sub "GPIO(0|1|2|3|4)_\\S\\d+" "\\1"; -#setexpr tmp_bank sub "GPIO\\d_(\\S)\\d+" "\\1"; -#test "${tmp_bank}" = "A" && setenv tmp_bank 0; -#test "${tmp_bank}" = "B" && setenv tmp_bank 1; -#test "${tmp_bank}" = "C" && setenv tmp_bank 2; -#test "${tmp_bank}" = "D" && setenv tmp_bank 3; -#setexpr tmp_pin sub "GPIO\\d_\\S(\\d+)" "\\1"; -#setexpr tmp_bank ${tmp_bank} * 8; -#setexpr tmp_pin ${tmp_bank} + ${tmp_pin}' -# -# -#if test -n "${param_spinor_spi_bus}"; then -# test "${param_spinor_spi_bus}" = "0" && setenv tmp_spi_path "spi@ff1c0000" -# test "${param_spinor_spi_bus}" = "1" && setenv tmp_spi_path "spi@ff1d0000" -# test "${param_spinor_spi_bus}" = "2" && setenv tmp_spi_path "spi@ff1e0000" -# test "${param_spinor_spi_bus}" = "3" && setenv tmp_spi_path "spi@ff1f0000" -# fdt set /${tmp_spi_path} status "okay" -# fdt set /${tmp_spi_path}/spiflash@0 status "okay" -# if test -n "${param_spinor_max_freq}"; then -# fdt set /${tmp_spi_path}/spiflash@0 spi-max-frequency "<${param_spinor_max_freq}>" -# fi -# if test "${param_spinor_spi_cs}" = "1"; then -# fdt set /${tmp_spi_path}/spiflash@0 reg "<1>" -# fi -# env delete tmp_spi_path -#fi -# -#if test -n "${param_spidev_spi_bus}"; then -# test "${param_spidev_spi_bus}" = "0" && setenv tmp_spi_path "spi@ff1c0000" -# test "${param_spidev_spi_bus}" = "1" && setenv tmp_spi_path "spi@ff1d0000" -# test "${param_spidev_spi_bus}" = "2" && setenv tmp_spi_path "spi@ff1e0000" -# test "${param_spidev_spi_bus}" = "3" && setenv tmp_spi_path "spi@ff1f0000" -# fdt set /${tmp_spi_path} status "okay" -# fdt set /${tmp_spi_path}/spidev status "okay" -# if test -n "${param_spidev_max_freq}"; then -# fdt set /${tmp_spi_path}/spidev spi-max-frequency "<${param_spidev_max_freq}>" -# fi -# if test "${param_spidev_spi_cs}" = "1"; then -# fdt set /${tmp_spi_path}/spidev reg "<1>"; -# fi -#fi -# -#if test -n "${param_w1_pin}"; then -# setenv tmp_pinctrl "${param_w1_pin}" -# setenv tmp_bank "${param_w1_pin}" -# setenv tmp_pin "${param_w1_pin}" -# run decompose_pin -# #echo "${param_w1_pin} ---> pinctrl = ${tmp_pinctrl}" -# #echo "${param_w1_pin} ---> bank = ${tmp_bank}" -# #echo "${param_w1_pin} ---> pin = ${tmp_pin}" -# fdt get value tmp_pinctrl /__symbols__ gpio${tmp_pinctrl} -# #echo "${param_w1_pin} ---> tmp_pinctrl = ${tmp_pinctrl}" -# fdt get value tmp_phandle ${tmp_pinctrl} phandle -# #echo "${param_w1_pin} ---> tmp_phandle = ${tmp_phandle}" -# fdt set /onewire@0 gpios "<${tmp_phandle} 0x000000${tmp_pin} 0 0>" -# env delete tmp_pinctrl tmp_bank tmp_pin tmp_phandle -#fi -#