[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-443-g88a379712

[Julien B a. A. <ar...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  88a379712658d47eb13ba13bb008eebdae13a4f7 (commit)
       via  9d190ff3a61f949609674a1b355170b3db613cc5 (commit)
       via  9954085379e17c5ce3221613c6e23351b3bb07a4 (commit)
       via  71494e21bd7541bd6aa634bd17543cd9fa0c6b80 (commit)
       via  9de58d2765d4b1b11b809fd95c43affbffab852b (commit)
       via  26595d25fc3e88ec09e4f35a654f385a9d22fd66 (commit)
       via  d82b68ced68c8c3cc6af55d5a14fc5a189ecc391 (commit)
       via  997bfe77f86bee76c54ddaceb82b585e4cfff5aa (commit)
      from  0dfeeb273a931adce05996a084fdffb729fb82c4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 88a379712658d47eb13ba13bb008eebdae13a4f7
Author: Julien BOIBESSOT <jul...@ar...>
Date:   Wed Jul 4 16:42:21 2018 +0200

    [BUILDROOT] remove apf9328*_defconfig (do not build anymore)

commit 9d190ff3a61f949609674a1b355170b3db613cc5
Author: Julien BOIBESSOT <jul...@ar...>
Date:   Wed Jul 4 16:40:32 2018 +0200

    [BUILDROOT] rename apf28mainline*_defconfig -> apf28*_defconfig

commit 9954085379e17c5ce3221613c6e23351b3bb07a4
Author: Julien BOIBESSOT <jul...@ar...>
Date:   Wed Jul 4 16:39:11 2018 +0200

    [BUILDROOT] rename apf28test_defconfig -> apf28legacytest_defconfig

commit 71494e21bd7541bd6aa634bd17543cd9fa0c6b80
Author: Julien BOIBESSOT <jul...@ar...>
Date:   Wed Jul 4 16:38:05 2018 +0200

    [BUILDROOT] rename apf28_defconfig -> apf28legacy_defconfig

commit 9de58d2765d4b1b11b809fd95c43affbffab852b
Author: Julien BOIBESSOT <jul...@ar...>
Date:   Wed Jul 4 16:36:20 2018 +0200

    [BUILDROOT] replace apf27xenomai_defconfig with apf27xenomaimainline_defconfig

commit 26595d25fc3e88ec09e4f35a654f385a9d22fd66
Author: Julien BOIBESSOT <jul...@ar...>
Date:   Wed Jul 4 16:34:22 2018 +0200

    [BUILDROOT] remove apf27_webradio_defconfig (do not build anymore)

commit d82b68ced68c8c3cc6af55d5a14fc5a189ecc391
Author: Julien BOIBESSOT <jul...@ar...>
Date:   Wed Jul 4 16:32:55 2018 +0200

    [BUILDROOT] rename /apf27preempt-rtmainline_defconfig -> apf27preempt-rt_defconfig

commit 997bfe77f86bee76c54ddaceb82b585e4cfff5aa
Author: Julien BOIBESSOT <jul...@ar...>
Date:   Wed Jul 4 16:31:10 2018 +0200

    [BUILDROOT] Update apf27test_defconfig with mainline kernel

-----------------------------------------------------------------------

Summary of changes:
 buildroot/configs/apf27_webradio_defconfig         |  94 ------------
 ...ainline_defconfig => apf27preempt-rt_defconfig} |   0
 buildroot/configs/apf27test_defconfig              |  19 ++-
 buildroot/configs/apf27xenomai_defconfig           |  29 ++--
 buildroot/configs/apf27xenomaimainline_defconfig   |  92 ------------
 buildroot/configs/apf28_defconfig                  |  32 ++--
 .../{apf28_defconfig => apf28legacy_defconfig}     |   0
 ...f28test_defconfig => apf28legacytest_defconfig} |   0
 buildroot/configs/apf28mainline_defconfig          |  86 -----------
 buildroot/configs/apf28mainlinetest_defconfig      | 162 ---------------------
 buildroot/configs/apf28test_defconfig              |  39 ++---
 buildroot/configs/apf9328_defconfig                |  70 ---------
 buildroot/configs/apf9328test_defconfig            | 130 -----------------
 buildroot/configs/apf9328xenomai_defconfig         |  75 ----------
 14 files changed, 62 insertions(+), 766 deletions(-)
 delete mode 100644 buildroot/configs/apf27_webradio_defconfig
 rename buildroot/configs/{apf27preempt-rtmainline_defconfig => apf27preempt-rt_defconfig} (100%)
 delete mode 100644 buildroot/configs/apf27xenomaimainline_defconfig
 copy buildroot/configs/{apf28_defconfig => apf28legacy_defconfig} (100%)
 copy buildroot/configs/{apf28test_defconfig => apf28legacytest_defconfig} (100%)
 delete mode 100644 buildroot/configs/apf28mainline_defconfig
 delete mode 100644 buildroot/configs/apf28mainlinetest_defconfig
 delete mode 100644 buildroot/configs/apf9328_defconfig
 delete mode 100644 buildroot/configs/apf9328test_defconfig
 delete mode 100644 buildroot/configs/apf9328xenomai_defconfig

