diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-25 20:54:00 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-25 20:54:00 +0100 |
commit | 2350ebe334d58c5236d05fb6adf7150fc0d32d7b (patch) | |
tree | 3070d920a7a0edffee38f4753e85842651b57c78 | |
parent | a504b3f95d8751e32d44fc68c29c99fdc2d707a1 (diff) | |
parent | f895baf25a71be2f71eb8f66dad003dc59a5e85e (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
-rw-r--r-- | mk/build.mk | 2 | ||||
-rw-r--r-- | mk/vars.mk | 2 | ||||
-rw-r--r-- | package/aufs2-util/patches/patch-libau_Makefile | 11 | ||||
-rw-r--r-- | package/pcmciautils/Makefile | 2 | ||||
-rw-r--r-- | target/arm/uclibc.config | 2 | ||||
-rw-r--r-- | target/linux/config/Config.in.kernel | 3 | ||||
-rw-r--r-- | target/linux/config/Config.in.multimedia | 5 | ||||
-rw-r--r-- | target/linux/config/Config.in.netdevice | 2 | ||||
-rw-r--r-- | target/linux/config/Config.in.pcmcia | 6 | ||||
-rw-r--r-- | target/linux/config/Config.in.usb | 5 |
10 files changed, 33 insertions, 7 deletions
diff --git a/mk/build.mk b/mk/build.mk index 708cb5cab..3e1b6cd69 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -17,6 +17,8 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_PACKAGE_GRUB=n \ ADK_PACKAGE_BASE_FILES=y \ ADK_PACKAGE_PYTHON=n \ + ADK_PKG_LAPTOP=n \ + ADK_PKG_DEVELOPMENT=n \ ADK_TOOLCHAIN_GCC_JAVA=n \ ADK_TOOLCHAIN_GCC_OBJC=n \ ADK_TOOLCHAIN_GCC_USE_SSP=n \ diff --git a/mk/vars.mk b/mk/vars.mk index 284b2465b..b7ec813b4 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -108,7 +108,7 @@ LINUX_HEADER_DIR:= $(STAGING_TARGET_DIR)/linux-header KERNEL_MODULE_FLAGS:= ARCH=${ARCH} KERNELVERSION="2.6" \ KERNEL_PATH=${LINUX_DIR} KERNELDIR=${LINUX_DIR} KERNEL_DIR=${LINUX_DIR} \ PREFIX=/usr CROSS_COMPILE="${TARGET_CROSS}" \ - CFLAGS_MODULE="-fhonour-copts" V=1 + LDFLAGS="" CFLAGS_MODULE="-fhonour-copts" V=1 TARGET_CONFIGURE_OPTS= PATH='${TARGET_PATH}' \ diff --git a/package/aufs2-util/patches/patch-libau_Makefile b/package/aufs2-util/patches/patch-libau_Makefile new file mode 100644 index 000000000..e454c9dc3 --- /dev/null +++ b/package/aufs2-util/patches/patch-libau_Makefile @@ -0,0 +1,11 @@ +--- w-aufs2-util-2-100111-1.orig/libau/Makefile 2011-01-07 05:00:54.000000000 +0100 ++++ w-aufs2-util-2-100111-1/libau/Makefile 2011-01-25 17:02:09.835243119 +0100 +@@ -45,7 +45,7 @@ install_ulib: File = ${LibSo}.${LibSoMaj + install_ulib: Tgt = ${DESTDIR}/usr/lib + install_ulib: ${File} + install -d ${Tgt} +- ${Install} -m 644 -s ${File} ${Tgt} ++ ${Install} -m 644 ${File} ${Tgt} + # -m 6755 + ln -sf ${File} ${Tgt}/${LibSo}.${LibSoMajor} + ln -sf ${LibSo}.${LibSoMajor} ${Tgt}/${LibSo} diff --git a/package/pcmciautils/Makefile b/package/pcmciautils/Makefile index 3d987083b..9b319a1e1 100644 --- a/package/pcmciautils/Makefile +++ b/package/pcmciautils/Makefile @@ -13,6 +13,8 @@ PKG_BUILDDEP:= sysfsutils PKG_URL:= http://www.kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html PKG_SITES:= http://www.kernel.org/pub/linux/utils/kernel/pcmcia/ +PKG_CFLINE_PCMCIAUTILS:=depends on ADK_TARGET_WITH_CARDBUS + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,PCMCIAUTILS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/target/arm/uclibc.config b/target/arm/uclibc.config index 7e8f045e9..b1a10602a 100644 --- a/target/arm/uclibc.config +++ b/target/arm/uclibc.config @@ -99,7 +99,7 @@ UCLIBC_CTOR_DTOR=y UCLIBC_HAS_THREADS_NATIVE=y UCLIBC_HAS_THREADS=y UCLIBC_HAS_TLS=y -# PTHREADS_DEBUG_SUPPORT is not set +PTHREADS_DEBUG_SUPPORT=y UCLIBC_HAS_SYSLOG=y UCLIBC_HAS_LFS=y # MALLOC is not set diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel index 988fbabd9..6bcb090df 100644 --- a/target/linux/config/Config.in.kernel +++ b/target/linux/config/Config.in.kernel @@ -1,3 +1,6 @@ +config ADK_KERNEL_EXPERIMENTAL + boolean + config ADK_KERNEL_ETRAX_MTD_SIZE hex depends on ADK_TARGET_SYSTEM_FOXBOARD_LX416 || ADK_TARGET_SYSTEM_FOXBOARD_LX832 diff --git a/target/linux/config/Config.in.multimedia b/target/linux/config/Config.in.multimedia index bf2fb4879..201e4c281 100644 --- a/target/linux/config/Config.in.multimedia +++ b/target/linux/config/Config.in.multimedia @@ -30,6 +30,7 @@ config ADK_KPACKAGE_KMOD_SND_RAWMIDI config ADK_KPACKAGE_KMOD_SND_AC97_CODEC tristate + depends on ADK_TARGET_WITH_PCI menu "Audio devices support" @@ -63,6 +64,7 @@ config ADK_KPACKAGE_KMOD_SND_INTEL8X0 select ADK_KPACKAGE_KMOD_SND default y if ADK_TARGET_SYSTEM_IBM_X40 default n + depends on ADK_TARGET_WITH_PCI help Driver for intel chipsets. @@ -71,6 +73,7 @@ config ADK_KPACKAGE_KMOD_SND_VIA82XX tristate select ADK_KPACKAGE_KMOD_SND default n + depends on ADK_TARGET_WITH_PCI help ALSA VIA82XX driver @@ -79,6 +82,7 @@ config ADK_KPACKAGE_KMOD_SND_ENS1370 tristate select ADK_KPACKAGE_KMOD_SND default n + depends on ADK_TARGET_WITH_PCI help ALSA Ensonique 1370 driver @@ -90,6 +94,7 @@ config ADK_KPACKAGE_KMOD_SND_CS5535AUDIO default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default n + depends on ADK_TARGET_WITH_PCI help ALSA AMD CS5535 driver diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice index d6e4bfcd1..b5390e92d 100644 --- a/target/linux/config/Config.in.netdevice +++ b/target/linux/config/Config.in.netdevice @@ -338,6 +338,8 @@ config ADK_KPACKAGE_KMOD_P54_USB select ADK_KPACKAGE_KMOD_P54_COMMON select ADK_KPACKAGE_KMOD_FW_LOADER select ADK_PACKAGE_P54_FIRMWARE + select ADK_KERNEL_EXPERIMENTAL + select ADK_KPACKAGE_KMOD_MAC80211 depends on ADK_PACKAGE_KMOD_USB_CONTROLLER default n help diff --git a/target/linux/config/Config.in.pcmcia b/target/linux/config/Config.in.pcmcia index 1d62615b0..1a0756009 100644 --- a/target/linux/config/Config.in.pcmcia +++ b/target/linux/config/Config.in.pcmcia @@ -3,20 +3,16 @@ depends on ADK_TARGET_WITH_CARDBUS config ADK_KERNEL_CARDBUS boolean - default n config ADK_KERNEL_PCMCIA_PROBE boolean - default n config ADK_KERNEL_SERIAL_8250_EXTENDED boolean - default n config ADK_KERNEL_SERIAL_8250_SHARE_IRQ boolean select ADK_KERNEL_SERIAL_8250_EXTENDED - default n config ADK_KPACKAGE_KMOD_PCCARD prompt "kmod-pccard....................... PCCARD support" @@ -40,7 +36,7 @@ config ADK_KPACKAGE_KMOD_YENTA default n config ADK_KPACKAGE_KMOD_SERIAL_8250_CS - prompt "kmod-pcmcia-serial................ PCMCIA/CardBus serial device support" + prompt "kmod-pcmcia-serial.............. PCMCIA/CardBus serial device support" tristate default n select ADK_KERNEL_SERIAL_8250_SHARE_IRQ diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb index b805e2b94..07a97ae24 100644 --- a/target/linux/config/Config.in.usb +++ b/target/linux/config/Config.in.usb @@ -64,6 +64,7 @@ config ADK_KPACKAGE_KMOD_USB_UHCI_HCD tristate depends on ADK_KPACKAGE_KMOD_USB depends on !ADK_KERNEL_USB_UHCI_HCD + depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 select ADK_PACKAGE_KMOD_USB_CONTROLLER help The Universal Host Controller Interface is a standard by Intel for @@ -85,6 +86,7 @@ config ADK_KPACKAGE_KMOD_USB_OHCI_HCD default y if ADK_TARGET_SYSTEM_IBM_X40 default n depends on ADK_KPACKAGE_KMOD_USB + depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 select ADK_PACKAGE_KMOD_USB_CONTROLLER help The Open Host Controller Interface (OHCI) is a standard for accessing @@ -101,6 +103,7 @@ config ADK_KPACKAGE_KMOD_USB_ISP116X_HCD tristate default n depends on ADK_KPACKAGE_KMOD_USB + depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 select ADK_PACKAGE_KMOD_USB_CONTROLLER help The ISP1160 and ISP1161 chips are USB host controllers. Enable this @@ -113,6 +116,7 @@ config ADK_KPACKAGE_KMOD_USB_SL811_HCD tristate default n depends on ADK_KPACKAGE_KMOD_USB + depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 select ADK_PACKAGE_KMOD_USB_CONTROLLER help The SL811HS is a single-port USB controller that supports either @@ -130,6 +134,7 @@ config ADK_KPACKAGE_KMOD_USB_EHCI_HCD default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 default y if ADK_TARGET_SYSTEM_IBM_X40 default n + depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 depends on ADK_KPACKAGE_KMOD_USB select ADK_PACKAGE_KMOD_USB_CONTROLLER help |