[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-48-g7a6f175
Brought to you by:
sszy
|
From: Julien B a. A. <ar...@us...> - 2016-03-27 17:44:04
|
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 7a6f17588db2e8c1385e7f543e2a3819c5843bdd (commit)
from 34baef292150a59ec926a7c5e7ef7a385b649022 (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 7a6f17588db2e8c1385e7f543e2a3819c5843bdd
Author: Julien BOIBESSOT <jul...@ar...>
Date: Sun Mar 27 19:04:44 2016 +0200
[BUILDROOT] Add preliminary support for new APF6UL SOM
-----------------------------------------------------------------------
Summary of changes:
...f6xenomai_defconfig => apf6ul_legacy_defconfig} | 60 ++++++++-----------
buildroot/target/device/armadeus/Makefile.in | 6 ++-
.../target/device/armadeus/apf6ul/genimage.cfg | 1 +
3 files changed, 31 insertions(+), 36 deletions(-)
copy buildroot/configs/{apf6xenomai_defconfig => apf6ul_legacy_defconfig} (61%)
create mode 100644 buildroot/target/device/armadeus/apf6ul/genimage.cfg
diff --git a/buildroot/configs/apf6xenomai_defconfig b/buildroot/configs/apf6ul_legacy_defconfig
similarity index 61%
copy from buildroot/configs/apf6xenomai_defconfig
copy to buildroot/configs/apf6ul_legacy_defconfig
index 2d920db..2d300f9 100644
--- a/buildroot/configs/apf6xenomai_defconfig
+++ b/buildroot/configs/apf6ul_legacy_defconfig
@@ -1,47 +1,41 @@
BR2_arm=y
-BR2_cortex_a9=y
-BR2_ARM_EABIHF=y
-BR2_ARM_ENABLE_NEON=y
-BR2_ARM_FPU_VFPV3D16=y
+BR2_cortex_a7=y
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_TOOLCHAIN_EXTERNAL=y
BR2_ENABLE_LOCALE_PURGE=y
-BR2_TARGET_GENERIC_HOSTNAME="apf6"
+BR2_TARGET_GENERIC_HOSTNAME="apf6ul"
BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
BR2_ROOTFS_SKELETON_CUSTOM=y
BR2_ROOTFS_SKELETON_CUSTOM_PATH="$(ARMADEUS_PATH)/rootfs/target_skeleton"
-BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3"
+BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
BR2_TARGET_TZ_INFO=y
BR2_TARGET_TZ_ZONELIST="europe"
BR2_TARGET_LOCALTIME="Europe/Paris"
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="apf6 imx6"
+BR2_ROOTFS_POST_SCRIPT_ARGS="apf6ul imx6ul"
BR2_TARGET_ARMADEUS=y
-BR2_BOARD_NAME="apf6"
-BR2_CPU_NAME="imx6"
-BR2_TARGET_ARMADEUS_NR_SDRAM="2"
-BR2_TARGET_ARMADEUS_SDRAM_SIZE="512"
+BR2_BOARD_NAME="apf6ul"
+BR2_CPU_NAME="imx6ul"
+BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.32"
-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)/apf6xenomai-linux-$(BR2_LINUX_KERNEL_VERSION).config"
+BR2_LINUX_KERNEL_CUSTOM_GIT=y
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.freescale.com/imx/linux-2.6-imx.git"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_3.14.52_1.1.0_ga"
+BR2_LINUX_KERNEL_DEFCONFIG="imx_v7"
BR2_LINUX_KERNEL_ZIMAGE=y
BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-wandboard imx6dl-apf6dev imx6q-apf6dev"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-14x14-evk"
BR2_LINUX_KERNEL_INSTALL_TARGET=y
BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
-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.10.32-arm-7.patch"
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_FAAD2=y
BR2_PACKAGE_GDB=y
BR2_PACKAGE_LTRACE=y
BR2_PACKAGE_PV=y
@@ -51,9 +45,7 @@ BR2_PACKAGE_DOSFSTOOLS=y
BR2_PACKAGE_DOSFSTOOLS_FATLABEL=y
BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
-BR2_PACKAGE_E2FSPROGS=y
BR2_PACKAGE_E2FSPROGS_E4DEFRAG=y
-BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
BR2_PACKAGE_MMC_UTILS=y
BR2_PACKAGE_FBGRAB=y
BR2_PACKAGE_FB_TEST_APP=y
@@ -67,13 +59,14 @@ BR2_PACKAGE_APF_CONFIG=y
BR2_PACKAGE_EVTEST=y
BR2_PACKAGE_I2C_TOOLS=y
BR2_PACKAGE_KBD=y
-BR2_PACKAGE_PCI_DEBUG=y
-BR2_PACKAGE_PCIUTILS=y
BR2_PACKAGE_TI_UTILS=y
BR2_PACKAGE_UBOOT_TOOLS=y
-BR2_PACKAGE_USBUTILS=y
+BR2_PACKAGE_LIBVORBIS=y
+BR2_PACKAGE_LIBUSB=y
+BR2_PACKAGE_LIBV4L=y
+BR2_PACKAGE_LIBV4L_UTILS=y
BR2_PACKAGE_TSLIB=y
-BR2_PACKAGE_NEWT=y
+BR2_PACKAGE_READLINE=y
BR2_PACKAGE_BC=y
BR2_PACKAGE_BLUEZ_UTILS=y
BR2_PACKAGE_CAN_UTILS=y
@@ -88,7 +81,6 @@ BR2_PACKAGE_WIRELESS_TOOLS=y
BR2_PACKAGE_WPA_SUPPLICANT=y
BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
-BR2_PACKAGE_XENOMAI_VERSION="2.6.3"
BR2_PACKAGE_UTIL_LINUX_BINARIES=y
BR2_PACKAGE_UTIL_LINUX_FSCK=y
BR2_PACKAGE_NANO=y
@@ -96,15 +88,13 @@ BR2_TARGET_ROOTFS_EXT2=y
BR2_TARGET_ROOTFS_EXT2_4=y
BR2_TARGET_ROOTFS_EXT2_LABEL="ROOTFS"
BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
-BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2014.07"
-BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2014.07"
-BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
-BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2014.07.h"
-BR2_TARGET_UBOOT_FORMAT_IMG=y
-BR2_TARGET_UBOOT_SPL=y
-BR2_TARGET_UBOOT_SPL_NAME="SPL"
+BR2_TARGET_UBOOT_BOARDNAME="mx6ul_14x14_evk"
+BR2_TARGET_UBOOT_CUSTOM_GIT=y
+BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.freescale.com/imx/uboot-imx.git"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_3.14.52_1.1.0_ga"
+BR2_TARGET_UBOOT_FORMAT_IMX=y
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
BR2_PACKAGE_HOST_E2TOOLS=y
BR2_PACKAGE_HOST_GENIMAGE=y
BR2_PACKAGE_HOST_IMX_USB_LOADER=y
+BR2_PACKAGE_HOST_MTOOLS=y
diff --git a/buildroot/target/device/armadeus/Makefile.in b/buildroot/target/device/armadeus/Makefile.in
index 559bc4e..42d9871 100644
--- a/buildroot/target/device/armadeus/Makefile.in
+++ b/buildroot/target/device/armadeus/Makefile.in
@@ -11,12 +11,15 @@ ARMADEUS_DTB_IMAGE_NAME:=$(addsuffix .dtb,$(BOARD_NAME))
LINUX26_KERNEL_NAME:=$(BOARD_NAME)-linux.bin
# !! if you modify the following, please also update scripts/quiltify.sh !!
+ifneq ($(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR), "")
define UBOOT_ARMADEUS_SPECIFIC_PATCH_HOOK
support/scripts/apply-patches.sh $(@D) $(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR) \*.patch
endef
UBOOT_POST_PATCH_HOOKS += UBOOT_ARMADEUS_SPECIFIC_PATCH_HOOK
+endif
ifneq ($(BR2_CPU_NAME), "imx6")
+ifneq ($(BR2_CPU_NAME), "imx6ul")
define UBOOT_UPDATE_CONFIG_HEADER
$(SED) "s,^#define CONFIG_BOARD_NAME.*,#define CONFIG_BOARD_NAME $(BOARD_NAME),g;"\
$(@D)/include/configs/$(UBOOT_BOARD_NAME).h
@@ -51,7 +54,8 @@ define UBOOT_POST_INSTALL_IMAGES_ACTION
endef
UBOOT_POST_INSTALL_IMAGES_HOOKS += UBOOT_POST_INSTALL_IMAGES_ACTION
-endif # BR2_BOARD_NAME != apf6
+endif # BR2_CPU_NAME != imx6ul
+endif # BR2_CPU_NAME != imx6
define LINUX_PRE_CONFIGURE_ACTION
ln -sf $(ARMADEUS_TOPDIR)/target/linux/modules $(@D)/drivers/armadeus
diff --git a/buildroot/target/device/armadeus/apf6ul/genimage.cfg b/buildroot/target/device/armadeus/apf6ul/genimage.cfg
new file mode 100644
index 0000000..2baf083
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf6ul/genimage.cfg
@@ -0,0 +1 @@
+# APF6UL image format
hooks/post-receive
--
armadeus
|