diff --git a/buildroot/configs/apf27_webradio_defconfig b/buildroot/configs/apf27_webradio_defconfig
deleted file mode 100644
index 89f359457..000000000
--- a/buildroot/configs/apf27_webradio_defconfig
+++ /dev/null
@@ -1,94 +0,0 @@
-BR2_arm=y
-BR2_WGET="wget --passive-ftp --tries=3"
-BR2_DL_DIR="$(BASE_DIR)/../downloads"
-BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
-BR2_CCACHE=y
-BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="2.6.29.6"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_REALLY_OLD=y
-BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-ng.config"
-BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
-BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
-BR2_PTHREAD_DEBUG=y
-BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_PACKAGE_HOST_GDB=y
-BR2_ENABLE_LOCALE_PURGE=y
-BR2_ENABLE_LOCALE_WHITELIST="C en_US"
-BR2_TARGET_OPTIMIZATION="-Os -pipe"
-BR2_TARGET_GENERIC_HOSTNAME="apf27"
-BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
-BR2_ROOTFS_DEVICE_CREATION_STATIC=y
-BR2_ROOTFS_STATIC_DEVICE_TABLE="system/device_table_dev.txt $(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)_device_table_dev.txt"
-BR2_TARGET_GENERIC_GETTY_PORT="ttySMX0"
-BR2_ROOTFS_OVERLAY="$(ARMADEUS_PATH)/rootfs/target_overlay"
-BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="apf27 imx27"
-BR2_TARGET_ARMADEUS=y
-BR2_BOARD_NAME="apf27"
-BR2_CPU_NAME="imx27"
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.29.6"
-BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
-BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
-BR2_LINUX_KERNEL_UIMAGE=y
-BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
-BR2_PACKAGE_FPGAREGS=y
-BR2_PACKAGE_IMXREGS=y
-BR2_PACKAGE_MAX5821CTRL=y
-BR2_PACKAGE_AD9889CTRL=y
-BR2_PACKAGE_ALSA_UTILS=y
-BR2_PACKAGE_ALSA_UTILS_AMIXER=y
-BR2_PACKAGE_ALSA_UTILS_APLAY=y
-BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
-BR2_PACKAGE_MPLAYER=y
-BR2_PACKAGE_PYWEBRADIO=y
-BR2_PACKAGE_GDB=y
-BR2_PACKAGE_STRACE=y
-BR2_PACKAGE_PYTHON_PYGAME=y
-BR2_PACKAGE_PYTHON_PYGAME_IMAGE=y
-BR2_PACKAGE_PYTHON_PYGAME_FONT=y
-BR2_PACKAGE_PYTHON_PYGAME_MIXER=y
-BR2_PACKAGE_PYTHON_PYGAME_MIXER_MUSIC=y
-BR2_PACKAGE_SDL_IMAGE_GIF=y
-BR2_PACKAGE_SDL_NET=y
-BR2_PACKAGE_I2C_TOOLS=y
-BR2_PACKAGE_MTD=y
-BR2_PACKAGE_MTD_JFFS2DUMP=y
-BR2_PACKAGE_MTD_MKFSJFFS2=y
-BR2_PACKAGE_MTD_SUMTOOL=y
-BR2_PACKAGE_UBOOT_TOOLS=y
-BR2_PACKAGE_PYTHON=y
-BR2_PACKAGE_PYTHON_PYEXPAT=y
-BR2_PACKAGE_TSLIB=y
-BR2_PACKAGE_NTP=y
-# BR2_PACKAGE_NTP_NTPD is not set
-BR2_PACKAGE_PORTMAP=y
-BR2_PACKAGE_WIRELESS_TOOLS=y
-BR2_PACKAGE_WPA_SUPPLICANT=y
-BR2_PACKAGE_WPA_SUPPLICANT_EAP=y
-BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
-BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
-BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y
-BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
-BR2_PACKAGE_NANO=y
-BR2_TARGET_ROOTFS_JFFS2=y
-BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_128K=y
-BR2_TARGET_ROOTFS_JFFS2_PAD=y
-BR2_TARGET_ROOTFS_UBIFS=y
-BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047
-BR2_TARGET_ROOTFS_UBI=y
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
-BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2017.01"
-BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2017.01.h"
-BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
-BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-nohab-spl.bin"
-BR2_TARGET_UBOOT_ENVIMAGE=y
-BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="$(ARMADEUS_PATH)/u-boot-env-2013.04.txt"
-BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x20000"
diff --git a/buildroot/configs/apf27preempt-rtmainline_defconfig b/buildroot/configs/apf27preempt-rt_defconfig
similarity index 100%
rename from buildroot/configs/apf27preempt-rtmainline_defconfig
rename to buildroot/configs/apf27preempt-rt_defconfig
diff --git a/buildroot/configs/apf27test_defconfig b/buildroot/configs/apf27test_defconfig
index 963828a21..6d787de92 100644
--- a/buildroot/configs/apf27test_defconfig
+++ b/buildroot/configs/apf27test_defconfig
@@ -5,8 +5,8 @@ BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="2.6.29.6"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_REALLY_OLD=y
+BR2_DEFAULT_KERNEL_VERSION="3.19.8"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_19=y
 BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-ng.config"
 BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
 BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
@@ -18,9 +18,8 @@ BR2_ENABLE_LOCALE_WHITELIST="C en_US"
 BR2_TARGET_OPTIMIZATION="-Os -pipe"
 BR2_TARGET_GENERIC_HOSTNAME="apf27"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
-BR2_ROOTFS_DEVICE_CREATION_STATIC=y
-BR2_ROOTFS_STATIC_DEVICE_TABLE="system/device_table_dev.txt $(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)_device_table_dev.txt"
-BR2_TARGET_GENERIC_GETTY_PORT="ttySMX0"
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
+BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
 BR2_ROOTFS_OVERLAY="$(ARMADEUS_PATH)/rootfs/target_overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
@@ -30,11 +29,14 @@ BR2_BOARD_NAME="apf27"
 BR2_CPU_NAME="imx27"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.29.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.19.8"
 BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
 BR2_LINUX_KERNEL_UIMAGE=y
+BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0xA0008000"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx27-apf27dev"
 BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
 BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
 BR2_PACKAGE_AS_DEVICES=y
@@ -112,6 +114,8 @@ BR2_PACKAGE_GPSD=y
 BR2_PACKAGE_I2C_TOOLS=y
 BR2_PACKAGE_INPUT_TOOLS=y
 BR2_PACKAGE_UBOOT_TOOLS=y
+BR2_PACKAGE_DTC=y
+BR2_PACKAGE_DTC_PROGRAMS=y
 BR2_PACKAGE_LIBV4L=y
 BR2_PACKAGE_LIBV4L_UTILS=y
 # BR 2013.11:
@@ -143,6 +147,7 @@ BR2_PACKAGE_NTP=y
 # BR2_PACKAGE_NTP_NTPD is not set
 BR2_PACKAGE_NTP_NTPDATE=y
 BR2_PACKAGE_RPCBIND=y
+BR2_PACKAGE_UUCP=y
 BR2_PACKAGE_PPPD=y
 BR2_PACKAGE_TCPDUMP=y
 BR2_PACKAGE_WIRELESS_TOOLS=y
@@ -164,7 +169,7 @@ BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
 BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2017.01"
-BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2017.01.h"
+BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)mainline-u-boot-2017.01.h"
 BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-nohab-spl.bin"
 BR2_TARGET_UBOOT_ENVIMAGE=y
diff --git a/buildroot/configs/apf27xenomai_defconfig b/buildroot/configs/apf27xenomai_defconfig
index eaffb3be3..b7173c595 100644
--- a/buildroot/configs/apf27xenomai_defconfig
+++ b/buildroot/configs/apf27xenomai_defconfig
@@ -4,9 +4,7 @@ BR2_DL_DIR="$(BASE_DIR)/../downloads"
 BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="2.6.29.6"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_REALLY_OLD=y
+BR2_KERNEL_HEADERS_3_14=y
 BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-ng.config"
 BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
 BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
@@ -18,9 +16,8 @@ BR2_ENABLE_LOCALE_WHITELIST="C en_US"
 BR2_TARGET_OPTIMIZATION="-Os -pipe"
 BR2_TARGET_GENERIC_HOSTNAME="apf27"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
-BR2_ROOTFS_DEVICE_CREATION_STATIC=y
-BR2_ROOTFS_STATIC_DEVICE_TABLE="system/device_table_dev.txt $(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)_device_table_dev.txt"
-BR2_TARGET_GENERIC_GETTY_PORT="ttySMX0"
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
+BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
 BR2_ROOTFS_OVERLAY="$(ARMADEUS_PATH)/rootfs/target_overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
@@ -30,13 +27,16 @@ BR2_BOARD_NAME="apf27"
 BR2_CPU_NAME="imx27"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.29.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.14.39"
 BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-2.6.29-xenomai.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION)-xenomai.config"
 BR2_LINUX_KERNEL_UIMAGE=y
+BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0xA0008000"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx27-apf27dev"
 BR2_LINUX_KERNEL_EXT_XENOMAI=y
-BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH_URL="ftp://ftp2.armadeus.com/armadeusw/adeos-ipipe-2.6.29-arm-1.13-05.patch"
+BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH_URL="http://download.gna.org/adeos/patches/v3.x/arm/ipipe-core-3.14.39-arm-9.patch"
 BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
 BR2_PACKAGE_FPGAREGS=y
 BR2_PACKAGE_FPGA_FIRMWARE=y
