Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NookieDevs/nook_kernel
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: fat-tire/nook_kernel
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.

Commits on Feb 19, 2011

  1. Revert "updated usb composite drivers and tweaked cyttsp touchscreen …

    …settings"
    
    This reverts commit 98b72ff.
    dalingrin committed Feb 19, 2011
    Copy the full SHA
    d61347c View commit details

Commits on Feb 20, 2011

  1. Redo part of CVPCS commit

    dalingrin committed Feb 20, 2011
    Copy the full SHA
    13394fd View commit details

Commits on Feb 22, 2011

  1. Backport of 2.6.32 dspbridge

    We can now use libbridge.so from CM repos.
    dalingrin committed Feb 22, 2011
    Copy the full SHA
    5af7f48 View commit details

Commits on Feb 23, 2011

  1. Copy the full SHA
    4fae9db View commit details
  2. Kernel now overclockable to 925mhz.

    Stock voltage.
    Overclock must be set with Cyanogenmod settings
    otherwise defaults to stock 800mhz
    dalingrin committed Feb 23, 2011
    Copy the full SHA
    6dee96e View commit details

Commits on Feb 25, 2011

  1. cpufreq and omap transition latency tweaks

    Reducing omap transition latency to reasonable value.
    This is defferable so it does not effect idle wake ups.
    dalingrin committed Feb 25, 2011
    Copy the full SHA
    1a562b5 View commit details

Commits on Feb 26, 2011

  1. Copy the full SHA
    cfd8026 View commit details
  2. Copy the full SHA
    8577b47 View commit details

Commits on Feb 28, 2011

  1. adding missing file required to compile. May not be the correct versi…

    …on (Cicada?), but this one does build and seem to work.
    fattire committed Feb 28, 2011
    Copy the full SHA
    5cb31b1 View commit details
  2. Copy the full SHA
    72ff875 View commit details

Commits on Mar 1, 2011

  1. Copy the full SHA
    14d5105 View commit details

Commits on Mar 7, 2011

  1. Copy the full SHA
    bfa30c5 View commit details
  2. Whitespace fix

    dalingrin committed Mar 7, 2011
    Copy the full SHA
    c7dcb58 View commit details
  3. Copy the full SHA
    75dfaa5 View commit details

Commits on Mar 9, 2011

  1. Copy the full SHA
    7cb54f3 View commit details
  2. new config + boardfile changes for bluetooth

    fattire authored and dalingrin committed Mar 9, 2011
    Copy the full SHA
    645cf70 View commit details
  3. changes to defconfig for bt. BNEP allows tethering. HCIBTSDIO may mak…

    …e hciattach texas work someday. Tx peabody124 for this.
    fat-tire committed Mar 9, 2011
    Copy the full SHA
    662a84b View commit details
  4. bt enable w/o needing patched u-boot

    ti-st turned off since it breaks rfkill & nobody cares unless FM is wired up
    pokey9000 committed Mar 9, 2011
    Copy the full SHA
    7a3b215 View commit details

Commits on Mar 13, 2011

  1. Bluetooth: Fix issue with sysfs handling for connections

    Due to a semantic changes in flush_workqueue() the current approach of
    synchronizing the sysfs handling for connections doesn't work anymore. The
    whole approach is actually fully broken and based on assumptions that are
    no longer valid.
    
    With the introduction of Simple Pairing support, the creation of low-level
    ACL links got changed. This change invalidates the reason why in the past
    two independent work queues have been used for adding/removing sysfs
    devices. The adding of the actual sysfs device is now postponed until the
    host controller successfully assigns an unique handle to that link. So
    the real synchronization happens inside the controller and not the host.
    
    The only left-over problem is that some internals of the sysfs device
    handling are not initialized ahead of time. This leaves potential access
    to invalid data and can cause various NULL pointer dereferences. To fix
    this a new function makes sure that all sysfs details are initialized
    when an connection attempt is made. The actual sysfs device is only
    registered when the connection has been successfully established. To
    avoid a race condition with the registration, the check if a device is
    registered has been moved into the removal work.
    
    As an extra protection two flush_work() calls are left in place to
    make sure a previous add/del work has been completed first.
    
    Based on a report by Marc Pignat <marc.pignat@hevs.ch>
    
    Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
    Tested-by: Justin P. Mattock <justinmattock@gmail.com>
    Tested-by: Roger Quadros <ext-roger.quadros@nokia.com>
    Tested-by: Marc Pignat <marc.pignat@hevs.ch>
    holtmann authored and verygreen committed Mar 13, 2011
    Copy the full SHA
    a1defe7 View commit details

Commits on Apr 8, 2011

  1. Update omap3621_nookcolor_defconfig

    Add cifs and iptables support.
    dalingrin committed Apr 8, 2011
    Copy the full SHA
    065f152 View commit details

