120-iconnect.patch 1.2 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243
  1. --- a/include/configs/iconnect.h
  2. +++ b/include/configs/iconnect.h
  3. @@ -66,30 +66,29 @@
  4. #define CONFIG_ENV_IS_NOWHERE
  5. #endif
  6. #define CONFIG_ENV_SIZE 0x20000
  7. -#define CONFIG_ENV_OFFSET 0x80000
  8. +#define CONFIG_ENV_OFFSET 0xe0000
  9. /*
  10. * Default environment variables
  11. */
  12. #define CONFIG_BOOTCOMMAND \
  13. "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \
  14. - "ubi part rootfs; " \
  15. - "ubifsmount ubi:rootfs; " \
  16. - "ubifsload 0x800000 ${kernel}; " \
  17. - "bootm 0x800000"
  18. + "ubi part ubi; " \
  19. + "ubi read 0x800000 kernel; " \
  20. + "bootz 0x800000"
  21. #define CONFIG_MTDPARTS \
  22. - "mtdparts=orion_nand:" \
  23. - "0x80000@0x0(uboot)," \
  24. - "0x20000@0x80000(uboot_env)," \
  25. - "-@0xa0000(rootfs)\0"
  26. + "mtdparts=orion_nand:" \
  27. + "0xe0000@0x0(uboot)," \
  28. + "0x20000@0xe0000(uboot_env)," \
  29. + "0x100000@0x100000(second_stage_uboot)," \
  30. + "-@0x200000(ubi)\0"
  31. #define CONFIG_EXTRA_ENV_SETTINGS \
  32. "console=console=ttyS0,115200\0" \
  33. "mtdids=nand0=orion_nand\0" \
  34. "mtdparts="CONFIG_MTDPARTS \
  35. - "kernel=/boot/uImage\0" \
  36. - "bootargs_root=noinitrd ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs\0"
  37. + "bootargs_root=\0"
  38. /*
  39. * Ethernet driver configuration