Board Support Package/platform: use ptxdist-2014.07.0

Signed-off-by: Juergen Borleis <jbe@pengutronix.de>

6 files changed, 81 insertions, 32 deletions

diff --git a/Changelog b/Changelog
index 4cbb0ab..27e5150 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,7 @@
+2014-07-20	Juergen Borleis <jbe@pengutronix.de
+
+	* Board Support Package: use ptxdist-2014.07.0
+
 2014-04-30	Juergen Borleis <jbe@pengutronix.de
 
 	* Board Support Package: Back to development also for the QT config
diff --git a/configs/platform-friendlyarm-mini2440/Changelog b/configs/platform-friendlyarm-mini2440/Changelog
index 3591e65..063b841 100644
--- a/configs/platform-friendlyarm-mini2440/Changelog
+++ b/configs/platform-friendlyarm-mini2440/Changelog
@@ -1,3 +1,7 @@
+2014-07-20	Juergen Borleis <jbe@pengutronix.de
+
+	* Platform: use ptxdist-2014.07.0
+
 2014-07-19	Juergen Borleis <jbe@pengutronix.de
 
 	* Kernel-3.2:
diff --git a/configs/platform-friendlyarm-mini2440/platformconfig-NAND-128M b/configs/platform-friendlyarm-mini2440/platformconfig-NAND-128M
index ff4cc27..5f82e58 100644
--- a/configs/platform-friendlyarm-mini2440/platformconfig-NAND-128M
+++ b/configs/platform-friendlyarm-mini2440/platformconfig-NAND-128M
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# PTXdist 2014.04.0
+# PTXdist 2014.07.0
 #
 PTXCONF__platformconfig_MAGIC__=y
 
@@ -19,7 +19,7 @@ PTXCONF_PLATFORM="mini2440"
 PTXCONF_PLATFORM_VERSION="master"
 PTXCONF_RUNTIME=y
 PTXCONF_BUILDTIME=y
-PTXCONF_PLATFORMCONFIG_VERSION="2014.04.0"
+PTXCONF_PLATFORMCONFIG_VERSION="2014.07.0"
 
 #
 # architecture                  
@@ -162,6 +162,11 @@ PTXCONF_BOOTLOADER=y
 # PTXCONF_X_LOAD is not set
 
 #
+# bootloader spec entries       
+#
+# PTXCONF_BLSPEC_ENTRY is not set
+
+#
 # image creation options        
 #
 # PTXCONF_IMAGE_BOOT_MLO_VFAT is not set
@@ -192,6 +197,7 @@ PTXCONF_IMAGE_KERNEL_INSTALL_EARLY=y
 # PTXCONF_IMAGE_KERNEL_LZOP is not set
 # PTXCONF_IMAGE_SQUASHFS is not set
 PTXCONF_IMAGE_TGZ=y
+PTXCONF_IMAGE_TGZ_LABEL="${PTXCONF_PROJECT_VENDOR}-${PTXCONF_PROJECT}${PTXCONF_PROJECT_VERSION}"
 # PTXCONF_IMAGE_UBI is not set
 # PTXCONF_IMAGE_UBIFS is not set
 # PTXCONF_IMAGE_UIMAGE is not set
@@ -200,10 +206,13 @@ PTXCONF_IMAGE_TGZ=y
 # new image creation options    
 #
 # PTXCONF_IMAGE_BOOT_MLO is not set
+# PTXCONF_IMAGE_HDIMG is not set
 # PTXCONF_IMAGE_ROOT_CPIO_GZ is not set
 # PTXCONF_IMAGE_ROOT_CPIO is not set
 # PTXCONF_IMAGE_ROOT_EXT is not set
 # PTXCONF_IMAGE_ROOT_TGZ is not set
+# PTXCONF_IMAGE_ROOT_UBI is not set
+# PTXCONF_IMAGE_ROOT_UBIFS is not set
 # PTXCONF_HOST_BZIP2 is not set
 # PTXCONF_HOST_CDRKIT is not set
 # PTXCONF_HOST_CMAKE is not set
@@ -217,7 +226,6 @@ PTXCONF_IMAGE_TGZ=y
 # PTXCONF_HOST_LIBBLKID is not set
 # PTXCONF_HOST_LIBCAP is not set
 # PTXCONF_HOST_LIBCONFUSE is not set
