314-mt7981-select-rootdisk.patch 2.6 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102
  1. --- a/board/mediatek/mt7981/mt7981_rfb.c
  2. +++ b/board/mediatek/mt7981/mt7981_rfb.c
  3. @@ -11,7 +11,9 @@
  4. #include <env.h>
  5. #include <init.h>
  6. #include <asm/global_data.h>
  7. +#include <asm/io.h>
  8. #include <linux/delay.h>
  9. +#include <linux/libfdt.h>
  10. #ifndef CONFIG_RESET_BUTTON_LABEL
  11. #define CONFIG_RESET_BUTTON_LABEL "reset"
  12. @@ -81,3 +83,54 @@ int board_nmbm_init(void)
  13. return 0;
  14. }
  15. +
  16. +#define MT7981_BOOT_NOR 0
  17. +#define MT7981_BOOT_SPIM_NAND 1 /* ToDo: fallback to SD */
  18. +#define MT7981_BOOT_EMMC 2
  19. +#define MT7981_BOOT_SNFI_NAND 3 /* ToDo (treated as SD) */
  20. +
  21. +int ft_system_setup(void *blob, struct bd_info *bd)
  22. +{
  23. + const u32 *media_handle_p;
  24. + int chosen, len, ret;
  25. + const char *media;
  26. + u32 media_handle;
  27. +
  28. + switch ((readl(0x11d006f0) & 0xc0) >> 6) {
  29. + case MT7981_BOOT_NOR:
  30. + media = "rootdisk-nor";
  31. + break
  32. + ;;
  33. + case MT7981_BOOT_SPIM_NAND:
  34. + media = "rootdisk-spim-nand";
  35. + break
  36. + ;;
  37. + case MT7981_BOOT_EMMC:
  38. + media = "rootdisk-emmc";
  39. + break
  40. + ;;
  41. + case MT7981_BOOT_SNFI_NAND:
  42. + media = "rootdisk-sd";
  43. + break
  44. + ;;
  45. + }
  46. +
  47. + chosen = fdt_path_offset(blob, "/chosen");
  48. + if (chosen <= 0)
  49. + return 0;
  50. +
  51. + media_handle_p = fdt_getprop(blob, chosen, media, &len);
  52. + if (media_handle_p <= 0 || len != 4)
  53. + return 0;
  54. +
  55. + media_handle = *media_handle_p;
  56. + ret = fdt_setprop(blob, chosen, "rootdisk", &media_handle, sizeof(media_handle));
  57. + if (ret) {
  58. + printf("cannot set media phandle %s as rootdisk /chosen node\n", media);
  59. + return ret;
  60. + }
  61. +
  62. + printf("set /chosen/rootdisk to bootrom media: %s (phandle 0x%08x)\n", media, fdt32_to_cpu(media_handle));
  63. +
  64. + return 0;
  65. +}
  66. --- a/configs/mt7981_emmc_rfb_defconfig
  67. +++ b/configs/mt7981_emmc_rfb_defconfig
  68. @@ -114,3 +114,4 @@ CONFIG_FAT_WRITE=y
  69. CONFIG_HEXDUMP=y
  70. # CONFIG_EFI_LOADER is not set
  71. CONFIG_LMB_MAX_REGIONS=64
  72. +CONFIG_OF_SYSTEM_SETUP=y
  73. --- a/configs/mt7981_nor_rfb_defconfig
  74. +++ b/configs/mt7981_nor_rfb_defconfig
  75. @@ -126,3 +126,4 @@ CONFIG_DM_SPI=y
  76. CONFIG_MTK_SPIM=y
  77. CONFIG_HEXDUMP=y
  78. CONFIG_LMB_MAX_REGIONS=64
  79. +CONFIG_OF_SYSTEM_SETUP=y
  80. --- a/configs/mt7981_rfb_defconfig
  81. +++ b/configs/mt7981_rfb_defconfig
  82. @@ -134,3 +134,4 @@ CONFIG_DM_SPI=y
  83. CONFIG_MTK_SPIM=y
  84. CONFIG_HEXDUMP=y
  85. CONFIG_LMB_MAX_REGIONS=64
  86. +CONFIG_OF_SYSTEM_SETUP=y
  87. --- a/configs/mt7981_sd_rfb_defconfig
  88. +++ b/configs/mt7981_sd_rfb_defconfig
  89. @@ -114,3 +114,4 @@ CONFIG_FAT_WRITE=y
  90. CONFIG_HEXDUMP=y
  91. # CONFIG_EFI_LOADER is not set
  92. CONFIG_LMB_MAX_REGIONS=64
  93. +CONFIG_OF_SYSTEM_SETUP=y
  94. --- a/configs/mt7981_snfi_nand_rfb_defconfig
  95. +++ b/configs/mt7981_snfi_nand_rfb_defconfig
  96. @@ -119,3 +119,4 @@ CONFIG_DM_SERIAL=y
  97. CONFIG_MTK_SERIAL=y
  98. CONFIG_HEXDUMP=y
  99. CONFIG_LMB_MAX_REGIONS=64
  100. +CONFIG_OF_SYSTEM_SETUP=y