]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
rockchip: rk3399: Fix loading FIT from SD-card when booting from eMMC
authorJonas Karlman <jonas@kwiboo.se>
Tue, 30 Apr 2024 15:30:24 +0000 (15:30 +0000)
committerKever Yang <kever.yang@rock-chips.com>
Tue, 7 May 2024 07:56:08 +0000 (15:56 +0800)
When RK3399 boards run SPL from eMMC and fail to load FIT from eMMC due
to it being missing or checksum validation fails there can be a fallback
to read FIT from SD-card. However, without proper pinctrl configuration
reading FIT from SD-card may fail:

  U-Boot SPL 2024.04-rc4 (Mar 17 2024 - 22:54:45 +0000)
  Trying to boot from MMC2
  mmc_load_image_raw_sector: mmc block read error
  Trying to boot from MMC2
  mmc_load_image_raw_sector: mmc block read error
  Trying to boot from MMC1
  Card did not respond to voltage select! : -110
  mmc_init: -95, time 12
  spl: mmc init failed with error: -95
  SPL: failed to boot from all boot devices (err=-6)
  ### ERROR ### Please RESET the board ###

Fix this by tagging related sdhci, sdmmc and spi flash pinctrl nodes
with bootph props. Also move bootph for common nodes shared by all
boards to the SoC u-boot.dtsi.

eMMC, SD-Card and SPI flash nodes are also changed to only be tagged
with bootph props for SPL and U-Boot pre-reloc phases.

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
35 files changed:
arch/arm/dts/rk3399-ficus-u-boot.dtsi
arch/arm/dts/rk3399-gru-u-boot.dtsi
arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi
arch/arm/dts/rk3399-roc-pc-u-boot.dtsi
arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi
arch/arm/dts/rk3399-rock960-u-boot.dtsi
arch/arm/dts/rk3399-rockpro64-u-boot.dtsi
arch/arm/dts/rk3399-u-boot.dtsi
configs/eaidk-610-rk3399_defconfig
configs/evb-rk3399_defconfig
configs/ficus-rk3399_defconfig
configs/firefly-rk3399_defconfig
configs/khadas-edge-captain-rk3399_defconfig
configs/khadas-edge-rk3399_defconfig
configs/khadas-edge-v-rk3399_defconfig
configs/leez-rk3399_defconfig
configs/nanopc-t4-rk3399_defconfig
configs/nanopi-m4-2gb-rk3399_defconfig
configs/nanopi-m4-rk3399_defconfig
configs/nanopi-m4b-rk3399_defconfig
configs/nanopi-neo4-rk3399_defconfig
configs/nanopi-r4s-rk3399_defconfig
configs/orangepi-rk3399_defconfig
configs/pinebook-pro-rk3399_defconfig
configs/pinephone-pro-rk3399_defconfig
configs/roc-pc-mezzanine-rk3399_defconfig
configs/roc-pc-rk3399_defconfig
configs/rock-4c-plus-rk3399_defconfig
configs/rock-4se-rk3399_defconfig
configs/rock-pi-4-rk3399_defconfig
configs/rock-pi-4c-rk3399_defconfig
configs/rock-pi-n10-rk3399pro_defconfig
configs/rock960-rk3399_defconfig
configs/rockpro64-rk3399_defconfig

index 67b63a835238b075610a1f2023bf5ec445b81bc6..ac924d6dc592d9e81dce07c8a996c2c48a5ce045 100644 (file)
@@ -5,3 +5,13 @@
 
 #include "rk3399-u-boot.dtsi"
 #include "rk3399-sdram-ddr3-1600.dtsi"
+
+&pcfg_pull_none_18ma {
+       bootph-pre-ram;
+       bootph-some-ram;
+};
+
+&pcfg_pull_up_8ma {
+       bootph-pre-ram;
+       bootph-some-ram;
+};
index b1604a6872c018fc7261f82781c86f32c6389aea..0cc40eb6d6f652cf76d1b074c3fee0cd939fa729 100644 (file)
        enable-gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>;
 };
 