-# PTXCONF_HOST_LIBICONV is not set
 PTXCONF_HOST_LIBKMOD=y
 PTXCONF_HOST_LIBLZO=y
 # PTXCONF_HOST_LIBUSB is not set
diff --git a/configs/platform-friendlyarm-mini2440/platformconfig-NAND-64M b/configs/platform-friendlyarm-mini2440/platformconfig-NAND-64M
index 71d1ca4..adc2fad 100644
--- a/configs/platform-friendlyarm-mini2440/platformconfig-NAND-64M
+++ b/configs/platform-friendlyarm-mini2440/platformconfig-NAND-64M
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# PTXdist 2014.04.0
+# PTXdist 2014.07.0
 #
 PTXCONF__platformconfig_MAGIC__=y
 
@@ -19,7 +19,7 @@ PTXCONF_PLATFORM="mini2440"
 PTXCONF_PLATFORM_VERSION="master"
 PTXCONF_RUNTIME=y
 PTXCONF_BUILDTIME=y
-PTXCONF_PLATFORMCONFIG_VERSION="2014.04.0"
+PTXCONF_PLATFORMCONFIG_VERSION="2014.07.0"
 
 #
 # architecture                  
@@ -162,6 +162,11 @@ PTXCONF_BOOTLOADER=y
 # PTXCONF_X_LOAD is not set
 
 #
+# bootloader spec entries       
+#
+# PTXCONF_BLSPEC_ENTRY is not set
+
+#
 # image creation options        
 #
 # PTXCONF_IMAGE_BOOT_MLO_VFAT is not set
@@ -192,6 +197,7 @@ PTXCONF_IMAGE_KERNEL_INSTALL_EARLY=y
 # PTXCONF_IMAGE_KERNEL_LZOP is not set
 # PTXCONF_IMAGE_SQUASHFS is not set
 PTXCONF_IMAGE_TGZ=y
+PTXCONF_IMAGE_TGZ_LABEL="${PTXCONF_PROJECT_VENDOR}-${PTXCONF_PROJECT}${PTXCONF_PROJECT_VERSION}"
 # PTXCONF_IMAGE_UBI is not set
 # PTXCONF_IMAGE_UBIFS is not set
 # PTXCONF_IMAGE_UIMAGE is not set
@@ -200,10 +206,13 @@ PTXCONF_IMAGE_TGZ=y
 # new image creation options    
 #
 # PTXCONF_IMAGE_BOOT_MLO is not set
+# PTXCONF_IMAGE_HDIMG is not set
 # PTXCONF_IMAGE_ROOT_CPIO_GZ is not set
 # PTXCONF_IMAGE_ROOT_CPIO is not set
 # PTXCONF_IMAGE_ROOT_EXT is not set
 # PTXCONF_IMAGE_ROOT_TGZ is not set
+# PTXCONF_IMAGE_ROOT_UBI is not set
+# PTXCONF_IMAGE_ROOT_UBIFS is not set
 # PTXCONF_HOST_BZIP2 is not set
 # PTXCONF_HOST_CDRKIT is not set
 # PTXCONF_HOST_CMAKE is not set
@@ -217,7 +226,6 @@ PTXCONF_IMAGE_TGZ=y
 # PTXCONF_HOST_LIBBLKID is not set
 # PTXCONF_HOST_LIBCAP is not set
 # PTXCONF_HOST_LIBCONFUSE is not set
-# PTXCONF_HOST_LIBICONV is not set
 PTXCONF_HOST_LIBKMOD=y
 PTXCONF_HOST_LIBLZO=y
 # PTXCONF_HOST_LIBUSB is not set
diff --git a/configs/ptxconfig b/configs/ptxconfig
index 6163a9b..03caf00 100644
--- a/configs/ptxconfig
+++ b/configs/ptxconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# PTXdist 2014.04.0
+# PTXdist 2014.07.0
 #
 
 #
@@ -45,7 +45,7 @@ PTXCONF_PROJECT_BUILD_DEVEL=y
 # PTXCONF_PROJECT_USE_DEVPKGS is not set
 PTXCONF_RUNTIME=y
 PTXCONF_BUILDTIME=y
-PTXCONF_CONFIGFILE_VERSION="2014.04.0"
+PTXCONF_CONFIGFILE_VERSION="2014.07.0"
 PTXCONF__ptxconfig_MAGIC__=y
 
 #
