PageRenderTime 828ms CodeModel.GetById 11ms RepoModel.GetById 0ms app.codeStats 0ms

/bootloader/u-boot-2009.08/patches/0557-ENGR00218282-MX6Q-fix-linker-error-when-more-configu.patch

https://github.com/red-root/PortingARMLinux
Patch | 126 lines | 104 code | 22 blank | 0 comment | 0 complexity | 587a7cd63e5715ed58cfe9b2d5e3f737 MD5 | raw file
Possible License(s): AGPL-1.0 
    

  1. From 2dbfc63a4a0206d31e419d9e595828e6408dce48 Mon Sep 17 00:00:00 2001
    2. 

  2. From: Zhang Jiejing <jiejing.zhang@freescale.com>
    3. 

  3. Date: Wed, 25 Jul 2012 11:35:11 +0800
    4. 

  4. Subject: [PATCH 557/678] ENGR00218282 MX6Q: fix linker error when more
    5. 

  5.  configure enabled.
    6. 

  6. 

  7. This commit fix the linker error when enable more function(like CONFIG_NAND,
    8. 

  8. CONFIG_SPASHSCREEN,etc) in uboot ARM2 board, and a possable linker error for
    9. 

  9. other MX6 boards:
    10. 

  10. 

  11. /home/lambert/share/SATA2/R13.3/prebuilt/linux-x86/toolchain/arm-eabi-4.4.3/
    12. 

  12. bin/arm-eabi-ld: section .bss [27831000 -> 278666e7] overlaps section
    13. 

  13. .rodata [2782387c -> 278609eb]
    14. 

  14. 

  15. /home/lambert/share/SATA2/R13.3/prebuilt/linux-x86/toolchain/arm-eabi-4.4.3/
    16. 

  16. bin/arm-eabi-ld: section .rodata.str1.1 [278609ec -> 27867803] overlaps
    17. 

  17. section .bss [27831000 -> 278666e7]
    18. 

  18. 

  19. One issue here is:
    20. 

  20. A recent gcc added a new unaligned rodata section called '.rodata.str1.1',
    21. 

  21. which needs to be added the the linker script.  Instead of just adding this
    22. 

  22. one section, we use a wildcard ".rodata*" to get all rodata linker section
    23. 

  23. gcc has now and might add in the future.
    24. 

  24. 

  25. Another issue is:
    26. 

  26. The secure boot feature require __hab_data section in uboot linker script,
    27. 

  27. but it's have a hard coding magic number, but if we enable more code, cause
    28. 

  28. .text section bigger, it will cross the line, so it report the
    29. 

  29. first linker error.
    30. 

  30. 

  31. This commit disable SECURE_BOOT feature by default for android,
    32. 

  32. and comments if user want to use this feature, it needs change the
    33. 

  33. .lds by there configure.
    34. 

  34. Also, enlarge the magic number that this feature needs to cover
    35. 

  35. if more code is build in.
    36. 

  36. 

  37. Signed-off-by: Zhang Jiejing <jiejing.zhang@freescale.com>
    38. 

  38. ---
    39. 

  39.  board/freescale/mx6q_arm2/u-boot.lds      |    6 +++---
    40. 

  40.  board/freescale/mx6q_sabreauto/u-boot.lds |    2 +-
    41. 

  41.  board/freescale/mx6q_sabrelite/u-boot.lds |    2 +-
    42. 

  42.  board/freescale/mx6q_sabresd/u-boot.lds   |    2 +-
    43. 

  43.  include/configs/mx6q_arm2_android.h       |    4 ++++
    44. 

  44.  5 files changed, 10 insertions(+), 6 deletions(-)
    45. 

  45. 

  46. diff --git a/board/freescale/mx6q_arm2/u-boot.lds b/board/freescale/mx6q_arm2/u-boot.lds
    47. 

  47. index 5bd58bb..a6bcebb 100644
    48. 

  48. --- a/board/freescale/mx6q_arm2/u-boot.lds
    49. 

  49. +++ b/board/freescale/mx6q_arm2/u-boot.lds
    50. 

  50. @@ -53,7 +53,7 @@ SECTIONS
    51. 

  51.  	}
    52. 

  52.  
    53. 

  53.  	. = ALIGN(4);
    54. 

  54. -	.rodata : { *(.rodata) }
    55. 

  55. +	.rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) }
    56. 

  56.  
    57. 

  57.  	. = ALIGN(4);
    58. 

  58.  	.data : { *(.data) }
    59. 

  59. @@ -69,8 +69,8 @@ SECTIONS
    60. 

  60.  	. = ALIGN(4);
    61. 

  61.  	_end_of_copy = .; /* end_of ROM copy code when HAB is not enabled */
    62. 

  62.  
    63. 

  63. -	/* Original Size is 0x27..., enlarge to 0x2F000 */
    64. 

  64. -	. = TEXT_BASE + 0x2F000;
    65. 

  65. +	/* Original Size is 0x27..., enlarge to 0x3F000 */
    66. 

  66. +	. = TEXT_BASE + 0x3F000;
    67. 

  67.  	__hab_data = .;
    68. 

  68.  	. = . + 0x2000;
    69. 

  69.  	__hab_data_end = .;
    70. 

  70. diff --git a/board/freescale/mx6q_sabreauto/u-boot.lds b/board/freescale/mx6q_sabreauto/u-boot.lds
    71. 

  71. index f3ebb48..8ef52ce 100644
    72. 

  72. --- a/board/freescale/mx6q_sabreauto/u-boot.lds
    73. 

  73. +++ b/board/freescale/mx6q_sabreauto/u-boot.lds
    74. 

  74. @@ -53,7 +53,7 @@ SECTIONS
    75. 

  75.  	}
    76. 

  76.  
    77. 

  77.  	. = ALIGN(4);
    78. 

  78. -	.rodata : { *(.rodata) }
    79. 

  79. +	.rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) }
    80. 

  80.  
    81. 

  81.  	. = ALIGN(4);
    82. 

  82.  	.data : { *(.data) }
    83. 

  83. diff --git a/board/freescale/mx6q_sabrelite/u-boot.lds b/board/freescale/mx6q_sabrelite/u-boot.lds
    84. 

  84. index fe40969..dceb877 100644
    85. 

  85. --- a/board/freescale/mx6q_sabrelite/u-boot.lds
    86. 

  86. +++ b/board/freescale/mx6q_sabrelite/u-boot.lds
    87. 

  87. @@ -53,7 +53,7 @@ SECTIONS
    88. 

  88.  	}
    89. 

  89.  
    90. 

  90.  	. = ALIGN(4);
    91. 

  91. -	.rodata : { *(.rodata) }
    92. 

  92. +	.rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) }
    93. 

  93.  
    94. 

  94.  	. = ALIGN(4);
    95. 

  95.  	.data : { *(.data) }
    96. 

  96. diff --git a/board/freescale/mx6q_sabresd/u-boot.lds b/board/freescale/mx6q_sabresd/u-boot.lds
    97. 

  97. index 1473ea9..9b678da 100644
    98. 

  98. --- a/board/freescale/mx6q_sabresd/u-boot.lds
    99. 

  99. +++ b/board/freescale/mx6q_sabresd/u-boot.lds
    100. 

  100. @@ -53,7 +53,7 @@ SECTIONS
    101. 

  101.  	}
    102. 

  102.  
    103. 

  103.  	. = ALIGN(4);
    104. 

  104. -	.rodata : { *(.rodata) }
    105. 

  105. +	.rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) }
    106. 

  106.  
    107. 

  107.  	. = ALIGN(4);
    108. 

  108.  	.data : { *(.data) }
    109. 

  109. diff --git a/include/configs/mx6q_arm2_android.h b/include/configs/mx6q_arm2_android.h
    110. 

  110. index 264d85b..361a720 100644
    111. 

  111. --- a/include/configs/mx6q_arm2_android.h
    112. 

  112. +++ b/include/configs/mx6q_arm2_android.h
    113. 

  113. @@ -24,6 +24,10 @@
    114. 

  114.  
    115. 

  115.  #include "mx6q_arm2.h"
    116. 

  116.  
    117. 

  117. +/* Disable secure boot feature in default, if you want to enable this
    118. 

  118. + * feature, please carefully read related documents, you may needs to
    119. 

  119. + * change u-boot.lds */
    120. 

  120. +#undef CONFIG_SECURE_BOOT
    121. 

  121.  
    122. 

  122.  /* Disable fastboot and recovery to pass build.
    123. 

  123.  
    124. 

  124. -- 
    125. 

  125. 1.7.7.4
    126. 

    127. 

    128.