Commits on Apr 19, 2011

  1. Ignore bootloader passed args

    Added kernel config option to ignore kernel
    command line args passed by the bootloader.
    dalingrin authored and fattire committed Apr 19, 2011
    Copy the full SHA
    f52d8d3 View commit details
  2. defconfig fix for screenshots, using 6/5M values. Currently being tes…

    …ted in Dalingrin's OC kernel.
    fattire committed Apr 19, 2011
    Copy the full SHA
    d9404e2 View commit details
  3. Copy the full SHA
    de1f96c View commit details

Commits on Apr 28, 2011

  1. Defconfig: Add PPP support

    dalingrin committed Apr 28, 2011
    Copy the full SHA
    c690f10 View commit details
Showing with 19,243 additions and 8,144 deletions.
  1. +7 −0 arch/arm/Kconfig
  2. +143 −30 arch/arm/configs/omap3621_nookcolor_defconfig
  3. +2 −0 arch/arm/kernel/setup.c
  4. +9 −10 arch/arm/mach-omap2/board-3621_evt1a.c
  5. +5 −124 arch/arm/mach-omap2/dspbridge.c
  6. +3 −0 arch/arm/mach-omap2/mux.c
  7. +1 −1 arch/arm/mach-omap2/omap3-opp.h
  8. +11 −3 arch/arm/plat-omap/cpu-omap.c
  9. +1 −1 arch/arm/plat-omap/devices.c
  10. +49 −22 arch/arm/plat-omap/include/dspbridge/_chnl_sm.h
  11. +40 −3 arch/arm/plat-omap/include/dspbridge/_dcd.h
  12. +17 −2 arch/arm/plat-omap/include/dspbridge/brddefs.h
  13. +48 −2 arch/arm/plat-omap/include/dspbridge/cfg.h
  14. +26 −2 arch/arm/plat-omap/include/dspbridge/cfgdefs.h
  15. +40 −5 arch/arm/plat-omap/include/dspbridge/chnl.h
  16. +168 −0 arch/arm/plat-omap/include/dspbridge/chnl_sm.h
  17. +26 −2 arch/arm/plat-omap/include/dspbridge/chnldefs.h
  18. +30 −3 arch/arm/plat-omap/include/dspbridge/chnlpriv.h
  19. +11 −3 arch/arm/plat-omap/include/dspbridge/clk.h
  20. +52 −18 arch/arm/plat-omap/include/dspbridge/cmm.h
  21. +34 −4 arch/arm/plat-omap/include/dspbridge/cmmdefs.h
  22. +54 −5 arch/arm/plat-omap/include/dspbridge/cod.h
  23. +135 −0 arch/arm/plat-omap/include/dspbridge/csl.h
  24. +29 −17 arch/arm/plat-omap/include/dspbridge/dbc.h
  25. +24 −2 arch/arm/plat-omap/include/dspbridge/dbdcd.h
  26. +25 −2 arch/arm/plat-omap/include/dspbridge/dbdcddef.h
  27. +93 −43 arch/arm/plat-omap/include/dspbridge/dbdefs.h
  28. +27 −6 arch/arm/plat-omap/include/dspbridge/dbg.h
  29. +12 −0 arch/arm/plat-omap/include/dspbridge/dbldefs.h
  30. +12 −6 arch/arm/plat-omap/include/dspbridge/dbll.h
  31. +11 −0 arch/arm/plat-omap/include/dspbridge/dblldefs.h
  32. +113 −0 arch/arm/plat-omap/include/dspbridge/dbreg.h
  33. +17 −4 arch/arm/plat-omap/include/dspbridge/dbtype.h
  34. +12 −2 arch/arm/plat-omap/include/dspbridge/dehdefs.h
  35. +62 −2 arch/arm/plat-omap/include/dspbridge/dev.h
  36. +12 −3 arch/arm/plat-omap/include/dspbridge/devdefs.h
  37. +29 −2 arch/arm/plat-omap/include/dspbridge/disp.h
  38. +14 −4 arch/arm/plat-omap/include/dspbridge/dispdefs.h
  39. +16 −4 arch/arm/plat-omap/include/dspbridge/dmm.h
  40. +167 −0 arch/arm/plat-omap/include/dspbridge/dpc.h
  41. +72 −35 arch/arm/plat-omap/include/dspbridge/drv.h
  42. +11 −2 arch/arm/plat-omap/include/dspbridge/drvdefs.h
  43. +30 −3 arch/arm/plat-omap/include/dspbridge/dspdrv.h
  44. +2 −0 arch/arm/plat-omap/include/dspbridge/dynamic_loader.h
  45. +71 −8 arch/arm/plat-omap/include/dspbridge/errbase.h
  46. +8 −2 arch/arm/plat-omap/include/dspbridge/gb.h
  47. +13 −8 arch/arm/plat-omap/include/dspbridge/getsection.h
  48. +8 −3 arch/arm/plat-omap/include/dspbridge/gh.h
  49. +10 −5 arch/arm/plat-omap/include/dspbridge/gs.h
  50. +25 −18 arch/arm/plat-omap/include/dspbridge/gt.h
  51. +14 −13 arch/arm/plat-omap/include/dspbridge/host_os.h
  52. +19 −2 arch/arm/plat-omap/include/dspbridge/io.h
  53. +47 −32 arch/arm/plat-omap/include/dspbridge/io_sm.h
  54. +11 −2 arch/arm/plat-omap/include/dspbridge/iodefs.h
  55. +216 −0 arch/arm/plat-omap/include/dspbridge/kfile.h
  56. +28 −6 arch/arm/plat-omap/include/dspbridge/ldr.h
  57. +131 −59 arch/arm/plat-omap/include/dspbridge/list.h
  58. +20 −5 arch/arm/plat-omap/include/dspbridge/mbx_sh.h
  59. +97 −17 arch/arm/plat-omap/include/dspbridge/mem.h
  60. +17 −2 arch/arm/plat-omap/include/dspbridge/memdefs.h
  61. +30 −2 arch/arm/plat-omap/include/dspbridge/mgr.h
  62. +12 −2 arch/arm/plat-omap/include/dspbridge/mgrpriv.h
  63. +22 −2 arch/arm/plat-omap/include/dspbridge/msg.h
  64. +13 −2 arch/arm/plat-omap/include/dspbridge/msgdefs.h
  65. +28 −5 arch/arm/plat-omap/include/dspbridge/nldr.h
  66. +13 −2 arch/arm/plat-omap/include/dspbridge/nldrdefs.h
  67. +48 −16 arch/arm/plat-omap/include/dspbridge/node.h
  68. +14 −2 arch/arm/plat-omap/include/dspbridge/nodedefs.h
  69. +21 −2 arch/arm/plat-omap/include/dspbridge/nodepriv.h
  70. +20 −2 arch/arm/plat-omap/include/dspbridge/ntfy.h
  71. +69 −25 arch/arm/plat-omap/include/dspbridge/proc.h
  72. +11 −2 arch/arm/plat-omap/include/dspbridge/procpriv.h
  73. +19 −0 arch/arm/plat-omap/include/dspbridge/pwr.h
  74. +10 −2 arch/arm/plat-omap/include/dspbridge/pwr_sh.h
  75. +33 −2 arch/arm/plat-omap/include/dspbridge/reg.h
  76. +18 −1 arch/arm/plat-omap/include/dspbridge/resourcecleanup.h
  77. +22 −4 arch/arm/plat-omap/include/dspbridge/rmm.h
  78. +31 −3 arch/arm/plat-omap/include/dspbridge/rms_sh.h
  79. +13 −2 arch/arm/plat-omap/include/dspbridge/rmstypes.h
  80. +15 −2 arch/arm/plat-omap/include/dspbridge/services.h
  81. +48 −0 arch/arm/plat-omap/include/dspbridge/std.h
  82. +39 −2 arch/arm/plat-omap/include/dspbridge/strm.h
  83. +12 −2 arch/arm/plat-omap/include/dspbridge/strmdefs.h
  84. +38 −2 arch/arm/plat-omap/include/dspbridge/sync.h
  85. +14 −2 arch/arm/plat-omap/include/dspbridge/utildefs.h
  86. +14 −2 arch/arm/plat-omap/include/dspbridge/uuidutil.h
  87. +37 −12 arch/arm/plat-omap/include/dspbridge/wcd.h
  88. +104 −55 arch/arm/plat-omap/include/dspbridge/wcdioctl.h
  89. +47 −14 arch/arm/plat-omap/include/dspbridge/wmd.h
  90. +23 −8 arch/arm/plat-omap/include/dspbridge/wmdchnl.h
  91. +24 −6 arch/arm/plat-omap/include/dspbridge/wmddeh.h
  92. +18 −6 arch/arm/plat-omap/include/dspbridge/wmdio.h
  93. +24 −2 arch/arm/plat-omap/include/dspbridge/wmdioctl.h
  94. +20 −7 arch/arm/plat-omap/include/dspbridge/wmdmsg.h
  95. +5 −0 arch/arm/plat-omap/include/mach/.directory
  96. +1 −1 arch/arm/plat-omap/include/mach/board-boxer.h
  97. +3 −0 arch/arm/plat-omap/include/mach/mux.h
  98. +3 −0 arch/arm/plat-omap/include/mach/omap34xx.h
  99. +40 −0 arch/arm/plat-omap/include/plat/dsp_common.h
  100. +1 −1 arch/arm/plat-omap/omap-pm-srf.c
  101. +1 −1 drivers/cpufreq/cpufreq_ondemand.c
  102. +4 −0 drivers/cpufreq/freq_table.c
  103. +39 −0 drivers/dsp/bridge/Kbuild
  104. +7 −21 drivers/dsp/bridge/Kconfig
  105. +2 −0 drivers/dsp/bridge/dynload/dload_internal.h
  106. +10 −7 drivers/dsp/bridge/dynload/doff.h
  107. +2 −0 drivers/dsp/bridge/dynload/getsection.c
  108. +2 −0 drivers/dsp/bridge/dynload/header.h
  109. +44 −38 drivers/dsp/bridge/dynload/module_list.h
  110. +28 −15 drivers/dsp/bridge/dynload/params.h
  111. +13 −16 drivers/dsp/bridge/dynload/reloc.c
  112. +2 −0 drivers/dsp/bridge/dynload/reloc_table.h
  113. +1 −0 drivers/dsp/bridge/dynload/reloc_table_c6000.c
  114. +5 −13 drivers/dsp/bridge/dynload/tramp.c
  115. +5 −13 drivers/dsp/bridge/dynload/tramp_table_c6000.c
  116. +19 −7 drivers/dsp/bridge/gen/_gt_para.c
  117. +15 −2 drivers/dsp/bridge/gen/gb.c
  118. +5 −22 drivers/dsp/bridge/gen/gh.c
  119. +23 −6 drivers/dsp/bridge/gen/gs.c
  120. +15 −3 drivers/dsp/bridge/gen/gt.c
  121. +18 −2 drivers/dsp/bridge/gen/uuidutil.c
  122. +12 −4 drivers/dsp/bridge/hw/GlobalTypes.h
  123. +15 −0 drivers/dsp/bridge/hw/IPIAccInt.h
  124. +2 −0 drivers/dsp/bridge/hw/IVA2RegAcM.h
  125. +1 −0 drivers/dsp/bridge/hw/MLBAccInt.h
  126. +169 −150 drivers/dsp/bridge/hw/MLBRegAcM.h
  127. +222 −194 drivers/dsp/bridge/hw/MMURegAcM.h
  128. +633 −564 drivers/dsp/bridge/hw/PRCMRegAcM.h
  129. +16 −5 drivers/dsp/bridge/hw/hw_defs.h
  130. +11 −2 drivers/dsp/bridge/hw/hw_dspssC64P.c
  131. +13 −2 drivers/dsp/bridge/hw/hw_dspssC64P.h
  132. +257 −0 drivers/dsp/bridge/hw/hw_mbox.c
  133. +345 −0 drivers/dsp/bridge/hw/hw_mbox.h
  134. +17 −3 drivers/dsp/bridge/hw/hw_mmu.c
  135. +15 −3 drivers/dsp/bridge/hw/hw_mmu.h
  136. +14 −4 drivers/dsp/bridge/hw/hw_prcm.c
  137. +10 −2 drivers/dsp/bridge/hw/hw_prcm.h
  138. +91 −15 drivers/dsp/bridge/pmgr/chnl.c
  139. +18 −3 drivers/dsp/bridge/pmgr/chnlobj.h
  140. +203 −79 drivers/dsp/bridge/pmgr/cmm.c
  141. +135 −27 drivers/dsp/bridge/pmgr/cod.c
  142. +1,385 −0 drivers/dsp/bridge/pmgr/dbl.c
  143. +118 −101 drivers/dsp/bridge/pmgr/dbll.c
  144. +332 −48 drivers/dsp/bridge/pmgr/dev.c
  145. +92 −15 drivers/dsp/bridge/pmgr/dmm.c
  146. +59 −10 drivers/dsp/bridge/pmgr/io.c
  147. +16 −3 drivers/dsp/bridge/pmgr/ioobj.h
  148. +46 −17 drivers/dsp/bridge/pmgr/msg.c
  149. +16 −3 drivers/dsp/bridge/pmgr/msgobj.h
  150. +284 −326 drivers/dsp/bridge/pmgr/wcd.c
  151. +232 −57 drivers/dsp/bridge/rmgr/dbdcd.c
  152. +180 −40 drivers/dsp/bridge/rmgr/disp.c
  153. +553 −196 drivers/dsp/bridge/rmgr/drv.c
  154. +323 −289 drivers/dsp/bridge/rmgr/drv_interface.c
  155. +12 −0 drivers/dsp/bridge/rmgr/drv_interface.h
  156. +106 −12 drivers/dsp/bridge/rmgr/dspdrv.c
  157. +105 −21 drivers/dsp/bridge/rmgr/mgr.c
  158. +182 −135 drivers/dsp/bridge/rmgr/nldr.c
  159. +655 −325 drivers/dsp/bridge/rmgr/node.c
  160. +739 −353 drivers/dsp/bridge/rmgr/proc.c
  161. +17 −2 drivers/dsp/bridge/rmgr/pwr.c
  162. +81 −25 drivers/dsp/bridge/rmgr/rmm.c
  163. +234 −74 drivers/dsp/bridge/rmgr/strm.c
  164. +184 −51 drivers/dsp/bridge/services/cfg.c
  165. +72 −67 drivers/dsp/bridge/services/clk.c
  166. +173 −0 drivers/dsp/bridge/services/csl.c
  167. +36 −5 drivers/dsp/bridge/services/dbg.c
  168. +274 −0 drivers/dsp/bridge/services/dpc.c
  169. +338 −0 drivers/dsp/bridge/services/kfile.c
  170. +279 −0 drivers/dsp/bridge/services/list.c
  171. +369 −13 drivers/dsp/bridge/services/mem.c
  172. +39 −22 drivers/dsp/bridge/services/ntfy.c
  173. +43 −14 drivers/dsp/bridge/services/reg.c
  174. +148 −66 drivers/dsp/bridge/services/regsup.c
  175. +11 −0 drivers/dsp/bridge/services/regsup.h
  176. +96 −39 drivers/dsp/bridge/services/services.c
  177. +174 −27 drivers/dsp/bridge/services/sync.c
  178. +18 −4 drivers/dsp/bridge/wmd/_cmm.h
  179. +13 −5 drivers/dsp/bridge/wmd/_deh.h
  180. +20 −5 drivers/dsp/bridge/wmd/_msg_sm.h
  181. +56 −56 drivers/dsp/bridge/wmd/_tiomap.h
  182. +14 −2 drivers/dsp/bridge/wmd/_tiomap_mmu.h
  183. +17 −2 drivers/dsp/bridge/wmd/_tiomap_pwr.h
  184. +11 −2 drivers/dsp/bridge/wmd/_tiomap_util.h
  185. +252 −149 drivers/dsp/bridge/wmd/chnl_sm.c
  186. +809 −1,185 drivers/dsp/bridge/wmd/io_sm.c
  187. +48 −11 drivers/dsp/bridge/wmd/mmu_fault.c
  188. +13 −3 drivers/dsp/bridge/wmd/mmu_fault.h
  189. +105 −86 drivers/dsp/bridge/wmd/msg_sm.c
  190. +254 −117 drivers/dsp/bridge/wmd/tiomap3430.c
  191. +154 −105 drivers/dsp/bridge/wmd/tiomap3430_pwr.c
  192. +71 −85 drivers/dsp/bridge/wmd/tiomap_io.c
  193. +13 −4 drivers/dsp/bridge/wmd/tiomap_io.h
  194. +174 −0 drivers/dsp/bridge/wmd/tiomap_sm.c
  195. +93 −117 drivers/dsp/bridge/wmd/ue_deh.c
  196. +11 −31 drivers/usb/gadget/android.c
  197. +178 −32 drivers/usb/gadget/composite.c
  198. +2 −2 drivers/usb/gadget/config.c
  199. +24 −0 drivers/usb/gadget/f_acm.h
  200. +1 −1 drivers/usb/gadget/f_adb.c
  201. +25 −0 drivers/usb/gadget/f_adb.h
  202. +1,779 −1,598 drivers/usb/gadget/f_mass_storage.c
  203. +52 −0 drivers/usb/gadget/f_mass_storage.h
  204. +50 −25 drivers/usb/gadget/f_rndis.c
  205. +3 −2 drivers/usb/gadget/f_serial.c
  206. +68 −57 drivers/usb/gadget/rndis.c
  207. +784 −0 drivers/usb/gadget/storage_common.c
  208. +8 −2 drivers/usb/gadget/u_ether.c
  209. +1 −8 drivers/usb/gadget/u_ether.h
  210. +1 −1 drivers/video/omap2/displays/panel-boxer.c
  211. +6 −0 include/linux/cyttsp.h
  212. +0 −2 include/linux/usb/android_composite.h
  213. +15 −1 include/linux/usb/composite.h
  214. +11 −3 include/linux/usb/gadget.h
  215. +11 −3 include/net/bluetooth/hci.h
  216. +8 −2 include/net/bluetooth/hci_core.h
  217. +2 −0 include/net/bluetooth/l2cap.h
  218. +3 −1 include/net/bluetooth/sco.h
  219. +74 −19 net/bluetooth/hci_conn.c
  220. +4 −2 net/bluetooth/hci_core.c
  221. +19 −18 net/bluetooth/hci_event.c
  222. +40 −34 net/bluetooth/hci_sysfs.c
  223. +16 −4 net/bluetooth/l2cap.c
  224. +36 −18 net/bluetooth/sco.c
