diff options
43 files changed, 4731 insertions, 68 deletions
diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf index dfdbe19e46..f7da451e65 100644 --- a/conf/distro/jlime-donkey.conf +++ b/conf/distro/jlime-donkey.conf @@ -18,6 +18,9 @@ PREFERRED_PROVIDERS = "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}libc-for-gcc:glibc" +PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-${TARGET_ARCH}" +PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" +PREFERRED_VERSION_kernel-modules = "2.6.16.20" #<> #<>We want kdrive as our default X-Server. @@ -62,11 +65,13 @@ BBINCLUDELOGS = "yes" IMAGE_FSTYPES = "tar.bz2" TARGET_OS = "linux" +#<>What we want on the bootstrap image (extra) +#<> #<> -#<>What we want on the bootstrap image (extra) -#<> -BOOTSTRAP_EXTRA_RDEPENDS += "pcmciautils ncurses nano wireless-tools console-tools coreutils" -BOOTSTRAP_EXTRA_DEPENDS += "pcmciautils ncurses nano wireless-tools console-tools coreutils" +BOOTSTRAP_EXTRA_RDEPENDS += "pcmciautils ncurses nano wireless-tools console-tools coreutils udev kernel-modules \ + e2tools e2fsprogs" +BOOTSTRAP_EXTRA_DEPENDS += "pcmciautils ncurses nano wireless-tools console-tools coreutils udev kernel-modules \ + e2tools e2fsprogs" #<> #<>What Opie version should we use. @@ -80,9 +85,9 @@ include conf/distro/preferred-opie-versions.inc PCMCIA_MANAGER = "pcmciautils" #<> -#<> Dont wanna break stuff when "some" packages do -O3, so lets set it at -O2 -#<> -FULL_OPTIMIZATION = "-O2" +#<> We are using gcc 4.1.1 so lets keep optimizations low +#<> +FULL_OPTIMIZATION = "-O1" #<> #<>Our Image files should look abit better. diff --git a/conf/distro/slugos-packages.conf b/conf/distro/slugos-packages.conf index 784bc5d8fd..650368a990 100644 --- a/conf/distro/slugos-packages.conf +++ b/conf/distro/slugos-packages.conf @@ -2,6 +2,7 @@ BBFILES := "\ ${PKGDIR}/packages/alsa/*.bb \ ${PKGDIR}/packages/apr/*.bb \ ${PKGDIR}/packages/asterisk/*.bb \ +${PKGDIR}/packages/asterisk-sounds/*.bb \ ${PKGDIR}/packages/atftp/*.bb \ ${PKGDIR}/packages/audiofile/*.bb \ ${PKGDIR}/packages/aumix/*.bb \ diff --git a/conf/machine/logicpd-pxa270.conf b/conf/machine/logicpd-pxa270.conf index 1027fe81cb..24e23bc9a0 100644 --- a/conf/machine/logicpd-pxa270.conf +++ b/conf/machine/logicpd-pxa270.conf @@ -3,9 +3,8 @@ #@DESCRIPTION: Machine configuration for LogicPD PXA270 Zoom Development Platform #OLDEST_KERNEL = "2.6.17-rc5" TARGET_ARCH = "arm" -PREFERRED_VERSION_mainstone-kernel = "2.6.17-rc5" +PREFERRED_VERSION_logicpd-pxa270 = "2.6.17-rc5" GUI_MACHINE_CLASS = "smallscreen" -IPKG_ARCHS = "all arm armv5te ${MACHINE}" PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}" diff --git a/packages/asterisk-sounds/.mtn2git_empty b/packages/asterisk-sounds/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/asterisk-sounds/.mtn2git_empty diff --git a/packages/asterisk-sounds/asterisk-sounds_1.2.1.bb b/packages/asterisk-sounds/asterisk-sounds_1.2.1.bb new file mode 100644 index 0000000000..18b85b8797 --- /dev/null +++ b/packages/asterisk-sounds/asterisk-sounds_1.2.1.bb @@ -0,0 +1,12 @@ +DESCRIPTION="Supplementary asterisk-sounds" +HOMEPAGE="www.asterisk.org" +LICENSE="GPL" +DEPENDS="" +PR = "r0" + +SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-sounds-${PV}.tar.gz" + +do_install() { + oe_runmake DESTDIR=${D} install +} + diff --git a/packages/asterisk/asterisk-1.2.9.1/.mtn2git_empty b/packages/asterisk/asterisk-1.2.9.1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/asterisk/asterisk-1.2.9.1/.mtn2git_empty diff --git a/packages/asterisk/asterisk-1.2.9.1/asterisk.patch b/packages/asterisk/asterisk-1.2.9.1/asterisk.patch new file mode 100644 index 0000000000..627738727e --- /dev/null +++ b/packages/asterisk/asterisk-1.2.9.1/asterisk.patch @@ -0,0 +1,194 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- asterisk-1.2.9.1/./Makefile~asterisk ++++ asterisk-1.2.9.1/./Makefile +@@ -331,7 +331,7 @@ + ASTCFLAGS+= $(TRACE_FRAMES) + ASTCFLAGS+= $(MALLOC_DEBUG) + ASTCFLAGS+= $(BUSYDETECT) +-ASTCFLAGS+= $(OPTIONS) ++#ASTCFLAGS+= $(OPTIONS) + ifneq ($(findstring dont-optimize,$(MAKECMDGOALS)),dont-optimize) + ASTCFLAGS+= -fomit-frame-pointer + endif +@@ -347,12 +347,12 @@ + netsock.o slinfactory.o ast_expr2.o ast_expr2f.o \ + cryptostub.o + +-ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/sys/poll.h),) ++ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/include/sys/poll.h),) + OBJS+= poll.o + ASTCFLAGS+=-DPOLLCOMPAT + endif + +-ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/dlfcn.h),) ++ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/include/dlfcn.h),) + OBJS+= dlfcn.o + ASTCFLAGS+=-DDLFCNCOMPAT + endif +@@ -397,7 +397,7 @@ + endif + + ifeq ($(MAKETOPLEVEL),$(MAKELEVEL)) +- CFLAGS+=$(ASTCFLAGS) ++override CFLAGS+=$(ASTCFLAGS) + endif + + # This is used when generating the doxygen documentation +@@ -519,7 +519,7 @@ + fi + rm -f include/asterisk/build.h.tmp + $(CC) -c -o buildinfo.o $(CFLAGS) buildinfo.c +- $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LIBS) ++ $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LDFLAGS) $(LIBS) + + muted: muted.o + $(CC) $(AUDIO_LIBS) -o muted muted.o +--- asterisk-1.2.9.1/codecs/gsm/Makefile~asterisk ++++ asterisk-1.2.9.1/codecs/gsm/Makefile +@@ -51,7 +51,7 @@ + ifneq (${PROC},ppc) + ifneq (${PROC},ppc64) + ifneq (${PROC},s390) +-OPTIMIZE+=-march=$(PROC) ++#OPTIMIZE+=-march=$(PROC) + endif + endif + endif +@@ -243,7 +243,7 @@ + ifneq (${PROC},arm) + ifneq ($(shell uname -m), parisc) + ifneq (${PROC}, s390) +-GSM_SOURCES+= $(SRC)/k6opt.s ++#GSM_SOURCES+= $(SRC)/k6opt.s + endif + endif + endif +@@ -309,7 +309,7 @@ + ifneq ($(shell uname -m), sparc64) + ifneq ($(shell uname -m), armv4l) + ifneq ($(shell uname -m), parisc) +-GSM_OBJECTS+= $(SRC)/k6opt.o ++#GSM_OBJECTS+= $(SRC)/k6opt.o + endif + endif + endif +--- asterisk-1.2.9.1/res/Makefile~asterisk ++++ asterisk-1.2.9.1/res/Makefile +@@ -89,7 +89,7 @@ + fi + + res_crypto.so: res_crypto.o +- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(CRYPTO_LIBS) ++ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< $(LDFLAGS) ${CYGSOLIB} $(CRYPTO_LIBS) + + clean: + rm -f *.so *.o .depend +--- asterisk-1.2.9.1/channels/Makefile~asterisk ++++ asterisk-1.2.9.1/channels/Makefile +@@ -73,7 +73,7 @@ + SOLINK+=-lrt + endif + +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/ixjuser.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/ixjuser.h),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/linux/ixjuser.h),) + CHANNEL_LIBS+=chan_phone.so + endif + +@@ -88,16 +88,16 @@ + + CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations + +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/alsa/asoundlib.h),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/alsa/asoundlib.h),) + CHANNEL_LIBS+=chan_alsa.so + endif + +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libpri.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libpri.so.1),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/lib/libpri.so.1),) + CFLAGS+=-DZAPATA_PRI + ZAPPRI=-lpri + endif + +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libmfcr2.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libmfcr2.so.1),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/lib/libmfcr2.so.1),) + CFLAGS+=-DZAPATA_R2 + ZAPR2=-lmfcr2 + endif +@@ -110,7 +110,7 @@ + endif + + ifndef WITHOUT_ZAPTEL +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/linux/zaptel.h),) + ifeq (${OSARCH},NetBSD) + SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/pkg/lib + endif +@@ -122,7 +122,7 @@ + endif + endif # WITHOUT_ZAPTEL + +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/vpbapi.h),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/vpbapi.h),) + CHANNEL_LIBS+=chan_vpb.so + CFLAGS+=-DLINUX + endif +@@ -137,7 +137,7 @@ + + ZAPDIR=/usr/lib + +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/nbs.h),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/nbs.h),) + CHANNEL_LIBS+=chan_nbs.so + endif + +@@ -158,7 +158,7 @@ + rm -f busy.h ringtone.h gentone gentone-ulaw + + %.so : %.o +- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} ${LIBS} ++ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< $(LDFLAGS) ${CYGSOLIB} ${LIBS} + + ifneq ($(wildcard .depend),) + include .depend +--- asterisk-1.2.9.1/pbx/Makefile~asterisk ++++ asterisk-1.2.9.1/pbx/Makefile +@@ -59,7 +59,7 @@ + $(CC) $(SOLINK) -o $@ $(KDE_CONSOLE_OBJS) $(KDE_LIBS) + + pbx_dundi.so: dundi-parser.o pbx_dundi.o +- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} pbx_dundi.o dundi-parser.o -lz ${CYGSOLIB} ++ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} pbx_dundi.o dundi-parser.o -lz ${CYGSOLIB} $(LDFLAGS) + + %.moc : %.h + $(MOC) $< -o $@ +--- asterisk-1.2.9.1/formats/Makefile~asterisk ++++ asterisk-1.2.9.1/formats/Makefile +@@ -25,7 +25,7 @@ + # + # OGG/Vorbis format + # +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/vorbis/codec.h),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/vorbis/codec.h),) + FORMAT_LIBS+=format_ogg_vorbis.so + endif + +--- asterisk-1.2.9.1/utils/Makefile~asterisk ++++ asterisk-1.2.9.1/utils/Makefile +@@ -22,11 +22,11 @@ + + TARGET=stereorize streamplayer + +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/popt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)/usr/local/include/popt.h),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/popt.h),) + TARGET+=smsq + endif + +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/newt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)/usr/local/include/newt.h),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/newt.h),) + TARGET+=astman + endif + diff --git a/packages/asterisk/asterisk_1.2.9.1.bb b/packages/asterisk/asterisk_1.2.9.1.bb new file mode 100644 index 0000000000..4298318935 --- /dev/null +++ b/packages/asterisk/asterisk_1.2.9.1.bb @@ -0,0 +1,36 @@ +DESCRIPTION="The Astersisk open source software PBX" +HOMEPAGE="www.asterisk.org" +LICENSE="GPL" +DEPENDS="ncurses zlib openssl" +PR = "r0" + +SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz \ + file://asterisk.patch;patch=1" + + +export CROSS_COMPILE="${CCACHE}${HOST_PREFIX}" +export CROSS_COMPILE_BIN="${STAGING_BINDIR}" +export CROSS_COMPILE_TARGET="${STAGING_DIR}/${HOST_SYS}" + +export CROSS_ARCH="Linux" +export CROSS_PROC="arm" +export SUB_PROC="xscale" + +export MAKECMDGOALS="dont-optimize" + +# We will probably have to edit the CFLAG in the Makefile + +do_compile() { + oe_runmake +} + +do_install() { + oe_runmake DESTDIR=${D} install +} + +do_stage () { + install -d ${STAGING_INCDIR}/asterisk + install -m 0644 ${S}/include/asterisk/*.h ${STAGING_INCDIR}/asterisk/ +} + + diff --git a/packages/base-files/base-files/jornada6xx/.mtn2git_empty b/packages/base-files/base-files/jornada6xx/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/base-files/base-files/jornada6xx/.mtn2git_empty diff --git a/packages/base-files/base-files/jornada6xx/fstab b/packages/base-files/base-files/jornada6xx/fstab new file mode 100644 index 0000000000..504a1a2f4e --- /dev/null +++ b/packages/base-files/base-files/jornada6xx/fstab @@ -0,0 +1,7 @@ +proc /proc proc defaults 0 0 +/dev/hda2 / ext2 defaults 0 0 +/dev/hda1 /mnt/cf auto defaults,sync,noauto 0 0 +/dev/hda3 none swap sw 0 0 +tmpfs /var tmpfs defaults 0 0 +tmpfs /mnt/ram tmpfs defaults 0 0 +devpts /dev/pts devpts defaults 0 0
\ No newline at end of file diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb index 866c016965..f7a0a66b03 100644 --- a/packages/base-files/base-files_3.0.14.bb +++ b/packages/base-files/base-files_3.0.14.bb @@ -52,6 +52,7 @@ hostname = "openembedded" hostname_slugos = "nslu2" hostname_mnci = "MNCI" hostname_rt3000 = "MNRT" +hostname_jlime = "JLime" do_install () { for d in ${dirs755}; do diff --git a/packages/ezx/ezx-boot-usb-native_svn.bb b/packages/ezx/ezx-boot-usb-native_1877.bb index 80dcb3533d..2630a6bab6 100644 --- a/packages/ezx/ezx-boot-usb-native_svn.bb +++ b/packages/ezx/ezx-boot-usb-native_1877.bb @@ -4,9 +4,9 @@ SECTION = "devel" AUTHOR = "Harald Welte" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "GPL" -PR = "r1" +PR = "r0" -SRC_URI = "svn://svn.openezx.org/trunk/src/host;module=boot_usb;proto=http" +SRC_URI = "svn://svn.openezx.org/trunk/src/host;module=boot_usb;proto=http;rev=${PV}" S = "${WORKDIR}/boot_usb" inherit native diff --git a/packages/ezx/ezx-gpiotool_svn.bb b/packages/ezx/ezx-gpiotool_1877.bb index c9b35f7df6..68f5d0d4f4 100644 --- a/packages/ezx/ezx-gpiotool_svn.bb +++ b/packages/ezx/ezx-gpiotool_1877.bb @@ -1,12 +1,12 @@ -DESCRIPTION = "Gpiotool can read/write gpio configuration as well as individual gpio pins from userspace." +DESCRIPTION = "Gpiotool can read/write gpio configuration from userspace." SECTION = "devel" LICENSE = "GPL" -HOMEPAGE = "http://openezx.org" +HOMEPAGE = "http://www.openezx.org" AUTHOR = "Harald Welte" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" -PR = "r1" +PR = "r0" -SRC_URI = "svn://svn.openezx.org/trunk/src/userspace;module=gpiotool;proto=http" +SRC_URI = "svn://svn.openezx.org/trunk/src/userspace;module=gpiotool;proto=http;rev=${PV}" S = "${WORKDIR}/gpiotool" do_compile() { diff --git a/packages/libgpevtype/libgpevtype_0.17.bb b/packages/libgpevtype/libgpevtype_0.17.bb index a2639f448c..38e8f3d7b2 100644 --- a/packages/libgpevtype/libgpevtype_0.17.bb +++ b/packages/libgpevtype/libgpevtype_0.17.bb @@ -6,6 +6,8 @@ DEPENDS = "libmimedir libeventdb" MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de> PR = "r0" +DEFAULT_PREFERENCE = "-1" + inherit pkgconfig gpe autotools SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2" diff --git a/packages/linux/linux-ezx/defconfig-a780 b/packages/linux/linux-ezx/defconfig-a780 index 550ba4a786..f61784f96a 100644 --- a/packages/linux/linux-ezx/defconfig-a780 +++ b/packages/linux/linux-ezx/defconfig-a780 @@ -857,7 +857,7 @@ CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_TRIGGERS=y # CONFIG_LEDS_E680 is not set -CONFIG_LEDS_A780=m +CONFIG_LEDS_A780=y CONFIG_LEDS_TRIGGER_TIMER=y # @@ -914,7 +914,7 @@ CONFIG_LOGO_LINUX_CLUT224=y CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_DEVICE=y -CONFIG_BACKLIGHT_EZX=m +CONFIG_BACKLIGHT_EZX=y CONFIG_LCD_CLASS_DEVICE=m CONFIG_LCD_DEVICE=y diff --git a/packages/linux/linux-ezx/defconfig-e680 b/packages/linux/linux-ezx/defconfig-e680 index 97d1602f20..52bf0d75f6 100644 --- a/packages/linux/linux-ezx/defconfig-e680 +++ b/packages/linux/linux-ezx/defconfig-e680 @@ -856,7 +856,7 @@ CONFIG_SPI_BITBANG=m CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_E680=m +CONFIG_LEDS_E680=y # CONFIG_LEDS_A780 is not set CONFIG_LEDS_TRIGGER_TIMER=y @@ -914,7 +914,7 @@ CONFIG_LOGO_LINUX_CLUT224=y CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_DEVICE=y -CONFIG_BACKLIGHT_EZX=m +CONFIG_BACKLIGHT_EZX=y CONFIG_LCD_CLASS_DEVICE=m CONFIG_LCD_DEVICE=y diff --git a/packages/linux/linux-ezx/e680-fix-keypad.patch b/packages/linux/linux-ezx/e680-fix-keypad.patch new file mode 100644 index 0000000000..b40283f332 --- /dev/null +++ b/packages/linux/linux-ezx/e680-fix-keypad.patch @@ -0,0 +1,150 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- linux-2.6.16/arch/arm/mach-pxa/ezx.c~e680-fix-keypad 2006-06-09 01:55:06.000000000 +0200 ++++ linux-2.6.16/arch/arm/mach-pxa/ezx.c 2006-06-09 03:09:26.000000000 +0200 +@@ -341,71 +341,25 @@ + }; + #endif + +-/* keyboard */ +- +-#if defined(CONFIG_PXA_EZX_V700) +-#error "kbd matrix still needs to be converted to new row/col layout" +-static unsigned char ezx_keycode[] = { +- /* col 0 */ +- KEY_UP, KEY_DOWN, KEY_LEFT, KEY_RIGHT, +- KEYPAD_POUND, KEY_0, KEY_9, 0, +- /* col 1 */ +- KEY_2, KEY_4, KEY_6, KEY_8, +- KEY_7, KEYPAD_SLEFT, KEYPAD_SRIGHT, 0, +- /* col 2 */ +- KEY_MENU, KEY_1, KEY_3, KEY_5, +- KEY_KPASTERISK, KEY_VOLUMEUP, KEY_VOLUMEDOWN, 0, +- /* col 3 */ +- KEY_CAMERA, KEYPAD_CLEAR, KEYPAD_CARRIER, KEYPAD_ACTIVATE, +- KEYPAD_SEND, KEYPAD_SMART, KEYPAD_VAVR, 0, +-}; +-static unsigned char ezx_direct_keycode[] = { +- KEYPAD_NONE, +- KEYPAD_NONE, +- KEYPAD_NONE, +- KEYPAD_NONE, +- KEYPAD_NONE, +- KEYPAD_NONE, +-}; +-#elif defined(CONFIG_PXA_EZX_E680_P4A) +-#error "kbd matrix still needs to be converted to new row/col layout" +-static unsigned char ezx_keycode[] = { +- /* col 0 */ +- KEY_UP, KEY_DOWN, KEY_LEFT, 0, 0, 0, 0, 0, +- /* col 1 */ +- KEY_RIGHT, KEY_CENTER, KEY_HOME, 0, 0, 0, 0, 0, +- /* col 2 */ +- KEYPAD_GAME_R, 0, KEYPAD_GAME_L, 0, 0, 0, 0, 0, +- /* col 3 */ +- KEY_A, KEY_B, 0, 0, 0, 0, 0, 0, +-}; +-static unsigned char ezx_direct_keycode[] = { +- KEY_CAMERA, +- KEYPAD_NONE, +- KEYPAD_NONE, +- KEYPAD_NONE, +- KEY_POWER, +- KEYPAD_NONE, +-}; +-#elif defined(CONFIG_PXA_EZX_E680) +-#error "kbd matrix still needs to be converted to new row/col layout" ++/* ++ * PXA Keyboard ++ */ ++#if defined(CONFIG_PXA_EZX_E680) + static unsigned char ezx_keycode[] = { +- /* col 0 */ +- KEY_UP, KEY_DOWN, 0, 0, 0, 0, 0, 0, +- /* col 1 */ +- KEY_RIGHT, KEY_LEFT, 0, 0, 0, 0, 0, 0, +- /* col 2 */ +- 0, KEYPAD_GAME_R, 0, 0, 0, 0, 0, 0, +- /* col 3 */ +- KEYPAD_HOME, KEYPAD_GAME_L, KEYPAD_CENTER, 0, 0, 0, 0, 0, ++ /* row 0 */ ++ KEY_UP, KEY_RIGHT, 0, KEY_PHONE, ++ /* row 1 */ ++ KEY_DOWN, KEY_LEFT, KEY_VOLUMEUP, KEY_VOLUMEDOWN, ++ /* row 2 */ ++ 0, 0, 0, KEY_KPENTER, + }; + static unsigned char ezx_direct_keycode[] = { + KEY_CAMERA, +- KEYPAD_NONE, +- KEYPAD_NONE, +- KEYPAD_A, ++ 0, ++ 0, ++ KEY_HOME, + KEY_POWER, +- KEYPAD_B, ++ KEY_MENU, + }; + #elif defined(CONFIG_PXA_EZX_A780) + static unsigned char ezx_keycode[] = { +@@ -424,22 +378,12 @@ + KEY_CAMERA, + }; + #else +-#error "no EZX subarchitecture defined !?!" ++#error "no EZX subarchitecture defined" + #endif + + static int ezx_kbd_init(void) + { +-#if defined(CONFIG_PXA_EZX_E680_P4A) +- pxa_gpio_mode(93 | GPIO_ALT_FN_1_IN); /* KP_DKIN<0>, VR Key */ +- pxa_gpio_mode(97 | GPIO_ALT_FN_1_IN); /* KP_DKIN<4>, power key */ +- pxa_gpio_mode(100 | GPIO_ALT_FN_1_IN); /* KP_MKIN<0> */ +- pxa_gpio_mode(101 | GPIO_ALT_FN_1_IN); /* KP_MKIN<1> */ +- pxa_gpio_mode(102 | GPIO_ALT_FN_1_IN); /* KP_MKIN<2> */ +- pxa_gpio_mode(103 | GPIO_ALT_FN_2_OUT); /* KP_MKOUT<0> */ +- pxa_gpio_mode(104 | GPIO_ALT_FN_2_OUT); /* KP_MKOUT<1> */ +- pxa_gpio_mode(105 | GPIO_ALT_FN_2_OUT); /* KP_MKOUT<2> */ +- pxa_gpio_mode(106 | GPIO_ALT_FN_2_OUT); /* KP_MKOUT<3> */ +-#elif defined(CONFIG_PXA_EZX_E680) ++#if defined(CONFIG_PXA_EZX_E680) + pxa_gpio_mode(93 | GPIO_ALT_FN_1_IN); /* KP_DKIN<0>, VR Key */ + pxa_gpio_mode(96 | GPIO_ALT_FN_1_IN); /* KP_DKIN<3>, GAME_A */ + pxa_gpio_mode(97 | GPIO_ALT_FN_1_IN); /* KP_DKIN<4>, power key */ +@@ -455,7 +399,7 @@ + GPDR(GPIO_TC_MM_EN) |= GPIO_bit(GPIO_TC_MM_EN); + GPSR(GPIO_TC_MM_EN) = GPIO_bit(GPIO_TC_MM_EN); + PGSR3 |= GPIO_bit(GPIO_TC_MM_EN); +-#elif defined (CONFIG_PXA_EZX_A780) ++#elif defined(CONFIG_PXA_EZX_A780) + pxa_gpio_mode(93 | GPIO_ALT_FN_1_IN); /* KP_DKIN<0>, voice_rec */ + pxa_gpio_mode(97 | GPIO_ALT_FN_3_IN); /* KP_MKIN<3> */ + pxa_gpio_mode(98 | GPIO_ALT_FN_3_IN); /* KP_MKIN<4> */ +@@ -476,10 +420,7 @@ + .scan_interval = HZ/40, + .matrix = { + .keycode = &ezx_keycode, +-#if defined(CONFIG_ARCH_EXZ_E680_P4A) +- .cols = 4, +- .rows = 3, +-#elif defined(CONFIG_PXA_EZX_E680) ++#if defined(CONFIG_PXA_EZX_E680) + .cols = 4, + .rows = 3, + #elif defined(CONFIG_PXA_EZX_A780) +@@ -489,9 +430,7 @@ + }, + .direct = { + .keycode = &ezx_direct_keycode, +-#if defined(CONFIG_PXA_EZX_E680_P4A) +- .num = 4, +-#elif defined(CONFIG_PXA_EZX_E680) ++#if defined(CONFIG_PXA_EZX_E680) + .num = 5, + #elif defined(CONFIG_PXA_EZX_A780) + .num = 1, diff --git a/packages/linux/linux-ezx/e680-keypad-compile-HACK.patch b/packages/linux/linux-ezx/e680-keypad-compile-HACK.patch deleted file mode 100644 index 47d07db695..0000000000 --- a/packages/linux/linux-ezx/e680-keypad-compile-HACK.patch +++ /dev/null @@ -1,42 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- linux-2.6.16/arch/arm/mach-pxa/ezx.c~e680-keypad-compile-fix.patch 2006-05-31 18:47:58.000000000 +0200 -+++ linux-2.6.16/arch/arm/mach-pxa/ezx.c 2006-05-31 18:51:57.000000000 +0200 -@@ -404,24 +404,20 @@ - KEYPAD_NONE, - }; - #elif defined(CONFIG_PXA_EZX_E680) --#error "kbd matrix still needs to be converted to new row/col layout" - static unsigned char ezx_keycode[] = { -- /* col 0 */ -- KEY_UP, KEY_DOWN, 0, 0, 0, 0, 0, 0, -- /* col 1 */ -- KEY_RIGHT, KEY_LEFT, 0, 0, 0, 0, 0, 0, -- /* col 2 */ -- 0, KEYPAD_GAME_R, 0, 0, 0, 0, 0, 0, -- /* col 3 */ -- KEYPAD_HOME, KEYPAD_GAME_L, KEYPAD_CENTER, 0, 0, 0, 0, 0, -+ /* row 0 */ -+ KEY_KPENTER, KEY_MENU, KEY_CANCEL, KEY_PAGEUP, KEY_UP, -+ /* row 1 */ -+ KEY_KP1, KEY_KP2, KEY_KP3, KEY_ENTER, KEY_KPENTER, /*center joypad */ -+ /* row 2 */ -+ KEY_KP4, KEY_KP5, KEY_KP6, KEY_PAGEDOWN, KEY_PHONE, -+ /* row 3 */ -+ KEY_KP7, KEY_KP8, KEY_KP9, KEY_PHONE, KEY_LEFT, -+ /* row 4 */ -+ KEY_KPASTERISK, KEY_KP0, KEY_KPDOT, KEY_PAGEDOWN, KEY_DOWN, - }; - static unsigned char ezx_direct_keycode[] = { - KEY_CAMERA, -- KEYPAD_NONE, -- KEYPAD_NONE, -- KEYPAD_A, -- KEY_POWER, -- KEYPAD_B, - }; - #elif defined(CONFIG_PXA_EZX_A780) - static unsigned char ezx_keycode[] = { diff --git a/packages/linux/linux-ezx/ezx-backlight-r1.patch b/packages/linux/linux-ezx/ezx-backlight-r1.patch new file mode 100644 index 0000000000..a277f19344 --- /dev/null +++ b/packages/linux/linux-ezx/ezx-backlight-r1.patch @@ -0,0 +1,277 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- linux-2.6.16/arch/arm/mach-pxa/ezx.c~ezx-backlight-r1.patch 2006-06-08 19:33:36.000000000 +0200 ++++ linux-2.6.16/arch/arm/mach-pxa/ezx.c 2006-06-08 19:33:37.000000000 +0200 +@@ -274,34 +274,9 @@ + .udc_command = ezx_udc_command, + }; + +-/* pxafb */ +- +-#define BKLIGHT_PRESCALE 2 +-#define BKLIGHT_PERIOD 49 +-#define DEFAULT_DUTYCYCLE 25 +-#define MAX_DUTYCYCLE (BKLIGHT_PERIOD+1) +-#define MIN_DUTYCYCLE 0 +- +-static void pxafb_backlight_power(int on) +-{ +- if (on) { +- CKEN |= CKEN0_PWM0; +- PWM_CTRL0 = BKLIGHT_PRESCALE; +- PWM_PERVAL0 = BKLIGHT_PERIOD; +- PWM_PWDUTY0 = DEFAULT_DUTYCYCLE; +- +- GPDR0 |= 0x00010000; //PWM0 is GPIO16 +- pxa_gpio_mode(GPIO16_PWM0_MD); +- } else { +- PWM_PWDUTY0 = 0; +- GAFR0_U &= 0xfffffffc; +- GPDR0 &= 0xfffeffff; /* set gpio16 (pwm0) as input */ +- CKEN &= ~CKEN0_PWM0; +- PWM_PWDUTY0 = MIN_DUTYCYCLE; +- } +-} +- +-//#define mdelay(x) udelay((x)*1000) ++/* ++ * EZX PXA Framebuffer ++ */ + + static void pxafb_lcd_power(int on) + { +@@ -326,35 +301,24 @@ + .xres = 240, + .yres = 320, + .bpp = 16, +- + .hsync_len = 10, + .left_margin = 20, + .right_margin = 10, +- + .vsync_len = 2, + .upper_margin = 3, + .lower_margin = 2, +- + .sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, +- + .lccr0 = 0x002008F8, + .lccr3 = 0x0430FF09, +- +- .pxafb_backlight_power = &pxafb_backlight_power, +- .pxafb_lcd_power = &pxafb_lcd_power, +-}; +- +- +-/* backlight for lcd */ +- +-static struct resource ezx_backlight_resources[] = { ++ .pxafb_lcd_power= &pxafb_lcd_power, + }; + +-static struct platform_device ezx_backlight_device = { +- .name = "ezx-lcd-backlight", ++/* ++ * EZX LCD Backlight ++ */ ++static struct platform_device ezxbacklight_device = { ++ .name = "ezx-bl", + .id = -1, +- .resource = ezx_backlight_resources, +- .num_resources = ARRAY_SIZE(ezx_backlight_resources), + }; + + #ifdef CONFIG_PXA_EZX_E680 +@@ -786,6 +750,7 @@ + + static struct platform_device *devices[] __initdata = { + &ezx_bp_device, ++ &ezxbacklight_device, + #ifdef CONFIG_PXA_EZX_E680 + &e680led_device, + #endif +--- linux-2.6.16/drivers/video/backlight/Kconfig~ezx-backlight-r1.patch 2006-06-08 19:33:34.000000000 +0200 ++++ linux-2.6.16/drivers/video/backlight/Kconfig 2006-06-08 19:33:37.000000000 +0200 +@@ -58,3 +58,12 @@ + If you have a HP Jornada 680, say y to enable the + backlight driver. + ++config BACKLIGHT_EZX ++ tristate "Motorola EXZ Backlight Driver (A780/E680/E680i)" ++ depends on BACKLIGHT_DEVICE && PXA_EZX ++ default y ++ help ++ If you have a Motorola A780 or E680(i), say y to enable the ++ backlight driver. ++ ++ +--- linux-2.6.16/drivers/video/backlight/Makefile~ezx-backlight-r1.patch 2006-03-20 06:53:29.000000000 +0100 ++++ linux-2.6.16/drivers/video/backlight/Makefile 2006-06-08 19:33:37.000000000 +0200 +@@ -5,3 +5,5 @@ + obj-$(CONFIG_BACKLIGHT_CORGI) += corgi_bl.o + obj-$(CONFIG_BACKLIGHT_HP680) += hp680_bl.o + obj-$(CONFIG_SHARP_LOCOMO) += locomolcd.o ++obj-$(CONFIG_BACKLIGHT_EZX) += ezx_bl.o ++ +--- /dev/null 2006-06-08 19:04:31.354926880 +0200 ++++ linux-2.6.16/drivers/video/backlight/ezx_bl.c 2006-06-08 20:52:33.000000000 +0200 +@@ -0,0 +1,156 @@ ++/* ++ * Backlight Driver for Motorola A780 and E680(i) GSM Phones. ++ * ++ * Copyright 2006 Vanille Media ++ * ++ * Author: Michael Lauer <mickey@Vanille.de> ++ * ++ * 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/module.h> ++#include <linux/kernel.h> ++#include <linux/init.h> ++#include <linux/platform_device.h> ++#include <linux/spinlock.h> ++#include <linux/fb.h> ++#include <linux/backlight.h> ++ ++#include <asm/arch/pxa-regs.h> ++#include <asm/arch/ezx.h> ++ ++#define EZX_MIN_INTENSITY 00 ++#define EZX_MAX_INTENSITY 50 ++#define EZX_DEFAULT_INTENSITY 25 ++ ++static spinlock_t bl_lock = SPIN_LOCK_UNLOCKED; ++static struct backlight_device *ezx_backlight_device; ++static int last_intensity; ++ ++static int ezxbl_send_intensity(struct backlight_device *bd) ++{ ++ unsigned long flags; ++ int intensity = bd->props->brightness; ++ ++ printk( KERN_DEBUG "ezx_set_intensity to %d\n", intensity ); ++ ++ if (bd->props->power != FB_BLANK_UNBLANK) ++ intensity = 0; ++ if (bd->props->fb_blank != FB_BLANK_UNBLANK) ++ intensity = 0; ++ ++ spin_lock_irqsave(&bl_lock, flags); ++ ++ printk( KERN_DEBUG "backlight last intensity was %d, new intensity is %d\n", last_intensity, intensity ); ++ ++ if ( !last_intensity && intensity ) { ++ printk( KERN_DEBUG "backlight power ON\n" ); ++ PWM_CTRL0 = 2; /* pre-scaler */ ++ PWM_PWDUTY0 = intensity; /* duty cycle */ ++ PWM_PERVAL0 = 49; /* period */ ++ pxa_gpio_mode(GPIO16_PWM0_MD); /* set GPIO16 as alternate function + output */ ++ pxa_set_cken(CKEN0_PWM0, 1); /* clock enable */ ++ } ++ else if ( last_intensity && !intensity ) { ++ printk( KERN_DEBUG "backlight power OFF\n" ); ++ PWM_PWDUTY0 = 0; ++ GAFR0_U &= 0xFFFFFFFC; /* ??? */ ++ pxa_set_cken(CKEN0_PWM0, 0); /* clock disable */ ++ pxa_gpio_mode(GPIO16_PWM0); /* set GPIO16 as input */ ++ } else if ( last_intensity && intensity ) { ++ printk( KERN_DEBUG "backlight adjusting duty cycle\n" ); ++ PWM_PWDUTY0 = intensity; /* duty cycle */ ++ } ++ spin_unlock_irqrestore(&bl_lock, flags); ++ last_intensity = intensity; ++ return 0; ++} ++ ++static int ezxbl_get_intensity(struct backlight_device *bd) ++{ ++ return last_intensity; ++} ++ ++static int ezxbl_set_intensity(struct backlight_device *bd) ++{ ++ return ezxbl_send_intensity(ezx_backlight_device); ++} ++ ++#ifdef CONFIG_PM ++static int ezxbl_suspend(struct platform_device *pdev, pm_message_t state) ++{ ++ //set suspend flag ++ ezxbl_set_intensity(ezx_backlight_device); ++ return 0; ++} ++ ++static int ezxbl_resume(struct platform_device *pdev) ++{ ++ // set resume flag ++ ezxbl_set_intensity(ezx_backlight_device); ++ return 0; ++} ++#else ++#define ezxbl_suspend NULL ++#define ezxbl_resume NULL ++#endif ++ ++static struct backlight_properties ezxbl_data = { ++ .owner = THIS_MODULE, ++ .get_brightness = ezxbl_get_intensity, ++ .max_brightness = EZX_MAX_INTENSITY, ++ .update_status = ezxbl_set_intensity, ++}; ++ ++static int __init ezxbl_probe(struct platform_device *pdev) ++{ ++ ezx_backlight_device = backlight_device_register ("ezx-bl", ++ NULL, &ezxbl_data); ++ if (IS_ERR (ezx_backlight_device)) ++ return PTR_ERR (ezx_backlight_device); ++ ++ ezxbl_data.power = FB_BLANK_UNBLANK; ++ ezxbl_data.brightness = EZX_DEFAULT_INTENSITY; ++ ezxbl_set_intensity(ezx_backlight_device); ++ ++ printk("EZX Backlight Driver Initialized.\n"); ++ return 0; ++} ++ ++static int ezxbl_remove(struct platform_device *pdev) ++{ ++ backlight_device_unregister(ezx_backlight_device); ++ ++ printk("EZX Backlight Driver Unloaded.\n"); ++ return 0; ++} ++ ++static struct platform_driver ezxbl_driver = { ++ .probe = ezxbl_probe, ++ .remove = ezxbl_remove, ++ .suspend = ezxbl_suspend, ++ .resume = ezxbl_resume, ++ .driver = { ++ .name = "ezx-bl", ++ }, ++}; ++ ++static int __init ezxbl_init(void) ++{ ++ return platform_driver_register(&ezxbl_driver); ++} ++ ++static void __exit ezxbl_exit(void) ++{ ++ platform_driver_unregister(&ezxbl_driver); ++} ++ ++module_init(ezxbl_init); ++module_exit(ezxbl_exit); ++ ++MODULE_AUTHOR("Michael Lauer <mickey@Vanille.de>"); ++MODULE_DESCRIPTION("Backlight Driver for Motorola A780|E680(i)"); ++MODULE_LICENSE("GPL"); diff --git a/packages/linux/linux-ezx/pxakbd-fix-directkeys.patch b/packages/linux/linux-ezx/pxakbd-fix-directkeys.patch new file mode 100644 index 0000000000..e1d0d7c26e --- /dev/null +++ b/packages/linux/linux-ezx/pxakbd-fix-directkeys.patch @@ -0,0 +1,15 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- linux-2.6.16/drivers/input/keyboard/pxakbd.c~pxakbd-fix-directkeys 2006-06-09 03:16:35.000000000 +0200 ++++ linux-2.6.16/drivers/input/keyboard/pxakbd.c 2006-06-09 03:21:04.000000000 +0200 +@@ -279,6 +279,7 @@ + KPC_ME | KPC_DE | /* matrix and direct keypad enabled */ + ((pxakbd->pd->matrix.cols-1)<<23) | /* columns */ + ((pxakbd->pd->matrix.rows-1)<<26) | /* rows */ ++ ((pxakbd->pd->direct.num-1)<<6) | /* direct keys */ + KPC_MS_ALL); /* scan all columns */ + + pxa_set_cken(CKEN19_KEYPAD, 1); diff --git a/packages/linux/linux-ezx_2.6.16.13.bb b/packages/linux/linux-ezx_2.6.16.13.bb index 3ca9b9d6a7..f7f9704645 100644 --- a/packages/linux/linux-ezx_2.6.16.13.bb +++ b/packages/linux/linux-ezx_2.6.16.13.bb @@ -6,7 +6,7 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@vanille.de>" LICENSE = "GPL" DEPENDS += "quilt-native" EZX = "ezx6" -PR = "${EZX}-r9" +PR = "${EZX}-r11" inherit kernel @@ -35,12 +35,13 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ \ file://touchscreen-fix-r0.patch;patch=1 \ \ - file://e680-keypad-compile-HACK.patch;patch=1 \ file://e680-disable-boomer-HACK.patch;patch=1 \ \ file://e680-leds-r1.patch;patch=1 \ file://a780-leds-r0.patch;patch=1 \ - file://ezx-backlight-r0.patch;patch=1 \ + file://ezx-backlight-r1.patch;patch=1 \ + file://e680-fix-keypad.patch;patch=1 \ + file://pxakbd-fix-directkeys.patch;patch=1 \ \ file://defconfig-a780 \ file://defconfig-e680" diff --git a/packages/linux/linux-jlime-sh3-2.6.16.20/.mtn2git_empty b/packages/linux/linux-jlime-sh3-2.6.16.20/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-jlime-sh3-2.6.16.20/.mtn2git_empty diff --git a/packages/linux/linux-jlime-sh3-2.6.16.20/Optimize-O1.patch b/packages/linux/linux-jlime-sh3-2.6.16.20/Optimize-O1.patch new file mode 100644 index 0000000000..4b8f1ec53d --- /dev/null +++ b/packages/linux/linux-jlime-sh3-2.6.16.20/Optimize-O1.patch @@ -0,0 +1,22 @@ +--- linux-2.6.16.20/Makefile_orig 2006-06-08 23:14:14.000000000 +0000 ++++ linux-2.6.16.20/Makefile 2006-06-08 23:15:39.000000000 +0000 +@@ -185,8 +185,8 @@ + + HOSTCC = gcc + HOSTCXX = g++ +-HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer +-HOSTCXXFLAGS = -O2 ++HOSTCFLAGS = -Wall -Wstrict-prototypes -O1 -fomit-frame-pointer ++HOSTCXXFLAGS = -O1 + + # Decide whether to build built-in, modular, or both. + # Normally, just do built-in. +@@ -501,7 +501,7 @@ + ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE + CFLAGS += -Os + else +-CFLAGS += -O2 ++CFLAGS += -O1 + endif + + #Add align options if CONFIG_CC_* is not equal to 0 diff --git a/packages/linux/linux-jlime-sh3-2.6.16.20/defconfig_jlime b/packages/linux/linux-jlime-sh3-2.6.16.20/defconfig_jlime new file mode 100644 index 0000000000..452b8d8210 --- /dev/null +++ b/packages/linux/linux-jlime-sh3-2.6.16.20/defconfig_jlime @@ -0,0 +1,1103 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.16-sh +# Thu Jun 8 03:45:30 2006 +# +CONFIG_SUPERH=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_GENERIC_CALIBRATE_DELAY=y + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_POSIX_MQUEUE=y +CONFIG_BSD_PROCESS_ACCT=y +# CONFIG_BSD_PROCESS_ACCT_V3 is not set +CONFIG_SYSCTL=y +# CONFIG_AUDIT is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_UID16=y +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +# CONFIG_EMBEDDED is not set +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=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_SLAB=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +# CONFIG_SLOB is not set + +# +# Loadable module support +# +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +CONFIG_OBSOLETE_MODPARM=y +CONFIG_MODVERSIONS=y +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_KMOD=y + +# +# Block layer +# +# CONFIG_LBD is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +CONFIG_DEFAULT_AS=y +# CONFIG_DEFAULT_DEADLINE is not set +# CONFIG_DEFAULT_CFQ is not set +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="anticipatory" + +# +# System type +# +# CONFIG_SH_SOLUTION_ENGINE is not set +# CONFIG_SH_7751_SOLUTION_ENGINE is not set +# CONFIG_SH_7300_SOLUTION_ENGINE is not set +# CONFIG_SH_73180_SOLUTION_ENGINE is not set +# CONFIG_SH_7751_SYSTEMH is not set +# CONFIG_SH_STB1_HARP is not set +# CONFIG_SH_STB1_OVERDRIVE is not set +CONFIG_SH_HP6XX=y +# CONFIG_SH_CQREEK is not set +# CONFIG_SH_DMIDA is not set +# CONFIG_SH_EC3104 is not set +# CONFIG_SH_SATURN is not set +# CONFIG_SH_DREAMCAST is not set +# CONFIG_SH_CAT68701 is not set +# CONFIG_SH_BIGSUR is not set +# CONFIG_SH_SH2000 is not set +# CONFIG_SH_ADX is not set +# CONFIG_SH_MPC1211 is not set +# CONFIG_SH_SH03 is not set +# CONFIG_SH_SECUREEDGE5410 is not set +# CONFIG_SH_HS7751RVOIP is not set +# CONFIG_SH_RTS7751R2D is not set +# CONFIG_SH_R7780RP is not set +# CONFIG_SH_EDOSK7705 is not set +# CONFIG_SH_SH4202_MICRODEV is not set +# CONFIG_SH_LANDISK is not set +# CONFIG_SH_TITAN is not set +# CONFIG_SH_UNKNOWN is not set + +# +# Processor selection +# +CONFIG_CPU_SH3=y + +# +# SH-2 Processor Support +# +# CONFIG_CPU_SUBTYPE_SH7604 is not set + +# +# SH-3 Processor Support +# +# CONFIG_CPU_SUBTYPE_SH7300 is not set +# CONFIG_CPU_SUBTYPE_SH7705 is not set +# CONFIG_CPU_SUBTYPE_SH7707 is not set +# CONFIG_CPU_SUBTYPE_SH7708 is not set +CONFIG_CPU_SUBTYPE_SH7709=y + +# +# SH-4 Processor Support +# +# CONFIG_CPU_SUBTYPE_SH7750 is not set +# CONFIG_CPU_SUBTYPE_SH7091 is not set +# CONFIG_CPU_SUBTYPE_SH7750R is not set +# CONFIG_CPU_SUBTYPE_SH7750S is not set +# CONFIG_CPU_SUBTYPE_SH7751 is not set +# CONFIG_CPU_SUBTYPE_SH7751R is not set +# CONFIG_CPU_SUBTYPE_SH7760 is not set +# CONFIG_CPU_SUBTYPE_SH4_202 is not set + +# +# ST40 Processor Support +# +# CONFIG_CPU_SUBTYPE_ST40STB1 is not set +# CONFIG_CPU_SUBTYPE_ST40GX1 is not set + +# +# SH-4A Processor Support +# +# CONFIG_CPU_SUBTYPE_SH73180 is not set +# CONFIG_CPU_SUBTYPE_SH7770 is not set +# CONFIG_CPU_SUBTYPE_SH7780 is not set + +# +# Memory management options +# +CONFIG_MMU=y +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +# CONFIG_SPARSEMEM_STATIC is not set +CONFIG_SPLIT_PTLOCK_CPUS=4 + +# +# Cache configuration +# +# CONFIG_SH_DIRECT_MAPPED is not set +# CONFIG_SH_WRITETHROUGH is not set +# CONFIG_SH_OCRAM is not set +CONFIG_MEMORY_START=0x0c000000 +CONFIG_MEMORY_SIZE=0x00400000 + +# +# Processor features +# +CONFIG_CPU_LITTLE_ENDIAN=y +CONFIG_SH_RTC=y +# CONFIG_SH_DSP is not set +CONFIG_SH_ADC=y +CONFIG_CPU_HAS_INTEVT=y +CONFIG_CPU_HAS_PINT_IRQ=y +CONFIG_CPU_HAS_SR_RB=y + +# +# Timer support +# +CONFIG_SH_TMU=y +CONFIG_SH_PCLK_FREQ=22110000 + +# +# CPU Frequency scaling +# +# CONFIG_CPU_FREQ is not set + +# +# DMA support +# +CONFIG_SH_DMA=y +CONFIG_NR_ONCHIP_DMA_CHANNELS=4 +# CONFIG_NR_DMA_CHANNELS_BOOL is not set + +# +# Companion Chips +# +CONFIG_HD6446X_SERIES=y +CONFIG_HD64461=y +# CONFIG_HD64465 is not set +CONFIG_HD64461_IRQ=36 +CONFIG_HD64461_IOBASE=0xb0000000 +CONFIG_HD64461_ENABLER=y + +# +# Kernel features +# +# CONFIG_KEXEC is not set +# CONFIG_PREEMPT is not set +# CONFIG_SMP is not set + +# +# Boot options +# +CONFIG_ZERO_PAGE_OFFSET=0x00001000 +CONFIG_BOOT_LINK_OFFSET=0x00800000 +# CONFIG_UBC_WAKEUP is not set +# CONFIG_CMDLINE_BOOL is not set + +# +# Bus options +# +CONFIG_ISA=y +# CONFIG_PCI is not set + +# +# PCCARD (PCMCIA/CardBus) support +# +CONFIG_PCCARD=y +# CONFIG_PCMCIA_DEBUG is not set +CONFIG_PCMCIA=y +CONFIG_PCMCIA_LOAD_CIS=y +CONFIG_PCMCIA_IOCTL=y + +# +# PC-card bridges +# +# CONFIG_I82365 is not set +# CONFIG_TCIC is not set +CONFIG_HD64461_PCMCIA=y +CONFIG_HD64461_PCMCIA_SOCKETS=1 +CONFIG_PCMCIA_PROBE=y + +# +# PCI Hotplug Support +# + +# +# Executable file formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_FLAT is not set +# CONFIG_BINFMT_MISC is not set + +# +# Power management options (EXPERIMENTAL) +# +CONFIG_PM=y +CONFIG_PM_LEGACY=y +# CONFIG_PM_DEBUG is not set +CONFIG_APM=y + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +CONFIG_NETDEBUG=y +CONFIG_PACKET=y +CONFIG_PACKET_MMAP=y +CONFIG_UNIX=y +CONFIG_XFRM=y +# CONFIG_XFRM_USER is not set +CONFIG_NET_KEY=y +CONFIG_INET=y +# CONFIG_IP_MULTICAST is not set +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +# CONFIG_IP_PNP is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_ARPD is not set +# CONFIG_SYN_COOKIES is not set +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_TUNNEL is not set +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_BIC=y +CONFIG_IPV6=y +# CONFIG_IPV6_PRIVACY is not set +# CONFIG_INET6_AH is not set +# CONFIG_INET6_ESP is not set +# CONFIG_INET6_IPCOMP is not set +# CONFIG_INET6_TUNNEL is not set +# CONFIG_IPV6_TUNNEL is not set +# CONFIG_NETFILTER is not set + +# +# DCCP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_DCCP is not set + +# +# SCTP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_SCTP is not set + +# +# TIPC Configuration (EXPERIMENTAL) +# +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE is not set +# 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 + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +CONFIG_IRDA=m + +# +# IrDA protocols +# +CONFIG_IRLAN=m +CONFIG_IRNET=m +# CONFIG_IRCOMM is not set +# 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 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=m + +# +# Old Serial dongle support +# +# CONFIG_DONGLE_OLD is not set + +# +# FIR device drivers +# +CONFIG_BT=m +CONFIG_BT_L2CAP=m +CONFIG_BT_SCO=m +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_HCIUART=m +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIDTL1=m +CONFIG_BT_HCIBT3C=m +CONFIG_BT_HCIBLUECARD=m +CONFIG_BT_HCIBTUART=m +CONFIG_BT_HCIVHCI=m +CONFIG_IEEE80211=m +# CONFIG_IEEE80211_DEBUG is not set +CONFIG_IEEE80211_CRYPT_WEP=m +# CONFIG_IEEE80211_CRYPT_CCMP is not set +# CONFIG_IEEE80211_CRYPT_TKIP is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +# CONFIG_STANDALONE is not set +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y + +# +# Connector - unified userspace <-> kernelspace linker +# +# CONFIG_CONNECTOR is not set + +# +# Memory Technology Devices (MTD) +# +# CONFIG_MTD is not set + +# +# Parallel port support +# +# CONFIG_PARPORT is not set + +# +# Plug and Play support +# +CONFIG_PNP=y +# CONFIG_PNP_DEBUG is not set + +# +# Protocols +# +# CONFIG_ISAPNP is not set + +# +# 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 is not set +# CONFIG_BLK_DEV_RAM is not set +CONFIG_BLK_DEV_RAM_COUNT=16 +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set + +# +# ATA/ATAPI/MFM/RLL support +# +CONFIG_IDE=y +CONFIG_IDE_MAX_HWIFS=4 +CONFIG_BLK_DEV_IDE=y + +# +# Please see Documentation/ide.txt for help/info on IDE drives +# +# CONFIG_BLK_DEV_IDE_SATA is not set +CONFIG_BLK_DEV_IDEDISK=y +# CONFIG_IDEDISK_MULTI_MODE is not set +CONFIG_BLK_DEV_IDECS=y +# 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=y +# CONFIG_BLK_DEV_IDEPNP is not set +CONFIG_IDE_SH=y +# CONFIG_IDE_ARM is not set +# CONFIG_IDE_CHIPSETS is not set +# CONFIG_BLK_DEV_IDEDMA is not set +# CONFIG_IDEDMA_AUTO is not set +# CONFIG_BLK_DEV_HD is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +# CONFIG_SCSI is not set + +# +# Old CD-ROM drivers (not SCSI, not IDE) +# +# CONFIG_CD_NO_IDESCSI is not set + +# +# Multi-device support (RAID and LVM) +# +# CONFIG_MD is not set + +# +# Fusion MPT device support +# +# CONFIG_FUSION is not set + +# +# IEEE 1394 (FireWire) support +# + +# +# I2O device support +# + +# +# Network device support +# +CONFIG_NETDEVICES=y +CONFIG_DUMMY=y +# CONFIG_BONDING is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set +# CONFIG_NET_SB1000 is not set + +# +# ARCnet devices +# +# CONFIG_ARCNET is not set + +# +# PHY device support +# +# CONFIG_PHYLIB is not set + +# +# Ethernet (10 or 100Mbit) +# +CONFIG_NET_ETHERNET=y +CONFIG_MII=m +# CONFIG_STNIC is not set +# CONFIG_NET_VENDOR_3COM is not set +# CONFIG_NET_VENDOR_SMC is not set +# CONFIG_SMC91X is not set +# CONFIG_NET_VENDOR_RACAL is not set +# CONFIG_AT1700 is not set +# CONFIG_DEPCA is not set +# CONFIG_HP100 is not set +# CONFIG_NET_ISA is not set +# CONFIG_NE2000 is not set +# CONFIG_NET_PCI is not set + +# +# Ethernet (1000 Mbit) +# + +# +# Ethernet (10000 Mbit) +# + +# +# Token Ring devices +# +# CONFIG_TR is not set + +# +# Wireless LAN (non-hamradio) +# +CONFIG_NET_RADIO=y + +# +# Obsolete Wireless cards support (pre-802.11) +# +# CONFIG_STRIP is not set +# CONFIG_ARLAN is not set +# CONFIG_WAVELAN is not set +CONFIG_PCMCIA_WAVELAN=m +CONFIG_PCMCIA_NETWAVE=m + +# +# Wireless 802.11 Frequency Hopping cards support +# +CONFIG_PCMCIA_RAYCS=m + +# +# Wireless 802.11b ISA/PCI cards support +# +CONFIG_HERMES=m +CONFIG_ATMEL=m + +# +# Wireless 802.11b Pcmcia/Cardbus cards support +# +CONFIG_PCMCIA_HERMES=m +CONFIG_PCMCIA_SPECTRUM=m +# CONFIG_AIRO_CS is not set +CONFIG_PCMCIA_ATMEL=m +CONFIG_PCMCIA_WL3501=m +CONFIG_HOSTAP=m +CONFIG_HOSTAP_FIRMWARE=y +CONFIG_HOSTAP_FIRMWARE_NVRAM=y +CONFIG_HOSTAP_CS=m +CONFIG_NET_WIRELESS=y + +# +# PCMCIA network device support +# +CONFIG_NET_PCMCIA=y +CONFIG_PCMCIA_3C589=m +CONFIG_PCMCIA_3C574=m +CONFIG_PCMCIA_FMVJ18X=m +CONFIG_PCMCIA_PCNET=m +CONFIG_PCMCIA_NMCLAN=m +CONFIG_PCMCIA_SMC91C92=m +CONFIG_PCMCIA_XIRC2PS=m +CONFIG_PCMCIA_AXNET=m + +# +# Wan interfaces +# +# CONFIG_WAN is not set +CONFIG_PPP=m +# CONFIG_PPP_MULTILINK is not set +# CONFIG_PPP_FILTER is not set +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_MPPE=m +CONFIG_PPPOE=m +CONFIG_SLIP=m +# CONFIG_SLIP_COMPRESSED is not set +# CONFIG_SLIP_SMART is not set +# CONFIG_SLIP_MODE_SLIP6 is not set +# CONFIG_SHAPER is not set +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set + +# +# ISDN subsystem +# +# CONFIG_ISDN is not set + +# +# Telephony Support +# +# CONFIG_PHONE is not set + +# +# Input device support +# +CONFIG_INPUT=y + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=640 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=240 +# CONFIG_INPUT_JOYDEV is not set +CONFIG_INPUT_TSDEV=y +CONFIG_INPUT_TSDEV_SCREEN_X=640 +CONFIG_INPUT_TSDEV_SCREEN_Y=240 +# CONFIG_INPUT_EVDEV is not set +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +# CONFIG_KEYBOARD_ATKBD is not set +# 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_HP620 is not set +CONFIG_KEYBOARD_HP680=y +# CONFIG_INPUT_MOUSE 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_HP600=y +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +# CONFIG_SERIO_I8042 is not set +# CONFIG_SERIO_SERPORT is not set +# CONFIG_SERIO_RAW is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +# CONFIG_SERIAL_8250 is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_SH_SCI=y +CONFIG_SERIAL_SH_SCI_CONSOLE=y +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=8 + +# +# IPMI +# +# CONFIG_IPMI_HANDLER is not set + +# +# Watchdog Cards +# +# CONFIG_WATCHDOG is not set +# CONFIG_RTC is not set +# CONFIG_GEN_RTC is not set +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set + +# +# Ftape, the floppy tape device driver +# + +# +# PCMCIA character devices +# +# CONFIG_SYNCLINK_CS is not set +# CONFIG_CARDMAN_4000 is not set +# CONFIG_CARDMAN_4040 is not set +# CONFIG_RAW_DRIVER is not set + +# +# TPM devices +# +# CONFIG_TCG_TPM is not set +# CONFIG_TELCLOCK is not set + +# +# I2C support +# +# CONFIG_I2C is not set + +# +# SPI support +# +# CONFIG_SPI is not set +# CONFIG_SPI_MASTER is not set + +# +# Dallas's 1-wire bus +# +# CONFIG_W1 is not set + +# +# Hardware Monitoring support +# +CONFIG_HWMON=y +# CONFIG_HWMON_VID is not set +# CONFIG_SENSORS_F71805F is not set +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Misc devices +# + +# +# Multimedia Capabilities Port drivers +# + +# +# Multimedia devices +# +# CONFIG_VIDEO_DEV is not set + +# +# Digital Video Broadcasting Devices +# +# CONFIG_DVB is not set + +# +# Graphics support +# +CONFIG_FB=y +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_TILEBLITTING is not set +# CONFIG_FB_EPSON1355 is not set +# CONFIG_FB_S1D13XXX is not set +CONFIG_FB_HIT=y +# CONFIG_FB_VIRTUAL is not set + +# +# Console display driver support +# +# CONFIG_MDA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +CONFIG_FONTS=y +# CONFIG_FONT_8x8 is not set +# CONFIG_FONT_8x16 is not set +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +CONFIG_FONT_PEARL_8x8=y +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +# CONFIG_FONT_10x18 is not set + +# +# Logo configuration +# +# CONFIG_LOGO is not set +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set + +# +# Sound +# +CONFIG_SOUND=y + +# +# Advanced Linux Sound Architecture +# +# CONFIG_SND is not set + +# +# Open Sound System +# +CONFIG_SOUND_PRIME=y +# CONFIG_OBSOLETE_OSS_DRIVER is not set +# CONFIG_SOUND_MSNDCLAS is not set +# CONFIG_SOUND_MSNDPIN is not set +CONFIG_SOUND_SH_DAC_AUDIO=y +CONFIG_SOUND_SH_DAC_AUDIO_CHANNEL=1 + +# +# USB support +# +# CONFIG_USB_ARCH_HAS_HCD is not set +# CONFIG_USB_ARCH_HAS_OHCI is not set + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# USB Gadget Support +# +# CONFIG_USB_GADGET is not set + +# +# MMC/SD Card support +# +# CONFIG_MMC is not set + +# +# InfiniBand support +# + +# +# EDAC - error detection and reporting (RAS) (EXPERIMENTAL) +# + +# +# File systems +# +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +CONFIG_EXT3_FS=m +# CONFIG_EXT3_FS_XATTR is not set +CONFIG_JBD=m +# CONFIG_JBD_DEBUG is not set +CONFIG_REISERFS_FS=m +# CONFIG_REISERFS_CHECK is not set +# CONFIG_REISERFS_PROC_INFO is not set +# CONFIG_REISERFS_FS_XATTR is not set +# CONFIG_JFS_FS is not set +# CONFIG_FS_POSIX_ACL is not set +# CONFIG_XFS_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_ROMFS_FS is not set +# CONFIG_INOTIFY is not set +# CONFIG_QUOTA is not set +CONFIG_DNOTIFY=y +CONFIG_AUTOFS_FS=y +CONFIG_AUTOFS4_FS=y +# CONFIG_FUSE_FS is not set + +# +# 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_PROC_KCORE=y +CONFIG_SYSFS=y +# CONFIG_TMPFS is not set +# CONFIG_HUGETLBFS is not set +# CONFIG_HUGETLB_PAGE is not set +CONFIG_RAMFS=y +# CONFIG_RELAYFS_FS is not set +# CONFIG_CONFIGFS_FS is not set + +# +# 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_CRAMFS is not set +# 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 is not set +# CONFIG_NFSD 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 +# CONFIG_9P_FS is not set + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y + +# +# Native Language Support +# +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=m +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=y +CONFIG_NLS_CODEPAGE_852=y +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ASCII=m +CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_2=y +CONFIG_NLS_ISO8859_3=y +CONFIG_NLS_ISO8859_4=y +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_UTF8=m + +# +# Profiling support +# +# CONFIG_PROFILING is not set + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +# CONFIG_MAGIC_SYSRQ is not set +# CONFIG_DEBUG_KERNEL is not set +CONFIG_LOG_BUF_SHIFT=14 +# CONFIG_SH_STANDARD_BIOS is not set +# CONFIG_KGDB is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set + +# +# Cryptographic options +# +CONFIG_CRYPTO=y +# CONFIG_CRYPTO_HMAC is not set +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MD5=m +CONFIG_CRYPTO_SHA1=m +CONFIG_CRYPTO_SHA256=m +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_WP512=m +CONFIG_CRYPTO_TGR192=m +CONFIG_CRYPTO_DES=m +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_AES=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_DEFLATE=m +CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_CRYPTO_CRC32C=m +CONFIG_CRYPTO_TEST=m + +# +# Hardware crypto devices +# + +# +# Library routines +# +CONFIG_CRC_CCITT=y +# CONFIG_CRC16 is not set +CONFIG_CRC32=y +CONFIG_LIBCRC32C=y +CONFIG_ZLIB_INFLATE=m +CONFIG_ZLIB_DEFLATE=m diff --git a/packages/linux/linux-jlime-sh3-2.6.16.20/volatile-setup.c.patch b/packages/linux/linux-jlime-sh3-2.6.16.20/volatile-setup.c.patch new file mode 100644 index 0000000000..48a84b7484 --- /dev/null +++ b/packages/linux/linux-jlime-sh3-2.6.16.20/volatile-setup.c.patch @@ -0,0 +1,11 @@ +--- linux-2.6.16.20/arch/sh/cchips/hd6446x/hd64461/setup.c_orig 2006-06-09 00:49:01.000000000 +0000 ++++ linux-2.6.16.20/arch/sh/cchips/hd6446x/hd64461/setup.c 2006-06-09 00:49:16.000000000 +0000 +@@ -79,7 +79,7 @@ + .end = end_hd64461_irq, + }; + +-static irqreturn_t hd64461_interrupt(int irq, void *dev_id, struct pt_regs *regs) ++static irqreturn_t hd64461_interrupt(int irq, void *dev_id, volatile struct pt_regs *regs) + { + printk(KERN_INFO + "HD64461: spurious interrupt, nirr: 0x%x nimr: 0x%x\n", diff --git a/packages/linux/linux-jlime-sh3-2.6.16.20/volatile-signal.c.patch b/packages/linux/linux-jlime-sh3-2.6.16.20/volatile-signal.c.patch new file mode 100644 index 0000000000..0a8178c4c6 --- /dev/null +++ b/packages/linux/linux-jlime-sh3-2.6.16.20/volatile-signal.c.patch @@ -0,0 +1,65 @@ +--- linux-2.6.16.20/arch/sh/kernel/signal.c_orig 2006-06-08 23:52:12.000000000 +0000 ++++ linux-2.6.16.20/arch/sh/kernel/signal.c 2006-06-08 23:58:27.000000000 +0000 +@@ -33,7 +33,7 @@ + + #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP))) + +-asmlinkage int do_signal(struct pt_regs *regs, sigset_t *oldset); ++asmlinkage int do_signal(volatile struct pt_regs *regs, sigset_t *oldset); + + /* + * Atomically swap in the new signal mask, and wait for a signal. +@@ -41,7 +41,7 @@ + asmlinkage int + sys_sigsuspend(old_sigset_t mask, + unsigned long r5, unsigned long r6, unsigned long r7, +- struct pt_regs regs) ++ volatile struct pt_regs regs) + { + sigset_t saveset; + +@@ -64,7 +64,7 @@ + asmlinkage int + sys_rt_sigsuspend(sigset_t *unewset, size_t sigsetsize, + unsigned long r6, unsigned long r7, +- struct pt_regs regs) ++ volatile struct pt_regs regs) + { + sigset_t saveset, newset; + +@@ -92,7 +92,7 @@ + + asmlinkage int + sys_sigaction(int sig, const struct old_sigaction __user *act, +- struct old_sigaction __user *oact) ++ volatile struct old_sigaction __user *oact) + { + struct k_sigaction new_ka, old_ka; + int ret; +@@ -125,7 +125,7 @@ + asmlinkage int + sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss, + unsigned long r6, unsigned long r7, +- struct pt_regs regs) ++ volatile struct pt_regs regs) + { + return do_sigaltstack(uss, uoss, regs.regs[15]); + } +@@ -232,7 +232,7 @@ + + asmlinkage int sys_sigreturn(unsigned long r4, unsigned long r5, + unsigned long r6, unsigned long r7, +- struct pt_regs regs) ++ volatile struct pt_regs regs) + { + struct sigframe __user *frame = (struct sigframe __user *)regs.regs[15]; + sigset_t set; +@@ -265,7 +265,7 @@ + + asmlinkage int sys_rt_sigreturn(unsigned long r4, unsigned long r5, + unsigned long r6, unsigned long r7, +- struct pt_regs regs) ++ volatile struct pt_regs regs) + { + struct rt_sigframe __user *frame = (struct rt_sigframe __user *)regs.regs[15]; + sigset_t set; diff --git a/packages/linux/linux-jlime-sh3-2.6.16.20/volatile-sys_sh.c.patch b/packages/linux/linux-jlime-sh3-2.6.16.20/volatile-sys_sh.c.patch new file mode 100644 index 0000000000..f90fe7fff4 --- /dev/null +++ b/packages/linux/linux-jlime-sh3-2.6.16.20/volatile-sys_sh.c.patch @@ -0,0 +1,11 @@ +--- linux-2.6.16.20/arch/sh/kernel/sys_sh.c_orig 2006-06-09 00:00:18.000000000 +0000 ++++ linux-2.6.16.20/arch/sh/kernel/sys_sh.c 2006-06-09 00:02:24.000000000 +0000 +@@ -31,7 +31,7 @@ + */ + asmlinkage int sys_pipe(unsigned long r4, unsigned long r5, + unsigned long r6, unsigned long r7, +- struct pt_regs regs) ++ volatile struct pt_regs regs) + { + int fd[2]; + int error; diff --git a/packages/linux/linux-jlime-sh3-2.6.16.20/volatile-traps.c.patch b/packages/linux/linux-jlime-sh3-2.6.16.20/volatile-traps.c.patch new file mode 100644 index 0000000000..dd432f58e5 --- /dev/null +++ b/packages/linux/linux-jlime-sh3-2.6.16.20/volatile-traps.c.patch @@ -0,0 +1,47 @@ +--- linux-2.6.16.20/arch/sh/kernel/traps.c_orig 2006-06-09 00:03:58.000000000 +0000 ++++ linux-2.6.16.20/arch/sh/kernel/traps.c 2006-06-09 00:07:04.000000000 +0000 +@@ -51,7 +51,7 @@ + #define DO_ERROR(trapnr, signr, str, name, tsk) \ + asmlinkage void do_##name(unsigned long r4, unsigned long r5, \ + unsigned long r6, unsigned long r7, \ +- struct pt_regs regs) \ ++ volatile struct pt_regs regs) \ + { \ + unsigned long error_code; \ + \ +@@ -89,7 +89,7 @@ + + DEFINE_SPINLOCK(die_lock); + +-void die(const char * str, struct pt_regs * regs, long err) ++void die(const char * str, volatile struct pt_regs * regs, long err) + { + static int die_counter; + +@@ -102,7 +102,7 @@ + do_exit(SIGSEGV); + } + +-static inline void die_if_kernel(const char * str, struct pt_regs * regs, long err) ++static inline void die_if_kernel(const char * str, volatile struct pt_regs * regs, long err) + { + if (!user_mode(regs)) + die(str, regs, err); +@@ -117,7 +117,7 @@ + * - other kernel errors are bad + * - return 0 if fixed-up, -EFAULT if non-fatal (to the kernel) fault + */ +-static int die_if_no_fixup(const char * str, struct pt_regs * regs, long err) ++static int die_if_no_fixup(const char * str, volatile struct pt_regs * regs, long err) + { + if (!user_mode(regs)) + { +@@ -581,7 +581,7 @@ + + asmlinkage void do_exception_error(unsigned long r4, unsigned long r5, + unsigned long r6, unsigned long r7, +- struct pt_regs regs) ++ volatile struct pt_regs regs) + { + long ex; + asm volatile("stc r2_bank, %0" : "=r" (ex)); diff --git a/packages/linux/linux-jlime-sh3_2.6.16.20.bb b/packages/linux/linux-jlime-sh3_2.6.16.20.bb new file mode 100644 index 0000000000..a8c40e4969 --- /dev/null +++ b/packages/linux/linux-jlime-sh3_2.6.16.20.bb @@ -0,0 +1,32 @@ +SECTION = "kernel" +DESCRIPTION = "Linux kernel for Hitachi SH3 based Jornada 6xx" +LICENSE = "GPL" +PR = "r0" + +COMPATIBLE_HOST = "sh.*-linux" +COMPATIBLE_MACHINE = 'jornada6xx' + +SRC_URI = "http://www.jlime.com/downloads/Releases/donkey/kernels/6xx/sources/jlime-2.6.16.20-patched.tar.gz \ + file://defconfig_jlime \ + file://volatile-traps.c.patch;patch=1 \ + file://volatile-signal.c.patch;patch=1 \ + file://volatile-sys_sh.c.patch;patch=1 \ + file://volatile-setup.c.patch;patch=1 \ + file://Optimize-O1.patch;patch=1" + +S = "${WORKDIR}/linux-${PV}" + +inherit kernel + +ARCH = "sh" +KERNEL_IMAGETYPE = "zImage" +FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*" + +do_configure_prepend() { + install -m 0644 ${WORKDIR}/defconfig_jlime ${S}/.config +} + +do_deploy() { + install -d ${DEPLOY_DIR_IMAGE} + install -m 0644 arch/$(ARCH)/boot/$(KERNEL_IMAGETYPE) $(DEPLOY_DIR)/images/$(KERNEL_IMAGETYPE) +} diff --git a/packages/linux/logicpd-pxa270-2.6.17-rc5/defconfig b/packages/linux/logicpd-pxa270-2.6.17-rc5/defconfig new file mode 100644 index 0000000000..212e38078e --- /dev/null +++ b/packages/linux/logicpd-pxa270-2.6.17-rc5/defconfig @@ -0,0 +1,927 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.17-rc5 +# Tue May 30 12:40:27 2006 +# +CONFIG_ARM=y +CONFIG_MMU=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ARCH_MTD_XIP=y +CONFIG_VECTORS_BASE=0xffff0000 + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +# CONFIG_POSIX_MQUEUE is not set +# CONFIG_BSD_PROCESS_ACCT is not set +CONFIG_SYSCTL=y +# CONFIG_AUDIT is not set +# CONFIG_IKCONFIG is not set +# CONFIG_RELAY is not set +CONFIG_INITRAMFS_SOURCE="" +CONFIG_UID16=y +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +# CONFIG_EMBEDDED is not set +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SHMEM=y +CONFIG_SLAB=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +# CONFIG_SLOB is not set +CONFIG_OBSOLETE_INTERMODULE=y + +# +# Loadable module support +# +CONFIG_MODULES=y +# CONFIG_MODULE_UNLOAD is not set +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +# CONFIG_KMOD is not set + +# +# Block layer +# +# CONFIG_BLK_DEV_IO_TRACE is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +CONFIG_DEFAULT_AS=y +# CONFIG_DEFAULT_DEADLINE is not set +# CONFIG_DEFAULT_CFQ is not set +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="anticipatory" + +# +# 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_EP93XX 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_IXP23XX is not set +# CONFIG_ARCH_L7200 is not set +CONFIG_ARCH_PXA=y +# 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 is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_AT91RM9200 is not set + +# +# Intel PXA2xx Implementations +# +# CONFIG_ARCH_LUBBOCK is not set +CONFIG_MACH_LOGICPD_PXA270=y +# CONFIG_MACH_MAINSTONE is not set +# CONFIG_ARCH_PXA_IDP is not set +# CONFIG_PXA_SHARPSL is not set +CONFIG_PXA27x=y +CONFIG_IWMMXT=y + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_XSCALE=y +CONFIG_CPU_32v5=y +CONFIG_CPU_ABRT_EV5T=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_TLB_V4WBI=y + +# +# Processor Features +# +# CONFIG_ARM_THUMB is not set +CONFIG_XSCALE_PMU=y + +# +# Bus support +# + +# +# PCCARD (PCMCIA/CardBus) support +# +# CONFIG_PCCARD is not set + +# +# Kernel Features +# +# CONFIG_PREEMPT is not set +# CONFIG_NO_IDLE_HZ is not set +CONFIG_HZ=100 +# CONFIG_AEABI is not set +# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +# CONFIG_SPARSEMEM_STATIC is not set +CONFIG_SPLIT_PTLOCK_CPUS=4096 +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=jffs2 ip=dhcp console=ttyS0,115200 mem=64M" +#CONFIG_CMDLINE="root=/dev/nfs nfsroot=192.168.3.5:/opt/nfs-exports/pxa-nfs-root ip=dhcp console=ttyS0,115200 mem=64M" +# CONFIG_XIP_KERNEL is not set + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +CONFIG_FPE_NWFPE=y +# CONFIG_FPE_NWFPE_XP is not set +# CONFIG_FPE_FASTFPE is not set + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_AOUT is not set +# CONFIG_BINFMT_MISC is not set +# CONFIG_ARTHUR is not set + +# +# Power management options +# +# CONFIG_PM is not set +# CONFIG_APM is not set + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +# CONFIG_NETDEBUG is not set +# CONFIG_PACKET is not set +CONFIG_UNIX=y +# CONFIG_NET_KEY is not set +CONFIG_INET=y +# CONFIG_IP_MULTICAST is not set +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +# CONFIG_IP_PNP_BOOTP is not set +# CONFIG_IP_PNP_RARP is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_ARPD is not set +# CONFIG_SYN_COOKIES is not set +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_XFRM_TUNNEL is not set +# CONFIG_INET_TUNNEL is not set +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_BIC=y +# CONFIG_IPV6 is not set +# CONFIG_INET6_XFRM_TUNNEL is not set +# CONFIG_INET6_TUNNEL is not set +# CONFIG_NETFILTER is not set + +# +# DCCP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_DCCP is not set + +# +# SCTP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_SCTP is not set + +# +# TIPC Configuration (EXPERIMENTAL) +# +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE is not set +# 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 + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +# CONFIG_IRDA is not set +# CONFIG_BT is not set +# CONFIG_IEEE80211 is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +# CONFIG_FW_LOADER is not set +# CONFIG_DEBUG_DRIVER is not set + +# +# Connector - unified userspace <-> kernelspace linker +# +# CONFIG_CONNECTOR is not set + +# +# Memory Technology Devices (MTD) +# +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +# CONFIG_MTD_CONCAT is not set +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 +# CONFIG_RFD_FTL is not set + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=y +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_GEN_PROBE=y +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=y +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 is not set +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_OTP is not set +CONFIG_MTD_CFI_INTELEXT=y +# CONFIG_MTD_CFI_AMDSTD is not set +# CONFIG_MTD_CFI_STAA is not set +CONFIG_MTD_CFI_UTIL=y +# 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 is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_PHYSMAP is not set +CONFIG_MTD_LOGICPD_PXA270=y +# CONFIG_MTD_ARM_INTEGRATOR is not set +# CONFIG_MTD_SHARP_SL is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# 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 is not set + +# +# OneNAND Flash Device Drivers +# +# CONFIG_MTD_ONENAND is not set + +# +# Parallel port support +# +# CONFIG_PARPORT is not set + +# +# Plug and Play support +# + +# +# Block devices +# +CONFIG_BLK_DEV_LOGICPD_CF=y +# CONFIG_BLK_DEV_COW_COMMON is not set +# CONFIG_BLK_DEV_LOOP is not set +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_RAM is not set +# CONFIG_BLK_DEV_INITRD is not set +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set + +# +# ATA/ATAPI/MFM/RLL support +# +CONFIG_IDE=y +CONFIG_BLK_DEV_IDE=y + +# +# Please see Documentation/ide.txt for help/info on IDE drives +# +# CONFIG_BLK_DEV_IDE_SATA is not set +CONFIG_BLK_DEV_IDEDISK=y +# CONFIG_IDEDISK_MULTI_MODE is not set +# 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 + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +# CONFIG_SCSI is not set + +# +# Multi-device support (RAID and LVM) +# +# CONFIG_MD is not set + +# +# Fusion MPT device support +# +# CONFIG_FUSION is not set + +# +# IEEE 1394 (FireWire) support +# + +# +# I2O device support +# + +# +# 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 +# +# CONFIG_PHYLIB is not set + +# +# Ethernet (10 or 100Mbit) +# +CONFIG_NET_ETHERNET=y +CONFIG_MII=y +CONFIG_SMC91X=y +# CONFIG_DM9000 is not set + +# +# Ethernet (1000 Mbit) +# + +# +# Ethernet (10000 Mbit) +# + +# +# Token Ring devices +# + +# +# Wireless LAN (non-hamradio) +# +# CONFIG_NET_RADIO 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_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set + +# +# ISDN subsystem +# +# CONFIG_ISDN is not set + +# +# Input device support +# +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_JOYDEV is not set +# CONFIG_INPUT_TSDEV is not set +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_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TOUCHSCREEN is not set +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +# CONFIG_SERIO_SERPORT is not set +CONFIG_SERIO_LIBPS2=y +# CONFIG_SERIO_RAW is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +# CONFIG_SERIAL_8250 is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_PXA=y +CONFIG_SERIAL_PXA_CONSOLE=y +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=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 is not set +# CONFIG_NVRAM is not set +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set + +# +# Ftape, the floppy tape device driver +# +# CONFIG_RAW_DRIVER is not set + +# +# TPM devices +# +# CONFIG_TCG_TPM is not set +# CONFIG_TELCLOCK is not set + +# +# I2C support +# +# CONFIG_I2C is not set + +# +# SPI support +# +# CONFIG_SPI is not set +# CONFIG_SPI_MASTER is not set + +# +# Dallas's 1-wire bus +# +# CONFIG_W1 is not set + +# +# Hardware Monitoring support +# +CONFIG_HWMON=y +# CONFIG_HWMON_VID is not set +# CONFIG_SENSORS_F71805F is not set +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Misc devices +# + +# +# LED devices +# +# CONFIG_NEW_LEDS is not set + +# +# LED drivers +# + +# +# LED Triggers +# + +# +# Multimedia devices +# +# CONFIG_VIDEO_DEV is not set +CONFIG_VIDEO_V4L2=y + +# +# Digital Video Broadcasting Devices +# +# CONFIG_DVB is not set + +# +# Graphics support +# +CONFIG_FB=y +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_MACMODES is not set +CONFIG_FB_FIRMWARE_EDID=y +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_TILEBLITTING is not set +# CONFIG_FB_S1D13XXX is not set +CONFIG_FB_PXA=y +# CONFIG_FB_PXA_PARAMETERS is not set +# CONFIG_FB_PXA_LPD_LQ64D343 is not set +# CONFIG_FB_PXA_LPD_LQ035Q7DB02 is not set +# CONFIG_FB_PXA_LPD_LQ057Q3DC02 is not set +CONFIG_FB_PXA_LPD_LQ10D368=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_FRAMEBUFFER_CONSOLE_ROTATION is not set +# CONFIG_FONTS is not set +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y + +# +# Logo configuration +# +CONFIG_LOGO=y +CONFIG_LOGO_LINUX_MONO=y +CONFIG_LOGO_LINUX_VGA16=y +CONFIG_LOGO_LINUX_CLUT224=y +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set + +# +# Sound +# +# CONFIG_SOUND is not set + +# +# USB support +# +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +# CONFIG_USB_ARCH_HAS_EHCI is not set +# CONFIG_USB is not set + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# USB Gadget Support +# +# CONFIG_USB_GADGET is not set + +# +# MMC/SD Card support +# +# CONFIG_MMC is not set + +# +# Real Time Clock +# +CONFIG_RTC_LIB=y +# CONFIG_RTC_CLASS is not set + +# +# File systems +# +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +# CONFIG_EXT3_FS is not set +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +# CONFIG_FS_POSIX_ACL is not set +# CONFIG_XFS_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_ROMFS_FS is not set +CONFIG_INOTIFY=y +# CONFIG_QUOTA is not set +CONFIG_DNOTIFY=y +# CONFIG_AUTOFS_FS is not set +# CONFIG_AUTOFS4_FS is not set +# CONFIG_FUSE_FS is not set + +# +# 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_TMPFS is not set +# CONFIG_HUGETLB_PAGE is not set +CONFIG_RAMFS=y +# CONFIG_CONFIGFS_FS is not set + +# +# 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 is not set +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_SUMMARY 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 +# 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_V3_ACL is not set +# CONFIG_NFS_V4 is not set +# CONFIG_NFS_DIRECTIO is not set +# CONFIG_NFSD is not set +CONFIG_ROOT_NFS=y +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +# CONFIG_RPCSEC_GSS_KRB5 is not set +# 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 +# CONFIG_9P_FS is not set + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y + +# +# Native Language Support +# +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +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 is not set + +# +# Profiling support +# +# CONFIG_PROFILING is not set + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +CONFIG_MAGIC_SYSRQ=y +CONFIG_DEBUG_KERNEL=y +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_DETECT_SOFTLOCKUP=y +# CONFIG_SCHEDSTATS is not set +# CONFIG_DEBUG_SLAB is not set +# CONFIG_DEBUG_MUTEXES 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=y +CONFIG_DEBUG_INFO=y +# CONFIG_DEBUG_FS is not set +# CONFIG_DEBUG_VM is not set +CONFIG_FRAME_POINTER=y +# CONFIG_UNWIND_INFO is not set +CONFIG_FORCED_INLINING=y +# CONFIG_RCU_TORTURE_TEST is not set +CONFIG_DEBUG_USER=y +# 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 is not set + +# +# Hardware crypto devices +# + +# +# Library routines +# +# CONFIG_CRC_CCITT is not set +# CONFIG_CRC16 is not set +CONFIG_CRC32=y +# CONFIG_LIBCRC32C is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y diff --git a/packages/linux/logicpd-pxa270_2.6.17-rc5.bb b/packages/linux/logicpd-pxa270_2.6.17-rc5.bb index 39557d3149..b380632740 100644 --- a/packages/linux/logicpd-pxa270_2.6.17-rc5.bb +++ b/packages/linux/logicpd-pxa270_2.6.17-rc5.bb @@ -5,7 +5,9 @@ MAINTAINER = "Shane Volpe <shane.volpe@gmail.com>" PR = "r1" SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.17-rc5.tar.bz2 \ - file://linux-2.6.17-rc5.patch;pnum=0;patch=1" + file://linux-2.6.17-rc5.patch;pnum=0;patch=1 \ + file://defconfig" + S = "${WORKDIR}/linux-2.6.17-rc5" @@ -18,7 +20,9 @@ ARCH = "arm" KERNEL_IMAGETYPE = "zImage" do_configure_prepend() { - install -m 0644 ${S}/arch/arm/configs/lpd270_defconfig ${S}/.config +# install -m 0644 ${S}/arch/arm/configs/lpd270_defconfig ${S}/.config + install -m 0644 ${WORKDIR}/defconfig ${S}/.config + } do_deploy() { diff --git a/packages/sylpheed/sylpheed_2.2.4.bb b/packages/sylpheed/sylpheed_2.2.4.bb index 315f46ea86..e1ede2b302 100644 --- a/packages/sylpheed/sylpheed_2.2.4.bb +++ b/packages/sylpheed/sylpheed_2.2.4.bb @@ -14,7 +14,7 @@ SRC_URI = "http://sylpheed.good-day.net/sylpheed/v2.2/sylpheed-${PV}.tar.bz2 \ FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications" FILES_${PN}-doc += "${datadir}" -EXTRA_OECONF = "--enable-gnutls" +EXTRA_OECONF = "--disable-ssl --enable-gnutls" CFLAGS += "-D_GNU_SOURCE" diff --git a/packages/sylpheed/sylpheed_2.2.5.bb b/packages/sylpheed/sylpheed_2.2.5.bb index 315f46ea86..e1ede2b302 100644 --- a/packages/sylpheed/sylpheed_2.2.5.bb +++ b/packages/sylpheed/sylpheed_2.2.5.bb @@ -14,7 +14,7 @@ SRC_URI = "http://sylpheed.good-day.net/sylpheed/v2.2/sylpheed-${PV}.tar.bz2 \ FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications" FILES_${PN}-doc += "${datadir}" -EXTRA_OECONF = "--enable-gnutls" +EXTRA_OECONF = "--disable-ssl --enable-gnutls" CFLAGS += "-D_GNU_SOURCE" diff --git a/packages/vim/vim-7.0/.mtn2git_empty b/packages/vim/vim-7.0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/vim/vim-7.0/.mtn2git_empty diff --git a/packages/vim/vim-7.0/configure.patch b/packages/vim/vim-7.0/configure.patch new file mode 100644 index 0000000000..52677bcfe8 --- /dev/null +++ b/packages/vim/vim-7.0/configure.patch @@ -0,0 +1,1601 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +Index: src/acinclude.m4 +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ src/acinclude.m4 2006-06-07 18:00:45.249541424 +0200 +@@ -0,0 +1,223 @@ ++dnl ++dnl Get the cflags and libraries from the gtk-config script ++dnl ++ ++dnl define an autoconf function to check for a specified version of GTK, and ++dnl try to compile/link a GTK program. this gets used once for GTK 1.1.16. ++dnl ++dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) ++dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS ++dnl ++AC_DEFUN(AM_PATH_GTK, ++[ ++ if test "X$GTK_CONFIG" != "Xno" -o "X$PKG_CONFIG" != "Xno"; then ++ { ++ min_gtk_version=ifelse([$1], ,0.99.7,$1) ++ AC_MSG_CHECKING(for GTK - version >= $min_gtk_version) ++ no_gtk="" ++ if (test "X$SKIP_GTK2" != "XYES" -a "X$PKG_CONFIG" != "Xno") \ ++ && $PKG_CONFIG --exists gtk+-2.0; then ++ { ++ dnl We should be using PKG_CHECK_MODULES() instead of this hack. ++ dnl But I guess the dependency on pkgconfig.m4 is not wanted or ++ dnl something like that. ++ GTK_CFLAGS=`$PKG_CONFIG --cflags gtk+-2.0` ++ GTK_LIBS=`$PKG_CONFIG --libs gtk+-2.0` ++ gtk_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ ++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` ++ gtk_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ ++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` ++ gtk_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ ++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` ++ } ++ elif test "X$GTK_CONFIG" != "Xno"; then ++ { ++ GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags` ++ GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs` ++ gtk_major_version=`$GTK_CONFIG $gtk_config_args --version | \ ++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` ++ gtk_minor_version=`$GTK_CONFIG $gtk_config_args --version | \ ++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` ++ gtk_micro_version=`$GTK_CONFIG $gtk_config_args --version | \ ++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` ++ } ++ else ++ no_gtk=yes ++ fi ++ ++ if test "x$enable_gtktest" = "xyes" -a "x$no_gtk" = "x"; then ++ { ++ ac_save_CFLAGS="$CFLAGS" ++ ac_save_LIBS="$LIBS" ++ CFLAGS="$CFLAGS $GTK_CFLAGS" ++ LIBS="$LIBS $GTK_LIBS" ++ ++ dnl ++ dnl Now check if the installed GTK is sufficiently new. (Also sanity ++ dnl checks the results of gtk-config to some extent ++ dnl ++ rm -f conf.gtktest ++ AC_TRY_RUN([ ++#include <gtk/gtk.h> ++#include <stdio.h> ++ ++int ++main () ++{ ++int major, minor, micro; ++char *tmp_version; ++ ++system ("touch conf.gtktest"); ++ ++/* HP/UX 9 (%@#!) writes to sscanf strings */ ++tmp_version = g_strdup("$min_gtk_version"); ++if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { ++ printf("%s, bad version string\n", "$min_gtk_version"); ++ exit(1); ++ } ++ ++if ((gtk_major_version > major) || ++ ((gtk_major_version == major) && (gtk_minor_version > minor)) || ++ ((gtk_major_version == major) && (gtk_minor_version == minor) && ++ (gtk_micro_version >= micro))) ++{ ++ return 0; ++} ++return 1; ++} ++],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ } ++ fi ++ if test "x$no_gtk" = x ; then ++ if test "x$enable_gtktest" = "xyes"; then ++ AC_MSG_RESULT(yes; found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version) ++ else ++ AC_MSG_RESULT(found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version) ++ fi ++ ifelse([$2], , :, [$2]) ++ else ++ { ++ AC_MSG_RESULT(no) ++ GTK_CFLAGS="" ++ GTK_LIBS="" ++ ifelse([$3], , :, [$3]) ++ } ++ fi ++ } ++ else ++ GTK_CFLAGS="" ++ GTK_LIBS="" ++ ifelse([$3], , :, [$3]) ++ fi ++ AC_SUBST(GTK_CFLAGS) ++ AC_SUBST(GTK_LIBS) ++ rm -f conf.gtktest ++]) ++ ++dnl --------------------------------------------------------------------------- ++dnl gnome ++dnl --------------------------------------------------------------------------- ++AC_DEFUN([GNOME_INIT_HOOK], ++[ ++ AC_SUBST(GNOME_LIBS) ++ AC_SUBST(GNOME_LIBDIR) ++ AC_SUBST(GNOME_INCLUDEDIR) ++ ++ AC_ARG_WITH(gnome-includes, ++ [ --with-gnome-includes=DIR Specify location of GNOME headers], ++ [CFLAGS="$CFLAGS -I$withval"] ++ ) ++ ++ AC_ARG_WITH(gnome-libs, ++ [ --with-gnome-libs=DIR Specify location of GNOME libs], ++ [LDFLAGS="$LDFLAGS -L$withval" gnome_prefix=$withval] ++ ) ++ ++ AC_ARG_WITH(gnome, ++ [ --with-gnome Specify prefix for GNOME files], ++ if test x$withval = xyes; then ++ want_gnome=yes ++ ifelse([$1], [], :, [$1]) ++ else ++ if test "x$withval" = xno; then ++ want_gnome=no ++ else ++ want_gnome=yes ++ LDFLAGS="$LDFLAGS -L$withval/lib" ++ CFLAGS="$CFLAGS -I$withval/include" ++ gnome_prefix=$withval/lib ++ fi ++ fi, ++ want_gnome=yes) ++ ++ if test "x$want_gnome" = xyes -a "0$gtk_major_version" -ge 2; then ++ { ++ AC_MSG_CHECKING(for libgnomeui-2.0) ++ if $PKG_CONFIG --exists libgnomeui-2.0; then ++ AC_MSG_RESULT(yes) ++ GNOME_LIBS=`$PKG_CONFIG --libs-only-l libgnomeui-2.0` ++ GNOME_LIBDIR=`$PKG_CONFIG --libs-only-L libgnomeui-2.0` ++ GNOME_INCLUDEDIR=`$PKG_CONFIG --cflags libgnomeui-2.0` ++ $1 ++ else ++ AC_MSG_RESULT(not found) ++ if test "x$2" = xfail; then ++ AC_MSG_ERROR(Could not find libgnomeui-2.0 via pkg-config) ++ fi ++ fi ++ } ++ elif test "x$want_gnome" = xyes; then ++ { ++ AC_PATH_PROG(GNOME_CONFIG,gnome-config,no) ++ if test "$GNOME_CONFIG" = "no"; then ++ no_gnome_config="yes" ++ else ++ AC_MSG_CHECKING(if $GNOME_CONFIG works) ++ if $GNOME_CONFIG --libs-only-l gnome >/dev/null 2>&1; then ++ AC_MSG_RESULT(yes) ++ GNOME_LIBS="`$GNOME_CONFIG --libs-only-l gnome gnomeui`" ++ GNOME_LIBDIR="`$GNOME_CONFIG --libs-only-L gnorba gnomeui`" ++ GNOME_INCLUDEDIR="`$GNOME_CONFIG --cflags gnorba gnomeui`" ++ $1 ++ else ++ AC_MSG_RESULT(no) ++ no_gnome_config="yes" ++ fi ++ fi ++ ++ if test x$exec_prefix = xNONE; then ++ if test x$prefix = xNONE; then ++ gnome_prefix=$ac_default_prefix/lib ++ else ++ gnome_prefix=$prefix/lib ++ fi ++ else ++ gnome_prefix=`eval echo \`echo $libdir\`` ++ fi ++ ++ if test "$no_gnome_config" = "yes"; then ++ AC_MSG_CHECKING(for gnomeConf.sh file in $gnome_prefix) ++ if test -f $gnome_prefix/gnomeConf.sh; then ++ AC_MSG_RESULT(found) ++ echo "loading gnome configuration from" \ ++ "$gnome_prefix/gnomeConf.sh" ++ . $gnome_prefix/gnomeConf.sh ++ $1 ++ else ++ AC_MSG_RESULT(not found) ++ if test x$2 = xfail; then ++ AC_MSG_ERROR(Could not find the gnomeConf.sh file that is generated by gnome-libs install) ++ fi ++ fi ++ fi ++ } ++ fi ++]) ++ ++AC_DEFUN([GNOME_INIT],[ ++ GNOME_INIT_HOOK([],fail) ++]) ++ ++ +Index: src/configure.in +=================================================================== +--- src.orig/configure.in 2006-05-04 12:46:11.000000000 +0200 ++++ src/configure.in 2006-06-07 18:09:16.326845864 +0200 +@@ -4,7 +4,7 @@ + dnl Should also work with autoconf 2.54 and later. + + AC_INIT(vim.h) +-AC_CONFIG_HEADER(auto/config.h:config.h.in) ++AC_CONFIG_HEADER(config.h:config.h.in) + + dnl Being able to run configure means the system is Unix (compatible). + AC_DEFINE(UNIX) +@@ -49,10 +49,10 @@ + + dnl If configure thinks we are cross compiling, there is probably something + dnl wrong with the CC or CFLAGS settings, give an understandable error message +-if test "$cross_compiling" = yes; then +- AC_MSG_ERROR([cannot compile a simple program, check CC and CFLAGS +- (cross compiling doesn't work)]) +-fi ++dnl if test "$cross_compiling" = yes; then ++dnl AC_MSG_ERROR([cannot compile a simple program, check CC and CFLAGS ++dnl (cross compiling doesn't work)]) ++dnl fi + + dnl gcc-cpp has the wonderful -MM option to produce nicer dependencies. + dnl But gcc 3.1 changed the meaning! See near the end. +@@ -330,6 +330,17 @@ + compiledby=""; AC_MSG_RESULT(no)) + AC_SUBST(compiledby) + ++dnl on FreeBSD tclsh is a silly script, look for tclsh8.0 or tclsh8.2 ++AC_MSG_CHECKING(--with-x argument) ++AC_ARG_WITH(x, [ --with-x= use X], ++[ ++if test X"$withval" = Xno; then ++ no_x=yes ++fi ++], ++AC_MSG_RESULT($withval), ++AC_MSG_RESULT(yes)) ++ + AC_MSG_CHECKING(--disable-xsmp argument) + AC_ARG_ENABLE(xsmp, + [ --disable-xsmp Disable XSMP session management], +@@ -514,7 +525,7 @@ + LDFLAGS="$perlldflags $LDFLAGS" + fi + PERL_LIBS=$perllibs +- PERL_SRC="auto/if_perl.c if_perlsfio.c" ++ PERL_SRC="if_perl.c if_perlsfio.c" + PERL_OBJ="objects/if_perl.o objects/if_perlsfio.o" + PERL_PRO="if_perl.pro if_perlsfio.pro" + AC_DEFINE(FEAT_PERL) +@@ -1323,241 +1334,6 @@ + SKIP_CARBON=YES + fi + +-dnl +-dnl Get the cflags and libraries from the gtk-config script +-dnl +- +-dnl define an autoconf function to check for a specified version of GTK, and +-dnl try to compile/link a GTK program. this gets used once for GTK 1.1.16. +-dnl +-dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) +-dnl Test for GTK, and define GTK_CFLAGS, GTK_LIBDIR and GTK_LIBS +-dnl +-AC_DEFUN(AM_PATH_GTK, +-[ +- if test "X$GTK_CONFIG" != "Xno" -o "X$PKG_CONFIG" != "Xno"; then +- { +- min_gtk_version=ifelse([$1], ,0.99.7,$1) +- AC_MSG_CHECKING(for GTK - version >= $min_gtk_version) +- no_gtk="" +- if (test "X$SKIP_GTK2" != "XYES" -a "X$PKG_CONFIG" != "Xno") \ +- && $PKG_CONFIG --exists gtk+-2.0; then +- { +- dnl We should be using PKG_CHECK_MODULES() instead of this hack. +- dnl But I guess the dependency on pkgconfig.m4 is not wanted or +- dnl something like that. +- GTK_CFLAGS=`$PKG_CONFIG --cflags gtk+-2.0` +- GTK_LIBDIR=`$PKG_CONFIG --libs-only-L gtk+-2.0` +- GTK_LIBS=`$PKG_CONFIG --libs gtk+-2.0` +- gtk_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` +- gtk_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` +- gtk_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` +- } +- elif test "X$GTK_CONFIG" != "Xno"; then +- { +- GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags` +- GTK_LIBDIR= +- GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs` +- gtk_major_version=`$GTK_CONFIG $gtk_config_args --version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` +- gtk_minor_version=`$GTK_CONFIG $gtk_config_args --version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` +- gtk_micro_version=`$GTK_CONFIG $gtk_config_args --version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` +- } +- else +- no_gtk=yes +- fi +- +- if test "x$enable_gtktest" = "xyes" -a "x$no_gtk" = "x"; then +- { +- ac_save_CFLAGS="$CFLAGS" +- ac_save_LIBS="$LIBS" +- CFLAGS="$CFLAGS $GTK_CFLAGS" +- LIBS="$LIBS $GTK_LIBS" +- +- dnl +- dnl Now check if the installed GTK is sufficiently new. (Also sanity +- dnl checks the results of gtk-config to some extent +- dnl +- rm -f conf.gtktest +- AC_TRY_RUN([ +-#include <gtk/gtk.h> +-#include <stdio.h> +- +-int +-main () +-{ +-int major, minor, micro; +-char *tmp_version; +- +-system ("touch conf.gtktest"); +- +-/* HP/UX 9 (%@#!) writes to sscanf strings */ +-tmp_version = g_strdup("$min_gtk_version"); +-if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { +- printf("%s, bad version string\n", "$min_gtk_version"); +- exit(1); +- } +- +-if ((gtk_major_version > major) || +- ((gtk_major_version == major) && (gtk_minor_version > minor)) || +- ((gtk_major_version == major) && (gtk_minor_version == minor) && +- (gtk_micro_version >= micro))) +-{ +- return 0; +-} +-return 1; +-} +-],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) +- CFLAGS="$ac_save_CFLAGS" +- LIBS="$ac_save_LIBS" +- } +- fi +- if test "x$no_gtk" = x ; then +- if test "x$enable_gtktest" = "xyes"; then +- AC_MSG_RESULT(yes; found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version) +- else +- AC_MSG_RESULT(found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version) +- fi +- ifelse([$2], , :, [$2]) +- else +- { +- AC_MSG_RESULT(no) +- GTK_CFLAGS="" +- GTK_LIBS="" +- ifelse([$3], , :, [$3]) +- } +- fi +- } +- else +- GTK_CFLAGS="" +- GTK_LIBS="" +- ifelse([$3], , :, [$3]) +- fi +- AC_SUBST(GTK_CFLAGS) +- AC_SUBST(GTK_LIBS) +- rm -f conf.gtktest +-]) +- +-dnl --------------------------------------------------------------------------- +-dnl gnome +-dnl --------------------------------------------------------------------------- +-AC_DEFUN([GNOME_INIT_HOOK], +-[ +- AC_SUBST(GNOME_LIBS) +- AC_SUBST(GNOME_LIBDIR) +- AC_SUBST(GNOME_INCLUDEDIR) +- +- AC_ARG_WITH(gnome-includes, +- [ --with-gnome-includes=DIR Specify location of GNOME headers], +- [CFLAGS="$CFLAGS -I$withval"] +- ) +- +- AC_ARG_WITH(gnome-libs, +- [ --with-gnome-libs=DIR Specify location of GNOME libs], +- [LDFLAGS="$LDFLAGS -L$withval" gnome_prefix=$withval] +- ) +- +- AC_ARG_WITH(gnome, +- [ --with-gnome Specify prefix for GNOME files], +- if test x$withval = xyes; then +- want_gnome=yes +- ifelse([$1], [], :, [$1]) +- else +- if test "x$withval" = xno; then +- want_gnome=no +- else +- want_gnome=yes +- LDFLAGS="$LDFLAGS -L$withval/lib" +- CFLAGS="$CFLAGS -I$withval/include" +- gnome_prefix=$withval/lib +- fi +- fi, +- want_gnome=yes) +- +- if test "x$want_gnome" = xyes -a "0$gtk_major_version" -ge 2; then +- { +- AC_MSG_CHECKING(for libgnomeui-2.0) +- if $PKG_CONFIG --exists libgnomeui-2.0; then +- AC_MSG_RESULT(yes) +- GNOME_LIBS=`$PKG_CONFIG --libs-only-l libgnomeui-2.0` +- GNOME_LIBDIR=`$PKG_CONFIG --libs-only-L libgnomeui-2.0` +- GNOME_INCLUDEDIR=`$PKG_CONFIG --cflags libgnomeui-2.0` +- +- dnl On FreeBSD we need -pthread but pkg-config doesn't include it. +- dnl This might not be the right way but it works for me... +- AC_MSG_CHECKING(for FreeBSD) +- if test "`(uname) 2>/dev/null`" = FreeBSD; then +- AC_MSG_RESULT(yes, adding -pthread) +- GNOME_INCLUDEDIR="$GNOME_INCLUDEDIR -D_THREAD_SAFE" +- GNOME_LIBS="$GNOME_LIBS -pthread" +- else +- AC_MSG_RESULT(no) +- fi +- $1 +- else +- AC_MSG_RESULT(not found) +- if test "x$2" = xfail; then +- AC_MSG_ERROR(Could not find libgnomeui-2.0 via pkg-config) +- fi +- fi +- } +- elif test "x$want_gnome" = xyes; then +- { +- AC_PATH_PROG(GNOME_CONFIG,gnome-config,no) +- if test "$GNOME_CONFIG" = "no"; then +- no_gnome_config="yes" +- else +- AC_MSG_CHECKING(if $GNOME_CONFIG works) +- if $GNOME_CONFIG --libs-only-l gnome >/dev/null 2>&1; then +- AC_MSG_RESULT(yes) +- GNOME_LIBS="`$GNOME_CONFIG --libs-only-l gnome gnomeui`" +- GNOME_LIBDIR="`$GNOME_CONFIG --libs-only-L gnorba gnomeui`" +- GNOME_INCLUDEDIR="`$GNOME_CONFIG --cflags gnorba gnomeui`" +- $1 +- else +- AC_MSG_RESULT(no) +- no_gnome_config="yes" +- fi +- fi +- +- if test x$exec_prefix = xNONE; then +- if test x$prefix = xNONE; then +- gnome_prefix=$ac_default_prefix/lib +- else +- gnome_prefix=$prefix/lib +- fi +- else +- gnome_prefix=`eval echo \`echo $libdir\`` +- fi +- +- if test "$no_gnome_config" = "yes"; then +- AC_MSG_CHECKING(for gnomeConf.sh file in $gnome_prefix) +- if test -f $gnome_prefix/gnomeConf.sh; then +- AC_MSG_RESULT(found) +- echo "loading gnome configuration from" \ +- "$gnome_prefix/gnomeConf.sh" +- . $gnome_prefix/gnomeConf.sh +- $1 +- else +- AC_MSG_RESULT(not found) +- if test x$2 = xfail; then +- AC_MSG_ERROR(Could not find the gnomeConf.sh file that is generated by gnome-libs install) +- fi +- fi +- fi +- } +- fi +-]) +- +-AC_DEFUN([GNOME_INIT],[ +- GNOME_INIT_HOOK([],fail) +-]) +- + + dnl --------------------------------------------------------------------------- + dnl Check for GTK. First checks for gtk-config, cause it needs that to get the +@@ -1977,7 +1753,7 @@ + AC_TRY_RUN([#include <ctype.h> + main() { exit(toupper('A') == 'A' && tolower('z') == 'z'); }], + AC_DEFINE(BROKEN_TOUPPER) AC_MSG_RESULT(bad), +- AC_MSG_RESULT(good), AC_MSG_ERROR(failed to compile test program)) ++ AC_MSG_RESULT(good), AC_MSG_WARN(failed to compile test program)) + + AC_MSG_CHECKING(whether __DATE__ and __TIME__ work) + AC_TRY_COMPILE(, [printf("(" __DATE__ " " __TIME__ ")");], +@@ -2165,7 +1941,7 @@ + # include <termcap.h> + #endif + main() {char *s; s=(char *)tgoto("%p1%d", 0, 1); exit(0); }], +- res="OK", res="FAIL", res="FAIL") ++ res="OK", res="FAIL", res="OK") + if test "$res" = "OK"; then + break + fi +@@ -2197,7 +1973,8 @@ + {char *s; s=(char *)tgoto("%p1%d", 0, 1); exit(!strcmp(s==0 ? "" : s, "1")); }], + AC_MSG_RESULT([no -- we are in termcap land]), + AC_MSG_RESULT([yes -- terminfo spoken here]); AC_DEFINE(TERMINFO), +- AC_MSG_ERROR(failed to compile test program.)) ++ AC_MSG_WARN(crosscompiling - defaulting to terminfo) ++ AC_DEFINE(TERMINFO)) + + if test "x$olibs" != "x$LIBS"; then + AC_MSG_CHECKING(what tgetent() returns for an unknown terminal) +@@ -2209,7 +1986,8 @@ + {char s[10000]; int res = tgetent(s, "thisterminaldoesnotexist"); exit(res != 0); }], + AC_MSG_RESULT(zero); AC_DEFINE(TGETENT_ZERO_ERR, 0), + AC_MSG_RESULT(non-zero), +- AC_MSG_ERROR(failed to compile test program.)) ++ AC_MSG_WARN(crosscompiling - defaulting to zero) ++ AC_DEFINE(TGETENT_ZERO_ERR)) + fi + + AC_MSG_CHECKING(whether termcap.h contains ospeed) +@@ -2360,7 +2138,7 @@ + fi + ], + AC_MSG_RESULT([can't determine - assume ptys are world accessable]), +- AC_MSG_ERROR(failed to compile test program)) ++ AC_MSG_WARN(failed to compile test program)) + rm -f conftest_grp + + dnl Checks for library functions. =================================== +@@ -2403,7 +2181,7 @@ + AC_MSG_RESULT(it is usable), + AC_MSG_RESULT(it stinks) + AC_DEFINE(BAD_GETCWD), +- AC_MSG_ERROR(failed to compile test program)) ++ AC_MSG_WARN(failed to compile test program)) + + dnl Check for functions in one big call, to reduce the size of configure + AC_CHECK_FUNCS(bcmp fchdir fchown fseeko fsync ftello getcwd getpseudotty \ +@@ -2427,13 +2205,20 @@ + AC_MSG_RESULT(yes); AC_DEFINE(HAVE_ST_BLKSIZE), + AC_MSG_RESULT(no)) + +-AC_MSG_CHECKING(whether stat() ignores a trailing slash) ++AC_CACHE_CHECK([whether stat() ignores a trailing slash], ++ [ac_cv_func_stat_ignores_trailing_slash], + AC_TRY_RUN( + [#include <sys/types.h> + #include <sys/stat.h> + main() {struct stat st; exit(stat("configure/", &st) != 0); }], +- AC_MSG_RESULT(yes); AC_DEFINE(STAT_IGNORES_SLASH), +- AC_MSG_RESULT(no), AC_MSG_ERROR(failed to compile test program)) ++ ac_cv_func_stat_ignores_trailing_slash=yes, ++ ac_cv_func_stat_ignores_trailing_slash=no, ++ ac_cv_func_stat_ignores_trailing_slash=no ++)) ++ ++if X"$ac_cv_func_stat_ignores_trailing_slash" = Xyes; then ++ AC_DEFINE(STAT_IGNORES_SLASH) ++fi + + dnl Link with iconv for charset translation, if not found without library. + dnl check for iconv() requires including iconv.h +@@ -2640,9 +2425,9 @@ + AC_DEFINE(USEBCOPY) AC_MSG_RESULT(bcopy does), + AC_TRY_RUN([#define mch_memmove(s,d,l) memcpy(d,s,l) $bcopy_test_prog], + AC_DEFINE(USEMEMCPY) AC_MSG_RESULT(memcpy does), AC_MSG_RESULT(no), +- AC_MSG_ERROR(failed to compile test program)), +- AC_MSG_ERROR(failed to compile test program)), +- AC_MSG_ERROR(failed to compile test program)) ++ AC_MSG_WARN(failed to compile test program)), ++ AC_MSG_WARN(failed to compile test program)), ++ AC_MSG_WARN(failed to compile test program)) + + dnl Check for multibyte locale functions + dnl Find out if _Xsetlocale() is supported by libX11. +@@ -2868,6 +2653,6 @@ + AC_SUBST(DEPEND_CFLAGS_FILTER) + + dnl write output files +-AC_OUTPUT(auto/config.mk:config.mk.in) ++AC_OUTPUT(config.mk:config.mk.in) + + dnl vim: set sw=2 tw=78 fo+=l: +Index: src/proto/if_perl.pro +=================================================================== +--- src.orig/proto/if_perl.pro 2006-05-07 15:09:36.000000000 +0200 ++++ src/proto/if_perl.pro 2006-06-07 18:10:54.164972208 +0200 +@@ -1,4 +1,4 @@ +-/* auto/if_perl.c */ ++/* if_perl.c */ + extern int perl_enabled __ARGS((int verbose)); + extern void perl_end __ARGS((void)); + extern void msg_split __ARGS((char_u *s, int attr)); +Index: src/link.sh +=================================================================== +--- src.orig/link.sh 2005-01-25 20:11:17.000000000 +0100 ++++ src/link.sh 2006-06-07 18:10:54.164972208 +0200 +@@ -16,18 +16,18 @@ + exit_value=0 + + # +-# If auto/link.sed already exists, use it. We assume a previous run of ++# If link.sed already exists, use it. We assume a previous run of + # link.sh has found the correct set of libraries. + # +-if test -f auto/link.sed; then +- echo "link.sh: The file 'auto/link.sed' exists, which is going to be used now." +- echo "link.sh: If linking fails, try deleting the auto/link.sed file." +- echo "link.sh: If this fails too, try creating an empty auto/link.sed file." ++if test -f link.sed; then ++ echo "link.sh: The file 'link.sed' exists, which is going to be used now." ++ echo "link.sh: If linking fails, try deleting the link.sed file." ++ echo "link.sh: If this fails too, try creating an empty link.sed file." + else + + # If linking works with the full link command, try removing some libraries, + # that are known not to be needed on at least one system. +-# Remove auto/pathdef.c if there is a new link command and compile it again. ++# Remove pathdef.c if there is a new link command and compile it again. + # There is a loop to remove libraries that appear several times. + # + # Notes: +@@ -38,7 +38,7 @@ + # + cat link.cmd + if sh link.cmd; then +- touch auto/link.sed ++ touch link.sed + cp link.cmd linkit.sh + for libname in SM ICE nsl dnet dnet_stub inet socket dir elf iconv Xt Xmu Xp Xpm X11 Xdmcp x w dl pthread thread readline m perl crypt attr; do + cont=yes +@@ -46,22 +46,22 @@ + if grep "l$libname " linkit.sh >/dev/null; then + if test ! -f link1.sed; then + echo "link.sh: OK, linking works, let's try removing a few libraries." +- echo "link.sh: See auto/link.log for details." +- rm -f auto/link.log ++ echo "link.sh: See link.log for details." ++ rm -f link.log + fi + echo "s/-l$libname *//" >link1.sed +- sed -f auto/link.sed <link.cmd >linkit2.sh ++ sed -f link.sed <link.cmd >linkit2.sh + sed -f link1.sed <linkit2.sh >linkit.sh + # keep the last -lm + if test $libname != "m" || grep "lm " linkit.sh >/dev/null; then + echo "link.sh: Trying to remove the $libname library..." +- cat linkit.sh >>auto/link.log ++ cat linkit.sh >>link.log + # Redirect this link output, it may contain error messages which + # should be ignored. +- if sh linkit.sh >>auto/link.log 2>&1; then ++ if sh linkit.sh >>link.log 2>&1; then + echo "link.sh: We don't need the $libname library!" +- cat link1.sed >>auto/link.sed +- rm -f auto/pathdef.c ++ cat link1.sed >>link.sed ++ rm -f pathdef.c + else + echo "link.sh: We DO need the $libname library." + cont= +@@ -77,7 +77,7 @@ + fi + done + done +- if test ! -f auto/pathdef.c; then ++ if test ! -f pathdef.c; then + $MAKE objects/pathdef.o + fi + if test ! -f link1.sed; then +@@ -92,23 +92,23 @@ + # + # Now do the real linking. + # +-if test -s auto/link.sed; then +- echo "link.sh: Using auto/link.sed file to remove a few libraries" +- sed -f auto/link.sed <link.cmd >linkit.sh ++if test -s link.sed; then ++ echo "link.sh: Using link.sed file to remove a few libraries" ++ sed -f link.sed <link.cmd >linkit.sh + cat linkit.sh + if sh linkit.sh; then + exit_value=0 + echo "link.sh: Linked fine with a few libraries removed" + else + exit_value=$? +- echo "link.sh: Linking failed, making auto/link.sed empty and trying again" +- mv -f auto/link.sed link2.sed +- touch auto/link.sed +- rm -f auto/pathdef.c ++ echo "link.sh: Linking failed, making link.sed empty and trying again" ++ mv -f link.sed link2.sed ++ touch link.sed ++ rm -f pathdef.c + $MAKE objects/pathdef.o + fi + fi +-if test -f auto/link.sed -a ! -s auto/link.sed -a ! -f link3.sed; then ++if test -f link.sed -a ! -s link.sed -a ! -f link3.sed; then + echo "link.sh: Using unmodified link command" + cat link.cmd + if sh link.cmd; then +@@ -117,8 +117,8 @@ + else + exit_value=$? + if test -f link2.sed; then +- echo "link.sh: Linking doesn't work at all, removing auto/link.sed" +- rm -f auto/link.sed ++ echo "link.sh: Linking doesn't work at all, removing link.sed" ++ rm -f link.sed + fi + fi + fi +Index: src/Makefile +=================================================================== +--- src.orig/Makefile 2006-05-07 15:25:27.000000000 +0200 ++++ src/Makefile 2006-06-07 18:17:32.150469216 +0200 +@@ -70,8 +70,8 @@ + # this in two steps with: + # make config + # make +-# The configuration phase creates/overwrites auto/config.h and +-# auto/config.mk. ++# The configuration phase creates/overwrites config.h and ++# config.mk. + # The configure script is created with "make autoconf". It can detect + # different features of your system and act accordingly. However, it is + # not correct for all systems. Check this: +@@ -86,14 +86,14 @@ + # make reconfig + # + # - If you do not trust the automatic configuration code, then inspect +-# auto/config.h and auto/config.mk, before starting the actual build +-# phase. If possible edit this Makefile, rather than auto/config.mk -- ++# config.h and config.mk, before starting the actual build ++# phase. If possible edit this Makefile, rather than config.mk -- + # especially look at the definition of VIMLOC below. Note that the +-# configure phase overwrites auto/config.mk and auto/config.h again. ++# configure phase overwrites config.mk and config.h again. + # - If you get error messages, find out what is wrong and try to correct + # it in this Makefile. You may need to do "make reconfig" when you + # change anything that configure uses (e.g. switching from an old C +-# compiler to an ANSI C compiler). Only when auto/configure does ++# compiler to an ANSI C compiler). Only when configure does + # something wrong you may need to change one of the other files. If + # you find a clean way to fix the problem, consider sending a note to + # the author of autoconf (bug-gnu-utils@prep.ai.mit.edu) or Vim +@@ -110,7 +110,7 @@ + # If the new Vim seems to be working OK you can install it and the + # documentation in the appropriate location. The default is + # "/usr/local". Change "prefix" below to change the location. +-# "auto/pathdef.c" will be compiled again after changing this to make ++# "pathdef.c" will be compiled again after changing this to make + # the executable know where the help files are located. + # Note that any existing executable is removed or overwritten. If you + # want to keep it you will have to make a backup copy first. +@@ -231,7 +231,7 @@ + # (I) SINIX-N 5.42 and 5.43 need some EXTRA_LIBS. Also for Reliant-Unix. + # (J) If you get undefined symbols, see below for a solution. + # (K) See lines to uncomment below for machines with 64 bit pointers. +-# (L) For Silicon Graphics O2 workstations remove "-lnsl" from auto/config.mk ++# (L) For Silicon Graphics O2 workstations remove "-lnsl" from config.mk + # (M) gcc version cygnus-2.0.1 does NOT work (symptom: "dl" deletes two + # characters instead of one). + # (N) SCO with decmouse. +@@ -245,7 +245,7 @@ + # detection, since the configure script runs into an error when it + # detects Python (probably because of the bash shell). + # (V) See lines to uncomment below. +-# (X) Need to use the .include "auto/config.mk" line below ++# (X) Need to use the .include "config.mk" line below + # (Y) See line with c89 below + # (Z) See lines with cc or c89 below + # (a) See line with EXTRA_LIBS below. +@@ -274,20 +274,20 @@ + #GUI_LIB_LOC = -L/usr/X11R6/lib + # }}} + +-######################## auto/config.mk ######################## {{{1 +-# At this position auto/config.mk is included. When starting from the +-# distribution it is almost empty. After running auto/configure it contains ++######################## config.mk ######################## {{{1 ++# At this position config.mk is included. When starting from the ++# distribution it is almost empty. After running configure it contains + # settings that have been discovered for your system. Settings below this +-# include override settings in auto/config.mk! ++# include override settings in config.mk! + +-# Note: if auto/config.mk is lost somehow (e.g., because configure was +-# interrupted), create an empty auto/config.mk file and do "make config". ++# Note: if config.mk is lost somehow (e.g., because configure was ++# interrupted), create an empty config.mk file and do "make config". + +-# (X) How to include auto/config.mk depends on the version of "make" you have, ++# (X) How to include config.mk depends on the version of "make" you have, + # if the current choice doesn't work, try the other one. + +-include auto/config.mk +-#.include "auto/config.mk" ++include config.mk ++#.include "config.mk" + CClink = $(CC) + + #}}} +@@ -367,7 +367,7 @@ + # Uncomment this when you want to include the Perl interface. + # The Perl option sometimes causes problems, because it adds extra flags + # to the command line. If you see strange flags during compilation, check in +-# auto/config.mk where they come from. If it's PERL_CFLAGS, try commenting ++# config.mk where they come from. If it's PERL_CFLAGS, try commenting + # the next line. + # When you get an error for a missing "perl.exp" file, try creating an emtpy + # one: "touch perl.exp". +@@ -696,12 +696,12 @@ + # 1. If you don't have an X server: Comment out CONF_OPT_GUI and uncomment + # CONF_OPT_X = --without-x. + # 2. make config +-# 3. edit auto/config.mk and remove -ldir and -ltermcap from LIBS. It doesn't ++# 3. edit config.mk and remove -ldir and -ltermcap from LIBS. It doesn't + # have -ldir (does config find it somewhere?) and -ltermcap has at + # least one problem so I use termlib.o instead. The problem with + # termcap is that it segfaults if you call it with the name of + # a non-existent terminal type. +-# 4. edit auto/config.h and add #define USE_TMPNAM ++# 4. edit config.h and add #define USE_TMPNAM + # 5. add termlib.o to OBJ + # 6. make + +@@ -767,7 +767,7 @@ + #GUI_LIB_LOC = -L/usr/lib64 + # then + # 1) make config +-# 2) edit auto/config.mk and delete the -lelf entry in the LIBS line ++# 2) edit config.mk and delete the -lelf entry in the LIBS line + # 3) make + # + # or (for 32bit pointers) uncomment the following line +@@ -775,7 +775,7 @@ + #GUI_LIB_LOC = -L/usr/lib32 + # then + # 1) make config +-# 2) edit auto/config.mk, add -n32 to LDFLAGS ++# 2) edit config.mk, add -n32 to LDFLAGS + # 3) make + ### + +@@ -1372,7 +1372,7 @@ + ops.c \ + option.c \ + os_unix.c \ +- auto/pathdef.c \ ++ pathdef.c \ + popupmnu.c \ + quickfix.c \ + regexp.c \ +@@ -1394,7 +1394,7 @@ + + TAGS_SRC = *.c *.cpp if_perl.xs + +-EXTRA_SRC = hangulin.c if_mzsch.c auto/if_perl.c if_perlsfio.c \ ++EXTRA_SRC = hangulin.c if_mzsch.c if_perl.c if_perlsfio.c \ + if_python.c if_tcl.c if_ruby.c if_sniff.c gui_beval.c \ + workshop.c wsdebug.c integration.c netbeans.c + +@@ -1537,14 +1537,14 @@ + + # Run configure with all the setting from above. + # +-# Note: auto/config.h doesn't depend on configure, because running configure +-# doesn't always update auto/config.h. The timestamp isn't changed if the ++# Note: config.h doesn't depend on configure, because running configure ++# doesn't always update config.h. The timestamp isn't changed if the + # file contents didn't change (to avoid recompiling everything). Including a +-# dependency on auto/config.h would cause running configure each time when +-# auto/config.h isn't updated. The dependency on auto/config.mk should make ++# dependency on config.h would cause running configure each time when ++# config.h isn't updated. The dependency on config.mk should make + # sure configure is run when it's needed. + # +-config auto/config.mk: auto/configure config.mk.in config.h.in ++config config.mk: configure config.mk.in config.h.in + GUI_INC_LOC="$(GUI_INC_LOC)" GUI_LIB_LOC="$(GUI_LIB_LOC)" \ + CC="$(CC)" CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" \ + LDFLAGS="$(LDFLAGS)" $(CONF_SHELL) srcdir="$(srcdir)" \ +@@ -1559,24 +1559,24 @@ + + # Use "make reconfig" to rerun configure without cached values. + # When config.h changes, most things will be recompiled automatically. +-# Invoke $(MAKE) to run config with the empty auto/config.mk. +-# Invoke $(MAKE) to build all with the filled auto/config.mk. ++# Invoke $(MAKE) to run config with the empty config.mk. ++# Invoke $(MAKE) to build all with the filled config.mk. + reconfig: scratch clean + $(MAKE) -f Makefile config + $(MAKE) -f Makefile all + +-# Run autoconf to produce auto/configure. ++# Run autoconf to produce configure. + # Note: + # - DO NOT RUN autoconf MANUALLY! It will overwrite ./configure instead of +-# producing auto/configure. ++# producing configure. + # - autoconf is not run automatically, because a patch usually changes both +-# configure.in and auto/configure but can't update the timestamps. People ++# configure.in and configure but can't update the timestamps. People + # who do not have (the correct version of) autoconf would run into trouble. + # + # Two tricks are required to make autoconf put its output in the "auto" dir: + # - Temporarily move the ./configure script to ./configure.save. Don't + # overwrite it, it's probably the result of an aborted autoconf. +-# - Use sed to change ./config.log to auto/config.log in the configure script. ++# - Use sed to change ./config.log to config.log in the configure script. + # Autoconf 2.5x (2.59 at least) produces a few more files that we need to take + # care of: + # - configure.lineno: has the line numbers replaced with $LINENO. That +@@ -1587,14 +1587,14 @@ + autoconf: + if test ! -f configure.save; then mv configure configure.save; fi + autoconf +- sed -e 's+>config.log+>auto/config.log+' -e 's+\./config.log+auto/config.log+' configure > auto/configure +- chmod 755 auto/configure ++ sed -e 's+>config.log+>config.log+' -e 's+\./config.log+config.log+' configure > configure ++ chmod 755 configure + mv -f configure.save configure + -rm -rf autom4te.cache +- -rm -f auto/config.status auto/config.cache ++ -rm -f config.status config.cache + +-# Re-execute this Makefile to include the new auto/config.mk produced by +-# configure Only used when typing "make" with a fresh auto/config.mk. ++# Re-execute this Makefile to include the new config.mk produced by ++# configure Only used when typing "make" with a fresh config.mk. + myself: + $(MAKE) -f Makefile all + +@@ -1605,7 +1605,7 @@ + + # Link the target for normal use or debugging. + # A shell script is used to try linking without unneccesary libraries. +-$(VIMTARGET): auto/config.mk objects $(OBJ) version.c version.h ++$(VIMTARGET): config.mk objects $(OBJ) version.c version.h + $(CCC) version.c -o objects/version.o + @LINK="$(PURIFY) $(SHRPENV) $(CClink) $(ALL_LIB_DIRS) $(LDFLAGS) \ + -o $(VIMTARGET) $(OBJ) objects/version.o $(ALL_LIBS)" \ +@@ -1644,7 +1644,7 @@ + # cproto $(PFLAGS) -DFEAT_GUI $(*F).c > $@ + + # Always define FEAT_GUI. This may generate a few warnings if it's also +-# defined in auto/config.h, you can ignore that. ++# defined in config.h, you can ignore that. + .c.pro: + cproto $(PFLAGS) -DFEAT_GUI $< > proto/$@ + echo "/* vim: set ft=c : */" >> proto/$@ +@@ -1674,18 +1674,18 @@ + echo "/* vim: set ft=c : */" >> proto/$@ + + os_vms.pro: os_vms.c +-# must use os_vms_conf.h for auto/config.h +- mv auto/config.h auto/config.h.save +- cp os_vms_conf.h auto/config.h ++# must use os_vms_conf.h for config.h ++ mv config.h config.h.save ++ cp os_vms_conf.h config.h + cproto $(PFLAGS) -DVMS -UFEAT_GUI_ATHENA -UFEAT_GUI_NEXTAW -UFEAT_GUI_MOTIF -UFEAT_GUI_GTK $< > proto/$@ + echo "/* vim: set ft=c : */" >> proto/$@ +- rm auto/config.h +- mv auto/config.h.save auto/config.h ++ rm config.h ++ mv config.h.save config.h + + # if_perl.pro is special: Use the generated if_perl.c for input and remove + # prototypes for local functions. +-if_perl.pro: auto/if_perl.c +- cproto $(PFLAGS) -DFEAT_GUI auto/if_perl.c | sed "/_VI/d" > proto/$@ ++if_perl.pro: if_perl.c ++ cproto $(PFLAGS) -DFEAT_GUI if_perl.c | sed "/_VI/d" > proto/$@ + + + notags: +@@ -2152,8 +2152,8 @@ + # We support common typing mistakes for Juergen! :-) + clean celan: testclean + -rm -f *.o objects/* core $(VIMTARGET).core $(VIMTARGET) vim xxd/*.o +- -rm -f $(TOOLS) auto/osdef.h auto/pathdef.c auto/if_perl.c +- -rm -f conftest* *~ auto/link.sed ++ -rm -f $(TOOLS) osdef.h pathdef.c if_perl.c ++ -rm -f conftest* *~ link.sed + -rm -rf $(APPDIR) + if test -d $(PODIR); then \ + cd $(PODIR); $(MAKE) prefix=$(DESTDIR)$(prefix) clean; \ +@@ -2167,11 +2167,11 @@ + mkdir $(SHADOWDIR) + cd $(SHADOWDIR); ln -s ../*.[ch] ../*.in ../*.sh ../*.xs ../*.xbm ../toolcheck ../proto ../vimtutor ../mkinstalldirs . + mkdir $(SHADOWDIR)/auto +- cd $(SHADOWDIR)/auto; ln -s ../../auto/configure . +- cd $(SHADOWDIR); rm -f auto/link.sed ++ cd $(SHADOWDIR)/auto; ln -s ../../configure . ++ cd $(SHADOWDIR); rm -f link.sed + cp Makefile configure $(SHADOWDIR) +- rm -f $(SHADOWDIR)/auto/config.mk $(SHADOWDIR)/config.mk.dist +- cp config.mk.dist $(SHADOWDIR)/auto/config.mk ++ rm -f $(SHADOWDIR)/config.mk $(SHADOWDIR)/config.mk.dist ++ cp config.mk.dist $(SHADOWDIR)/config.mk + cp config.mk.dist $(SHADOWDIR) + mkdir $(SHADOWDIR)/xxd + cd $(SHADOWDIR)/xxd; ln -s ../../xxd/*.[ch] ../../xxd/Make* . +@@ -2201,10 +2201,10 @@ + + # Start configure from scratch + scrub scratch: +- -rm -f auto/config.status auto/config.cache config.log auto/config.log +- -rm -f auto/config.h auto/link.log auto/link.sed auto/config.mk +- touch auto/config.h +- cp config.mk.dist auto/config.mk ++ -rm -f config.status config.cache config.log config.log ++ -rm -f config.h link.log link.sed config.mk ++ touch config.h ++ cp config.mk.dist config.mk + + distclean: clean scratch + -rm -f tags +@@ -2252,16 +2252,16 @@ + .c.o: + $(CCC) $< + +-auto/if_perl.c: if_perl.xs ++if_perl.c: if_perl.xs + $(PERL) -e 'unless ( $$] >= 5.005 ) { for (qw(na defgv errgv)) { print "#define PL_$$_ $$_\n" }}' > $@ + $(PERL) $(PERLLIB)/ExtUtils/xsubpp -prototypes -typemap \ + $(PERLLIB)/ExtUtils/typemap if_perl.xs >> $@ + +-auto/osdef.h: auto/config.h osdef.sh osdef1.h.in osdef2.h.in ++osdef.h: config.h osdef.sh osdef1.h.in osdef2.h.in + CC="$(CC) $(OSDEF_CFLAGS)" srcdir=$(srcdir) sh $(srcdir)/osdef.sh + + QUOTESED = sed -e 's/"/\\"/g' -e 's/\\"/"/' -e 's/\\";$$/";/' +-auto/pathdef.c: Makefile auto/config.mk ++pathdef.c: Makefile config.mk + -@echo creating $@ + -@echo '/* pathdef.c */' > $@ + -@echo '/* This file is automatically created by Makefile' >> $@ +@@ -2390,8 +2390,8 @@ + objects/if_mzsch.o: if_mzsch.c + $(CCC) -o $@ if_mzsch.c + +-objects/if_perl.o: auto/if_perl.c +- $(CCC) -o $@ auto/if_perl.c ++objects/if_perl.o: if_perl.c ++ $(CCC) -o $@ if_perl.c + + objects/if_perlsfio.o: if_perlsfio.c + $(CCC) -o $@ if_perlsfio.c +@@ -2465,8 +2465,8 @@ + objects/os_unix.o: os_unix.c + $(CCC) -o $@ os_unix.c + +-objects/pathdef.o: auto/pathdef.c +- $(CCC) -o $@ auto/pathdef.c ++objects/pathdef.o: pathdef.c ++ $(CCC) -o $@ pathdef.c + + objects/py_config.o: $(PYTHON_CONFDIR)/config.c + $(CCC) -o $@ $(PYTHON_CONFDIR)/config.c \ +@@ -2609,200 +2609,200 @@ + ############################################################################### + ### (automatically generated by 'make depend') + ### Dependencies: +-objects/buffer.o: buffer.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ++objects/buffer.o: buffer.c vim.h config.h feature.h os_unix.h osdef.h \ + ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ + arabic.h version.h +-objects/charset.o: charset.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ++objects/charset.o: charset.c vim.h config.h feature.h os_unix.h osdef.h \ + ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ + arabic.h +-objects/diff.o: diff.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ++objects/diff.o: diff.c vim.h config.h feature.h os_unix.h osdef.h \ + ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ + arabic.h +-objects/digraph.o: digraph.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ++objects/digraph.o: digraph.c vim.h config.h feature.h os_unix.h osdef.h \ + ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ + arabic.h +-objects/edit.o: edit.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ++objects/edit.o: edit.c vim.h config.h feature.h os_unix.h osdef.h \ + ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ + arabic.h +-objects/eval.o: eval.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ++objects/eval.o: eval.c vim.h config.h feature.h os_unix.h osdef.h \ + ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ + arabic.h version.h +-objects/ex_cmds.o: ex_cmds.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ++objects/ex_cmds.o: ex_cmds.c vim.h config.h feature.h os_unix.h osdef.h \ + ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ + arabic.h version.h +-objects/ex_cmds2.o: ex_cmds2.c vim.h auto/config.h feature.h os_unix.h \ +- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ ++objects/ex_cmds2.o: ex_cmds2.c vim.h config.h feature.h os_unix.h \ ++ osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ + regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ + globals.h farsi.h arabic.h version.h +-objects/ex_docmd.o: ex_docmd.c vim.h auto/config.h feature.h os_unix.h \ +- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ ++objects/ex_docmd.o: ex_docmd.c vim.h config.h feature.h os_unix.h \ ++ osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ + regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ + globals.h farsi.h arabic.h +-objects/ex_eval.o: ex_eval.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ++objects/ex_eval.o: ex_eval.c vim.h config.h feature.h os_unix.h osdef.h \ + ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ + arabic.h +-objects/ex_getln.o: ex_getln.c vim.h auto/config.h feature.h os_unix.h \ +- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ ++objects/ex_getln.o: ex_getln.c vim.h config.h feature.h os_unix.h \ ++ osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ + regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ + globals.h farsi.h arabic.h +-objects/fileio.o: fileio.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ++objects/fileio.o: fileio.c vim.h config.h feature.h os_unix.h osdef.h \ + ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ + arabic.h +-objects/fold.o: fold.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ++objects/fold.o: fold.c vim.h config.h feature.h os_unix.h osdef.h \ + ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ + arabic.h +-objects/getchar.o: getchar.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ++objects/getchar.o: getchar.c vim.h config.h feature.h os_unix.h osdef.h \ + ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ + arabic.h +-objects/hardcopy.o: hardcopy.c vim.h auto/config.h feature.h os_unix.h \ +- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ ++objects/hardcopy.o: hardcopy.c vim.h config.h feature.h os_unix.h \ ++ osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ + regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ + globals.h farsi.h arabic.h version.h +-objects/hashtab.o: hashtab.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ++objects/hashtab.o: hashtab.c vim.h config.h feature.h os_unix.h osdef.h \ + ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ + arabic.h +-objects/if_cscope.o: if_cscope.c vim.h auto/config.h feature.h os_unix.h \ +- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ ++objects/if_cscope.o: if_cscope.c vim.h config.h feature.h os_unix.h \ ++ osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ + regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ + globals.h farsi.h arabic.h if_cscope.h +-objects/if_xcmdsrv.o: if_xcmdsrv.c vim.h auto/config.h feature.h os_unix.h \ +- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ ++objects/if_xcmdsrv.o: if_xcmdsrv.c vim.h config.h feature.h os_unix.h \ ++ osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ + regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ + globals.h farsi.h arabic.h version.h +-objects/main.o: main.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ++objects/main.o: main.c vim.h config.h feature.h os_unix.h osdef.h \ + ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ + arabic.h farsi.c arabic.c +-objects/mark.o: mark.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ++objects/mark.o: mark.c vim.h config.h feature.h os_unix.h osdef.h \ + ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ + arabic.h +-objects/memfile.o: memfile.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ++objects/memfile.o: memfile.c vim.h config.h feature.h os_unix.h osdef.h \ + ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ + arabic.h +-objects/memline.o: memline.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ++objects/memline.o: memline.c vim.h config.h feature.h os_unix.h osdef.h \ + ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ + arabic.h +-objects/menu.o: menu.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ++objects/menu.o: menu.c vim.h config.h feature.h os_unix.h osdef.h \ + ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ + arabic.h +-objects/message.o: message.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ++objects/message.o: message.c vim.h config.h feature.h os_unix.h osdef.h \ + ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ + arabic.h +-objects/misc1.o: misc1.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ++objects/misc1.o: misc1.c vim.h config.h feature.h os_unix.h osdef.h \ + ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ + arabic.h version.h +-objects/misc2.o: misc2.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ++objects/misc2.o: misc2.c vim.h config.h feature.h os_unix.h osdef.h \ + ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ + arabic.h +-objects/move.o: move.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ++objects/move.o: move.c vim.h config.h feature.h os_unix.h osdef.h \ + ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ + arabic.h +-objects/mbyte.o: mbyte.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ++objects/mbyte.o: mbyte.c vim.h config.h feature.h os_unix.h osdef.h \ + ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ + arabic.h +-objects/normal.o: normal.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ++objects/normal.o: normal.c vim.h config.h feature.h os_unix.h osdef.h \ + ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ + arabic.h +-objects/ops.o: ops.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h ascii.h \ ++objects/ops.o: ops.c vim.h config.h feature.h os_unix.h osdef.h ascii.h \ + keymap.h term.h macros.h option.h structs.h regexp.h gui.h gui_beval.h \ + proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h arabic.h +-objects/option.o: option.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ++objects/option.o: option.c vim.h config.h feature.h os_unix.h osdef.h \ + ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ + arabic.h +-objects/os_unix.o: os_unix.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ++objects/os_unix.o: os_unix.c vim.h config.h feature.h os_unix.h osdef.h \ + ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ + arabic.h os_unixx.h +-objects/pathdef.o: auto/pathdef.c ./vim.h ./auto/config.h ./feature.h ./os_unix.h \ +- ./auto/osdef.h ./ascii.h ./keymap.h ./term.h ./macros.h ./option.h \ ++objects/pathdef.o: pathdef.c ./vim.h ./config.h ./feature.h ./os_unix.h \ ++ ./osdef.h ./ascii.h ./keymap.h ./term.h ./macros.h ./option.h \ + ./structs.h ./regexp.h ./gui.h ./gui_beval.h proto/gui_beval.pro \ + ./ex_cmds.h ./proto.h ./globals.h ./farsi.h ./arabic.h +-objects/popupmnu.o: popupmnu.c vim.h auto/config.h feature.h os_unix.h \ +- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ ++objects/popupmnu.o: popupmnu.c vim.h config.h feature.h os_unix.h \ ++ osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ + regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ + globals.h farsi.h arabic.h +-objects/quickfix.o: quickfix.c vim.h auto/config.h feature.h os_unix.h \ +- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ ++objects/quickfix.o: quickfix.c vim.h config.h feature.h os_unix.h \ ++ osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ + regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ + globals.h farsi.h arabic.h +-objects/regexp.o: regexp.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ++objects/regexp.o: regexp.c vim.h config.h feature.h os_unix.h osdef.h \ + ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ + arabic.h +-objects/screen.o: screen.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ++objects/screen.o: screen.c vim.h config.h feature.h os_unix.h osdef.h \ + ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ + arabic.h +-objects/search.o: search.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ++objects/search.o: search.c vim.h config.h feature.h os_unix.h osdef.h \ + ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ + arabic.h +-objects/spell.o: spell.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ++objects/spell.o: spell.c vim.h config.h feature.h os_unix.h osdef.h \ + ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ + arabic.h +-objects/syntax.o: syntax.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ++objects/syntax.o: syntax.c vim.h config.h feature.h os_unix.h osdef.h \ + ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ + arabic.h +-objects/tag.o: tag.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h ascii.h \ ++objects/tag.o: tag.c vim.h config.h feature.h os_unix.h osdef.h ascii.h \ + keymap.h term.h macros.h option.h structs.h regexp.h gui.h gui_beval.h \ + proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h arabic.h +-objects/term.o: term.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ++objects/term.o: term.c vim.h config.h feature.h os_unix.h osdef.h \ + ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ + arabic.h +-objects/ui.o: ui.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h ascii.h \ ++objects/ui.o: ui.c vim.h config.h feature.h os_unix.h osdef.h ascii.h \ + keymap.h term.h macros.h option.h structs.h regexp.h gui.h gui_beval.h \ + proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h arabic.h +-objects/undo.o: undo.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ++objects/undo.o: undo.c vim.h config.h feature.h os_unix.h osdef.h \ + ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ + arabic.h +-objects/version.o: version.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ++objects/version.o: version.c vim.h config.h feature.h os_unix.h osdef.h \ + ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ + arabic.h version.h +-objects/window.o: window.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ++objects/window.o: window.c vim.h config.h feature.h os_unix.h osdef.h \ + ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ + arabic.h +-objects/gui.o: gui.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h ascii.h \ ++objects/gui.o: gui.c vim.h config.h feature.h os_unix.h osdef.h ascii.h \ + keymap.h term.h macros.h option.h structs.h regexp.h gui.h gui_beval.h \ + proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h arabic.h +-objects/gui_gtk.o: gui_gtk.c gui_gtk_f.h vim.h auto/config.h feature.h os_unix.h \ +- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ ++objects/gui_gtk.o: gui_gtk.c gui_gtk_f.h vim.h config.h feature.h os_unix.h \ ++ osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ + regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ + globals.h farsi.h arabic.h ../pixmaps/stock_icons.h +-objects/gui_gtk_f.o: gui_gtk_f.c vim.h auto/config.h feature.h os_unix.h \ +- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ ++objects/gui_gtk_f.o: gui_gtk_f.c vim.h config.h feature.h os_unix.h \ ++ osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ + regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ + globals.h farsi.h arabic.h gui_gtk_f.h +-objects/gui_motif.o: gui_motif.c vim.h auto/config.h feature.h os_unix.h \ +- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ ++objects/gui_motif.o: gui_motif.c vim.h config.h feature.h os_unix.h \ ++ osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ + regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ + globals.h farsi.h arabic.h gui_xmebw.h ../pixmaps/alert.xpm \ + ../pixmaps/error.xpm ../pixmaps/generic.xpm ../pixmaps/info.xpm \ +@@ -2822,16 +2822,16 @@ + ../pixmaps/tb_shell.xpm ../pixmaps/tb_replace.xpm \ + ../pixmaps/tb_vsplit.xpm ../pixmaps/tb_maxwidth.xpm \ + ../pixmaps/tb_minwidth.xpm +-objects/gui_xmdlg.o: gui_xmdlg.c vim.h auto/config.h feature.h os_unix.h \ +- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ ++objects/gui_xmdlg.o: gui_xmdlg.c vim.h config.h feature.h os_unix.h \ ++ osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ + regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ + globals.h farsi.h arabic.h +-objects/gui_xmebw.o: gui_xmebw.c vim.h auto/config.h feature.h os_unix.h \ +- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ ++objects/gui_xmebw.o: gui_xmebw.c vim.h config.h feature.h os_unix.h \ ++ osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ + regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ + globals.h farsi.h arabic.h gui_xmebwp.h gui_xmebw.h +-objects/gui_athena.o: gui_athena.c vim.h auto/config.h feature.h os_unix.h \ +- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ ++objects/gui_athena.o: gui_athena.c vim.h config.h feature.h os_unix.h \ ++ osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ + regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ + globals.h farsi.h arabic.h gui_at_sb.h gui_x11_pm.h \ + ../pixmaps/tb_new.xpm ../pixmaps/tb_open.xpm ../pixmaps/tb_close.xpm \ +@@ -2849,73 +2849,73 @@ + ../pixmaps/tb_shell.xpm ../pixmaps/tb_replace.xpm \ + ../pixmaps/tb_vsplit.xpm ../pixmaps/tb_maxwidth.xpm \ + ../pixmaps/tb_minwidth.xpm +-objects/gui_gtk_x11.o: gui_gtk_x11.c vim.h auto/config.h feature.h os_unix.h \ +- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ ++objects/gui_gtk_x11.o: gui_gtk_x11.c vim.h config.h feature.h os_unix.h \ ++ osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ + regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ + globals.h farsi.h arabic.h gui_gtk_f.h ../runtime/vim32x32.xpm \ + ../runtime/vim16x16.xpm ../runtime/vim48x48.xpm +-objects/gui_x11.o: gui_x11.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ++objects/gui_x11.o: gui_x11.c vim.h config.h feature.h os_unix.h osdef.h \ + ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ + arabic.h ../runtime/vim32x32.xpm ../runtime/vim16x16.xpm \ + ../runtime/vim48x48.xpm +-objects/gui_at_sb.o: gui_at_sb.c vim.h auto/config.h feature.h os_unix.h \ +- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ ++objects/gui_at_sb.o: gui_at_sb.c vim.h config.h feature.h os_unix.h \ ++ osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ + regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ + globals.h farsi.h arabic.h gui_at_sb.h +-objects/gui_at_fs.o: gui_at_fs.c vim.h auto/config.h feature.h os_unix.h \ +- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ ++objects/gui_at_fs.o: gui_at_fs.c vim.h config.h feature.h os_unix.h \ ++ osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ + regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ + globals.h farsi.h arabic.h gui_at_sb.h +-objects/pty.o: pty.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h ascii.h \ ++objects/pty.o: pty.c vim.h config.h feature.h os_unix.h osdef.h ascii.h \ + keymap.h term.h macros.h option.h structs.h regexp.h gui.h gui_beval.h \ + proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h arabic.h +-objects/hangulin.o: hangulin.c vim.h auto/config.h feature.h os_unix.h \ +- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ ++objects/hangulin.o: hangulin.c vim.h config.h feature.h os_unix.h \ ++ osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ + regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ + globals.h farsi.h arabic.h +-objects/if_mzsch.o: if_mzsch.c vim.h auto/config.h feature.h os_unix.h \ +- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ ++objects/if_mzsch.o: if_mzsch.c vim.h config.h feature.h os_unix.h \ ++ osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ + regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ + globals.h farsi.h arabic.h if_mzsch.h +-objects/if_perl.o: auto/if_perl.c ./vim.h ./auto/config.h ./feature.h ./os_unix.h \ +- ./auto/osdef.h ./ascii.h ./keymap.h ./term.h ./macros.h ./option.h \ ++objects/if_perl.o: if_perl.c ./vim.h ./config.h ./feature.h ./os_unix.h \ ++ ./osdef.h ./ascii.h ./keymap.h ./term.h ./macros.h ./option.h \ + ./structs.h ./regexp.h ./gui.h ./gui_beval.h proto/gui_beval.pro \ + ./ex_cmds.h ./proto.h ./globals.h ./farsi.h ./arabic.h +-objects/if_perlsfio.o: if_perlsfio.c vim.h auto/config.h feature.h os_unix.h \ +- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ ++objects/if_perlsfio.o: if_perlsfio.c vim.h config.h feature.h os_unix.h \ ++ osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ + regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ + globals.h farsi.h arabic.h +-objects/if_python.o: if_python.c vim.h auto/config.h feature.h os_unix.h \ +- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ ++objects/if_python.o: if_python.c vim.h config.h feature.h os_unix.h \ ++ osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ + regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ + globals.h farsi.h arabic.h +-objects/if_tcl.o: if_tcl.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ++objects/if_tcl.o: if_tcl.c vim.h config.h feature.h os_unix.h osdef.h \ + ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ + arabic.h +-objects/if_ruby.o: if_ruby.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ++objects/if_ruby.o: if_ruby.c vim.h config.h feature.h os_unix.h osdef.h \ + ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ + arabic.h version.h +-objects/if_sniff.o: if_sniff.c vim.h auto/config.h feature.h os_unix.h \ +- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ ++objects/if_sniff.o: if_sniff.c vim.h config.h feature.h os_unix.h \ ++ osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ + regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ + globals.h farsi.h arabic.h os_unixx.h +-objects/gui_beval.o: gui_beval.c vim.h auto/config.h feature.h os_unix.h \ +- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ ++objects/gui_beval.o: gui_beval.c vim.h config.h feature.h os_unix.h \ ++ osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ + regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ + globals.h farsi.h arabic.h +-objects/workshop.o: workshop.c auto/config.h integration.h vim.h feature.h \ +- os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h \ ++objects/workshop.o: workshop.c config.h integration.h vim.h feature.h \ ++ os_unix.h osdef.h ascii.h keymap.h term.h macros.h option.h \ + structs.h regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h \ + proto.h globals.h farsi.h arabic.h version.h workshop.h + objects/wsdebug.o: wsdebug.c +-objects/integration.o: integration.c vim.h auto/config.h feature.h os_unix.h \ +- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ ++objects/integration.o: integration.c vim.h config.h feature.h os_unix.h \ ++ osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ + regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ + globals.h farsi.h arabic.h integration.h +-objects/netbeans.o: netbeans.c vim.h auto/config.h feature.h os_unix.h \ +- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ ++objects/netbeans.o: netbeans.c vim.h config.h feature.h os_unix.h \ ++ osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ + regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ + globals.h farsi.h arabic.h version.h +Index: src/osdef.sh +=================================================================== +--- src.orig/osdef.sh 2004-06-07 16:32:26.000000000 +0200 ++++ src/osdef.sh 2006-06-07 18:10:54.170971296 +0200 +@@ -25,7 +25,7 @@ + # define select select_declared_wrong + #endif + #define tgetstr tgetstr_declared_wrong +-#include "auto/config.h" ++#include "config.h" + #include "os_unix.h" /* bring in most header files, more follow below */ + #include "os_unixx.h" /* bring in header files for os_unix.c */ + +@@ -73,10 +73,10 @@ + EOF + + cat osdef0.ccc | sed -n -f osdef11.sed >> osdef2.sed +-sed -f osdef2.sed < $srcdir/osdef1.h.in > auto/osdef.h ++sed -f osdef2.sed < $srcdir/osdef1.h.in > osdef.h + + cat osdef0.ccc | sed -n -f osdef21.sed > osdef2.sed +-sed -f osdef2.sed < $srcdir/osdef2.h.in >> auto/osdef.h ++sed -f osdef2.sed < $srcdir/osdef2.h.in >> osdef.h + + rm osdef0.c osdef0.cc osdef0.ccc osdef11.sed osdef21.sed osdef2.sed + +@@ -89,7 +89,7 @@ + exit 1 + fi + cat $srcdir/osdef1.h.in $srcdir/osdef2.h.in >osdefX.h.in +-if eval test "`diff auto/osdef.h osdefX.h.in | wc -l`" -eq 4; then ++if eval test "`diff osdef.h osdefX.h.in | wc -l`" -eq 4; then + echo " Hmm, sed is very pessimistic about your system header files." + echo " But it did not dump core -- strange! Let's continue carefully..." + echo " If this fails, you may want to remove offending lines from osdef.h" +Index: src/pathdef.sh +=================================================================== +--- src.orig/pathdef.sh 2004-06-07 16:32:26.000000000 +0200 ++++ src/pathdef.sh 2006-06-07 18:10:54.171971144 +0200 +@@ -1,11 +1,11 @@ + #! /bin/sh + # +-# pathdef.sh: adjust pathdef.c for auto/link.sed, if it exists ++# pathdef.sh: adjust pathdef.c for link.sed, if it exists + # +-if test -s auto/link.sed; then +- cp auto/pathdef.c auto/pathdef.tmp +- sed -f auto/link.sed <auto/pathdef.tmp >auto/pathdef.c +- rm -f auto/pathdef.tmp ++if test -s link.sed; then ++ cp pathdef.c auto/pathdef.tmp ++ sed -f link.sed <auto/pathdef.tmp >auto/pathdef.c ++ rm -f pathdef.tmp + fi + + # vim:set sw=2 et: +Index: src/vim.h +=================================================================== +--- src.orig/vim.h 2006-04-30 17:32:38.000000000 +0200 ++++ src/vim.h 2006-06-07 18:13:32.711869416 +0200 +@@ -29,7 +29,7 @@ + /* ============ the header file puzzle (ca. 50-100 pieces) ========= */ + + #ifdef HAVE_CONFIG_H /* GNU autoconf (or something else) was here */ +-# include "auto/config.h" ++# include "config.h" + # define HAVE_PATHDEF + + /* +@@ -38,7 +38,7 @@ + * test program. Other items from configure may also be wrong then! + */ + # if (SIZEOF_INT == 0) +- Error: configure did not run properly. Check auto/config.log. ++ Error: configure did not run properly. Check config.log. + # endif + + /* +@@ -259,7 +259,7 @@ + */ + #if !defined(__cplusplus) && defined(UNIX) \ + && !defined(MACOS_X) /* MACOS_X doesn't yet support osdef.h */ +-# include "auto/osdef.h" /* bring missing declarations in */ ++# include "osdef.h" /* bring missing declarations in */ + #endif + + #ifdef __EMX__ +Index: src/workshop.c +=================================================================== +--- src.orig/workshop.c 2006-02-26 19:23:47.000000000 +0100 ++++ src/workshop.c 2006-06-07 18:10:54.174970688 +0200 +@@ -9,7 +9,7 @@ + */ + + #ifdef HAVE_CONFIG_H +-# include "auto/config.h" ++# include "config.h" + #endif + #include <stdio.h> + #include <stdlib.h> diff --git a/packages/vim/vim-tiny_7.0.bb b/packages/vim/vim-tiny_7.0.bb new file mode 100644 index 0000000000..16f60693fa --- /dev/null +++ b/packages/vim/vim-tiny_7.0.bb @@ -0,0 +1,9 @@ +include vim_${PV}.bb + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/vim-${PV}" + +EXTRA_OECONF = "--enable-gui=none --disable-gtktest \ + --disable-xim --with-features=tiny \ + --disable-gpm --without-x --disable-netbeans \ + --with-tlib=ncurses" + diff --git a/packages/vim/vim_7.0.bb b/packages/vim/vim_7.0.bb new file mode 100644 index 0000000000..1f618a8050 --- /dev/null +++ b/packages/vim/vim_7.0.bb @@ -0,0 +1,9 @@ +VIMVER = "70" + +include vim.inc + +EXTRA_OECONF = "--enable-gui=none --disable-gtktest \ + --disable-xim --with-features=normal \ + --disable-gpm --without-x --disable-netbeans \ + --with-tlib=ncurses" + diff --git a/packages/zd1211/zd1211-r77/.mtn2git_empty b/packages/zd1211/zd1211-r77/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/zd1211/zd1211-r77/.mtn2git_empty diff --git a/packages/zd1211/zd1211-r77/makefile-unslung.patch b/packages/zd1211/zd1211-r77/makefile-unslung.patch new file mode 100644 index 0000000000..4edcbb7a9d --- /dev/null +++ b/packages/zd1211/zd1211-r77/makefile-unslung.patch @@ -0,0 +1,48 @@ +--- zd1211-driver-r77/Makefile.orig 2006-02-25 16:04:26.000000000 +0100 ++++ zd1211-driver-r77/Makefile 2006-02-25 17:11:27.000000000 +0100 +@@ -4,24 +4,23 @@ + # + # + +-CC=gcc +-CPP=g++ +-LD=ld +-rM=rm -f -r ++CC ?= gcc ++CPP ?= g++ ++LD ?= ld + +-MODPATH := /lib/modules/$(shell uname -r) ++MODPATH ?= /lib/modules/$(shell uname -r) + + # if the kernel is 2.6.x, turn on this +-KERN_26=y ++#KERN_26=y + +-KERNEL_SOURCE=$(MODPATH)/source ++KERNEL_SOURCE ?= $(MODPATH)/source + #KERNEL_SOURCE=/usr/src/linux + + # set to 1 for zd1211b + ZD1211REV_B=0 + +-SRC_DIR=src +-DEFINES=-D__KERNEL__ -DMODULE=1 ++SRC_DIR=src ++DEFINES ?=-D__KERNEL__ -DMODULE=1 + + + +@@ -227,9 +226,9 @@ + depmod -a + + #for apdbg +- gcc -o apdbg apdbg.c +- chmod +x apdbg +- cp ./apdbg /sbin/apdbg ++# gcc -o apdbg apdbg.c ++# chmod +x apdbg ++# cp ./apdbg /sbin/apdbg + + clean: + rm -rf .tmp_versions .*.cmd *.ko *.mod.c *.mod.o *.o $(SRC_DIR)/*.o $(SRC_DIR)/.*.o.cmd diff --git a/packages/zd1211/zd1211-r77/makefile.patch b/packages/zd1211/zd1211-r77/makefile.patch new file mode 100644 index 0000000000..ed111e07ef --- /dev/null +++ b/packages/zd1211/zd1211-r77/makefile.patch @@ -0,0 +1,47 @@ +--- zd1211-driver-r77/Makefile.orig 2006-02-25 16:04:26.000000000 +0100 ++++ zd1211-driver-r77/Makefile 2006-02-25 17:11:27.000000000 +0100 +@@ -4,24 +4,23 @@ + # + # + +-CC=gcc +-CPP=g++ +-LD=ld +-rM=rm -f -r ++CC ?= gcc ++CPP ?= g++ ++LD ?= ld + +-MODPATH := /lib/modules/$(shell uname -r) ++MODPATH ?= /lib/modules/$(shell uname -r) + + # if the kernel is 2.6.x, turn on this + KERN_26=y + +-KERNEL_SOURCE=$(MODPATH)/source ++KERNEL_SOURCE ?= $(MODPATH)/source + #KERNEL_SOURCE=/usr/src/linux + + # set to 1 for zd1211b + ZD1211REV_B=0 + +-SRC_DIR=src +-DEFINES=-D__KERNEL__ -DMODULE=1 ++SRC_DIR=src ++DEFINES ?=-D__KERNEL__ -DMODULE=1 + + + +@@ -227,9 +226,9 @@ + depmod -a + + #for apdbg +- gcc -o apdbg apdbg.c +- chmod +x apdbg +- cp ./apdbg /sbin/apdbg ++# gcc -o apdbg apdbg.c ++# chmod +x apdbg ++# cp ./apdbg /sbin/apdbg + + clean: + rm -rf .tmp_versions .*.cmd *.ko *.mod.c *.mod.o *.o $(SRC_DIR)/*.o $(SRC_DIR)/.*.o.cmd diff --git a/packages/zd1211/zd1211-r77/unslung-iwpriv-hack.patch b/packages/zd1211/zd1211-r77/unslung-iwpriv-hack.patch new file mode 100644 index 0000000000..64f3806140 --- /dev/null +++ b/packages/zd1211/zd1211-r77/unslung-iwpriv-hack.patch @@ -0,0 +1,19 @@ +--- zd1211-driver-r74/src/zd1205.c~ 2006-04-16 09:42:15.000000000 -0500 ++++ zd1211-driver-r74/src/zd1205.c 2006-04-27 12:29:03.000000000 -0500 +@@ -349,8 +349,14 @@ + { SIOCIWFIRSTPRIV + 0xA, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "connect" }, + { SIOCIWFIRSTPRIV + 0xB, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_mac_mode" }, + { SIOCIWFIRSTPRIV + 0xC, 0, IW_PRIV_TYPE_CHAR | 12, "get_mac_mode" }, +- { SIOCIWFIRSTPRIV + 0xD, 0, 0, "save_conf" /* has been removed */ }, +- { SIOCIWFIRSTPRIV + 0xE, 0, 0, "load_conf" /* has been removed */ }, ++// HACK HACK HACK - The following two lines are commented out in order to make ++// iwpriv work on Unslung (2.4.22 kernel) - this kernel's Wireless Extensions ++// can only handle up to 16 iwpriv entries in this structure. Yes, the correct ++// fix is to patch the Wireless Extensions in the Unslung kernel. This hack ++// should be removed when that's actually done. ~mwester 27APR2006 ++// { SIOCIWFIRSTPRIV + 0xD, 0, 0, "save_conf" /* has been removed */ }, ++// { SIOCIWFIRSTPRIV + 0xE, 0, 0, "load_conf" /* has been removed */ }, ++// End of HACK + { SIOCIWFIRSTPRIV + 0xF, 0, IW_PRIV_TYPE_CHAR | 14, "get_Region" }, + { SIOCIWFIRSTPRIV + 0x9,IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_Region" }, + }; diff --git a/packages/zd1211/zd1211-r77/unslung-writel-logging.patch b/packages/zd1211/zd1211-r77/unslung-writel-logging.patch new file mode 100644 index 0000000000..00d54d7d68 --- /dev/null +++ b/packages/zd1211/zd1211-r77/unslung-writel-logging.patch @@ -0,0 +1,14 @@ +--- zd1211-driver-r74/src/zd1211.c~ 2006-04-09 12:28:06.000000000 -0500 ++++ zd1211-driver-r74/src/zd1211.c 2006-04-27 12:38:55.000000000 -0500 +@@ -652,7 +652,10 @@ + count++; + + if (count > 5) { +- printk(KERN_ERR "1211_readl failed for 5 attempts...Very Serious"); ++// You are going to see this often enough on Unslung that we might as well put it in ++// the syslog and fix it so it has a nl on the end. Sigh. ~mwester, 27APR06 ++// ++ printk(KERN_ERR "1211_readl failed for 5 attempts...Very Serious\n"); + break; + } + } diff --git a/packages/zd1211/zd1211_r77.bb b/packages/zd1211/zd1211_r77.bb new file mode 100644 index 0000000000..398d516372 --- /dev/null +++ b/packages/zd1211/zd1211_r77.bb @@ -0,0 +1,36 @@ +DESCRIPTION = "Driver for zd1211 family of wireless USB Dongles" +PRIORITY = "optional" +SECTION = "kernel/modules" +MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>" +LICENSE = "GPL" +PR = "r1" +RDEPENDS = "wireless-tools" + +SRC_URI = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \ + file://makefile.patch;patch=1 \ + " + +SRC_URI_unslung = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \ + file://makefile-unslung.patch;patch=1 \ + file://unslung-iwpriv-hack.patch;patch=1 \ + file://unslung-writel-logging.patch;patch=1 \ + " + +S = "${WORKDIR}/zd1211-driver-${PV}" + +inherit module + +do_compile () { + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CC LD CPP + oe_runmake 'MODPATH={D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net' \ + 'KERNEL_SOURCE=${STAGING_KERNEL_DIR}' \ + 'KDIR=${STAGING_KERNEL_DIR}' \ + 'KERNEL_VERSION=${KERNEL_VERSION}' \ + 'CC=${KERNEL_CC}' \ + 'LD=${KERNEL_LD}' +} + +do_install() { + install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net + install -m 0644 ${S}/zd1211*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net +} |