@@ -57,6 +57,8 @@ BR2_PACKAGE_MTD_MKFSJFFS2=y
 BR2_PACKAGE_MTD_SUMTOOL=y
 BR2_PACKAGE_I2C_TOOLS=y
 BR2_PACKAGE_UBOOT_TOOLS=y
+BR2_PACKAGE_DTC=y
+BR2_PACKAGE_DTC_PROGRAMS=y
 BR2_PACKAGE_TSLIB=y
 BR2_PACKAGE_CAN_UTILS=y
 BR2_PACKAGE_DROPBEAR=y
@@ -66,13 +68,12 @@ BR2_PACKAGE_NTP=y
 BR2_PACKAGE_RPCBIND=y
 BR2_PACKAGE_WIRELESS_TOOLS=y
 BR2_PACKAGE_WPA_SUPPLICANT=y
+BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y
 BR2_PACKAGE_WPA_SUPPLICANT_EAP=y
+BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
 BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
 BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
-BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y
-BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
-BR2_PACKAGE_XENOMAI_VERSION="2.4.9"
-BR2_PACKAGE_XENOMAI_CONF_OPT="--enable-arm-mach=mx2"
+BR2_PACKAGE_XENOMAI_VERSION="2.6.4"
 BR2_PACKAGE_XENOMAI_TESTSUITE=y
 BR2_PACKAGE_NANO=y
 BR2_TARGET_ROOTFS_UBIFS=y
@@ -83,7 +84,7 @@ BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
 BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2017.01"
-BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2017.01.h"
+BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)mainline-u-boot-2017.01.h"
 BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-nohab-spl.bin"
 BR2_TARGET_UBOOT_ENVIMAGE=y
diff --git a/buildroot/configs/apf27xenomaimainline_defconfig b/buildroot/configs/apf27xenomaimainline_defconfig
deleted file mode 100644
index b7173c595..000000000
--- a/buildroot/configs/apf27xenomaimainline_defconfig
+++ /dev/null
@@ -1,92 +0,0 @@
-BR2_arm=y
-BR2_WGET="wget --passive-ftp --tries=3"
-BR2_DL_DIR="$(BASE_DIR)/../downloads"
-BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
-BR2_CCACHE=y
-BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
-BR2_KERNEL_HEADERS_3_14=y
-BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-ng.config"
-BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
-BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
-BR2_PTHREAD_DEBUG=y
-BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_PACKAGE_HOST_GDB=y
-BR2_ENABLE_LOCALE_PURGE=y
-BR2_ENABLE_LOCALE_WHITELIST="C en_US"
-BR2_TARGET_OPTIMIZATION="-Os -pipe"
-BR2_TARGET_GENERIC_HOSTNAME="apf27"
-BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
-BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
-BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
-BR2_ROOTFS_OVERLAY="$(ARMADEUS_PATH)/rootfs/target_overlay"
-BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="apf27 imx27"
-BR2_TARGET_ARMADEUS=y
-BR2_BOARD_NAME="apf27"
-BR2_CPU_NAME="imx27"
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.14.39"
-BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
-BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION)-xenomai.config"
-BR2_LINUX_KERNEL_UIMAGE=y
-BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0xA0008000"
-BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx27-apf27dev"
-BR2_LINUX_KERNEL_EXT_XENOMAI=y
-BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH_URL="http://download.gna.org/adeos/patches/v3.x/arm/ipipe-core-3.14.39-arm-9.patch"
-BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
-BR2_PACKAGE_FPGAREGS=y
-BR2_PACKAGE_FPGA_FIRMWARE=y
-BR2_PACKAGE_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf27_200k.bit"
-BR2_PACKAGE_FPGA_FIRMWARE_EXPORT=y
-BR2_PACKAGE_IMXREGS=y
-BR2_PACKAGE_MAX5821CTRL=y
-BR2_PACKAGE_AD9889CTRL=y
-BR2_PACKAGE_ALSA_UTILS=y
-BR2_PACKAGE_ALSA_UTILS_AMIXER=y
-BR2_PACKAGE_ALSA_UTILS_APLAY=y
-BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
-BR2_PACKAGE_GDB=y
-BR2_PACKAGE_STRACE=y
-BR2_PACKAGE_MTD=y
-BR2_PACKAGE_MTD_JFFS2DUMP=y
-BR2_PACKAGE_MTD_MKFSJFFS2=y
-BR2_PACKAGE_MTD_SUMTOOL=y
-BR2_PACKAGE_I2C_TOOLS=y
-BR2_PACKAGE_UBOOT_TOOLS=y
-BR2_PACKAGE_DTC=y
-BR2_PACKAGE_DTC_PROGRAMS=y
-BR2_PACKAGE_TSLIB=y
-BR2_PACKAGE_CAN_UTILS=y
-BR2_PACKAGE_DROPBEAR=y
-BR2_PACKAGE_IPROUTE2=y
-BR2_PACKAGE_NTP=y
-# BR2_PACKAGE_NTP_NTPD is not set
-BR2_PACKAGE_RPCBIND=y
-BR2_PACKAGE_WIRELESS_TOOLS=y
-BR2_PACKAGE_WPA_SUPPLICANT=y
-BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y
-BR2_PACKAGE_WPA_SUPPLICANT_EAP=y
-BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
-BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
-BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
-BR2_PACKAGE_XENOMAI_VERSION="2.6.4"
-BR2_PACKAGE_XENOMAI_TESTSUITE=y
-BR2_PACKAGE_NANO=y
-BR2_TARGET_ROOTFS_UBIFS=y
-BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047
-BR2_TARGET_ROOTFS_UBI=y
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
-BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2017.01"
-BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)mainline-u-boot-2017.01.h"
-BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
-BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-nohab-spl.bin"
-BR2_TARGET_UBOOT_ENVIMAGE=y
-BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="$(ARMADEUS_PATH)/u-boot-env-2013.04.txt"
-BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x20000"
diff --git a/buildroot/configs/apf28_defconfig b/buildroot/configs/apf28_defconfig
index 28ad78c5d..5191b865c 100644
--- a/buildroot/configs/apf28_defconfig
+++ b/buildroot/configs/apf28_defconfig
@@ -4,22 +4,19 @@ BR2_DL_DIR="$(BASE_DIR)/../downloads"
 BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="2.6.35.3"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_REALLY_OLD=y
+BR2_KERNEL_HEADERS_4_9=y
 BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-ng.config"
 BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
 BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
 BR2_PTHREAD_DEBUG=y
+BR2_GCC_VERSION_4_8_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_PACKAGE_HOST_GDB=y
-BR2_ENABLE_LOCALE_PURGE=y
-BR2_ENABLE_LOCALE_WHITELIST="C en_US"
 BR2_TARGET_OPTIMIZATION="-Os -pipe"
 BR2_TARGET_GENERIC_HOSTNAME="apf28"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
-BR2_TARGET_GENERIC_GETTY_PORT="ttyAM0"
+BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
 BR2_ROOTFS_OVERLAY="$(ARMADEUS_PATH)/rootfs/target_overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
@@ -30,11 +27,13 @@ BR2_CPU_NAME="imx28"
 BR2_TARGET_ARMADEUS_SDRAM_SIZE="128"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.35.3"