7 changes: 7 additions & 0 deletions arch/arm/Kconfig
Original file line number Diff line number Diff line change
@@ -1083,6 +1083,13 @@ config CMDLINE
time by entering them here. As a minimum, you should specify the
memory size and the root device (e.g., mem=64M root=/dev/nfs).

config IGNORE_BOOT_ARGS
bool "Ignore bootloader command line args"
default n
help
Ignore the command line args passed from the bootloader and use
default command line args defined in CONFIG_CMDLINE

config XIP_KERNEL
bool "Kernel Execute-In-Place from ROM"
depends on !ZBOOT_ROM
173 changes: 143 additions & 30 deletions arch/arm/configs/omap3621_nookcolor_defconfig
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.29-omap1
# Sun Jan 30 20:58:25 2011
# Tue Apr 26 23:47:20 2011
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -335,7 +335,8 @@ CONFIG_ALIGNMENT_TRAP=y
#
CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0
CONFIG_CMDLINE="root=/dev/nfs nfsroot=192.168.0.1:/home/user/buildroot ip=192.168.0.2:192.168.0.1:192.168.0.1:255.255.255.0:tgt:eth0:off rw console=ttyS2,115200n8"
CONFIG_CMDLINE="console=ttyS0,115200n8 androidboot.console=ttyS0 initrd rw init=/init videoout=omap24xxvout omap_vout.video1_numbuffers=6 omap_vout.vid1_static_vrfb_alloc=y omapfb.vram=0:5M"
CONFIG_IGNORE_BOOT_ARGS=y
# CONFIG_XIP_KERNEL is not set
# CONFIG_KEXEC is not set

