300-oxnas-target.patch 3.1 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101
  1. --- a/arch/arm/include/asm/mach-types.h
  2. +++ b/arch/arm/include/asm/mach-types.h
  3. @@ -212,6 +212,7 @@ extern unsigned int __machine_arch_type;
  4. #define MACH_TYPE_EDB9307A 1128
  5. #define MACH_TYPE_OMAP_3430SDP 1138
  6. #define MACH_TYPE_VSTMS 1140
  7. +#define MACH_TYPE_OXNAS 1152
  8. #define MACH_TYPE_MICRO9M 1169
  9. #define MACH_TYPE_BUG 1179
  10. #define MACH_TYPE_AT91SAM9263EK 1202
  11. --- a/drivers/block/Makefile
  12. +++ b/drivers/block/Makefile
  13. @@ -21,3 +21,4 @@ obj-$(CONFIG_IDE_SIL680) += sil680.o
  14. obj-$(CONFIG_SANDBOX) += sandbox.o
  15. obj-$(CONFIG_SCSI_SYM53C8XX) += sym53c8xx.o
  16. obj-$(CONFIG_SYSTEMACE) += systemace.o
  17. +obj-$(CONFIG_IDE_PLX) += plxsata_ide.o
  18. --- a/drivers/usb/host/Makefile
  19. +++ b/drivers/usb/host/Makefile
  20. @@ -33,6 +33,7 @@ obj-$(CONFIG_USB_EHCI_MX6) += ehci-mx6.o
  21. obj-$(CONFIG_USB_EHCI_OMAP) += ehci-omap.o
  22. obj-$(CONFIG_USB_EHCI_PPC4XX) += ehci-ppc4xx.o
  23. obj-$(CONFIG_USB_EHCI_MARVELL) += ehci-marvell.o
  24. +obj-$(CONFIG_USB_EHCI_OXNAS) += ehci-oxnas.o
  25. obj-$(CONFIG_USB_EHCI_PCI) += ehci-pci.o
  26. obj-$(CONFIG_USB_EHCI_SPEAR) += ehci-spear.o
  27. obj-$(CONFIG_USB_EHCI_SUNXI) += ehci-sunxi.o
  28. --- a/tools/.gitignore
  29. +++ b/tools/.gitignore
  30. @@ -9,6 +9,7 @@
  31. /mkenvimage
  32. /mkimage
  33. /mkexynosspl
  34. +/mkox820crc
  35. /mpc86x_clk
  36. /mxsboot
  37. /mksunxiboot
  38. --- a/tools/Makefile
  39. +++ b/tools/Makefile
  40. @@ -143,6 +143,12 @@ hostprogs-$(CONFIG_KIRKWOOD) += kwboot
  41. hostprogs-y += proftool
  42. hostprogs-$(CONFIG_STATIC_RELA) += relocate-rela
  43. +
  44. +hostprogs-$(CONFIG_OX820) += mkox820crc$(SFX)
  45. +
  46. +mkox820crc$(SFX)-objs := mkox820crc.o lib/crc32.o
  47. +
  48. +
  49. # We build some files with extra pedantic flags to try to minimize things
  50. # that won't build on some weird host compiler -- though there are lots of
  51. # exceptions for files that aren't complaint.
  52. --- a/drivers/serial/ns16550.c
  53. +++ b/drivers/serial/ns16550.c
  54. @@ -118,6 +118,14 @@ int ns16550_calc_divisor(NS16550_t port,
  55. }
  56. port->osc_12m_sel = 0; /* clear if previsouly set */
  57. #endif
  58. +#ifdef CONFIG_OX820
  59. + {
  60. + /* with additional 3 bit fractional */
  61. + u32 div = (CONFIG_SYS_NS16550_CLK + baudrate) / (baudrate * 2);
  62. + port->reg9 = (div & 7) << 5;
  63. + return (div >> 3);
  64. + }
  65. +#endif
  66. return DIV_ROUND_CLOSEST(clock, mode_x_div * baudrate);
  67. }
  68. --- a/scripts/Makefile.spl
  69. +++ b/scripts/Makefile.spl
  70. @@ -202,6 +202,9 @@ OBJCOPYFLAGS_$(SPL_BIN).bin = $(SPL_OBJC
  71. $(obj)/$(SPL_BIN).bin: $(obj)/$(SPL_BIN) FORCE
  72. $(call if_changed,objcopy)
  73. +ifdef CONFIG_OX820
  74. + $(OBJTREE)/tools/mkox820crc $@
  75. +endif
  76. LDFLAGS_$(SPL_BIN) += -T u-boot-spl.lds $(LDFLAGS_FINAL)
  77. ifneq ($(CONFIG_SPL_TEXT_BASE),)
  78. --- a/arch/arm/Kconfig
  79. +++ b/arch/arm/Kconfig
  80. @@ -488,6 +488,9 @@ config TARGET_BALLOON3
  81. config TARGET_H2200
  82. bool "Support h2200"
  83. +config TARGET_OX820
  84. + bool "Support ox820"
  85. +
  86. config TARGET_PALMLD
  87. bool "Support palmld"
  88. @@ -650,6 +653,7 @@ source "board/logicpd/imx27lite/Kconfig"
  89. source "board/logicpd/imx31_litekit/Kconfig"
  90. source "board/mpl/vcma9/Kconfig"
  91. source "board/olimex/mx23_olinuxino/Kconfig"
  92. +source "board/ox820/Kconfig"
  93. source "board/palmld/Kconfig"
  94. source "board/palmtc/Kconfig"
  95. source "board/palmtreo680/Kconfig"