summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile3
-rw-r--r--mk/build.mk14
-rw-r--r--mk/modules.mk1
-rw-r--r--package/udev/patches/patch-extras_cdrom_id_cdrom_id_c6
-rw-r--r--package/xorg-server/Makefile2
-rw-r--r--target/foxboard/kernel.config56
-rw-r--r--target/linux/config/Config.in.leds18
-rw-r--r--target/linux/config/Config.in.netdevice5
8 files changed, 81 insertions, 24 deletions
diff --git a/Makefile b/Makefile
index fa7faa6bb..8402845b5 100644
--- a/Makefile
+++ b/Makefile
@@ -140,6 +140,9 @@ package_index: .prereq_done
bulk: .prereq_done
@${GMAKE_INV} bulk
+bulktoolchain: .prereq_done
+ @${GMAKE_INV} bulktoolchain
+
bulkall: .prereq_done
@${GMAKE_INV} bulkall
diff --git a/mk/build.mk b/mk/build.mk
index a8ba19c72..53f0ff5bf 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -18,6 +18,8 @@ DEFCONFIG= ADK_DEVELSYSTEM=n \
ADK_PACKAGE_GRUB=n \
ADK_PACKAGE_AUFS2_UTIL=n \
ADK_PACKAGE_BASE_FILES=y \
+ ADK_PACKAGE_GCC=n \
+ ADK_PACKAGE_MGETTY=n \
ADK_COMPILE_HEIMDAL=n \
ADK_PACKAGE_HEIMDAL_PKINIT=n \
ADK_PACKAGE_HEIMDAL_SERVER=n \
@@ -425,6 +427,18 @@ bulk:
) 2>&1 | tee $(TOPDIR)/bin/$${target}_$$libc/$$target-$$libc-$$fs.log; \
done <${TOPDIR}/target/bulk.lst
+bulktoolchain:
+ while read target libc; do \
+ mkdir -p $(TOPDIR)/bin/$${target}_$$libc; \
+ ( \
+ echo === building $$target $$libc on $$(date); \
+ $(GMAKE) prereq && \
+ $(GMAKE) TARGET=$$target LIBC=$$libc defconfig; \
+ $(GMAKE) VERBOSE=1 all; \
+ rm .config; \
+ ) 2>&1 | tee $(TOPDIR)/bin/$${target}_$$libc/$$target-$$libc.log; \
+ done <${TOPDIR}/target/bulktool.lst
+
bulkall:
while read target libc fs; do \
mkdir -p $(TOPDIR)/bin/$${target}_$$libc; \
diff --git a/mk/modules.mk b/mk/modules.mk
index 4747a4e16..ab33f6863 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -778,7 +778,6 @@ $(eval $(call KMOD_template,CRYPTO_FCRYPT,crypto-fcrypt,\
,11))
$(eval $(call KMOD_template,CRYPTO_DEFLATE,crypto-deflate,\
- $(MODULES_DIR)/kernel/lib/zlib_inflate/zlib_inflate \
$(MODULES_DIR)/kernel/lib/zlib_deflate/zlib_deflate \
$(MODULES_DIR)/kernel/crypto/deflate \
,10))
diff --git a/package/udev/patches/patch-extras_cdrom_id_cdrom_id_c b/package/udev/patches/patch-extras_cdrom_id_cdrom_id_c
index 06c053779..61c499cd2 100644
--- a/package/udev/patches/patch-extras_cdrom_id_cdrom_id_c
+++ b/package/udev/patches/patch-extras_cdrom_id_cdrom_id_c
@@ -1,6 +1,6 @@
---- udev-142.orig/extras/cdrom_id/cdrom_id.c 2009-04-23 15:02:36.000000000 +0200
-+++ udev-142/extras/cdrom_id/cdrom_id.c 2009-12-12 00:20:04.000000000 +0100
-@@ -140,7 +140,7 @@ static void scsi_cmd_set(struct udev *ud
+--- udev-151.orig/extras/cdrom_id/cdrom_id.c 2009-12-03 13:45:03.000000000 +0100
++++ udev-151/extras/cdrom_id/cdrom_id.c 2010-03-17 22:10:24.984418969 +0100
+@@ -141,7 +141,7 @@ static void scsi_cmd_set(struct udev *ud
cmd->sg_io.mx_sb_len = sizeof(cmd->_sense);
cmd->sg_io.cmdp = cmd->cgc.cmd;
cmd->sg_io.sbp = cmd->_sense.u;
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile
index 977710c4f..d3fd19175 100644
--- a/package/xorg-server/Makefile
+++ b/package/xorg-server/Makefile
@@ -20,6 +20,8 @@ PKG_BUILDDEP+= libX11 randrproto renderproto fixesproto damageproto \
PKG_URL:= http://www.x.org
PKG_SITES:= http://xorg.freedesktop.org/archive/individual/xserver/
+PKG_TARGET_DEPENDS:= !foxboard
+
CFLINE_XORG_SERVER:= depends on ADK_TARGET_WITH_VGA
include $(TOPDIR)/mk/package.mk
diff --git a/target/foxboard/kernel.config b/target/foxboard/kernel.config
index b99fb3403..3d6f17b3f 100644
--- a/target/foxboard/kernel.config
+++ b/target/foxboard/kernel.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.32
-# Mon Feb 1 19:21:16 2010
+# Linux kernel version: 2.6.33
+# Mon Mar 22 13:36:55 2010
#
CONFIG_MMU=y
CONFIG_ZONE_DMA=y
@@ -40,6 +40,7 @@ CONFIG_SYSVIPC_SYSCTL=y
#
CONFIG_TREE_RCU=y
# CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_TINY_RCU is not set
# CONFIG_RCU_TRACE is not set
CONFIG_RCU_FANOUT=32
# CONFIG_RCU_FANOUT_EXACT is not set
@@ -105,14 +106,41 @@ CONFIG_BLOCK=y
# IO Schedulers
#
CONFIG_IOSCHED_NOOP=y
-# CONFIG_IOSCHED_AS is not set
# CONFIG_IOSCHED_DEADLINE is not set
# CONFIG_IOSCHED_CFQ is not set
-# CONFIG_DEFAULT_AS is not set
# CONFIG_DEFAULT_DEADLINE is not set
# CONFIG_DEFAULT_CFQ is not set
CONFIG_DEFAULT_NOOP=y
CONFIG_DEFAULT_IOSCHED="noop"
+# CONFIG_INLINE_SPIN_TRYLOCK is not set
+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK is not set
+# CONFIG_INLINE_SPIN_LOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
+CONFIG_INLINE_SPIN_UNLOCK=y
+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_READ_TRYLOCK is not set
+# CONFIG_INLINE_READ_LOCK is not set
+# CONFIG_INLINE_READ_LOCK_BH is not set
+# CONFIG_INLINE_READ_LOCK_IRQ is not set
+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
+CONFIG_INLINE_READ_UNLOCK=y
+# CONFIG_INLINE_READ_UNLOCK_BH is not set
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_WRITE_TRYLOCK is not set
+# CONFIG_INLINE_WRITE_LOCK is not set
+# CONFIG_INLINE_WRITE_LOCK_BH is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
+CONFIG_INLINE_WRITE_UNLOCK=y
+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
+# CONFIG_MUTEX_SPIN_ON_OWNER is not set
# CONFIG_FREEZER is not set
#
@@ -143,8 +171,6 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
CONFIG_ZONE_DMA_FLAG=1
CONFIG_BOUNCE=y
CONFIG_VIRT_TO_BUS=y
-CONFIG_HAVE_MLOCK=y
-CONFIG_HAVE_MLOCKED_PAGE_BIT=y
# CONFIG_KSM is not set
CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
@@ -264,7 +290,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
# CONFIG_IRDA is not set
# CONFIG_BT is not set
# CONFIG_AF_RXRPC is not set
-# CONFIG_WIRELESS is not set
+CONFIG_WIRELESS=y
+# CONFIG_CFG80211 is not set
+# CONFIG_LIB80211 is not set
+
+#
+# CFG80211 needs to be enabled for MAC80211
+#
# CONFIG_WIMAX is not set
# CONFIG_RFKILL is not set
# CONFIG_NET_9P is not set
@@ -463,8 +495,8 @@ CONFIG_MII=y
# CONFIG_NETDEV_1000 is not set
# CONFIG_NETDEV_10000 is not set
CONFIG_WLAN=y
-# CONFIG_WLAN_PRE80211 is not set
-# CONFIG_WLAN_80211 is not set
+# CONFIG_USB_ZD1201 is not set
+# CONFIG_HOSTAP is not set
#
# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -728,7 +760,11 @@ CONFIG_MAGIC_SYSRQ=y
# CONFIG_KEYS is not set
# CONFIG_SECURITY is not set
# CONFIG_SECURITYFS is not set
-# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+# CONFIG_DEFAULT_SECURITY_SMACK is not set
+# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY=""
CONFIG_CRYPTO=y
#
diff --git a/target/linux/config/Config.in.leds b/target/linux/config/Config.in.leds
index 380193561..2123458e9 100644
--- a/target/linux/config/Config.in.leds
+++ b/target/linux/config/Config.in.leds
@@ -1,11 +1,17 @@
-menu "LEDS driver support"
-depends on ADK_TARGET_WITH_LEDS
-
config ADK_KERNEL_NEW_LEDS
bool
default n
help
+config ADK_KERNEL_LEDS_TRIGGERS
+ bool
+ default n
+ select ADK_KERNEL_NEW_LEDS
+ help
+
+menu "LEDS driver support"
+depends on ADK_TARGET_WITH_LEDS
+
config ADK_KPACKAGE_KMOD_LEDS_CLASS
prompt "LED Class support"
tristate
@@ -13,12 +19,6 @@ config ADK_KPACKAGE_KMOD_LEDS_CLASS
default n
help
-config ADK_KERNEL_LEDS_TRIGGERS
- bool
- default n
- select ADK_KERNEL_NEW_LEDS
- help
-
config ADK_KPACKAGE_KMOD_LEDS_TRIGGER_TIMER
prompt "LED Timer trigger"
tristate
diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice
index 9ba5f6556..043c698d9 100644
--- a/target/linux/config/Config.in.netdevice
+++ b/target/linux/config/Config.in.netdevice
@@ -157,7 +157,6 @@ config ADK_MOD_KERNEL_MAC80211
select ADK_KERNEL_CRC32
select ADK_KERNEL_WIRELESS
select ADK_KERNEL_WLAN_80211
- select ADK_KERNEL_MAC80211_LEDS
default n
menu "Wireless card support"
@@ -205,6 +204,7 @@ config ADK_KPACKAGE_KMOD_ATH5K
select ADK_KERNEL_MAC80211_LEDS
select ADK_KERNEL_ATH_COMMON
depends on ADK_KPACKAGE_KMOD_MAC80211
+ depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI
default n
help
Driver for Atheros 5xxx/24xx cards.
@@ -246,6 +246,7 @@ config ADK_KPACKAGE_KMOD_RT2400PCI
select ADK_KERNEL_RT2X00
select ADK_KERNEL_MAC80211_LEDS
depends on ADK_KPACKAGE_KMOD_MAC80211
+ depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI
help
This adds support for rt2400 wireless chipset family.
Supported chips: RT2460.
@@ -257,6 +258,7 @@ config ADK_KPACKAGE_KMOD_RT2500PCI
select ADK_KERNEL_RT2X00
select ADK_KERNEL_MAC80211_LEDS
depends on ADK_KPACKAGE_KMOD_MAC80211
+ depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI
help
This adds support for rt2500 wireless chipset family.
Supported chips: RT2560.
@@ -270,6 +272,7 @@ config ADK_KPACKAGE_KMOD_RT61PCI
select ADK_KPACKAGE_KMOD_CRC_ITU_T
select ADK_PACKAGE_RT61_FIRMWARE
depends on ADK_KPACKAGE_KMOD_MAC80211
+ depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI
help
This adds support for rt2501 wireless chipset family.
Supported chips: RT2561, RT2561S & RT2661.