@@ -350,10 +351,10 @@ CONFIG_CPU_FREQ_STAT=y
# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE=y
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
CONFIG_CPU_FREQ_GOV_POWERSAVE=y
# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
CONFIG_CPU_FREQ_GOV_USERSPACE=y
CONFIG_CPU_FREQ_GOV_ONDEMAND=y
CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
@@ -426,8 +427,13 @@ CONFIG_NET_KEY=y
CONFIG_NET_KEY_MIGRATE=y
CONFIG_INET=y
CONFIG_IP_MULTICAST=y
# CONFIG_IP_ADVANCED_ROUTER is not set
CONFIG_IP_ADVANCED_ROUTER=y
CONFIG_ASK_IP_FIB_HASH=y
# CONFIG_IP_FIB_TRIE is not set
CONFIG_IP_FIB_HASH=y
# CONFIG_IP_MULTIPLE_TABLES is not set
# CONFIG_IP_ROUTE_MULTIPATH is not set
# CONFIG_IP_ROUTE_VERBOSE is not set
# CONFIG_IP_PNP is not set
# CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE is not set
@@ -452,7 +458,74 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
# CONFIG_IPV6 is not set
CONFIG_ANDROID_PARANOID_NETWORK=y
# CONFIG_NETWORK_SECMARK is not set
# CONFIG_NETFILTER is not set
CONFIG_NETFILTER=y
# CONFIG_NETFILTER_DEBUG is not set
CONFIG_NETFILTER_ADVANCED=y

