patch-include_configs_mx6_cubox-i_h 3.0 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364
  1. --- u-boot-imx6-20140819.orig/include/configs/mx6_cubox-i.h 2014-08-19 09:42:57.000000000 +0200
  2. +++ u-boot-imx6-20140819/include/configs/mx6_cubox-i.h 2014-08-19 13:26:15.775439757 +0200
  3. @@ -158,7 +158,7 @@
  4. "script=boot.scr\0" \
  5. "bootfile=auto\0" \
  6. "bootenv=uEnv.txt\0" \
  7. - "boot_prefixes=/ /boot/\0" \
  8. + "boot_prefixes=/boot/\0" \
  9. "console=ttymxc0\0" \
  10. "stdin=serial,usbkbd\0" \
  11. "stdout=serial,vga\0" \
  12. @@ -171,7 +171,7 @@
  13. "ip_dyn=yes\0" \
  14. "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
  15. "mmcpart=1\0" \
  16. - "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
  17. + "mmcroot=/dev/mmcblk0p1 rootwait rw\0" \
  18. "update_sd_firmware_filename=u-boot.imx\0" \
  19. "update_sd_firmware=" \
  20. "if test ${ip_dyn} = yes; then " \
  21. @@ -217,7 +217,7 @@
  22. "importbootenv=echo Importing environment from mmc${mmcdev} ...; " \
  23. "env import -t ${loadaddr} ${filesize};\0" \
  24. "autoboot=echo Booting ${boot_file}; " \
  25. - "if test ${boot_file} = zImage; then " \
  26. + "if test ${boot_file} = kernel; then " \
  27. "bootz ${loadaddr} ${ramdisk_addr} ${fdt_addr}; " \
  28. "else " \
  29. "bootm ${loadaddr} ${ramdisk_addr} ${fdt_addr}; " \
  30. @@ -232,14 +232,14 @@
  31. "else " \
  32. "setenv ramdisk_addr -; " \
  33. "fi; " \
  34. - "if test ${boot_file} = zImage; then " \
  35. + "if test ${boot_file} = kernel; then " \
  36. "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
  37. "if run loadfdt; then " \
  38. "echo Loaded ${fdt_file}; " \
  39. "else " \
  40. "setenv fdt_addr; " \
  41. "if test ${boot_fdt} = try; then " \
  42. - "echo WARN: Cannot load the DTB and boot file is type zImage;" \
  43. + "echo WARN: Cannot load the DTB and boot file is type kernel;" \
  44. "echo if you have not appended a dtb to the file it may;" \
  45. "echo hang after displaying Starting kernel...;" \
  46. "echo ;" \
  47. @@ -269,7 +269,7 @@
  48. "setenv get_cmd tftp; " \
  49. "fi; " \
  50. "if test ${bootfile} = auto; then " \
  51. - "setenv bootfile zImage; " \
  52. + "setenv bootfile kernel; " \
  53. "if ${get_cmd} ${bootfile}; then " \
  54. "run bootit; " \
  55. "else " \
  56. @@ -295,7 +295,7 @@
  57. "fi; " \
  58. "if test ${bootfile} = auto; then " \
  59. "setenv origbootfile auto; " \
  60. - "setenv bootfile zImage; " \
  61. + "setenv bootfile kernel; " \
  62. "if run loadbootfile; then " \
  63. "run mmcboot; " \
  64. "else " \