0002-Forward-port-parabola-patch.patch 5.8 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114
  1. From ab424dd74098de8e8704c238d305f0983016c8cf Mon Sep 17 00:00:00 2001
  2. From: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
  3. Date: Wed, 22 Mar 2017 11:48:58 +0100
  4. Subject: [PATCH 2/3] Forward-port parabola patch
  5. Like in the original patch:
  6. - The default boot partition is changed
  7. - The kernel image name has been changed to comply with parabola naming
  8. - An initrd path has been added
  9. - A base directory where to find the dtb has been added.
  10. Here's are the sed scripts that I ran to help do that:
  11. sed 's#setenv fdtbase #setenv fdtbase ${fdtdir}/#g' -i include/configs/am335x_evm.h
  12. sed 's#setenv fdtfile #setenv fdtfile ${fdtdir}/#g' -i include/configs/am335x_evm.h
  13. Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
  14. ---
  15. include/configs/am335x_evm.h | 47 +++++++++++++++++++++++---------------------
  16. 1 file changed, 25 insertions(+), 22 deletions(-)
  17. diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
  18. index 399b25f47a..1a7d3e88a3 100644
  19. --- a/include/configs/am335x_evm.h
  20. +++ b/include/configs/am335x_evm.h
  21. @@ -105,10 +105,13 @@
  22. DEFAULT_LINUX_BOOT_ENV \
  23. DEFAULT_MMC_TI_ARGS \
  24. DEFAULT_FIT_TI_ARGS \
  25. - "bootpart=0:2\0" \
  26. + "bootpart=0:1\0" \
  27. "bootdir=/boot\0" \
  28. - "bootfile=zImage\0" \
  29. + "bootfile=vmlinuz-linux-libre\0" \
  30. + "ramdiskfile=initramfs-linux-libre.img\0" \
  31. "fdtfile=undefined\0" \
  32. + "fdtdir=/boot/dtbs/linux-libre\0" \
  33. + "rdfile=initramfs-linux-libre.img\0" \
  34. "console=ttyO0,115200n8\0" \
  35. "partitions=" \
  36. "uuid_disk=${uuid_gpt_disk};" \
  37. @@ -141,50 +144,50 @@
  38. "findfdt="\
  39. "echo board_name=[$board_name] ...; " \
  40. "if test $board_name = A335BONE; then " \
  41. - "setenv fdtfile am335x-bone.dtb; setenv fdtbase am335x-bone; fi; " \
  42. + "setenv fdtfile ${fdtdir}/am335x-bone.dtb; setenv fdtbase ${fdtdir}/am335x-bone; fi; " \
  43. "if test $board_name = A335BNLT; then " \
  44. "echo board_rev=[$board_rev] ...; " \
  45. "if test $board_rev = GH01; then " \
  46. - "setenv fdtfile am335x-boneblack.dtb; setenv fdtbase am335x-boneblack; " \
  47. + "setenv fdtfile ${fdtdir}/am335x-boneblack.dtb; setenv fdtbase ${fdtdir}/am335x-boneblack; " \
  48. "elif test $board_rev = BBG1; then " \
  49. - "setenv fdtfile am335x-bonegreen.dtb; setenv fdtbase am335x-bonegreen; " \
  50. + "setenv fdtfile ${fdtdir}/am335x-bonegreen.dtb; setenv fdtbase ${fdtdir}/am335x-bonegreen; " \
  51. "elif test $board_rev = BP00; then " \
  52. - "setenv fdtfile am335x-pocketbone.dtb; setenv fdtbase am335x-pocketbone; " \
  53. + "setenv fdtfile ${fdtdir}/am335x-pocketbone.dtb; setenv fdtbase ${fdtdir}/am335x-pocketbone; " \
  54. "elif test $board_rev = GW1A; then " \
  55. - "setenv fdtfile am335x-bonegreen-wireless.dtb; setenv fdtbase am335x-bonegreen-wireless; " \
  56. + "setenv fdtfile ${fdtdir}/am335x-bonegreen-wireless.dtb; setenv fdtbase ${fdtdir}/am335x-bonegreen-wireless; " \
  57. "elif test $board_rev = AIA0; then " \
  58. - "setenv fdtfile am335x-abbbi.dtb; setenv fdtbase am335x-abbbi; " \
  59. + "setenv fdtfile ${fdtdir}/am335x-abbbi.dtb; setenv fdtbase ${fdtdir}/am335x-abbbi; " \
  60. "elif test $board_rev = EIA0; then " \
  61. - "setenv fdtfile am335x-boneblack.dtb; setenv fdtbase am335x-boneblack; " \
  62. + "setenv fdtfile ${fdtdir}/am335x-boneblack.dtb; setenv fdtbase ${fdtdir}/am335x-boneblack; " \
  63. "elif test $board_rev = SE0A; then " \
  64. - "setenv fdtfile am335x-sancloud-bbe.dtb; setenv fdtbase am335x-sancloud-bbe; " \
  65. + "setenv fdtfile ${fdtdir}/am335x-sancloud-bbe.dtb; setenv fdtbase ${fdtdir}/am335x-sancloud-bbe; " \
  66. "elif test $board_rev = ME06; then " \
  67. - "setenv fdtfile am335x-bonegreen.dtb; setenv fdtbase am335x-bonegreen; " \
  68. + "setenv fdtfile ${fdtdir}/am335x-bonegreen.dtb; setenv fdtbase ${fdtdir}/am335x-bonegreen; " \
  69. "elif test $board_rev = M10A; then " \
  70. - "setenv fdtfile am335x-vsc8531bbb.dtb; setenv fdtbase am335x-vsc8531bbb; " \
  71. + "setenv fdtfile ${fdtdir}/am335x-vsc8531bbb.dtb; setenv fdtbase ${fdtdir}/am335x-vsc8531bbb; " \
  72. "else " \
  73. - "setenv fdtfile am335x-boneblack.dtb; setenv fdtbase am335x-boneblack; " \
  74. + "setenv fdtfile ${fdtdir}/am335x-boneblack.dtb; setenv fdtbase ${fdtdir}/am335x-boneblack; " \
  75. "fi; " \
  76. "fi; " \
  77. "if test $board_name = BBG1; then " \
  78. - "setenv fdtfile am335x-bonegreen.dtb; setenv fdtbase am335x-bonegreen; fi; " \
  79. + "setenv fdtfile ${fdtdir}/am335x-bonegreen.dtb; setenv fdtbase ${fdtdir}/am335x-bonegreen; fi; " \
  80. "if test $board_name = BBBW; then " \
  81. - "setenv fdtfile am335x-boneblack-wireless.dtb; setenv fdtbase am335x-boneblack-wireless; fi; " \
  82. + "setenv fdtfile ${fdtdir}/am335x-boneblack-wireless.dtb; setenv fdtbase ${fdtdir}/am335x-boneblack-wireless; fi; " \
  83. "if test $board_name = BBBL; then " \
  84. - "setenv fdtfile am335x-boneblue.dtb; setenv fdtbase am335x-boneblue; fi; " \
  85. + "setenv fdtfile ${fdtdir}/am335x-boneblue.dtb; setenv fdtbase ${fdtdir}/am335x-boneblue; fi; " \
  86. "if test $board_name = SBBE; then " \
  87. - "setenv fdtfile am335x-sancloud-bbe.dtb; setenv fdtbase am335x-sancloud-bbe; fi; " \
  88. + "setenv fdtfile ${fdtdir}/am335x-sancloud-bbe.dtb; setenv fdtbase ${fdtdir}/am335x-sancloud-bbe; fi; " \
  89. "if test $board_name = A33515BB; then " \
  90. - "setenv fdtfile am335x-evm.dtb; fi; " \
  91. + "setenv fdtfile ${fdtdir}/am335x-evm.dtb; fi; " \
  92. "if test $board_name = A335X_SK; then " \
  93. - "setenv fdtfile am335x-evmsk.dtb; fi; " \
  94. + "setenv fdtfile ${fdtdir}/am335x-evmsk.dtb; fi; " \
  95. "if test $board_name = A335_ICE; then " \
  96. - "setenv fdtfile am335x-icev2.dtb; fi; " \
  97. + "setenv fdtfile ${fdtdir}/am335x-icev2.dtb; fi; " \
  98. "if test $fdtfile = undefined; then " \
  99. "setenv board_name A335BNLT; " \
  100. "setenv board_rev EMMC; " \
  101. - "setenv fdtbase am335x-boneblack-emmc-overlay; " \
  102. - "setenv fdtfile am335x-boneblack-emmc-overlay.dtb; " \
  103. + "setenv fdtbase ${fdtdir}/am335x-boneblack-emmc-overlay; " \
  104. + "setenv fdtfile ${fdtdir}/am335x-boneblack-emmc-overlay.dtb; " \
  105. "fi; \0" \
  106. "init_console=" \
  107. "if test $board_name = A335_ICE; then "\
  108. --
  109. 2.12.1