@@ -84,6 +84,7 @@ PTXCONF_HOST_AUTOTOOLS_LIBTOOL=y
 # PTXCONF_HOST_CHRPATH is not set
 # PTXCONF_HOST_CKERMIT is not set
 # PTXCONF_HOST_CMAKE is not set
+# PTXCONF_HOST_COREUTILS is not set
 # PTXCONF_HOST_CRAMFS is not set
 # PTXCONF_HOST_CXXTOOLS is not set
 # PTXCONF_HOST_DBUS_GLIB is not set
@@ -114,7 +115,6 @@ PTXCONF_HOST_IPKG=y
 # PTXCONF_HOST_LIBCGROUP is not set
 # PTXCONF_HOST_LIBCONFUSE is not set
 # PTXCONF_HOST_LIBGD is not set
-# PTXCONF_HOST_LIBICONV is not set
 # PTXCONF_HOST_LIBLZO is not set
 # PTXCONF_HOST_LIBPCRE is not set
 # PTXCONF_HOST_LIBPNG is not set
@@ -215,7 +215,6 @@ PTXCONF_CROSS_PKG_CONFIG_WRAPPER=y
 # PTXCONF_RTPS is not set
 # PTXCONF_SP_OOPS_EXTRACT is not set
 PTXCONF_STRACE=y
-PTXCONF_STRACE_SHARED=y
 # PTXCONF_SYSSTAT is not set
 # PTXCONF_TRACE_CMD is not set
 # PTXCONF_VALGRIND is not set
@@ -1177,7 +1176,6 @@ PTXCONF_BUSYBOX_LOGGER=y
 #
 # BusyBox' gunzip is selected!
 #
-# PTXCONF_HAL is not set
 PTXCONF_HTOP=y
 # PTXCONF_I2C_TOOLS is not set
 # PTXCONF_INITNG is not set
@@ -1336,6 +1334,7 @@ PTXCONF_UTIL_LINUX_NG_LIBMOUNT=y
 # PTXCONF_UTIL_LINUX_NG_CFDISK is not set
 # PTXCONF_UTIL_LINUX_NG_MKSWAP is not set
 # PTXCONF_UTIL_LINUX_NG_SWAPON is not set
+# PTXCONF_UTIL_LINUX_NG_LOSETUP is not set
 PTXCONF_UTIL_LINUX_NG_MOUNT=y
 PTXCONF_UTIL_LINUX_NG_UMOUNT=y
 
@@ -1376,6 +1375,17 @@ PTXCONF_UTIL_LINUX_NG_UMOUNT=y
 # PTXCONF_LUA is not set
 # PTXCONF_LUAEXPAT is not set
 # PTXCONF_PERL is not set
+
+#
+# perl Extra Modules            
+#
+# PTXCONF_DIGEST_HMAC_PERL is not set
+# PTXCONF_IO_SOCKET_INET6_PERL is not set
+# PTXCONF_MUNIN is not set
+# PTXCONF_NET_DNS_PERL is not set
+# PTXCONF_NET_IP_PERL is not set
+# PTXCONF_NET_SERVER_PERL is not set
+# PTXCONF_SOCKET6_PERL is not set
 # PTXCONF_PHP5 is not set
 # PTXCONF_PYTHON is not set
 
@@ -1406,11 +1416,14 @@ PTXCONF_UTIL_LINUX_NG_UMOUNT=y
 #
 # Networking Tools              
 #
+# PTXCONF_ALFRED is not set
 # PTXCONF_APACHE2 is not set
 # PTXCONF_APACHE2_MOD_PYTHON is not set
 # PTXCONF_APR_UTIL is not set
 # PTXCONF_APR is not set
+# PTXCONF_AUTOSSH is not set
 # PTXCONF_AVAHI is not set
+# PTXCONF_BATCTL is not set
 # PTXCONF_BING is not set
 # PTXCONF_BOA is not set
 # PTXCONF_BRIDGE_UTILS is not set
@@ -1418,6 +1431,7 @@ PTXCONF_UTIL_LINUX_NG_UMOUNT=y
 # PTXCONF_CHRONY is not set
 # PTXCONF_COMGT is not set
 # PTXCONF_CONNMAN is not set
+# PTXCONF_CPPZMQ is not set
 # PTXCONF_CRDA is not set
 # PTXCONF_DHCP is not set
 # PTXCONF_DIBBLER is not set
