Página inicial Explorar Ajuda
Entrar
Parabola
/
abslibre
mirror de https://git.parabola.nu/abslibre.git
Observar 2
Favorito 0
Fork 0
Arquivos Issues 0 Wiki
Branch: wip-teres
Branches Tags
abslibre
/
unmaintained
/
uboot-udoo
/
0001-parabola-arm-modifications.patch

0001-parabola-arm-modifications.patch 12 KB
Link permanente Histórico Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392 
  1. diff --git a/board/udoo/1066mhz_4x256mx16_dl.cfg b/board/udoo/1066mhz_4x256mx16_dl.cfg
    2. 

  2. new file mode 100644
    3. 

  3. index 0000000..e37c9f9
    4. 

  4. --- /dev/null
    5. 

  5. +++ b/board/udoo/1066mhz_4x256mx16_dl.cfg
    6. 

  6. @@ -0,0 +1,58 @@
    7. 

  7. +/*
    8. 

  8. + * Copyright (C) 2013 Seco USA Inc
    9. 

  9. + *
    10. 

  10. + * SPDX-License-Identifier:	GPL-2.0+
    11. 

  11. + */
    12. 

  12. +
    13. 

  13. +
    14. 

  14. +DATA 4, MX6_MMDC_P0_MDPDC,	0x0002002D
    15. 

  15. +DATA 4, MX6_MMDC_P0_MDOTC,	0x00333040
    16. 

  16. +
    17. 

  17. +DATA 4, MX6_MMDC_P0_MDCFG0,	0x3F4352F3
    18. 

  18. +DATA 4, MX6_MMDC_P0_MDCFG1,	0xB66D8B63
    19. 

  19. +DATA 4, MX6_MMDC_P0_MDCFG2,	0x01FF00DB
    20. 

  20. +
    21. 

  21. +DATA 4, MX6_MMDC_P0_MDMISC,	0x00001740
    22. 

  22. +DATA 4, MX6_MMDC_P0_MDSCR,	0x00008000
    23. 

  23. +DATA 4, MX6_MMDC_P0_MDRWD,	0x000026D2
    24. 

  24. +
    25. 

  25. +
    26. 

  26. +DATA 4, MX6_MMDC_P0_MDOR,	0x00431023
    27. 

  27. +DATA 4, MX6_MMDC_P0_MDASP,	0x00000027
    28. 

  28. +DATA 4, MX6_MMDC_P0_MDCTL,	0x831A0000
    29. 

  29. +
    30. 

  30. +DATA 4, MX6_MMDC_P0_MDSCR,	0x02008032
    31. 

  31. +DATA 4, MX6_MMDC_P0_MDSCR,	0x00008033
    32. 

  32. +DATA 4, MX6_MMDC_P0_MDSCR,	0x00048031
    33. 

  33. +DATA 4, MX6_MMDC_P0_MDSCR,	0x05208030
    34. 

  34. +DATA 4, MX6_MMDC_P0_MDSCR,	0x04008040
    35. 

  35. +
    36. 

  36. +DATA 4, MX6_MMDC_P0_MPZQHWCTRL,	0xa1390003
    37. 

  37. +DATA 4, MX6_MMDC_P1_MPZQHWCTRL,	0xa1390003
    38. 

  38. +
    39. 

  39. +DATA 4, MX6_MMDC_P0_MDREF,	0x00007800
    40. 

  40. +
    41. 

  41. +DATA 4, MX6_MMDC_P0_MPODTCTRL,	0x00022227
    42. 

  42. +DATA 4, MX6_MMDC_P1_MPODTCTRL,	0x00022227
    43. 

  43. +
    44. 

  44. +DATA 4, MX6_MMDC_P0_MPDGCTRL0,	0x425C0251
    45. 

  45. +DATA 4, MX6_MMDC_P0_MPDGCTRL1,	0x021B021E
    46. 

  46. +DATA 4, MX6_MMDC_P1_MPDGCTRL0,	0x021B021E
    47. 

  47. +DATA 4, MX6_MMDC_P1_MPDGCTRL1,	0x01730200
    48. 

  48. +
    49. 

  49. +DATA 4, MX6_MMDC_P0_MPRDDLCTL,	0x45474C45
    50. 

  50. +DATA 4, MX6_MMDC_P1_MPRDDLCTL,	0x44464744
    51. 

  51. +DATA 4, MX6_MMDC_P0_MPWRDLCTL,	0x3F3F3336
    52. 

  52. +DATA 4, MX6_MMDC_P1_MPWRDLCTL,	0x32383630
    53. 

  53. +
    54. 

  54. +DATA 4, MX6_MMDC_P0_MPWLDECTRL0,	0x002F0038
    55. 

  55. +DATA 4, MX6_MMDC_P0_MPWLDECTRL1,	0x001F001F
    56. 

  56. +DATA 4, MX6_MMDC_P1_MPWLDECTRL0,	0x001F001F
    57. 

  57. +DATA 4, MX6_MMDC_P1_MPWLDECTRL1,	0x001F001F
    58. 

  58. +
    59. 

  59. +DATA 4, MX6_MMDC_P0_MPMUR0,	0x00000000
    60. 

  60. +DATA 4, MX6_MMDC_P1_MPMUR0,	0x00000000
    61. 

  61. +
    62. 

  62. +DATA 4, MX6_MMDC_P0_MDPDC,	0x0002556D
    63. 

  63. +DATA 4, MX6_MMDC_P0_MAPSR,	0x00011006
    64. 

  64. +DATA 4, MX6_MMDC_P0_MDSCR,	0x00000000
    65. 

  65. diff --git a/board/udoo/ddr-setup_dl.cfg b/board/udoo/ddr-setup_dl.cfg
    66. 

  66. new file mode 100644
    67. 

  67. index 0000000..487570e
    68. 

  68. --- /dev/null
    69. 

  69. +++ b/board/udoo/ddr-setup_dl.cfg
    70. 

  70. @@ -0,0 +1,84 @@
    71. 

  71. +/*
    72. 

  72. + * Copyright (C) 2013 Seco USA Inc
    73. 

  73. + *
    74. 

  74. + * SPDX-License-Identifier:	GPL-2.0+
    75. 

  75. + *
    76. 

  76. + * Device Configuration Data (DCD)
    77. 

  77. + *
    78. 

  78. + * Each entry must have the format:
    79. 

  79. + * Addr-type           Address        Value
    80. 

  80. + *
    81. 

  81. + * where:
    82. 

  82. + *      Addr-type register length (1,2 or 4 bytes)
    83. 

  83. + *      Address   absolute address of the register
    84. 

  84. + *      value     value to be stored in the register
    85. 

  85. + */
    86. 

  86. +
    87. 

  87. +/*
    88. 

  88. + * DDR3 settings
    89. 

  89. + * MX6Q    ddr is limited to 1066 Mhz	currently 1056 MHz(528 MHz clock),
    90. 

  90. + *	   memory bus width: 64 bits	x16/x32/x64
    91. 

  91. + * MX6DL   ddr is limited to 800 MHz(400 MHz clock)
    92. 

  92. + *	   memory bus width: 64 bits	x16/x32/x64
    93. 

  93. + * MX6SOLO ddr is limited to 800 MHz(400 MHz clock)
    94. 

  94. + *	   memory bus width: 32 bits	x16/x32
    95. 

  95. + */
    96. 

  96. +DATA 4, MX6_IOM_DRAM_SDQS0,	0x00000028
    97. 

  97. +DATA 4, MX6_IOM_DRAM_SDQS1,	0x00000028
    98. 

  98. +DATA 4, MX6_IOM_DRAM_SDQS2,	0x00000028
    99. 

  99. +DATA 4, MX6_IOM_DRAM_SDQS3,	0x00000028
    100. 

  100. +DATA 4, MX6_IOM_DRAM_SDQS4,	0x00000028
    101. 

  101. +DATA 4, MX6_IOM_DRAM_SDQS5,	0x00000028
    102. 

  102. +DATA 4, MX6_IOM_DRAM_SDQS6,	0x00000028
    103. 

  103. +DATA 4, MX6_IOM_DRAM_SDQS7,	0x00000028
    104. 

  104. +
    105. 

  105. +DATA 4, MX6_IOM_GRP_B0DS,	0x00000028
    106. 

  106. +DATA 4, MX6_IOM_GRP_B1DS,	0x00000028
    107. 

  107. +DATA 4, MX6_IOM_GRP_B2DS,	0x00000028
    108. 

  108. +DATA 4, MX6_IOM_GRP_B3DS,	0x00000028
    109. 

  109. +DATA 4, MX6_IOM_GRP_B4DS,	0x00000028
    110. 

  110. +DATA 4, MX6_IOM_GRP_B5DS,	0x00000028
    111. 

  111. +DATA 4, MX6_IOM_GRP_B6DS,	0x00000028
    112. 

  112. +DATA 4, MX6_IOM_GRP_B7DS,	0x00000028
    113. 

  113. +DATA 4, MX6_IOM_GRP_ADDDS,	0x00000028
    114. 

  114. +
    115. 

  115. +DATA 4, MX6_IOM_GRP_CTLDS,	0x00000028
    116. 

  116. +
    117. 

  117. +DATA 4, MX6_IOM_DRAM_DQM0,	0x00000028
    118. 

  118. +DATA 4, MX6_IOM_DRAM_DQM1,	0x00000028
    119. 

  119. +DATA 4, MX6_IOM_DRAM_DQM2,	0x00000028
    120. 

  120. +DATA 4, MX6_IOM_DRAM_DQM3,	0x00000028
    121. 

  121. +DATA 4, MX6_IOM_DRAM_DQM4,	0x00000028
    122. 

  122. +DATA 4, MX6_IOM_DRAM_DQM5,	0x00000028
    123. 

  123. +DATA 4, MX6_IOM_DRAM_DQM6,	0x00000028
    124. 

  124. +DATA 4, MX6_IOM_DRAM_DQM7,	0x00000028
    125. 

  125. +
    126. 

  126. +DATA 4, MX6_IOM_DRAM_CAS,	0x00000028
    127. 

  127. +DATA 4, MX6_IOM_DRAM_RAS,	0x00000028
    128. 

  128. +DATA 4, MX6_IOM_DRAM_SDCLK_0,	0x00000028
    129. 

  129. +DATA 4, MX6_IOM_DRAM_SDCLK_1,	0x00000028
    130. 

  130. +
    131. 

  131. +DATA 4, MX6_IOM_DRAM_RESET,	0x00000028
    132. 

  132. +
    133. 

  133. +DATA 4, MX6_IOM_DRAM_SDODT0,	0x00000028
    134. 

  134. +DATA 4, MX6_IOM_DRAM_SDODT1,	0x00000028
    135. 

  135. +
    136. 

  136. +/* (differential input) */
    137. 

  137. +DATA 4, MX6_IOM_DDRMODE_CTL,	0x00020000
    138. 

  138. +/* (differential input) */
    139. 

  139. +DATA 4, MX6_IOM_GRP_DDRMODE,	0x00020000
    140. 

  140. +/* disable ddr pullups */
    141. 

  141. +DATA 4, MX6_IOM_GRP_DDRPKE,	0x00000000
    142. 

  142. +DATA 4, MX6_IOM_DRAM_SDBA2,	0x00000000
    143. 

  143. +/* 40 Ohm drive strength for cs0/1,sdba2,cke0/1,sdwe */
    144. 

  144. +DATA 4, MX6_IOM_GRP_DDR_TYPE,	0x000C0000
    145. 

  145. +
    146. 

  146. +/* Read data DQ Byte0-3 delay */
    147. 

  147. +DATA 4, MX6_MMDC_P0_MPRDDQBY0DL,	0x33333333
    148. 

  148. +DATA 4, MX6_MMDC_P0_MPRDDQBY1DL,	0x33333333
    149. 

  149. +DATA 4, MX6_MMDC_P0_MPRDDQBY2DL,	0x33333333
    150. 

  150. +DATA 4, MX6_MMDC_P0_MPRDDQBY3DL,	0x33333333
    151. 

  151. +DATA 4, MX6_MMDC_P1_MPRDDQBY0DL,	0x33333333
    152. 

  152. +DATA 4, MX6_MMDC_P1_MPRDDQBY1DL,	0x33333333
    153. 

  153. +DATA 4, MX6_MMDC_P1_MPRDDQBY2DL,	0x33333333
    154. 

  154. +DATA 4, MX6_MMDC_P1_MPRDDQBY3DL,	0x33333333
    155. 

  155. diff --git a/board/udoo/udoo-dl.cfg b/board/udoo/udoo-dl.cfg
    156. 

  156. new file mode 100644
    157. 

  157. index 0000000..46953c1
    158. 

  158. --- /dev/null
    159. 

  159. +++ b/board/udoo/udoo-dl.cfg
    160. 

  160. @@ -0,0 +1,29 @@
    161. 

  161. +/*
    162. 

  162. + * Copyright (C) 2013 Boundary Devices
    163. 

  163. + *
    164. 

  164. + * SPDX-License-Identifier:	GPL-2.0+
    165. 

  165. + *
    166. 

  166. + * Refer doc/README.imximage for more details about how-to configure
    167. 

  167. + * and create imximage boot image
    168. 

  168. + *
    169. 

  169. + * The syntax is taken as close as possible with the kwbimage
    170. 

  170. + */
    171. 

  171. +
    172. 

  172. +/* image version */
    173. 

  173. +IMAGE_VERSION 2
    174. 

  174. +
    175. 

  175. +/*
    176. 

  176. + * Boot Device : one of
    177. 

  177. + * spi, sd (the board has no nand neither onenand)
    178. 

  178. + */
    179. 

  179. +BOOT_FROM      sd
    180. 

  180. +
    181. 

  181. +#define __ASSEMBLY__
    182. 

  182. +#include <config.h>
    183. 

  183. +#include "asm/arch/mx6-ddr.h"
    184. 

  184. +#include "asm/arch/iomux.h"
    185. 

  185. +#include "asm/arch/crm_regs.h"
    186. 

  186. +
    187. 

  187. +#include "ddr-setup_dl.cfg"
    188. 

  188. +#include "1066mhz_4x256mx16_dl.cfg"
    189. 

  189. +#include "clocks.cfg"
    190. 

  190. diff --git a/configs/udoo_dl_defconfig b/configs/udoo_dl_defconfig
    191. 

  191. new file mode 100644
    192. 

  192. index 0000000..5dc9016
    193. 

  193. --- /dev/null
    194. 

  194. +++ b/configs/udoo_dl_defconfig
    195. 

  195. @@ -0,0 +1,3 @@
    196. 

  196. +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/udoo/udoo-dl.cfg,MX6DL,DDR_MB=1024"
    197. 

  197. +CONFIG_ARM=y
    198. 

  198. +CONFIG_TARGET_UDOO=y
    199. 

  199. diff --git a/include/configs/udoo.h b/include/configs/udoo.h
    200. 

  200. index 700e9c1..7fdce0f 100644
    201. 

  201. --- a/include/configs/udoo.h
    202. 

  202. +++ b/include/configs/udoo.h
    203. 

  203. @@ -78,7 +78,7 @@
    204. 

  204.  #define CONFIG_CMD_BMODE
    205. 

  205.  #define CONFIG_CMD_SETEXPR
    206. 

  206.  
    207. 

  207. -#define CONFIG_BOOTDELAY		3
    208. 

  208. +#define CONFIG_BOOTDELAY		1
    209. 

  209.  
    210. 

  210.  #define CONFIG_SYS_MEMTEST_START	0x10000000
    211. 

  211.  #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + 500 * SZ_1M)
    212. 

  212. @@ -96,60 +96,97 @@
    213. 

  213.  #define CONFIG_BOUNCE_BUFFER
    214. 

  214.  #define CONFIG_CMD_EXT2
    215. 

  215.  #define CONFIG_CMD_FAT
    216. 

  216. +#define CONFIG_CMD_EXT4
    217. 

  217. +#define CONFIG_CMD_FS_GENERIC
    218. 

  218.  #define CONFIG_DOS_PARTITION
    219. 

  219.  
    220. 

  220. +#define CONFIG_IDENT_STRING " Parabola GNU/Linux-libre"
    221. 

  221. +
    222. 

  222. +#if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S)
    223. 

  223. +#define CONFIG_DEFAULT_FDT_FILE		"imx6dl-udoo.dtb"
    224. 

  224. +#elif defined(CONFIG_MX6Q)
    225. 

  225.  #define CONFIG_DEFAULT_FDT_FILE		"imx6q-udoo.dtb"
    226. 

  226. +#endif
    227. 

  227.  
    228. 

  228.  #define CONFIG_EXTRA_ENV_SETTINGS \
    229. 

  229. -	"script=boot.scr\0" \
    230. 

  230. -	"image=zImage\0" \
    231. 

  231. -	"console=ttymxc1\0" \
    232. 

  232. +	"bootfile=vmlinuz-linux-libre\0" \
    233. 

  233. +	"bootdir=/boot\0" \
    234. 

  234. +	"console=ttymxc1,115200\0" \
    235. 

  235.  	"splashpos=m,m\0" \
    236. 

  236.  	"fdt_high=0xffffffff\0" \
    237. 

  237. +	"rdaddr=0x12A00000\0" \
    238. 

  238. +	"rdfile=initramfs-linux-libre.img\0" \
    239. 

  239.  	"initrd_high=0xffffffff\0" \
    240. 

  240. -	"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
    241. 

  241. -	"fdt_addr=0x18000000\0" \
    242. 

  242. -	"boot_fdt=try\0" \
    243. 

  243. +	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
    244. 

  244. +	"fdtdir=/boot/dtbs/linux-libre\0" \
    245. 

  245. +	"fdtaddr=0x18000000\0" \
    246. 

  246.  	"ip_dyn=yes\0" \
    247. 

  247. +	"optargs=\0" \
    248. 

  248. +	"video=\0" \
    249. 

  249.  	"mmcdev=0\0" \
    250. 

  250. -	"mmcpart=1\0" \
    251. 

  251. -	"mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
    252. 

  252. -	"update_sd_firmware_filename=u-boot.imx\0" \
    253. 

  253. -	"update_sd_firmware=" \
    254. 

  254. -		"if test ${ip_dyn} = yes; then " \
    255. 

  255. -			"setenv get_cmd dhcp; " \
    256. 

  256. +	"mmcroot=/dev/mmcblk0p1 rw rootwait\0" \
    257. 

  257. +	"mmcargs=setenv bootargs console=${console} " \
    258. 

  258. +		"${optargs} " \
    259. 

  259. +		"root=${mmcroot} " \
    260. 

  260. +		"video=${video}\0" \
    261. 

  261. +	"videoargs=" \
    262. 

  262. +		"setenv nextcon 0; " \
    263. 

  263. +		"if hdmidet; then " \
    264. 

  264. +			"setenv bootargs ${bootargs} " \
    265. 

  265. +				"video=mxcfb${nextcon}:dev=hdmi,1280x720M@60," \
    266. 

  266. +					"if=RGB24; " \
    267. 

  267. +			"setenv fbmem fbmem=28M; " \
    268. 

  268. +			"setexpr nextcon ${nextcon} + 1; " \
    269. 

  269.  		"else " \
    270. 

  270. -			"setenv get_cmd tftp; " \
    271. 

  271. +			"echo - no HDMI monitor;" \
    272. 

  272.  		"fi; " \
    273. 

  273. -		"if mmc dev ${mmcdev}; then "	\
    274. 

  274. -			"if ${get_cmd} ${update_sd_firmware_filename}; then " \
    275. 

  275. -				"setexpr fw_sz ${filesize} / 0x200; " \
    276. 

  276. -				"setexpr fw_sz ${fw_sz} + 1; "	\
    277. 

  277. -				"mmc write ${loadaddr} 0x2 ${fw_sz}; " \
    278. 

  278. -			"fi; "	\
    279. 

  279. -		"fi\0" \
    280. 

  280. -	"mmcargs=setenv bootargs console=${console},${baudrate} " \
    281. 

  281. -		"root=${mmcroot}\0" \
    282. 

  282. -	"loadbootscript=" \
    283. 

  283. -		"fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
    284. 

  284. -	"bootscript=echo Running bootscript from mmc ...; " \
    285. 

  285. -		"source\0" \
    286. 

  286. -	"loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
    287. 

  287. -	"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
    288. 

  288. -	"mmcboot=echo Booting from mmc ...; " \
    289. 

  289. -		"run mmcargs; " \
    290. 

  290. -		"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
    291. 

  291. -			"if run loadfdt; then " \
    292. 

  292. -				"bootz ${loadaddr} - ${fdt_addr}; " \
    293. 

  293. +		"i2c dev 1; " \
    294. 

  294. +		"if i2c probe 0x10; then " \
    295. 

  295. +			"setenv bootargs ${bootargs} " \
    296. 

  296. +				"video=mxcfb${nextcon}:dev=lcd,800x480@60," \
    297. 

  297. +					"if=RGB666; " \
    298. 

  298. +			"if test 0 -eq ${nextcon}; then " \
    299. 

  299. +				"setenv fbmem fbmem=10M; " \
    300. 

  300.  			"else " \
    301. 

  301. -				"if test ${boot_fdt} = try; then " \
    302. 

  302. -					"bootz; " \
    303. 

  303. -				"else " \
    304. 

  304. -					"echo WARN: Cannot load the DT; " \
    305. 

  305. -				"fi; " \
    306. 

  306. +				"setenv fbmem ${fbmem},10M; " \
    307. 

  307.  			"fi; " \
    308. 

  308. +			"setexpr nextcon ${nextcon} + 1; " \
    309. 

  309.  		"else " \
    310. 

  310. -			"bootz; " \
    311. 

  311. +			"echo '- no FWBADAPT-7WVGA-LCD-F07A-0102 display';" \
    312. 

  312. +		"fi; " \
    313. 

  313. +		"setenv bootargs ${bootargs} ${fbmem}\0" \
    314. 

  314. +	"loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
    315. 

  315. +	"loadrd=load mmc ${bootpart} ${rdaddr} ${bootdir}/${rdfile}\0" \
    316. 

  316. +	"loadfdt=echo loading ${fdtdir}/${fdtfile} ...; load mmc ${bootpart} ${fdtaddr} ${fdtdir}/${fdtfile}\0" \
    317. 

  317. +	"mmcboot=mmc dev ${mmcdev}; " \
    318. 

  318. +		"if mmc rescan; then " \
    319. 

  319. +			"echo SD/MMC found on device ${mmcdev};" \
    320. 

  320. +			"setenv bootpart ${mmcdev}:1; " \
    321. 

  321. +			"echo Checking for: ${bootdir}/uEnv.txt ...;" \
    322. 

  322. +			"if test -e mmc ${bootpart} ${bootdir}/uEnv.txt; then " \
    323. 

  323. +				"load mmc ${bootpart} ${loadaddr} ${bootdir}/uEnv.txt;" \
    324. 

  324. +				"env import -t ${loadaddr} ${filesize};" \
    325. 

  325. +				"echo Loaded environment from ${bootdir}/uEnv.txt;" \
    326. 

  326. +				"echo Checking if uenvcmd is set ...;" \
    327. 

  327. +				"if test -n ${uenvcmd}; then " \
    328. 

  328. +					"echo Running uenvcmd ...;" \
    329. 

  329. +					"run uenvcmd;" \
    330. 

  330. +				"fi;" \
    331. 

  331. +			"fi; " \
    332. 

  332. +			"if run loadimage; then " \
    333. 

  333. +				"if run loadfdt; then " \
    334. 

  334. +					"run mmcargs;" \
    335. 

  335. +					"if run loadrd; then " \
    336. 

  336. +						"bootz ${loadaddr} ${rdaddr}:${filesize} ${fdtaddr};" \
    337. 

  337. +					"else " \
    338. 

  338. +						"bootz ${loadaddr} - ${fdtaddr};" \
    339. 

  339. +					"fi;" \
    340. 

  340. +				"else " \
    341. 

  341. +					"echo Kernel found, but no device tree found;" \
    342. 

  342. +				"fi;" \
    343. 

  343. +			"else " \
    344. 

  344. +				"echo No kernel found;" \
    345. 

  345. +			"fi;" \
    346. 

  346.  		"fi;\0" \
    347. 

  347.  	"netargs=setenv bootargs console=${console},${baudrate} " \
    348. 

  348.  		"root=/dev/nfs " \
    349. 

  349. @@ -161,10 +198,10 @@
    350. 

  350.  		"else " \
    351. 

  351.  			"setenv get_cmd tftp; " \
    352. 

  352.  		"fi; " \
    353. 

  353. -		"${get_cmd} ${image}; " \
    354. 

  354. +		"${get_cmd} ${bootfile}; " \
    355. 

  355.  		"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
    356. 

  356. -			"if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
    357. 

  357. -				"bootz ${loadaddr} - ${fdt_addr}; " \
    358. 

  358. +			"if ${get_cmd} ${fdtaddr} ${fdtfile}; then " \
    359. 

  359. +				"bootz ${loadaddr} - ${fdtaddr}; " \
    360. 

  360.  			"else " \
    361. 

  361.  				"if test ${boot_fdt} = try; then " \
    362. 

  362.  					"bootz; " \
    363. 

  363. @@ -177,16 +214,7 @@
    364. 

  364.  		"fi;\0"
    365. 

  365.  
    366. 

  366.  #define CONFIG_BOOTCOMMAND \
    367. 

  367. -	   "mmc dev ${mmcdev}; if mmc rescan; then " \
    368. 

  368. -		   "if run loadbootscript; then " \
    369. 

  369. -			   "run bootscript; " \
    370. 

  370. -		   "else " \
    371. 

  371. -			   "if run loadimage; then " \
    372. 

  372. -				   "run mmcboot; " \
    373. 

  373. -			   "else run netboot; " \
    374. 

  374. -			   "fi; " \
    375. 

  375. -		   "fi; " \
    376. 

  376. -	   "else run netboot; fi"
    377. 

  377. +	"run mmcboot;"
    378. 

  378.  
    379. 

  379.  /* Miscellaneous configurable options */
    380. 

  380.  #define CONFIG_SYS_LONGHELP
    381. 

  381. @@ -228,6 +256,7 @@
    382. 

  382.  
    383. 

  383.  #define CONFIG_OF_LIBFDT
    384. 

  384.  #define CONFIG_CMD_BOOTZ
    385. 

  385. +#define CONFIG_SUPPORT_RAW_INITRD
    386. 

  386.  
    387. 

  387.  #ifndef CONFIG_SYS_DCACHE_OFF
    388. 

  388.  #define CONFIG_CMD_CACHE
    389. 

  389. -- 
    390. 

  390. 2.2.1
    391. 

  391. 

  392.