+&sdhci {
+       /delete-property/ bootph-pre-ram;
+};
+
+&sdmmc {
+       /delete-property/ bootph-pre-ram;
+};
+
+&sdmmc_bus4 {
+       /delete-property/ bootph-pre-ram;
+};
+
+&sdmmc_cd {
+       /delete-property/ bootph-pre-ram;
+};
+
+&sdmmc_clk {
+       /delete-property/ bootph-pre-ram;
+};
+
+&sdmmc_cmd {
+       /delete-property/ bootph-pre-ram;
+};
+
 &spi5 {
        spi-activate-delay = <100>;
        spi-max-frequency = <3000000>;
index 56fdaf440aea5edf5e48da443e07d0acc40d652b..17af95a114fc9a9a462af5c657f27de2e18a276d 100644 (file)
@@ -19,7 +19,8 @@
 };
 
 &spiflash {
-       bootph-all;
+       bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &vdd_log {
index d1912a2ef6a966cd4d1e0053649c58ce6580af57..1930e5e1035386a09ed0744cfac87256689e2064 100644 (file)
 };
 
 &norflash {
-       bootph-all;
-};
-
-&pcfg_pull_none {
-       bootph-all;
-};
-
-&pcfg_pull_up {
-       bootph-all;
-};
-
-&sdmmc_bus4 {
-       bootph-all;
-};
-
-&sdmmc_clk {
-       bootph-all;
-};
-
-&sdmmc_cmd {
-       bootph-all;
+       bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &uart0 {
index 58a3c0afcddd6e3d85b7c2f80072528706ceae1b..d40daacc7823d48fbb461506eaf92283b080cf32 100644 (file)
@@ -33,8 +33,9 @@
 };
 
 &spi1 {
-       spi_flash: flash@0 {
-               bootph-all;
+       flash@0 {
+               bootph-pre-ram;
+               bootph-some-ram;
        };
 };
 
index 5c1c451b8f85f720292dba40947d4b1b19945000..44dab14dc211049125e1efb37d5e46a3e8c0307c 100644 (file)
@@ -3,3 +3,13 @@
  * Copyright (c) 2023 Radxa Limited
  */
 #include "rk3399-rock-pi-4-u-boot.dtsi"
+
+&pcfg_pull_none_18ma {
+       bootph-pre-ram;
+       bootph-some-ram;
+};
+
+&pcfg_pull_up_8ma {
+       bootph-pre-ram;
+       bootph-some-ram;
+};
index 55716ba4df733b98eabcd60ab99dcd8302fff33a..ef08d8987cee8fce093592b5de8342a96174cd14 100644 (file)
                vin-supply = <&vcc5v0_sys>;
        };
 };
+
+&pcfg_pull_none_18ma {
+       bootph-pre-ram;
+       bootph-some-ram;
+};
+
+&pcfg_pull_up_8ma {
+       bootph-pre-ram;
+       bootph-some-ram;
+};
index b15e5392c3cfd4752f79605ea1bedfd435b09445..e280739057df5aaccc91710384bdd5ef384a8072 100644 (file)
@@ -26,8 +26,6 @@
                         };
                 };
         };
-
-
 };
 
 &sdhci {
@@ -36,8 +34,9 @@
 };
 
 &spi1 {
-       spi_flash: flash@0 {
-               bootph-all;
+       flash@0 {
+               bootph-pre-ram;
+               bootph-some-ram;
        };
 };
 
index b39fe39fa2b373ec82648b120033af423266aee0..4298552dd9993a370ef56feda9ca0f4984c0f7e7 100644 (file)
 };
 
 &emmc_phy {
-       bootph-all;
+       bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &grf {
        bootph-all;
 };
 
+&pcfg_pull_none {
+       bootph-all;
+};
+
+&pcfg_pull_up {
+       bootph-all;
+};
+
 &pinctrl {
        bootph-all;
 };
 };
 
 &sdhci {
-       bootph-all;
+       bootph-pre-ram;
+       bootph-some-ram;
        max-frequency = <200000000>;
 
        /* mmc to sram can't do dma, prevent aborts transferring TF-A parts */
 };
 
 &sdmmc {
-       bootph-all;
+       bootph-pre-ram;
+       bootph-some-ram;
 
        /* mmc to sram can't do dma, prevent aborts transferring TF-A parts */
        u-boot,spl-fifo-mode;
 };
 
