[oe-commits] org.oe.dev nylon update:
MartinDietze commit
openembedded-commits at lists.openembedded.org
Thu Nov 2 14:19:05 UTC 2006
nylon update:
- formally added mtx-3 architecture
- pptp support in the linux kernel
Author: MartinDietze at openembedded.org
Branch: org.openembedded.dev
Revision: bfb0a1fb8db8d4e4949fe027cfb6cb8d9a05a75b
ViewMTN: http://monotone.openembedded.org/revision.psp?id=bfb0a1fb8db8d4e4949fe027cfb6cb8d9a05a75b
Files:
1
packages/linux/linux-mtx-3-2.6.15
packages/linux/linux-mtx-3-2.6.15.4
conf/machine/mtx-3.conf
packages/linux/linux-mtx-2-2.4.27/46-otg.patch
packages/linux/linux-mtx-2-2.4.27/47-au1000_eth.patch
packages/linux/linux-mtx-2-2.4.27/48-pptp.patch
packages/linux/linux-mtx-3-2.6.15/00-mtx-3.diff
packages/linux/linux-mtx-3-2.6.15/01-verbose-and-fatal-mkuboot.diff
packages/linux/linux-mtx-3-2.6.15/defconfig-mtx-3
packages/linux/linux-mtx-3-2.6.15.4/00-mtx-3.diff
packages/linux/linux-mtx-3-2.6.15.4/01-verbose-and-fatal-mkuboot.diff
packages/linux/linux-mtx-3-2.6.15.4/defconfig-mtx-3
packages/linux/linux-mtx-3_2.6.15.4.bb
packages/linux/linux-mtx-3_2.6.15.bb
classes/nylon-image.bbclass
conf/distro/nylon.conf
packages/images/nylon-image-base.bb
packages/linux/linux-mtx-1-2.4.27/42-usb-ohci-fixes.patch
packages/linux/linux-mtx-2-2.4.27/00-mtx-2.diff
packages/linux/linux-mtx-2-2.4.27/42-usb-ohci-fixes.patch
packages/linux/linux-mtx-2-2.4.27/defconfig-mtx-2
packages/linux/linux-mtx-2_2.4.27.bb
Diffs:
#
# mt diff -r3a9d9c2fbccf98a13f0b99d39983cc369c3bc39f -rbfb0a1fb8db8d4e4949fe027cfb6cb8d9a05a75b
#
#
#
# add_dir "packages/linux/linux-mtx-3-2.6.15"
#
# add_dir "packages/linux/linux-mtx-3-2.6.15.4"
#
# add_file "conf/machine/mtx-3.conf"
# content [fdb175ac7764898aa9cbdbac8259d104a24fe859]
#
# add_file "packages/linux/linux-mtx-2-2.4.27/46-otg.patch"
# content [dabc4034a238f33e6e3abc27e40b9f1734205b68]
#
# add_file "packages/linux/linux-mtx-2-2.4.27/47-au1000_eth.patch"
# content [22d24febd3da6d81253c2e3f9ee39172d3019699]
#
# add_file "packages/linux/linux-mtx-2-2.4.27/48-pptp.patch"
# content [bcec9e94cce79f927754066315299e7469b5feda]
#
# add_file "packages/linux/linux-mtx-3-2.6.15/00-mtx-3.diff"
# content [499c9f40ad69901b458d16e3dc996b6d38bbdb45]
#
# add_file "packages/linux/linux-mtx-3-2.6.15/01-verbose-and-fatal-mkuboot.diff"
# content [284473d01e7381cc421fa5354e25e636c5936d6c]
#
# add_file "packages/linux/linux-mtx-3-2.6.15/defconfig-mtx-3"
# content [7e2d362c2e255d94355233e5af2ee4523acf97b7]
#
# add_file "packages/linux/linux-mtx-3-2.6.15.4/00-mtx-3.diff"
# content [499c9f40ad69901b458d16e3dc996b6d38bbdb45]
#
# add_file "packages/linux/linux-mtx-3-2.6.15.4/01-verbose-and-fatal-mkuboot.diff"
# content [284473d01e7381cc421fa5354e25e636c5936d6c]
#
# add_file "packages/linux/linux-mtx-3-2.6.15.4/defconfig-mtx-3"
# content [7e2d362c2e255d94355233e5af2ee4523acf97b7]
#
# add_file "packages/linux/linux-mtx-3_2.6.15.4.bb"
# content [3d0a174628c0d5a51fec4f635df97fdc6a6ff476]
#
# add_file "packages/linux/linux-mtx-3_2.6.15.bb"
# content [c306ae82e144cb95c7a1e4da80a1d47673a4ebfd]
#
# patch "classes/nylon-image.bbclass"
# from [7f547f046f485a5385ec484d4d5f39fba533c56f]
# to [243723637914fbc79aba717937ab24f32218b659]
#
# patch "conf/distro/nylon.conf"
# from [587feb9460378c39572f16ef78d17ee4233671f2]
# to [f8c68714a5929223de31e3ee5a6ed3173f44c747]
#
# patch "packages/images/nylon-image-base.bb"
# from [75a2e6a24af68164671d1a4747cc7c7c81c069ef]
# to [2d0553fe134e54ddf297d562f59d1ab002a6e83b]
#
# patch "packages/linux/linux-mtx-1-2.4.27/42-usb-ohci-fixes.patch"
# from [aa81da866e8a656338a98d83a4efa7eea5247a14]
# to [4d3e1a78e570823ae702785a22ac090020ca95b4]
#
# patch "packages/linux/linux-mtx-2-2.4.27/00-mtx-2.diff"
# from [0a77d80a7cdf060af5eef77845396ae4d296c512]
# to [256088104e8f8e0c46beee7da86d5beef4c361f6]
#
# patch "packages/linux/linux-mtx-2-2.4.27/42-usb-ohci-fixes.patch"
# from [aa81da866e8a656338a98d83a4efa7eea5247a14]
# to [4d3e1a78e570823ae702785a22ac090020ca95b4]
#
# patch "packages/linux/linux-mtx-2-2.4.27/defconfig-mtx-2"
# from [c6c86b0c4e731eae020e2773223b002bd308b567]
# to [a3f0571d4b1c47a7c5b0dbaef0b8265962be7c40]
#
# patch "packages/linux/linux-mtx-2_2.4.27.bb"
# from [ff37054d07b40e11e9cf6ae878130609159a57ed]
# to [851912fe8c60027ae465e242aa189d7071936a05]
#
============================================================
--- conf/machine/mtx-3.conf fdb175ac7764898aa9cbdbac8259d104a24fe859
+++ conf/machine/mtx-3.conf fdb175ac7764898aa9cbdbac8259d104a24fe859
@@ -0,0 +1,36 @@
+#@TYPE: Machine
+#@NAME: 4G Systems mtx-3
+#@DESCRIPTION: Machine configuration for the mtx-3 (aka SurfBox 3rd generation)
+
+# hint: the mtx-3 architecture is still in experimental state, no hardware
+# is yet available for it
+
+# TARGET_ARCH should be set here in the machine configuration.
+# For compiling the kernel, ARCH will be derived form it by kernel-arch.bbclass
+TARGET_ARCH = "arm"
+
+IPKG_ARCHS = "all arm ${MACHINE}"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-mtx-3"
+
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n"
+
+TARGET_CC_ARCH = "-march=armv5te"
+#-mtune=arm926ejs"
+
+USE_DEVFS = "1"
+USE_VT = "0"
+SERIAL_CONSOLE = "115200 ttyS0 vt100"
+
+BOOTSTRAP_EXTRA_RDEPENDS += ""
+
+#PREFERRED_VERSION_yamon = "2.24"
+
+
+# FIXME: old srec files as mtx-2 used to do it ... this may need to get adapted sometime!
+
+# create srec files
+#IMAGE_POSTPROCESS_COMMAND += "\
+# ${TARGET_PREFIX}objcopy -O srec -I binary --adjust-vma 0xbe000000 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.${type} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.srec; \
+# grep -v S7 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.srec > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.srec; \
+# grep -v S0 ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_NAME}.flash.srec >> ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.srec; "
============================================================
--- packages/linux/linux-mtx-2-2.4.27/46-otg.patch dabc4034a238f33e6e3abc27e40b9f1734205b68
+++ packages/linux/linux-mtx-2-2.4.27/46-otg.patch dabc4034a238f33e6e3abc27e40b9f1734205b68
@@ -0,0 +1,56853 @@
+--- linux/Makefile-otgorig 2006-09-20 16:02:57.347146612 +0200
++++ linux/Makefile 2006-09-20 16:03:35.280797278 +0200
+@@ -181,6 +181,7 @@
+ DRIVERS-$(CONFIG_HAMRADIO) += drivers/net/hamradio/hamradio.o
+ DRIVERS-$(CONFIG_TC) += drivers/tc/tc.a
+ DRIVERS-$(CONFIG_USB) += drivers/usb/usbdrv.o
++DRIVERS-$(CONFIG_OTG) += drivers/otg/otg_drv.o
+ DRIVERS-$(CONFIG_USB_GADGET) += drivers/usb/gadget/built-in.o
+ DRIVERS-y +=drivers/media/media.o
+ DRIVERS-$(CONFIG_INPUT) += drivers/input/inputdrv.o
+--- linux/arch/mips/config-shared.in-otgorig 2006-09-20 16:09:20.671834564 +0200
++++ linux/arch/mips/config-shared.in 2006-09-20 16:09:28.068156725 +0200
+@@ -1009,6 +1009,7 @@
+ endmenu
+
+ source drivers/usb/Config.in
++source drivers/otg/Config.in
+
+ source net/bluetooth/Config.in
+
+--- linux/drivers/Makefile-otgorig 2006-09-20 16:09:47.100985766 +0200
++++ linux/drivers/Makefile 2006-09-20 16:10:25.730668535 +0200
+@@ -6,7 +6,7 @@
+ #
+
+
+-mod-subdirs := dio hil mtd sbus video macintosh usb input telephony ide \
++mod-subdirs := dio hil mtd sbus video macintosh usb otg input telephony ide \
+ message/i2o message/fusion scsi md ieee1394 pnp isdn atm \
+ fc4 net/hamradio i2c acpi bluetooth usb/gadget sensors
+
+@@ -28,6 +28,7 @@
+ subdir-$(CONFIG_MAC) += macintosh
+ subdir-$(CONFIG_PPC32) += macintosh
+ subdir-$(CONFIG_USB) += usb
++subdir-$(CONFIG_OTG) += otg
+ subdir-$(CONFIG_USB_GADGET) += usb/gadget
+ subdir-$(CONFIG_INPUT) += input
+ subdir-$(CONFIG_PHONE) += telephony
+diff -uNr linux/drivers/no-otg/Config.in linux/drivers/otg/Config.in
+--- linux/drivers/no-otg/Config.in 1970-01-01 01:00:00.000000000 +0100
++++ linux/drivers/otg/Config.in 2006-09-01 21:41:25.000000000 +0200
+@@ -0,0 +1,103 @@
++#
++# USBOTG - Top level configuration of a USB Peripheral or USB On-The-Go Peripheral Device
++#
++# Copyright (c) 2004 Belcarra
++#
++#
++
++mainmenu_option next_comment
++
++ #
++ # Enable/Disable OTG Support
++ #
++ comment 'On-The-Go and USB Peripheral Support'
++ tristate 'Support for On-The-Go and USB Peripherals ' CONFIG_OTG
++
++ if [ "$CONFIG_OTG" != "n" ]; then
++ #
++ # Select appropriate hardware platform, each config file
++ # will only offer options if the kernel is configured for
++ # that specific architecture or platform. They should define
++ # the following to enable the further configuration in this
++ # file:
++ # CONFIG_OTG_PLATFORM_OTG offer OTG configuration
++ #
++ # CONFIG_OTG_PLATFORM_USBD offer USBD configuration and
++ # function selection
++ # CONFIG_OTG_PLATFORM_HOST offer HOST configuration
++ #
++ mainmenu_option next_comment
++ comment 'Select Hardware'
++
++ # platform oriented configurations
++# source drivers/otg/config/Config.in-mainstone
++# source drivers/otg/config/Config.in-pcs-b780
++# source drivers/otg/config/Config.in-pcs-p1
++# source drivers/otg/config/Config.in-mx2ads
++# source drivers/otg/config/Config.in-omap-h2
++ source drivers/otg/config/Config.in-db1550
++# source drivers/otg/config/Config.in-mordor
++
++ # architecture specific configurations
++ source drivers/otg/config/Config.in-au1x00
++# source drivers/otg/config/Config.in-dbmx1
++# source drivers/otg/config/Config.in-lh7a400
++# source drivers/otg/config/Config.in-lubbock
++# source drivers/otg/config/Config.in-smdk2500
++# source drivers/otg/config/Config.in-strongarm
++# source drivers/otg/config/Config.in-superh
++
++ # generic drivers
++ source drivers/otg/config/Config.in-isp1301
++ source drivers/otg/config/Config.in-max3353e
++ endmenu
++
++ if [ "$CONFIG_OTG_PLATFORM_OTG" = "y" -o "$CONFIG_OTG_PLATFORM_USBD" = "y" ]; then
++
++ #
++ # Generic Options
++ #
++ mainmenu_option next_comment
++ comment 'General Support Options'
++ bool 'Enable High Speed Descriptors' CONFIG_OTG_HIGH_SPEED
++ # bool 'Enable Root HUB Function' CONFIG_OTG_ROOT_HUB
++ bool 'OTG Fast Tracing' CONFIG_OTG_TRACE
++ tristate 'USB FUNCTION FS Module' CONFIG_OTG_PROCFSM
++ bool 'Disable C99 initializers' CONFIG_OTG_NOC99
++ endmenu
++
++ #
++ # Select USB Peripheral Function Drivers
++ #
++ mainmenu_option next_comment
++ comment 'Targeted Peripherals (USB Peripheral Function Drivers)'
++ source drivers/otg/functions/acm/Config.in
++ source drivers/otg/functions/mouse/Config.in
++ source drivers/otg/functions/network/Config.in
++ source drivers/otg/functions/msc/Config.in
++# source drivers/otg/functions/test/Config.in
++ endmenu
++
++ mainmenu_option next_comment
++ comment 'Traditional Device Options'
++ bool 'Built-in Minimal USB Device' CONFIG_OTG_FW_MN
++ dep_bool 'Enable Auto-Start' CONFIG_OTG_TR_AUTO $CONFIG_OTG_MN
++ endmenu
++ fi
++ #dep_tristate 'Build OTG minihost core' CONFIG_OTG_HOSTCORE $CONFIG_OTG
++ if [ "$CONFIG_OTG_PLATFORM_HOST" != "n" ]; then
++ #
++ # Host configuration
++ #
++ mainmenu_option next_comment
++ comment 'Host configuration (OTG minihost core and HCD)'
++# source drivers/otg/core/Config.in
++ source drivers/otg/ocd/Config.in
++# source drivers/otg/classes/usblan/Config.in
++ endmenu
++ fi
++
++ fi
++
++endmenu
++
+diff -uNr linux/drivers/no-otg/Config.in-orig linux/drivers/otg/Config.in-orig
+--- linux/drivers/no-otg/Config.in-orig 1970-01-01 01:00:00.000000000 +0100
++++ linux/drivers/otg/Config.in-orig 2006-09-01 21:41:25.000000000 +0200
+@@ -0,0 +1,73 @@
++#
++# OTG - configuration of a USB On-The-Go Device
++#
++# Copyright (c) 2004 Belcarra
++#
++# The otg_export script will delete all comments marked "(Testing)"
++#
++
++mainmenu_option next_comment
++
++comment 'OTG devices'
++
++tristate 'Support for USB On-The-Go Devices ' CONFIG_OTG
++
++if [ "$CONFIG_OTG" = "y" -o "$CONFIG_OTG" = "m" ]; then
++ comment ''
++ bool ' Enable High Speed Descriptors' CONFIG_OTG_HIGH_SPEED
++ bool ' Enable Root HUB Function' CONFIG_OTG_ROOT_HUB
++ comment ''
++
++ bool ' Disable PCD' CONFIG_OTG_DISABLE_PCD
++ bool ' Disable HCD' CONFIG_OTG_DISABLE_HCD
++
++ comment ''
++
++ bool ' OTG Proc FS' CONFIG_OTG_PROCFS
++ tristate ' OTG Proc FS Module' CONFIG_OTG_PROCFSM $CONFIG_OTG
++
++ comment 'On-The-Go Functions'
++
++ source drivers/otg/functions/network/Config.in
++ source drivers/otg/functions/acm/Config.in
++ source drivers/otg/functions/msc/Config.in
++
++ source drivers/otg/functions/isotest/Config.in
++ source drivers/otg/functions/mouse/Config.in
++
++ comment ''
++ comment 'On-The-Go Transceiver Controller Drivers (TCD)'
++
++ source drivers/otg/tcd/isp1301/Config.in
++
++ comment ''
++ comment 'On-The-Go Peripheral Controller Drivers (PCD)'
++
++ source drivers/otg/pcd/au1x00/Config.in
++ source drivers/otg/pcd/mx1/Config.in
++ source drivers/otg/pcd/mx2/Config.in
++ source drivers/otg/pcd/pxa/Config.in
++ source drivers/otg/pcd/sa1100/Config.in
++ source drivers/otg/pcd/lh7a400/Config.in
++ source drivers/otg/pcd/omap/Config.in
++ source drivers/otg/pcd/smdk2500/Config.in
++ source drivers/otg/pcd/superh/Config.in
++ source drivers/otg/pcd/sx2/Config.in
++ source drivers/otg/pcd/wmmx/Config.in
++
++ comment ''
++ comment 'On-The-Go Host Controller Drivers (HCD)'
++
++ source drivers/otg/hcd/omap/Config.in
++
++ comment ''
++ tristate ' OTG Fast Tracing' CONFIG_OTG_TRACE
++ comment ''
++
++ comment 'Non Current Bus Drivers (Testing)'
++ source drivers/otg/functions/pst/Config.in
++ source drivers/otg/functions/datalog/Config.in
++
++fi
++
++endmenu
+diff -uNr linux/drivers/no-otg/FIX-MAKEFILES linux/drivers/otg/FIX-MAKEFILES
+--- linux/drivers/no-otg/FIX-MAKEFILES 1970-01-01 01:00:00.000000000 +0100
++++ linux/drivers/otg/FIX-MAKEFILES 2006-09-01 21:41:25.000000000 +0200
+@@ -0,0 +1,23 @@
++#!/bin/sh
++
++ARG=$1
++shift
++
++[ -z "${ARG}" ] && echo Bad args && exit 1
++
++#find . -name Makefile-${ARG} | while read i
++#do
++# m=`expr $i : "\(.*\)-${ARG}"`
++# ln -sfv $i $m
++#done
++
++find . -type d | while read d
++do
++ pushd $d > /dev/null
++ if [ -s Makefile-${ARG} ] ; then
++ echo -n `pwd` ": "
++ ln -sfv Makefile-${ARG} Makefile
++ fi
++ popd >/dev/null
++done
++
+diff -uNr linux/drivers/no-otg/Kconfig linux/drivers/otg/Kconfig
+--- linux/drivers/no-otg/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux/drivers/otg/Kconfig 2006-09-01 21:41:25.000000000 +0200
+@@ -0,0 +1,115 @@
++menu "On-The-Go and USB Peripheral Support"
++
++ config OTG
++ tristate "Support for On-The-Go and USB Peripheral Support"
++ ---help---
++ Configure all or part of the Belcarra OTG Stack
++
++
++ menu "On-The-Go Support"
++ depends on OTG
++
++ source "drivers/otg/config/Kconfig-scma11-evb"
++ #source "drivers/otg/config/Kconfig-omap-h2"
++
++ endmenu
++
++ menu "On-The-Go Support Configuration"
++ depends on OTG_PLATFORM_OTG
++
++ choice
++ depends on OTG && OTG_PLATFORM_OTG
++ prompt "On-The-Go Device Configuration"
++ config OTG_CFG_TR
++ bool "Traditional USB Peripheral"
++ ---help---
++ Compile as a Traditional USB Peripheral.
++ On-The-Go support is enabled.
++ config OTG_CFG_HO
++ bool "Host Only"
++ ---help---
++ Compile the USB Host support without the USB Peripheral
++ support. This is generally only useful for testing the
++ USB Host support and Host Controller drivers.
++ config OTG_CFG_PO
++ bool "Peripheral Only"
++ ---help---
++ Compile as a On-The-Go Peripheral-Only device. This
++ is similiar to a Traditional USB Peripheral but enables
++ On-The-Go features such as SRP.
++ config OTG_CFG_DR
++ bool "Dual Role"
++ ---help---
++ Compile as an On-The-Go Dual-Role device.
++
++ endchoice
++ endmenu
++
++ menu "Targeted Peripheral List (USB Host Class Drivers)"
++ depends on OTG_PLATFORM_OTG
++ # souce "drivers/otg/xxxx"
++ #
++ #---help---
++ #A list of USB peripherals that this device
++ #can support when it is acting as a host.
++ endmenu
++
++ menu "General Support Options"
++
++ depends on OTG_PLATFORM_OTG|| OTG_PLATFORM_USBD
++
++ # This needs to be a specific defined variable that comes
++ # from Kconfig-platform file
++ #
++ #config usb
++ # tristate 'OTG host core support (separate from native Linux host support)'
++
++ config OTG_HIGH_SPEED
++ bool 'Enable high speed descriptors'
++ depends on OTG!=n
++
++ config OTG_TRACE
++ bool 'OTG Fast Tracing'
++ depe%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list