#
# Core Netfilter Configuration
#
# CONFIG_NETFILTER_NETLINK_QUEUE is not set
# CONFIG_NETFILTER_NETLINK_LOG is not set
# CONFIG_NF_CONNTRACK is not set
CONFIG_NETFILTER_XTABLES=y
# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
CONFIG_NETFILTER_XT_TARGET_MARK=y
# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
# CONFIG_NETFILTER_XT_MATCH_ESP is not set
# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
# CONFIG_NETFILTER_XT_MATCH_MAC is not set
CONFIG_NETFILTER_XT_MATCH_MARK=y
# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
CONFIG_NETFILTER_XT_MATCH_OWNER=y
CONFIG_NETFILTER_XT_MATCH_POLICY=y
# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
# CONFIG_NETFILTER_XT_MATCH_REALM is not set
# CONFIG_NETFILTER_XT_MATCH_RECENT is not set
# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
# CONFIG_NETFILTER_XT_MATCH_STRING is not set
# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
# CONFIG_NETFILTER_XT_MATCH_TIME is not set
# CONFIG_NETFILTER_XT_MATCH_U32 is not set
# CONFIG_IP_VS is not set

#
# IP: Netfilter Configuration
#
# CONFIG_NF_DEFRAG_IPV4 is not set
# CONFIG_IP_NF_QUEUE is not set
CONFIG_IP_NF_IPTABLES=y
CONFIG_IP_NF_MATCH_ADDRTYPE=y
CONFIG_IP_NF_MATCH_AH=y
CONFIG_IP_NF_MATCH_ECN=y
CONFIG_IP_NF_MATCH_TTL=y
CONFIG_IP_NF_FILTER=y
CONFIG_IP_NF_TARGET_REJECT=y
CONFIG_IP_NF_TARGET_LOG=y
CONFIG_IP_NF_TARGET_ULOG=y
CONFIG_IP_NF_TARGET_IDLETIMER=y
CONFIG_IP_NF_MANGLE=y
CONFIG_IP_NF_TARGET_ECN=y
CONFIG_IP_NF_TARGET_TTL=y
CONFIG_IP_NF_RAW=y
CONFIG_IP_NF_ARPTABLES=y
CONFIG_IP_NF_ARPFILTER=y
CONFIG_IP_NF_ARP_MANGLE=y
# CONFIG_IP_DCCP is not set
# CONFIG_IP_SCTP is not set
# CONFIG_TIPC is not set
@@ -479,14 +552,23 @@ CONFIG_ANDROID_PARANOID_NETWORK=y
# CONFIG_CAN is not set
# CONFIG_IRDA is not set
CONFIG_BT=y
# CONFIG_BT_L2CAP is not set
# CONFIG_BT_SCO is not set
CONFIG_BT_L2CAP=y
CONFIG_BT_SCO=y
CONFIG_BT_RFCOMM=y
CONFIG_BT_RFCOMM_TTY=y
CONFIG_BT_BNEP=y
# CONFIG_BT_BNEP_MC_FILTER is not set
# CONFIG_BT_BNEP_PROTO_FILTER is not set
CONFIG_BT_HIDP=y

#
# Bluetooth device drivers
#
# CONFIG_BT_HCIBTSDIO is not set
# CONFIG_BT_HCIUART is not set
CONFIG_BT_HCIBTSDIO=y
CONFIG_BT_HCIUART=y
CONFIG_BT_HCIUART_H4=y
# CONFIG_BT_HCIUART_BCSP is not set
CONFIG_BT_HCIUART_LL=y
# CONFIG_BT_HCIBRF6150 is not set
# CONFIG_BT_HCIH4P is not set
# CONFIG_BT_HCIVHCI is not set
@@ -546,7 +628,7 @@ CONFIG_ANDROID_PMEM=y
CONFIG_WL127X_RFKILL=y
# CONFIG_APANIC is not set
CONFIG_APANIC_PLABEL="kpanic"
CONFIG_BUILD_TI_ST=y
# CONFIG_BUILD_TI_ST is not set
# CONFIG_MAX9635 is not set
# CONFIG_C2PORT is not set

@@ -561,8 +643,8 @@ CONFIG_BUILD_TI_ST=y
#
# Texas Instruments shared transport line discipline
#
CONFIG_TI_ST=y
CONFIG_TI_ST_BT=y
# CONFIG_TI_ST is not set
# CONFIG_TI_ST_BT is not set
# CONFIG_TI_ST_FM is not set
# CONFIG_TI_ST_GPS is not set
CONFIG_HAVE_IDE=y
@@ -627,7 +709,7 @@ CONFIG_NETDEVICES=y
# CONFIG_BONDING is not set
# CONFIG_MACVLAN is not set
# CONFIG_EQUALIZER is not set
# CONFIG_TUN is not set
CONFIG_TUN=y
# CONFIG_VETH is not set
# CONFIG_NET_ETHERNET is not set
# CONFIG_NETDEV_1000 is not set
@@ -644,8 +726,20 @@ CONFIG_NETDEVICES=y
# Enable WiMAX (Networking options) to see the WiMAX drivers
#
# CONFIG_WAN is not set
# CONFIG_PPP is not set
CONFIG_PPP=y
CONFIG_PPP_MULTILINK=y
CONFIG_PPP_FILTER=y
CONFIG_PPP_ASYNC=y
CONFIG_PPP_SYNC_TTY=y
CONFIG_PPP_DEFLATE=y
CONFIG_PPP_BSDCOMP=y
CONFIG_PPP_MPPE=y
CONFIG_PPPOE=y
CONFIG_PPPOL2TP=y
CONFIG_PPPOLAC=y
CONFIG_PPPOPNS=y
# CONFIG_SLIP is not set
CONFIG_SLHC=y
# CONFIG_NETCONSOLE is not set
# CONFIG_NETPOLL is not set
# CONFIG_NET_POLL_CONTROLLER is not set
@@ -828,7 +922,7 @@ CONFIG_SPI_OMAP24XX=y
CONFIG_ARCH_REQUIRE_GPIOLIB=y
CONFIG_GPIOLIB=y
# CONFIG_DEBUG_GPIO is not set
# CONFIG_GPIO_SYSFS is not set
CONFIG_GPIO_SYSFS=y

