diff options
| author | ccsmart <ccsmart@smartpal.de> | 2005-08-27 16:49:51 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-08-27 16:49:51 +0000 |
| commit | 3d65e3ebf8fcdce26763674a0c4b09149bec33be (patch) | |
| tree | aeb676b97aaeb8ced632d4cf50d472e05f6e4c1c | |
| parent | 5b5d55d83b2bfb50fdd8b8b8875217c5676314d2 (diff) | |
| parent | d2fb24b4dca507970eda44faf4d3bfc966490b54 (diff) | |
merge of 7441878ba0c588c0781b7565310897973e6f36af
and 76212ac44485e51989d04e8572e5b46bc808d90f
36 files changed, 2877 insertions, 9 deletions
diff --git a/conf/machine/h6300.conf b/conf/machine/h6300.conf new file mode 100644 index 0000000000..b4d371591c --- /dev/null +++ b/conf/machine/h6300.conf @@ -0,0 +1,29 @@ +#@TYPE: Machine +#@NAME: OMAP1510 cpu on iPaq h6315 and h6340 +#@DESCRIPTION: Machine configuration for the OMAP 1510 based iPaq h6300 series devices + +TARGET_ARCH = "arm" +PACKAGE_ARCH = "arm" +IPKG_ARCHS = "all arm armv4" + +PREFERRED_PROVIDER_xserver = "xserver-kdrive" +PREFERRED_PROVIDER_virtual/kernel = "linux-h6300-omap1" +PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" + +BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel sysfsutils console-tools modutils-collateral module-init-tools" +BOOTSTRAP_EXTRA_RDEPENDS = "kernel kernel-modules sysfsutils console-tools modutils-collateral module-init-tools" + +H6300_MODULES = "fat vfat nfs \ +bluetooth rfcomm bnep l2cap hci_uart \ +irda irlan irtty ircomm ircomm-tty \ +omapts" + +BOOTSTRAP_EXTRA_DEPENDS += "apmd wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz scap network-suspend-scripts" +BOOTSTRAP_EXTRA_RDEPENDS += "apm apmd network-suspend-scripts" +BOOTSTRAP_EXTRA_RRECOMMENDS += "wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz scap ${@linux_module_packages('${H6300_MODULES}', d)}" + +SERIAL_CONSOLE ?= "115200 ttyS0" +EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" + +#Use OMAP 1510 cpu specifig arm9tdmi options for gcc +include conf/machine/tune-arm9tdmi.conf diff --git a/conf/machine/tune-arm9tdmi.conf b/conf/machine/tune-arm9tdmi.conf new file mode 100644 index 0000000000..cfc3bad1c1 --- /dev/null +++ b/conf/machine/tune-arm9tdmi.conf @@ -0,0 +1 @@ +TARGET_CC_ARCH = "-mcpu=arm9tdmi -mtune=arm9tdmi" diff --git a/packages/addons/devshell.bb b/packages/addons/devshell.bb index 920ac00d10..6d5d53a1a2 100644 --- a/packages/addons/devshell.bb +++ b/packages/addons/devshell.bb @@ -1,6 +1,7 @@ DESCRIPTION = "Runs a shell in an environment as emitted by BitBake to execute tasks" LICENSE = "GPL" MAINTAINER = "Rene Wagner <rw@handhelds.org>" +PR = "r1" inherit autotools pkgconfig @@ -63,7 +64,10 @@ do_package() { cp $shellfile tmpfile echo "#!/bin/bash --rcfile" > $shellfile sed -e "s:${S}:.:g" -e "s:exit 1:true:" tmpfile >> $shellfile + echo "export PS1='[OE::${TARGET_PREFIX}${DISTRO}-${MACHINE}]:\w\$ '" >> $shellfile + echo "alias ./configure=oe_runconf" >> $shellfile + echo "alias make=oe_runmake" >> $shellfile mkdir -p ${DEPLOY_DIR}/addons install -m 755 $shellfile ${DEPLOY_DIR}/addons diff --git a/packages/jamvm/jamvm-1.3.1/.mtn2git_empty b/packages/device-mapper/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/jamvm/jamvm-1.3.1/.mtn2git_empty +++ b/packages/device-mapper/.mtn2git_empty diff --git a/packages/device-mapper/device-mapper-1.01.04/.mtn2git_empty b/packages/device-mapper/device-mapper-1.01.04/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/device-mapper/device-mapper-1.01.04/.mtn2git_empty diff --git a/packages/device-mapper/device-mapper-1.01.04/devmap-mknod-busybox.patch b/packages/device-mapper/device-mapper-1.01.04/devmap-mknod-busybox.patch new file mode 100644 index 0000000000..70a2658930 --- /dev/null +++ b/packages/device-mapper/device-mapper-1.01.04/devmap-mknod-busybox.patch @@ -0,0 +1,9 @@ +--- device-mapper.1.01.04/scripts/devmap_mknod.sh 2002-07-23 05:50:13.000000000 -0700 ++++ device-mapper.1.01.04/scripts/devmap_mknod.sh~ 2005-08-25 14:51:13.000000000 -0700 +@@ -37,5 +37,5 @@ + test -e $CONTROL && rm -f $CONTROL + + echo "Creating $CONTROL character device with major:$MAJOR minor:$MINOR." +-mknod --mode=600 $CONTROL c $MAJOR $MINOR ++mknod -m 600 $CONTROL c $MAJOR $MINOR + diff --git a/packages/device-mapper/device-mapper_1.01.04.bb b/packages/device-mapper/device-mapper_1.01.04.bb new file mode 100644 index 0000000000..64d66b965e --- /dev/null +++ b/packages/device-mapper/device-mapper_1.01.04.bb @@ -0,0 +1,28 @@ +SECTION = "libs" +DESCRIPTION = "The Device-mapper is a new component of the linux kernel \ +that supports logical volume management. It is required by LVM2 and EVMS. \ +The original LVM (included in stock 2.4 kernels) does not use it." +MAINTAINER = "Dan Williams <dan.j.williams@gmail.com>" +LICENSE = "GPL" +PR = "r2" + +S = "${WORKDIR}/${PN}.${PV}" + +SRC_URI = "ftp://sources.redhat.com/pub/dm/device-mapper.${PV}.tgz \ + file://devmap-mknod-busybox.patch;patch=1" + +inherit autotools update-rc.d + +INITSCRIPT_NAME = "devmap_mknod.sh" +INITSCRIPT_PARAMS = "defaults" + +do_stage () { + install -m 0644 lib/libdevmapper.h ${STAGING_INCDIR} || die "failed to install libdevmapper.h" + oe_libinstall -a -so -C lib/ioctl libdevmapper ${STAGING_LIBDIR} +} + +do_install() { + autotools_do_install + oe_runmake install_static_lib + install -D -m 755 ${S}/scripts/${INITSCRIPT_NAME} ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME} +} diff --git a/packages/findutils/findutils-native_4.1.20.bb b/packages/findutils/findutils-native_4.1.20.bb index 47fcfdcaa9..617d1bab36 100644 --- a/packages/findutils/findutils-native_4.1.20.bb +++ b/packages/findutils/findutils-native_4.1.20.bb @@ -1,4 +1,4 @@ -inherit native include findutils_${PV}.bb +inherit native FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/findutils-${PV}" S = "${WORKDIR}/findutils-${PV}" diff --git a/packages/gawk/gawk-native_3.1.4.bb b/packages/gawk/gawk-native_3.1.4.bb new file mode 100644 index 0000000000..dcfca421de --- /dev/null +++ b/packages/gawk/gawk-native_3.1.4.bb @@ -0,0 +1,16 @@ +INHIBIT_AUTOTOOLS_DEPS = "1" +include gawk_${PV}.bb + +inherit native + +DEPENDS = "" +PATCH_DEPENDS = "" +PATCHCLEANCMD = "" +PATCHCMD = "num='%s'; name='%s'; file='%s'; patch -p "$num" -i "$file"" + +S = "${WORKDIR}/gawk-${PV}" + +do_stage() { + install -d ${STAGING_BINDIR} + install -m 755 gawk ${STAGING_BINDIR} +} diff --git a/packages/gpsdrive/gpsdrive_cvs.bb b/packages/gpsdrive/gpsdrive_cvs.bb index ba4432f5ca..271ea1f375 100644 --- a/packages/gpsdrive/gpsdrive_cvs.bb +++ b/packages/gpsdrive/gpsdrive_cvs.bb @@ -6,7 +6,7 @@ DEFAULT_PREFERENCE="-1" PACKAGES += "gpsdrive-add" DESCRIPTION = "GPS navigation/map display software" -DEPENDS = "virtual/libc gtk+ pcre gpsd" +DEPENDS = "virtual/libc libart-lgpl gtk+ pcre gpsd" RDEPENDS_${PN} = "gdk-pixbuf-loader-gif gpsd" MAINTAINER = "Koen Kooi <koen@handhelds.org>" SECTION = "x11" @@ -14,7 +14,6 @@ PRIORITY = "optional" LICENSE = "GPL" SRC_URI = "cvs://anonymous@cvs.gpsdrive.cc/cvsroot;module=gpsdrive \ - file://gpsdrive-pda-fix.patch;patch=1;pnum=1 \ file://gpsdrive.desktop" S = "${WORKDIR}/gpsdrive" diff --git a/packages/gtk+/gtk+-2.8.0/pkg-config-pangoft2.patch b/packages/gtk+/gtk+-2.8.0/pkg-config-pangoft2.patch new file mode 100644 index 0000000000..8cbc578f24 --- /dev/null +++ b/packages/gtk+/gtk+-2.8.0/pkg-config-pangoft2.patch @@ -0,0 +1,11 @@ +--- gtk+-2.8.0/configure.in.orig 2005-08-27 15:52:21 +0200 ++++ gtk+-2.8.0/configure.in 2005-08-26 23:07:10 +0200 +@@ -1347,7 +1347,7 @@ + if test "x$gdktarget" = "xwin32"; then + PANGO_PACKAGES="pangowin32 pangocairo" + else +- PANGO_PACKAGES="pango pangocairo" ++ PANGO_PACKAGES="pango pangocairo pangoxft pangoft2" + fi + + AC_MSG_CHECKING(Pango flags) diff --git a/packages/gtk+/gtk+_2.8.0.bb b/packages/gtk+/gtk+_2.8.0.bb index 126bc22307..21fb8337fe 100644 --- a/packages/gtk+/gtk+_2.8.0.bb +++ b/packages/gtk+/gtk+_2.8.0.bb @@ -6,7 +6,7 @@ SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Philip Blundell <pb@handhelds.org>" DEPENDS = "glib-2.0 pango atk jpeg libpng xext libxcursor gtk-doc libgcrypt cairo" -PR = "r0" +PR = "r1" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-${PV}.tar.bz2 \ file://no-xwc.patch;patch=1 \ @@ -17,6 +17,7 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-${PV}.tar.bz2 \ file://gtklabel-resize-patch;patch=1 \ file://menu-deactivate.patch;patch=1 \ file://xsettings.patch;patch=1 \ + file://pkg-config-pangoft2.patch;patch=1 \ file://scroll-timings.patch;patch=1 \ file://small-gtkfilesel.patch;patch=1 \ file://migration.patch;patch=1;pnum=0" diff --git a/packages/jamvm/jamvm/.mtn2git_empty b/packages/jamvm/jamvm/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/jamvm/jamvm/.mtn2git_empty diff --git a/packages/jamvm/jamvm-1.3.1/size-defaults.patch b/packages/jamvm/jamvm/jamvm-1.3.1-size-defaults.patch index a41beee982..a41beee982 100644 --- a/packages/jamvm/jamvm-1.3.1/size-defaults.patch +++ b/packages/jamvm/jamvm/jamvm-1.3.1-size-defaults.patch diff --git a/packages/jamvm/jamvm_1.3.1.bb b/packages/jamvm/jamvm_1.3.1.bb index f33745d788..7d674dc720 100644 --- a/packages/jamvm/jamvm_1.3.1.bb +++ b/packages/jamvm/jamvm_1.3.1.bb @@ -9,7 +9,7 @@ DEPENDS = "zlib classpath" RDEPENDS = "classpath (>= 0.14) classpath-common (>= 0.14)" SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz \ - file://size-defaults.patch;patch=1" + file://jamvm-1.3.1-size-defaults.patch;patch=1" inherit autotools update-alternatives diff --git a/packages/jamvm/jamvm_1.3.2.bb b/packages/jamvm/jamvm_1.3.2.bb new file mode 100644 index 0000000000..7d674dc720 --- /dev/null +++ b/packages/jamvm/jamvm_1.3.2.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "A compact Java Virtual Machine which conforms to the JVM specification version 2." +HOMEPAGE = "http://jamvm.sourceforge.net/" +LICENSE = "GPL" +PRIORITY = "optional" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" +SECTION = "interpreters" + +DEPENDS = "zlib classpath" +RDEPENDS = "classpath (>= 0.14) classpath-common (>= 0.14)" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz \ + file://jamvm-1.3.1-size-defaults.patch;patch=1" + +inherit autotools update-alternatives + +EXTRA_OECONF = "--with-classpath-install-dir=${prefix}" +CFLAGS += "-DDEFAULT_MAX_HEAP=16*MB" + +PROVIDES = "virtual/java" +ALTERNATIVE_NAME = "java" +ALTERNATIVE_PATH = "${bindir}/jamvm" +ALTERNATIVE_PRIORITY = "10" diff --git a/packages/linux/linux-h6300-omap1-2.6.12-rc5/.mtn2git_empty b/packages/linux/linux-h6300-omap1-2.6.12-rc5/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-h6300-omap1-2.6.12-rc5/.mtn2git_empty diff --git a/packages/linux/linux-h6300-omap1-2.6.12-rc5/defconfig b/packages/linux/linux-h6300-omap1-2.6.12-rc5/defconfig new file mode 100644 index 0000000000..affff1d696 --- /dev/null +++ b/packages/linux/linux-h6300-omap1-2.6.12-rc5/defconfig @@ -0,0 +1,1504 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.12-rc5-omap1-h6300 +# Tue Aug 23 23:07:32 2005 +# +CONFIG_ARM=y +CONFIG_MMU=y +CONFIG_UID16=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_GENERIC_IOMAP=y + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +# CONFIG_CLEAN_COMPILE is not set +CONFIG_BROKEN=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# +CONFIG_LOCALVERSION="" +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_POSIX_MQUEUE=y +CONFIG_BSD_PROCESS_ACCT=y +CONFIG_BSD_PROCESS_ACCT_V3=y +CONFIG_SYSCTL=y +# CONFIG_AUDIT is not set +CONFIG_HOTPLUG=y +CONFIG_KOBJECT_UEVENT=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_EMBEDDED=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SHMEM=y +CONFIG_CC_ALIGN_FUNCTIONS=0 +CONFIG_CC_ALIGN_LABELS=0 +CONFIG_CC_ALIGN_LOOPS=0 +CONFIG_CC_ALIGN_JUMPS=0 +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 + +# +# Loadable module support +# +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +CONFIG_OBSOLETE_MODPARM=y +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_KMOD=y + +# +# System Type +# +# CONFIG_ARCH_CLPS7500 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CO285 is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_CAMELOT is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_IOP3XX is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_PXA is not set +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_LH7A40X is not set +CONFIG_ARCH_OMAP=y +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_H720X is not set + +# +# TI OMAP Implementations +# +CONFIG_ARCH_OMAP1=y +# CONFIG_ARCH_OMAP2 is not set + +# +# OMAP Core Type +# +# CONFIG_ARCH_OMAP730 is not set +CONFIG_ARCH_OMAP1510=y +# CONFIG_ARCH_OMAP16XX is not set + +# +# OMAP Board Type +# +# CONFIG_MACH_OMAP_INNOVATOR is not set +CONFIG_MACH_H6300=y +# CONFIG_MACH_VOICEBLUE is not set +# CONFIG_MACH_NETSTAR is not set +# CONFIG_MACH_OMAP_GENERIC is not set + +# +# OMAP CPU Speed +# +# CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER is not set +CONFIG_OMAP_ARM_168MHZ=y +CONFIG_OMAP_ARM_150MHZ=y +CONFIG_OMAP_ARM_120MHZ=y +CONFIG_OMAP_ARM_60MHZ=y +CONFIG_OMAP_ARM_30MHZ=y +CONFIG_OMAP_DSP=y +CONFIG_OMAP_DSP_MBCMD_VERBOSE=y +CONFIG_OMAP_DSP_TASK_MULTIOPEN=y +CONFIG_OMAP_DSP_FBEXPORT=y + +# +# OMAP Feature Selections +# +# CONFIG_OMAP_RESET_CLOCKS is not set +# CONFIG_OMAP_BOOT_TAG is not set +CONFIG_OMAP_MUX=y +# CONFIG_OMAP_MUX_DEBUG is not set +CONFIG_OMAP_MUX_WARNINGS=y +CONFIG_OMAP_MPU_TIMER=y +# CONFIG_OMAP_32K_TIMER is not set +CONFIG_OMAP_LL_DEBUG_UART1=y +# CONFIG_OMAP_LL_DEBUG_UART2 is not set +# CONFIG_OMAP_LL_DEBUG_UART3 is not set + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_ARM925T=y +CONFIG_CPU_32v4=y +CONFIG_CPU_ABRT_EV4T=y +CONFIG_CPU_CACHE_V4WT=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_COPY_V4WB=y +CONFIG_CPU_TLB_V4WBI=y + +# +# Processor Features +# +CONFIG_ARM_THUMB=y +# CONFIG_CPU_ICACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_WRITETHROUGH is not set + +# +# Bus support +# +CONFIG_ISA_DMA_API=y + +# +# PCCARD (PCMCIA/CardBus) support +# +CONFIG_PCCARD=m +# CONFIG_PCMCIA_DEBUG is not set +CONFIG_PCMCIA=m + +# +# PC-card bridges +# +CONFIG_TCIC=m +CONFIG_PCCARD_NONSTATIC=m + +# +# Kernel Features +# +# CONFIG_SMP is not set +# CONFIG_PREEMPT is not set +# CONFIG_DISCONTIGMEM is not set +CONFIG_LEDS=y +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="console=tty0 root=/dev/nfs nfsroot=192.168.2.1:/opt/h6300/rootfs,rsize=8192,wsize=8192 ip=192.168.2.2:192.168.2.1:192.168.2.1:255.0.0.0:ipaq:" +# CONFIG_XIP_KERNEL is not set + +# +# CPU Frequency scaling +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=y +CONFIG_CPU_FREQ_DEBUG=y +CONFIG_CPU_FREQ_STAT=y +CONFIG_CPU_FREQ_STAT_DETAILS=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=y +CONFIG_CPU_FREQ_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_ONDEMAND=y + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +CONFIG_FPE_NWFPE=y +CONFIG_FPE_NWFPE_XP=y +# CONFIG_FPE_FASTFPE is not set + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +CONFIG_BINFMT_AOUT=y +CONFIG_BINFMT_MISC=y +# CONFIG_ARTHUR is not set + +# +# Power management options +# +CONFIG_PM=y +CONFIG_APM=y + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +# CONFIG_DEBUG_DRIVER is not set + +# +# Memory Technology Devices (MTD) +# +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +CONFIG_MTD_CONCAT=y +CONFIG_MTD_PARTITIONS=y +CONFIG_MTD_REDBOOT_PARTS=y +CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 +# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set +# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set +# CONFIG_MTD_CMDLINE_PARTS is not set +# CONFIG_MTD_AFS_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=m +CONFIG_MTD_JEDECPROBE=m +CONFIG_MTD_GEN_PROBE=m +CONFIG_MTD_CFI_ADV_OPTIONS=y +CONFIG_MTD_CFI_NOSWAP=y +# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set +# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set +# CONFIG_MTD_CFI_GEOMETRY is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +CONFIG_MTD_CFI_INTELEXT=m +CONFIG_MTD_CFI_AMDSTD=m +CONFIG_MTD_CFI_AMDSTD_RETRY=1 +CONFIG_MTD_CFI_STAA=m +CONFIG_MTD_CFI_UTIL=m +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +CONFIG_MTD_ABSENT=m +# CONFIG_MTD_OBSOLETE_CHIPS is not set +# CONFIG_MTD_XIP is not set + +# +# Mapping drivers for chip access +# +CONFIG_MTD_COMPLEX_MAPPINGS=y +CONFIG_MTD_PHYSMAP=m +CONFIG_MTD_PHYSMAP_START=0x8000000 +CONFIG_MTD_PHYSMAP_LEN=0x4000000 +CONFIG_MTD_PHYSMAP_BANKWIDTH=2 +# CONFIG_MTD_ARM_INTEGRATOR is not set +# CONFIG_MTD_EDB7312 is not set +# CONFIG_MTD_IMPA7 is not set +# CONFIG_MTD_OMAP_NOR is not set +# CONFIG_MTD_PCMCIA is not set + +# +# Self-contained MTD device drivers +# +CONFIG_MTD_SLRAM=m +CONFIG_MTD_PHRAM=m +CONFIG_MTD_MTDRAM=m +CONFIG_MTDRAM_TOTAL_SIZE=4096 +CONFIG_MTDRAM_ERASE_SIZE=128 +CONFIG_MTD_BLKMTD=m +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +CONFIG_MTD_DOC2000=m +CONFIG_MTD_DOC2001=m +CONFIG_MTD_DOC2001PLUS=m +CONFIG_MTD_DOCPROBE=m +CONFIG_MTD_DOCECC=m +CONFIG_MTD_DOCPROBE_ADVANCED=y +CONFIG_MTD_DOCPROBE_ADDRESS=0x0000 +CONFIG_MTD_DOCPROBE_HIGH=y +CONFIG_MTD_DOCPROBE_55AA=y + +# +# NAND Flash Device Drivers +# +CONFIG_MTD_NAND=m +# CONFIG_MTD_NAND_VERIFY_WRITE is not set +# CONFIG_MTD_NAND_TOTO is not set +CONFIG_MTD_NAND_IDS=m +CONFIG_MTD_NAND_DISKONCHIP=m +CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED=y +CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0x0 +# CONFIG_MTD_NAND_DISKONCHIP_PROBE_HIGH is not set +CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE=y +# CONFIG_MTD_NAND_NANDSIM is not set + +# +# Parallel port support +# +# CONFIG_PARPORT is not set + +# +# Plug and Play support +# + +# +# Block devices +# +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_CRYPTOLOOP=m +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_UB is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=16384 +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +# CONFIG_CDROM_PKTCDVD is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +# CONFIG_ATA_OVER_ETH is not set + +# +# ATA/ATAPI/MFM/RLL support +# +# CONFIG_IDE is not set + +# +# SCSI device support +# +# CONFIG_SCSI is not set + +# +# Multi-device support (RAID and LVM) +# +# CONFIG_MD is not set + +# +# Fusion MPT device support +# + +# +# IEEE 1394 (FireWire) support +# +# CONFIG_IEEE1394 is not set + +# +# I2O device support +# + +# +# Networking support +# +CONFIG_NET=y + +# +# Networking options +# +CONFIG_PACKET=y +# CONFIG_PACKET_MMAP is not set +CONFIG_UNIX=y +# CONFIG_NET_KEY is not set +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +CONFIG_IP_PNP_RARP=y +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_IP_MROUTE is not set +# CONFIG_ARPD is not set +CONFIG_SYN_COOKIES=y +CONFIG_INET_AH=m +CONFIG_INET_ESP=m +CONFIG_INET_IPCOMP=m +CONFIG_INET_TUNNEL=m +CONFIG_IP_TCPDIAG=y +CONFIG_IP_TCPDIAG_IPV6=y + +# +# IP: Virtual Server Configuration +# +# CONFIG_IP_VS is not set +CONFIG_IPV6=y +CONFIG_IPV6_PRIVACY=y +CONFIG_INET6_AH=m +CONFIG_INET6_ESP=m +CONFIG_INET6_IPCOMP=m +CONFIG_INET6_TUNNEL=m +CONFIG_IPV6_TUNNEL=m +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_BRIDGE_NETFILTER=y + +# +# IP: Netfilter Configuration +# +CONFIG_IP_NF_CONNTRACK=m +CONFIG_IP_NF_CT_ACCT=y +CONFIG_IP_NF_CONNTRACK_MARK=y +CONFIG_IP_NF_CT_PROTO_SCTP=m +CONFIG_IP_NF_FTP=m +CONFIG_IP_NF_IRC=m +CONFIG_IP_NF_TFTP=m +# CONFIG_IP_NF_AMANDA is not set +CONFIG_IP_NF_QUEUE=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_LIMIT=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_MAC=m +CONFIG_IP_NF_MATCH_PKTTYPE=m +# CONFIG_IP_NF_MATCH_MARK is not set +# CONFIG_IP_NF_MATCH_MULTIPORT is not set +# CONFIG_IP_NF_MATCH_TOS is not set +# CONFIG_IP_NF_MATCH_RECENT is not set +# CONFIG_IP_NF_MATCH_ECN is not set +# CONFIG_IP_NF_MATCH_DSCP is not set +# CONFIG_IP_NF_MATCH_AH_ESP is not set +# CONFIG_IP_NF_MATCH_LENGTH is not set +# CONFIG_IP_NF_MATCH_TTL is not set +# CONFIG_IP_NF_MATCH_TCPMSS is not set +# CONFIG_IP_NF_MATCH_HELPER is not set +# CONFIG_IP_NF_MATCH_STATE is not set +# CONFIG_IP_NF_MATCH_CONNTRACK is not set +# CONFIG_IP_NF_MATCH_OWNER is not set +# CONFIG_IP_NF_MATCH_PHYSDEV is not set +# CONFIG_IP_NF_MATCH_ADDRTYPE is not set +# CONFIG_IP_NF_MATCH_REALM is not set +# CONFIG_IP_NF_MATCH_SCTP is not set +# CONFIG_IP_NF_MATCH_COMMENT is not set +# CONFIG_IP_NF_MATCH_CONNMARK is not set +# CONFIG_IP_NF_MATCH_HASHLIMIT is not set +# CONFIG_IP_NF_FILTER is not set +# CONFIG_IP_NF_TARGET_LOG is not set +# CONFIG_IP_NF_TARGET_ULOG is not set +# CONFIG_IP_NF_TARGET_TCPMSS is not set +# CONFIG_IP_NF_NAT is not set +CONFIG_IP_NF_MANGLE=m +# CONFIG_IP_NF_TARGET_TOS is not set +# CONFIG_IP_NF_TARGET_ECN is not set +# CONFIG_IP_NF_TARGET_DSCP is not set +# CONFIG_IP_NF_TARGET_MARK is not set +# CONFIG_IP_NF_TARGET_CLASSIFY is not set +# CONFIG_IP_NF_TARGET_CONNMARK is not set +# CONFIG_IP_NF_TARGET_CLUSTERIP is not set +# CONFIG_IP_NF_RAW is not set +# CONFIG_IP_NF_ARPTABLES is not set + +# +# IPv6: Netfilter Configuration (EXPERIMENTAL) +# +CONFIG_IP6_NF_QUEUE=m +CONFIG_IP6_NF_IPTABLES=m +# CONFIG_IP6_NF_MATCH_LIMIT is not set +CONFIG_IP6_NF_MATCH_MAC=m +CONFIG_IP6_NF_MATCH_RT=m +# CONFIG_IP6_NF_MATCH_OPTS is not set +# CONFIG_IP6_NF_MATCH_FRAG is not set +# CONFIG_IP6_NF_MATCH_HL is not set +# CONFIG_IP6_NF_MATCH_MULTIPORT is not set +# CONFIG_IP6_NF_MATCH_OWNER is not set +# CONFIG_IP6_NF_MATCH_MARK is not set +CONFIG_IP6_NF_MATCH_IPV6HEADER=m +# CONFIG_IP6_NF_MATCH_AHESP is not set +# CONFIG_IP6_NF_MATCH_LENGTH is not set +# CONFIG_IP6_NF_MATCH_EUI64 is not set +# CONFIG_IP6_NF_MATCH_PHYSDEV is not set +CONFIG_IP6_NF_FILTER=m +# CONFIG_IP6_NF_TARGET_LOG is not set +CONFIG_IP6_NF_MANGLE=m +# CONFIG_IP6_NF_TARGET_MARK is not set +CONFIG_IP6_NF_RAW=m + +# +# Bridge: Netfilter Configuration +# +CONFIG_BRIDGE_NF_EBTABLES=m +# CONFIG_BRIDGE_EBT_BROUTE is not set +# CONFIG_BRIDGE_EBT_T_FILTER is not set +# CONFIG_BRIDGE_EBT_T_NAT is not set +# CONFIG_BRIDGE_EBT_802_3 is not set +# CONFIG_BRIDGE_EBT_AMONG is not set +# CONFIG_BRIDGE_EBT_ARP is not set +# CONFIG_BRIDGE_EBT_IP is not set +# CONFIG_BRIDGE_EBT_LIMIT is not set +# CONFIG_BRIDGE_EBT_MARK is not set +# CONFIG_BRIDGE_EBT_PKTTYPE is not set +# CONFIG_BRIDGE_EBT_STP is not set +# CONFIG_BRIDGE_EBT_VLAN is not set +# CONFIG_BRIDGE_EBT_ARPREPLY is not set +# CONFIG_BRIDGE_EBT_DNAT is not set +# CONFIG_BRIDGE_EBT_MARK_T is not set +# CONFIG_BRIDGE_EBT_REDIRECT is not set +# CONFIG_BRIDGE_EBT_SNAT is not set +# CONFIG_BRIDGE_EBT_LOG is not set +# CONFIG_BRIDGE_EBT_ULOG is not set +CONFIG_XFRM=y +CONFIG_XFRM_USER=y + +# +# SCTP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_SCTP is not set +# CONFIG_ATM is not set +CONFIG_BRIDGE=y +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_NET_DIVERT is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set + +# +# QoS and/or fair queueing +# +# CONFIG_NET_SCHED is not set +# CONFIG_NET_CLS_ROUTE is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set +# CONFIG_HAMRADIO is not set +CONFIG_IRDA=m + +# +# IrDA protocols +# +CONFIG_IRLAN=m +CONFIG_IRNET=m +CONFIG_IRCOMM=m +CONFIG_IRDA_ULTRA=y + +# +# IrDA options +# +CONFIG_IRDA_CACHE_LAST_LSAP=y +CONFIG_IRDA_FAST_RR=y +# CONFIG_IRDA_DEBUG is not set + +# +# Infrared-port device drivers +# + +# +# SIR device drivers +# +# CONFIG_IRTTY_SIR is not set + +# +# Dongle support +# + +# +# Old SIR device drivers +# +# CONFIG_IRPORT_SIR is not set + +# +# Old Serial dongle support +# + +# +# FIR device drivers +# +# CONFIG_USB_IRDA is not set +# CONFIG_SIGMATEL_FIR is not set +# CONFIG_NSC_FIR is not set +# CONFIG_WINBOND_FIR is not set +CONFIG_OMAP1610_IR=m +CONFIG_SMC_IRCC_FIR=m +# CONFIG_ALI_FIR is not set +# CONFIG_VIA_FIR is not set +CONFIG_BT=m +CONFIG_BT_L2CAP=m +# CONFIG_BT_SCO is not set +CONFIG_BT_RFCOMM=m +# CONFIG_BT_RFCOMM_TTY is not set +CONFIG_BT_BNEP=m +# CONFIG_BT_BNEP_MC_FILTER is not set +# CONFIG_BT_BNEP_PROTO_FILTER is not set +CONFIG_BT_HIDP=m + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIUSB=m +# CONFIG_BT_HCIUSB_SCO is not set +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +# CONFIG_BT_HCIUART_BCSP_TXCRC is not set +CONFIG_BT_HCIBCM203X=m +CONFIG_BT_HCIBPA10X=m +CONFIG_BT_HCIBFUSB=m +CONFIG_BT_HCIDTL1=m +CONFIG_BT_HCIBT3C=m +CONFIG_BT_HCIBLUECARD=m +CONFIG_BT_HCIBTUART=m +CONFIG_BT_HCIVHCI=m +CONFIG_NETDEVICES=y +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set + +# +# Ethernet (10 or 100Mbit) +# +CONFIG_NET_ETHERNET=y +CONFIG_MII=y +CONFIG_SMC91X=y + +# +# Ethernet (1000 Mbit) +# + +# +# Ethernet (10000 Mbit) +# + +# +# Token Ring devices +# + +# +# Wireless LAN (non-hamradio) +# +CONFIG_NET_RADIO=y + +# +# Obsolete Wireless cards support (pre-802.11) +# +CONFIG_STRIP=y +# CONFIG_PCMCIA_WAVELAN is not set +# CONFIG_PCMCIA_NETWAVE is not set + +# +# Wireless 802.11 Frequency Hopping cards support +# +# CONFIG_PCMCIA_RAYCS is not set + +# +# Wireless 802.11b ISA/PCI cards support +# +# CONFIG_HERMES is not set +CONFIG_ATMEL=y + +# +# Wireless 802.11b Pcmcia/Cardbus cards support +# +# CONFIG_AIRO_CS is not set +# CONFIG_PCMCIA_ATMEL is not set +# CONFIG_PCMCIA_WL3501 is not set +CONFIG_NET_WIRELESS=y + +# +# PCMCIA network device support +# +# CONFIG_NET_PCMCIA is not set + +# +# Wan interfaces +# +# CONFIG_WAN 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_PPPOE=y +# CONFIG_SLIP is not set +# CONFIG_SHAPER is not set +# CONFIG_NETCONSOLE is not set + +# +# ISDN subsystem +# +# CONFIG_ISDN is not set + +# +# Input device support +# +CONFIG_INPUT=y + +# +# Userland interfaces +# +# CONFIG_INPUT_MOUSEDEV is not set +# CONFIG_INPUT_JOYDEV is not set +CONFIG_INPUT_TSDEV=y +CONFIG_INPUT_TSDEV_SCREEN_X=240 +CONFIG_INPUT_TSDEV_SCREEN_Y=320 +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +CONFIG_KEYBOARD_ATKBD=y +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set +# CONFIG_KEYBOARD_NEWTON is not set +CONFIG_KEYBOARD_OMAP=y +CONFIG_INPUT_MOUSE=y +CONFIG_MOUSE_PS2=y +CONFIG_MOUSE_SERIAL=y +# CONFIG_MOUSE_VSXXXAA is not set +# CONFIG_INPUT_JOYSTICK is not set +CONFIG_INPUT_TOUCHSCREEN=y +# CONFIG_TOUCHSCREEN_GUNZE is not set +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +CONFIG_TOUCHSCREEN_OMAP=m +CONFIG_INPUT_MISC=y +CONFIG_INPUT_UINPUT=m + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_SERPORT=y +CONFIG_SERIO_LIBPS2=y +CONFIG_SERIO_RAW=y +# CONFIG_GAMEPORT is not set +CONFIG_SOUND_GAMEPORT=y + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +# CONFIG_SERIAL_8250_CONSOLE is not set +# CONFIG_SERIAL_8250_CS is not set +CONFIG_SERIAL_8250_NR_UARTS=4 +# CONFIG_SERIAL_8250_EXTENDED is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_CORE=y +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=256 + +# +# IPMI +# +# CONFIG_IPMI_HANDLER is not set + +# +# Watchdog Cards +# +CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_NOWAYOUT=y + +# +# Watchdog Device Drivers +# +CONFIG_SOFT_WATCHDOG=m + +# +# USB-based Watchdog Cards +# +# CONFIG_USBPCWATCHDOG is not set +CONFIG_NVRAM=y +# CONFIG_RTC is not set +CONFIG_OMAP_RTC=y +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set + +# +# Ftape, the floppy tape device driver +# +# CONFIG_DRM is not set + +# +# PCMCIA character devices +# +# CONFIG_SYNCLINK_CS is not set +# CONFIG_RAW_DRIVER is not set + +# +# TPM devices +# + +# +# I2C support +# +CONFIG_I2C=y +CONFIG_I2C_CHARDEV=y + +# +# I2C Algorithms +# +CONFIG_I2C_ALGOBIT=y +CONFIG_I2C_ALGOPCF=y +CONFIG_I2C_ALGOPCA=y + +# +# I2C Hardware Bus support +# +CONFIG_I2C_ISA=m +CONFIG_I2C_PARPORT_LIGHT=m +# CONFIG_I2C_STUB is not set +CONFIG_I2C_PCA_ISA=m +CONFIG_I2C_OMAP=y + +# +# Hardware Sensors Chip support +# +# CONFIG_I2C_SENSOR is not set +# CONFIG_SENSORS_ADM1021 is not set +# CONFIG_SENSORS_ADM1025 is not set +# CONFIG_SENSORS_ADM1026 is not set +# CONFIG_SENSORS_ADM1031 is not set +# CONFIG_SENSORS_ASB100 is not set +# CONFIG_SENSORS_DS1621 is not set +# CONFIG_SENSORS_FSCHER is not set +# CONFIG_SENSORS_FSCPOS is not set +# CONFIG_SENSORS_GL518SM is not set +# CONFIG_SENSORS_GL520SM is not set +# CONFIG_SENSORS_IT87 is not set +# CONFIG_SENSORS_LM63 is not set +# CONFIG_SENSORS_LM75 is not set +# CONFIG_SENSORS_LM77 is not set +# CONFIG_SENSORS_LM78 is not set +# CONFIG_SENSORS_LM80 is not set +# CONFIG_SENSORS_LM83 is not set +# CONFIG_SENSORS_LM85 is not set +# CONFIG_SENSORS_LM87 is not set +# CONFIG_SENSORS_LM90 is not set +# CONFIG_SENSORS_LM92 is not set +# CONFIG_SENSORS_MAX1619 is not set +# CONFIG_SENSORS_PC87360 is not set +# CONFIG_SENSORS_SMSC47B397 is not set +# CONFIG_SENSORS_SMSC47M1 is not set +# CONFIG_SENSORS_W83781D is not set +# CONFIG_SENSORS_W83L785TS is not set +# CONFIG_SENSORS_W83627HF is not set + +# +# Other I2C Chip support +# +# CONFIG_SENSORS_DS1337 is not set +# CONFIG_SENSORS_EEPROM is not set +# CONFIG_SENSORS_PCF8574 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_SENSORS_RTC8564 is not set +# CONFIG_TPS65010 is not set +CONFIG_SENSORS_TLV320AIC23=y +# 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 + +# +# Misc devices +# + +# +# Multimedia devices +# +CONFIG_VIDEO_DEV=y + +# +# Video For Linux +# + +# +# Video Adapters +# +# CONFIG_VIDEO_CPIA is not set +# CONFIG_VIDEO_SAA5246A is not set +# CONFIG_VIDEO_SAA5249 is not set +# CONFIG_TUNER_3036 is not set +# CONFIG_VIDEO_OVCAMCHIP is not set + +# +# Radio Adapters +# +# CONFIG_RADIO_MAESTRO is not set + +# +# Digital Video Broadcasting Devices +# +# CONFIG_DVB is not set + +# +# Graphics support +# +CONFIG_FB=y +# CONFIG_FB_CFB_FILLRECT is not set +# CONFIG_FB_CFB_COPYAREA is not set +# CONFIG_FB_CFB_IMAGEBLIT is not set +CONFIG_FB_SOFT_CURSOR=y +# CONFIG_FB_MACMODES is not set +CONFIG_FB_MODE_HELPERS=y +# CONFIG_FB_TILEBLITTING is not set +# CONFIG_FB_S1D13XXX is not set +CONFIG_FB_OMAP=y +CONFIG_FB_OMAP_INTERNAL_LCDC=y +# CONFIG_FB_OMAP_EXTERNAL_LCDC is not set +CONFIG_FB_OMAP_DMA_TUNE=y +# CONFIG_FB_VIRTUAL is not set + +# +# Console display driver support +# +# CONFIG_VGA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_FONTS=y +# CONFIG_FONT_8x8 is not set +# CONFIG_FONT_8x16 is not set +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +CONFIG_FONT_MINI_4x6=y +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set + +# +# Logo configuration +# +# CONFIG_LOGO is not set +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_BACKLIGHT_DEVICE=y +CONFIG_LCD_CLASS_DEVICE=y +CONFIG_LCD_DEVICE=y + +# +# Sound +# +CONFIG_SOUND=m + +# +# Advanced Linux Sound Architecture +# +# CONFIG_SND is not set + +# +# Open Sound System +# +CONFIG_SOUND_PRIME=m +CONFIG_SOUND_OMAP=m +# CONFIG_SOUND_OMAP_TSC2101 is not set +# CONFIG_SOUND_BT878 is not set +# CONFIG_SOUND_FUSION is not set +# CONFIG_SOUND_CS4281 is not set +# CONFIG_SOUND_SONICVIBES is not set +# CONFIG_SOUND_TRIDENT is not set +# CONFIG_SOUND_MSNDCLAS is not set +# CONFIG_SOUND_MSNDPIN is not set +# CONFIG_SOUND_OSS is not set +# CONFIG_SOUND_TVMIXER is not set +# CONFIG_SOUND_AD1980 is not set + +# +# USB support +# +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +CONFIG_USB=y +CONFIG_USB_DEBUG=y + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +# CONFIG_USB_BANDWIDTH is not set +# CONFIG_USB_DYNAMIC_MINORS is not set +# CONFIG_USB_SUSPEND is not set +# CONFIG_USB_OTG is not set + +# +# USB Host Controller Drivers +# +CONFIG_USB_OHCI_HCD=y +# CONFIG_USB_OHCI_BIG_ENDIAN is not set +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +# CONFIG_USB_SL811_HCD is not set + +# +# USB Device Class drivers +# +# CONFIG_USB_AUDIO is not set + +# +# USB Bluetooth TTY can only be used with disabled Bluetooth subsystem +# +# CONFIG_USB_MIDI is not set +CONFIG_USB_ACM=y +# CONFIG_USB_PRINTER is not set + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information +# +# CONFIG_USB_STORAGE is not set + +# +# USB Input Devices +# +# CONFIG_USB_HID is not set + +# +# USB HID Boot Protocol drivers +# +# CONFIG_USB_KBD is not set +# CONFIG_USB_MOUSE is not set +# CONFIG_USB_AIPTEK is not set +# CONFIG_USB_WACOM is not set +# CONFIG_USB_KBTAB is not set +# CONFIG_USB_POWERMATE is not set +# CONFIG_USB_MTOUCH is not set +# CONFIG_USB_EGALAX is not set +# CONFIG_USB_XPAD is not set +# CONFIG_USB_ATI_REMOTE is not set + +# +# USB Imaging devices +# +# CONFIG_USB_MDC800 is not set + +# +# USB Multimedia devices +# +# CONFIG_USB_DABUSB is not set +# CONFIG_USB_VICAM is not set +# CONFIG_USB_DSBR is not set +# CONFIG_USB_IBMCAM is not set +# CONFIG_USB_KONICAWC is not set +# CONFIG_USB_OV511 is not set +# CONFIG_USB_SE401 is not set +# CONFIG_USB_SN9C102 is not set +# CONFIG_USB_STV680 is not set +# CONFIG_USB_PWC is not set + +# +# USB Network Adapters +# +# CONFIG_USB_CATC is not set +# CONFIG_USB_KAWETH is not set +# CONFIG_USB_PEGASUS is not set +# CONFIG_USB_RTL8150 is not set +CONFIG_USB_USBNET=y + +# +# USB Host-to-Host Cables +# +# CONFIG_USB_ALI_M5632 is not set +# CONFIG_USB_AN2720 is not set +# CONFIG_USB_BELKIN is not set +# CONFIG_USB_GENESYS is not set +CONFIG_USB_NET1080=y +# CONFIG_USB_PL2301 is not set +# CONFIG_USB_KC2190 is not set + +# +# Intelligent USB Devices/Gadgets +# +# CONFIG_USB_ARMLINUX is not set +# CONFIG_USB_EPSON2888 is not set +# CONFIG_USB_ZAURUS is not set +CONFIG_USB_CDCETHER=y + +# +# USB Network Adapters +# +CONFIG_USB_AX8817X=y +# CONFIG_USB_ZD1201 is not set +CONFIG_USB_MON=y + +# +# USB port drivers +# + +# +# USB Serial Converter support +# +CONFIG_USB_SERIAL=y +CONFIG_USB_SERIAL_CONSOLE=y +CONFIG_USB_SERIAL_GENERIC=y +# CONFIG_USB_SERIAL_AIRPRIME is not set +# CONFIG_USB_SERIAL_BELKIN is not set +# CONFIG_USB_SERIAL_WHITEHEAT is not set +# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set +# CONFIG_USB_SERIAL_CP2101 is not set +# CONFIG_USB_SERIAL_CYPRESS_M8 is not set +# CONFIG_USB_SERIAL_EMPEG is not set +# CONFIG_USB_SERIAL_FTDI_SIO is not set +CONFIG_USB_SERIAL_VISOR=y +CONFIG_USB_SERIAL_IPAQ=y +# CONFIG_USB_SERIAL_IR is not set +# CONFIG_USB_SERIAL_EDGEPORT is not set +# CONFIG_USB_SERIAL_EDGEPORT_TI is not set +# CONFIG_USB_SERIAL_GARMIN is not set +# CONFIG_USB_SERIAL_IPW is not set +# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set +# CONFIG_USB_SERIAL_KEYSPAN is not set +# CONFIG_USB_SERIAL_KLSI is not set +# CONFIG_USB_SERIAL_KOBIL_SCT is not set +# CONFIG_USB_SERIAL_MCT_U232 is not set +# CONFIG_USB_SERIAL_PL2303 is not set +# CONFIG_USB_SERIAL_HP4X is not set +# CONFIG_USB_SERIAL_SAFE is not set +# CONFIG_USB_SERIAL_TI is not set +# CONFIG_USB_SERIAL_CYBERJACK is not set +# CONFIG_USB_SERIAL_XIRCOM is not set +# CONFIG_USB_SERIAL_OMNINET is not set + +# +# USB Miscellaneous drivers +# +# CONFIG_USB_EMI62 is not set +# CONFIG_USB_EMI26 is not set +# CONFIG_USB_AUERSWALD is not set +# CONFIG_USB_RIO500 is not set +# CONFIG_USB_LEGOTOWER is not set +# CONFIG_USB_LCD is not set +# CONFIG_USB_LED is not set +# CONFIG_USB_CYTHERM is not set +# CONFIG_USB_PHIDGETKIT is not set +# CONFIG_USB_PHIDGETSERVO is not set +# CONFIG_USB_IDMOUSE is not set +# CONFIG_USB_TEST is not set + +# +# USB ATM/DSL drivers +# + +# +# USB Gadget Support +# +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DEBUG_FILES=y +# CONFIG_USB_GADGET_NET2280 is not set +# CONFIG_USB_GADGET_PXA2XX is not set +# CONFIG_USB_GADGET_GOKU is not set +# CONFIG_USB_GADGET_LH7A40X is not set +CONFIG_USB_GADGET_OMAP=y +CONFIG_USB_OMAP=y +# CONFIG_USB_GADGET_DUMMY_HCD is not set +# CONFIG_USB_GADGET_DUALSPEED is not set +# CONFIG_USB_ZERO is not set +CONFIG_USB_ETH=y +# CONFIG_USB_ETH_RNDIS is not set +# CONFIG_USB_GADGETFS is not set +# CONFIG_USB_FILE_STORAGE is not set +# CONFIG_USB_G_SERIAL is not set + +# +# MMC/SD Card support +# +CONFIG_MMC=y +# CONFIG_MMC_DEBUG is not set +CONFIG_MMC_BLOCK=y +CONFIG_MMC_BLOCK_BROKEN_RFD=y +CONFIG_MMC_BULKTRANSFER=y +CONFIG_MMC_OMAP=y +# CONFIG_MMC_WBSD is not set + +# +# Synchronous Serial Interfaces (SSI) +# +CONFIG_OMAP_UWIRE=y +CONFIG_OMAP_TSC2101=y + +# +# File systems +# +CONFIG_EXT2_FS=y +CONFIG_EXT2_FS_XATTR=y +CONFIG_EXT2_FS_POSIX_ACL=y +CONFIG_EXT2_FS_SECURITY=y +# CONFIG_EXT3_FS is not set +# CONFIG_JBD is not set +CONFIG_FS_MBCACHE=y +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +CONFIG_FS_POSIX_ACL=y + +# +# XFS support +# +# CONFIG_XFS_FS is not set +# CONFIG_MINIX_FS is not set +CONFIG_ROMFS_FS=y +# CONFIG_QUOTA is not set +# CONFIG_DNOTIFY is not set +# CONFIG_AUTOFS_FS is not set +CONFIG_AUTOFS4_FS=y + +# +# CD-ROM/DVD Filesystems +# +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +# CONFIG_NTFS_FS is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_SYSFS=y +CONFIG_DEVFS_FS=y +CONFIG_DEVFS_MOUNT=y +# CONFIG_DEVFS_DEBUG is not set +CONFIG_DEVPTS_FS_XATTR=y +CONFIG_DEVPTS_FS_SECURITY=y +CONFIG_TMPFS=y +CONFIG_TMPFS_XATTR=y +CONFIG_TMPFS_SECURITY=y +# CONFIG_HUGETLBFS is not set +# CONFIG_HUGETLB_PAGE is not set +CONFIG_RAMFS=y + +# +# Miscellaneous filesystems +# +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +CONFIG_JFFS_FS=y +CONFIG_JFFS_FS_VERBOSE=0 +CONFIG_JFFS_PROC_FS=y +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_FS_DEBUG=4 +# CONFIG_JFFS2_FS_NAND is not set +# CONFIG_JFFS2_FS_NOR_ECC is not set +CONFIG_JFFS2_COMPRESSION_OPTIONS=y +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_RTIME=y +CONFIG_JFFS2_RUBIN=y +# CONFIG_JFFS2_CMODE_NONE is not set +CONFIG_JFFS2_CMODE_PRIORITY=y +# CONFIG_JFFS2_CMODE_SIZE is not set +CONFIG_CRAMFS=y +# CONFIG_VXFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set + +# +# Network File Systems +# +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +CONFIG_NFS_V4=y +# CONFIG_NFS_DIRECTIO is not set +# CONFIG_NFSD is not set +CONFIG_ROOT_NFS=y +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_SUNRPC=y +CONFIG_SUNRPC_GSS=y +CONFIG_RPCSEC_GSS_KRB5=y +# CONFIG_RPCSEC_GSS_SPKM3 is not set +# CONFIG_SMB_FS is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +# CONFIG_MAC_PARTITION is not set +CONFIG_MSDOS_PARTITION=y +# CONFIG_BSD_DISKLABEL is not set +# CONFIG_MINIX_SUBPARTITION is not set +# CONFIG_SOLARIS_X86_PARTITION is not set +# CONFIG_UNIXWARE_DISKLABEL is not set +# CONFIG_LDM_PARTITION is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +# CONFIG_EFI_PARTITION is not set + +# +# Native Language Support +# +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="utf8" +CONFIG_NLS_CODEPAGE_437=y +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_CODEPAGE_1250 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set +# CONFIG_NLS_ASCII is not set +CONFIG_NLS_ISO8859_1=y +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +# CONFIG_NLS_ISO8859_15 is not set +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +CONFIG_NLS_UTF8=y + +# +# Profiling support +# +# CONFIG_PROFILING is not set + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +CONFIG_DEBUG_KERNEL=y +CONFIG_MAGIC_SYSRQ=y +CONFIG_LOG_BUF_SHIFT=17 +# CONFIG_SCHEDSTATS is not set +# CONFIG_DEBUG_SLAB is not set +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_KOBJECT is not set +# CONFIG_DEBUG_BUGVERBOSE is not set +# CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_FS is not set +CONFIG_FRAME_POINTER=y +# CONFIG_DEBUG_USER is not set +# CONFIG_DEBUG_WAITQ is not set +CONFIG_DEBUG_ERRORS=y +CONFIG_DEBUG_LL=y +# CONFIG_DEBUG_ICEDCC is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set + +# +# Cryptographic options +# +CONFIG_CRYPTO=y +CONFIG_CRYPTO_HMAC=y +# CONFIG_CRYPTO_NULL is not set +# CONFIG_CRYPTO_MD4 is not set +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_SHA1=y +# 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_DES=y +# 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 is not set +# CONFIG_CRYPTO_KHAZAD is not set +# CONFIG_CRYPTO_ANUBIS is not set +CONFIG_CRYPTO_DEFLATE=m +# CONFIG_CRYPTO_MICHAEL_MIC is not set +# CONFIG_CRYPTO_CRC32C is not set +# CONFIG_CRYPTO_TEST is not set + +# +# Hardware crypto devices +# + +# +# Library routines +# +CONFIG_CRC_CCITT=y +CONFIG_CRC32=y +CONFIG_LIBCRC32C=y +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_REED_SOLOMON=m +CONFIG_REED_SOLOMON_DEC16=y diff --git a/packages/linux/linux-h6300-omap1-2.6.12-rc5/h6300_omap1_2612rc5.patch b/packages/linux/linux-h6300-omap1-2.6.12-rc5/h6300_omap1_2612rc5.patch new file mode 100644 index 0000000000..7e2f452850 --- /dev/null +++ b/packages/linux/linux-h6300-omap1-2.6.12-rc5/h6300_omap1_2612rc5.patch @@ -0,0 +1,1055 @@ +diff -Naur linux-2.6.12-rc5_omap1/arch/arm/mach-omap/clock.c linux-2.6.12-rc5_omap1_h6300/arch/arm/mach-omap/clock.c +--- linux-2.6.12-rc5_omap1/arch/arm/mach-omap/clock.c 2005-08-23 22:36:30.426733413 +0300 ++++ linux-2.6.12-rc5_omap1_h6300/arch/arm/mach-omap/clock.c 2005-08-23 22:38:07.446289831 +0300 +@@ -21,6 +21,7 @@ + #include <asm/arch/usb.h> + + #include "clock.h" ++#include <asm/mach-types.h> + + static LIST_HEAD(clocks); + static DECLARE_MUTEX(clocks_sem); +@@ -447,8 +448,17 @@ + static struct clk mclk_1510 = { + .name = "mclk", + /* Direct from ULPD, no parent. May be enabled by ext hardware. */ ++#if 0 + .rate = 12000000, + .flags = CLOCK_IN_OMAP1510 | RATE_FIXED, ++#else ++ .flags = CLOCK_IN_OMAP1510, ++ .enable_reg = COM_CLK_DIV_CTRL_SEL, ++ .enable_bit = COM_ULPD_PLL_CLK_REQ, ++ .set_rate = &set_ext_clk_rate, ++ .round_rate = &round_ext_clk_rate, ++ .init = &init_ext_clk, ++#endif + }; + + static struct clk mclk_16xx = { +@@ -1247,6 +1257,9 @@ + clk_use(&armxor_ck); + clk_use(&armtim_ck); + ++ if (machine_is_h6300()) ++ clk_enable(&lcd_ck); ++ + if (cpu_is_omap1510()) + clk_enable(&arm_gpio_ck); + +diff -Naur linux-2.6.12-rc5_omap1/arch/arm/mach-omap/dma.c linux-2.6.12-rc5_omap1_h6300/arch/arm/mach-omap/dma.c +--- linux-2.6.12-rc5_omap1/arch/arm/mach-omap/dma.c 2005-08-23 22:36:30.615703332 +0300 ++++ linux-2.6.12-rc5_omap1_h6300/arch/arm/mach-omap/dma.c 2005-08-23 22:38:07.480284420 +0300 +@@ -671,6 +671,7 @@ + unsigned long top, bottom; + int es; + u16 w; ++ u16 l; + unsigned long en, fn; + long ei, fi; + unsigned long vxres; +@@ -769,6 +770,10 @@ + } + + if (omap_dma_in_1510_mode()) { ++ l = omap_readw(OMAP1510_DMA_LCD_CTRL); ++ l &= ~(1 << 6); ++ omap_writew (l, OMAP1510_DMA_LCD_CTRL); ++ + omap_writew(top >> 16, OMAP1510_DMA_LCD_TOP_F1_U); + omap_writew(top, OMAP1510_DMA_LCD_TOP_F1_L); + omap_writew(bottom >> 16, OMAP1510_DMA_LCD_BOT_F1_U); +@@ -893,7 +898,6 @@ + w = omap_readw(OMAP1610_DMA_LCD_CCR); + w |= 1 << 7; + omap_writew(w, OMAP1610_DMA_LCD_CCR); +- + lcd_dma.active = 1; + } + +diff -Naur linux-2.6.12-rc5_omap1/arch/arm/mach-omap/mcbsp.c linux-2.6.12-rc5_omap1_h6300/arch/arm/mach-omap/mcbsp.c +--- linux-2.6.12-rc5_omap1/arch/arm/mach-omap/mcbsp.c 2005-08-23 22:36:31.270599085 +0300 ++++ linux-2.6.12-rc5_omap1_h6300/arch/arm/mach-omap/mcbsp.c 2005-08-23 22:38:07.481284261 +0300 +@@ -760,3 +760,4 @@ + EXPORT_SYMBOL(omap_mcbsp_xmit_buffer); + EXPORT_SYMBOL(omap_mcbsp_recv_buffer); + EXPORT_SYMBOL(omap_mcbsp_set_spi_mode); ++EXPORT_SYMBOL(omap_mcbsp_pollwrite); +diff -Naur linux-2.6.12-rc5_omap1/arch/arm/mach-omap/omap1/board-h6300.c linux-2.6.12-rc5_omap1_h6300/arch/arm/mach-omap/omap1/board-h6300.c +--- linux-2.6.12-rc5_omap1/arch/arm/mach-omap/omap1/board-h6300.c 1970-01-01 02:00:00.000000000 +0200 ++++ linux-2.6.12-rc5_omap1_h6300/arch/arm/mach-omap/omap1/board-h6300.c 2005-08-23 22:38:07.482284102 +0300 +@@ -0,0 +1,143 @@ ++/* ++ * linux/arch/arm/mach-omap/board-generic.c ++ * ++ * Modified from board-h6300.c ++ * ++ * Code for generic OMAP board. Should work on many OMAP systems where ++ * the device drivers take care of all the necessary hardware initialization. ++ * Do not put any board specific code to this file; create a new machine ++ * type if you need custom low-level initializations. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ */ ++ ++#include <linux/kernel.h> ++#include <linux/init.h> ++#include <linux/device.h> ++#include <linux/delay.h> ++#include <linux/mtd/mtd.h> ++#include <linux/mtd/partitions.h> ++ ++#include <asm/hardware.h> ++#include <asm/mach-types.h> ++#include <asm/mach/arch.h> ++#include <asm/mach/flash.h> ++#include <asm/mach/map.h> ++ ++#include <asm/arch/gpio.h> ++#include <asm/arch/tc.h> ++#include <asm/arch/usb.h> ++ ++#include "../common.h" ++ ++static int __initdata h6300_serial_ports[OMAP_MAX_NR_PORTS] = {1, 1, 1}; ++ ++static struct mtd_partition h6300_partitions[] = { ++ /* bootloader (U-Boot, etc) in first sector */ ++ { ++ .name = "bootloader", ++ .offset = 0, ++ .size = SZ_128K, ++ .mask_flags = MTD_WRITEABLE, /* force read-only */ ++ }, ++ /* bootloader params in the next sector */ ++ { ++ .name = "params", ++ .offset = MTDPART_OFS_APPEND, ++ .size = SZ_128K, ++ .mask_flags = 0, ++ }, ++ /* kernel */ ++ { ++ .name = "kernel", ++ .offset = MTDPART_OFS_APPEND, ++ .size = SZ_2M, ++ .mask_flags = 0 ++ }, ++ /* rest of flash1 is a file system */ ++ { ++ .name = "rootfs", ++ .offset = MTDPART_OFS_APPEND, ++ .size = SZ_16M - SZ_2M - 2 * SZ_128K, ++ .mask_flags = 0 ++ }, ++ /* file system */ ++ { ++ .name = "filesystem", ++ .offset = MTDPART_OFS_APPEND, ++ .size = MTDPART_SIZ_FULL, ++ .mask_flags = 0 ++ } ++}; ++ ++static struct flash_platform_data h6300_flash_data = { ++ .map_name = "cfi_probe", ++ .width = 2, ++ .parts = h6300_partitions, ++ .nr_parts = ARRAY_SIZE(h6300_partitions), ++}; ++ ++static struct resource h6300_flash_resource = { ++ .start = OMAP_CS0_PHYS, ++ .end = OMAP_CS0_PHYS + SZ_32M - 1, ++ .flags = IORESOURCE_MEM, ++}; ++ ++static struct platform_device h6300_flash_device = { ++ .name = "omapflash", ++ .id = 0, ++ .dev = { ++ .platform_data = &h6300_flash_data, ++ }, ++ .num_resources = 1, ++ .resource = &h6300_flash_resource, ++}; ++ ++static struct platform_device *h6300_devices[] __initdata = { ++ &h6300_flash_device, ++}; ++ ++static void __init h6300_init_irq(void) ++{ ++ omap_init_irq(); ++ omap_gpio_init(); ++} ++ ++/* assume no Mini-AB port */ ++ ++static struct omap_usb_config h6300_usb_config __initdata = { ++ .hmc_mode = 0, ++ .register_dev = 1, ++ .pins[0] = 0, ++}; ++ ++static struct omap_board_config_kernel h6300_config[] = { ++ { OMAP_TAG_USB, &h6300_usb_config }, ++}; ++ ++static void __init h6300_init(void) ++{ ++ platform_add_devices(h6300_devices, ARRAY_SIZE(h6300_devices)); ++ h6300_config[0].data = &h6300_usb_config; ++ ++ omap_board_config = h6300_config; ++ omap_board_config_size = ARRAY_SIZE(h6300_config); ++} ++ ++static void __init h6300_map_io(void) ++{ ++ omap_map_common_io(); ++ omap_serial_init(h6300_serial_ports); ++} ++ ++MACHINE_START(H6300, "HP IPaq H6300") ++ MAINTAINER("Everett Coleman II <gcc80x86@fuzzyneural.net>") ++ BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000) ++ BOOT_PARAMS(0x10000100) ++ MAPIO(h6300_map_io) ++ INITIRQ(h6300_init_irq) ++ INIT_MACHINE(h6300_init) ++ .timer = &omap_timer, ++MACHINE_END +diff -Naur linux-2.6.12-rc5_omap1/arch/arm/mach-omap/omap1/Kconfig linux-2.6.12-rc5_omap1_h6300/arch/arm/mach-omap/omap1/Kconfig +--- linux-2.6.12-rc5_omap1/arch/arm/mach-omap/omap1/Kconfig 2005-08-23 22:36:31.495563275 +0300 ++++ linux-2.6.12-rc5_omap1_h6300/arch/arm/mach-omap/omap1/Kconfig 2005-08-23 22:38:07.515278850 +0300 +@@ -26,6 +26,12 @@ + TI OMAP 1510 or 1610 Innovator board support. Say Y here if you + have such a board. + ++config MACH_H6300 ++ bool "HP IPaq H6300" ++ depends on ARCH_OMAP1 && ARCH_OMAP1510 ++ help ++ HP IPaq H6300 series ++ + config MACH_OMAP_H2 + bool "TI H2 Support" + depends on ARCH_OMAP1 && ARCH_OMAP16XX +diff -Naur linux-2.6.12-rc5_omap1/arch/arm/mach-omap/omap1/Makefile linux-2.6.12-rc5_omap1_h6300/arch/arm/mach-omap/omap1/Makefile +--- linux-2.6.12-rc5_omap1/arch/arm/mach-omap/omap1/Makefile 2005-08-23 22:36:31.564552293 +0300 ++++ linux-2.6.12-rc5_omap1_h6300/arch/arm/mach-omap/omap1/Makefile 2005-08-23 22:38:07.516278691 +0300 +@@ -9,6 +9,7 @@ + # Specific board support + obj-$(CONFIG_MACH_OMAP_H2) += board-h2.o + obj-$(CONFIG_MACH_OMAP_INNOVATOR) += board-innovator.o ++obj-$(CONFIG_MACH_H6300) += board-h6300.o + obj-$(CONFIG_MACH_OMAP_GENERIC) += board-generic.o + obj-$(CONFIG_MACH_OMAP_PERSEUS2) += board-perseus2.o + obj-$(CONFIG_MACH_OMAP_OSK) += board-osk.o +diff -Naur linux-2.6.12-rc5_omap1/drivers/input/touchscreen/omap/Makefile linux-2.6.12-rc5_omap1_h6300/drivers/input/touchscreen/omap/Makefile +--- linux-2.6.12-rc5_omap1/drivers/input/touchscreen/omap/Makefile 2005-08-23 22:36:32.554394729 +0300 ++++ linux-2.6.12-rc5_omap1_h6300/drivers/input/touchscreen/omap/Makefile 2005-08-23 22:38:07.550273279 +0300 +@@ -8,5 +8,6 @@ + objs-$(CONFIG_ARCH_OMAP16XX)$(CONFIG_MACH_OMAP_H3) += ts_hx.o + objs-$(CONFIG_ARCH_OMAP1510)$(CONFIG_MACH_OMAP_INNOVATOR) += ts_inn1510.o + objs-$(CONFIG_ARCH_OMAP16XX)$(CONFIG_MACH_OMAP_OSK) += ts_osk.o ++objs-$(CONFIG_ARCH_OMAP1510)$(CONFIG_MACH_H6300) += ts_hx.o + + omapts-objs := omap_ts.o $(objs-yy) +diff -Naur linux-2.6.12-rc5_omap1/drivers/input/touchscreen/omap/omap_ts.c linux-2.6.12-rc5_omap1_h6300/drivers/input/touchscreen/omap/omap_ts.c +--- linux-2.6.12-rc5_omap1/drivers/input/touchscreen/omap/omap_ts.c 2005-08-23 22:36:32.555394570 +0300 ++++ linux-2.6.12-rc5_omap1_h6300/drivers/input/touchscreen/omap/omap_ts.c 2005-08-23 22:38:07.551273120 +0300 +@@ -39,14 +39,14 @@ + + #include <asm/mach-types.h> + +-//#define DEBUG ++#define DEBUG + + #include "omap_ts.h" + + #define OMAP_TS_NAME "omap_ts" + + static struct ts_device *__initdata ts_devs[] = { +-#if defined(CONFIG_MACH_OMAP_H2) || defined(CONFIG_MACH_OMAP_H3) ++#if defined(CONFIG_MACH_OMAP_H2) || defined(CONFIG_MACH_OMAP_H3) || defined(CONFIG_MACH_H6300) + &hx_ts, + #endif + #ifdef CONFIG_MACH_OMAP_OSK +@@ -70,8 +70,7 @@ + input_report_abs(&(ts_omap.inputdevice), ABS_PRESSURE, data[2]); + input_sync(&(ts_omap.inputdevice)); + +- DEBUG_TS("omap_ts_read: read x=%d,y=%d,p=%d\n", data[0], data[1], +- data[2]); ++ //DEBUG_TS("omap_ts_read: read x=%d,y=%d,p=%d\n", data[0], data[1], data[2]); + + return 0; + } +@@ -84,7 +83,7 @@ + + if (!ts_omap.dev->penup()) { + if (!ts_omap.touched) { +- DEBUG_TS("omap_ts_timer: pen down\n"); ++ //DEBUG_TS("omap_ts_timer: pen down\n"); + input_report_key(&(ts_omap.inputdevice), BTN_TOUCH, 1); + } + ts_omap.touched = 1; +@@ -93,7 +92,7 @@ + add_timer(&(ts_omap.ts_timer)); + } else { + if (ts_omap.touched) { +- DEBUG_TS("omap_ts_timer: pen up\n"); ++ //DEBUG_TS("omap_ts_timer: pen up\n"); + ts_omap.touched = 0; + input_report_abs(&(ts_omap.inputdevice), ABS_X, 0); + input_report_abs(&(ts_omap.inputdevice), ABS_Y, 0); +diff -Naur linux-2.6.12-rc5_omap1/drivers/input/touchscreen/omap/ts_hx.c linux-2.6.12-rc5_omap1_h6300/drivers/input/touchscreen/omap/ts_hx.c +--- linux-2.6.12-rc5_omap1/drivers/input/touchscreen/omap/ts_hx.c 2005-08-23 22:36:32.588389317 +0300 ++++ linux-2.6.12-rc5_omap1_h6300/drivers/input/touchscreen/omap/ts_hx.c 2005-08-23 22:38:07.585267709 +0300 +@@ -33,6 +33,7 @@ + #include <asm/arch/mux.h> + #include <asm/arch/hardware.h> + #include <asm/hardware/tsc2101.h> ++#include <linux/delay.h> + + #include "../drivers/ssi/omap-tsc2101.h" + #include "omap_ts.h" +@@ -88,6 +89,9 @@ + } else if (machine_is_omap_h3()) { + gpio = H3_GPIO_NUM; + omap_cfg_reg(W19_1610_GPIO48); ++ }else if (machine_is_h6300()) { ++ gpio = 2; ++ omap_cfg_reg(M14_1510_GPIO2); + } else + return -ENODEV; + +@@ -180,5 +184,8 @@ + omap_free_gpio(H2_GPIO_NUM); + else if (machine_is_omap_h3()) + omap_free_gpio(H3_GPIO_NUM); ++ else if (machine_is_h6300()) ++ omap_free_gpio(2); ++ + } + #endif +diff -Naur linux-2.6.12-rc5_omap1/drivers/ssi/omap-tsc2101.c linux-2.6.12-rc5_omap1_h6300/drivers/ssi/omap-tsc2101.c +--- linux-2.6.12-rc5_omap1/drivers/ssi/omap-tsc2101.c 2005-08-23 22:36:33.800196420 +0300 ++++ linux-2.6.12-rc5_omap1_h6300/drivers/ssi/omap-tsc2101.c 2005-08-23 22:38:07.586267550 +0300 +@@ -25,6 +25,7 @@ + #include <linux/delay.h> + + #include <asm/system.h> ++#include <asm/arch/gpio.h> + #include <asm/irq.h> + #include <asm/io.h> + #include <asm/mach-types.h> +@@ -39,7 +40,7 @@ + + #include "omap-tsc2101.h" + +-#if CONFIG_ARCH_OMAP16XX ++#if CONFIG_ARCH_OMAP1 + #include <../drivers/ssi/omap-uwire.h> + #else + #error "Unsupported configuration" +@@ -47,7 +48,7 @@ + + #define SPIO 1 + +-static int count; ++static int count = 0; + static spinlock_t tsc2101_lock = SPIN_LOCK_UNLOCKED; + static struct clk * tsc2101_mclk_ck; + +@@ -66,13 +67,12 @@ + if (count++ == 0) { + int ret = 0; + /* set the Mux to provide MCLK to TSC2101 */ +- if (machine_is_omap_h3()) { ++ if (machine_is_omap_h3()) + ret = omap_cfg_reg(V5_1710_MCLK_ON); +- } else { +- if (machine_is_omap_h2()) { +- ret = omap_cfg_reg(R10_1610_MCLK_ON); +- } +- } ++ else if (machine_is_omap_h2()) ++ ret = omap_cfg_reg(R10_1610_MCLK_ON); ++ else if (machine_is_h6300 ()) ++ ret = omap_cfg_reg(R10_1610_MCLK_ON); // TODO: for now use the 1610 mux + + /* Get the MCLK */ + tsc2101_mclk_ck = clk_get(NULL, "mclk"); +@@ -108,19 +108,22 @@ + if (--count == 0) { + int ret = 0; + /* Remove the Mux to Stop MCLK to TSC2101 */ +- if (machine_is_omap_h3()) { ++ if (machine_is_omap_h3()) + ret = omap_cfg_reg(V5_1710_MCLK_OFF); +- } else { +- if (machine_is_omap_h2()) { +- ret = omap_cfg_reg(R10_1610_MCLK_OFF); +- } +- } ++ else if (machine_is_omap_h2()) ++ ret = omap_cfg_reg(R10_1610_MCLK_OFF); ++// else if (machine_is_h6300 ()) ++// ret = omap_cfg_reg(R10_1610_MCLK_OFF); // TODO: for now use the 1610 mux + + /* Release the MCLK */ + clk_disable(tsc2101_mclk_ck); + clk_put(tsc2101_mclk_ck); + tsc2101_mclk_ck = NULL; + ++#if defined(CONFIG_MACH_H6300) ++ omap_free_gpio(8); ++#endif ++ + module_put(THIS_MODULE); + } + spin_unlock(&tsc2101_lock); +@@ -130,57 +133,57 @@ + { + + int ret = 0; ++ int cs = 0; + +- if (machine_is_omap_h2()) { +- ret = +- omap_uwire_data_transfer(1, +- (((page) << 11) | (address << 5)), +- 16, 0, NULL, 1); +- if (ret) { +- printk(KERN_ERR +- "uwire-write returned error for address %x\n", +- address); +- return; +- } +- ret = omap_uwire_data_transfer(1, data, 16, 0, NULL, 0); +- if (ret) { +- printk(KERN_ERR +- "uwire-write returned error for address %x\n", +- address); +- return; +- } ++ if (cpu_is_omap16xx ()) { ++ if (machine_is_omap_h2()) ++ cs=1; ++ if (machine_is_omap_h3()) ++ cs=0; ++ } else if (cpu_is_omap15xx ()) { ++ cs=0; + } +- if (machine_is_omap_h3()) { + +- ret = +- omap_uwire_data_transfer(0, ((page << 11) | (address << 5)), +- 16, 0, NULL, 1); +- if (ret) { +- printk(KERN_ERR +- "uwire-write returned error for address %x\n", +- address); +- return; +- } +- ret = omap_uwire_data_transfer(0, data, 16, 0, NULL, 0); +- if (ret) { +- printk(KERN_ERR +- "uwire-write returned error for address %x\n", +- address); +- return; +- } ++#if defined(CONFIG_MACH_H6300) ++ omap_set_gpio_dataout(8, 0); ++#endif ++ ++ ret = omap_uwire_data_transfer(cs, ++ (((page) << 11) | (address << 5)), ++ 16, 0, NULL, 1); ++ if (ret) { ++ printk(KERN_ERR ++ "uwire-write returned error for address %x\n", ++ address); ++ omap_set_gpio_dataout(8, 1); ++ return; ++ } ++ ret = omap_uwire_data_transfer(cs, data, 16, 0, NULL, 0); ++ if (ret) { ++ printk(KERN_ERR ++ "uwire-write returned error for address %x\n", ++ address); ++ omap_set_gpio_dataout(8, 1); ++ return; + } + ++#if defined(CONFIG_MACH_H6300) ++ omap_set_gpio_dataout(8, 1); ++#endif + } + + void omap_tsc2101_reads(int page, u8 startaddress, u16 * data, int numregs) + { + int cs = 0, i; +- if (machine_is_omap_h2()) { ++ if (machine_is_omap_h2()) + cs = 1; +- } +- if (machine_is_omap_h3()) { ++ if (machine_is_omap_h3()) + cs = 0; +- } ++ ++#if defined(CONFIG_MACH_H6300) ++ omap_set_gpio_dataout(8, 0); ++#endif ++ + (void)omap_uwire_data_transfer(cs, (0x8000 | (page << 11) + | (startaddress << 5)), + 16, 0, NULL, 1); +@@ -188,11 +191,15 @@ + omap_uwire_data_transfer(cs, 0, 0, 16, data, 1); + } + omap_uwire_data_transfer(cs, 0, 0, 16, data, 0); ++ ++#if defined(CONFIG_MACH_H6300) ++ omap_set_gpio_dataout(8, 1); ++#endif + } + + u16 omap_tsc2101_read(int page, u8 address) + { +- u16 ret; ++ u16 ret=0; + omap_tsc2101_reads(page, address, &ret, 1); + return ret; + } +@@ -217,7 +224,6 @@ + return err; + } + #endif +- + if (machine_is_omap_h2()) { + uwire_flags = UWIRE_READ_RISING_EDGE | UWIRE_WRITE_RISING_EDGE; + omap_cfg_reg(N15_1610_UWIRE_CS1); +@@ -228,9 +234,22 @@ + omap_cfg_reg(N14_1610_UWIRE_CS0); + omap_uwire_configure_mode(0, uwire_flags); + } ++ if (machine_is_h6300()) { ++ uwire_flags = UWIRE_READ_RISING_EDGE | UWIRE_WRITE_RISING_EDGE; ++ omap_cfg_reg(X1_1510_UWIRE_CS0); ++ omap_uwire_configure_mode(0, uwire_flags); ++ ++ omap_request_gpio(8); ++ omap_set_gpio_dataout(8, 0); ++ omap_set_gpio_direction (8, 0); ++ } ++ + + /* Configure MCLK enable */ +- omap_writel(omap_readl(PU_PD_SEL_2) | (1 << 22), PU_PD_SEL_2); ++ if (cpu_is_omap16xx ()) ++ omap_writel(omap_readl(PU_PD_SEL_2) | (1 << 22), PU_PD_SEL_2); ++ if (machine_is_h6300()) ++ omap_cfg_reg(X1_1510_UWIRE_SDI); + + return 0; + } +@@ -243,5 +262,5 @@ + + MODULE_AUTHOR("Texas Instruments"); + MODULE_DESCRIPTION +- ("Glue audio driver for the TI OMAP1610/OMAP1710 TSC2101 codec."); ++ ("Glue audio driver for the TI TSC2101 codec."); + MODULE_LICENSE("GPL"); +diff -Naur linux-2.6.12-rc5_omap1/drivers/ssi/omap-uwire.c linux-2.6.12-rc5_omap1_h6300/drivers/ssi/omap-uwire.c +--- linux-2.6.12-rc5_omap1/drivers/ssi/omap-uwire.c 2005-08-23 22:36:33.827192123 +0300 ++++ linux-2.6.12-rc5_omap1_h6300/drivers/ssi/omap-uwire.c 2005-08-23 22:38:07.586267550 +0300 +@@ -205,6 +205,11 @@ + omap_cfg_reg(N14_1610_UWIRE_CS0); + omap_cfg_reg(N15_1610_UWIRE_CS1); + } ++ ++ if (machine_is_h6300 ()) { ++ omap_cfg_reg(X1_1510_UWIRE_CS0); ++ omap_cfg_reg(X1_1510_UWIRE_CS3); ++ } + if (machine_is_omap_perseus2()) { + /* configure pins: MPU_UW_nSCS1, MPU_UW_SDO, MPU_UW_SCLK */ + int val = omap_readl(OMAP730_IO_CONF_9) & ~0x00EEE000; +diff -Naur linux-2.6.12-rc5_omap1/drivers/usb/gadget/omap_udc.c linux-2.6.12-rc5_omap1_h6300/drivers/usb/gadget/omap_udc.c +--- linux-2.6.12-rc5_omap1/drivers/usb/gadget/omap_udc.c 2005-08-23 22:36:33.937174616 +0300 ++++ linux-2.6.12-rc5_omap1_h6300/drivers/usb/gadget/omap_udc.c 2005-08-23 22:38:07.653256887 +0300 +@@ -2101,7 +2101,7 @@ + /* boards that don't have VBUS sensing can't autogate 48MHz; + * can't enter deep sleep while a gadget driver is active. + */ +- if (machine_is_omap_innovator() || machine_is_omap_osk()) ++ if (machine_is_omap_innovator() || machine_is_omap_osk() || machine_is_h6300()) + omap_vbus_session(&udc->gadget, 1); + + done: +@@ -2119,7 +2119,7 @@ + if (!driver || driver != udc->driver) + return -EINVAL; + +- if (machine_is_omap_innovator() || machine_is_omap_osk()) ++ if (machine_is_omap_innovator() || machine_is_omap_osk() || machine_is_h6300()) + omap_vbus_session(&udc->gadget, 0); + + if (udc->transceiver) +@@ -2727,7 +2727,7 @@ + hmc = HMC_1510; + type = "(unknown)"; + +- if (machine_is_omap_innovator()) { ++ if (machine_is_omap_innovator() || machine_is_h6300()) { + /* just set up software VBUS detect, and then + * later rig it so we always report VBUS. + * FIXME without really sensing VBUS, we can't +@@ -2957,6 +2957,11 @@ + + static int __init udc_init(void) + { ++#ifdef USE_DMA ++ if (machine_is_h6300()) ++ use_dma=0; ++#endif ++ + INFO("%s, version: " DRIVER_VERSION + #ifdef USE_ISO + " (iso)" +diff -Naur linux-2.6.12-rc5_omap1/drivers/usb/gadget/omap_udc.h linux-2.6.12-rc5_omap1_h6300/drivers/usb/gadget/omap_udc.h +--- linux-2.6.12-rc5_omap1/drivers/usb/gadget/omap_udc.h 2005-08-23 22:36:33.939174298 +0300 ++++ linux-2.6.12-rc5_omap1_h6300/drivers/usb/gadget/omap_udc.h 2005-08-23 22:37:10.616335999 +0300 +@@ -174,6 +174,7 @@ + unsigned ep0_set_config:1; + unsigned ep0_reset_config:1; + unsigned ep0_setup:1; ++ + struct completion *done; + }; + +diff -Naur linux-2.6.12-rc5_omap1/drivers/video/omap/lcd_h6300.c linux-2.6.12-rc5_omap1_h6300/drivers/video/omap/lcd_h6300.c +--- linux-2.6.12-rc5_omap1/drivers/video/omap/lcd_h6300.c 1970-01-01 02:00:00.000000000 +0200 ++++ linux-2.6.12-rc5_omap1_h6300/drivers/video/omap/lcd_h6300.c 2005-08-23 22:38:07.655256568 +0300 +@@ -0,0 +1,90 @@ ++/* ++ * File: drivers/video/omap_new/lcd-inn1510.c ++ * ++ * LCD panel support for the TI OMAP1510 Innovator board ++ * ++ * Copyright (C) 2004 Nokia Corporation ++ * Author: Imre Deak <imre.deak@nokia.com> ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License as published by the ++ * Free Software Foundation; either version 2 of the License, or (at your ++ * option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, but ++ * WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License along ++ * with this program; if not, write to the Free Software Foundation, Inc., ++ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ */ ++ ++#include <linux/module.h> ++#include <asm/io.h> ++ ++ ++#include "omapfb.h" ++ ++// #define OMAPFB_DBG 1 ++ ++#include "debug.h" ++ ++static int h6300_panel_init(struct lcd_panel *panel) ++{ ++ DBGENTER(1); ++ DBGLEAVE(1); ++ return 0; ++} ++ ++static void h6300_panel_cleanup(struct lcd_panel *panel) ++{ ++ DBGENTER(1); ++ DBGLEAVE(1); ++} ++ ++static int h6300_panel_enable(struct lcd_panel *panel) ++{ ++ DBGENTER(1); ++ DBGLEAVE(1); ++ return 0; ++} ++ ++static void h6300_panel_disable(struct lcd_panel *panel) ++{ ++ DBGENTER(1); ++ DBGLEAVE(1); ++} ++ ++static unsigned long h6300_panel_get_caps(struct lcd_panel *panel) ++{ ++ return 0; ++} ++ ++static struct lcdc_video_mode mode240x320 = { ++ .x_res = 240, ++ .y_res = 320, ++ .pixel_clock = 12500, ++ .bpp = 16, ++ .hsw = 12, ++ .hfp = 10, ++ .hbp = 10, ++ .vsw = 3, ++ .vfp = 10, ++ .vbp = 3, ++ .pcd = 4, ++}; ++ ++struct lcd_panel h6300_panel = { ++ .name = "h6300", ++ .config = LCD_PANEL_TFT, ++ .video_mode = &mode240x320, ++ ++ .init = h6300_panel_init, ++ .cleanup = h6300_panel_cleanup, ++ .enable = h6300_panel_enable, ++ .disable = h6300_panel_disable, ++ .get_caps= h6300_panel_get_caps, ++}; ++ +diff -Naur linux-2.6.12-rc5_omap1/drivers/video/omap/Makefile linux-2.6.12-rc5_omap1_h6300/drivers/video/omap/Makefile +--- linux-2.6.12-rc5_omap1/drivers/video/omap/Makefile 2005-08-23 22:36:34.395101723 +0300 ++++ linux-2.6.12-rc5_omap1_h6300/drivers/video/omap/Makefile 2005-08-23 22:38:07.656256409 +0300 +@@ -11,6 +11,7 @@ + objs-y$(CONFIG_MACH_OMAP_H2) += lcd_h2.o + objs-$(CONFIG_ARCH_OMAP16XX)$(CONFIG_MACH_OMAP_INNOVATOR) += lcd_inn1610.o + objs-$(CONFIG_ARCH_OMAP1510)$(CONFIG_MACH_OMAP_INNOVATOR) += lcd_inn1510.o ++objs-$(CONFIG_ARCH_OMAP1510)$(CONFIG_MACH_H6300) += lcd_h6300.o + objs-$(CONFIG_ARCH_OMAP16XX)$(CONFIG_MACH_OMAP_OSK) += lcd_osk.o + objs-$(CONFIG_ARCH_OMAP730)$(CONFIG_MACH_OMAP_PERSEUS2) += lcd_p2.o + +diff -Naur linux-2.6.12-rc5_omap1/drivers/video/omap/omapfb.h linux-2.6.12-rc5_omap1_h6300/drivers/video/omap/omapfb.h +--- linux-2.6.12-rc5_omap1/drivers/video/omap/omapfb.h 2005-08-23 22:36:34.397101404 +0300 ++++ linux-2.6.12-rc5_omap1_h6300/drivers/video/omap/omapfb.h 2005-08-23 22:38:07.688251316 +0300 +@@ -316,6 +316,7 @@ + extern struct lcd_panel osk_panel; + extern struct lcd_panel innovator1610_panel; + extern struct lcd_panel innovator1510_panel; ++extern struct lcd_panel h6300_panel; + + extern struct lcd_ctrl omapfb_lcdc_ctrl; + +diff -Naur linux-2.6.12-rc5_omap1/drivers/video/omap/omapfb_main.c linux-2.6.12-rc5_omap1_h6300/drivers/video/omap/omapfb_main.c +--- linux-2.6.12-rc5_omap1/drivers/video/omap/omapfb_main.c 2005-08-23 22:36:34.472089467 +0300 ++++ linux-2.6.12-rc5_omap1_h6300/drivers/video/omap/omapfb_main.c 2005-08-23 22:38:07.690250998 +0300 +@@ -108,6 +108,9 @@ + &innovator1610_panel, + #endif + #endif ++#ifdef CONFIG_MACH_H6300 ++ &h6300_panel, ++#endif + }; + + static struct lcd_ctrl *ctrls[] = { +@@ -1881,6 +1884,8 @@ + def_name = "inn1610"; + if (machine_is_omap_innovator() && cpu_is_omap1510()) + def_name = "inn1510"; ++ if (machine_is_h6300()) ++ def_name = "h6300"; + if (def_name == NULL) + return -1; + strncpy(name, def_name, sizeof(name) - 1); +diff -Naur linux-2.6.12-rc5_omap1/include/asm-arm/arch-omap/board-h6300.h linux-2.6.12-rc5_omap1_h6300/include/asm-arm/arch-omap/board-h6300.h +--- linux-2.6.12-rc5_omap1/include/asm-arm/arch-omap/board-h6300.h 1970-01-01 02:00:00.000000000 +0200 ++++ linux-2.6.12-rc5_omap1_h6300/include/asm-arm/arch-omap/board-h6300.h 2005-08-23 22:38:07.726245268 +0300 +@@ -0,0 +1,40 @@ ++/* ++ * linux/include/asm-arm/arch-omap/board-innovator.h ++ * ++ * Copyright (C) 2001 RidgeRun, Inc. ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License as published by the ++ * Free Software Foundation; either version 2 of the License, or (at your ++ * option) any later version. ++ * ++ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED ++ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ++ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN ++ * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, ++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT ++ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF ++ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ++ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF ++ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ * ++ * You should have received a copy of the GNU General Public License along ++ * with this program; if not, write to the Free Software Foundation, Inc., ++ * 675 Mass Ave, Cambridge, MA 02139, USA. ++ */ ++#ifndef __ASM_ARCH_H6300_H ++#define __ASM_ARCH_H6300_H ++ ++#ifndef OMAP_SDRAM_DEVICE ++#define OMAP_SDRAM_DEVICE D256M_1X16_4B ++#endif ++ ++#define OMAP1510P1_IMIF_PRI_VALUE 0x00 ++#define OMAP1510P1_EMIFS_PRI_VALUE 0x00 ++#define OMAP1510P1_EMIFF_PRI_VALUE 0x00 ++ ++#define NR_FPGA_IRQS 24 ++#define NR_IRQS IH_BOARD_BASE + NR_FPGA_IRQS ++ ++#endif /* __ASM_ARCH_H6300_H */ +diff -Naur linux-2.6.12-rc5_omap1/include/asm-arm/arch-omap/hardware.h linux-2.6.12-rc5_omap1_h6300/include/asm-arm/arch-omap/hardware.h +--- linux-2.6.12-rc5_omap1/include/asm-arm/arch-omap/hardware.h 2005-08-23 22:36:34.980008616 +0300 ++++ linux-2.6.12-rc5_omap1_h6300/include/asm-arm/arch-omap/hardware.h 2005-08-23 22:38:07.727245109 +0300 +@@ -299,6 +299,10 @@ + #include "board-innovator.h" + #endif + ++#ifdef CONFIG_MACH_H6300 ++#include "board-h6300.h" ++#endif ++ + #ifdef CONFIG_MACH_OMAP_H2 + #include "board-h2.h" + #endif +diff -Naur linux-2.6.12-rc5_omap1/include/asm-arm/arch-omap/mux.h linux-2.6.12-rc5_omap1_h6300/include/asm-arm/arch-omap/mux.h +--- linux-2.6.12-rc5_omap1/include/asm-arm/arch-omap/mux.h 2005-08-23 22:36:35.014003205 +0300 ++++ linux-2.6.12-rc5_omap1_h6300/include/asm-arm/arch-omap/mux.h 2005-08-23 22:38:07.795234287 +0300 +@@ -250,9 +250,16 @@ + U18_1610_UWIRE_SDI, + W21_1610_UWIRE_SDO, + N14_1610_UWIRE_CS0, +- P15_1610_UWIRE_CS0, ++ P15_1610_UWIRE_CS3, + N15_1610_UWIRE_CS1, + ++ /* OMAP-1510 uWire */ ++ X1_1510_UWIRE_CS3, ++ X1_1510_UWIRE_CS0, ++ X1_1510_UWIRE_SCLK, ++ X1_1510_UWIRE_SDO, ++ X1_1510_UWIRE_SDI, ++ + /* OMAP-1610 Flash */ + L3_1610_FLASH_CS2B_OE, + M8_1610_FLASH_CS2B_WE, +@@ -481,6 +488,13 @@ + MUX_CFG("P15_1610_UWIRE_CS3", 8, 12, 1, 1, 22, 0, 1, 1, 1) + MUX_CFG("N15_1610_UWIRE_CS1", 7, 18, 2, 1, 14, 0, NA, 0, 1) + ++/* OMAP-1510 uWire */ ++MUX_CFG("X1_1510_UWIRE_CS3", 8, 12, 1, NA, 0, 0, NA, 0, 1) ++MUX_CFG("X1_1510_UWIRE_CS0", 8, 9, 1, NA, 0, 0, NA, 0, 1) ++MUX_CFG("X1_1510_UWIRE_SCLK", 8, 6, 0, NA, 0, 0, NA, 0, 1) ++MUX_CFG("X1_1510_UWIRE_SDO", 8, 3, 0, NA, 0, 0, NA, 0, 1) ++MUX_CFG("X1_1510_UWIRE_SDI", 8, 0, 0, 1, 18, 1, NA, 0, 1) ++ + /* OMAP-1610 Flash */ + MUX_CFG("L3_1610_FLASH_CS2B_OE",10, 6, 1, NA, 0, 0, NA, 0, 1) + MUX_CFG("M8_1610_FLASH_CS2B_WE",10, 3, 1, NA, 0, 0, NA, 0, 1) +@@ -545,7 +559,8 @@ + /* MCLK Settings */ + MUX_CFG("V5_1710_MCLK_ON", B, 15, 0, NA, 0, 0, NA, 0, 0) + MUX_CFG("V5_1710_MCLK_OFF", B, 15, 6, NA, 0, 0, NA, 0, 0) +-MUX_CFG("R10_1610_MCLK_ON", B, 18, 0, NA, 22, 0, NA, 1, 0) ++/* orig: MUX_CFG("R10_1610_MCLK_ON", B, 18, 0, NA, 22, 0, NA, 1, 0) */ ++MUX_CFG("R10_1610_MCLK_ON", B, 18, 0, NA, 22, 0, NA, 1, 1) + MUX_CFG("R10_1610_MCLK_OFF", B, 18, 6, 2, 22, 1, 2, 1, 1) + + /* CompactFlash controller, conflicts with MMC1 */ +diff -Naur linux-2.6.12-rc5_omap1/include/asm-arm/cpu-single.h linux-2.6.12-rc5_omap1_h6300/include/asm-arm/cpu-single.h +--- linux-2.6.12-rc5_omap1/include/asm-arm/cpu-single.h 2005-05-25 06:31:20.000000000 +0300 ++++ linux-2.6.12-rc5_omap1_h6300/include/asm-arm/cpu-single.h 2005-08-23 22:38:07.817230785 +0300 +@@ -41,4 +41,4 @@ + extern void cpu_dcache_clean_area(void *, int); + extern void cpu_do_switch_mm(unsigned long pgd_phys, struct mm_struct *mm); + extern void cpu_set_pte(pte_t *ptep, pte_t pte); +-extern volatile void cpu_reset(unsigned long addr); ++extern void cpu_reset(unsigned long addr); +diff -Naur linux-2.6.12-rc5_omap1/Makefile linux-2.6.12-rc5_omap1_h6300/Makefile +--- linux-2.6.12-rc5_omap1/Makefile 2005-08-23 22:36:35.409940179 +0300 ++++ linux-2.6.12-rc5_omap1_h6300/Makefile 2005-08-23 22:38:07.818230626 +0300 +@@ -11,7 +11,7 @@ + # expect to learn how to build the kernel reading this file. + + # Add custom flags here to avoid conflict with updates +-EXTRAVERSION := $(EXTRAVERSION)-omap2 ++EXTRAVERSION := $(EXTRAVERSION)-omap1-h6300 + + # Do not print "Entering directory ..." + MAKEFLAGS += --no-print-directory +diff -Naur linux-2.6.12-rc5_omap1/sound/oss/Kconfig linux-2.6.12-rc5_omap1_h6300/sound/oss/Kconfig +--- linux-2.6.12-rc5_omap1/sound/oss/Kconfig 2005-08-23 22:36:35.439935405 +0300 ++++ linux-2.6.12-rc5_omap1_h6300/sound/oss/Kconfig 2005-08-23 22:38:07.849225692 +0300 +@@ -12,7 +12,7 @@ + + config SOUND_OMAP_TSC2101 + tristate "TSC2101 Stereo Codec" +- depends on SOUND_OMAP && ( MACH_OMAP_H2 || MACH_OMAP_H3 ) ++ depends on SOUND_OMAP && ARCH_OMAP1 + select OMAP_TSC2101 + select OMAP_UWIRE if ARCH_OMAP + ---help--- +diff -Naur linux-2.6.12-rc5_omap1/sound/oss/omap-audio.c linux-2.6.12-rc5_omap1_h6300/sound/oss/omap-audio.c +--- linux-2.6.12-rc5_omap1/sound/oss/omap-audio.c 2005-08-23 22:36:35.498926014 +0300 ++++ linux-2.6.12-rc5_omap1_h6300/sound/oss/omap-audio.c 2005-08-23 22:38:07.895218371 +0300 +@@ -56,8 +56,8 @@ + + /***************************** MACROS ************************************/ + +-#undef DEBUG +-//#define DEBUG ++//#undef DEBUG ++#define DEBUG + #ifdef DEBUG + #define DPRINTK printk + #define FN_IN printk("[omap_audio.c:[%s] start\n", __FUNCTION__) +diff -Naur linux-2.6.12-rc5_omap1/sound/oss/omap-audio-tsc2101.c linux-2.6.12-rc5_omap1_h6300/sound/oss/omap-audio-tsc2101.c +--- linux-2.6.12-rc5_omap1/sound/oss/omap-audio-tsc2101.c 2005-08-23 22:36:35.557916624 +0300 ++++ linux-2.6.12-rc5_omap1_h6300/sound/oss/omap-audio-tsc2101.c 2005-08-23 22:38:07.897218053 +0300 +@@ -48,7 +48,7 @@ + #include "omap-audio.h" + #include "omap-audio-dma-intfc.h" + #include <asm/arch/mcbsp.h> +-#if CONFIG_ARCH_OMAP16XX ++#if CONFIG_ARCH_OMAP1 + #include <../drivers/ssi/omap-uwire.h> + #include <asm/arch/dsp_common.h> + #else +@@ -70,12 +70,14 @@ + + #define CODEC_NAME "TSC2101" + +-#if CONFIG_ARCH_OMAP16XX +-#define PLATFORM_NAME "OMAP16XX" ++#if CONFIG_ARCH_OMAP1 ++#define PLATFORM_NAME "OMAP" + #endif + + #if CONFIG_ARCH_OMAP16XX + #define OMAP_DSP_BASE 0xE0000000 ++#elif CONFIG_ARCH_OMAP1510 ++#define OMAP_DSP_BASE 0xE0000000 + #endif + + /* Define to set the tsc as the master w.r.t McBSP */ +@@ -91,9 +93,15 @@ + + /* Select the McBSP For Audio */ + #if CONFIG_ARCH_OMAP16XX +-#define AUDIO_MCBSP OMAP_MCBSP1 ++# define AUDIO_MCBSP OMAP_MCBSP1 ++# define AUDIO_DMA_TX OMAP_DMA_MCBSP1_TX ++# define AUDIO_DMA_RX OMAP_DMA_MCBSP1_RX ++#elif CONFIG_ARCH_OMAP1510 ++# define AUDIO_MCBSP OMAP_MCBSP1 ++# define AUDIO_DMA_TX OMAP_DMA_MCBSP1_TX ++# define AUDIO_DMA_RX OMAP_DMA_MCBSP1_RX + #else +-#error "UnSupported Configuration" ++# error "UnSupported Configuration" + #endif + + #define REC_MASK (SOUND_MASK_LINE | SOUND_MASK_MIC) +@@ -123,18 +131,18 @@ + + /*********** Debug Macros ********/ + /* To Generate a rather shrill tone -test the entire path */ +-//#define TONE_GEN ++#define TONE_GEN + /* To Generate a tone for each keyclick - test the tsc,spi paths*/ +-//#define TEST_KEYCLICK ++#define TEST_KEYCLICK + /* To dump the tsc registers for debug */ +-//#define TSC_DUMP_REGISTERS ++#define TSC_DUMP_REGISTERS + + #ifdef DPRINTK + #undef DPRINTK + #endif + #undef DEBUG + +-//#define DEBUG ++#define DEBUG + #ifdef DEBUG + #define DPRINTK(ARGS...) printk(KERN_INFO "<%s>: ",__FUNCTION__);printk(ARGS) + #define FN_IN printk(KERN_INFO "[%s]: start\n", __FUNCTION__) +@@ -149,13 +157,13 @@ + + static audio_stream_t output_stream = { + .id = "TSC2101 out", +- .dma_dev = OMAP_DMA_MCBSP1_TX, ++ .dma_dev = AUDIO_DMA_TX, + .input_or_output = FMODE_WRITE + }; + + static audio_stream_t input_stream = { + .id = "TSC2101 in", +- .dma_dev = OMAP_DMA_MCBSP1_RX, ++ .dma_dev = AUDIO_DMA_RX, + .input_or_output = FMODE_READ + }; + +@@ -215,6 +223,17 @@ + }; + + static struct omap_mcbsp_reg_cfg initial_config = { ++#if CONFIG_MACH_H6300 ++ .spcr2 = 0x0005, ++ .spcr1 = 0x0005, ++ .rcr2 = 0x8041, ++ .rcr1 = 0x8041, ++ .xcr2 = 0x00a1, ++ .xcr1 = 0x00a1, ++ .srgr2 = 0xb000, ++ .srgr1 = 0xb000, ++ .pcr0 = 0x0081, ++#else + .spcr2 = FREE | FRST | GRST | XRST | XINTM(3), + .spcr1 = RINTM(3) | RRST, + .rcr2 = RPHASE | RFRLEN2(OMAP_MCBSP_WORD_8) | +@@ -230,14 +249,13 @@ + #if CONFIG_MACH_OMAP_H2 + .pcr0 = CLKXM | CLKRM | FSXP | FSRP | CLKXP | CLKRP, + #elif CONFIG_MACH_OMAP_H3 +- +-#ifndef TSC_MASTER ++# ifndef TSC_MASTER + .pcr0 = FSXM | FSRM | CLKXM | CLKRM | CLKXP | CLKRP, +-#else ++# else + .pcr0 = CLKRM | SCLKME | FSXP | FSRP | CLKXP | CLKRP, +-#endif /* tsc Master defs */ +- ++# endif /* tsc Master defs */ + #endif /* platform specific inits */ ++#endif + }; + + /***************************** MODULES SPECIFIC FUNCTION PROTOTYPES ********************/ +@@ -1218,5 +1236,5 @@ + + MODULE_AUTHOR("Texas Instruments"); + MODULE_DESCRIPTION +- ("Glue audio driver for the TI OMAP1610/OMAP1710 TSC2101 codec."); ++ ("Glue audio driver for the TI OMAP TSC2101 codec."); + MODULE_LICENSE("GPL"); diff --git a/packages/linux/linux-h6300-omap1_2.6.12-rc5.bb b/packages/linux/linux-h6300-omap1_2.6.12-rc5.bb new file mode 100644 index 0000000000..51210c41f6 --- /dev/null +++ b/packages/linux/linux-h6300-omap1_2.6.12-rc5.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Linux kernel for h6300 devices." +MAINTAINER = "Mika Laitio <lamikr@cc.jyu.fi>" +SECTION = "kernel" +LICENSE = "GPL" + +SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.12-rc5.tar.bz2 \ + http://www.muru.com/linux/omap/patches/patch-2.6.12-rc5-omap2.bz2;patch=1 \ + file://h6300_omap1_2612rc5.patch;patch=1 \ + file://defconfig" + +S = "${WORKDIR}/linux-2.6.12-rc5" + +inherit kernel + +do_configure_prepend() { + install -m 0644 ${WORKDIR}/defconfig ${S}/.config + oe_runmake oldconfig +} diff --git a/packages/lvm2/.mtn2git_empty b/packages/lvm2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/lvm2/.mtn2git_empty diff --git a/packages/lvm2/lvm2_2.01.09.bb b/packages/lvm2/lvm2_2.01.09.bb new file mode 100644 index 0000000000..66343596c4 --- /dev/null +++ b/packages/lvm2/lvm2_2.01.09.bb @@ -0,0 +1,13 @@ +SECTION = "utils" +DESCRIPTION = "LVM2 is a set of utilities to manage logical volumes in Linux." +MAINTAINER = "Dan Williams <dan.j.williams@gmail.com>" +LICENSE = "GPL" +PR = "r1" +DEPENDS = "device-mapper" + +S = "${WORKDIR}/LVM2.${PV}" + +SRC_URI = "ftp://sources.redhat.com/pub/lvm2/LVM2.${PV}.tgz" + +inherit autotools + diff --git a/packages/make/make-native_3.80.bb b/packages/make/make-native_3.80.bb index 848bb03539..8541c48927 100644 --- a/packages/make/make-native_3.80.bb +++ b/packages/make/make-native_3.80.bb @@ -1,5 +1,5 @@ -inherit native include make_${PV}.bb +inherit native FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/make-${PV}" S = "${WORKDIR}/make-${PV}" diff --git a/packages/mdadm/.mtn2git_empty b/packages/mdadm/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mdadm/.mtn2git_empty diff --git a/packages/mdadm/mdadm-1.12.0/.mtn2git_empty b/packages/mdadm/mdadm-1.12.0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mdadm/mdadm-1.12.0/.mtn2git_empty diff --git a/packages/mdadm/mdadm-1.12.0/build_flags.patch b/packages/mdadm/mdadm-1.12.0/build_flags.patch new file mode 100644 index 0000000000..38e1051d6f --- /dev/null +++ b/packages/mdadm/mdadm-1.12.0/build_flags.patch @@ -0,0 +1,19 @@ +--- mdadm-1.12.0/Makefile 2005-08-22 17:30:21.000000000 -0700 ++++ mdadm-1.12.0/Makefile~ 2005-08-22 17:30:14.000000000 -0700 +@@ -37,13 +37,13 @@ + + KLIBC_GCC = gcc -nostdinc -iwithprefix include -I$(KLIBC)/klibc/include -I$(KLIBC)/linux/include -I$(KLIBC)/klibc/arch/i386/include -I$(KLIBC)/klibc/include/bits32 + +-CC = gcc +-CXFLAGS = -ggdb ++CC := $(CC) ++CXFLAGS = + CWFLAGS = -Wall -Werror -Wstrict-prototypes + SYSCONFDIR = /etc + CONFFILE = $(SYSCONFDIR)/mdadm.conf + MAILCMD =/usr/sbin/sendmail -t +-CFLAGS = $(CWFLAGS) -DCONFFILE=\"$(CONFFILE)\" $(CXFLAGS) -DSendmail=\""$(MAILCMD)"\" ++CFLAGS := $(CFLAGS) $(TARGET_CFLAGS) $(CWFLAGS) -DCONFFILE=\"$(CONFFILE)\" $(CXFLAGS) -DSendmail=\""$(MAILCMD)"\" + + # If you want a static binary, you might uncomment these + # LDFLAGS = -static diff --git a/packages/mdadm/mdadm-1.12.0/install.patch b/packages/mdadm/mdadm-1.12.0/install.patch new file mode 100644 index 0000000000..e778f9a3b9 --- /dev/null +++ b/packages/mdadm/mdadm-1.12.0/install.patch @@ -0,0 +1,17 @@ +--- mdadm-1.12.0/Makefile 2005-08-22 16:53:26.000000000 -0700 ++++ mdadm-1.12.0/Makefile~ 2005-08-22 16:53:04.000000000 -0700 +@@ -119,10 +119,10 @@ + $(OBJS) : mdadm.h + + install : mdadm mdadm.8 md.4 mdadm.conf.5 +- $(INSTALL) -D $(STRIP) -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm +- $(INSTALL) -D -m 644 mdadm.8 $(DESTDIR)$(MAN8DIR)/mdadm.8 +- $(INSTALL) -D -m 644 md.4 $(DESTDIR)$(MAN4DIR)/md.4 +- $(INSTALL) -D -m 644 mdadm.conf.5 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5 ++ $(INSTALL) -D -s -m 755 mdadm $(DESTDIR)$(BINDIR) ++ $(INSTALL) -D -m 644 mdadm.8 $(DESTDIR)$(MAN8DIR) ++ $(INSTALL) -D -m 644 md.4 $(DESTDIR)$(MAN4DIR) ++ $(INSTALL) -D -m 644 mdadm.conf.5 $(DESTDIR)$(MAN5DIR) + + clean : + rm -f mdadm $(OBJS) core *.man mdadm.tcc mdadm.uclibc mdadm.static *.orig *.porig *.rej *.alt \ diff --git a/packages/mdadm/mdadm.inc b/packages/mdadm/mdadm.inc new file mode 100644 index 0000000000..977095c7ac --- /dev/null +++ b/packages/mdadm/mdadm.inc @@ -0,0 +1,16 @@ +SECTION = "utils" +DESCRIPTION = "mdadm is a tool for creating, managing and monitoring \ +device arrays using the "md" driver in Linux, also \ +known as Software RAID arrays." +MAINTAINER = "Dan Williams <dan.j.williams@gmail.com>" +LICENSE = "GPL" + +SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/${PN}-${PV}.tar.bz2" + +inherit autotools + + +do_install() { + export STRIP="" + autotools_do_install +} diff --git a/packages/mdadm/mdadm_1.12.0.bb b/packages/mdadm/mdadm_1.12.0.bb new file mode 100644 index 0000000000..454c5d330f --- /dev/null +++ b/packages/mdadm/mdadm_1.12.0.bb @@ -0,0 +1,4 @@ +include mdadm.inc +PR = "r1" + +SRC_URI += " file://build_flags.patch;patch=1 " diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb index 80c0a5be09..2c9fc435e5 100644 --- a/packages/meta/openslug-packages.bb +++ b/packages/meta/openslug-packages.bb @@ -45,6 +45,7 @@ OPENSLUG_PACKAGES = "\ grep \ gtk-doc \ gzip \ + ifupdown \ iperf \ ipkg-utils \ iptables \ diff --git a/packages/pcmcia-cs/files/arm/pcmcia b/packages/pcmcia-cs/files/arm/pcmcia index 3dc330db21..d42bc84e77 100644 --- a/packages/pcmcia-cs/files/arm/pcmcia +++ b/packages/pcmcia-cs/files/arm/pcmcia @@ -1,6 +1,14 @@ case `awk 'BEGIN { FS=":" } /Processor/ { gsub(/ /, "", $2) ; print $2 } ' </proc/cpuinfo` in *XScale-PXA2*) - PCIC=pxa_cs + + case "`uname -r`" in + 2.4*) + PCIC=pxa_cs + ;; + 2.6*) + PCIC=pxa2xx_core + ;; + esac ;; *StrongARM-1100* | *StrongARM-1110*) PCIC=sa1100_cs @@ -12,6 +20,11 @@ case `awk 'BEGIN { FS=":" } /Processor/ { gsub(/ /, "", $2) ; print $2 } ' </pro esac if grep -q iPAQ /proc/cpuinfo; then - PCIC_EXTRA=h3600_generic_sleeve + case `module_id` in + "HP iPAQ H2200") + ;; + *) + PCIC_EXTRA=h3600_generic_sleeve + ;; + esac fi - diff --git a/packages/sablevm/sablevm-classpath_1.12.bb b/packages/sablevm/sablevm-classpath_1.12.bb new file mode 100644 index 0000000000..b712816326 --- /dev/null +++ b/packages/sablevm/sablevm-classpath_1.12.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "GNU Classpath modified to work with SableVM" +HOMEPAGE = "http://sablevm.org" +LICENSE = "Classpath" +PRIORITY = "optional" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" +SECTION = "libs" + +DEPENDS = "glib-2.0 gtk+ libart-lgpl pango xtst jikes-native zip-native" +RDEPENDS_${PN} = "${PN}-native (>= ${PV})" + +SRC_URI = "http://sablevm.org/download/release/${PV}/${PN}-${PV}.tar.gz \ + file://disable-automake-checks.patch;patch=1" + +inherit autotools + +EXTRA_OECONF = "--with-compressed-classes=zip" + +PACKAGES += " ${PN}-native" + +FILES_${PN} = "${datadir}/${PN} \ + ${libdir}/sablevm" +FILES_${PN}-native = "${libdir}/${PN}" + +do_install() { + autotools_do_install + mv ${D}${libdir}/security ${D}${libdir}/${PN} +} diff --git a/packages/sablevm/sablevm_1.12.bb b/packages/sablevm/sablevm_1.12.bb new file mode 100644 index 0000000000..030d8022ad --- /dev/null +++ b/packages/sablevm/sablevm_1.12.bb @@ -0,0 +1,53 @@ +DESCRIPTION = "A highly-portable Java virtual machine implementing the Java virtual machine specification, second edition." +HOMEPAGE = "http://sablevm.org" +LICENSE = "LGPL" +PRIORITY = "optional" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" +SECTION = "interpreters" + +DEPENDS = "libffi libtool popt \ + sablevm-classpath" +# unzip" +RRECOMMENDS = "sablevm-classpath (>= ${PV})" + +SRC_URI = "http://sablevm.org/download/release/${PV}/${PN}-${PV}.tar.gz \ + file://no-internal-libs.patch;patch=1" + +inherit autotools update-alternatives + +EXTRA_OECONF = "--enable-real-life-brokenness \ + --disable-errors-on-warnings --disable-signals-for-exceptions" + +PROVIDES = "virtual/java" +ALTERNATIVE_NAME = "java" +ALTERNATIVE_PATH = "${bindir}/java-sablevm" +ALTERNATIVE_PRIORITY = "350" + +PACKAGES = "${PN} ${PN}-doc lib${PN} lib${PN}-dev" + +FILES_${PN} = "${bindir} \ + ${libdir}/${PN}/bin" + +FILES_lib${PN} = "${libdir}/lib${PN}-*.so" + +FILES_lib${PN}-dev = "${includedir}/jni* \ + ${libdir}/lib${PN}.so \ + ${libdir}/lib${PN}.la" + +do_configure() { + # remove internal copies of libpopt and libffi + rm -rf src/libpopt src/libffi + + autotools_do_configure +} + +do_install() { + autotools_do_install + + install -d ${D}${docdir} + mv ${D}${datadir}/${PN} ${D}${docdir}/ + + # symlink only present in the deb... + install -d ${D}${libdir}/${PN}/bin + cd ${D}${libdir}/${PN}/bin && ln -sf ../../../bin/java-sablevm java +} diff --git a/packages/x11/x11-common/etc/X11/Xinit.d/12keymap b/packages/x11/x11-common/etc/X11/Xinit.d/12keymap index 0e64aac9f4..abc14f8661 100644 --- a/packages/x11/x11-common/etc/X11/Xinit.d/12keymap +++ b/packages/x11/x11-common/etc/X11/Xinit.d/12keymap @@ -16,5 +16,8 @@ case $MACHINE in "Simpad") xmodmap - < /etc/X11/simpad.xmodmap ;; + "HP iPAQ H2200") + xmodmap - < /etc/X11/h2200.xmodmap + ;; esac diff --git a/packages/x11/x11-common/etc/X11/h2200.xmodmap b/packages/x11/x11-common/etc/X11/h2200.xmodmap new file mode 100644 index 0000000000..736766efd7 --- /dev/null +++ b/packages/x11/x11-common/etc/X11/h2200.xmodmap @@ -0,0 +1,5 @@ +keycode 75 = XF86Calendar +keycode 76 = telephone +keycode 77 = XF86Mail +keycode 78 = XF86Start +keycode 124 = XF86PowerDown diff --git a/packages/xst/xst_0.14.bb b/packages/xst/xst_0.15.bb index 76ab7af26f..76ab7af26f 100644 --- a/packages/xst/xst_0.14.bb +++ b/packages/xst/xst_0.15.bb |