From 72352a678de50a08efe346f0ff195f116739295a Mon Sep 17 00:00:00 2001 From: Juergen Beisert Date: Wed, 11 Apr 2012 21:29:03 +0200 Subject: BSP/platforms: back to development Signed-off-by: Juergen Beisert --- ChangeLog | 4 ++ configs/arm-qemu-2011.11.0/Changelog | 4 ++ configs/arm-qemu-2011.11.0/platformconfig | 16 ++++-- configs/i586-qemu-2011.11.0/Changelog | 4 ++ configs/i586-qemu-2011.11.0/platformconfig | 16 ++++-- configs/ptxconfig | 82 ++++++++++++++++++++++-------- 6 files changed, 97 insertions(+), 29 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2819c48..d2ed6a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-04-11 Juergen Beisert + + * BSP: back to development + 2011-11-16 Juergen Beisert * BSP: using the current ptxdist-2011.11.0 diff --git a/configs/arm-qemu-2011.11.0/Changelog b/configs/arm-qemu-2011.11.0/Changelog index 67a567e..1ad5349 100644 --- a/configs/arm-qemu-2011.11.0/Changelog +++ b/configs/arm-qemu-2011.11.0/Changelog @@ -1,3 +1,7 @@ +2012-04-11 Juergen Beisert + + * platform: back to development + 2011-11-16 Juergen Beisert * platform: diff --git a/configs/arm-qemu-2011.11.0/platformconfig b/configs/arm-qemu-2011.11.0/platformconfig index 3508cc7..2820754 100644 --- a/configs/arm-qemu-2011.11.0/platformconfig +++ b/configs/arm-qemu-2011.11.0/platformconfig @@ -1,8 +1,10 @@ # # Automatically generated make config: don't edit -# PTXdist 2011.11.0 +# PTXdist 2012.04.0-00019-g6548ee2 # -PTXCONF_PLATFORMCONFIG_VERSION="2011.11.0" +PTXCONF_PLATFORMCONFIG_VERSION="2012.04.0-00019-g6548ee2" +PTXCONF_RUNTIME=y +PTXCONF_BUILDTIME=y PTXCONF__platformconfig_MAGIC__=y # @@ -17,7 +19,7 @@ PTXCONF__platformconfig_MAGIC__=y # ------------------------------------ # PTXCONF_PLATFORM="versatilepb" -PTXCONF_PLATFORM_VERSION="-2011.11.0" +PTXCONF_PLATFORM_VERSION="-master" # # architecture @@ -114,12 +116,17 @@ PTXCONF_KERNEL_EXTRA_MAKEVARS="CONFIG_DEBUG_SECTION_MISMATCH=y" PTXCONF_CONSOLE_NAME="ttyAMA0" PTXCONF_CONSOLE_SPEED="115200" +# +# extra kernel +# + # # bootloaders # # PTXCONF_AT91BOOTSTRAP is not set # PTXCONF_AT91BOOTSTRAP2 is not set # PTXCONF_BAREBOX is not set +# PTXCONF_BAREBOX_MLO is not set # PTXCONF_GRUB is not set # PTXCONF_HOST_MXS_UTILS is not set # PTXCONF_U_BOOT_V2 is not set @@ -148,6 +155,7 @@ PTXCONF_IMAGE_HD_PART1_END="306975" PTXCONF_IMAGE_HD_PART1_TYPE="0x83" # PTXCONF_IMAGE_HD_PART2 is not set PTXCONF_IMAGE_HD_PART1_CONTENT="${IMAGEDIR}/root.ext2" +# PTXCONF_IMAGE_VDI is not set # # ipkg options @@ -186,7 +194,7 @@ PTXCONF_HOST_GENPART=y # PTXCONF_HOST_MTOOLS is not set # PTXCONF_HOST_OPENSSL is not set # PTXCONF_HOST_SQUASHFS_TOOLS is not set -PTXCONF_HOST_UMKIMAGE=y +PTXCONF_HOST_U_BOOT_TOOLS=y # PTXCONF_HOST_UTIL_LINUX_NG is not set # PTXCONF_HOST_XL_TOOLS is not set # PTXCONF_HOST_XZ is not set diff --git a/configs/i586-qemu-2011.11.0/Changelog b/configs/i586-qemu-2011.11.0/Changelog index 2e75559..e678731 100644 --- a/configs/i586-qemu-2011.11.0/Changelog +++ b/configs/i586-qemu-2011.11.0/Changelog @@ -1,3 +1,7 @@ +2012-04-11 Juergen Beisert + + * platform: back to development + 2011-11-16 Juergen Beisert * platform: diff --git a/configs/i586-qemu-2011.11.0/platformconfig b/configs/i586-qemu-2011.11.0/platformconfig index c91c0e8..5bf7090 100644 --- a/configs/i586-qemu-2011.11.0/platformconfig +++ b/configs/i586-qemu-2011.11.0/platformconfig @@ -1,8 +1,10 @@ # # Automatically generated make config: don't edit -# PTXdist 2011.11.0 +# PTXdist 2012.04.0-00019-g6548ee2 # -PTXCONF_PLATFORMCONFIG_VERSION="2011.11.0" +PTXCONF_PLATFORMCONFIG_VERSION="2012.04.0-00019-g6548ee2" +PTXCONF_RUNTIME=y +PTXCONF_BUILDTIME=y PTXCONF__platformconfig_MAGIC__=y # @@ -17,7 +19,7 @@ PTXCONF__platformconfig_MAGIC__=y # ------------------------------------ # PTXCONF_PLATFORM="i586" -PTXCONF_PLATFORM_VERSION="-2011.11.0" +PTXCONF_PLATFORM_VERSION="-master" # # architecture @@ -119,11 +121,16 @@ PTXCONF_KERNEL_EXTRA_MAKEVARS="CONFIG_DEBUG_SECTION_MISMATCH=y" PTXCONF_CONSOLE_NAME="ttyS0" PTXCONF_CONSOLE_SPEED="115200" +# +# extra kernel +# + # # bootloaders # # PTXCONF_AT91BOOTSTRAP2 is not set # PTXCONF_BAREBOX is not set +# PTXCONF_BAREBOX_MLO is not set # PTXCONF_GRUB is not set # PTXCONF_HOST_MXS_UTILS is not set # PTXCONF_SYSLINUX is not set @@ -152,6 +159,7 @@ PTXCONF_IMAGE_HD_PART1_END="306975" PTXCONF_IMAGE_HD_PART1_TYPE="0x83" # PTXCONF_IMAGE_HD_PART2 is not set PTXCONF_IMAGE_HD_PART1_CONTENT="${IMAGEDIR}/root.ext2" +# PTXCONF_IMAGE_VDI is not set # # ipkg options @@ -194,7 +202,7 @@ PTXCONF_HOST_GENPART=y # PTXCONF_HOST_MTOOLS is not set # PTXCONF_HOST_OPENSSL is not set # PTXCONF_HOST_SQUASHFS_TOOLS is not set -# PTXCONF_HOST_UMKIMAGE is not set +# PTXCONF_HOST_U_BOOT_TOOLS is not set # PTXCONF_HOST_UTIL_LINUX_NG is not set # PTXCONF_HOST_XL_TOOLS is not set PTXCONF_HOST_XZ=y diff --git a/configs/ptxconfig b/configs/ptxconfig index 6de63a6..0b5add7 100644 --- a/configs/ptxconfig +++ b/configs/ptxconfig @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# PTXdist 2011.11.0 +# PTXdist 2012.04.0-00019-g6548ee2 # PTXCONF_MODULES=y @@ -17,7 +17,7 @@ PTXCONF_MODULES=y # PTXCONF_PROJECT_VENDOR="PTX" PTXCONF_PROJECT="Generic" -PTXCONF_PROJECT_VERSION="-2011.11.0" +PTXCONF_PROJECT_VERSION="-master" # # ------------------------------------ @@ -32,7 +32,9 @@ PTXCONF_PROJECT_BUILD_DEVEL=y # PTXCONF_PROJECT_USE_LOCAL_PLATFORM is not set # PTXCONF_PROJECT_CREATE_DEVPKGS is not set # PTXCONF_PROJECT_USE_DEVPKGS is not set -PTXCONF_CONFIGFILE_VERSION="2011.11.0" +PTXCONF_RUNTIME=y +PTXCONF_BUILDTIME=y +PTXCONF_CONFIGFILE_VERSION="2012.04.0-00019-g6548ee2" PTXCONF__ptxconfig_MAGIC__=y # @@ -70,6 +72,7 @@ PTXCONF_HOST_AUTOTOOLS_LIBTOOL=y # PTXCONF_HOST_DOSFSTOOLS is not set # PTXCONF_HOST_E2FSPROGS is not set # PTXCONF_HOST_EGGDBUS is not set +PTXCONF_HOST_ELF_H_COMPAT=y # PTXCONF_HOST_EXPAT is not set PTXCONF_HOST_FAKEROOT=y PTXCONF_HOST_FIGLET=y @@ -114,7 +117,7 @@ PTXCONF_HOST_PKG_CONFIG=y # PTXCONF_HOST_QT4 is not set # PTXCONF_HOST_SQUASHFS_TOOLS is not set # PTXCONF_HOST_TIMEOUT is not set -# PTXCONF_HOST_UMKIMAGE is not set +# PTXCONF_HOST_U_BOOT_TOOLS is not set # PTXCONF_HOST_USPLASH is not set # PTXCONF_HOST_UTIL_LINUX_NG is not set # PTXCONF_HOST_XCB_PROTO is not set @@ -213,6 +216,7 @@ PTXCONF_UDEV_BBINIT_LINK="S00udev" PTXCONF_INITMETHOD_BBINIT_LINK_MODULES="S98modules" PTXCONF_INITMETHOD_BBINIT_LINK_NETWORKING="S26networking" PTXCONF_RC_ONCE=y +PTXCONF_OS_RELEASE=y # # directories in rootfs @@ -254,6 +258,7 @@ PTXCONF_ROOTFS_HOSTNAME=y PTXCONF_ROOTFS_ETC_HOSTNAME="qemu" PTXCONF_ROOTFS_HOSTS=y PTXCONF_ROOTFS_ISSUE=y +# PTXCONF_ROOTFS_MODPROBE_CONF is not set PTXCONF_ROOTFS_NSSWITCH_CONF=y PTXCONF_ROOTFS_PROFILE=y PTXCONF_ROOTFS_PROTOCOLS=y @@ -1173,12 +1178,13 @@ PTXCONF_BUSYBOX_LOGGER=y # PTXCONF_SUDO is not set # PTXCONF_SYSTEMD is not set # PTXCONF_TIMEOUT is not set +# PTXCONF_U_BOOT_TOOLS is not set PTXCONF_UDEV=y # # build options # -PTXCONF_UDEV_EXPERIMENTAL=y +PTXCONF_UDEV_LEGACY=y # PTXCONF_UDEV_DEBUG is not set # PTXCONF_UDEV_SYSLOG is not set @@ -1186,16 +1192,33 @@ PTXCONF_UDEV_EXPERIMENTAL=y # install options # PTXCONF_UDEV_ETC_CONF=y -PTXCONF_UDEV_DEFAULT_RULES=y -PTXCONF_UDEV_DEFAULT_DRIVERS_RULES=y -# PTXCONF_UDEV_DEFAULT_KEYMAPS is not set +PTXCONF_UDEV_DRIVERS_RULES=y +# PTXCONF_UDEV_KEYMAPS is not set # PTXCONF_UDEV_CUST_RULES is not set # PTXCONF_UDEV_LIBUDEV is not set # PTXCONF_UDEV_LIBGUDEV is not set PTXCONF_UDEV_STARTSCRIPT=y -# PTXCONF_UDEV_EXTRAS is not set + +# +# persistent device node links +# +# PTXCONF_UDEV_PERSISTENT_ATA is not set +# PTXCONF_UDEV_PERSISTENT_CDROM is not set +# PTXCONF_UDEV_PERSISTENT_EDD is not set +# PTXCONF_UDEV_PERSISTENT_GENERATOR is not set +# PTXCONF_UDEV_PERSISTENT_PCI is not set +# PTXCONF_UDEV_PERSISTENT_USB is not set +# PTXCONF_UDEV_PERSISTENT_SCSI is not set +# PTXCONF_UDEV_PERSISTENT_V4L is not set + +# +# misc helper +# +# PTXCONF_UDEV_ACCELEROMETER is not set +# PTXCONF_UDEV_ACL is not set +# PTXCONF_UDEV_COLLECT is not set +# PTXCONF_UDEV_MTD_PROBE is not set # PTXCONF_UDISKS is not set -# PTXCONF_UMKIMAGE is not set # PTXCONF_UPSTART is not set # PTXCONF_USBUTILS is not set # PTXCONF_UTIL_LINUX_NG is not set @@ -1206,13 +1229,21 @@ PTXCONF_UDEV_STARTSCRIPT=y # Scripting Languages # # PTXCONF_CBMBASIC is not set -# PTXCONF_DBUS_PYTHON is not set # PTXCONF_GMAKE is not set # PTXCONF_JS is not set # PTXCONF_LUA is not set # PTXCONF_PHP5 is not set -# PTXCONF_PYGOBJECT is not set # PTXCONF_PYTHON is not set + +# +# python Extra Modules +# +# PTXCONF_DBUS_PYTHON is not set +# PTXCONF_FLUP is not set +# PTXCONF_LIBV4L2_PYTHON is not set +# PTXCONF_PYGOBJECT is not set +# PTXCONF_PYSERIAL is not set +# PTXCONF_PYTHON_IMAGING is not set # PTXCONF_PYTHON3 is not set # @@ -1237,6 +1268,7 @@ PTXCONF_UDEV_STARTSCRIPT=y # PTXCONF_CANFESTIVAL is not set # PTXCONF_CHRONY is not set # PTXCONF_CONNMAN is not set +# PTXCONF_CRDA is not set # PTXCONF_DHCP is not set # PTXCONF_DIBBLER is not set # PTXCONF_DNSMASQ is not set @@ -1244,7 +1276,7 @@ PTXCONF_UDEV_STARTSCRIPT=y # PTXCONF_ETHERWAKE is not set # PTXCONF_ETHTOOL is not set # PTXCONF_FCGI is not set -# PTXCONF_FLUP is not set +# PTXCONF_GNUTLS is not set # PTXCONF_HASERL is not set # PTXCONF_HPING is not set # PTXCONF_IFPLUGD is not set @@ -1252,6 +1284,7 @@ PTXCONF_UDEV_STARTSCRIPT=y # PTXCONF_INETUTILS is not set # PTXCONF_IPROUTE2 is not set # PTXCONF_IPTABLES is not set +# PTXCONF_IW is not set # PTXCONF_JSON_DBUS_BRIDGE is not set # PTXCONF_LIBCGI is not set # PTXCONF_LIBCGICC is not set @@ -1270,6 +1303,7 @@ PTXCONF_UDEV_STARTSCRIPT=y # PTXCONF_NET_SNMP is not set # PTXCONF_NETCAT is not set # PTXCONF_NETKIT_FTP is not set +# PTXCONF_NETWORKMANAGER is not set # PTXCONF_NFSUTILS is not set # PTXCONF_NMAP is not set # PTXCONF_NSS_MDNS is not set @@ -1326,6 +1360,7 @@ PTXCONF_UDEV_STARTSCRIPT=y # PTXCONF_SQUASHFS_TOOLS is not set # PTXCONF_UNZIP is not set # PTXCONF_XFSPROGS is not set +# PTXCONF_XZ is not set # PTXCONF_ZIP is not set # @@ -1400,6 +1435,7 @@ PTXCONF_UDEV_STARTSCRIPT=y # PTXCONF_LIBICAL is not set # PTXCONF_LIBIODBC is not set # PTXCONF_LIBJPEG is not set +# PTXCONF_LIBKMOD is not set # PTXCONF_LIBKSBA is not set # PTXCONF_LIBLIST is not set # PTXCONF_LIBLTDL is not set @@ -1414,13 +1450,16 @@ PTXCONF_UDEV_STARTSCRIPT=y # PTXCONF_LIBNL is not set # PTXCONF_LIBOIL is not set # PTXCONF_LIBOOP is not set +# PTXCONF_LIBOSIP2 is not set # PTXCONF_LIBPCRE is not set +# PTXCONF_LIBPIPELINE is not set # PTXCONF_LIBPNG is not set # PTXCONF_LIBPOPT is not set # PTXCONF_LIBRN is not set # PTXCONF_LIBSIGCPP is not set # PTXCONF_LIBSYSFS is not set # PTXCONF_LIBUCDAEMON is not set +# PTXCONF_LIBURCU is not set # PTXCONF_LIBUSB_COMPAT is not set # PTXCONF_LIBUSB is not set # PTXCONF_LIBX86 is not set @@ -1485,10 +1524,12 @@ PTXCONF_NCURSES_TERMCAP=y # # Test Suites # +# PTXCONF_ARM_MEMSPEED is not set # PTXCONF_BONNIEXX is not set # PTXCONF_CALIBRATOR is not set # PTXCONF_DBENCH is not set # PTXCONF_EVTEST is not set +# PTXCONF_FLASHBENCH is not set # PTXCONF_HACKBENCH is not set # PTXCONF_HOST_PELTS is not set # PTXCONF_IOZONE is not set @@ -1547,20 +1588,19 @@ PTXCONF_NCURSES_TERMCAP=y # gtk+ & friends # # PTXCONF_ATK is not set +# PTXCONF_ATKMM is not set # PTXCONF_CAIRO is not set # PTXCONF_CAIROMM is not set +# PTXCONF_GDK_PIXBUF is not set # PTXCONF_GLADE is not set # PTXCONF_GLADEMM is not set # PTXCONF_GLIB is not set # PTXCONF_GLIBMM is not set -# PTXCONF_GTK_ENGINE_EXPERIENCE is not set -# PTXCONF_GTK_THEME_EXPERIENCE is not set -# PTXCONF_GTKCORE is not set +# PTXCONF_GTK_ENGINES is not set +# PTXCONF_GTK is not set # PTXCONF_GTKMM is not set -# PTXCONF_GWT is not set # PTXCONF_LIBCROCO is not set # PTXCONF_LIBGEE is not set -# PTXCONF_LIBGLADE is not set # PTXCONF_LIBRSVG is not set # PTXCONF_PANGO is not set # PTXCONF_PANGOMM is not set @@ -1572,7 +1612,6 @@ PTXCONF_NCURSES_TERMCAP=y # # PTXCONF_ARORA is not set # PTXCONF_LIBQXT is not set -# PTXCONF_PYSIDE is not set # PTXCONF_QT4_DEMOS is not set # PTXCONF_QT4_EXAMPLES is not set # PTXCONF_QT4 is not set @@ -1592,12 +1631,15 @@ PTXCONF_NCURSES_TERMCAP=y # sound # # PTXCONF_ALSA_UTILS is not set +# PTXCONF_LAME is not set # PTXCONF_LIBID3TAG is not set # PTXCONF_LIBMAD is not set +# PTXCONF_LIBMIKMOD is not set # PTXCONF_MADPLAY is not set # PTXCONF_MPG123 is not set # PTXCONF_RAWREC is not set # PTXCONF_SETMIXER is not set +# PTXCONF_TWOLAME is not set # PTXCONF_TK is not set # @@ -1618,11 +1660,9 @@ PTXCONF_NCURSES_TERMCAP=y # PTXCONF_LIBMPEG2 is not set # PTXCONF_LIBOGG is not set # PTXCONF_LIBTHEORA is not set -# PTXCONF_LIBV4L2_PYTHON is not set # PTXCONF_LIBVORBIS is not set # PTXCONF_ORC is not set # PTXCONF_PIXMAN is not set -# PTXCONF_PYTHON_IMAGING is not set # PTXCONF_SPEEX is not set # PTXCONF_SVGALIB is not set # PTXCONF_TSLIB is not set -- cgit v1.2.3