From 2b5598807571ca28c8c81a415ea14748fff94fc2 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 19 Jan 2007 16:09:40 +0000 Subject: portmap: updated to 5-25 --- packages/portmap/portmap-5-24/.mtn2git_empty | 0 packages/portmap/portmap-5-24/make.patch | 73 ---------------------------- packages/portmap/portmap-5-25/.mtn2git_empty | 0 packages/portmap/portmap-5-25/make.patch | 73 ++++++++++++++++++++++++++++ packages/portmap/portmap_5-24.bb | 1 - packages/portmap/portmap_5-25.bb | 1 + 6 files changed, 74 insertions(+), 74 deletions(-) delete mode 100644 packages/portmap/portmap-5-24/.mtn2git_empty delete mode 100644 packages/portmap/portmap-5-24/make.patch create mode 100644 packages/portmap/portmap-5-25/.mtn2git_empty create mode 100644 packages/portmap/portmap-5-25/make.patch delete mode 100644 packages/portmap/portmap_5-24.bb create mode 100644 packages/portmap/portmap_5-25.bb diff --git a/packages/portmap/portmap-5-24/.mtn2git_empty b/packages/portmap/portmap-5-24/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/portmap/portmap-5-24/make.patch b/packages/portmap/portmap-5-24/make.patch deleted file mode 100644 index 7726846b7c..0000000000 --- a/packages/portmap/portmap-5-24/make.patch +++ /dev/null @@ -1,73 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - -Index: portmap_5beta/Makefile -=================================================================== ---- portmap_5beta.orig/Makefile 2006-12-19 10:32:58.000000000 +0000 -+++ portmap_5beta/Makefile 2006-12-19 10:35:54.000000000 +0000 -@@ -110,6 +110,13 @@ - # - #CONST = -Dconst= - -+DESTDIR = -+prefix = /usr -+sbindir = /sbin -+datadir = $(prefix)/share -+mandir = $(datadir)/man -+docdir = $(datadir)/doc/portmap -+ - ### End of configurable stuff. - ############################## - -@@ -127,7 +134,7 @@ - COPT = $(CONST) $(HOSTS_ACCESS) $(CHECK_PORT) \ - $(SYS) -DFACILITY=$(FACILITY) $(ULONG) $(ZOMBIES) $(BROKEN_PIPE) \ - $(SA_LEN) $(LOOPBACK) $(SETPGRP) --CFLAGS = -Wall $(COPT) -O2 $(NSARCHS) -+CFLAGS = -Wall -O2 $(NSARCHS) - OBJECTS = portmap.o pmap_check.o from_local.o $(AUX) - - all: portmap pmap_dump pmap_set -@@ -142,20 +149,23 @@ - $(CC) $(CFLAGS) -o $@ $? $(LIBS) - - from_local: from_local.c -- cc $(CFLAGS) -DTEST -o $@ from_local.c -+ $(CC) $(COPT) -DTEST $(CFLAGS) $(LDFLAGS) -o $@ from_local.c - - get_myaddress: get_myaddress.c -- cc $(CFLAGS) -DTEST -o $@ get_myaddress.c $(LIBS) -+ $(CC) $(COPT) -DTEST $(CFLAGS) $(LDFLAGS) -o $@ get_myaddress.c $(LIBS) - - install: all -- install -o root -g root -m 0755 -s portmap ${BASEDIR}/sbin -- install -o root -g root -m 0755 -s pmap_dump ${BASEDIR}/sbin -- install -o root -g root -m 0755 -s pmap_set ${BASEDIR}/sbin -- install -o root -g root -m 0644 portmap.8 ${BASEDIR}/usr/share/man/man8 -- install -o root -g root -m 0644 pmap_dump.8 ${BASEDIR}/usr/share/man/man8 -- install -o root -g root -m 0644 pmap_set.8 ${BASEDIR}/usr/share/man/man8 -- cat BLURB >${BASEDIR}/usr/share/doc/portmap/portmapper.txt -- gzip -9f ${BASEDIR}/usr/share/doc/portmap/portmapper.txt -+ install -d $(DESTDIR)/$(sbindir) \ -+ $(DESTDIR)/$(docdir) \ -+ $(DESTDIR)/$(mandir)/man8 -+ install -m 0755 portmap ${DESTDIR}/sbin -+ install -m 0755 pmap_dump ${DESTDIR}/sbin -+ install -m 0755 pmap_set ${DESTDIR}/sbin -+ install -m 0644 portmap.8 ${DESTDIR}/usr/share/man/man8 -+ install -m 0644 pmap_dump.8 ${DESTDIR}/usr/share/man/man8 -+ install -m 0644 pmap_set.8 ${DESTDIR}/usr/share/man/man8 -+ cat BLURB >${DESTDIR}/usr/share/doc/portmap/portmapper.txt -+ gzip -9f ${DESTDIR}/usr/share/doc/portmap/portmapper.txt - - - lint: -@@ -181,3 +191,6 @@ - portmap.o: portmap.c - portmap.o: pmap_check.h Makefile - strerror.o: strerror.c -+ -+%.o: %.c -+ $(CC) $(COPT) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $*.c -o $*.o diff --git a/packages/portmap/portmap-5-25/.mtn2git_empty b/packages/portmap/portmap-5-25/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/portmap/portmap-5-25/make.patch b/packages/portmap/portmap-5-25/make.patch new file mode 100644 index 0000000000..7726846b7c --- /dev/null +++ b/packages/portmap/portmap-5-25/make.patch @@ -0,0 +1,73 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +Index: portmap_5beta/Makefile +=================================================================== +--- portmap_5beta.orig/Makefile 2006-12-19 10:32:58.000000000 +0000 ++++ portmap_5beta/Makefile 2006-12-19 10:35:54.000000000 +0000 +@@ -110,6 +110,13 @@ + # + #CONST = -Dconst= + ++DESTDIR = ++prefix = /usr ++sbindir = /sbin ++datadir = $(prefix)/share ++mandir = $(datadir)/man ++docdir = $(datadir)/doc/portmap ++ + ### End of configurable stuff. + ############################## + +@@ -127,7 +134,7 @@ + COPT = $(CONST) $(HOSTS_ACCESS) $(CHECK_PORT) \ + $(SYS) -DFACILITY=$(FACILITY) $(ULONG) $(ZOMBIES) $(BROKEN_PIPE) \ + $(SA_LEN) $(LOOPBACK) $(SETPGRP) +-CFLAGS = -Wall $(COPT) -O2 $(NSARCHS) ++CFLAGS = -Wall -O2 $(NSARCHS) + OBJECTS = portmap.o pmap_check.o from_local.o $(AUX) + + all: portmap pmap_dump pmap_set +@@ -142,20 +149,23 @@ + $(CC) $(CFLAGS) -o $@ $? $(LIBS) + + from_local: from_local.c +- cc $(CFLAGS) -DTEST -o $@ from_local.c ++ $(CC) $(COPT) -DTEST $(CFLAGS) $(LDFLAGS) -o $@ from_local.c + + get_myaddress: get_myaddress.c +- cc $(CFLAGS) -DTEST -o $@ get_myaddress.c $(LIBS) ++ $(CC) $(COPT) -DTEST $(CFLAGS) $(LDFLAGS) -o $@ get_myaddress.c $(LIBS) + + install: all +- install -o root -g root -m 0755 -s portmap ${BASEDIR}/sbin +- install -o root -g root -m 0755 -s pmap_dump ${BASEDIR}/sbin +- install -o root -g root -m 0755 -s pmap_set ${BASEDIR}/sbin +- install -o root -g root -m 0644 portmap.8 ${BASEDIR}/usr/share/man/man8 +- install -o root -g root -m 0644 pmap_dump.8 ${BASEDIR}/usr/share/man/man8 +- install -o root -g root -m 0644 pmap_set.8 ${BASEDIR}/usr/share/man/man8 +- cat BLURB >${BASEDIR}/usr/share/doc/portmap/portmapper.txt +- gzip -9f ${BASEDIR}/usr/share/doc/portmap/portmapper.txt ++ install -d $(DESTDIR)/$(sbindir) \ ++ $(DESTDIR)/$(docdir) \ ++ $(DESTDIR)/$(mandir)/man8 ++ install -m 0755 portmap ${DESTDIR}/sbin ++ install -m 0755 pmap_dump ${DESTDIR}/sbin ++ install -m 0755 pmap_set ${DESTDIR}/sbin ++ install -m 0644 portmap.8 ${DESTDIR}/usr/share/man/man8 ++ install -m 0644 pmap_dump.8 ${DESTDIR}/usr/share/man/man8 ++ install -m 0644 pmap_set.8 ${DESTDIR}/usr/share/man/man8 ++ cat BLURB >${DESTDIR}/usr/share/doc/portmap/portmapper.txt ++ gzip -9f ${DESTDIR}/usr/share/doc/portmap/portmapper.txt + + + lint: +@@ -181,3 +191,6 @@ + portmap.o: portmap.c + portmap.o: pmap_check.h Makefile + strerror.o: strerror.c ++ ++%.o: %.c ++ $(CC) $(COPT) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $*.c -o $*.o diff --git a/packages/portmap/portmap_5-24.bb b/packages/portmap/portmap_5-24.bb deleted file mode 100644 index 064679e7f0..0000000000 --- a/packages/portmap/portmap_5-24.bb +++ /dev/null @@ -1 +0,0 @@ -require portmap.inc diff --git a/packages/portmap/portmap_5-25.bb b/packages/portmap/portmap_5-25.bb new file mode 100644 index 0000000000..064679e7f0 --- /dev/null +++ b/packages/portmap/portmap_5-25.bb @@ -0,0 +1 @@ +require portmap.inc -- cgit v1.2.3 From e0851eee5b7e54db524cd2bbd29bbf473ee4820b Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Sun, 21 Jan 2007 21:37:37 +0000 Subject: mythtv: add PACKAGES_DYNAMIC so depends on mythtv-themes work --- packages/mythtv/mythtv_0.20.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/mythtv/mythtv_0.20.bb b/packages/mythtv/mythtv_0.20.bb index 6ac37e5e65..ab9060de94 100644 --- a/packages/mythtv/mythtv_0.20.bb +++ b/packages/mythtv/mythtv_0.20.bb @@ -31,6 +31,8 @@ FILES_mythtv-data = "${datadir}" RDEPENDS_${PN} = "mythtv-backend mythtv-frontend mythtv-bin mythtv-filters mythtv-data" ALLOW_EMPTY_${PN} = "1" +PACKAGES_DYNAMIC = "mythtv-theme-*" + python __anonymous () { import bb -- cgit v1.2.3 From 20b0a297873a39589eab87563b93a1b299533584 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 21 Jan 2007 23:01:14 +0000 Subject: scons.bbclass: override installation prefix --- classes/scons.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/scons.bbclass b/classes/scons.bbclass index 89b5da2d0e..534b3bd4c7 100644 --- a/classes/scons.bbclass +++ b/classes/scons.bbclass @@ -1,12 +1,12 @@ DEPENDS += "python-scons-native" scons_do_compile() { - ${STAGING_BINDIR_NATIVE}/scons || \ + ${STAGING_BINDIR_NATIVE}/scons PREFIX=${prefix} prefix=${prefix} || \ oefatal "scons build execution failed." } scons_do_install() { - ${STAGING_BINDIR_NATIVE}/scons install || \ + ${STAGING_BINDIR_NATIVE}/scons PREFIX=${D}${prefix} prefix=${D}${prefix} install || \ oefatal "scons install execution failed." } -- cgit v1.2.3 From 6f3962bfb7ce43f09ed869b60fc87aed4dc9534f Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 21 Jan 2007 23:02:34 +0000 Subject: add chibitracker, an SDL based Impulse Tracker clone --- packages/chibitracker/.mtn2git_empty | 0 packages/chibitracker/chibitracker_svn.bb | 13 +++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 packages/chibitracker/.mtn2git_empty create mode 100644 packages/chibitracker/chibitracker_svn.bb diff --git a/packages/chibitracker/.mtn2git_empty b/packages/chibitracker/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/chibitracker/chibitracker_svn.bb b/packages/chibitracker/chibitracker_svn.bb new file mode 100644 index 0000000000..ec7d9284a2 --- /dev/null +++ b/packages/chibitracker/chibitracker_svn.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Chibitracker is an impulse tracker clone based on SDL" +LICENSE = "GPL" +HOMEPAGE = "http://www.chibitracker.com" +SECTION = "multimedia" +AUTHOR = "Juan Linietsky " +DEPENDS = "virtual/libsdl libsdl-mixer" +PV = "0.9.9+svn${SRCDATE}" + +SRC_URI = "svn://svn.berlios.de/chibitracker;module=trunk" +S = "${WORKDIR}/trunk" + +inherit scons + -- cgit v1.2.3 From 73a2bbb215128206b22f2abe8031ca4e2ad81456 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Mon, 22 Jan 2007 05:09:19 +0000 Subject: linux-handhelds-2.6 2.6.19-hh8: Update defconfigs for h3900 and h4000 to the latest from defconfigman. --- packages/linux/linux-handhelds-2.6/h3900/defconfig | 88 ++-- packages/linux/linux-handhelds-2.6/h4000/defconfig | 497 ++++----------------- packages/linux/linux-handhelds-2.6_2.6.19-hh8.bb | 2 +- 3 files changed, 147 insertions(+), 440 deletions(-) diff --git a/packages/linux/linux-handhelds-2.6/h3900/defconfig b/packages/linux/linux-handhelds-2.6/h3900/defconfig index d678a6c5c3..52b2c8741e 100644 --- a/packages/linux/linux-handhelds-2.6/h3900/defconfig +++ b/packages/linux/linux-handhelds-2.6/h3900/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.19-hh7 -# Sun Dec 31 02:28:00 2006 +# Linux kernel version: 2.6.19-hh8 +# Mon Jan 22 05:03:33 2007 # CONFIG_ARM=y # CONFIG_GENERIC_TIME is not set @@ -38,7 +38,6 @@ CONFIG_SYSVIPC=y # CONFIG_UTS_NS is not set # CONFIG_AUDIT is not set CONFIG_IKCONFIG=y -# CONFIG_MINIMAL_OOPS is not set CONFIG_IKCONFIG_PROC=y # CONFIG_RELAY is not set CONFIG_INITRAMFS_SOURCE="" @@ -58,8 +57,6 @@ CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_EPOLL=y CONFIG_SHMEM=y -CONFIG_USELIB=y -CONFIG_CORE_DUMP=y CONFIG_SLAB=y CONFIG_VM_EVENT_COUNTERS=y CONFIG_RT_MUTEXES=y @@ -146,7 +143,6 @@ CONFIG_MACH_H3900=y CONFIG_IPAQ_H3900_LCD=y CONFIG_IPAQ_H3900_BACKLIGHT=y CONFIG_IPAQ_H3900_BATTERY=y -# CONFIG_IPAQ_H3900_MMC is not set # CONFIG_MACH_H4000 is not set # CONFIG_MACH_H4700 is not set # CONFIG_MACH_HX2750 is not set @@ -169,14 +165,17 @@ CONFIG_IPAQ_H3900_BATTERY=y # CONFIG_PXA_SHARPSL is not set # CONFIG_MACH_TRIZEPS4 is not set CONFIG_PXA25x=y -# CONFIG_SA1100_H3100 is not set -# CONFIG_SA1100_H3600 is not set -# CONFIG_SA1100_H3800 is not set # # Linux As Bootloader # # CONFIG_LAB is not set +CONFIG_PXA_IPAQ=y + +# +# XScale-based iPAQ +# +CONFIG_IPAQ_HANDHELD=y # # Processor Type @@ -198,16 +197,6 @@ CONFIG_ARM_THUMB=y CONFIG_XSCALE_PMU=y CONFIG_KEXEC=y -# -# Compaq/iPAQ Platforms -# -CONFIG_PXA_IPAQ=y - -# -# XScale-based iPAQ -# -CONFIG_IPAQ_HANDHELD=y - # # Compaq/iPAQ Drivers # @@ -515,10 +504,7 @@ CONFIG_INPUT=y # # Userland interfaces # -CONFIG_INPUT_MOUSEDEV=y -CONFIG_INPUT_MOUSEDEV_PSAUX=y -CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +# CONFIG_INPUT_MOUSEDEV is not set # CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_TSDEV is not set CONFIG_INPUT_EVDEV=y @@ -624,7 +610,42 @@ CONFIG_LEGACY_PTY_COUNT=32 # # I2C support # -# CONFIG_I2C is not set +CONFIG_I2C=m +# CONFIG_I2C_CHARDEV is not set + +# +# I2C Algorithms +# +# CONFIG_I2C_ALGOBIT is not set +# CONFIG_I2C_ALGOPCF is not set +# CONFIG_I2C_ALGOPCA is not set + +# +# I2C Hardware Bus support +# +CONFIG_I2C_PXA=m +# CONFIG_I2C_PXA_SLAVE is not set +# CONFIG_I2C_OCORES is not set +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_PCA_ISA is not set + +# +# Miscellaneous I2C Chip support +# +# CONFIG_SENSORS_DS1337 is not set +# CONFIG_SENSORS_DS1374 is not set +# CONFIG_SENSORS_EEPROM is not set +# CONFIG_SENSORS_PCF8574 is not set +# CONFIG_SENSORS_PCA9539 is not set +# CONFIG_SENSORS_PCA9535 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_SENSORS_RTC8564 is not set +# CONFIG_SENSORS_MAX6875 is not set +# 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 # # SPI support @@ -759,7 +780,17 @@ CONFIG_BACKLIGHT_CORGI=y # # Sound # -# CONFIG_SOUND is not set +CONFIG_SOUND=y + +# +# Advanced Linux Sound Architecture +# +# CONFIG_SND is not set + +# +# Open Sound System +# +# CONFIG_SOUND_PRIME is not set # # USB support @@ -833,8 +864,15 @@ CONFIG_RTC_INTF_DEV=y # # RTC drivers # +# CONFIG_RTC_DRV_X1205 is not set +# CONFIG_RTC_DRV_DS1307 is not set # CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_ISL1208 is not set +# CONFIG_RTC_DRV_DS1672 is not set # CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_PCF8563 is not set +# CONFIG_RTC_DRV_PCF8583 is not set +# CONFIG_RTC_DRV_RS5C372 is not set # CONFIG_RTC_DRV_M48T86 is not set CONFIG_RTC_DRV_SA1100=y # CONFIG_RTC_DRV_TEST is not set diff --git a/packages/linux/linux-handhelds-2.6/h4000/defconfig b/packages/linux/linux-handhelds-2.6/h4000/defconfig index 478adadb03..f17812c9f4 100644 --- a/packages/linux/linux-handhelds-2.6/h4000/defconfig +++ b/packages/linux/linux-handhelds-2.6/h4000/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.19-hh8 -# Sat Jan 20 05:47:10 2007 +# Mon Jan 22 05:03:36 2007 # CONFIG_ARM=y # CONFIG_GENERIC_TIME is not set @@ -44,7 +44,7 @@ CONFIG_INITRAMFS_SOURCE="" CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y CONFIG_EMBEDDED=y -CONFIG_UID16=y +# CONFIG_UID16 is not set CONFIG_SYSCTL_SYSCALL=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_ALL is not set @@ -141,12 +141,11 @@ CONFIG_ARCH_PXA=y # CONFIG_ARCH_H2200 is not set # CONFIG_MACH_H3900 is not set CONFIG_MACH_H4000=y -CONFIG_IPAQ_H4000_SERIAL=m +# CONFIG_IPAQ_H4000_SERIAL is not set CONFIG_IPAQ_H4000_UDC=y CONFIG_IPAQ_H4000_LCD=y CONFIG_IPAQ_H4000_BACKLIGHT=y CONFIG_IPAQ_H4000_TS=y -CONFIG_IPAQ_H4000_PCMCIA=y CONFIG_IPAQ_H4000_BUTTONS=y CONFIG_IPAQ_H4000_BATT=y CONFIG_IPAQ_H4000_LEDS=y @@ -231,7 +230,7 @@ CONFIG_PCMCIA_IOCTL=y # # PC-card bridges # -CONFIG_PCMCIA_PXA2XX=y +# CONFIG_PCMCIA_PXA2XX is not set # # Kernel Features @@ -239,7 +238,8 @@ CONFIG_PCMCIA_PXA2XX=y # CONFIG_PREEMPT is not set CONFIG_NO_IDLE_HZ=y CONFIG_HZ=100 -# CONFIG_AEABI is not set +CONFIG_AEABI=y +CONFIG_OABI_COMPAT=y # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y @@ -263,20 +263,7 @@ CONFIG_CMDLINE="keepinitrd" # # 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=y -# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set -CONFIG_CPU_FREQ_GOV_PERFORMANCE=y -CONFIG_CPU_FREQ_GOV_POWERSAVE=y -CONFIG_CPU_FREQ_GOV_USERSPACE=m -CONFIG_CPU_FREQ_GOV_ONDEMAND=m -CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y -CONFIG_CPU_FREQ_PXA=y -CONFIG_PXA25x_ALTERNATE_FREQS=y +# CONFIG_CPU_FREQ is not set # # Floating point emulation @@ -295,7 +282,6 @@ CONFIG_FPE_NWFPE=y CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_AOUT is not set # CONFIG_BINFMT_MISC is not set -# CONFIG_ARTHUR is not set # # Power management options @@ -341,9 +327,9 @@ CONFIG_IP_PNP=y # CONFIG_INET_IPCOMP is not set # CONFIG_INET_XFRM_TUNNEL is not set # CONFIG_INET_TUNNEL is not set -CONFIG_INET_XFRM_MODE_TRANSPORT=y -CONFIG_INET_XFRM_MODE_TUNNEL=y -# CONFIG_INET_XFRM_MODE_BEET is not set +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +CONFIG_INET_XFRM_MODE_BEET=y # CONFIG_INET_DIAG is not set # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_CUBIC=y @@ -353,26 +339,12 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # IP: Virtual Server Configuration # # CONFIG_IP_VS is not set -CONFIG_IPV6=m -# CONFIG_IPV6_PRIVACY is not set -# CONFIG_IPV6_ROUTER_PREF is not set -# CONFIG_INET6_AH is not set -# CONFIG_INET6_ESP is not set -# CONFIG_INET6_IPCOMP is not set -# CONFIG_IPV6_MIP6 is not set +# CONFIG_IPV6 is not set # CONFIG_INET6_XFRM_TUNNEL is not set # CONFIG_INET6_TUNNEL is not set -CONFIG_INET6_XFRM_MODE_TRANSPORT=m -CONFIG_INET6_XFRM_MODE_TUNNEL=m -# CONFIG_INET6_XFRM_MODE_BEET is not set -# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set -# CONFIG_IPV6_SIT is not set -# CONFIG_IPV6_TUNNEL is not set -# CONFIG_IPV6_MULTIPLE_TABLES is not set # CONFIG_NETWORK_SECMARK is not set CONFIG_NETFILTER=y # CONFIG_NETFILTER_DEBUG is not set -CONFIG_BRIDGE_NETFILTER=y # # Core Netfilter Configuration @@ -398,16 +370,6 @@ CONFIG_IP_NF_IRC=m # CONFIG_IP_NF_SIP is not set # CONFIG_IP_NF_QUEUE is not set -# -# IPv6: Netfilter Configuration (EXPERIMENTAL) -# -# CONFIG_IP6_NF_QUEUE is not set - -# -# Bridge: Netfilter Configuration -# -# CONFIG_BRIDGE_NF_EBTABLES is not set - # # DCCP Configuration (EXPERIMENTAL) # @@ -423,10 +385,9 @@ CONFIG_IP_NF_IRC=m # # CONFIG_TIPC is not set # CONFIG_ATM is not set -CONFIG_BRIDGE=m +# CONFIG_BRIDGE is not set # CONFIG_VLAN_8021Q is not set # CONFIG_DECNET is not set -CONFIG_LLC=m # CONFIG_LLC2 is not set # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -445,72 +406,9 @@ CONFIG_LLC=m # # CONFIG_NET_PKTGEN is not set # CONFIG_HAMRADIO is not set -CONFIG_IRDA=y - -# -# IrDA protocols -# -CONFIG_IRLAN=m -CONFIG_IRCOMM=y -# CONFIG_IRDA_ULTRA is not set - -# -# IrDA options -# -# CONFIG_IRDA_CACHE_LAST_LSAP is not set -# CONFIG_IRDA_FAST_RR is not set -CONFIG_IRDA_DEBUG=y - -# -# Infrared-port device drivers -# - -# -# SIR device drivers -# -CONFIG_IRTTY_SIR=m - -# -# Dongle support -# -# CONFIG_DONGLE is not set - -# -# Old SIR device drivers -# -# CONFIG_IRPORT_SIR is not set - -# -# Old Serial dongle support -# - -# -# FIR device drivers -# -CONFIG_PXA_FICP=y -CONFIG_BT=y -CONFIG_BT_L2CAP=m -CONFIG_BT_SCO=m -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=m -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_HIDP=m - -# -# Bluetooth device drivers -# -CONFIG_BT_HCIUART=m -CONFIG_BT_HCIUART_H4=y -CONFIG_BT_HCIUART_BCSP=y -# CONFIG_BT_HCIDTL1 is not set -# CONFIG_BT_HCIBT3C is not set -# CONFIG_BT_HCIBLUECARD is not set -# CONFIG_BT_HCIBTUART is not set -# CONFIG_BT_HCIVHCI is not set +# CONFIG_IRDA is not set +# CONFIG_BT is not set # CONFIG_IEEE80211 is not set -CONFIG_WIRELESS_EXT=y # # Device Drivers @@ -533,99 +431,7 @@ CONFIG_FW_LOADER=y # # Memory Technology Devices (MTD) # -CONFIG_MTD=y -CONFIG_MTD_DEBUG=y -CONFIG_MTD_DEBUG_VERBOSE=1 -CONFIG_MTD_CONCAT=y -CONFIG_MTD_PARTITIONS=y -# CONFIG_MTD_REDBOOT_PARTS 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 -# CONFIG_RFD_FTL is not set -# CONFIG_SSFDC is not set - -# -# RAM/ROM/Flash chip drivers -# -CONFIG_MTD_CFI=m -# CONFIG_MTD_JEDECPROBE is not set -CONFIG_MTD_GEN_PROBE=m -# CONFIG_MTD_CFI_ADV_OPTIONS 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 is not set -# CONFIG_MTD_CFI_STAA is not set -CONFIG_MTD_CFI_UTIL=m -# CONFIG_MTD_RAM is not set -# CONFIG_MTD_ROM is not set -# CONFIG_MTD_ABSENT is not set -# CONFIG_MTD_OBSOLETE_CHIPS is not set -CONFIG_MTD_XIP=y - -# -# Mapping drivers for chip access -# -# CONFIG_MTD_COMPLEX_MAPPINGS is not set -# CONFIG_MTD_PHYSMAP is not set -# CONFIG_MTD_ARM_INTEGRATOR is not set -# CONFIG_MTD_IPAQ is not set -# CONFIG_MTD_SHARP_SL is not set -# CONFIG_MTD_PLATRAM is not set - -# -# Self-contained MTD device drivers -# -# CONFIG_MTD_DATAFLASH is not set -# CONFIG_MTD_M25P80 is not set -# CONFIG_MTD_SLRAM is not set -# CONFIG_MTD_PHRAM is not set -# CONFIG_MTD_MTDRAM is not set -# CONFIG_MTD_BLOCK2MTD is not set - -# -# Disk-On-Chip Device Drivers -# -# CONFIG_MTD_DOC2000 is not set -# CONFIG_MTD_DOC2001 is not set -# CONFIG_MTD_DOC2001PLUS is not set - -# -# NAND Flash Device Drivers -# -CONFIG_MTD_NAND=y -# CONFIG_MTD_NAND_VERIFY_WRITE is not set -# CONFIG_MTD_NAND_ECC_SMC is not set -# CONFIG_MTD_NAND_H1900 is not set -CONFIG_MTD_NAND_IDS=y -CONFIG_MTD_NAND_DISKONCHIP=y -# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set -CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0 -# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set -# CONFIG_MTD_NAND_SHARPSL is not set -# CONFIG_MTD_NAND_NANDSIM is not set - -# -# OneNAND Flash Device Drivers -# -# CONFIG_MTD_ONENAND is not set +# CONFIG_MTD is not set # # Parallel port support @@ -640,11 +446,10 @@ CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0 # Block devices # # CONFIG_BLK_DEV_COW_COMMON is not set -CONFIG_BLK_DEV_LOOP=y -# CONFIG_BLK_DEV_CRYPTOLOOP is not set -CONFIG_BLK_DEV_NBD=m +# CONFIG_BLK_DEV_LOOP is not set +# CONFIG_BLK_DEV_NBD is not set CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_COUNT=6 +CONFIG_BLK_DEV_RAM_COUNT=4 CONFIG_BLK_DEV_RAM_SIZE=8192 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 CONFIG_BLK_DEV_INITRD=y @@ -654,30 +459,7 @@ CONFIG_BLK_DEV_INITRD=y # # ATA/ATAPI/MFM/RLL support # -CONFIG_IDE=m -CONFIG_IDE_MAX_HWIFS=4 -CONFIG_BLK_DEV_IDE=m - -# -# Please see Documentation/ide.txt for help/info on IDE drives -# -# CONFIG_BLK_DEV_IDE_SATA is not set -CONFIG_BLK_DEV_IDEDISK=m -# CONFIG_IDEDISK_MULTI_MODE is not set -CONFIG_BLK_DEV_IDECS=m -# CONFIG_BLK_DEV_IDECD is not set -# CONFIG_BLK_DEV_IDETAPE is not set -# CONFIG_BLK_DEV_IDEFLOPPY is not set -# CONFIG_IDE_TASK_IOCTL is not set - -# -# IDE chipset support/bugfixes -# -# CONFIG_IDE_GENERIC is not set -# CONFIG_IDE_ARM is not set -# CONFIG_BLK_DEV_IDEDMA is not set -# CONFIG_IDEDMA_AUTO is not set -# CONFIG_BLK_DEV_HD is not set +# CONFIG_IDE is not set # # SCSI device support @@ -712,81 +494,7 @@ CONFIG_BLK_DEV_IDECS=m # # Network device support # -CONFIG_NETDEVICES=y -# CONFIG_DUMMY is not set -# CONFIG_BONDING is not set -# CONFIG_EQUALIZER is not set -# CONFIG_TUN is not set - -# -# PHY device support -# - -# -# Ethernet (10 or 100Mbit) -# -# CONFIG_NET_ETHERNET is not set - -# -# Ethernet (1000 Mbit) -# - -# -# Ethernet (10000 Mbit) -# - -# -# Token Ring devices -# - -# -# Wireless LAN (non-hamradio) -# -CONFIG_NET_RADIO=y -# CONFIG_NET_WIRELESS_RTNETLINK is not set - -# -# Obsolete Wireless cards support (pre-802.11) -# -# CONFIG_STRIP is not set -# 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 is not set - -# -# Wireless 802.11b Pcmcia/Cardbus cards support -# -# CONFIG_AIRO_CS is not set -# CONFIG_PCMCIA_WL3501 is not set -# CONFIG_HOSTAP is not set -CONFIG_ACX=y -CONFIG_ACX_MEM=y -# CONFIG_ACX_H4000 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 is not set -# CONFIG_SLIP is not set -# CONFIG_SHAPER is not set -# CONFIG_NETCONSOLE is not set +# CONFIG_NETDEVICES is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set @@ -806,9 +514,7 @@ CONFIG_INPUT=y # # 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_TSDEV is not set CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_EVBUG is not set @@ -824,7 +530,11 @@ CONFIG_INPUT_KEYBOARD=y # CONFIG_KEYBOARD_STOWAWAY is not set CONFIG_GPIO_KEYS=y CONFIG_KEYBOARD_ASIC3=y -# CONFIG_INPUT_MOUSE is not set +CONFIG_INPUT_MOUSE=y +# CONFIG_MOUSE_PS2 is not set +# CONFIG_MOUSE_SERIAL is not set +# CONFIG_MOUSE_NAVPOINT is not set +# CONFIG_MOUSE_VSXXXAA is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TOUCHSCREEN is not set # CONFIG_INPUT_MISC is not set @@ -870,9 +580,9 @@ CONFIG_LEGACY_PTY_COUNT=32 # Watchdog Cards # # CONFIG_WATCHDOG is not set -CONFIG_HW_RANDOM=y +# CONFIG_HW_RANDOM is not set # CONFIG_NVRAM is not set -CONFIG_SA1100_RTC=y +# CONFIG_SA1100_RTC is not set # CONFIG_DTLK is not set # CONFIG_R3964 is not set @@ -896,8 +606,8 @@ CONFIG_SA1100_RTC=y # # I2C support # -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y +CONFIG_I2C=m +# CONFIG_I2C_CHARDEV is not set # # I2C Algorithms @@ -909,7 +619,7 @@ CONFIG_I2C_CHARDEV=y # # I2C Hardware Bus support # -CONFIG_I2C_PXA=y +CONFIG_I2C_PXA=m # CONFIG_I2C_PXA_SLAVE is not set # CONFIG_I2C_OCORES is not set # CONFIG_I2C_PARPORT_LIGHT is not set @@ -936,19 +646,8 @@ CONFIG_I2C_PXA=y # # SPI support # -CONFIG_SPI=y -CONFIG_SPI_DEBUG=y -CONFIG_SPI_MASTER=y - -# -# SPI Master Controller Drivers -# -# CONFIG_SPI_BITBANG is not set -# CONFIG_SPI_PXA2XX is not set - -# -# SPI Protocol Masters -# +# CONFIG_SPI is not set +# CONFIG_SPI_MASTER is not set # # Dallas's 1-wire bus @@ -958,52 +657,13 @@ CONFIG_SPI_MASTER=y # # Hardware Monitoring support # -CONFIG_HWMON=y +# CONFIG_HWMON is not set # CONFIG_HWMON_VID is not set -# CONFIG_SENSORS_ABITUGURU 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_ADM9240 is not set -# CONFIG_SENSORS_ASB100 is not set -# CONFIG_SENSORS_ATXP1 is not set -# CONFIG_SENSORS_DS1621 is not set -# CONFIG_SENSORS_F71805F 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_LM70 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_SMSC47M1 is not set -# CONFIG_SENSORS_SMSC47M192 is not set -# CONFIG_SENSORS_SMSC47B397 is not set -# CONFIG_SENSORS_VT1211 is not set -# CONFIG_SENSORS_W83781D is not set -# CONFIG_SENSORS_W83791D is not set -# CONFIG_SENSORS_W83792D is not set -# CONFIG_SENSORS_W83L785TS is not set -# CONFIG_SENSORS_W83627HF is not set -# CONFIG_SENSORS_W83627EHF is not set -# CONFIG_HWMON_DEBUG_CHIP is not set # # Hardware Monitoring - Battery # -CONFIG_BATTERY_MONITOR=y +# CONFIG_BATTERY_MONITOR is not set # # L3 serial bus support @@ -1050,12 +710,7 @@ CONFIG_LEDS_ASIC3=y # # LED Triggers # -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_TIMER=y -CONFIG_LEDS_TRIGGER_TIMER_ASIC3=y -# CONFIG_LEDS_TRIGGER_IDE_DISK is not set -CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_LEDS_TRIGGER_SHARED=y +# CONFIG_LEDS_TRIGGERS is not set # # Multimedia devices @@ -1070,7 +725,7 @@ CONFIG_LEDS_TRIGGER_SHARED=y # # Graphics support # -CONFIG_FIRMWARE_EDID=y +# CONFIG_FIRMWARE_EDID is not set CONFIG_FB=y CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_COPYAREA=y @@ -1078,11 +733,11 @@ CONFIG_FB_CFB_IMAGEBLIT=y # CONFIG_FB_MACMODES is not set # CONFIG_FB_BACKLIGHT is not set # CONFIG_FB_MODE_HELPERS is not set -CONFIG_FB_TILEBLITTING=y +# CONFIG_FB_TILEBLITTING is not set # CONFIG_FB_IMAGEON is not set # CONFIG_FB_S1D13XXX is not set CONFIG_FB_PXA=y -CONFIG_FB_PXA_PARAMETERS=y +# CONFIG_FB_PXA_PARAMETERS is not set # CONFIG_FB_MBX is not set # CONFIG_FB_VIRTUAL is not set # CONFIG_FB_VSFB is not set @@ -1125,21 +780,19 @@ CONFIG_SOUND=y # # Advanced Linux Sound Architecture # -CONFIG_SND=y -CONFIG_SND_TIMER=y -CONFIG_SND_PCM=y +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m # CONFIG_SND_SEQUENCER is not set CONFIG_SND_OSSEMUL=y -CONFIG_SND_MIXER_OSS=y -CONFIG_SND_PCM_OSS=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m CONFIG_SND_PCM_OSS_PLUGINS=y # CONFIG_SND_DYNAMIC_MINORS is not set -# CONFIG_SND_SUPPORT_OLD_API is not set +CONFIG_SND_SUPPORT_OLD_API=y CONFIG_SND_VERBOSE_PROCFS=y -CONFIG_SND_VERBOSE_PRINTK=y -CONFIG_SND_DEBUG=y -CONFIG_SND_DEBUG_DETECT=y -# CONFIG_SND_PCM_XRUN_DEBUG is not set +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set # # Generic devices @@ -1152,8 +805,8 @@ CONFIG_SND_DEBUG_DETECT=y # # ALSA ARM devices # -CONFIG_SND_H4000=y -CONFIG_SND_PXA2xx_I2SOUND=y +CONFIG_SND_H4000=m +CONFIG_SND_PXA2xx_I2SOUND=m # CONFIG_SND_PXA2XX_AC97 is not set # @@ -1166,7 +819,7 @@ CONFIG_SND_PXA2xx_I2SOUND=y # SoC audio support # # CONFIG_SND_SOC is not set -CONFIG_SND_UDA1380=y +CONFIG_SND_UDA1380=m # # Open Sound System @@ -1189,7 +842,7 @@ CONFIG_USB_ARCH_HAS_HCD=y # USB Gadget Support # CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_DEBUG_FILES=y +# CONFIG_USB_GADGET_DEBUG_FILES is not set CONFIG_USB_GADGET_SELECTED=y # CONFIG_USB_GADGET_NET2280 is not set CONFIG_USB_GADGET_PXA2XX=y @@ -1206,7 +859,7 @@ CONFIG_USB_PXA2XX=y # 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_ETH_RNDIS=y # CONFIG_USB_GADGETFS is not set # CONFIG_USB_FILE_STORAGE is not set # CONFIG_USB_G_SERIAL is not set @@ -1229,7 +882,35 @@ CONFIG_MMC_ASIC3=y # Real Time Clock # CONFIG_RTC_LIB=y -# CONFIG_RTC_CLASS is not set +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +CONFIG_RTC_DEBUG=y + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set + +# +# RTC drivers +# +# CONFIG_RTC_DRV_X1205 is not set +# CONFIG_RTC_DRV_DS1307 is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_ISL1208 is not set +# CONFIG_RTC_DRV_DS1672 is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_PCF8563 is not set +# CONFIG_RTC_DRV_PCF8583 is not set +# CONFIG_RTC_DRV_RS5C372 is not set +# CONFIG_RTC_DRV_M48T86 is not set +CONFIG_RTC_DRV_SA1100=y +# CONFIG_RTC_DRV_TEST is not set +# CONFIG_RTC_DRV_V3020 is not set # # File systems @@ -1293,16 +974,6 @@ CONFIG_RAMFS=y # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set -# CONFIG_JFFS_FS is not set -CONFIG_JFFS2_FS=m -CONFIG_JFFS2_FS_DEBUG=1 -CONFIG_JFFS2_FS_WRITEBUFFER=y -# CONFIG_JFFS2_SUMMARY is not set -# CONFIG_JFFS2_FS_XATTR is not set -# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set -CONFIG_JFFS2_ZLIB=y -CONFIG_JFFS2_RTIME=y -# CONFIG_JFFS2_RUBIN is not set # CONFIG_CRAMFS is not set # CONFIG_VXFS_FS is not set # CONFIG_HPFS_FS is not set @@ -1392,12 +1063,12 @@ CONFIG_NLS_UTF8=y # # Kernel hacking # -# CONFIG_PRINTK_TIME is not set +CONFIG_PRINTK_TIME=y CONFIG_ENABLE_MUST_CHECK=y # CONFIG_MAGIC_SYSRQ is not set # CONFIG_UNUSED_SYMBOLS is not set CONFIG_DEBUG_KERNEL=y -CONFIG_LOG_BUF_SHIFT=15 +CONFIG_LOG_BUF_SHIFT=16 CONFIG_DETECT_SOFTLOCKUP=y # CONFIG_SCHEDSTATS is not set # CONFIG_DEBUG_SLAB is not set @@ -1476,6 +1147,4 @@ CONFIG_CRC32=y # CONFIG_LIBCRC32C is not set CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y -CONFIG_REED_SOLOMON=y -CONFIG_REED_SOLOMON_DEC16=y CONFIG_PLIST=y diff --git a/packages/linux/linux-handhelds-2.6_2.6.19-hh8.bb b/packages/linux/linux-handhelds-2.6_2.6.19-hh8.bb index b34d4630a0..ec5844bfb5 100644 --- a/packages/linux/linux-handhelds-2.6_2.6.19-hh8.bb +++ b/packages/linux/linux-handhelds-2.6_2.6.19-hh8.bb @@ -1,7 +1,7 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." LICENSE = "GPL" -PR = "r0" +PR = "r1" DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3 From e946ee2e2b21733dc6b1f5bf8acfa3319dca8f0f Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Mon, 22 Jan 2007 05:10:25 +0000 Subject: h4000.conf: Go modular kernel (sound and its dependencies so far). --- conf/machine/h4000.conf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf index 2a34333bac..9428b9ce11 100644 --- a/conf/machine/h4000.conf +++ b/conf/machine/h4000.conf @@ -22,10 +22,15 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" PCMCIA_MANAGER = "pcmciautils" PREFERRED_PROVIDER_xserver = "xserver-kdrive" +MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-h4000-audio \ + kernel-module-i2c-pxa" + # # Modules autoload and other boot properties # module_autoload_snd-pcm-oss = "snd-pcm-oss" +module_autoload_snd-mixer-oss = "snd-mixer-oss" +module_autoload_snd-h4000_audio = "snd-h4000_audio" module_autoload_g_ether = "g_ether" SERIAL_CONSOLE = "115200 ttyS0 vt100" -- cgit v1.2.3 From 8099a24bd2c1951ea7b69a3f432abc0a43acc251 Mon Sep 17 00:00:00 2001 From: "Christiano P." Date: Mon, 22 Jan 2007 16:57:15 +0000 Subject: xserver-kdrive: added HVGA and 320x320 resolutions for Palm devices - close #1687 --- packages/xorg-xserver/kmode-palm.patch | 34 ++++++++++++++++++++++ .../xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb | 8 +++-- 2 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 packages/xorg-xserver/kmode-palm.patch diff --git a/packages/xorg-xserver/kmode-palm.patch b/packages/xorg-xserver/kmode-palm.patch new file mode 100644 index 0000000000..255e707b55 --- /dev/null +++ b/packages/xorg-xserver/kmode-palm.patch @@ -0,0 +1,34 @@ +--- kmode.c 2006-05-03 19:48:42.000000000 +0200 ++++ xserver/hw/kdrive/src/kmode.c 2006-05-03 19:50:43.000000000 +0200 +@@ -32,6 +32,31 @@ + /* H V Hz KHz */ + /* FP BP BLANK POLARITY */ + ++ /* Treo 650 */ ++ ++ { 320, 320, 64, 16256, ++ 17, 12, 32, KdSyncNegative, ++ 1, 11, 14, KdSyncNegative, ++ }, ++ ++ { 320, 320, 64, 0, ++ 0, 0, 0, KdSyncNegative, ++ 0, 0, 0, KdSyncNegative, ++ }, ++ ++ /* LifeDrive/T3/TX modes */ ++ ++ { 320, 480, 64, 16256, ++ 17, 12, 32, KdSyncNegative, ++ 1, 11, 14, KdSyncNegative, ++ }, ++ ++ { 480, 320, 64, 0, ++ 0, 0, 0, KdSyncNegative, ++ 0, 0, 0, KdSyncNegative, ++ }, ++ ++ + /* IPAQ modeline: + * + * Modeline "320x240" 5.7222 320 337 340 352 240 241 244 254" diff --git a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb index 64a49aed68..0de2506414 100644 --- a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb @@ -1,7 +1,7 @@ LICENSE = "MIT" DEPENDS = "tslib virtual/libsdl xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" -PR = "r5" +PR = "r6" PROVIDES = "virtual/xserver" RPROVIDES = "virtual/xserver" @@ -44,11 +44,15 @@ SRC_URI = "http://ftp.x.org/pub/X11R7.1/src/xserver/xorg-server-X11R7.1-1.1.0.ta file://disable-xf86-dga-xorgcfg.patch;patch=1 \ file://w100.patch;patch=1 \ file://enable-tslib.patch;patch=1 \ - file://xcalibrate.patch;patch=1" + file://xcalibrate.patch;patch=1 \ + file://kmode-palm.patch;patch=1" SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1" PACKAGE_ARCH_poodle = "poodle" +PACKAGE_ARCH_palmtx = "palmtx" +PACKAGE_ARCH_palmld = "palmld" +PACKAGE_ARCH_palmz72 = "palmz72" S = "${WORKDIR}/xorg-server-X11R7.1-1.1.0" -- cgit v1.2.3 From 27440f39dc28a0346d2e862ec7bbee31afa553cd Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 22 Jan 2007 16:58:58 +0000 Subject: xserver-kdrive: move kmode-palm.patch to xserver-kdrive --- packages/xorg-xserver/kmode-palm.patch | 34 ---------------------- .../xorg-xserver/xserver-kdrive/kmode-palm.patch | 34 ++++++++++++++++++++++ 2 files changed, 34 insertions(+), 34 deletions(-) delete mode 100644 packages/xorg-xserver/kmode-palm.patch create mode 100644 packages/xorg-xserver/xserver-kdrive/kmode-palm.patch diff --git a/packages/xorg-xserver/kmode-palm.patch b/packages/xorg-xserver/kmode-palm.patch deleted file mode 100644 index 255e707b55..0000000000 --- a/packages/xorg-xserver/kmode-palm.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- kmode.c 2006-05-03 19:48:42.000000000 +0200 -+++ xserver/hw/kdrive/src/kmode.c 2006-05-03 19:50:43.000000000 +0200 -@@ -32,6 +32,31 @@ - /* H V Hz KHz */ - /* FP BP BLANK POLARITY */ - -+ /* Treo 650 */ -+ -+ { 320, 320, 64, 16256, -+ 17, 12, 32, KdSyncNegative, -+ 1, 11, 14, KdSyncNegative, -+ }, -+ -+ { 320, 320, 64, 0, -+ 0, 0, 0, KdSyncNegative, -+ 0, 0, 0, KdSyncNegative, -+ }, -+ -+ /* LifeDrive/T3/TX modes */ -+ -+ { 320, 480, 64, 16256, -+ 17, 12, 32, KdSyncNegative, -+ 1, 11, 14, KdSyncNegative, -+ }, -+ -+ { 480, 320, 64, 0, -+ 0, 0, 0, KdSyncNegative, -+ 0, 0, 0, KdSyncNegative, -+ }, -+ -+ - /* IPAQ modeline: - * - * Modeline "320x240" 5.7222 320 337 340 352 240 241 244 254" diff --git a/packages/xorg-xserver/xserver-kdrive/kmode-palm.patch b/packages/xorg-xserver/xserver-kdrive/kmode-palm.patch new file mode 100644 index 0000000000..255e707b55 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive/kmode-palm.patch @@ -0,0 +1,34 @@ +--- kmode.c 2006-05-03 19:48:42.000000000 +0200 ++++ xserver/hw/kdrive/src/kmode.c 2006-05-03 19:50:43.000000000 +0200 +@@ -32,6 +32,31 @@ + /* H V Hz KHz */ + /* FP BP BLANK POLARITY */ + ++ /* Treo 650 */ ++ ++ { 320, 320, 64, 16256, ++ 17, 12, 32, KdSyncNegative, ++ 1, 11, 14, KdSyncNegative, ++ }, ++ ++ { 320, 320, 64, 0, ++ 0, 0, 0, KdSyncNegative, ++ 0, 0, 0, KdSyncNegative, ++ }, ++ ++ /* LifeDrive/T3/TX modes */ ++ ++ { 320, 480, 64, 16256, ++ 17, 12, 32, KdSyncNegative, ++ 1, 11, 14, KdSyncNegative, ++ }, ++ ++ { 480, 320, 64, 0, ++ 0, 0, 0, KdSyncNegative, ++ 0, 0, 0, KdSyncNegative, ++ }, ++ ++ + /* IPAQ modeline: + * + * Modeline "320x240" 5.7222 320 337 340 352 240 241 244 254" -- cgit v1.2.3 From c3237aa243bb2c2b7079387a2c8202fd99978d5a Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 22 Jan 2007 18:34:04 +0000 Subject: ep93xx: prefer kdrive --- conf/machine/ep93xx.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/machine/ep93xx.conf b/conf/machine/ep93xx.conf index 0951056710..912cbc5c77 100644 --- a/conf/machine/ep93xx.conf +++ b/conf/machine/ep93xx.conf @@ -7,6 +7,7 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4t" PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" +PREFERRED_PROVIDER_xserver = "xserver-kdrive" #don't try to access tty1 USE_VT = "0" -- cgit v1.2.3 From 59eef48f549db256895ce0c50a205513feaa08d7 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 22 Jan 2007 18:35:14 +0000 Subject: xorg-xserver: diet-x11 doesn't provide kdb (yet), so depend on full-fat x11 again --- packages/xorg-xserver/xorg-xserver-common.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc index 0a91cfed12..68e39826c0 100644 --- a/packages/xorg-xserver/xorg-xserver-common.inc +++ b/packages/xorg-xserver/xorg-xserver-common.inc @@ -11,7 +11,7 @@ xcmiscproto xextproto xproto xf86miscproto xf86vidmodeproto xf86bigfontproto \ scrnsaverproto bigreqsproto resourceproto fontsproto inputproto \ xf86dgaproto videoproto compositeproto trapproto recordproto dmxproto \ resourceproto xineramaproto xtrans evieext libxkbfile libxfont libxau \ -libfontenc libxdmcp libxxf86vm libxaw libxmu libxt libxpm libxext virtual/libx11 \ +libfontenc libxdmcp libxxf86vm libxaw libxmu libxt libxpm libxext libx11 \ libxkbui libxxf86misc libxi libdmx libxtst libxres mesa mkfontscale-native" RDEPENDS="rgb" -- cgit v1.2.3 From a728223abb0150d55dcd0831001c815c20dfa642 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Mon, 22 Jan 2007 22:15:41 +0000 Subject: m4: upgrade to 1.4.4 after hrw tested successfully. --- packages/m4/m4-native_1.4.2.bb | 19 ------------------- packages/m4/m4-native_1.4.4.bb | 19 +++++++++++++++++++ packages/m4/m4/make.patch | 41 ----------------------------------------- packages/m4/m4_1.4.2.bb | 11 ----------- packages/m4/m4_1.4.4.bb | 10 ++++++++++ 5 files changed, 29 insertions(+), 71 deletions(-) delete mode 100644 packages/m4/m4-native_1.4.2.bb create mode 100644 packages/m4/m4-native_1.4.4.bb delete mode 100644 packages/m4/m4/make.patch delete mode 100644 packages/m4/m4_1.4.2.bb create mode 100644 packages/m4/m4_1.4.4.bb diff --git a/packages/m4/m4-native_1.4.2.bb b/packages/m4/m4-native_1.4.2.bb deleted file mode 100644 index 8beb8748e3..0000000000 --- a/packages/m4/m4-native_1.4.2.bb +++ /dev/null @@ -1,19 +0,0 @@ -require m4_${PV}.bb - -inherit native - -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/m4" - -INHIBIT_AUTOTOOLS_DEPS = "1" -DEPENDS += "gnu-config-native" - -do_configure() { - install -m 0644 ${STAGING_DATADIR}/gnu-config/config.sub . - install -m 0644 ${STAGING_DATADIR}/gnu-config/config.guess . - oe_runconf -} - -do_stage() { - install -m 0755 src/m4 ${STAGING_BINDIR}/ -} - diff --git a/packages/m4/m4-native_1.4.4.bb b/packages/m4/m4-native_1.4.4.bb new file mode 100644 index 0000000000..8beb8748e3 --- /dev/null +++ b/packages/m4/m4-native_1.4.4.bb @@ -0,0 +1,19 @@ +require m4_${PV}.bb + +inherit native + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/m4" + +INHIBIT_AUTOTOOLS_DEPS = "1" +DEPENDS += "gnu-config-native" + +do_configure() { + install -m 0644 ${STAGING_DATADIR}/gnu-config/config.sub . + install -m 0644 ${STAGING_DATADIR}/gnu-config/config.guess . + oe_runconf +} + +do_stage() { + install -m 0755 src/m4 ${STAGING_BINDIR}/ +} + diff --git a/packages/m4/m4/make.patch b/packages/m4/m4/make.patch deleted file mode 100644 index 3577b0b7db..0000000000 --- a/packages/m4/m4/make.patch +++ /dev/null @@ -1,41 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- m4-1.4.2/doc/Makefile.in~make -+++ m4-1.4.2/doc/Makefile.in -@@ -57,9 +57,9 @@ - date > $(srcdir)/stamp-vti - - install: all -- $(srcdir)/../mkinstalldirs $(infodir) -+ $(srcdir)/../mkinstalldirs $(DESTDIR)$(infodir) - cd $(srcdir) && for file in m4.info*; do \ -- $(INSTALL_DATA) $$file $(infodir)/$$file; \ -+ $(INSTALL_DATA) $$file $(DESTDIR)$(infodir)/$$file; \ - done - - uninstall: ---- m4-1.4.2/src/Makefile.in~make -+++ m4-1.4.2/src/Makefile.in -@@ -35,7 +35,7 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - transform = @program_transform_name@ --bindir = $(exec_prefix)/bin -+bindir = @bindir@ - - COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) - LINK = $(CC) $(LDFLAGS) -o $@ -@@ -84,8 +84,8 @@ - $(LINK) ansi2knr.o $(LIBS) - - install: all -- $(srcdir)/../mkinstalldirs $(bindir) -- $(INSTALL_PROGRAM) m4 $(bindir)/`echo m4 | sed '$(transform)'` -+ $(srcdir)/../mkinstalldirs $(DESTDIR)$(bindir) -+ $(INSTALL_PROGRAM) m4 $(DESTDIR)$(bindir)/`echo m4 | sed '$(transform)'` - - uninstall: - rm -f $(bindir)/`echo m4 | sed '$(transform)'` diff --git a/packages/m4/m4_1.4.2.bb b/packages/m4/m4_1.4.2.bb deleted file mode 100644 index 05a9b5b0a5..0000000000 --- a/packages/m4/m4_1.4.2.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "GNU m4 is an implementation of the traditional Unix macro \ -processor." -LICENSE = "GPL" -SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz \ - file://make.patch;patch=1" -S = "${WORKDIR}/m4-${PV}" - -inherit autotools - -EXTRA_AUTORECONF = "--exclude=autopoint,aclocal" -EXTRA_OEMAKE += "'infodir=${infodir}'" diff --git a/packages/m4/m4_1.4.4.bb b/packages/m4/m4_1.4.4.bb new file mode 100644 index 0000000000..0c9f4c38ac --- /dev/null +++ b/packages/m4/m4_1.4.4.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "GNU m4 is an implementation of the traditional Unix macro \ +processor." +LICENSE = "GPL" +SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz" +S = "${WORKDIR}/m4-${PV}" + +inherit autotools + +EXTRA_AUTORECONF = "--exclude=autopoint,aclocal" +EXTRA_OEMAKE += "'infodir=${infodir}'" -- cgit v1.2.3 From 1a2ae11fe27018575b72e88a0f36c48630863237 Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Mon, 22 Jan 2007 23:24:38 +0000 Subject: linux-omap1.inc : autoload ohci_hcd module so USB works without manual intervention. --- packages/linux/linux-omap1.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/linux/linux-omap1.inc b/packages/linux/linux-omap1.inc index 8e78ac1a5c..ac7d398122 100644 --- a/packages/linux/linux-omap1.inc +++ b/packages/linux/linux-omap1.inc @@ -10,6 +10,8 @@ inherit kernel KERNEL_IMAGETYPE = "vmlinux" KERNEL_OUTPUT = "${KERNEL_IMAGETYPE}" +module_autoload_ohci-hcd_omap5912osk = "ohci-hcd" + do_configure_prepend() { if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then -- cgit v1.2.3 From 6fa394ceac34ef739434b8765ae2bb09d117d506 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Tue, 23 Jan 2007 02:03:05 +0000 Subject: tune-thumb.conf: Default thumb interworking to on, fix the overrides definition (do not want a space in there), explicitly turn off thumb and interworking options when not requested, explicitly turn off interworking for the kernel. --- conf/machine/include/tune-thumb.conf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/conf/machine/include/tune-thumb.conf b/conf/machine/include/tune-thumb.conf index 48003571f1..a25cb5320c 100644 --- a/conf/machine/include/tune-thumb.conf +++ b/conf/machine/include/tune-thumb.conf @@ -9,7 +9,7 @@ ARM_INSTRUCTION_SET ?= "arm" # but requires more instructions (140% for 70% smaller code) so may be # slower. -THUMB_INTERWORK ?= "no" +THUMB_INTERWORK ?= "yes" # "yes" "no" # Whether to compile with code to allow interworking between the two # instruction sets. This allows thumb code to be executed on a primarily @@ -18,15 +18,15 @@ THUMB_INTERWORK ?= "no" OVERRIDE_THUMB = "${@['', ':thumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}" OVERRIDE_INTERWORK = "${@['', ':thumb-interwork'][bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes']}" -OVERRIDES += "${OVERRIDE_THUMB}${OVERRIDE_INTERWORK}" +OVERRIDES .= "${OVERRIDE_THUMB}${OVERRIDE_INTERWORK}" # Compiler and linker options for application code and kernel code. These # options ensure that the compiler has the correct settings for the selected # instruction set and interworking. -ARM_INTERWORK_M_OPT = "${@['', '-mthumb-interwork'][bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes']}" -ARM_THUMB_M_OPT = "${@['', '-mthumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}" +ARM_INTERWORK_M_OPT = "${@['-mno-thumb-interwork', '-mthumb-interwork'][bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes']}" +ARM_THUMB_M_OPT = "${@['-mno-thumb', '-mthumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}" # TARGET_CC_ARCH += "${ARM_INTERWORK_M_OPT} ${ARM_THUMB_M_OPT}" -TARGET_CC_KERNEL_ARCH += "-mno-thumb" +TARGET_CC_KERNEL_ARCH += "-mno-thumb-interwork -mno-thumb" -- cgit v1.2.3 From 14263a02e4a3a58b5ce6c40b4579d0929ad6de22 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Tue, 23 Jan 2007 02:04:23 +0000 Subject: tune-xscale.conf: Set TARGET_CC_KERNEL_ARCH correctly --- conf/machine/include/tune-xscale.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/machine/include/tune-xscale.conf b/conf/machine/include/tune-xscale.conf index 0b98f09fc8..e5fea93912 100644 --- a/conf/machine/include/tune-xscale.conf +++ b/conf/machine/include/tune-xscale.conf @@ -1,3 +1,3 @@ TARGET_CC_ARCH = "-march=armv5te -mtune=xscale" +TARGET_CC_KERNEL_ARCH = "-march=armv5te -mtune=xscale" PACKAGE_ARCH = "armv5te" - -- cgit v1.2.3 From 36017e0567e15bca5b406a4adbe1db0ff707c70f Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Tue, 23 Jan 2007 02:07:51 +0000 Subject: madwifi: Replaced the slugos-specific oemake override with machine-endianness-specific overrides --- packages/madwifi/madwifi-ng_r.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/madwifi/madwifi-ng_r.inc b/packages/madwifi/madwifi-ng_r.inc index c82b785eb1..4f38799a8d 100644 --- a/packages/madwifi/madwifi-ng_r.inc +++ b/packages/madwifi/madwifi-ng_r.inc @@ -22,7 +22,8 @@ inherit module-base EXTRA_OEMAKE = "LDFLAGS= KERNELPATH=${STAGING_KERNEL_DIR} KERNELRELEASE=${KERNEL_VERSION} TOOLPREFIX=${TARGET_PREFIX}" -EXTRA_OEMAKE_prepend_slugos = "TARGET=xscale-${ARCH_BYTE_SEX}-elf " +EXTRA_OEMAKE_prepend_ixp4xxle = "TARGET=xscale-le-elf " +EXTRA_OEMAKE_prepend_ixp4xxbe = "TARGET=xscale-be-elf " do_compile() { oe_runmake all -- cgit v1.2.3 From 4f6607cc3419b47b8cf25b63b5f2a5ffece9b0dc Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Tue, 23 Jan 2007 02:11:08 +0000 Subject: apex: Changed ixp4xx-specific ARCH_BYTE_SEX variable usage into generic CONFIG_SITE based endianness checks --- packages/apex/apex_1.4.11.bb | 19 ++++++++++++------- packages/apex/apex_1.4.7.bb | 19 ++++++++++++------- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/packages/apex/apex_1.4.11.bb b/packages/apex/apex_1.4.11.bb index bb45a310b0..713cc833fd 100644 --- a/packages/apex/apex_1.4.11.bb +++ b/packages/apex/apex_1.4.11.bb @@ -23,18 +23,20 @@ CMDLINE="console=ttyS0,115200 rootfstype=jffs2 root=/dev/mtdblock4 rw init=/linu # defconfig to .config do_configure() { rm -f ${S}/.config - if test '${ARCH_BYTE_SEX}' = be - then + . ${CONFIG_SITE} + if [ "x$ac_cv_c_bigendian" = "xyes" -o "x$ac_cv_c_littleendian" = "xno" ]; then sed -e 's/.*CONFIG_USER_BIGENDIAN.*/CONFIG_USER_BIGENDIAN=y/' \ -e 's/.*CONFIG_BIGENDIAN.*/CONFIG_BIGENDIAN=y/' \ -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE}\"|' \ ${WORKDIR}/defconfig > ${S}/.config - else + elif [ "x$ac_cv_c_littleendian" = "xyes" -o "x$ac_cv_c_bigendian" = "xno" ]; then sed -e 's/.*CONFIG_USER_LITTLEENDIAN.*/CONFIG_USER_LITTLEENDIAN=y/' \ -e 's/.*CONFIG_LITTLEENDIAN.*/CONFIG_LITTLEENDIAN=y/' \ -e 's/.*CONFIG_ENV_REGION_KERNEL_SWAP.*/CONFIG_ENV_REGION_KERNEL_SWAP=y/' \ -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE}\"|' \ ${WORKDIR}/defconfig > ${S}/.config + else + oefatal do_configure cannot determine endianess fi oe_runmake oldconfig } @@ -43,11 +45,14 @@ DEPENDS += "devio-native" do_populate_staging() { install -d ${STAGING_LOADER_DIR} - # FIXME - arch-arm should not be hard-coded - if test '${ARCH_BYTE_SEX}' = be - then + . ${CONFIG_SITE} + if [ "x$ac_cv_c_bigendian" = "xyes" -o "x$ac_cv_c_littleendian" = "xno" ]; then + # FIXME - arch-arm should not be hard-coded cp src/arch-arm/rom/apex.bin ${STAGING_LOADER_DIR}/apex.bin - else + elif [ "x$ac_cv_c_littleendian" = "xyes" -o "x$ac_cv_c_bigendian" = "xno" ]; then + # FIXME - arch-arm should not be hard-coded devio '<<'src/arch-arm/rom/apex.bin >${STAGING_LOADER_DIR}/apex.bin 'xp $,4' + else + oefatal do_populate_staging cannot determine endianess fi } diff --git a/packages/apex/apex_1.4.7.bb b/packages/apex/apex_1.4.7.bb index bb45a310b0..713cc833fd 100644 --- a/packages/apex/apex_1.4.7.bb +++ b/packages/apex/apex_1.4.7.bb @@ -23,18 +23,20 @@ CMDLINE="console=ttyS0,115200 rootfstype=jffs2 root=/dev/mtdblock4 rw init=/linu # defconfig to .config do_configure() { rm -f ${S}/.config - if test '${ARCH_BYTE_SEX}' = be - then + . ${CONFIG_SITE} + if [ "x$ac_cv_c_bigendian" = "xyes" -o "x$ac_cv_c_littleendian" = "xno" ]; then sed -e 's/.*CONFIG_USER_BIGENDIAN.*/CONFIG_USER_BIGENDIAN=y/' \ -e 's/.*CONFIG_BIGENDIAN.*/CONFIG_BIGENDIAN=y/' \ -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE}\"|' \ ${WORKDIR}/defconfig > ${S}/.config - else + elif [ "x$ac_cv_c_littleendian" = "xyes" -o "x$ac_cv_c_bigendian" = "xno" ]; then sed -e 's/.*CONFIG_USER_LITTLEENDIAN.*/CONFIG_USER_LITTLEENDIAN=y/' \ -e 's/.*CONFIG_LITTLEENDIAN.*/CONFIG_LITTLEENDIAN=y/' \ -e 's/.*CONFIG_ENV_REGION_KERNEL_SWAP.*/CONFIG_ENV_REGION_KERNEL_SWAP=y/' \ -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE}\"|' \ ${WORKDIR}/defconfig > ${S}/.config + else + oefatal do_configure cannot determine endianess fi oe_runmake oldconfig } @@ -43,11 +45,14 @@ DEPENDS += "devio-native" do_populate_staging() { install -d ${STAGING_LOADER_DIR} - # FIXME - arch-arm should not be hard-coded - if test '${ARCH_BYTE_SEX}' = be - then + . ${CONFIG_SITE} + if [ "x$ac_cv_c_bigendian" = "xyes" -o "x$ac_cv_c_littleendian" = "xno" ]; then + # FIXME - arch-arm should not be hard-coded cp src/arch-arm/rom/apex.bin ${STAGING_LOADER_DIR}/apex.bin - else + elif [ "x$ac_cv_c_littleendian" = "xyes" -o "x$ac_cv_c_bigendian" = "xno" ]; then + # FIXME - arch-arm should not be hard-coded devio '<<'src/arch-arm/rom/apex.bin >${STAGING_LOADER_DIR}/apex.bin 'xp $,4' + else + oefatal do_populate_staging cannot determine endianess fi } -- cgit v1.2.3 From 79ebe7b06aa1dd508d80ef4bb040a37d6bc314a9 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Tue, 23 Jan 2007 02:13:35 +0000 Subject: ixp4xx-npe: Removed unused instances of slugos-specific ARCH_BYTE_SEX variable. --- packages/ixp4xx/ixp4xx-npe_2.1.bb | 9 +-------- packages/ixp4xx/ixp4xx-npe_2.3.bb | 9 +-------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/packages/ixp4xx/ixp4xx-npe_2.1.bb b/packages/ixp4xx/ixp4xx-npe_2.1.bb index 3370ad0c81..7fdc3abf63 100644 --- a/packages/ixp4xx/ixp4xx-npe_2.1.bb +++ b/packages/ixp4xx/ixp4xx-npe_2.1.bb @@ -11,14 +11,7 @@ COMPATIBLE_MACHINE = "(nslu2|ixp4xx)" FILES_${PN} = "${base_libdir}/firmware/NPE-B" do_compile() { -# if test '${ARCH_BYTE_SEX}' = be -# then - ${STAGING_BINDIR_NATIVE}/IxNpeMicrocode-${PV} -be -# fi -# if test '${ARCH_BYTE_SEX}' = le -# then -# ${STAGING_BINDIR_NATIVE}/IxNpeMicrocode-${PV} -le -# fi + ${STAGING_BINDIR_NATIVE}/IxNpeMicrocode-${PV} -be } do_install() { diff --git a/packages/ixp4xx/ixp4xx-npe_2.3.bb b/packages/ixp4xx/ixp4xx-npe_2.3.bb index 571080bda0..c6d91ff950 100644 --- a/packages/ixp4xx/ixp4xx-npe_2.3.bb +++ b/packages/ixp4xx/ixp4xx-npe_2.3.bb @@ -11,14 +11,7 @@ COMPATIBLE_MACHINE = "(nslu2|ixp4xx)" FILES_${PN} = "${base_libdir}/firmware/NPE-B" do_compile() { -# if test '${ARCH_BYTE_SEX}' = be -# then - ${STAGING_BINDIR_NATIVE}/IxNpeMicrocode-${PV} -be -# fi -# if test '${ARCH_BYTE_SEX}' = le -# then -# ${STAGING_BINDIR_NATIVE}/IxNpeMicrocode-${PV} -le -# fi + ${STAGING_BINDIR_NATIVE}/IxNpeMicrocode-${PV} -be } do_install() { -- cgit v1.2.3 From 2d96dd3d8722c5260740717f70c442b4cb445aac Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Tue, 23 Jan 2007 02:21:17 +0000 Subject: ixp4xx (and related ixp4xx-specific files): Change all usage of ARCH_BYTE_SEX to IXP4XX_MACHINE_ENDIAN (and ensure COMPATIBLE_MACHINE is in effect whereever it is used). Add the nslu2le and nslu2be machines. Change include/ixp4xx.conf to use tune-xscale and tune-thumb. Remove slugos-specific variables that had global OE equivalents. Deprecate ixp4xx.conf and nslu2.conf in favour of endian-specific replacements. --- conf/distro/include/slugos.inc | 6 +- conf/distro/slugos-bag.conf | 2 +- conf/distro/slugos-bau.conf | 2 +- conf/distro/slugos-btu.conf | 2 +- conf/distro/slugos-lag.conf | 2 +- conf/distro/slugos-lau.conf | 2 +- conf/distro/slugos-ltu.conf | 2 +- conf/distro/unslung.conf | 2 +- conf/machine/include/ixp4xx.conf | 114 ++++++-------------------------- conf/machine/ixp4xx.conf | 8 --- conf/machine/ixp4xxbe.conf | 12 ++-- conf/machine/ixp4xxle.conf | 12 ++-- conf/machine/nslu2.conf | 19 ++++++ conf/machine/nslu2be.conf | 9 +++ conf/machine/nslu2le.conf | 9 +++ packages/images/slugos-image.bb | 6 +- packages/ixp425-eth/ixp400-eth_1.4.bb | 3 +- packages/ixp425-eth/ixp400-eth_1.5.1.bb | 3 +- packages/ixp425-eth/ixp400-eth_1.5.bb | 3 +- packages/ixp4xx/ixp-osal_2.0.bb | 2 +- packages/ixp4xx/ixp-osal_2.1.1.bb | 2 +- packages/ixp4xx/ixp-osal_2.1.bb | 2 +- packages/ixp4xx/ixp4xx-csr_2.0.bb | 2 +- packages/ixp4xx/ixp4xx-csr_2.1.1.bb | 2 +- packages/ixp4xx/ixp4xx-csr_2.1.bb | 2 +- packages/linux/ixp4xx-kernel.inc | 74 ++++++++++----------- packages/linux/nslu2-kernel.inc | 4 +- 27 files changed, 134 insertions(+), 174 deletions(-) create mode 100644 conf/machine/nslu2be.conf create mode 100644 conf/machine/nslu2le.conf diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index 7ca663a4d6..1cb9ef0bed 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -11,7 +11,7 @@ # slugos-[bl][at][gu] - a specific configuration encoded as follows: # # b or l - big or little endian -# set ARCH_BYTE_SEX to match +# set IXP4XX_MACHINE_ENDIAN to match # # a or t - ARM or Thumb instructions in the low level libraries # set ARM_INSTRUCTION_SET to match @@ -45,7 +45,7 @@ DISTRO_FEED ?= "unstable" # The following must also be set, they define the basic format of the build # -#ARCH_BYTE_SEX "be" or "le" +#IXP4XX_MACHINE_ENDIAN "be" or "le" #ARM_INSTRUCTION_SET "arm" or "thumb" #TARGET_OS "linux" or "linux-uclibc" #SLUGOS_IMAGESEX "big-endian" or "little-endian" (JFFS2 format) @@ -55,7 +55,7 @@ DISTRO_FEED ?= "unstable" USE_NLS ?= "no" # To make errors easier to identify: -DISTRO_NAME ?= "INVALID-${ARCH_BYTE_SEX}-${ARM_INSTRUCTION_SET}-${TARGET_OS}" +DISTRO_NAME ?= "INVALID-${IXP4XX_MACHINE_ENDIAN}-${ARM_INSTRUCTION_SET}-${TARGET_OS}" DISTRO_TYPE ?= "INVALID" # The following must not be changed. diff --git a/conf/distro/slugos-bag.conf b/conf/distro/slugos-bag.conf index 12deb5e7d8..89e61cb386 100644 --- a/conf/distro/slugos-bag.conf +++ b/conf/distro/slugos-bag.conf @@ -10,7 +10,7 @@ DISTRO_NAME ?= "slugos-bag" # DISTRO_FEED ?= "unstable" DISTRO_TYPE ?= "beta" -ARCH_BYTE_SEX = "be" +IXP4XX_MACHINE_ENDIAN = "be" ARM_INSTRUCTION_SET = "arm" TARGET_OS = "linux" SLUGOS_IMAGESEX ?= "big-endian" diff --git a/conf/distro/slugos-bau.conf b/conf/distro/slugos-bau.conf index 1e74dfc526..c6a609d3c5 100644 --- a/conf/distro/slugos-bau.conf +++ b/conf/distro/slugos-bau.conf @@ -11,7 +11,7 @@ DISTRO_NAME ?= "slugos-bau" # DISTRO_FEED ?= "unstable" DISTRO_TYPE ?= "alpha" -ARCH_BYTE_SEX = "be" +IXP4XX_MACHINE_ENDIAN = "be" ARM_INSTRUCTION_SET = "arm" TARGET_OS = "linux-uclibc" SLUGOS_IMAGESEX ?= "big-endian" diff --git a/conf/distro/slugos-btu.conf b/conf/distro/slugos-btu.conf index 125d6e0746..a378551665 100644 --- a/conf/distro/slugos-btu.conf +++ b/conf/distro/slugos-btu.conf @@ -10,7 +10,7 @@ DISTRO_NAME ?= "slugos-btu" # DISTRO_FEED ?= "unstable" DISTRO_TYPE ?= "beta" -ARCH_BYTE_SEX = "be" +IXP4XX_MACHINE_ENDIAN = "be" ARM_INSTRUCTION_SET = "thumb" TARGET_OS = "linux-uclibc" SLUGOS_IMAGESEX ?= "big-endian" diff --git a/conf/distro/slugos-lag.conf b/conf/distro/slugos-lag.conf index 5d65fcd78b..feefb88407 100644 --- a/conf/distro/slugos-lag.conf +++ b/conf/distro/slugos-lag.conf @@ -10,7 +10,7 @@ DISTRO_NAME ?= "slugos-lag" # DISTRO_FEED ?= "unstable" DISTRO_TYPE ?= "beta" -ARCH_BYTE_SEX = "le" +IXP4XX_MACHINE_ENDIAN = "le" ARM_INSTRUCTION_SET = "arm" TARGET_OS = "linux" SLUGOS_IMAGESEX ?= "big-endian" diff --git a/conf/distro/slugos-lau.conf b/conf/distro/slugos-lau.conf index 56c71fb329..098f8684b7 100644 --- a/conf/distro/slugos-lau.conf +++ b/conf/distro/slugos-lau.conf @@ -9,7 +9,7 @@ DISTRO_NAME ?= "slugos-lau" # DISTRO_FEED ?= "unstable" DISTRO_TYPE ?= "alpha" -ARCH_BYTE_SEX = "le" +IXP4XX_MACHINE_ENDIAN = "le" ARM_INSTRUCTION_SET = "arm" TARGET_OS = "linux-uclibc" SLUGOS_IMAGESEX ?= "big-endian" diff --git a/conf/distro/slugos-ltu.conf b/conf/distro/slugos-ltu.conf index 5a4f22f017..2151446205 100644 --- a/conf/distro/slugos-ltu.conf +++ b/conf/distro/slugos-ltu.conf @@ -9,7 +9,7 @@ DISTRO_NAME ?= "slugos-ltu" # DISTRO_FEED ?= "unstable" DISTRO_TYPE ?= "beta" -ARCH_BYTE_SEX = "le" +IXP4XX_MACHINE_ENDIAN = "le" ARM_INSTRUCTION_SET = "thumb" TARGET_OS = "linux-uclibc" SLUGOS_IMAGESEX ?= "big-endian" diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf index 25ac84d270..befbae8cd7 100644 --- a/conf/distro/unslung.conf +++ b/conf/distro/unslung.conf @@ -18,7 +18,7 @@ TARGET_FPU = "soft" TARGET_OS = "linux" # select distro specific options to match that of the original LinkSys build -ARCH_BYTE_SEX = "be" +IXP4XX_MACHINE_ENDIAN = "be" ARM_INSTRUCTION_SET = "arm" THUMB_INTERWORK = "no" diff --git a/conf/machine/include/ixp4xx.conf b/conf/machine/include/ixp4xx.conf index 0aba653201..42ca723d90 100644 --- a/conf/machine/include/ixp4xx.conf +++ b/conf/machine/include/ixp4xx.conf @@ -2,6 +2,12 @@ #@NAME: ixp4xx #@DESCRIPTION: genric machine configuration for ixp4xx platforms +MACHINE_FEATURES = "kernel26 usbhost ext2" + +EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x20000 --faketime -n" + +PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel" + #------------------------------------------------------------------------------- # INPUTS #------------------------------------------------------------------------------- @@ -15,12 +21,13 @@ # # description -ARCH_BYTE_SEX = "le" +IXP4XX_MACHINE_ENDIAN ?= "le" # "be" "le" # The memory byte sex and (on correctly implemented hardware - the IXP4XX is # correct) the byte sex of the buses within the system. 'be' (big-endian) # means that the first byte is the most significant byte on a bus, 'le' # (little-endian) means that the first byte is the least significant byte. +# Default to little-endian mode (since EABI does not support big endian yet) ARM_INSTRUCTION_SET = "arm" # "arm" "thumb" @@ -44,12 +51,6 @@ DISTRO_BASE = "" # after ${DISTRO}, this allows different distros