Advertisement
trini

diff.txt

Sep 12th, 2012
103
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 7.20 KB | None | 0 0
  1. --- mybuild/.config 2012-09-11 19:39:43.081606500 -0400
  2. +++ ../configs/beaglebone 2012-09-11 07:40:25.650225930 -0400
  3. @@ -518,10 +518,7 @@
  4. CONFIG_ARM_ATAG_DTB_COMPAT=y
  5. CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y
  6. # CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND is not set
  7. -CONFIG_CMDLINE="console=ttyO0,115200n8 root=/dev/nfs nfsroot=10.10.10.30:/home/mporter/target/mainline/beaglebone,rsize=1024,wsize=1024 ip=dhcp earlyprintk=serial,ttyO0,115200"
  8. -# CONFIG_CMDLINE_FROM_BOOTLOADER is not set
  9. -# CONFIG_CMDLINE_EXTEND is not set
  10. -CONFIG_CMDLINE_FORCE=y
  11. +CONFIG_CMDLINE=""
  12. # CONFIG_XIP_KERNEL is not set
  13. # CONFIG_KEXEC is not set
  14. # CONFIG_CRASH_DUMP is not set
  15. @@ -534,7 +531,29 @@
  16. #
  17. # CPU Frequency scaling
  18. #
  19. -# CONFIG_CPU_FREQ is not set
  20. +CONFIG_CPU_FREQ=y
  21. +CONFIG_CPU_FREQ_TABLE=y
  22. +CONFIG_CPU_FREQ_STAT=y
  23. +CONFIG_CPU_FREQ_STAT_DETAILS=y
  24. +# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
  25. +# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
  26. +CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
  27. +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
  28. +# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
  29. +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
  30. +CONFIG_CPU_FREQ_GOV_POWERSAVE=y
  31. +CONFIG_CPU_FREQ_GOV_USERSPACE=y
  32. +CONFIG_CPU_FREQ_GOV_ONDEMAND=y
  33. +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
  34. +CONFIG_GENERIC_CPUFREQ_CPU0=y
  35. +
  36. +#
  37. +# ARM CPU frequency scaling drivers
  38. +#
  39. +CONFIG_ARM_OMAP2PLUS_CPUFREQ=y
  40. +# CONFIG_ARM_EXYNOS4210_CPUFREQ is not set
  41. +# CONFIG_ARM_EXYNOS4X12_CPUFREQ is not set
  42. +# CONFIG_ARM_EXYNOS5250_CPUFREQ is not set
  43. CONFIG_CPU_IDLE=y
  44. CONFIG_CPU_IDLE_GOV_LADDER=y
  45. CONFIG_CPU_IDLE_GOV_MENU=y
  46. @@ -1133,7 +1152,7 @@
  47. # CONFIG_RFD_FTL is not set
  48. # CONFIG_SSFDC is not set
  49. # CONFIG_SM_FTL is not set
  50. -CONFIG_MTD_OOPS=y
  51. +# CONFIG_MTD_OOPS is not set
  52. # CONFIG_MTD_SWAP is not set
  53.  
  54. #
  55. @@ -1280,7 +1299,7 @@
  56. #
  57. # EEPROM support
  58. #
  59. -# CONFIG_EEPROM_AT24 is not set
  60. +CONFIG_EEPROM_AT24=y
  61. # CONFIG_EEPROM_AT25 is not set
  62. # CONFIG_EEPROM_LEGACY is not set
  63. # CONFIG_EEPROM_MAX6875 is not set
  64. @@ -1388,7 +1407,7 @@
  65. CONFIG_NET_VENDOR_I825XX=y
  66. CONFIG_NET_VENDOR_MARVELL=y
  67. CONFIG_NET_VENDOR_MICREL=y
  68. -# CONFIG_KS8842 is not set
  69. +CONFIG_KS8842=m
  70. CONFIG_KS8851=y
  71. CONFIG_KS8851_MLL=y
  72. CONFIG_NET_VENDOR_MICROCHIP=y
  73. @@ -1616,7 +1635,7 @@
  74. CONFIG_TOUCHSCREEN_EDT_FT5X06=m
  75. # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
  76. # CONFIG_TOUCHSCREEN_TOUCHWIN is not set
  77. -# CONFIG_TOUCHSCREEN_TI_TSC is not set
  78. +CONFIG_TOUCHSCREEN_TI_TSC=y
  79. # CONFIG_TOUCHSCREEN_PIXCIR is not set
  80. # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
  81. # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
  82. @@ -1751,9 +1770,9 @@
  83. # Other I2C/SMBus bus drivers
  84. #
  85. # CONFIG_I2C_STUB is not set
  86. -CONFIG_I2C_DEBUG_CORE=y
  87. +# CONFIG_I2C_DEBUG_CORE is not set
  88. # CONFIG_I2C_DEBUG_ALGO is not set
  89. -CONFIG_I2C_DEBUG_BUS=y
  90. +# CONFIG_I2C_DEBUG_BUS is not set
  91. CONFIG_SPI=y
  92. # CONFIG_SPI_DEBUG is not set
  93. CONFIG_SPI_MASTER=y
  94. @@ -1774,7 +1793,7 @@
  95. #
  96. # SPI Protocol Masters
  97. #
  98. -# CONFIG_SPI_SPIDEV is not set
  99. +CONFIG_SPI_SPIDEV=y
  100. # CONFIG_SPI_TLE62X0 is not set
  101. # CONFIG_HSI is not set
  102.  
  103. @@ -1801,7 +1820,7 @@
  104. #
  105. CONFIG_PINMUX=y
  106. CONFIG_PINCONF=y
  107. -CONFIG_DEBUG_PINCTRL=y
  108. +# CONFIG_DEBUG_PINCTRL is not set
  109. CONFIG_PINCTRL_SINGLE=y
  110. CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
  111. CONFIG_ARCH_REQUIRE_GPIOLIB=y
  112. @@ -1823,7 +1842,6 @@
  113. # CONFIG_GPIO_MAX732X is not set
  114. # CONFIG_GPIO_PCF857X is not set
  115. # CONFIG_GPIO_SX150X is not set
  116. -# CONFIG_GPIO_TPS65912 is not set
  117. CONFIG_GPIO_TWL4030=y
  118. # CONFIG_GPIO_ADP5588 is not set
  119.  
  120. @@ -1846,7 +1864,6 @@
  121. #
  122. # MODULbus GPIO expanders:
  123. #
  124. -# CONFIG_GPIO_TPS65910 is not set
  125. CONFIG_W1=y
  126. CONFIG_W1_CON=y
  127.  
  128. @@ -2044,9 +2061,8 @@
  129. # CONFIG_TPS6507X is not set
  130. CONFIG_MFD_TPS65217=y
  131. # CONFIG_MFD_TPS6586X is not set
  132. -CONFIG_MFD_TPS65910=y
  133. -CONFIG_MFD_TPS65912=y
  134. -CONFIG_MFD_TPS65912_I2C=y
  135. +# CONFIG_MFD_TPS65910 is not set
  136. +# CONFIG_MFD_TPS65912_I2C is not set
  137. # CONFIG_MFD_TPS65912_SPI is not set
  138. CONFIG_TWL4030_CORE=y
  139. # CONFIG_TWL4030_MADC is not set
  140. @@ -2107,8 +2123,6 @@
  141. CONFIG_REGULATOR_TPS6507X=y
  142. CONFIG_REGULATOR_TPS65217=y
  143. # CONFIG_REGULATOR_TPS6524X is not set
  144. -CONFIG_REGULATOR_TPS65910=y
  145. -CONFIG_REGULATOR_TPS65912=y
  146. CONFIG_REGULATOR_TWL4030=y
  147. CONFIG_MEDIA_SUPPORT=m
  148.  
  149. @@ -2300,6 +2314,7 @@
  150. #
  151. # CONFIG_VIDEO_THS7303 is not set
  152. # CONFIG_VIDEO_M52790 is not set
  153. +CONFIG_VIDEO_VIVI=m
  154. CONFIG_V4L_USB_DRIVERS=y
  155.  
  156. #
  157. @@ -2652,16 +2667,12 @@
  158. CONFIG_FB_CFB_COPYAREA=m
  159. CONFIG_FB_CFB_IMAGEBLIT=m
  160. # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
  161. -CONFIG_FB_SYS_FILLRECT=y
  162. -CONFIG_FB_SYS_COPYAREA=y
  163. -CONFIG_FB_SYS_IMAGEBLIT=y
  164. -CONFIG_FB_FOREIGN_ENDIAN=y
  165. -# CONFIG_FB_BOTH_ENDIAN is not set
  166. -CONFIG_FB_BIG_ENDIAN=y
  167. -# CONFIG_FB_LITTLE_ENDIAN is not set
  168. -CONFIG_FB_SYS_FOPS=y
  169. +# CONFIG_FB_SYS_FILLRECT is not set
  170. +# CONFIG_FB_SYS_COPYAREA is not set
  171. +# CONFIG_FB_SYS_IMAGEBLIT is not set
  172. +# CONFIG_FB_FOREIGN_ENDIAN is not set
  173. +# CONFIG_FB_SYS_FOPS is not set
  174. # CONFIG_FB_WMT_GE_ROPS is not set
  175. -CONFIG_FB_DEFERRED_IO=y
  176. # CONFIG_FB_SVGALIB is not set
  177. # CONFIG_FB_MACMODES is not set
  178. # CONFIG_FB_BACKLIGHT is not set
  179. @@ -2680,7 +2691,6 @@
  180. # CONFIG_FB_METRONOME is not set
  181. # CONFIG_FB_BROADSHEET is not set
  182. # CONFIG_FB_AUO_K190X is not set
  183. -CONFIG_FB_ST7735=y
  184. CONFIG_OMAP2_VRAM=y
  185. CONFIG_OMAP2_VRFB=y
  186. CONFIG_OMAP2_DSS=m
  187. @@ -2724,9 +2734,9 @@
  188. # CONFIG_LCD_S6E63M0 is not set
  189. # CONFIG_LCD_LD9040 is not set
  190. # CONFIG_LCD_AMS369FG06 is not set
  191. -CONFIG_BACKLIGHT_CLASS_DEVICE=m
  192. +CONFIG_BACKLIGHT_CLASS_DEVICE=y
  193. CONFIG_BACKLIGHT_GENERIC=m
  194. -CONFIG_BACKLIGHT_PWM=m
  195. +CONFIG_BACKLIGHT_PWM=y
  196. # CONFIG_BACKLIGHT_ADP8860 is not set
  197. # CONFIG_BACKLIGHT_ADP8870 is not set
  198. # CONFIG_BACKLIGHT_LP855X is not set
  199. @@ -2736,9 +2746,20 @@
  200. # Console display driver support
  201. #
  202. CONFIG_DUMMY_CONSOLE=y
  203. -# CONFIG_FRAMEBUFFER_CONSOLE is not set
  204. +CONFIG_FRAMEBUFFER_CONSOLE=y
  205. +# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
  206. +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
  207. +CONFIG_FONTS=y
  208. +CONFIG_FONT_8x8=y
  209. CONFIG_FONT_8x16=y
  210. -CONFIG_FONT_AUTOSELECT=y
  211. +# CONFIG_FONT_6x11 is not set
  212. +# CONFIG_FONT_7x14 is not set
  213. +# CONFIG_FONT_PEARL_8x8 is not set
  214. +# CONFIG_FONT_ACORN_8x8 is not set
  215. +# CONFIG_FONT_MINI_4x6 is not set
  216. +# CONFIG_FONT_SUN8x16 is not set
  217. +# CONFIG_FONT_SUN12x22 is not set
  218. +# CONFIG_FONT_10x18 is not set
  219. CONFIG_LOGO=y
  220. CONFIG_LOGO_LINUX_MONO=y
  221. CONFIG_LOGO_LINUX_VGA16=y
  222. @@ -3259,14 +3280,14 @@
  223. #
  224. # DMA Clients
  225. #
  226. -# CONFIG_NET_DMA is not set
  227. -# CONFIG_ASYNC_TX_DMA is not set
  228. -# CONFIG_DMATEST is not set
  229. +CONFIG_NET_DMA=y
  230. +CONFIG_ASYNC_TX_DMA=y
  231. +CONFIG_DMATEST=m
  232. # CONFIG_AUXDISPLAY is not set
  233. CONFIG_UIO=y
  234. -# CONFIG_UIO_PDRV is not set
  235. -# CONFIG_UIO_PDRV_GENIRQ is not set
  236. -CONFIG_UIO_PRUSS=y
  237. +CONFIG_UIO_PDRV=y
  238. +CONFIG_UIO_PDRV_GENIRQ=m
  239. +CONFIG_UIO_PRUSS=m
  240.  
  241. #
  242. # Virtio drivers
  243. @@ -3300,7 +3321,7 @@
  244. # CONFIG_PM_DEVFREQ is not set
  245. # CONFIG_EXTCON is not set
  246. # CONFIG_MEMORY is not set
  247. -CONFIG_IIO=m
  248. +CONFIG_IIO=y
  249. CONFIG_IIO_BUFFER=y
  250. CONFIG_IIO_KFIFO_BUF=m
  251. CONFIG_IIO_TRIGGERED_BUFFER=m
  252. @@ -3311,7 +3332,7 @@
  253. # Analog to digital converters
  254. #
  255. CONFIG_AD7266=m
  256. -CONFIG_TI_ADC=m
  257. +CONFIG_TI_ADC=y
  258.  
  259. #
  260. # Amplifiers
  261. @@ -3662,11 +3683,7 @@
  262. # CONFIG_STRICT_DEVMEM is not set
  263. CONFIG_ARM_UNWIND=y
  264. # CONFIG_DEBUG_USER is not set
  265. -CONFIG_DEBUG_LL=y
  266. -CONFIG_DEBUG_LL_UART_NONE=y
  267. -# CONFIG_DEBUG_ICEDCC is not set
  268. -# CONFIG_DEBUG_SEMIHOSTING is not set
  269. -CONFIG_EARLY_PRINTK=y
  270. +# CONFIG_DEBUG_LL is not set
  271. # CONFIG_ARM_KPROBES_TEST is not set
  272. # CONFIG_PID_IN_CONTEXTIDR is not set
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement