[oe-commits] org.oe.dev merge of '5a2fb2965a905224af0a1e26d73f342ecf8944e8'
koen commit
oe at amethyst.openembedded.net
Mon Sep 1 17:59:22 UTC 2008
merge of '5a2fb2965a905224af0a1e26d73f342ecf8944e8'
and '6fc6bb1fff3ea7b5546ddedf048c33f9a287ac15'
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: af0c4d3aced36377e834c849548c1d865ac58ed6
ViewMTN: http://monotone.openembedded.org/revision/info/af0c4d3aced36377e834c849548c1d865ac58ed6
Files:
1
conf/machine/beagleboard.conf
packages/tasks/task-base.bb
packages/linux/linux-neuros/neuros-osd2/defconfig
packages/linux/linux-neuros_git.bb
Diffs:
#
# mt diff -r5a2fb2965a905224af0a1e26d73f342ecf8944e8 -raf0c4d3aced36377e834c849548c1d865ac58ed6
#
#
#
# patch "conf/machine/beagleboard.conf"
# from [d9ead88ad9a6d2f71fd898e1f6d3e15ccdda9ade]
# to [0522763e9cc027487e7e483c9c17b62283d48ba8]
#
# patch "packages/tasks/task-base.bb"
# from [dbf6b2fb6b546996379743d91f02f085e4be575f]
# to [0a8a49cbcdc81b29d170d635b8c3eaca4b1a3ba5]
#
============================================================
--- conf/machine/beagleboard.conf d9ead88ad9a6d2f71fd898e1f6d3e15ccdda9ade
+++ conf/machine/beagleboard.conf 0522763e9cc027487e7e483c9c17b62283d48ba8
@@ -4,8 +4,12 @@ PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv
TARGET_ARCH = "arm"
PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6 armv7 armv7a"
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-XSERVER = "xserver-kdrive-fbdev"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+XSERVER = "xserver-xorg \
+ xf86-input-evdev \
+ xf86-input-mouse \
+ xf86-video-fbdev \
+ xf86-input-keyboard"
# Only has DVI connector for external screen
GUI_MACHINE_CLASS = "bigscreen"
@@ -36,4 +40,4 @@ EXTRA_IMAGEDEPENDS += "u-boot x-load"
EXTRA_IMAGEDEPENDS += "u-boot x-load"
# and sdio
+MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa"
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat alsa"
============================================================
--- packages/tasks/task-base.bb dbf6b2fb6b546996379743d91f02f085e4be575f
+++ packages/tasks/task-base.bb 0a8a49cbcdc81b29d170d635b8c3eaca4b1a3ba5
@@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro
DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r71"
+PR = "r72"
inherit task
#
# mt diff -r6fc6bb1fff3ea7b5546ddedf048c33f9a287ac15 -raf0c4d3aced36377e834c849548c1d865ac58ed6
#
#
#
# patch "packages/linux/linux-neuros/neuros-osd2/defconfig"
# from [5539a43b14905d9753ce995624377ab86d43fca7]
# to [a9cfc6eccf84b142b79a01caa34f4e764d525e83]
#
# patch "packages/linux/linux-neuros_git.bb"
# from [46ef1359dfcf607b015434aca3dad642a958af22]
# to [8a2085ca21edfc669ae9d66484f583f97979835a]
#
============================================================
--- packages/linux/linux-neuros/neuros-osd2/defconfig 5539a43b14905d9753ce995624377ab86d43fca7
+++ packages/linux/linux-neuros/neuros-osd2/defconfig a9cfc6eccf84b142b79a01caa34f4e764d525e83
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.23-davinci1
-# Thu Mar 6 20:08:16 2008
+# Thu Aug 7 13:02:41 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -32,7 +32,7 @@ CONFIG_LOCALVERSION=""
CONFIG_BROKEN_ON_SMP=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_LOCALVERSION_AUTO=y
# CONFIG_SWAP is not set
CONFIG_SYSVIPC=y
CONFIG_SYSVIPC_SYSCTL=y
@@ -188,6 +188,7 @@ CONFIG_ARM_THUMB=y
# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
# CONFIG_CPU_CACHE_ROUND_ROBIN is not set
# CONFIG_OUTER_CACHE is not set
+CONFIG_FORCE_MAX_ZONEORDER=13
#
# Bus support
@@ -208,7 +209,8 @@ CONFIG_HZ=100
# CONFIG_HIGH_RES_TIMERS is not set
# CONFIG_PREEMPT is not set
CONFIG_HZ=100
-# CONFIG_AEABI is not set
+CONFIG_AEABI=y
+CONFIG_OABI_COMPAT=y
# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
CONFIG_SELECT_MEMORY_MODEL=y
CONFIG_FLATMEM_MANUAL=y
@@ -231,7 +233,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0
#
CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE=""
+CONFIG_CMDLINE=" debug "
# CONFIG_XIP_KERNEL is not set
# CONFIG_KEXEC is not set
@@ -252,7 +254,6 @@ CONFIG_BINFMT_ELF=y
CONFIG_BINFMT_ELF=y
# CONFIG_BINFMT_AOUT is not set
# CONFIG_BINFMT_MISC is not set
-# CONFIG_ARTHUR is not set
#
# Power management options
@@ -377,12 +378,17 @@ CONFIG_NETFILTER=y
# Wireless
#
# CONFIG_CFG80211 is not set
-# CONFIG_WIRELESS_EXT is not set
+CONFIG_WIRELESS_EXT=y
# CONFIG_MAC80211 is not set
CONFIG_IEEE80211=y
+# CONFIG_IEEE80211_DEBUG is not set
+CONFIG_IEEE80211_CRYPT_WEP=y
+# CONFIG_IEEE80211_CRYPT_CCMP is not set
+# CONFIG_IEEE80211_CRYPT_TKIP is not set
+CONFIG_IEEE80211_SOFTMAC=y
+# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
# CONFIG_RFKILL is not set
# CONFIG_NET_9P is not set
-CONFIG_IEEE80211_SOFTMAC=y
#
# Device Drivers
@@ -604,17 +610,21 @@ CONFIG_NET_ETHERNET=y
# CONFIG_MII is not set
# CONFIG_AX88796 is not set
# CONFIG_SMC91X is not set
+CONFIG_TI_DAVINCI_EMAC=y
# CONFIG_DM9000 is not set
CONFIG_NETDEV_1000=y
CONFIG_NETDEV_10000=y
-CONFIG_TI_DAVINCI_EMAC=y
#
# Wireless LAN
#
# CONFIG_WLAN_PRE80211 is not set
CONFIG_WLAN_80211=y
+# CONFIG_LIBERTAS is not set
+# CONFIG_USB_ZD1201 is not set
+# CONFIG_HOSTAP is not set
CONFIG_ZD1211RW=y
+# CONFIG_ZD1211RW_DEBUG is not set
#
# USB Network Adapters
@@ -680,6 +690,12 @@ CONFIG_INPUT_MISC=y
# CONFIG_INPUT_TABLET is not set
# CONFIG_INPUT_TOUCHSCREEN is not set
CONFIG_INPUT_MISC=y
+# CONFIG_INPUT_ATI_REMOTE is not set
+# CONFIG_INPUT_ATI_REMOTE2 is not set
+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
+# CONFIG_INPUT_POWERMATE is not set
+# CONFIG_INPUT_YEALINK is not set
+# CONFIG_INPUT_UINPUT is not set
CONFIG_INPUT_NEUROS_IR=m
#
@@ -724,9 +740,9 @@ CONFIG_RESIZER=y
# CONFIG_R3964 is not set
# CONFIG_RAW_DRIVER is not set
CONFIG_RESIZER=y
-CONFIG_THS7313=y
-CONFIG_THS8200=y
# CONFIG_TCG_TPM is not set
+# CONFIG_PREVIEWER is not set
+CONFIG_THS7313=y
CONFIG_I2C=y
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_CHARDEV=y
@@ -766,12 +782,12 @@ CONFIG_SENSORS_TLV320AIC33=y
# CONFIG_SENSORS_MAX6875 is not set
# CONFIG_SENSORS_TSL2550 is not set
# CONFIG_GPIOEXPANDER_DAVINCI is not set
+CONFIG_I2C_NEUROS_MSP430=m
+CONFIG_I2C_NEUROS_SIL9034HDMI=m
# CONFIG_I2C_DEBUG_CORE is not set
# CONFIG_I2C_DEBUG_ALGO is not set
# CONFIG_I2C_DEBUG_BUS is not set
# CONFIG_I2C_DEBUG_CHIP is not set
-CONFIG_I2C_NEUROS_MSP430=m
-CONFIG_I2C_NEUROS_SIL9034HDMI=m
#
# SPI support
@@ -848,10 +864,14 @@ CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
CONFIG_VIDEO_CAPTURE_DRIVERS=y
# CONFIG_VIDEO_ADV_DEBUG is not set
CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
+CONFIG_VIDEO_TVP5150=y
CONFIG_VIDEO_DAVINCI=y
-CONFIG_VIDEO_TVP5150=y
-CONFIG_VIDEO_TVP7000=y
+
+#
+# Video Capture Decoder
+#
# CONFIG_VIDEO_TVP5146 is not set
+CONFIG_VIDEO_TVP7000=y
# CONFIG_VIDEO_CPIA is not set
# CONFIG_VIDEO_CPIA2 is not set
# CONFIG_VIDEO_SAA5246A is not set
@@ -880,6 +900,7 @@ CONFIG_RADIO_ADAPTERS=y
# CONFIG_RADIO_TEA5761 is not set
# CONFIG_USB_DSBR is not set
# CONFIG_DVB_CORE is not set
+CONFIG_VIDEO_BUF=y
CONFIG_DAB=y
# CONFIG_USB_DABUSB is not set
@@ -894,6 +915,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y
# CONFIG_DISPLAY_SUPPORT is not set
# CONFIG_VGASTATE is not set
CONFIG_VIDEO_OUTPUT_CONTROL=y
+CONFIG_THS8200=y
CONFIG_FB=y
CONFIG_FIRMWARE_EDID=y
# CONFIG_FB_DDC is not set
@@ -918,6 +940,7 @@ CONFIG_FB_DM=y
# CONFIG_FB_DAVINCI is not set
# CONFIG_FB_VIRTUAL is not set
CONFIG_FB_DM=y
+
#
# Console display driver support
#
@@ -929,10 +952,7 @@ CONFIG_FONT_8x16=y
# CONFIG_FONTS is not set
CONFIG_FONT_8x8=y
CONFIG_FONT_8x16=y
-CONFIG_LOGO=y
-CONFIG_LOGO_LINUX_MONO=y
-CONFIG_LOGO_LINUX_VGA16=y
-CONFIG_LOGO_LINUX_CLUT224=y
+# CONFIG_LOGO is not set
#
# Sound
@@ -951,7 +971,8 @@ CONFIG_SOUND_DAVINCI=y
# CONFIG_SOUND_MSNDCLAS is not set
# CONFIG_SOUND_MSNDPIN is not set
CONFIG_SOUND_DAVINCI=y
-CONFIG_SOUND_DAVINCI_AIC32=y
+CONFIG_SOUND_DAVINCI_AIC32=m
+# CONFIG_SOUND_DAVINCI_AIC33 is not set
#
# DaVinci Audio Options
@@ -1003,9 +1024,10 @@ CONFIG_USB_MUSB_HOST=y
# DaVinci 644x USB support
#
CONFIG_USB_MUSB_HOST=y
-# CONFIG_USB_MUSB_PERIPHERAL=y
+# CONFIG_USB_MUSB_PERIPHERAL is not set
# CONFIG_USB_MUSB_OTG is not set
-CONFIG_USB_GADGET_MUSB_HDRC=y
+# CONFIG_USB_GADGET_MUSB_HDRC is not set
+CONFIG_USB_MUSB_HDRC_HCD=y
# CONFIG_MUSB_PIO_ONLY is not set
# CONFIG_USB_INVENTRA_DMA is not set
CONFIG_USB_TI_CPPI_DMA=y
@@ -1092,7 +1114,8 @@ CONFIG_USB_GADGET_SELECTED=y
# CONFIG_USB_GADGET_FSL_USB2 is not set
# CONFIG_USB_GADGET_NET2280 is not set
# CONFIG_USB_GADGET_PXA2XX is not set
-# CONFIG_USB_GADGET_M66592 is not set
+CONFIG_USB_GADGET_M66592=y
+CONFIG_USB_M66592=m
# CONFIG_USB_GADGET_GOKU is not set
# CONFIG_USB_GADGET_LH7A40X is not set
# CONFIG_USB_GADGET_OMAP is not set
@@ -1339,7 +1362,8 @@ CONFIG_NLS_UTF8=m
#
# Profiling support
#
-# CONFIG_PROFILING is not set
+CONFIG_PROFILING=y
+CONFIG_OPROFILE=y
#
# Kernel hacking
@@ -1360,7 +1384,44 @@ CONFIG_FRAME_POINTER=y
#
# CONFIG_KEYS is not set
# CONFIG_SECURITY is not set
-# CONFIG_CRYPTO is not set
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_MANAGER=y
+# CONFIG_CRYPTO_HMAC is not set
+# CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_MD4 is not set
+# CONFIG_CRYPTO_MD5 is not set
+# CONFIG_CRYPTO_SHA1 is not set
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_GF128MUL is not set
+CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_PCBC=m
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+# CONFIG_CRYPTO_DES is not set
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_AES is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_TEA is not set
+CONFIG_CRYPTO_ARC4=y
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_TEST is not set
+CONFIG_CRYPTO_HW=y
#
# Library routines
============================================================
--- packages/linux/linux-neuros_git.bb 46ef1359dfcf607b015434aca3dad642a958af22
+++ packages/linux/linux-neuros_git.bb 8a2085ca21edfc669ae9d66484f583f97979835a
@@ -5,7 +5,7 @@ PV = "2.6.23-${PR}+git${SRCREV}"
SRCREV = "d3e362827237bd002b0ea2d0e2f5ee688bcb5332"
PV = "2.6.23-${PR}+git${SRCREV}"
-PR = "r11"
+PR = "r12"
COMPATIBLE_MACHINE = "(neuros-osd|neuros-osd2)"
More information about the Openembedded-commits
mailing list