-&spi1 {
-       bootph-all;
+&sdmmc_bus4 {
+       bootph-pre-ram;
+       bootph-some-ram;
+};
+
+&sdmmc_cd {
+       bootph-pre-ram;
+       bootph-some-ram;
+};
+
+&sdmmc_clk {
+       bootph-pre-ram;
+       bootph-some-ram;
+};
+
+&sdmmc_cmd {
+       bootph-pre-ram;
+       bootph-some-ram;
+};
+
+&spi1_clk {
+       bootph-pre-ram;
+       bootph-some-ram;
+};
+
+&spi1_cs0 {
+       bootph-pre-ram;
+       bootph-some-ram;
+};
+
+&spi1_rx {
+       bootph-pre-ram;
+       bootph-some-ram;
+};
+
+&spi1_tx {
+       bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &uart2 {
index 4d8b495ccfec5674d4351af0dad1ac38e9324386..eba6f90c605bd73d9bd210594eed1d69af8e5aea 100644 (file)
@@ -25,7 +25,7 @@ CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_TIME=y
 CONFIG_SPL_OF_CONTROL=y
-CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ROCKCHIP_GPIO=y
index c4936768ffb6ce9de3a64f7d74fb816285e8649f..afb79987464f2db04663e7b430839870301f18e4 100644 (file)
@@ -27,7 +27,7 @@ CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_TIME=y
 CONFIG_SPL_OF_CONTROL=y
-CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NET_RANDOM_ETHADDR=y
index 3bcd0fd66b91d408e508ae97bcc6d6cf47bec054..f4e3ebba8f4677ccd0fcf8650e2cef83bd9566ec 100644 (file)
@@ -25,7 +25,7 @@ CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_TIME=y
 CONFIG_SPL_OF_CONTROL=y
-CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SYS_MMC_ENV_DEV=1
index 8f68ffbd3a4966df3e4f5269f69e99c51fd2b93c..db98926b627aeec3301df981b8aeb32e2c73ee6e 100644 (file)
@@ -29,7 +29,7 @@ CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_TIME=y
 CONFIG_SPL_OF_CONTROL=y
-CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ROCKCHIP_GPIO=y
index 310250ed4a528b543b7e4ff54baf57c349a22f16..230b9d7964427e5c8181a45eed1c99a777a73f72 100644 (file)
@@ -27,7 +27,7 @@ CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_TIME=y
 CONFIG_SPL_OF_CONTROL=y
-CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NET_RANDOM_ETHADDR=y
index 3fe5542d1256595ef84facccb2f97629c19122c3..9f13cbf583988d7ac0dd8e0ff270d47d187dae6e 100644 (file)
@@ -27,7 +27,7 @@ CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_TIME=y
 CONFIG_SPL_OF_CONTROL=y
-CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ROCKCHIP_GPIO=y
index 4b41454d710da4f366c81c2aa719f98e1445d36a..abc4f2054cfdb5f45b515ef0d51fa5d355df3033 100644 (file)
@@ -27,7 +27,7 @@ CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_TIME=y
 CONFIG_SPL_OF_CONTROL=y
-CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NET_RANDOM_ETHADDR=y
index 2831cfb366895f5651ffaff5730b41ba11caca45..13453e5234446b46f171907d425f9607e8bd7362 100644 (file)
@@ -25,7 +25,7 @@ CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_TIME=y
 CONFIG_SPL_OF_CONTROL=y
-CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ROCKCHIP_GPIO=y
index cdfacb66e6783f35c650df9bda9c460f411f8f7b..f935716ccf478862670b99e17fc450894c87cfbd 100644 (file)
@@ -28,7 +28,7 @@ CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_TIME=y
 CONFIG_SPL_OF_CONTROL=y
-CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ROCKCHIP_GPIO=y
index 51596f57ae35dc064562d213330b05fae568867e..d142b702ce89bd9c70e1b35bde4c7b8eaaaed540 100644 (file)
@@ -25,7 +25,7 @@ CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_TIME=y
 CONFIG_SPL_OF_CONTROL=y
-CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ROCKCHIP_GPIO=y
index 2af84fb6ff1705f27105818ebcc29fe8dd574ef8..8ce879da4c07b5a56cd2016847e143e3d24f8ad5 100644 (file)
@@ -25,7 +25,7 @@ CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_TIME=y
 CONFIG_SPL_OF_CONTROL=y
-CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ROCKCHIP_GPIO=y
index 1b76f98e0df7cac7732827f92afa33da87c50a69..33ef74a1f6909bb8756eaedce6c89a5f3b62085a 100644 (file)
@@ -25,7 +25,7 @@ CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_TIME=y
 CONFIG_SPL_OF_CONTROL=y
-CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ROCKCHIP_GPIO=y
index c176c5a121111e11ef5c9c9a0ca9fb0ed1f03dc1..45a7d0a3257d70f370375f6e56a78518d655e902 100644 (file)
@@ -25,7 +25,7 @@ CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_TIME=y
 CONFIG_SPL_OF_CONTROL=y
-CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ROCKCHIP_GPIO=y
index ea01d323541b993fb21468d1c521a6542f6871fc..a666547fe5975687e25169a29d99b21d69849679 100644 (file)
@@ -25,7 +25,7 @@ CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_TIME=y
 CONFIG_SPL_OF_CONTROL=y
-CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ROCKCHIP_GPIO=y
index c6a92b2decf327ad46f74f6c8a5b0b50fa089e0d..337eeab8b42bd2521b157d6565eb6667cdc8df8d 100644 (file)
@@ -25,7 +25,7 @@ CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_TIME=y
 CONFIG_SPL_OF_CONTROL=y
-CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ROCKCHIP_GPIO=y
index e4aad1b710cbcadee042c5dcc4cd74c88956ada0..a250624dfaa9b0a44daf3ab1829e9a4b5765eea7 100644 (file)
@@ -41,7 +41,7 @@ CONFIG_CMD_TIME=y
 CONFIG_CMD_PMIC=y
 CONFIG_CMD_REGULATOR=y
 CONFIG_SPL_OF_CONTROL=y
-CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
index 285c47d76b6e1b62b682bec6ab883c49c6976a34..dcdac6b32d6d4e8e106b9c8d2cb5d481bf6b4216 100644 (file)
@@ -40,7 +40,7 @@ CONFIG_CMD_TIME=y
 CONFIG_CMD_PMIC=y
 CONFIG_CMD_REGULATOR=y
 CONFIG_SPL_OF_CONTROL=y
-CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
index 1ff4e15c8c1008d39581382988d0ab582f1a0407..f281df6c1b1209d6f2beb82e997ca03ca23ad463 100644 (file)
@@ -38,7 +38,7 @@ CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_TIME=y
 CONFIG_SPL_OF_CONTROL=y
-CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
index 5d6e6b17091fbcae263a66ac7aa32b93a91d1ce9..0d4a03db9e65bd45dd1a9db5c0b7c49d800de2af 100644 (file)
@@ -38,7 +38,7 @@ CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_TIME=y
 CONFIG_SPL_OF_CONTROL=y
-CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
index 6c69e8bdcb9201c9aebd8251e20774264e4a5d14..2024defb2bf0df0e689da5235b51bebc59743f4b 100644 (file)
@@ -34,7 +34,7 @@ CONFIG_CMD_USB_MASS_STORAGE=y
 CONFIG_CMD_EFIDEBUG=y
 CONFIG_CMD_TIME=y
 CONFIG_SPL_OF_CONTROL=y
-CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DFU_MMC=y
index e5ed81022bd6f351a12bcd6a2c6fd925fb51b7e5..9b2303fdf792f2bc5768c9e8c4a0590516be3902 100644 (file)
@@ -33,7 +33,7 @@ CONFIG_CMD_USB_MASS_STORAGE=y
 CONFIG_CMD_EFIDEBUG=y
 CONFIG_CMD_TIME=y
 CONFIG_SPL_OF_CONTROL=y
-CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DFU_MMC=y
index 2801becedb4bc0616e764b3d09710c4c6db1161e..6cf445dd6338dddf46eb3768342d4e78fd26f234 100644 (file)
@@ -40,7 +40,7 @@ CONFIG_CMD_USB_MASS_STORAGE=y
 CONFIG_CMD_EFIDEBUG=y
 CONFIG_CMD_TIME=y
 CONFIG_SPL_OF_CONTROL=y
-CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
index 72d37bff9e9a0819603c629b198d5cf584739bac..4a9d1c531c10e6348d9c88f16a94f251f6b1e98d 100644 (file)
@@ -34,7 +34,7 @@ CONFIG_CMD_USB_MASS_STORAGE=y
 CONFIG_CMD_EFIDEBUG=y
 CONFIG_CMD_TIME=y
 CONFIG_SPL_OF_CONTROL=y
-CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DFU_MMC=y
index 6889cdcbf7d88169c9835f751153ff2102ace548..234d0c9ab0f5d2cc592dee6b2e0a4754ae1790f8 100644 (file)
@@ -31,7 +31,7 @@ CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_TIME=y
 CONFIG_SPL_OF_CONTROL=y
-CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ROCKCHIP_GPIO=y
index 7a4a3df85b1be4ff8739bb7ec2e11faf6c57993b..3b5ab7dc5781d666dea90619a9c0c49b21e703a1 100644 (file)
@@ -33,7 +33,7 @@ CONFIG_CMD_TIME=y
 CONFIG_CMD_PMIC=y
 CONFIG_CMD_REGULATOR=y
 CONFIG_SPL_OF_CONTROL=y
-CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SYS_MMC_ENV_DEV=1
index 368ef7c4b5dbc943a2b5b6c2f557a15df333bb56..6c829089fd912f8f8706a39685112fb1fef3d4a0 100644 (file)
@@ -38,7 +38,7 @@ CONFIG_CMD_USB=y
 CONFIG_CMD_TIME=y
 CONFIG_CMD_BOOTSTAGE=y
 CONFIG_SPL_OF_CONTROL=y
-CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SPL_DM_SEQ_ALIAS=y