diff options
35 files changed, 3002 insertions, 327 deletions
diff --git a/mk/build.mk b/mk/build.mk index 32e125df9..2a3bf2d34 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -507,13 +507,13 @@ bulktoolchain: bulk: for libc in uclibc eglibc glibc;do \ while read arch; do \ - systems=$$(./scripts/getsystems $$arch); \ + systems=$$(./scripts/getsystems $$arch|grep -v toolchain); \ for system in $$systems;do \ mkdir -p $(TOPDIR)/bin/$${system}_$${arch}_$$libc; \ ( \ echo === building $$arch $$system $$libc on $$(date); \ $(GMAKE) prereq && \ - $(GMAKE) ARCH=$$arch SYSTEM=$$system LIBC=$$libc defconfig; \ + $(GMAKE) ARCH=$$arch SYSTEM=$$system LIBC=$$libc FS=archive defconfig; \ $(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit;fi; \ rm .config; \ ) 2>&1 | tee $(TOPDIR)/bin/$${system}_$${arch}_$$libc/build.log; \ @@ -525,13 +525,13 @@ bulk: bulkall: for libc in uclibc eglibc glibc;do \ while read arch; do \ - systems=$$(./scripts/getsystems $$arch); \ + systems=$$(./scripts/getsystems $$arch| grep -v toolchain); \ for system in $$systems;do \ mkdir -p $(TOPDIR)/bin/$${system}_$${arch}_$$libc; \ ( \ echo === building $$arch $$system $$libc on $$(date); \ $(GMAKE) prereq && \ - $(GMAKE) ARCH=$$arch SYSTEM=$$system LIBC=$$libc allconfig; \ + $(GMAKE) ARCH=$$arch SYSTEM=$$system LIBC=$$libc FS=archive allconfig; \ $(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit;fi; \ rm .config; \ ) 2>&1 | tee $(TOPDIR)/bin/$${system}_$${arch}_$$libc/build.log; \ @@ -543,13 +543,13 @@ bulkall: bulkallmod: for libc in uclibc eglibc glibc;do \ while read arch; do \ - systems=$$(./scripts/getsystems $$arch); \ + systems=$$(./scripts/getsystems $$arch| grep -v toolchain); \ for system in $$systems;do \ mkdir -p $(TOPDIR)/bin/$${system}_$${arch}_$$libc; \ ( \ echo === building $$arch $$system $$libc on $$(date); \ $(GMAKE) prereq && \ - $(GMAKE) ARCH=$$arch SYSTEM=$$system LIBC=$$libc allmodconfig; \ + $(GMAKE) ARCH=$$arch SYSTEM=$$system LIBC=$$libc FS=archive allmodconfig; \ $(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit;fi; \ rm .config; \ ) 2>&1 | tee $(TOPDIR)/bin/$${system}_$${arch}_$$libc/build.log; \ diff --git a/mk/kernel-vars.mk b/mk/kernel-vars.mk index e730f561d..346a26fc9 100644 --- a/mk/kernel-vars.mk +++ b/mk/kernel-vars.mk @@ -7,3 +7,11 @@ KERNEL_MAKE_OPTS+= CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \ CC="$(TARGET_CC)" HOSTCC="${CC_FOR_BUILD}" \ HOSTCFLAGS='${CFLAGS_FOR_BUILD}' endif +ifeq (${ADK_TARGET_BROADCOM_MODEL_LINKSYS_WRT54G},y) +ADK_KCPPFLAGS+= -DBCM47XX_OVERRIDE_FLASHSIZE=0x400000 +endif +ifeq (${ADK_TARGET_BROADCOM_MODEL_LINKSYS_WRT54GS},y) +ADK_KCPPFLAGS+= -DBCM47XX_OVERRIDE_FLASHSIZE=0x800000 +endif + +KERNEL_MAKE_ENV+= KCPPFLAGS='${ADK_KCPPFLAGS}' diff --git a/package/bluez/Makefile b/package/bluez/Makefile index 883725a29..e359b8f77 100644 --- a/package/bluez/Makefile +++ b/package/bluez/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= bluez -PKG_VERSION:= 4.89 +PKG_VERSION:= 4.92 PKG_RELEASE:= 1 -PKG_MD5SUM:= 67fd9ad2852ce01f01b16ddd2336d1ea +PKG_MD5SUM:= abe5b76df95939f4eb6fa493f4764a95 PKG_DESCR:= bluetooth libraries and applications PKG_SECTION:= bluetooth PKG_DEPENDS:= kmod-bt libusb glib dbus diff --git a/package/cairo/Makefile b/package/cairo/Makefile index 503468257..f25372af8 100644 --- a/package/cairo/Makefile +++ b/package/cairo/Makefile @@ -28,6 +28,9 @@ $(eval $(call PKG_template,CAIRO,cairo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEN $(eval $(call PKG_template,CAIRO_DEV,cairo-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_CAIRO_DEV},${PKGSC_CAIRO_DEV},${PKG_OPTS})) TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) +ifeq ($(TARGET_ARCH),arm) +TARGET_CFLAGS:= $(filter-out -Os,$(TARGET_CFLAGS)) +endif CONFIGURE_ARGS+= --enable-ft=yes \ --enable-tee=yes \ --enable-xlib=yes diff --git a/package/classpath/Makefile b/package/classpath/Makefile index 3292232c1..fd5efa109 100644 --- a/package/classpath/Makefile +++ b/package/classpath/Makefile @@ -14,6 +14,8 @@ PKG_DEPENDS:= libgtk gdk-pixbuf orbit2 gconf PKG_URL:= http://www.gnu.org/software/classpath/home.html PKG_SITES:= ${MASTER_SITE_GNU:=classpath/} +PKG_ARCH_DEPENDS:= !cris + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,CLASSPATH,classpath,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/dbus/Makefile b/package/dbus/Makefile index 8b7a96504..02ee6936d 100644 --- a/package/dbus/Makefile +++ b/package/dbus/Makefile @@ -18,6 +18,8 @@ PKG_SUBPKGS:= DBUS DBUS_DEV PKGSC_DBUS_DEV:= devel PKGSD_DBUS_DEV:= DBUS headers +PKG_ARCH_DEPENDS:= !arm + ifeq ($(ADK_STATIC),y) PKG_OPTS:= libonly endif diff --git a/package/dbus/patches/patch-configure b/package/dbus/patches/patch-configure index e5bce5132..1aa31b56b 100644 --- a/package/dbus/patches/patch-configure +++ b/package/dbus/patches/patch-configure @@ -1,5 +1,14 @@ --- dbus-1.4.6.orig/configure 2011-02-17 21:06:57.000000000 +0100 -+++ dbus-1.4.6/configure 2011-04-13 04:47:38.000000000 +0200 ++++ dbus-1.4.6/configure 2011-04-26 16:00:48.797847993 +0200 +@@ -18718,7 +18718,7 @@ DBUS_CLIENT_LIBS="$THREAD_LIBS $NETWORK_ + + + DBUS_BUS_CFLAGS="$XML_CFLAGS" +-DBUS_BUS_LIBS="$XML_LIBS $SELINUX_LIBS $THREAD_LIBS $ADT_LIBS $NETWORK_libs" ++DBUS_BUS_LIBS="$XML_LIBS $SELINUX_LIBS $ADT_LIBS $NETWORK_libs" + + + @@ -19608,18 +19608,6 @@ if test "x$GCC" = "xyes"; then ;; esac diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile index be732ea31..266102769 100644 --- a/package/ffmpeg/Makefile +++ b/package/ffmpeg/Makefile @@ -14,6 +14,8 @@ PKG_BUILDDEP:= faad2 PKG_URL:= http://www.ffmpeg.org/ PKG_SITES:= http://www.ffmpeg.org/releases/ +PKG_ARCH_DEPENDS:= !cris + PKG_SUBPKGS:= FFMPEG FFPLAY PKGSD_FFPLAY:= ffmpeg based video player PKGSC_FFPLAY:= multimedia diff --git a/package/fontconfig/patches/patch-fontconfig_pc_in b/package/fontconfig/patches/patch-fontconfig_pc_in new file mode 100644 index 000000000..b2670b8df --- /dev/null +++ b/package/fontconfig/patches/patch-fontconfig_pc_in @@ -0,0 +1,9 @@ +--- fontconfig-2.8.0.orig/fontconfig.pc.in 2009-11-16 18:24:52.000000000 +0100 ++++ fontconfig-2.8.0/fontconfig.pc.in 2011-04-25 18:08:32.487672440 +0200 +@@ -7,5 +7,5 @@ Name: Fontconfig + Description: Font configuration and customization library + Version: @VERSION@ + Libs: -L${libdir} -lfontconfig +-Libs.private: @LIBXML2_LIBS@ @EXPAT_LIBS@ @FREETYPE_LIBS@ @ICONV_LIBS@ ++Libs.private: @LIBXML2_LIBS@ @EXPAT_LIBS@ -lfreetype -lz @ICONV_LIBS@ + Cflags: -I${includedir} diff --git a/package/fuse/patches/patch-fuse_pc_in b/package/fuse/patches/patch-fuse_pc_in new file mode 100644 index 000000000..9f21cd567 --- /dev/null +++ b/package/fuse/patches/patch-fuse_pc_in @@ -0,0 +1,9 @@ +--- fuse-2.7.4.orig/fuse.pc.in 2008-02-19 20:51:21.000000000 +0100 ++++ fuse-2.7.4/fuse.pc.in 2011-04-25 18:02:20.087672599 +0200 +@@ -6,5 +6,5 @@ includedir=@includedir@ + Name: fuse + Description: Filesystem in Userspace + Version: @VERSION@ +-Libs: -L${libdir} -lfuse @libfuse_libs@ ++Libs: -L${libdir} -lfuse + Cflags: -I${includedir}/fuse -D_FILE_OFFSET_BITS=64 diff --git a/package/gdk-pixbuf/patches/patch-gdk-pixbuf-2_0_pc_in b/package/gdk-pixbuf/patches/patch-gdk-pixbuf-2_0_pc_in new file mode 100644 index 000000000..ae45cef82 --- /dev/null +++ b/package/gdk-pixbuf/patches/patch-gdk-pixbuf-2_0_pc_in @@ -0,0 +1,10 @@ +--- gdk-pixbuf-2.23.1.orig/gdk-pixbuf-2.0.pc.in 2010-11-30 03:37:47.000000000 +0100 ++++ gdk-pixbuf-2.23.1/gdk-pixbuf-2.0.pc.in 2011-04-25 18:07:16.917662321 +0200 +@@ -13,6 +13,6 @@ Description: Image loading and scaling + Version: @VERSION@ + Requires: gobject-2.0 + Requires.private: gmodule-no-export-2.0 @PNG_DEP_CFLAGS_PACKAGES@ +-Libs: -L${libdir} -lgdk_pixbuf-@GDK_PIXBUF_API_VERSION@ @GDK_PIXBUF_EXTRA_LIBS@ ++Libs: -L${libdir} -lgdk_pixbuf-@GDK_PIXBUF_API_VERSION@ -ltiff -ljpeg -lpng12 -lm + Cflags: -I${includedir}/gdk-pixbuf-@GDK_PIXBUF_API_VERSION@ @GDK_PIXBUF_EXTRA_CFLAGS@ + diff --git a/package/libpthread/Makefile b/package/libpthread/Makefile index 4d61d570a..de0d75403 100644 --- a/package/libpthread/Makefile +++ b/package/libpthread/Makefile @@ -49,8 +49,8 @@ endif libpthread-dev-install: ifeq ($(ADK_NATIVE),) ${INSTALL_DIR} ${IDIR_LIBPTHREAD_DEV}/usr/lib - ${CP} ./files/libpthread.so.$(ARCH) ${IDIR_LIBPTHREAD_DEV}/usr/lib/libpthread.so - ${CP} ${STAGING_TARGET_DIR}/usr/lib/libpthread_nonshared.a ${IDIR_LIBPTHREAD_DEV}/usr/lib + -${CP} ./files/libpthread.so.$(ARCH) ${IDIR_LIBPTHREAD_DEV}/usr/lib/libpthread.so + -${CP} ${STAGING_TARGET_DIR}/usr/lib/libpthread_nonshared.a ${IDIR_LIBPTHREAD_DEV}/usr/lib endif include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libpthread/files/libpthread.so.arm b/package/libpthread/files/libpthread.so.arm new file mode 100644 index 000000000..73f6b6c9d --- /dev/null +++ b/package/libpthread/files/libpthread.so.arm @@ -0,0 +1,5 @@ +/* GNU ld script + Use the shared library, but some functions are only in + the static library, so try that secondarily. */ +OUTPUT_FORMAT(elf32-arm) +GROUP ( /lib/libpthread.so.0 /usr/lib/libpthread_nonshared.a ) diff --git a/package/neon/patches/patch-neon_pc_in b/package/neon/patches/patch-neon_pc_in new file mode 100644 index 000000000..7ae4faf9a --- /dev/null +++ b/package/neon/patches/patch-neon_pc_in @@ -0,0 +1,10 @@ +--- neon-0.29.5.orig/neon.pc.in 2006-06-26 12:01:29.000000000 +0200 ++++ neon-0.29.5/neon.pc.in 2011-04-25 18:11:35.518922624 +0200 +@@ -6,6 +6,6 @@ includedir=@includedir@ + Name: neon + Description: HTTP/WebDAV client library + Version: @NEON_VERSION@ +-Libs.private: @NEON_LIBS@ ++Libs.private: -lz -lssl -lcrypto -ldl -lxml2 -lm + Libs: -L${libdir} -lneon @NEON_PC_LIBS@ + Cflags: -I${includedir}/neon @NEON_CFLAGS@ diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile index 8d0da3e2c..08d80e4c4 100644 --- a/package/openjdk/Makefile +++ b/package/openjdk/Makefile @@ -24,6 +24,8 @@ PKG_SITES:= http://download.java.net/openjdk/jdk6/promoted/b22/ \ http://icedtea.classpath.org/download/drops/ \ http://icedtea.classpath.org/download/source/ +PKG_CFLINE_OPENJDK:= depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC + # autotools infrastructure for OpenJDK ICEDTEA_NAME:= icedtea6 ICEDTEA_VERSION:= 1.10 diff --git a/package/openjdk/patches/iconv.patch b/package/openjdk/patches/iconv.patch new file mode 100644 index 000000000..16a6946f6 --- /dev/null +++ b/package/openjdk/patches/iconv.patch @@ -0,0 +1,49 @@ +diff -Nur w-openjdk-6.orig/openjdk-6/hotspot/make/linux/makefiles/gcc.make w-openjdk-6/openjdk-6/hotspot/make/linux/makefiles/gcc.make +--- w-openjdk-6.orig/openjdk-6/hotspot/make/linux/makefiles/gcc.make 2011-02-28 17:03:13.000000000 +0100 ++++ w-openjdk-6/openjdk-6/hotspot/make/linux/makefiles/gcc.make 2011-04-11 18:36:16.837665258 +0200 +@@ -108,9 +108,6 @@ + CFLAGS += -pipe + endif + +-# Compiler warnings are treated as errors +-WARNINGS_ARE_ERRORS = -Werror +- + # Except for a few acceptable ones + # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit + # conversions which might affect the values. To avoid that, we need to turn +diff -Nur w-openjdk-6.orig/openjdk-6/jdk/make/java/instrument/Makefile w-openjdk-6/openjdk-6/jdk/make/java/instrument/Makefile +--- w-openjdk-6.orig/openjdk-6/jdk/make/java/instrument/Makefile 2011-02-28 17:06:10.000000000 +0100 ++++ w-openjdk-6/openjdk-6/jdk/make/java/instrument/Makefile 2011-04-11 23:14:27.571411016 +0200 +@@ -123,6 +123,8 @@ + # We don't want to link against -ljava + JAVALIB= + ++LDLIBS += -liconv ++ + # + # Add to ambient vpath so we pick up the library files + # +diff -Nur w-openjdk-6.orig/openjdk-6/jdk/make/java/npt/Makefile w-openjdk-6/openjdk-6/jdk/make/java/npt/Makefile +--- w-openjdk-6.orig/openjdk-6/jdk/make/java/npt/Makefile 2011-02-28 17:06:11.000000000 +0100 ++++ w-openjdk-6/openjdk-6/jdk/make/java/npt/Makefile 2011-04-11 23:14:07.017670197 +0200 +@@ -65,6 +65,8 @@ + # We don't want to link against -ljava + JAVALIB= + ++LDLIBS += -liconv ++ + # Add -export options to explicitly spell exported symbols + ifeq ($(PLATFORM), windows) + OTHER_LCF += -export:nptInitialize -export:nptTerminate +diff -Nur w-openjdk-6.orig/openjdk-6/jdk/make/sun/splashscreen/Makefile w-openjdk-6/openjdk-6/jdk/make/sun/splashscreen/Makefile +--- w-openjdk-6.orig/openjdk-6/jdk/make/sun/splashscreen/Makefile 2011-02-28 17:06:12.000000000 +0100 ++++ w-openjdk-6/openjdk-6/jdk/make/sun/splashscreen/Makefile 2011-04-11 23:15:07.221411030 +0200 +@@ -55,6 +55,8 @@ + + JAVALIB= + ++LDLIBS += -liconv ++ + # + # C Flags + # diff --git a/package/pcc-libs/Makefile b/package/pcc-libs/Makefile index 9533b97c9..8d206d0a8 100644 --- a/package/pcc-libs/Makefile +++ b/package/pcc-libs/Makefile @@ -12,6 +12,7 @@ PKG_SECTION:= lang PKG_URL:= http://pcc.ludd.ltu.se/ PKG_SITES:= http://pcc.ludd.ltu.se/ftp/pub/pcc-releases/ +PKG_ARCH_DEPENDS:= !arm !cris DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz include $(TOPDIR)/mk/package.mk diff --git a/package/pcc/Makefile b/package/pcc/Makefile index a20d3dece..78dd52bd0 100644 --- a/package/pcc/Makefile +++ b/package/pcc/Makefile @@ -15,6 +15,7 @@ PKG_URL:= http://pcc.ludd.ltu.se/ PKG_SITES:= http://pcc.ludd.ltu.se/ftp/pub/pcc-releases/ PKG_NOPARALLEL:= 1 +PKG_ARCH_DEPENDS:= !arm !cris DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz include $(TOPDIR)/mk/package.mk diff --git a/target/arm/Makefile b/target/arm/Makefile index 141d2c279..dbf955a81 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/mk/modules.mk include $(TOPDIR)/mk/kernel-build.mk include $(TOPDIR)/mk/image.mk -KERNEL:=$(LINUX_DIR)/kernel-adk +KERNEL:=$(LINUX_DIR)/vmlinux LOADADDR:=0x20008000 tools-compile: diff --git a/target/config/Config.in b/target/config/Config.in index 4c8c8bcb5..453c894a3 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -80,6 +80,18 @@ config ADK_TARGET_ABI_N64 endchoice +choice +prompt "Broadcom BCM47xx Model" +depends on ADK_TARGET_SYSTEM_BROADCOM_BCM47XX + +config ADK_TARGET_BROADCOM_MODEL_LINKSYS_WRT54G + boolean "Linksys WRT54g" + +config ADK_TARGET_BROADCOM_MODEL_LINKSYS_WRT54GS + boolean "Linksys WRT54gs" + +endchoice + if ADK_LINUX_NATIVE source "target/config/Config.in.native" endif @@ -464,7 +476,6 @@ config ADK_TARGET_ROOTFS_MMC config ADK_TARGET_ROOTFS_ARCHIVE bool "Archive usable for different filesystems" - depends on ADK_HARDWARE_QEMU help Use this option if your root filesystem is ext2/ext3/ext4/xfs. diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools index 8ed343d2a..31246458d 100644 --- a/target/config/Config.in.tools +++ b/target/config/Config.in.tools @@ -1,5 +1,5 @@ config ADK_TOOLS_ADDPATTERN_ARGS string - default "-p W54G -v v4.20.6" if ADK_TARGET_SYSTEM_LINKSYS_WRT54G - default "-p W54S -v v4.70.6" if ADK_TARGET_SYSTEM_LINKSYS_WRT54GS + default "-p W54G -v v4.20.6" if ADK_TARGET_BROADCOM_MODEL_LINKSYS_WRT54G + default "-p W54S -v v4.70.6" if ADK_TARGET_BROADCOM_MODEL_LINKSYS_WRT54GS default "" diff --git a/target/cris/Makefile b/target/cris/Makefile index 0c87fb6d7..28e33eda5 100644 --- a/target/cris/Makefile +++ b/target/cris/Makefile @@ -38,3 +38,9 @@ imageinstall: kernel-install ${BIN_DIR}/${ROOTFSUSERTARBALL} @echo Do not forget to set network boot jumper, before you start the foxboard @echo ${ROOTFSUSERTARBALL} is your nfs root and can be extracted on your nfs server endif +ifeq ($(ADK_TARGET_FS),archive) +imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) + @cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL) + @echo 'The kernel file is: $(BIN_DIR)/${TARGET_KERNEL}' + @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)" +endif diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index a6f26dc71..f8673351a 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -273,6 +273,8 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_MD tristate depends on !ADK_KERNEL_BLK_DEV_MD select ADK_KERNEL_MD + depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX832 + depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX416 help config ADK_KERNEL_MD_RAID0 @@ -307,6 +309,8 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_DM prompt "kmod-dm........................... Device Mapper support" select ADK_KERNEL_MD depends on !ADK_KERNEL_BLK_DEV_DM + depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX832 + depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX416 tristate help Device-mapper is a low level volume manager. It works by allowing @@ -319,7 +323,7 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_DM config ADK_KPACKAGE_KMOD_DM_CRYPT prompt "kmod-dm-crypt..................... Crypt target support" depends on !ADK_KERNEL_DM_CRYPT - select ADK_KPACKAGE_KMOD_BLK_DEV_DM + depends on ADK_KPACKAGE_KMOD_BLK_DEV_DM select ADK_KERNEL_MD select ADK_KERNEL_CRYPTO select ADK_KPACKAGE_KMOD_CRYPTO_CBC @@ -336,14 +340,14 @@ config ADK_KPACKAGE_KMOD_DM_CRYPT config ADK_KPACKAGE_KMOD_DM_SNAPSHOT prompt "kmod-dm-snapshot.................. Snapshot target" - select ADK_KPACKAGE_KMOD_BLK_DEV_DM + depends on ADK_KPACKAGE_KMOD_BLK_DEV_DM tristate help Allow volume managers to take writable snapshots of a device. config ADK_KPACKAGE_KMOD_DM_MIRROR prompt "kmod-dm-mirror.................... Mirror target" - select ADK_KPACKAGE_KMOD_BLK_DEV_DM + depends on ADK_KPACKAGE_KMOD_BLK_DEV_DM tristate help Allow volume managers to mirror logical volumes, also @@ -354,6 +358,8 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_DRBD tristate select ADK_KERNEL_BLK_DEV select ADK_KERNEL_CONNECTOR + depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX832 + depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX416 help DRBD - http://www.drbd.org diff --git a/target/linux/config/Config.in.debug b/target/linux/config/Config.in.debug index 3da69a594..1ab7bba85 100644 --- a/target/linux/config/Config.in.debug +++ b/target/linux/config/Config.in.debug @@ -60,6 +60,8 @@ config ADK_KPACKAGE_KMOD_OPROFILE prompt "kernel support for oprofile" tristate select ADK_KERNEL_PROFILING + depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX832 + depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX416 default n help use oprofile package to make use of the kernel support. diff --git a/target/linux/config/Config.in.flash b/target/linux/config/Config.in.flash index 1ca289b75..91cfc9140 100644 --- a/target/linux/config/Config.in.flash +++ b/target/linux/config/Config.in.flash @@ -44,7 +44,7 @@ config ADK_KERNEL_MTD_AR7_PARTS config ADK_KERNEL_MTD_CFI_INTELEXT boolean - default y if ADK_TARGET_SYSTEM_LINKSYS_WRT54G + default y if ADK_TARGET_SYSTEM_BROADCOM_BCM47XX default n config ADK_TARGET_NAND diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input index 429c2ad73..3c55fb8dd 100644 --- a/target/linux/config/Config.in.input +++ b/target/linux/config/Config.in.input @@ -56,6 +56,8 @@ config ADK_KPACKAGE_KMOD_USB_HID select ADK_KERNEL_INPUT select ADK_KERNEL_HID select ADK_PACKAGE_KMOD_USB_CONTROLLER + depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX832 + depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX416 depends on ADK_TARGET_WITH_USB default n diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice index bbd2990e9..f942046ac 100644 --- a/target/linux/config/Config.in.netdevice +++ b/target/linux/config/Config.in.netdevice @@ -115,8 +115,7 @@ config ADK_KERNEL_B44 select ADK_KERNEL_NET_ETHERNET select ADK_KERNEL_NET_PCI select ADK_KERNEL_MII - default y if ADK_TARGET_SYSTEM_LINKSYS_WRT54G - default y if ADK_TARGET_SYSTEM_LINKSYS_WRT54GS + default y if ADK_TARGET_SYSTEM_BROADCOM_BCM47XX default n help @@ -345,6 +344,7 @@ config ADK_KPACKAGE_KMOD_B43 prompt "kmod-b43..................... Broadcom B43xx wireless cards" tristate select ADK_KPACKAGE_KMOD_FW_LOADER + select ADK_KPACKAGE_KMOD_MAC80211 depends on ADK_TARGET_WITH_SSB || ADK_TARGET_WITH_MINIPCI default n help @@ -354,6 +354,8 @@ config ADK_KPACKAGE_KMOD_RTL8187 prompt "kmod-rtl8187................. Realtek RTL8187/RTL8187B wireless cards" tristate depends on ADK_TARGET_WITH_USB + depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX832 + depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX416 default n help Driver for Realtek RTL8187/RTL8187B wireless chips. @@ -368,6 +370,8 @@ config ADK_KPACKAGE_KMOD_P54_USB select ADK_KPACKAGE_KMOD_MAC80211 select ADK_KPACKAGE_KMOD_CRC_CCITT depends on ADK_PACKAGE_KMOD_USB_CONTROLLER + depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX832 + depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX416 default n help Driver for Prism54 USB adaptors. diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb index e7905b531..b1375ac05 100644 --- a/target/linux/config/Config.in.usb +++ b/target/linux/config/Config.in.usb @@ -73,6 +73,8 @@ config ADK_KPACKAGE_KMOD_USB_UHCI_HCD depends on ADK_KPACKAGE_KMOD_USB depends on !ADK_KERNEL_USB_UHCI_HCD depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 + depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX832 + depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX416 default y if ADK_TARGET_SYSTEM_IBM_X40 default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default n @@ -92,6 +94,8 @@ config ADK_KPACKAGE_KMOD_USB_OHCI_HCD select ADK_PACKAGE_KMOD_USB_CONTROLLER depends on ADK_KPACKAGE_KMOD_USB depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 + depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX832 + depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX416 default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 @@ -112,6 +116,8 @@ config ADK_KPACKAGE_KMOD_USB_ISP116X_HCD select ADK_PACKAGE_KMOD_USB_CONTROLLER depends on ADK_KPACKAGE_KMOD_USB depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 + depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX832 + depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX416 default n help The ISP1160 and ISP1161 chips are USB host controllers. Enable this @@ -125,6 +131,8 @@ config ADK_KPACKAGE_KMOD_USB_SL811_HCD select ADK_PACKAGE_KMOD_USB_CONTROLLER depends on ADK_KPACKAGE_KMOD_USB depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 + depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX832 + depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX416 default n help The SL811HS is a single-port USB controller that supports either @@ -139,6 +147,8 @@ config ADK_KPACKAGE_KMOD_USB_EHCI_HCD select ADK_PACKAGE_KMOD_USB_CONTROLLER depends on !ADK_KERNEL_USB_EHCI_HCD depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 + depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX832 + depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX416 depends on ADK_KPACKAGE_KMOD_USB default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 diff --git a/target/linux/patches/2.6.37/brcm.patch b/target/linux/patches/2.6.37/brcm.patch index 6ce7fc3c8..c484dc838 100644 --- a/target/linux/patches/2.6.37/brcm.patch +++ b/target/linux/patches/2.6.37/brcm.patch @@ -1,45 +1,6 @@ -diff -Nur linux-2.6.37.orig/arch/mips/Kconfig linux-2.6.37/arch/mips/Kconfig ---- linux-2.6.37.orig/arch/mips/Kconfig 2011-01-05 01:50:19.000000000 +0100 -+++ linux-2.6.37/arch/mips/Kconfig 2011-01-19 22:45:48.000000000 +0100 -@@ -84,6 +84,7 @@ - select GENERIC_GPIO - select SYS_HAS_EARLY_PRINTK - select CFE -+ select SYS_SUPPORTS_ZBOOT_UART16550 - help - Support for BCM47XX based boards - -diff -Nur linux-2.6.37.orig/arch/mips/Makefile linux-2.6.37/arch/mips/Makefile ---- linux-2.6.37.orig/arch/mips/Makefile 2011-01-05 01:50:19.000000000 +0100 -+++ linux-2.6.37/arch/mips/Makefile 2011-01-19 22:48:04.000000000 +0100 -@@ -76,6 +76,7 @@ - all-$(CONFIG_BOOT_ELF32) := $(vmlinux-32) - all-$(CONFIG_BOOT_ELF64) := $(vmlinux-64) - all-$(CONFIG_SYS_SUPPORTS_ZBOOT)+= vmlinuz -+all-$(CONFIG_BCM47XX) += vmlinuz.elf - - # - # GCC uses -G 0 -mabicalls -fpic as default. We don't want PIC in the kernel -@@ -276,7 +277,7 @@ - $(Q)$(MAKE) $(build)=arch/mips/boot VMLINUX=$(vmlinux-32) arch/mips/boot/$@ - - # boot/compressed --vmlinuz vmlinuz.bin vmlinuz.ecoff vmlinuz.srec: $(vmlinux-32) FORCE -+vmlinuz vmlinuz.bin vmlinuz.ecoff vmlinuz.srec vmlinuz.elf: $(vmlinux-32) FORCE - $(Q)$(MAKE) $(build)=arch/mips/boot/compressed \ - VMLINUX_LOAD_ADDRESS=$(load-y) 32bit-bfd=$(32bit-bfd) $@ - -@@ -313,6 +314,7 @@ - echo ' vmlinuz.ecoff - ECOFF zboot image' - echo ' vmlinuz.bin - Raw binary zboot image' - echo ' vmlinuz.srec - SREC zboot image' -+ echo ' vmlinuz.elf - ELF self-relocating zboot image' - echo - echo ' These will be default as apropriate for a configured platform.' - endef diff -Nur linux-2.6.37.orig/arch/mips/bcm47xx/Makefile linux-2.6.37/arch/mips/bcm47xx/Makefile --- linux-2.6.37.orig/arch/mips/bcm47xx/Makefile 2011-01-05 01:50:19.000000000 +0100 -+++ linux-2.6.37/arch/mips/bcm47xx/Makefile 2011-01-19 22:45:43.000000000 +0100 ++++ linux-2.6.37/arch/mips/bcm47xx/Makefile 2011-04-26 20:26:19.777672932 +0200 @@ -3,4 +3,4 @@ # under Linux. # @@ -48,8 +9,8 @@ diff -Nur linux-2.6.37.orig/arch/mips/bcm47xx/Makefile linux-2.6.37/arch/mips/bc +obj-y := gpio.o irq.o nvram.o prom.o serial.o setup.o time.o platform.o< |