@@ -1465,6 +1479,7 @@ PTXCONF_IPROUTE2_NSTAT=y
 # PTXCONF_LIBNETFILTER_LOG is not set
 # PTXCONF_LIBNETFILTER_QUEUE is not set
 # PTXCONF_LIBNFNETLINK is not set
+# PTXCONF_LIBOPING is not set
 # PTXCONF_LIBPCAP is not set
 # PTXCONF_LIBSOUP is not set
 # PTXCONF_LIBSSH2 is not set
@@ -1499,12 +1514,14 @@ PTXCONF_IPROUTE2_NSTAT=y
 # PTXCONF_PPP is not set
 # PTXCONF_PROFTPD is not set
 # PTXCONF_PUREFTPD is not set
+# PTXCONF_RADVD is not set
 # PTXCONF_RSYNC is not set
 # PTXCONF_RSYNC3 is not set
 # PTXCONF_RSYSLOG is not set
 # PTXCONF_SIMPLERPL is not set
 # PTXCONF_SITECOPY is not set
 # PTXCONF_STRONGSWAN is not set
+# PTXCONF_STUNNEL is not set
 # PTXCONF_SYSLOGNG is not set
 # PTXCONF_TCPDUMP is not set
 # PTXCONF_TCPWRAPPER is not set
@@ -1605,6 +1622,7 @@ PTXCONF_E2FSPROGS_INSTALL_TUNE2FS=y
 # PTXCONF_CANUTILS is not set
 # PTXCONF_CKERMIT is not set
 # PTXCONF_EFAX is not set
+# PTXCONF_HEIRLOOM_MAILX is not set
 # PTXCONF_IRSSI is not set
 # PTXCONF_LIBMATTHEW_JAVA is not set
 # PTXCONF_LIBSOCKETCAN is not set
@@ -1766,7 +1784,6 @@ PTXCONF_NCURSES_PANEL=y
 # PTXCONF_NICKEL is not set
 # PTXCONF_OWFS is not set
 # PTXCONF_POCO is not set
-# PTXCONF_POLICYKIT is not set
 # PTXCONF_POLKIT is not set
 # PTXCONF_PROTOBUF is not set
 # PTXCONF_PSLIB is not set
@@ -1831,12 +1848,6 @@ PTXCONF_ZLIB=y
 # PTXCONF_DBENCH is not set
 # PTXCONF_DT is not set
 PTXCONF_EVTEST=y
-
-#
-# Installation Options
-#
-PTXCONF_EVTEST_EVTEST=y
-# PTXCONF_EVTEST_CAPTURE is not set
 # PTXCONF_FLASHBENCH is not set
 # PTXCONF_HACKBENCH is not set
 # PTXCONF_HOST_PELTS is not set
@@ -1852,6 +1863,7 @@ PTXCONF_RING_BELL=y
 #
 # Games                         
 #
+# PTXCONF_CMATRIX is not set
 # PTXCONF_MMPONG is not set
 # PTXCONF_SCUMMVM is not set
 # PTXCONF_SUPERTUX is not set
@@ -1982,7 +1994,6 @@ PTXCONF_MADPLAY=y
 #
 # PTXCONF_FONTCONFIG is not set
 # PTXCONF_I915RESOLUTION is not set
-# PTXCONF_MEDIA_CTL is not set
 # PTXCONF_XAWTV is not set
 
 #
@@ -2017,6 +2028,7 @@ PTXCONF_TSLIB_TS_CALIBRATE=y
 PTXCONF_TSLIB_TS_TEST=y
 # PTXCONF_V4L_UTILS is not set
 # PTXCONF_VO_AACENC is not set
+# PTXCONF_XKEYBOARD_CONFIG is not set
 # PTXCONF_XORG is not set
 
 #
diff --git a/configs/ptxconfig.qt b/configs/ptxconfig.qt
index c78de78..66f2e94 100644
--- a/configs/ptxconfig.qt
+++ b/configs/ptxconfig.qt
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# PTXdist 2014.04.0
+# PTXdist 2014.07.0
 #
 
 #
@@ -45,7 +45,7 @@ PTXCONF_PROJECT_BUILD_DEVEL=y
 # PTXCONF_PROJECT_USE_DEVPKGS is not set
 PTXCONF_RUNTIME=y
 PTXCONF_BUILDTIME=y
