110-dockstar.patch 1.5 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354
  1. --- a/include/configs/dockstar.h
  2. +++ b/include/configs/dockstar.h
  3. @@ -31,6 +31,7 @@
  4. * Commands configuration
  5. */
  6. #define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */
  7. +#define CONFIG_SYS_MVFS
  8. #define CONFIG_CMD_ENV
  9. #define CONFIG_CMD_NAND
  10. /*
  11. @@ -53,29 +54,29 @@
  12. * it has to be rounded to sector size
  13. */
  14. #define CONFIG_ENV_SIZE 0x20000 /* 128k */
  15. -#define CONFIG_ENV_ADDR 0x80000
  16. -#define CONFIG_ENV_OFFSET 0x80000 /* env starts here */
  17. +#define CONFIG_ENV_OFFSET 0xe0000 /* env starts here */
  18. /*
  19. * Default environment variables
  20. */
  21. #define CONFIG_BOOTCOMMAND \
  22. "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \
  23. - "ubi part root; " \
  24. - "ubifsmount ubi:root; " \
  25. - "ubifsload 0x800000 ${kernel}; " \
  26. - "ubifsload 0x1100000 ${initrd}; " \
  27. - "bootm 0x800000 0x1100000"
  28. + "ubi part ubi; " \
  29. + "ubi read 0x800000 kernel; " \
  30. + "bootm 0x800000"
  31. -#define CONFIG_MTDPARTS "mtdparts=orion_nand:1m(uboot),-(root)\0"
  32. +#define CONFIG_MTDPARTS \
  33. + "mtdparts=orion_nand:" \
  34. + "0xe0000@0x0(uboot)," \
  35. + "0x20000@0xe0000(uboot_env)," \
  36. + "0x100000@0x100000(second_stage_uboot)," \
  37. + "-@0x200000(ubi)\0"
  38. #define CONFIG_EXTRA_ENV_SETTINGS \
  39. - "console=console=ttyS0,115200\0" \
  40. - "mtdids=nand0=orion_nand\0" \
  41. - "mtdparts="CONFIG_MTDPARTS \
  42. - "kernel=/boot/uImage\0" \
  43. - "initrd=/boot/uInitrd\0" \
  44. - "bootargs_root=ubi.mtd=1 root=ubi0:root rootfstype=ubifs ro\0"
  45. + "console=console=ttyS0,115200\0" \
  46. + "mtdids=nand0=orion_nand\0" \
  47. + "mtdparts="CONFIG_MTDPARTS \
  48. + "bootargs_root=\0"
  49. /*
  50. * Ethernet Driver configuration