120-iconnect.patch 1.3 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647
  1. --- a/include/configs/iconnect.h
  2. +++ b/include/configs/iconnect.h
  3. @@ -66,30 +66,35 @@
  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. + "ubi part root; " \
  16. "ubifsmount ubi:rootfs; " \
  17. "ubifsload 0x800000 ${kernel}; " \
  18. - "bootm 0x800000"
  19. + "ubifsload 0x700000 ${fdt}; " \
  20. + "ubifsumount; " \
  21. + "fdt addr 0x700000; fdt resize; fdt chosen; " \
  22. + "bootz 0x800000 - 0x700000"
  23. #define CONFIG_MTDPARTS \
  24. - "mtdparts=orion_nand:" \
  25. - "0x80000@0x0(uboot)," \
  26. - "0x20000@0x80000(uboot_env)," \
  27. - "-@0xa0000(rootfs)\0"
  28. + "mtdparts=orion_nand:" \
  29. + "0xe0000@0x0(uboot)," \
  30. + "0x20000@0xe0000(uboot_env)," \
  31. + "0x100000@0x100000(second_stage_uboot)," \
  32. + "-@0x200000(root)\0"
  33. #define CONFIG_EXTRA_ENV_SETTINGS \
  34. "console=console=ttyS0,115200\0" \
  35. "mtdids=nand0=orion_nand\0" \
  36. "mtdparts="CONFIG_MTDPARTS \
  37. - "kernel=/boot/uImage\0" \
  38. - "bootargs_root=noinitrd ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs\0"
  39. + "kernel=/boot/zImage\0" \
  40. + "fdt=/boot/iconnect.dtb\0" \
  41. + "bootargs_root=ubi.mtd=3 root=ubi0:rootfs rootfstype=ubifs rw\0"
  42. /*
  43. * Ethernet driver configuration