#
# Memory mapped GPIO expanders:
@@ -1065,14 +1159,16 @@ CONFIG_LOGO_LINUX_MONO=y
CONFIG_LOGO_LINUX_VGA16=y
CONFIG_LOGO_LINUX_CLUT224=y
CONFIG_SOUND=y
# CONFIG_SOUND_OSS_CORE is not set
CONFIG_SOUND_OSS_CORE=y
CONFIG_SND=y
CONFIG_SND_TIMER=y
CONFIG_SND_PCM=y
CONFIG_SND_JACK=y
# CONFIG_SND_SEQUENCER is not set
# CONFIG_SND_MIXER_OSS is not set
# CONFIG_SND_PCM_OSS is not set
CONFIG_SND_OSSEMUL=y
CONFIG_SND_MIXER_OSS=m
CONFIG_SND_PCM_OSS=m
CONFIG_SND_PCM_OSS_PLUGINS=y
# CONFIG_SND_HRTIMER is not set
# CONFIG_SND_DYNAMIC_MINORS is not set
CONFIG_SND_SUPPORT_OLD_API=y
@@ -1108,6 +1204,7 @@ CONFIG_HID=y
# Special HID drivers
#
CONFIG_HID_COMPAT=y
# CONFIG_HID_APPLE is not set
CONFIG_USB_SUPPORT=y
CONFIG_USB_ARCH_HAS_HCD=y
CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1332,13 +1429,15 @@ CONFIG_ANDROID_LOW_MEMORY_KILLER=y
#
# CONFIG_CBUS is not set
CONFIG_MPU_BRIDGE=y
CONFIG_BRIDGE_DVFS=y
# CONFIG_BRIDGE_DVFS is not set
CONFIG_BRIDGE_MEMPOOL_SIZE=0x600000
# CONFIG_BRIDGE_DEBUG is not set
CONFIG_BRIDGE_WDT3=y
CONFIG_WDT_TIMEOUT=5
# CONFIG_BRIDGE_RECOVERY is not set
CONFIG_BRIDGE_CACHE_LINE_CHECK=y

