Etusivu Tutki Apua
Kirjaudu sisään
PUBLIC_REPOS
/
buildroot
peilaus alkaen git://git.buildroot.net/buildroot
2
1
Fork 0
Tiedostot
Puu: a82b3262b2
Haarat Tagit
buildroot
/
boot
/
uboot
/
uboot-v2011.12-change-kernel-address-in-dataflash.patch

uboot-v2011.12-change-kernel-address-in-dataflash.patch 7.4 KB
Historia Raaka

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181 
  1. From 9fc4787c7a6c797db649831f86e49c4bf9780b4e Mon Sep 17 00:00:00 2001
    2. 

  2. From: Alexandre Belloni <alexandre.belloni@piout.net>
    3. 

  3. Date: Mon, 2 Jan 2012 03:51:11 +0100
    4. 

  4. Subject: [PATCH] Change kernel address in dataflash to match u-boot's size
    5. 

  5. 

  6. On at91sam platforms, u-boot grew larger than the allocated size in
    7. 

  7. dataflash, the layout was:
    8. 

  8. bootstrap  0x00000000
    9. 

  9. ubootenv   0x00004200
    10. 

  10. uboot      0x00008400
    11. 

  11. kernel     0x00042000
    12. 

  12. 

  13. u-boot with the defconfig doesn't seem to fit in 0x42000 - 0x8400 =
    14. 

  14. 0x39C00 bytes anymore.
    15. 

  15. 

  16. Now, the layout is:
    17. 

  17. bootstrap  0x00000000
    18. 

  18. uboot      0x00004000
    19. 

  19. ubootenv   0x00084000
    20. 

  20. ubootenv2  0x00088000
    21. 

  21. kernel     0x0008C000
    22. 

  22. 

  23. Signed-off-by: Alexandre Belloni <alexandre.belloni@piout.net>
    24. 

  24. ---
    25. 

  25.  include/configs/at91sam9260ek.h |   18 ++++++++++++------
    26. 

  26.  include/configs/at91sam9261ek.h |   18 ++++++++++++------
    27. 

  27.  include/configs/at91sam9263ek.h |   10 +++++++---
    28. 

  28.  include/configs/at91sam9rlek.h  |   10 +++++++---
    29. 

  29.  4 files changed, 38 insertions(+), 18 deletions(-)
    30. 

  30. 

  31. diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
    32. 

  32. index db52ee6..b537760 100644
    33. 

  33. --- a/include/configs/at91sam9260ek.h
    34. 

  34. +++ b/include/configs/at91sam9260ek.h
    35. 

  35. @@ -185,10 +185,12 @@
    36. 

  36.  /* bootstrap + u-boot + env + linux in dataflash on CS0 */
    37. 

  37.  #define CONFIG_ENV_IS_IN_DATAFLASH	1
    38. 

  38.  #define CONFIG_SYS_MONITOR_BASE	(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
    39. 

  39. -#define CONFIG_ENV_OFFSET		0x4200
    40. 

  40. +#define CONFIG_ENV_OFFSET		0x84000
    41. 

  41.  #define CONFIG_ENV_ADDR		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
    42. 

  42. -#define CONFIG_ENV_SIZE		0x4200
    43. 

  43. -#define CONFIG_BOOTCOMMAND	"cp.b 0xC0042000 0x22000000 0x210000; bootm"
    44. 

  44. +#define CONFIG_ENV_SIZE		0x4000
    45. 

  45. +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE)
    46. 

  46. +#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
    47. 

  47. +#define CONFIG_BOOTCOMMAND	"cp.b 0xC008C000 0x22000000 0x210000; bootm"
    48. 

  48.  #define CONFIG_BOOTARGS		"console=ttyS0,115200 "			\
    49. 

  49.  				"root=/dev/mtdblock0 "			\
    50. 

  50.  				"mtdparts=atmel_nand:-(root) "		\
    51. 

  51. @@ -199,10 +201,12 @@
    52. 

  52.  /* bootstrap + u-boot + env + linux in dataflash on CS1 */
    53. 

  53.  #define CONFIG_ENV_IS_IN_DATAFLASH	1
    54. 

  54.  #define CONFIG_SYS_MONITOR_BASE	(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1 + 0x8400)
    55. 

  55. -#define CONFIG_ENV_OFFSET		0x4200
    56. 

  56. +#define CONFIG_ENV_OFFSET		0x84000
    57. 

  57.  #define CONFIG_ENV_ADDR		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1 + CONFIG_ENV_OFFSET)
    58. 

  58. -#define CONFIG_ENV_SIZE		0x4200
    59. 

  59. -#define CONFIG_BOOTCOMMAND	"cp.b 0xD0042000 0x22000000 0x210000; bootm"
    60. 

  60. +#define CONFIG_ENV_SIZE		0x4000
    61. 

  61. +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE)
    62. 

  62. +#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
    63. 

  63. +#define CONFIG_BOOTCOMMAND	"cp.b 0xD008C000 0x22000000 0x210000; bootm"
    64. 

  64.  #define CONFIG_BOOTARGS		"console=ttyS0,115200 "			\
    65. 

  65.  				"root=/dev/mtdblock0 "			\
    66. 

  66.  				"mtdparts=atmel_nand:-(root) "		\
    67. 

  67. @@ -231,6 +235,8 @@
    68. 

  68.  #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
    69. 

  69.  #define CONFIG_SYS_LONGHELP		1
    70. 

  70.  #define CONFIG_CMDLINE_EDITING	1
    71. 

  71. +#define CONFIG_AUTO_COMPLETE
    72. 

  72. +#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
    73. 

  73.  
    74. 

  74.  /*
    75. 

  75.   * Size of malloc() pool
    76. 

  76. diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
    77. 

  77. index 5140b26..fa461da 100644
    78. 

  78. --- a/include/configs/at91sam9261ek.h
    79. 

  79. +++ b/include/configs/at91sam9261ek.h
    80. 

  80. @@ -187,10 +187,12 @@
    81. 

  81.  /* bootstrap + u-boot + env + linux in dataflash on CS0 */
    82. 

  82.  #define CONFIG_ENV_IS_IN_DATAFLASH
    83. 

  83.  #define CONFIG_SYS_MONITOR_BASE	(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
    84. 

  84. -#define CONFIG_ENV_OFFSET	0x4200
    85. 

  85. +#define CONFIG_ENV_OFFSET	0x84000
    86. 

  86.  #define CONFIG_ENV_ADDR		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
    87. 

  87. -#define CONFIG_ENV_SIZE		0x4200
    88. 

  88. -#define CONFIG_BOOTCOMMAND	"cp.b 0xC0042000 0x22000000 0x210000; bootm"
    89. 

  89. +#define CONFIG_ENV_SIZE		0x4000
    90. 

  90. +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE)
    91. 

  91. +#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
    92. 

  92. +#define CONFIG_BOOTCOMMAND	"cp.b 0xC008C000 0x22000000 0x210000; bootm"
    93. 

  93.  #define CONFIG_BOOTARGS		"console=ttyS0,115200 "			\
    94. 

  94.  				"root=/dev/mtdblock0 "			\
    95. 

  95.  				"mtdparts=atmel_nand:-(root) "		\
    96. 

  96. @@ -201,10 +203,12 @@
    97. 

  97.  /* bootstrap + u-boot + env + linux in dataflash on CS3 */
    98. 

  98.  #define CONFIG_ENV_IS_IN_DATAFLASH
    99. 

  99.  #define CONFIG_SYS_MONITOR_BASE	(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS3 + 0x8400)
    100. 

  100. -#define CONFIG_ENV_OFFSET	0x4200
    101. 

  101. +#define CONFIG_ENV_OFFSET	0x84000
    102. 

  102.  #define CONFIG_ENV_ADDR		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS3 + CONFIG_ENV_OFFSET)
    103. 

  103. -#define CONFIG_ENV_SIZE		0x4200
    104. 

  104. -#define CONFIG_BOOTCOMMAND	"cp.b 0xD0042000 0x22000000 0x210000; bootm"
    105. 

  105. +#define CONFIG_ENV_SIZE		0x4000
    106. 

  106. +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE)
    107. 

  107. +#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
    108. 

  108. +#define CONFIG_BOOTCOMMAND	"cp.b 0xD008C000 0x22000000 0x210000; bootm"
    109. 

  109.  #define CONFIG_BOOTARGS		"console=ttyS0,115200 "			\
    110. 

  110.  				"root=/dev/mtdblock0 "			\
    111. 

  111.  				"mtdparts=atmel_nand:-(root) "		\
    112. 

  112. @@ -233,6 +237,8 @@
    113. 

  113.  #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
    114. 

  114.  #define CONFIG_SYS_LONGHELP
    115. 

  115.  #define CONFIG_CMDLINE_EDITING
    116. 

  116. +#define CONFIG_AUTO_COMPLETE
    117. 

  117. +#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
    118. 

  118.  
    119. 

  119.  /*
    120. 

  120.   * Size of malloc() pool
    121. 

  121. diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
    122. 

  122. index 8399246..253bee4 100644
    123. 

  123. --- a/include/configs/at91sam9263ek.h
    124. 

  124. +++ b/include/configs/at91sam9263ek.h
    125. 

  125. @@ -314,10 +314,12 @@
    126. 

  126.  /* bootstrap + u-boot + env + linux in dataflash on CS0 */
    127. 

  127.  #define CONFIG_ENV_IS_IN_DATAFLASH	1
    128. 

  128.  #define CONFIG_SYS_MONITOR_BASE	(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
    129. 

  129. -#define CONFIG_ENV_OFFSET		0x4200
    130. 

  130. +#define CONFIG_ENV_OFFSET		0x84000
    131. 

  131.  #define CONFIG_ENV_ADDR		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
    132. 

  132. -#define CONFIG_ENV_SIZE		0x4200
    133. 

  133. -#define CONFIG_BOOTCOMMAND	"cp.b 0xC0042000 0x22000000 0x210000; bootm"
    134. 

  134. +#define CONFIG_ENV_SIZE		0x4000
    135. 

  135. +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE)
    136. 

  136. +#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
    137. 

  137. +#define CONFIG_BOOTCOMMAND	"cp.b 0xC008C000 0x22000000 0x210000; bootm"
    138. 

  138.  #define CONFIG_BOOTARGS		"console=ttyS0,115200 " \
    139. 

  139.  				"root=/dev/mtdblock0 " \
    140. 

  140.  				"mtdparts=atmel_nand:-(root) "\
    141. 

  141. @@ -347,6 +349,8 @@
    142. 

  142.  #define CONFIG_AUTO_COMPLETE
    143. 

  143.  #define CONFIG_SYS_HUSH_PARSER
    144. 

  144.  #define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
    145. 

  145. +#define CONFIG_AUTO_COMPLETE
    146. 

  146. +#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
    147. 

  147.  
    148. 

  148.  /*
    149. 

  149.   * Size of malloc() pool
    150. 

  150. diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
    151. 

  151. index 79ea1f2..423f523 100644
    152. 

  152. --- a/include/configs/at91sam9rlek.h
    153. 

  153. +++ b/include/configs/at91sam9rlek.h
    154. 

  154. @@ -153,10 +153,12 @@
    155. 

  155.  /* bootstrap + u-boot + env + linux in dataflash on CS0 */
    156. 

  156.  #define CONFIG_ENV_IS_IN_DATAFLASH	1
    157. 

  157.  #define CONFIG_SYS_MONITOR_BASE	(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
    158. 

  158. -#define CONFIG_ENV_OFFSET		0x4200
    159. 

  159. +#define CONFIG_ENV_OFFSET		0x84000
    160. 

  160.  #define CONFIG_ENV_ADDR		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
    161. 

  161. -#define CONFIG_ENV_SIZE		0x4200
    162. 

  162. -#define CONFIG_BOOTCOMMAND	"cp.b 0xC0042000 0x22000000 0x210000; bootm"
    163. 

  163. +#define CONFIG_ENV_SIZE		0x4000
    164. 

  164. +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE)
    165. 

  165. +#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
    166. 

  166. +#define CONFIG_BOOTCOMMAND	"cp.b 0xC008C000 0x22000000 0x210000; bootm"
    167. 

  167.  #define CONFIG_BOOTARGS		"console=ttyS0,115200 " \
    168. 

  168.  				"root=/dev/mtdblock0 " \
    169. 

  169.  				"mtdparts=atmel_nand:-(root) "\
    170. 

  170. @@ -183,6 +185,8 @@
    171. 

  171.  #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
    172. 

  172.  #define CONFIG_SYS_LONGHELP		1
    173. 

  173.  #define CONFIG_CMDLINE_EDITING		1
    174. 

  174. +#define CONFIG_AUTO_COMPLETE
    175. 

  175. +#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
    176. 

  176.  
    177. 

  177.  /*
    178. 

  178.   * Size of malloc() pool
    179. 

  179. -- 
    180. 

  180. 1.7.5.4
    181. 

  181.