-PTXCONF_CONFIGFILE_VERSION="2014.04.0"
+PTXCONF_CONFIGFILE_VERSION="2014.07.0"
 PTXCONF__ptxconfig_MAGIC__=y
 
 #
@@ -84,6 +84,7 @@ PTXCONF_HOST_AUTOTOOLS_LIBTOOL=y
 # PTXCONF_HOST_CHRPATH is not set
 # PTXCONF_HOST_CKERMIT is not set
 # PTXCONF_HOST_CMAKE is not set
+# PTXCONF_HOST_COREUTILS is not set
 # PTXCONF_HOST_CRAMFS is not set
 # PTXCONF_HOST_CXXTOOLS is not set
 # PTXCONF_HOST_DBUS_GLIB is not set
@@ -114,7 +115,6 @@ PTXCONF_HOST_IPKG=y
 # PTXCONF_HOST_LIBCGROUP is not set
 # PTXCONF_HOST_LIBCONFUSE is not set
 # PTXCONF_HOST_LIBGD is not set
-# PTXCONF_HOST_LIBICONV is not set
 # PTXCONF_HOST_LIBLZO is not set
 # PTXCONF_HOST_LIBPCRE is not set
 # PTXCONF_HOST_LIBPNG is not set
@@ -215,7 +215,6 @@ PTXCONF_CROSS_PKG_CONFIG_WRAPPER=y
 # PTXCONF_RTPS is not set
 # PTXCONF_SP_OOPS_EXTRACT is not set
 PTXCONF_STRACE=y
-PTXCONF_STRACE_SHARED=y
 # PTXCONF_SYSSTAT is not set
 # PTXCONF_TRACE_CMD is not set
 # PTXCONF_VALGRIND is not set
@@ -1178,7 +1177,6 @@ PTXCONF_BUSYBOX_LOGGER=y
 #
 # BusyBox' gunzip is selected!
 #
-# PTXCONF_HAL is not set
 PTXCONF_HTOP=y
 # PTXCONF_I2C_TOOLS is not set
 # PTXCONF_INITNG is not set
@@ -1337,6 +1335,7 @@ PTXCONF_UTIL_LINUX_NG_LIBMOUNT=y
 # PTXCONF_UTIL_LINUX_NG_CFDISK is not set
 # PTXCONF_UTIL_LINUX_NG_MKSWAP is not set
 # PTXCONF_UTIL_LINUX_NG_SWAPON is not set
+# PTXCONF_UTIL_LINUX_NG_LOSETUP is not set
 PTXCONF_UTIL_LINUX_NG_MOUNT=y
 PTXCONF_UTIL_LINUX_NG_UMOUNT=y
 
@@ -1377,6 +1376,17 @@ PTXCONF_UTIL_LINUX_NG_UMOUNT=y
 # PTXCONF_LUA is not set
 # PTXCONF_LUAEXPAT is not set
 # PTXCONF_PERL is not set
+
+#
+# perl Extra Modules            
+#
+# PTXCONF_DIGEST_HMAC_PERL is not set
+# PTXCONF_IO_SOCKET_INET6_PERL is not set
+# PTXCONF_MUNIN is not set
+# PTXCONF_NET_DNS_PERL is not set
+# PTXCONF_NET_IP_PERL is not set
+# PTXCONF_NET_SERVER_PERL is not set
+# PTXCONF_SOCKET6_PERL is not set
 # PTXCONF_PHP5 is not set
 # PTXCONF_PYTHON is not set
 
@@ -1407,11 +1417,14 @@ PTXCONF_UTIL_LINUX_NG_UMOUNT=y
 #
 # Networking Tools              
 #
+# PTXCONF_ALFRED is not set
 # PTXCONF_APACHE2 is not set
 # PTXCONF_APACHE2_MOD_PYTHON is not set
 # PTXCONF_APR_UTIL is not set
 # PTXCONF_APR is not set
+# PTXCONF_AUTOSSH is not set
 # PTXCONF_AVAHI is not set
+# PTXCONF_BATCTL is not set
 # PTXCONF_BING is not set
 # PTXCONF_BOA is not set
 # PTXCONF_BRIDGE_UTILS is not set
@@ -1419,6 +1432,7 @@ PTXCONF_UTIL_LINUX_NG_UMOUNT=y
 # PTXCONF_CHRONY is not set
 # PTXCONF_COMGT is not set
 # PTXCONF_CONNMAN is not set