-BR2_LINUX_KERNEL_PATCH="ftp://ftp2.armadeus.com/armadeusw/linux-2.6.35.3-imx_10.12.01.patch.tar.gz ftp://ftp2.armadeus.com/armadeusw/patches_for_L2.6.35_MX28_SDK_10.12_SOURCE.tar.gz ftp://ftp2.armadeus.com/armadeusw/L2.6.35_10.12_EMI_FREQ_PATCH_UP.tar.gz ftp://ftp2.armadeus.com/armadeusw/MX28-FEC-PROBLEM-PATCH.tar.gz ftp://ftp2.armadeus.com/armadeusw/linux-2.6.35.3-imx_11.09.01.patch.tar.gz ../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
-BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.65"
+BR2_LINUX_KERNEL_PATCH="../patches/linux/4.9"
+BR2_LINUX_KERNEL_DEFCONFIG="mxs"
 BR2_LINUX_KERNEL_UIMAGE=y
+BR2_LINUX_KERNEL_UIMAGE_LOADADDR="40008000"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx28-apf28dev"
 BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
 BR2_PACKAGE_HOST_IMX28_USB_DOWNLOADER=y
 BR2_PACKAGE_IMXREGS=y
@@ -42,26 +41,24 @@ BR2_PACKAGE_GDB=y
 BR2_PACKAGE_STRACE=y
 BR2_PACKAGE_MTD=y
 BR2_PACKAGE_MTD_SUMTOOL=y
-BR2_PACKAGE_I2C_TOOLS=y
 BR2_PACKAGE_INPUT_TOOLS=y
 # BR2_PACKAGE_INPUT_TOOLS_INPUTATTACH is not set
 # BR2_PACKAGE_INPUT_TOOLS_JSCAL is not set
 # BR2_PACKAGE_INPUT_TOOLS_JSTEST is not set
 BR2_PACKAGE_UBOOT_TOOLS=y
 BR2_PACKAGE_LZO=y
-BR2_PACKAGE_ZLIB=y
+BR2_PACKAGE_DTC=y
+BR2_PACKAGE_DTC_PROGRAMS=y
 BR2_PACKAGE_TSLIB=y
-BR2_PACKAGE_NCURSES_TARGET_PANEL=y
-BR2_PACKAGE_NCURSES_TARGET_FORM=y
-BR2_PACKAGE_NCURSES_TARGET_MENU=y
 BR2_PACKAGE_CAN_UTILS=y
+BR2_PACKAGE_DROPBEAR=y
 BR2_PACKAGE_IPERF=y
 BR2_PACKAGE_IPERF3=y
 BR2_PACKAGE_IPROUTE2=y
+BR2_PACKAGE_LRZSZ=y
 BR2_PACKAGE_NTP=y
 # BR2_PACKAGE_NTP_NTPD is not set
 BR2_PACKAGE_RPCBIND=y
-BR2_PACKAGE_UUCP=y
 BR2_PACKAGE_WIRELESS_TOOLS=y
 BR2_PACKAGE_WPA_SUPPLICANT=y
 BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y
@@ -81,7 +78,8 @@ BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
 BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2017.01"
-BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2017.01.h"
+BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)mainline-u-boot-2017.01.h"
+# BR2_TARGET_UBOOT_FORMAT_BIN is not set
 BR2_TARGET_UBOOT_FORMAT_SB=y
 BR2_TARGET_UBOOT_ENVIMAGE=y
 BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="$(ARMADEUS_PATH)/u-boot-env-2013.04.txt"
