diff options
41 files changed, 87782 insertions, 273 deletions
@@ -1,9 +1,4 @@ -- php update -- openssh update +- add support for brcm 2.6 - macos x build -- test on OpenSuSE -- test on Fedora Core - help text for config/ needs adoption - fix watchdog for alix1c (mfgpt timers problem) -- implement rpm package backend -- implement dpkg package backend diff --git a/mk/modules.mk b/mk/modules.mk index fce15c190..a7fc49d8c 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1047,18 +1047,18 @@ $(eval $(call KMOD_template,PCCARD,pccard,\ $(MODULES_DIR)/kernel/drivers/pcmcia/pcmcia_core \ ,40)) -$(eval $(call KMOD_template,PCMCIA,pcmcia,\ - $(MODULES_DIR)/kernel/drivers/pcmcia/pcmcia \ -,50)) - -$(eval $(call KMOD_template,CARDBUS,cardbus,\ +$(eval $(call KMOD_template,YENTA,yenta,\ $(MODULES_DIR)/kernel/drivers/pcmcia/rsrc_nonstatic \ $(MODULES_DIR)/kernel/drivers/pcmcia/yenta_socket \ ,50)) -$(eval $(call KMOD_template,PCMCIA_SERIAL_CS,pcmcia-serial-cs,\ +$(eval $(call KMOD_template,PCMCIA,pcmcia,\ + $(MODULES_DIR)/kernel/drivers/pcmcia/pcmcia \ +,60)) + +$(eval $(call KMOD_template,SERIAL_8250_CS,serial-8250-cs,\ $(MODULES_DIR)/kernel/drivers/serial/serial_cs \ -,55)) +,70)) # # Input diff --git a/mk/rootfs.mk b/mk/rootfs.mk index b91a58629..2e3bd52b0 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -10,6 +10,11 @@ endef ifeq ($(ADK_LINUX_MIPS_RB532),y) ROOTFS:= root=/dev/sda2 +MTDDEV:= root=/dev/mtdblock1 +endif + +ifeq ($(ADK_LINUX_MIPS_RB433),y) +MTDDEV:= root=/dev/mtdblock2 endif ifeq ($(ADK_LINUX_ARM_FOXBOARD),y) @@ -22,7 +27,7 @@ $(eval $(call rootfs_template,archive,ARCHIVE)) $(eval $(call rootfs_template,initramfs,INITRAMFS)) $(eval $(call rootfs_template,initramfs-piggyback,INITRAMFS_PIGGYBACK)) $(eval $(call rootfs_template,squashfs,SQUASHFS)) -$(eval $(call rootfs_template,yaffs,YAFFS,root=/dev/mtdblock1 panic=3)) +$(eval $(call rootfs_template,yaffs,YAFFS,$(MTDDEV) panic=3)) $(eval $(call rootfs_template,nfsroot,NFSROOT,root=/dev/nfs ip=dhcp init=/init)) $(eval $(call rootfs_template,encrypted,ENCRYPTED)) diff --git a/package/Config.in b/package/Config.in index 5f1a0bdd4..265e222fd 100644 --- a/package/Config.in +++ b/package/Config.in @@ -56,6 +56,7 @@ source "package/xz/Config.in" endmenu menu "Cryptography" +source "package/ccid/Config.in" source "package/cryptsetup/Config.in" source "package/gnupg/Config.in" source "package/gnutls/Config.in" @@ -65,6 +66,7 @@ source "package/openct/Config.in" source "package/opensc/Config.in" source "package/openssl/Config.in" source "package/openssl-pkcs11/Config.in" +source "package/pcsc-lite/Config.in" source "package/rng-tools/Config.in" endmenu @@ -579,9 +581,11 @@ source "package/hdparm/Config.in" source "package/usbutils/Config.in" source "package/patch/Config.in" source "package/pciutils/Config.in" +source "package/pcmciautils/Config.in" source "package/procps/Config.in" source "package/sispmctl/Config.in" source "package/stress/Config.in" +source "package/sysfsutils/Config.in" source "package/sysstat/Config.in" source "package/swconfig/Config.in" source "package/udev/Config.in" diff --git a/package/adkinstall/Makefile b/package/adkinstall/Makefile index 5a1823cc3..944c073fb 100644 --- a/package/adkinstall/Makefile +++ b/package/adkinstall/Makefile @@ -10,7 +10,7 @@ PKG_DESCR:= installer for cf, mmc, sd or mtd devices PKG_SECTION:= base PKG_DEPENDS:= parted sfdisk e2fsprogs -PKG_TARGET_DEPENDS:= alix wrap rb532 foxg20 +PKG_TARGET_DEPENDS:= alix wrap rb532 foxg20 rb411 rb433 WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION} NO_DISTFILES:= 1 @@ -34,6 +34,12 @@ ifeq ($(ADK_LINUX_MIPS_RB532),y) else ifeq ($(ADK_LINUX_ARM_FOXBOARD),y) ${INSTALL_BIN} ./src/adkinstall.foxg20 \ $(IDIR_ADKINSTALL)/sbin/adkinstall +else ifeq ($(ADK_LINUX_MIPS_RB433),y) + ${INSTALL_BIN} ./src/adkinstall.rb4xx \ + $(IDIR_ADKINSTALL)/sbin/adkinstall +else ifeq ($(ADK_LINUX_MIPS_RB411),y) + ${INSTALL_BIN} ./src/adkinstall.rb4xx \ + $(IDIR_ADKINSTALL)/sbin/adkinstall else ${INSTALL_BIN} ./src/adkinstall $(IDIR_ADKINSTALL)/sbin endif diff --git a/package/base-files/src/lib/mdev/init b/package/base-files/src/lib/mdev/init index de368c80c..eec8242a1 100644 --- a/package/base-files/src/lib/mdev/init +++ b/package/base-files/src/lib/mdev/init @@ -14,3 +14,9 @@ if [ "$SUBSYSTEM" == "firmware" ];then fi fi fi +if [ "$SUBSYSTEM" == "pcmcia_socket" ];then + logger "Setting up PCMCIA socket resource database" + if [ "$ACTION" == "add" ];then + /usr/sbin/pcmcia-socket-startup + fi +fi diff --git a/package/base-files/src/sbin/adkupdate b/package/base-files/src/sbin/adkupdate index 1af188b41..dd8d3ecec 100755 --- a/package/base-files/src/sbin/adkupdate +++ b/package/base-files/src/sbin/adkupdate @@ -34,6 +34,8 @@ prepare() { mount -o remount,rw / if [ "$system" == "RB532" ];then mount -t yaffs2 /dev/mtdblock0 /boot + elif [ "$system" == "AR7130" ];then + mount -t yaffs2 /dev/mtdblock1 /boot elif [ "$system" == "FOXG20" ];then mount -t vfat /dev/mmcblk0p1 /boot fi @@ -89,6 +91,8 @@ if [ -x /sbin/cfgfs ];then fi if [ "$system" == "RB532" ];then umount -f /boot +elif [ "$system" == "AR7130" ];then + umount -f /boot elif [ "$system" == "FOXG20" ];then umount -f /boot fi diff --git a/package/ccid/Makefile b/package/ccid/Makefile new file mode 100644 index 000000000..2e63a888c --- /dev/null +++ b/package/ccid/Makefile @@ -0,0 +1,28 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= ccid +PKG_VERSION:= 1.3.12 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 7fcdbacacd955659286f988fa9b6e0be +PKG_DESCR:= a generic USB CCID and ICCD driver +PKG_SECTION:= security +PKG_URL:= http://pcsclite.alioth.debian.org/ccid.html +PKG_SITES:= https://alioth.debian.org/frs/download.php/3281/ + +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,CCID,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_ARGS+= --enable-twinserial + +post-install: + $(INSTALL_DIR) $(IDIR_CCID)/usr/pcsc/drivers/serial + $(CP) $(WRKINST)/usr/pcsc/drivers/serial/libccidtwin.so* \ + $(IDIR_CCID)/usr/pcsc/drivers/serial + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile index 1b9897807..4eb72170e 100644 --- a/package/cfgfs/Makefile +++ b/package/cfgfs/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 2 PKG_DESCR:= compressed config filesystem PKG_SECTION:= base -PKG_TARGET_DEPENDS:= alix wrap foxboard ag241 rb532 foxg20 +PKG_TARGET_DEPENDS:= alix wrap foxboard ag241 rb532 foxg20 rb411 rb433 WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION} NO_DISTFILES:= 1 diff --git a/package/nand/Makefile b/package/nand/Makefile index f904bc910..dc6292c01 100644 --- a/package/nand/Makefile +++ b/package/nand/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 3 PKG_DESCR:= NAND utility PKG_SECTION:= base -PKG_TARGET_DEPENDS:= rb532 +PKG_TARGET_DEPENDS:= rb532 rb411 rb433 NO_DISTFILES:= 1 diff --git a/package/opensc/Makefile b/package/opensc/Makefile index 702a38751..2cf89050e 100644 --- a/package/opensc/Makefile +++ b/package/opensc/Makefile @@ -4,11 +4,12 @@ include ${TOPDIR}/rules.mk PKG_NAME:= opensc -PKG_VERSION:= 0.11.8 +PKG_VERSION:= 0.11.13 PKG_RELEASE:= 1 -PKG_MD5SUM:= a269b478b18dddb648b9bd930206b5a8 +PKG_MD5SUM:= 98fa151e947941f9c3f27420fdf47c11 PKG_DESCR:= a set of libraries and utilities to access smart cards PKG_SECTION:= crypto +PKG_BUILDDEP+= libtool PKG_URL:= http://www.opensc-project.org/opensc PKG_SITES:= http://www.opensc-project.org/files/opensc/ diff --git a/package/pcmciautils/Makefile b/package/pcmciautils/Makefile new file mode 100644 index 000000000..d99b1a7d1 --- /dev/null +++ b/package/pcmciautils/Makefile @@ -0,0 +1,32 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= pcmciautils +PKG_VERSION:= 017 +PKG_RELEASE:= 1 +PKG_MD5SUM:= ee5837214d297661c8b8189055a351fc +PKG_DESCR:= Utilities for PCMCIA subsystem +PKG_SECTION:= utils +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/ + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,PCMCIAUTILS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIG_STYLE= manual + +post-install: + $(INSTALL_DIR) $(IDIR_PCMCIAUTILS)/etc/pcmcia + $(INSTALL_DATA) ./files/config.opts \ + $(IDIR_PCMCIAUTILS)/etc/pcmcia + $(INSTALL_DIR) $(IDIR_PCMCIAUTILS)/usr/sbin + $(INSTALL_BIN) $(WRKINST)/sbin/pccardctl \ + $(IDIR_PCMCIAUTILS)/usr/sbin + $(INSTALL_BIN) $(WRKINST)/lib/udev/pcmcia-socket-startup \ + $(IDIR_PCMCIAUTILS)/usr/sbin + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/pcmciautils/files/config.opts b/package/pcmciautils/files/config.opts new file mode 100644 index 000000000..868ab48c4 --- /dev/null +++ b/package/pcmciautils/files/config.opts @@ -0,0 +1,34 @@ +# +# Local PCMCIA Configuration File +# +#---------------------------------------------------------------------- +# +# System resources available for PCMCIA cards +# +# NOTE: these settings have no effect on resources assigned to a +# CardBus bridge device itself; this file only affects resources +# assigned to cards. Also, interrupt settings here will only affect +# ISA bus interrupts assigned to 16-bit cards. PCI interrupts +# generally can't be reconfigured. +# +# With the kernel PCMCIA subsystem, these settings also have no effect +# at all on resources used for 32-bit CardBus cards. Those are set by +# the PCI hotplug subsystem. +# + +include port 0x100-0x3af +include port 0x3e0-0x4ff +include port 0x820-0x8ff +include port 0xc00-0xcf7 + +include memory 0xc0000-0xfffff +include memory 0xa0000000-0xa0ffffff +include memory 0x60000000-0x60ffffff + +# These may hurt on FSC. +# include port 0x3c0-0x3d2 +# Exclude 0x3d3 as Radeon IGP MCE's if you touch these ports +# include port 0x3d4-0x3df + +# High port numbers do not always work... +# include port 0x1000-0x17ff diff --git a/package/pcmciautils/patches/patch-Makefile b/package/pcmciautils/patches/patch-Makefile new file mode 100644 index 000000000..821753ddc --- /dev/null +++ b/package/pcmciautils/patches/patch-Makefile @@ -0,0 +1,11 @@ +--- pcmciautils-017.orig/Makefile 2010-01-06 16:47:45.000000000 +0100 ++++ pcmciautils-017/Makefile 2010-05-13 14:06:30.741613760 +0200 +@@ -94,7 +94,7 @@ PWD = $(shell pwd) + # If you are running a cross compiler, you may want to set this + # to something more interesting, like "arm-linux-". If you want + # to compile vs uClibc, that can be done here as well. +-CROSS = #/usr/i386-linux-uclibc/usr/bin/i386-uclibc- ++CROSS ?= #/usr/i386-linux-uclibc/usr/bin/i386-uclibc- + CC = $(CROSS)gcc + LD = $(CROSS)gcc + AR = $(CROSS)ar diff --git a/package/pcsc-lite/Makefile b/package/pcsc-lite/Makefile new file mode 100644 index 000000000..b81a64d27 --- /dev/null +++ b/package/pcsc-lite/Makefile @@ -0,0 +1,36 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= pcsc-lite +PKG_VERSION:= 1.6.0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= fc3fd0e83090ecc81e5b32700fa246c2 +PKG_DESCR:= middleware for smartcards +PKG_SECTION:= security +PKG_BUILDDEP+= libusb libusb-compat +PKG_DEPENDS:= libusb libusb-compat libpthread ccid +PKG_URL:= http://pcsclite.alioth.debian.org/ +PKG_SITES:= https://alioth.debian.org/frs/download.php/3279/ + +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,PCSC_LITE,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_ARGS+= --disable-libhal + +post-install: + $(INSTALL_DIR) $(IDIR_PCSC_LITE)/etc + $(INSTALL_DIR) $(IDIR_PCSC_LITE)/usr/sbin + $(INSTALL_DIR) $(IDIR_PCSC_LITE)/usr/lib + $(INSTALL_DATA) ./files/reader.conf \ + $(IDIR_PCSC_LITE)/etc + $(INSTALL_BIN) $(WRKINST)/usr/sbin/pcscd \ + $(IDIR_PCSC_LITE)/usr/sbin + $(CP) $(WRKINST)/usr/lib/libpcsclite.so* \ + $(IDIR_PCSC_LITE)/usr/lib + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/pcsc-lite/files/pcscd.init b/package/pcsc-lite/files/pcscd.init new file mode 100644 index 000000000..557762eca --- /dev/null +++ b/package/pcsc-lite/files/pcscd.init @@ -0,0 +1,27 @@ +#!/bin/sh +#PKG pcscd +#INIT 80 + +. /etc/rc.conf + +case $1 in +autostop) ;; +autostart) + test x"${pcscd:-NO}" = x"NO" && exit 0 + exec sh $0 start + ;; +start) + pcscd + ;; +stop) + pkill pcscd + ;; +restart) + sh $0 stop + sh $0 start + ;; +*) + echo "usage: $0 {start | stop | restart}" + ;; +esac +exit $? diff --git a/package/pcsc-lite/files/pcscd.postinst b/package/pcsc-lite/files/pcscd.postinst new file mode 100644 index 000000000..1b27f479d --- /dev/null +++ b/package/pcsc-lite/files/pcscd.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf pcscd pcscd NO diff --git a/package/pcsc-lite/files/reader.conf b/package/pcsc-lite/files/reader.conf new file mode 100644 index 000000000..f56f290fb --- /dev/null +++ b/package/pcsc-lite/files/reader.conf @@ -0,0 +1,16 @@ +# FRIENDLYNAME Any name +# DEVICENAME device filename used by the reader: +# /dev/ttyS0 for the first serial port +# or /dev/null if this is not used by the driver +# LIBPATH Location of the driver library for your reader +# CHANNELID +# 0x0103F8 or 1 for /dev/ttyS0 (COM1) +# 0x0102F8 or 2 for /dev/ttyS1 (COM2) +# 0x0103E8 or 3 for /dev/ttyS2 (COM3) +# 0x0102E8 or 4 for /dev/ttyS3 (COM4) +# + +FRIENDLYNAME "GemPCTwin serial" +DEVICENAME /dev/ttyS0 +LIBPATH /usr/pcsc/drivers/serial/libccidtwin.so +CHANNELID 0 diff --git a/package/sysfsutils/Makefile b/package/sysfsutils/Makefile new file mode 100644 index 000000000..33bc0b905 --- /dev/null +++ b/package/sysfsutils/Makefile @@ -0,0 +1,27 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= sysfsutils +PKG_VERSION:= 2.1.0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 14e7dcd0436d2f49aa403f67e1ef7ddc +PKG_DESCR:= utilites built upon sysfs +PKG_SECTION:= utils +PKG_URL:= http://linux-diag.sourceforge.net/Sysfsutils.html +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=linux-diag/sysfsutils/2.1.0/} + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,SYSFSUTILS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +post-install: + $(INSTALL_DIR) $(IDIR_SYSFSUTILS)/usr/bin + $(INSTALL_DIR) $(IDIR_SYSFSUTILS)/usr/lib + $(CP) $(WRKINST)/usr/lib/libsysfs.so* \ + $(IDIR_SYSFSUTILS)/usr/lib + $(INSTALL_BIN) $(WRKINST)/usr/bin/systool \ + $(IDIR_SYSFSUTILS)/usr/bin + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index 854712190..c3724740f 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -38,14 +38,15 @@ if [[ -n $ADK_PACKAGE_FIREFOX ]]; then NEED_LIBIDL="$NEED_LIBIDL firefox" fi -if [[ -n $ADK_PACKAGE_LIBUSB ]]; then - NEED_BISON="$NEED_BISON libusb" -fi - if [[ -n $ADK_COMPILE_HEIMDAL ]]; then NEED_BISON="$NEED_BISON heimdal-server" fi +if [[ -n $ADK_COMPILE_PCMCIAUTILS ]]; then + NEED_BISON="$NEED_BISON pcmciautils" + NEED_FLEX="$NEED_FLEX pcmciautils" +fi + if [[ -n $ADK_PACKAGE_XKEYBOARD_CONFIG ]]; then NEED_XKBCOMP="$NEED_XKBCOMP xkeyboard-config" fi diff --git a/target/Config.in b/target/Config.in index 06638ad4d..1e4836592 100644 --- a/target/Config.in +++ b/target/Config.in @@ -116,10 +116,7 @@ config ADK_x86_64_qemu config ADK_rb532 tristate -config ADK_rb411 - tristate - -config ADK_rb433 +config ADK_rb4xx tristate config ADK_zaurus @@ -182,8 +179,7 @@ config ADK_TARGET default "foxg20" if ADK_foxg20 default "native" if ADK_NATIVE default "rb532" if ADK_rb532 - default "rb411" if ADK_rb411 - default "rb433" if ADK_rb433 + default "rb4xx" if ADK_rb4xx default "zaurus" if ADK_arm default "lemote" if ADK_lemote default "ibmx40" if ADK_ibmx40 @@ -699,35 +695,30 @@ prompt "Routerboard model" default ADK_LINUX_MIPS_RB532 depends on ADK_LINUX_MIKROTIK -config ADK_LINUX_MIPS_RB411 - bool "Mikrotik Routerboard 411" - select ADK_rb411 - select ADK_KERNEL_NETDEVICES - select ADK_KERNEL_NET_PCI - select ADK_KERNEL_NETDEV_1000 - select ADK_KERNEL_NET_ETHERNET - select ADK_TARGET_WITH_MINIPCI - depends on ADK_BROKEN - help - Support for Mikrotik RB411. - Status: development - -config ADK_LINUX_MIPS_RB433 - bool "Mikrotik Routerboard 433" - select ADK_rb433 +config ADK_LINUX_MIPS_RB4XX + bool "Mikrotik Routerboard 411/433" + select ADK_rb4xx + select ADK_KERNEL_MISC_FILESYSTEMS + select ADK_KERNEL_YAFFS_FS + select ADK_KERNEL_YAFFS_YAFFS2 + select ADK_KERNEL_YAFFS_AUTO_YAFFS2 select ADK_KERNEL_NETDEVICES select ADK_KERNEL_NET_PCI select ADK_KERNEL_NETDEV_1000 select ADK_KERNEL_NET_ETHERNET select ADK_TARGET_WITH_MINIPCI - depends on ADK_BROKEN + select ADK_TARGET_WITH_WATCHDOG help - Support for Mikrotik RB433. - Status: development + Support for Mikrotik RB411/RB433. + Status: stable config ADK_LINUX_MIPS_RB532 bool "Mikrotik Routerboard 532" select ADK_rb532 + select ADK_KERNEL_MISC_FILESYSTEMS + select ADK_KERNEL_YAFFS_FS + select ADK_KERNEL_YAFFS_YAFFS2 + select ADK_KERNEL_YAFFS_AUTO_YAFFS2 select ADK_KERNEL_NETDEVICES select ADK_KERNEL_NET_PCI select ADK_KERNEL_NET_ETHERNET @@ -785,8 +776,7 @@ config ADK_TARGET_LIB_EGLIBC ADK_LINUX_X86_ALIX2D || \ ADK_LINUX_X86_ALIX2D13 || \ ADK_LINUX_X86_WRAP || \ - ADK_LINUX_MIPS_RB411 || \ - ADK_LINUX_MIPS_RB433 || \ + ADK_LINUX_MIPS_RB4XX || \ ADK_LINUX_MIPS_RB532 || \ ADK_LINUX_X86_64_SHUTTLE || \ ADK_LINUX_MIPS64_LEMOTE || \ @@ -805,6 +795,7 @@ config ADK_TARGET_LIB_GLIBC ADK_LINUX_X86_ALIX2D13 || \ ADK_LINUX_X86_WRAP || \ ADK_LINUX_MIPS_RB532 || \ + ADK_LINUX_MIPS_RB4XX || \ ADK_LINUX_X86_64_SHUTTLE || \ ADK_LINUX_RESCUE || \ ADK_LINUX_MIPS64_LEMOTE || \ @@ -868,8 +859,7 @@ config ADK_TARGET_ROOTFS_YAFFS select ADK_KERNEL_YAFFS_YAFFS2 depends on \ ADK_LINUX_MIPS_RB532 || \ - ADK_LINUX_MIPS_RB433 || \ - ADK_LINUX_MIPS_RB411 + ADK_LINUX_MIPS_RB4XX help Root filesystem on NAND. @@ -883,8 +873,7 @@ config ADK_TARGET_ROOTFS_NFSROOT ADK_LINUX_X86_ALIX2D13 || \ ADK_LINUX_X86_WRAP || \ ADK_LINUX_MIPS_RB532 || \ - ADK_LINUX_MIPS_RB433 || \ - ADK_LINUX_MIPS_RB411 || \ + ADK_LINUX_MIPS_RB4XX || \ ADK_LINUX_MIPS_WAG54G || \ ADK_LINUX_MIPS_AG241 || \ ADK_LINUX_MIPS64_LEMOTE diff --git a/target/bulk.lst b/target/bulk.lst index 9771be429..ff3447866 100644 --- a/target/bulk.lst +++ b/target/bulk.lst @@ -1,18 +1,15 @@ ag241 uclibc nfsroot foxboard uclibc nfsroot foxg20 uclibc nfsroot +rb4xx uclibc nfsroot +rb4xx eglibc nfsroot +rb4xx glibc nfsroot rb532 uclibc nfsroot rb532 eglibc nfsroot rb532 glibc nfsroot alix1c uclibc nfsroot alix1c eglibc nfsroot alix1c glibc nfsroot -alix2d uclibc nfsroot -alix2d eglibc nfsroot -alix2d glibc nfsroot -alix2d13 uclibc nfsroot -alix2d13 eglibc nfsroot -alix2d13 glibc nfsroot wrap uclibc nfsroot wrap eglibc nfsroot wrap glibc nfsroot @@ -32,3 +29,7 @@ x86_64_qemu uclibc archive x86_64_qemu eglibc archive x86_64_qemu glibc archive lemote eglibc archive +lemote glibc archive +ibmx40 uclibc archive +ibmx40 eglibc archive +ibmx40 glibc archive diff --git a/target/ibmx40/kernel.config b/target/ibmx40/kernel.config index c1190ba62..ff04d19be 100644 --- a/target/ibmx40/kernel.config +++ b/target/ibmx40/kernel.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.33.2 -# Mon Apr 12 21:50:04 2010 +# Linux kernel version: 2.6.33-rc2-zen1 "Blue Chair" +# Sun Jan 10 23:31:23 2010 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -46,7 +46,6 @@ CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y CONFIG_GENERIC_IRQ_PROBE=y -CONFIG_X86_32_LAZY_GS=y CONFIG_KTIME_SCALAR=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" CONFIG_CONSTRUCTORS=y @@ -54,28 +53,30 @@ CONFIG_CONSTRUCTORS=y # # General setup # +# CONFIG_SCHED_BFS is not set CONFIG_EXPERIMENTAL=y CONFIG_BROKEN_ON_SMP=y CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 -CONFIG_LOCALVERSION="" -# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_LOCALVERSION="-zen-nuty" +CONFIG_LOCALVERSION_AUTO=y CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y CONFIG_HAVE_KERNEL_LZMA=y -CONFIG_HAVE_KERNEL_LZO=y -# CONFIG_KERNEL_GZIP is not set +CONFIG_KERNEL_GZIP=y # CONFIG_KERNEL_BZIP2 is not set -CONFIG_KERNEL_LZMA=y -# CONFIG_KERNEL_LZO is not set -# CONFIG_SWAP is not set +# CONFIG_KERNEL_LZMA is not set +CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_MQUEUE_SYSCTL=y -# CONFIG_BSD_PROCESS_ACCT is not set +CONFIG_BSD_PROCESS_ACCT=y +# CONFIG_BSD_PROCESS_ACCT_V3 is not set # CONFIG_TASKSTATS is not set -# CONFIG_AUDIT is not set +CONFIG_AUDIT=y +CONFIG_AUDITSYSCALL=y +CONFIG_AUDIT_TREE=y # # RCU Subsystem @@ -89,31 +90,42 @@ CONFIG_RCU_FANOUT=32 # CONFIG_TREE_RCU_TRACE is not set CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=15 +CONFIG_LOG_BUF_SHIFT=16 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y # CONFIG_GROUP_SCHED is not set # CONFIG_CGROUPS is not set # CONFIG_SYSFS_DEPRECATED_V2 is not set -# CONFIG_RELAY is not set -# CONFIG_NAMESPACES is not set +CONFIG_RELAY=y +CONFIG_NAMESPACES=y +# CONFIG_UTS_NS is not set +# CONFIG_IPC_NS is not set +# CONFIG_USER_NS is not set +# CONFIG_PID_NS is not set +# CONFIG_NET_NS is not set CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" -# CONFIG_RD_GZIP is not set -# CONFIG_RD_BZIP2 is not set +CONFIG_RD_GZI |