1. 11 Aug, 2021 2 commits
    • Artem Lapkin's avatar
      rk3399: boot_devices fix spinor node name · e8a663cc
      Artem Lapkin authored and Kever Yang's avatar Kever Yang committed
      
      
      Problem: board_spl_was_booted_from return wrong boot_devices[3] value
      /spi@ff1d0000 and same-as-spl dont work properly for SPINOR flash
      because arch/arm/mach-rockchip/spl-boot-order.c spl_node_to_boot_device
      need parse SPINOR flash node as UCLASS_SPI_FLASH
      
      spl-boot-order: same-as-spl > *** BOOT_SOURCE_ID 3 (2:emmc 3:spi 5:sd ...
      /spi@ff1d0000 > board_boot_order: could not map node @618 to a boot-device
      /sdhci@fe330000 > /mmc@fe320000
      
      Solution: just change it to /spi@ff1d0000/flash@0
      
      spl-boot-order: same-as-spl > *** BOOT_SOURCE_ID 3 (2:emmc 3:spi 5:sd ...
      /spi@ff1d0000/flash@0 > /sdhci@fe330000 > /mmc@fe320000
      Signed-off-by: default avatarArtem Lapkin <art@khadas.com>
      Reviewed-by: Kever Yang's avatarKever Yang <kever.yang@rock-chips.com>
      e8a663cc
    • Alex Bee's avatar
      rockchip: Fix MMC boot order · b212ad24
      Alex Bee authored and Kever Yang's avatar Kever Yang committed
      
      
      Basically all, i.e. rk3036.dtsi, rk3128.dtsi, rk3xxx.dtsi, rk322x.dtsi,
      rk3288.dtsi, rk3308-u-boot.dtsi, rk3328-u-boot.dtsi, rk3399-u-boot.dtsi
      and px30-u-boot.dtsi Rockchip SoC devicetrees which have mmc indexes
      are defining eMMC as mmc0 and sdmmc as mmc1.
      This means that the rule to try to boot from the SD card first is ignored,
      which as per comment is what we want and is important for distros, which
      rely on that.
      
      Fix this by setting the correct mmc index, i.e. first from mmc1 (SD card),
      second from mmc0 (eMMC).
      Signed-off-by: default avatarAlex Bee <knaerzche@gmail.com>
      Reviewed-by: Kever Yang's avatarKever Yang <kever.yang@rock-chips.com>
      b212ad24
  2. 10 Aug, 2021 1 commit
  3. 09 Aug, 2021 37 commits