diff --git a/buildroot/configs/apf28_defconfig b/buildroot/configs/apf28legacy_defconfig
similarity index 100%
copy from buildroot/configs/apf28_defconfig
copy to buildroot/configs/apf28legacy_defconfig
diff --git a/buildroot/configs/apf28test_defconfig b/buildroot/configs/apf28legacytest_defconfig
similarity index 100%
copy from buildroot/configs/apf28test_defconfig
copy to buildroot/configs/apf28legacytest_defconfig
diff --git a/buildroot/configs/apf28mainline_defconfig b/buildroot/configs/apf28mainline_defconfig
deleted file mode 100644
index 5191b865c..000000000
--- a/buildroot/configs/apf28mainline_defconfig
+++ /dev/null
@@ -1,86 +0,0 @@
-BR2_arm=y
-BR2_WGET="wget --passive-ftp --tries=3"
-BR2_DL_DIR="$(BASE_DIR)/../downloads"
-BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
-BR2_CCACHE=y
-BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
-BR2_KERNEL_HEADERS_4_9=y
-BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-ng.config"
-BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
-BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
-BR2_PTHREAD_DEBUG=y
-BR2_GCC_VERSION_4_8_X=y
-BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_PACKAGE_HOST_GDB=y
-BR2_TARGET_OPTIMIZATION="-Os -pipe"
-BR2_TARGET_GENERIC_HOSTNAME="apf28"
-BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
-BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
-BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
-BR2_ROOTFS_OVERLAY="$(ARMADEUS_PATH)/rootfs/target_overlay"
-BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="apf28 imx28"
-BR2_TARGET_ARMADEUS=y
-BR2_BOARD_NAME="apf28"
-BR2_CPU_NAME="imx28"
-BR2_TARGET_ARMADEUS_SDRAM_SIZE="128"
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.65"
-BR2_LINUX_KERNEL_PATCH="../patches/linux/4.9"
-BR2_LINUX_KERNEL_DEFCONFIG="mxs"
-BR2_LINUX_KERNEL_UIMAGE=y
-BR2_LINUX_KERNEL_UIMAGE_LOADADDR="40008000"
-BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx28-apf28dev"
-BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
-BR2_PACKAGE_HOST_IMX28_USB_DOWNLOADER=y
-BR2_PACKAGE_IMXREGS=y
-BR2_PACKAGE_GDB=y
-BR2_PACKAGE_STRACE=y
-BR2_PACKAGE_MTD=y
-BR2_PACKAGE_MTD_SUMTOOL=y
-BR2_PACKAGE_INPUT_TOOLS=y
-# BR2_PACKAGE_INPUT_TOOLS_INPUTATTACH is not set
-# BR2_PACKAGE_INPUT_TOOLS_JSCAL is not set
-# BR2_PACKAGE_INPUT_TOOLS_JSTEST is not set
-BR2_PACKAGE_UBOOT_TOOLS=y
-BR2_PACKAGE_LZO=y
-BR2_PACKAGE_DTC=y
-BR2_PACKAGE_DTC_PROGRAMS=y
-BR2_PACKAGE_TSLIB=y
-BR2_PACKAGE_CAN_UTILS=y
-BR2_PACKAGE_DROPBEAR=y
-BR2_PACKAGE_IPERF=y
-BR2_PACKAGE_IPERF3=y
-BR2_PACKAGE_IPROUTE2=y
-BR2_PACKAGE_LRZSZ=y
-BR2_PACKAGE_NTP=y
-# BR2_PACKAGE_NTP_NTPD is not set
-BR2_PACKAGE_RPCBIND=y
-BR2_PACKAGE_WIRELESS_TOOLS=y
-BR2_PACKAGE_WPA_SUPPLICANT=y
-BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y
-BR2_PACKAGE_WPA_SUPPLICANT_EAP=y
-BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
-BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
-BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
-BR2_PACKAGE_WPA_SUPPLICANT_IEEE80211W=y
-BR2_PACKAGE_NANO=y
-BR2_TARGET_ROOTFS_UBIFS=y
-BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000
-BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=4227
-BR2_TARGET_ROOTFS_UBI=y
-BR2_TARGET_ROOTFS_UBI_SUBSIZE=0
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
-BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2017.01"
-BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)mainline-u-boot-2017.01.h"
-# BR2_TARGET_UBOOT_FORMAT_BIN is not set
-BR2_TARGET_UBOOT_FORMAT_SB=y
-BR2_TARGET_UBOOT_ENVIMAGE=y
-BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="$(ARMADEUS_PATH)/u-boot-env-2013.04.txt"
-BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x20000"
diff --git a/buildroot/configs/apf28mainlinetest_defconfig b/buildroot/configs/apf28mainlinetest_defconfig
deleted file mode 100644
index 47bacef82..000000000
--- a/buildroot/configs/apf28mainlinetest_defconfig
+++ /dev/null
@@ -1,162 +0,0 @@
-BR2_arm=y
-BR2_WGET="wget --passive-ftp --tries=3"
-BR2_DL_DIR="$(BASE_DIR)/../downloads"
-BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
-BR2_CCACHE=y
-BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.19.8"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_19=y
-BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-ng.config"
-BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
-BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
-BR2_PTHREAD_DEBUG=y
-BR2_GCC_VERSION_4_8_X=y
-BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_PACKAGE_HOST_GDB=y
-BR2_TARGET_OPTIMIZATION="-Os -pipe"
-BR2_TARGET_GENERIC_HOSTNAME="apf28"
-BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
-BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
-BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
-BR2_ROOTFS_OVERLAY="$(ARMADEUS_PATH)/rootfs/target_overlay"
-BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="apf28 imx28"
-BR2_TARGET_ARMADEUS=y
-BR2_BOARD_NAME="apf28"
-BR2_CPU_NAME="imx28"
-BR2_TARGET_ARMADEUS_SDRAM_SIZE="128"
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.19.8"
-BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
-BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
-BR2_LINUX_KERNEL_UIMAGE=y
-BR2_LINUX_KERNEL_UIMAGE_LOADADDR="40008000"
-BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx28-apf28dev"
-BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
-BR2_PACKAGE_AS_DEVICES=y
-BR2_PACKAGE_AS_DEVICES_TESTS=y
-BR2_PACKAGE_AS_DEVICES_CPP=y
-BR2_PACKAGE_AS_DEVICES_TESTS_CPP=y
-BR2_PACKAGE_DEMOS=y
-BR2_PACKAGE_ARMADEUS_DEMOS_ARMANOID=y
-BR2_PACKAGE_ARMADEUS_DEMOS_BACKLIGHT=y
-BR2_PACKAGE_ARMADEUS_DEMOS_INPUT=y
-BR2_PACKAGE_ARMADEUS_DEMOS_MUSIC_PLAYER=y
-BR2_PACKAGE_ARMADEUS_DEMOS_CAPTURE=y
-BR2_PACKAGE_ARMADEUS_DEMOS_OSCILLO=y
-BR2_PACKAGE_ARMADEUS_DEMOS_SHOW_IMAGE=y
-BR2_PACKAGE_ARMADEUS_DEMOS_TEST_LCD=y
-BR2_PACKAGE_HOST_IMX28_USB_DOWNLOADER=y
-BR2_PACKAGE_IMXREGS=y
-BR2_PACKAGE_TESTSUITE=y
-BR2_PACKAGE_ALSA_UTILS=y
-BR2_PACKAGE_ALSA_UTILS_AMIXER=y
-BR2_PACKAGE_ALSA_UTILS_APLAY=y
-BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
-BR2_PACKAGE_FFMPEG=y
-BR2_PACKAGE_FFMPEG_FFPLAY=y
-BR2_PACKAGE_GSTREAMER=y
-BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC=y
-BR2_PACKAGE_GST_PLUGINS_GOOD=y
-BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_RTP=y
-BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_RTSP=y
-BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_V4L2=y
-BR2_PACKAGE_GST_PLUGINS_BAD=y
-BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_H264PARSE=y
-BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RTPMUX=y
-BR2_PACKAGE_GST_PLUGINS_UGLY=y
-BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MAD=y
-BR2_PACKAGE_MADPLAY=y
-BR2_PACKAGE_MPLAYER=y
-BR2_PACKAGE_GDB=y
-BR2_PACKAGE_LMBENCH=y
-BR2_PACKAGE_LTRACE=y
-BR2_PACKAGE_STRACE=y
-BR2_PACKAGE_E2FSPROGS=y
-BR2_PACKAGE_MTD=y
-BR2_PACKAGE_MTD_SUMTOOL=y
-BR2_PACKAGE_DOOM_WAD=y
-BR2_PACKAGE_LBREAKOUT2=y
-BR2_PACKAGE_OPENTYRIAN=y
-BR2_PACKAGE_PRBOOM=y
-BR2_PACKAGE_SLIDESHOW=y
-BR2_PACKAGE_FBDUMP=y
-BR2_PACKAGE_FBGRAB=y
-BR2_PACKAGE_FB_TEST_APP=y
-BR2_PACKAGE_FBV=y
-BR2_PACKAGE_SDL_GFX=y
-BR2_PACKAGE_SDL_IMAGE_GIF=y
-BR2_PACKAGE_SDL_SOUND=y
-BR2_PACKAGE_SDL_SOUND_PLAYSOUND=y
-BR2_PACKAGE_SDL_WATER=y
-BR2_PACKAGE_I2C_TOOLS=y
-BR2_PACKAGE_INPUT_TOOLS=y
-# BR2_PACKAGE_INPUT_TOOLS_INPUTATTACH is not set
-# BR2_PACKAGE_INPUT_TOOLS_JSCAL is not set
-# BR2_PACKAGE_INPUT_TOOLS_JSTEST is not set
-BR2_PACKAGE_UBOOT_TOOLS=y
-BR2_PACKAGE_LUA=y
-BR2_PACKAGE_LUA_READLINE=y
-BR2_PACKAGE_PYTHON=y
-BR2_PACKAGE_PYTHON_READLINE=y
-BR2_PACKAGE_PYTHON_PYGAME=y
-BR2_PACKAGE_PYTHON_PYGAME_IMAGE=y
-BR2_PACKAGE_PYTHON_PYGAME_FONT=y
-BR2_PACKAGE_PYTHON_PYGAME_MIXER=y
-BR2_PACKAGE_PYTHON_PYGAME_MIXER_MUSIC=y
-BR2_PACKAGE_PYTHON_SERIAL=y
-BR2_PACKAGE_SPEEX=y
-BR2_PACKAGE_DTC=y
-BR2_PACKAGE_DTC_PROGRAMS=y
-BR2_PACKAGE_LIBUSB=y
-BR2_PACKAGE_LIBV4L=y
-BR2_PACKAGE_LIBV4L_UTILS=y
-BR2_PACKAGE_TSLIB=y
-BR2_PACKAGE_LIBXML2=y
-BR2_PACKAGE_BLUEZ_UTILS=y
-BR2_PACKAGE_BLUEZ_UTILS_COMPAT=y
-BR2_PACKAGE_CAN_UTILS=y
-BR2_PACKAGE_DROPBEAR=y
-BR2_PACKAGE_IPERF=y
-BR2_PACKAGE_IPERF3=y
-BR2_PACKAGE_IPROUTE2=y
-BR2_PACKAGE_LIGHTTPD=y
-BR2_PACKAGE_LIGHTTPD_OPENSSL=y
-BR2_PACKAGE_LIGHTTPD_LUA=y
-BR2_PACKAGE_LINKS=y
-BR2_PACKAGE_NTP=y
-# BR2_PACKAGE_NTP_NTPD is not set
-BR2_PACKAGE_NTP_NTPDATE=y
-BR2_PACKAGE_PPPD=y
-BR2_PACKAGE_RPCBIND=y
-BR2_PACKAGE_TCPDUMP=y
-BR2_PACKAGE_WIRELESS_TOOLS=y
-BR2_PACKAGE_WPA_SUPPLICANT=y
-BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y
-BR2_PACKAGE_WPA_SUPPLICANT_EAP=y
-BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
-BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
-BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
-BR2_PACKAGE_WPA_SUPPLICANT_IEEE80211W=y
-BR2_PACKAGE_NANO=y
-BR2_TARGET_ROOTFS_UBIFS=y
-BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000
-BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=4227
-BR2_TARGET_ROOTFS_UBI=y
-BR2_TARGET_ROOTFS_UBI_SUBSIZE=0
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
-BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2017.01"
-BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)mainline-u-boot-2017.01.h"
-# BR2_TARGET_UBOOT_FORMAT_BIN is not set
-BR2_TARGET_UBOOT_FORMAT_SB=y
-BR2_TARGET_UBOOT_ENVIMAGE=y
-BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="$(ARMADEUS_PATH)/u-boot-env-2013.04.txt"
-BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x20000"
diff --git a/buildroot/configs/apf28test_defconfig b/buildroot/configs/apf28test_defconfig
index d0a2ca73a..47bacef82 100644
--- a/buildroot/configs/apf28test_defconfig
+++ b/buildroot/configs/apf28test_defconfig
@@ -5,21 +5,20 @@ BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="2.6.35.3"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_REALLY_OLD=y
+BR2_DEFAULT_KERNEL_VERSION="3.19.8"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_19=y
 BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-ng.config"
 BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
 BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
 BR2_PTHREAD_DEBUG=y