+# PTXCONF_CPPZMQ is not set
 # PTXCONF_CRDA is not set
 # PTXCONF_DHCP is not set
 # PTXCONF_DIBBLER is not set
@@ -1466,6 +1480,7 @@ PTXCONF_IPROUTE2_NSTAT=y
 # PTXCONF_LIBNETFILTER_LOG is not set
 # PTXCONF_LIBNETFILTER_QUEUE is not set
 # PTXCONF_LIBNFNETLINK is not set
+# PTXCONF_LIBOPING is not set
 # PTXCONF_LIBPCAP is not set
 # PTXCONF_LIBSOUP is not set
 # PTXCONF_LIBSSH2 is not set
@@ -1500,12 +1515,14 @@ PTXCONF_IPROUTE2_NSTAT=y
 # PTXCONF_PPP is not set
 # PTXCONF_PROFTPD is not set
 # PTXCONF_PUREFTPD is not set
+# PTXCONF_RADVD is not set
 # PTXCONF_RSYNC is not set
 # PTXCONF_RSYNC3 is not set
 # PTXCONF_RSYSLOG is not set
 # PTXCONF_SIMPLERPL is not set
 # PTXCONF_SITECOPY is not set
 # PTXCONF_STRONGSWAN is not set
+# PTXCONF_STUNNEL is not set
 # PTXCONF_SYSLOGNG is not set
 # PTXCONF_TCPDUMP is not set
 # PTXCONF_TCPWRAPPER is not set
@@ -1606,6 +1623,7 @@ PTXCONF_E2FSPROGS_INSTALL_TUNE2FS=y
 # PTXCONF_CANUTILS is not set
 # PTXCONF_CKERMIT is not set
 # PTXCONF_EFAX is not set
+# PTXCONF_HEIRLOOM_MAILX is not set
 # PTXCONF_IRSSI is not set
 # PTXCONF_LIBMATTHEW_JAVA is not set
 # PTXCONF_LIBSOCKETCAN is not set
@@ -1691,6 +1709,7 @@ PTXCONF_LIBBLKID=y
 # PTXCONF_LIBICAL is not set
 # PTXCONF_LIBIODBC is not set
 PTXCONF_LIBJPEG=y
+# PTXCONF_LIBJPEG_BIN is not set
 PTXCONF_LIBKMOD=y
 
 #
@@ -1767,7 +1786,6 @@ PTXCONF_NCURSES_PANEL=y
 # PTXCONF_NICKEL is not set
 # PTXCONF_OWFS is not set
 # PTXCONF_POCO is not set
-# PTXCONF_POLICYKIT is not set
 # PTXCONF_POLKIT is not set
 # PTXCONF_PROTOBUF is not set
 # PTXCONF_PSLIB is not set
@@ -1844,12 +1862,6 @@ PTXCONF_ZLIB=y
 # PTXCONF_DBENCH is not set
 # PTXCONF_DT is not set
 PTXCONF_EVTEST=y
-
-#
-# Installation Options
-#
-PTXCONF_EVTEST_EVTEST=y
-# PTXCONF_EVTEST_CAPTURE is not set
 # PTXCONF_FLASHBENCH is not set
 # PTXCONF_HACKBENCH is not set
 # PTXCONF_HOST_PELTS is not set
@@ -1865,6 +1877,7 @@ PTXCONF_RING_BELL=y
 #
 # Games                         
 #
+# PTXCONF_CMATRIX is not set
 # PTXCONF_MMPONG is not set
 # PTXCONF_SCUMMVM is not set
 # PTXCONF_SUPERTUX is not set
@@ -2118,7 +2131,6 @@ PTXCONF_MADPLAY=y
 #
 # PTXCONF_FONTCONFIG is not set
 # PTXCONF_I915RESOLUTION is not set
-# PTXCONF_MEDIA_CTL is not set
 # PTXCONF_XAWTV is not set
 
 #
@@ -2153,6 +2165,7 @@ PTXCONF_TSLIB_TS_CALIBRATE=y
 PTXCONF_TSLIB_TS_TEST=y
 # PTXCONF_V4L_UTILS is not set
 # PTXCONF_VO_AACENC is not set
+# PTXCONF_XKEYBOARD_CONFIG is not set
 # PTXCONF_XORG is not set
 
 #