#
# Bridge Hacking
#
# CONFIG_BRIDGE_CHECK_ALIGN_128 is not set

#
# Bridge Notifications
@@ -1424,7 +1523,21 @@ CONFIG_MISC_FILESYSTEMS=y
# CONFIG_ROMFS_FS is not set
# CONFIG_SYSV_FS is not set
# CONFIG_UFS_FS is not set
# CONFIG_NETWORK_FILESYSTEMS is not set
CONFIG_NETWORK_FILESYSTEMS=y
# CONFIG_NFS_FS is not set
# CONFIG_NFSD is not set
# CONFIG_SMB_FS is not set
CONFIG_CIFS=y
CONFIG_CIFS_STATS=y
CONFIG_CIFS_STATS2=y
CONFIG_CIFS_WEAK_PW_HASH=y
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y
CONFIG_CIFS_DEBUG2=y
CONFIG_CIFS_EXPERIMENTAL=y
# CONFIG_NCP_FS is not set
# CONFIG_CODA_FS is not set
# CONFIG_AFS_FS is not set

#
# Partition Types
@@ -1486,7 +1599,7 @@ CONFIG_NLS_ISO8859_1=y
# CONFIG_NLS_ISO8859_15 is not set
# CONFIG_NLS_KOI8_R is not set
# CONFIG_NLS_KOI8_U is not set
# CONFIG_NLS_UTF8 is not set
CONFIG_NLS_UTF8=y
# CONFIG_DLM is not set

#
@@ -1607,9 +1720,9 @@ CONFIG_CRYPTO_MANAGER2=y
CONFIG_CRYPTO_CBC=y
# CONFIG_CRYPTO_CTR is not set
# CONFIG_CRYPTO_CTS is not set
# CONFIG_CRYPTO_ECB is not set
CONFIG_CRYPTO_ECB=y
# CONFIG_CRYPTO_LRW is not set
# CONFIG_CRYPTO_PCBC is not set
CONFIG_CRYPTO_PCBC=m
# CONFIG_CRYPTO_XTS is not set

#
@@ -1631,7 +1744,7 @@ CONFIG_CRYPTO_MD5=y
# CONFIG_CRYPTO_RMD320 is not set
CONFIG_CRYPTO_SHA1=y
CONFIG_CRYPTO_SHA256=y
# CONFIG_CRYPTO_SHA512 is not set
CONFIG_CRYPTO_SHA512=y
# CONFIG_CRYPTO_TGR192 is not set
# CONFIG_CRYPTO_WP512 is not set

@@ -1640,7 +1753,7 @@ CONFIG_CRYPTO_SHA256=y
#
CONFIG_CRYPTO_AES=y
# CONFIG_CRYPTO_ANUBIS is not set
# CONFIG_CRYPTO_ARC4 is not set
CONFIG_CRYPTO_ARC4=y
# CONFIG_CRYPTO_BLOWFISH is not set
# CONFIG_CRYPTO_CAMELLIA is not set
# CONFIG_CRYPTO_CAST5 is not set
2 changes: 2 additions & 0 deletions arch/arm/kernel/setup.c
Original file line number Diff line number Diff line change
@@ -613,7 +613,9 @@ __tagtable(ATAG_REVISION, parse_tag_revision);

static int __init parse_tag_cmdline(const struct tag *tag)
{
#ifndef CONFIG_IGNORE_BOOT_ARGS
strlcpy(default_command_line, tag->u.cmdline.cmdline, COMMAND_LINE_SIZE);
#endif
return 0;
}

Loading