+BR2_GCC_VERSION_4_8_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_PACKAGE_HOST_GDB=y
-BR2_ENABLE_LOCALE_PURGE=y
-BR2_ENABLE_LOCALE_WHITELIST="C en_US"
 BR2_TARGET_OPTIMIZATION="-Os -pipe"
 BR2_TARGET_GENERIC_HOSTNAME="apf28"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
-BR2_TARGET_GENERIC_GETTY_PORT="ttyAM0"
+BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
 BR2_ROOTFS_OVERLAY="$(ARMADEUS_PATH)/rootfs/target_overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
@@ -30,11 +29,14 @@ BR2_CPU_NAME="imx28"
 BR2_TARGET_ARMADEUS_SDRAM_SIZE="128"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.35.3"
-BR2_LINUX_KERNEL_PATCH="ftp://ftp2.armadeus.com/armadeusw/linux-2.6.35.3-imx_10.12.01.patch.tar.gz ftp://ftp2.armadeus.com/armadeusw/patches_for_L2.6.35_MX28_SDK_10.12_SOURCE.tar.gz ftp://ftp2.armadeus.com/armadeusw/L2.6.35_10.12_EMI_FREQ_PATCH_UP.tar.gz ftp://ftp2.armadeus.com/armadeusw/MX28-FEC-PROBLEM-PATCH.tar.gz ftp://ftp2.armadeus.com/armadeusw/linux-2.6.35.3-imx_11.09.01.patch.tar.gz ../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.19.8"
+BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
 BR2_LINUX_KERNEL_UIMAGE=y
+BR2_LINUX_KERNEL_UIMAGE_LOADADDR="40008000"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx28-apf28dev"
 BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
 BR2_PACKAGE_AS_DEVICES=y
 BR2_PACKAGE_AS_DEVICES_TESTS=y
@@ -69,6 +71,7 @@ BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_H264PARSE=y
 BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RTPMUX=y
 BR2_PACKAGE_GST_PLUGINS_UGLY=y
 BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MAD=y
+BR2_PACKAGE_MADPLAY=y
 BR2_PACKAGE_MPLAYER=y
 BR2_PACKAGE_GDB=y
 BR2_PACKAGE_LMBENCH=y
@@ -77,15 +80,15 @@ BR2_PACKAGE_STRACE=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_MTD=y
 BR2_PACKAGE_MTD_SUMTOOL=y
+BR2_PACKAGE_DOOM_WAD=y
 BR2_PACKAGE_LBREAKOUT2=y
 BR2_PACKAGE_OPENTYRIAN=y
-BR2_PACKAGE_DOOM_WAD=y
 BR2_PACKAGE_PRBOOM=y
 BR2_PACKAGE_SLIDESHOW=y
 BR2_PACKAGE_FBDUMP=y
 BR2_PACKAGE_FBGRAB=y
-BR2_PACKAGE_FBV=y
 BR2_PACKAGE_FB_TEST_APP=y
+BR2_PACKAGE_FBV=y
 BR2_PACKAGE_SDL_GFX=y
 BR2_PACKAGE_SDL_IMAGE_GIF=y
 BR2_PACKAGE_SDL_SOUND=y
@@ -97,15 +100,8 @@ BR2_PACKAGE_INPUT_TOOLS=y
 # BR2_PACKAGE_INPUT_TOOLS_JSCAL is not set
 # BR2_PACKAGE_INPUT_TOOLS_JSTEST is not set
 BR2_PACKAGE_UBOOT_TOOLS=y
-BR2_PACKAGE_LIBV4L=y
-BR2_PACKAGE_LIBV4L_UTILS=y
-# BR 2013.11:
-#BR2_PACKAGE_LIBV4L_V4L2_COMPLIANCE=y
-#BR2_PACKAGE_LIBV4L_V4L2_DBG=y
 BR2_PACKAGE_LUA=y
 BR2_PACKAGE_LUA_READLINE=y
-# BR 2013.11:
-#BR2_PACKAGE_LUA_INTERPRETER_READLINE
 BR2_PACKAGE_PYTHON=y
 BR2_PACKAGE_PYTHON_READLINE=y
 BR2_PACKAGE_PYTHON_PYGAME=y
@@ -115,7 +111,11 @@ BR2_PACKAGE_PYTHON_PYGAME_MIXER=y
 BR2_PACKAGE_PYTHON_PYGAME_MIXER_MUSIC=y
 BR2_PACKAGE_PYTHON_SERIAL=y
 BR2_PACKAGE_SPEEX=y
+BR2_PACKAGE_DTC=y
+BR2_PACKAGE_DTC_PROGRAMS=y
 BR2_PACKAGE_LIBUSB=y
+BR2_PACKAGE_LIBV4L=y
+BR2_PACKAGE_LIBV4L_UTILS=y
 BR2_PACKAGE_TSLIB=y
 BR2_PACKAGE_LIBXML2=y
 BR2_PACKAGE_BLUEZ_UTILS=y
