Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meta-digi-arm: use 'v3.10/master' branch for MX6 

Also remove support for device tree variants as it's not needed. We will
only have different device tree for the different CPUs, but not for the
different variants of the same CPU.

https://jira.digi.com/browse/DEL-1569

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2015-03-20 17:28:21 +01:00
parent f8da7787ef
commit 04f8a546aa
2 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
meta-digi-arm/conf/machine/include/ccimx6.inc
View File

@ -84,15 +84,3 @@ CPU_FAMILY_q512 = "mx6q"
CPU_FAMILY_dl256 = "mx6dl"
CPU_FAMILY_wdl512 = "mx6dl"
CPU_FAMILY_wbdl1024 = "mx6dl"
# Per-variant device tree
DTB_VARIANT_STR = ""
DTB_VARIANT_STR_wbkq1024 = "-wbk"
DTB_VARIANT_STR_wbq512 = "-wb"
DTB_VARIANT_STR_wbq1024 = "-wb"
DTB_VARIANT_STR_wq1024 = "-wb"
DTB_VARIANT_STR_wdl256 = "-w"
DTB_VARIANT_STR_q512 = "-wb"
DTB_VARIANT_STR_dl256 = "-z"
DTB_VARIANT_STR_wdl512 = "-mw"
DTB_VARIANT_STR_wbdl1024 = "-mwb"

13
meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb
View File

@ -8,7 +8,6 @@ DEPENDS += "lzop-native bc-native"
# Internal repo branch
SRCBRANCH = "v3.10/master"
SRCBRANCH_mxs = "v3.10/dey-1.4/maint"
SRCBRANCH_mx6 = "v3.10/dey-1.7/maint"
SRCREV_external = ""
SRCREV_external_mxs = ""
@ -36,18 +35,6 @@ do_update_dts() {
:
}
do_update_dts_ccimx6() {
# Rename variant device tree to the standard name (used in u-boot)
for DTB in ${KERNEL_DEVICETREE}; do
DTS="${DTB%b}s"
DTS_VARIANT="$(echo ${DTS} | sed "s/${MACHINE}/${MACHINE}${DTB_VARIANT_STR}/g")"
[ "${DTS_VARIANT}" = "${DTS}" ] && continue
if [ -e "${S}/arch/arm/boot/dts/${DTS_VARIANT}" ]; then
cp -f "${S}/arch/arm/boot/dts/${DTS_VARIANT}" "${S}/arch/arm/boot/dts/${DTS}"
fi
done
}
do_update_dts_mxs() {
if [ -n "${HAVE_WIFI}" ]; then
config_dts enable '_ssp2_mmc_wifi.dtsi'