@@ -137,11 +137,11 @@ BR2_PACKAGE_RPCBIND=y
 BR2_PACKAGE_TCPDUMP=y
 BR2_PACKAGE_WIRELESS_TOOLS=y
 BR2_PACKAGE_WPA_SUPPLICANT=y
+BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y
 BR2_PACKAGE_WPA_SUPPLICANT_EAP=y
+BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
 BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
 BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
-BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y
-BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
 BR2_PACKAGE_WPA_SUPPLICANT_IEEE80211W=y
 BR2_PACKAGE_NANO=y
 BR2_TARGET_ROOTFS_UBIFS=y
@@ -154,7 +154,8 @@ BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
 BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2017.01"
-BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2017.01.h"
+BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)mainline-u-boot-2017.01.h"
+# BR2_TARGET_UBOOT_FORMAT_BIN is not set
 BR2_TARGET_UBOOT_FORMAT_SB=y
 BR2_TARGET_UBOOT_ENVIMAGE=y
 BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="$(ARMADEUS_PATH)/u-boot-env-2013.04.txt"
diff --git a/buildroot/configs/apf9328_defconfig b/buildroot/configs/apf9328_defconfig
deleted file mode 100644
index bbf015dd0..000000000
--- a/buildroot/configs/apf9328_defconfig
+++ /dev/null
@@ -1,70 +0,0 @@
-BR2_arm=y
-BR2_arm920t=y
-BR2_WGET="wget --passive-ftp --tries=3"
-BR2_DL_DIR="$(BASE_DIR)/../downloads"
-BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
-BR2_CCACHE=y
-BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="2.6.29.6"
-BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-ng.config"
-BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
-BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
-BR2_PTHREAD_DEBUG=y
-BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_PACKAGE_HOST_GDB=y
-BR2_ENABLE_LOCALE_PURGE=y
-BR2_ENABLE_LOCALE_WHITELIST="C en_US"
-BR2_TARGET_OPTIMIZATION="-Os -pipe"
-BR2_TARGET_GENERIC_HOSTNAME="apf9328"
-BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
-BR2_TARGET_GENERIC_GETTY_PORT="ttySMX0"
-BR2_ROOTFS_OVERLAY="$(ARMADEUS_PATH)/rootfs/target_overlay"
-BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="apf9328 imxl"
-BR2_TARGET_ARMADEUS=y
-BR2_BOARD_NAME="apf9328"
-BR2_CPU_NAME="imxl"
-BR2_TARGET_ARMADEUS_SDRAM_SIZE="16"
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.29.6"
-BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
-BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
-BR2_LINUX_KERNEL_UIMAGE=y
-BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
-BR2_PACKAGE_FPGAREGS=y
-BR2_PACKAGE_FPGA_FIRMWARE=y
-BR2_PACKAGE_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf9328_200k.bit"
-BR2_PACKAGE_FPGA_FIRMWARE_EXPORT=y
-BR2_PACKAGE_IMXREGS=y
-BR2_PACKAGE_MAX5821CTRL=y
-BR2_PACKAGE_CH7024CTRL=y
-BR2_PACKAGE_ALSA_UTILS=y
-BR2_PACKAGE_ALSA_UTILS_AMIXER=y
-BR2_PACKAGE_ALSA_UTILS_APLAY=y
-BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
-BR2_PACKAGE_GDB=y
-BR2_PACKAGE_MTD=y
-BR2_PACKAGE_MTD_JFFS2DUMP=y
-BR2_PACKAGE_MTD_MKFSJFFS2=y
-BR2_PACKAGE_MTD_SUMTOOL=y
-BR2_PACKAGE_UBOOT_TOOLS=y
-BR2_PACKAGE_TSLIB=y
-BR2_PACKAGE_NTP=y
-# BR2_PACKAGE_NTP_NTPD is not set
-BR2_PACKAGE_NANO=y
-BR2_PACKAGE_RPCBIND=y
-BR2_TARGET_ROOTFS_JFFS2=y
-BR2_TARGET_ROOTFS_JFFS2_PAD=y
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
-BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2017.01"
-BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2017.01.h"
-BR2_TARGET_UBOOT_ENVIMAGE=y
-BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-env-2013.04.txt"
-BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x20000"
diff --git a/buildroot/configs/apf9328test_defconfig b/buildroot/configs/apf9328test_defconfig
deleted file mode 100644
index 3bca812d2..000000000
--- a/buildroot/configs/apf9328test_defconfig
+++ /dev/null
@@ -1,130 +0,0 @@
-BR2_arm=y
-BR2_arm920t=y
-BR2_WGET="wget --passive-ftp --tries=3"
-BR2_DL_DIR="$(BASE_DIR)/../downloads"
-BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
-BR2_CCACHE=y
-BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="2.6.29.6"
-BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-ng.config"
-BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
-BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
-BR2_PTHREAD_DEBUG=y
-BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_PACKAGE_HOST_GDB=y
-BR2_ENABLE_LOCALE_PURGE=y
-BR2_ENABLE_LOCALE_WHITELIST="C en_US"
-BR2_TARGET_OPTIMIZATION="-Os -pipe"
-BR2_TARGET_GENERIC_HOSTNAME="apf9328"
-BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
-BR2_TARGET_GENERIC_GETTY_PORT="ttySMX0"
-BR2_ROOTFS_OVERLAY="$(ARMADEUS_PATH)/rootfs/target_overlay"
-BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="apf9328 imxl"
-BR2_TARGET_ARMADEUS=y
-BR2_BOARD_NAME="apf9328"
-BR2_CPU_NAME="imxl"
-BR2_TARGET_ARMADEUS_SDRAM_SIZE="16"
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.29.6"
-BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
-BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
-BR2_LINUX_KERNEL_UIMAGE=y
-BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
-BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
-BR2_PACKAGE_AS_DEVICES=y
-BR2_PACKAGE_AS_DEVICES_TESTS=y
-BR2_PACKAGE_AS_DEVICES_CPP=y
-BR2_PACKAGE_AS_DEVICES_TESTS_CPP=y
-BR2_PACKAGE_DEMOS=y
-BR2_PACKAGE_ARMADEUS_DEMOS_ARMANOID=y
-BR2_PACKAGE_ARMADEUS_DEMOS_BACKLIGHT=y
-BR2_PACKAGE_ARMADEUS_DEMOS_GPIO=y
-BR2_PACKAGE_ARMADEUS_DEMOS_GPS=y
-BR2_PACKAGE_ARMADEUS_DEMOS_INPUT=y
-BR2_PACKAGE_ARMADEUS_DEMOS_MUSIC_PLAYER=y
-BR2_PACKAGE_ARMADEUS_DEMOS_OSCILLO=y
-BR2_PACKAGE_ARMADEUS_DEMOS_SHOW_IMAGE=y
-BR2_PACKAGE_ARMADEUS_DEMOS_TEST_LCD=y
-BR2_PACKAGE_ARMADEUS_DEMOS_MCP25020=y
-BR2_PACKAGE_FPGAREGS=y
-BR2_PACKAGE_FPGA_FIRMWARE=y
-BR2_PACKAGE_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf9328_200k.bit"
-BR2_PACKAGE_FPGA_FIRMWARE_EXPORT=y
-BR2_PACKAGE_IMXREGS=y
-BR2_PACKAGE_MAX5821CTRL=y
-BR2_PACKAGE_TESTSUITE=y
-BR2_PACKAGE_CH7024CTRL=y
-BR2_PACKAGE_ALSA_UTILS=y
-BR2_PACKAGE_ALSA_UTILS_AMIXER=y
-BR2_PACKAGE_ALSA_UTILS_APLAY=y
-BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
-BR2_PACKAGE_MADPLAY=y
-BR2_PACKAGE_MPLAYER=y
-BR2_PACKAGE_GDB=y
-BR2_PACKAGE_LTRACE=y
-BR2_PACKAGE_STRACE=y
-BR2_PACKAGE_FBDUMP=y
-BR2_PACKAGE_FBGRAB=y
-BR2_PACKAGE_FBSET=y
-BR2_PACKAGE_FBV=y
-BR2_PACKAGE_FB_TEST_APP=y
-BR2_PACKAGE_SDL_IMAGE_GIF=y
-BR2_PACKAGE_SDL_IMAGE_JPEG=y
-BR2_PACKAGE_SDL_IMAGE_PNG=y
-BR2_PACKAGE_SDL_SOUND=y
-BR2_PACKAGE_SDL_SOUND_PLAYSOUND=y
-BR2_PACKAGE_SDL_NET=y
-BR2_PACKAGE_SDL_GFX=y
-BR2_PACKAGE_SLIDESHOW=y
-BR2_PACKAGE_SDL_WATER=y
-BR2_PACKAGE_E2FSPROGS=y
-BR2_PACKAGE_MTD=y
-BR2_PACKAGE_MTD_JFFS2DUMP=y
-BR2_PACKAGE_MTD_MKFSJFFS2=y
-BR2_PACKAGE_MTD_SUMTOOL=y
-BR2_PACKAGE_I2C_TOOLS=y
-BR2_PACKAGE_INPUT_TOOLS=y
-BR2_PACKAGE_UBOOT_TOOLS=y
-BR2_PACKAGE_LUA=y
-BR2_PACKAGE_LUA_READLINE=y
-# BR 2013.11:
-#BR2_PACKAGE_LUA_INTERPRETER_READLINE=y
-BR2_PACKAGE_TSLIB=y
-BR2_PACKAGE_LIBUSB=y
-BR2_PACKAGE_LIBFFI=y
-BR2_PACKAGE_BOA=y
-BR2_PACKAGE_CAN_UTILS=y
-BR2_PACKAGE_DROPBEAR=y
-BR2_PACKAGE_ETHTOOL=y
-BR2_PACKAGE_IPERF=y
-BR2_PACKAGE_IPROUTE2=y
-BR2_PACKAGE_LINKS=y
-BR2_PACKAGE_NTP=y
-# BR2_PACKAGE_NTP_NTPD is not set
-BR2_PACKAGE_NTP_NTPDATE=y
-BR2_PACKAGE_RPCBIND=y
-BR2_PACKAGE_TCPDUMP=y
-BR2_PACKAGE_WIRELESS_TOOLS=y
-BR2_PACKAGE_WPA_SUPPLICANT=y
-BR2_PACKAGE_WPA_SUPPLICANT_EAP=y
-BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
-BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
-BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y
-BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
-BR2_PACKAGE_NANO=y
-BR2_TARGET_ROOTFS_JFFS2=y
-BR2_TARGET_ROOTFS_JFFS2_PAD=y
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
-BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2017.01"
-BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2017.01.h"
-BR2_TARGET_UBOOT_ENVIMAGE=y
-BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-env-2013.04.txt"
-BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x20000"
diff --git a/buildroot/configs/apf9328xenomai_defconfig b/buildroot/configs/apf9328xenomai_defconfig
deleted file mode 100644
index f02de9c6e..000000000
--- a/buildroot/configs/apf9328xenomai_defconfig
+++ /dev/null
@@ -1,75 +0,0 @@
-BR2_arm=y
-BR2_arm920t=y
-BR2_WGET="wget --passive-ftp --tries=3"
-BR2_DL_DIR="$(BASE_DIR)/../downloads"
-BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
-BR2_CCACHE=y
-BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="2.6.29.6"
-BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-ng.config"
-BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
-BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
-BR2_PTHREAD_DEBUG=y
-BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_PACKAGE_HOST_GDB=y
-BR2_ENABLE_LOCALE_PURGE=y
-BR2_ENABLE_LOCALE_WHITELIST="C en_US"
-BR2_TARGET_OPTIMIZATION="-Os -pipe"
-BR2_TARGET_GENERIC_HOSTNAME="apf9328"
-BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
-BR2_TARGET_GENERIC_GETTY_PORT="ttySMX0"
-BR2_ROOTFS_OVERLAY="$(ARMADEUS_PATH)/rootfs/target_overlay"
-BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="apf9328 imxl"
-BR2_TARGET_ARMADEUS=y
-BR2_BOARD_NAME="apf9328"
-BR2_CPU_NAME="imxl"
-BR2_TARGET_ARMADEUS_SDRAM_SIZE="16"
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.29.6"
-BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
-BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
-BR2_LINUX_KERNEL_UIMAGE=y
-BR2_LINUX_KERNEL_EXT_XENOMAI=y
-BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH_URL="ftp://ftp2.armadeus.com/armadeusw/adeos-ipipe-2.6.29-arm-1.13-05.patch"
-BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
-BR2_PACKAGE_FPGAREGS=y
-BR2_PACKAGE_FPGA_FIRMWARE=y
-BR2_PACKAGE_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf9328_200k.bit"
-BR2_PACKAGE_FPGA_FIRMWARE_EXPORT=y
-BR2_PACKAGE_IMXREGS=y
-BR2_PACKAGE_MAX5821CTRL=y
-BR2_PACKAGE_CH7024CTRL=y
-BR2_PACKAGE_ALSA_UTILS=y
-BR2_PACKAGE_ALSA_UTILS_AMIXER=y
-BR2_PACKAGE_ALSA_UTILS_APLAY=y
-BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
-BR2_PACKAGE_GDB=y
-BR2_PACKAGE_MTD=y
-BR2_PACKAGE_MTD_JFFS2DUMP=y
-BR2_PACKAGE_MTD_MKFSJFFS2=y
-BR2_PACKAGE_MTD_SUMTOOL=y
-BR2_PACKAGE_UBOOT_TOOLS=y
-BR2_PACKAGE_TSLIB=y
-BR2_PACKAGE_NTP=y
-# BR2_PACKAGE_NTP_NTPD is not set
-BR2_PACKAGE_RPCBIND=y
-BR2_PACKAGE_XENOMAI_VERSION="2.4.9"
-BR2_PACKAGE_XENOMAI_CONF_OPT="--enable-arm-mach=imx"
-BR2_PACKAGE_XENOMAI_TESTSUITE=y
-BR2_PACKAGE_NANO=y
-BR2_TARGET_ROOTFS_JFFS2=y
-BR2_TARGET_ROOTFS_JFFS2_PAD=y
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
-BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2017.01"
-BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2017.01.h"
-BR2_TARGET_UBOOT_ENVIMAGE=y
-BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-env-2013.04.txt"
-BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x20000"


hooks/post-receive
-- 
armadeus