diff --git a/meta-digi-arm/conf/machine/ccimx6sbc.conf b/meta-digi-arm/conf/machine/ccimx6sbc.conf index fe4069461..cb6fd9569 100644 --- a/meta-digi-arm/conf/machine/ccimx6sbc.conf +++ b/meta-digi-arm/conf/machine/ccimx6sbc.conf @@ -5,7 +5,7 @@ # Contains the ConnectCore 6 module. include conf/machine/include/ccimx6.inc -KERNEL_DEVICETREE = "i${CPU_FAMILY}-${MACHINE}.dtb i${CPU_FAMILY}-${MACHINE}-ldo-bypass.dtb" +KERNEL_DEVICETREE = "imx6q-ccimx6sbc.dtb imx6q-ccimx6sbc-ldo-bypass.dtb" SERIAL_CONSOLES = "115200;ttymxc3" diff --git a/meta-digi-arm/conf/machine/include/ccimx6.inc b/meta-digi-arm/conf/machine/include/ccimx6.inc index a8ecf4414..e8e3e894d 100644 --- a/meta-digi-arm/conf/machine/include/ccimx6.inc +++ b/meta-digi-arm/conf/machine/include/ccimx6.inc @@ -6,7 +6,7 @@ include conf/machine/include/imx-digi-base.inc include conf/machine/include/tune-cortexa9.inc DIGI_FAMILY = "ccimx6" -SOC_FAMILY = "mx6:${CPU_FAMILY}:${DIGI_FAMILY}" +SOC_FAMILY = "mx6:mx6q:${DIGI_FAMILY}" # Platform u-boot settings UBOOT_ENTRYPOINT = "0x10800000" @@ -30,57 +30,6 @@ MACHINE_EXTRA_RDEPENDS += " \ MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}" MACHINE_EXTRA_RRECOMMENDS += "fsl-alsa-plugins" -# -# Supported variants -# -# Maintain in sync with the same table in platform local.conf template. -# -# Name WiFi[w] BT[b] Kinetis[k] Proc[q|dl] DDR[1024|512|256] -# --------------------------------------------------------------------------- -# wbkq1024 Y Y Y quad/dual 1024MiB (0x01,0x02) -# wbq512 Y Y N quad/dual 512MiB (0x03,0x06) -# wbq1024 Y Y N quad/dual 1024MiB (0x04) -# wq1024 Y N N quad/dual 1024MiB (0x05) -# wdl256 Y N N duallite/solo 256MiB (0x07) -# q512 N N N quad/dual 512MiB (0x08) -# dl256 N N N duallite/solo 256MiB (0x09) -# wdl512 Y N N duallite/solo 512MiB (0x0A) -# wbdl1024 Y Y N duallite/solo 1024MiB (0x0B) +MACHINE_FEATURES += "accel-graphics accel-video wifi bluetooth" -# All variants support -MACHINE_FEATURES += "accel-graphics accel-video" - -# Per-variant machine features -MACHINE_FEATURES_append_wbkq1024 = " wifi bluetooth" -MACHINE_FEATURES_append_wbq512 = " wifi bluetooth" -MACHINE_FEATURES_append_wbq1024 = " wifi bluetooth" -MACHINE_FEATURES_append_wq1024 = " wifi" -MACHINE_FEATURES_append_wdl256 = " wifi" -MACHINE_FEATURES_append_q512 = "" -MACHINE_FEATURES_append_dl256 = "" -MACHINE_FEATURES_append_wdl512 = " wifi" -MACHINE_FEATURES_append_wbdl1024 = " wifi bluetooth" - -# Per-variant u-boot configuration -UBOOT_MACHINE = "" -UBOOT_MACHINE_wbkq1024 = "ccimx6qsbc_config" -UBOOT_MACHINE_wbq512 = "ccimx6qsbc512MB_config" -UBOOT_MACHINE_wbq1024 = "ccimx6qsbc_config" -UBOOT_MACHINE_wq1024 = "ccimx6qsbc_config" -UBOOT_MACHINE_wdl256 = "ccimx6dlsbc256MB_config" -UBOOT_MACHINE_q512 = "ccimx6qsbc512MB_config" -UBOOT_MACHINE_dl256 = "ccimx6dlsbc256MB_config" -UBOOT_MACHINE_wdl512 = "ccimx6dlsbc512MB_config" -UBOOT_MACHINE_wbdl1024 = "ccimx6dlsbc_config" - -# Per-variant cpu family -CPU_FAMILY = "" -CPU_FAMILY_wbkq1024 = "mx6q" -CPU_FAMILY_wbq512 = "mx6q" -CPU_FAMILY_wbq1024 = "mx6q" -CPU_FAMILY_wq1024 = "mx6q" -CPU_FAMILY_wdl256 = "mx6dl" -CPU_FAMILY_q512 = "mx6q" -CPU_FAMILY_dl256 = "mx6dl" -CPU_FAMILY_wdl512 = "mx6dl" -CPU_FAMILY_wbdl1024 = "mx6dl" +UBOOT_MACHINE = "ccimx6qsbc_config" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2013.04/ccimx6/boot-sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2013.04/ccimx6/boot-sd.txt index 6d8fd2385..b516e0d4c 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2013.04/ccimx6/boot-sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2013.04/ccimx6/boot-sd.txt @@ -12,5 +12,5 @@ # setenv mmcroot /dev/mmcblk${mmcdev}p2 setenv uimage uImage -setenv fdt_file i##CPU_FAMILY##-${board}.dtb +setenv fdt_file imx6q-${board}.dtb dboot linux mmc ${mmcdev}:${mmcpart} diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2013.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2013.04.bb index 624acbe81..00b1ac119 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2013.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2013.04.bb @@ -20,7 +20,6 @@ do_compile_prepend() { } do_deploy_append() { - sed -i -e 's,##CPU_FAMILY##,${CPU_FAMILY},g' ${WORKDIR}/boot-sd.txt mkimage -T script -n bootscript -C none -d ${WORKDIR}/boot-sd.txt ${DEPLOYDIR}/boot-sd.scr } diff --git a/sdk/build.sh b/sdk/build.sh index cd0cbeab2..546f11157 100755 --- a/sdk/build.sh +++ b/sdk/build.sh @@ -151,7 +151,7 @@ done<<-_EOF_ ccardimx28js - e w wb web web1 ccimx51js 128 128a 128agv agv eagv w w128a w128agv wagv weagv ccimx53js - 128 4k e e4k w w128 we - ccimx6sbc wbkq1024 wbq512 wbq1024 wq1024 wdl256 q512 dl256 wdl512 wbdl1024 + ccimx6sbc DONTBUILDVARIANTS _EOF_ # Build alternative linux and u-boot diff --git a/sdk/config/ccimx6sbc/local.conf.sample b/sdk/config/ccimx6sbc/local.conf.sample index ff3e0e97a..95bef230a 100644 --- a/sdk/config/ccimx6sbc/local.conf.sample +++ b/sdk/config/ccimx6sbc/local.conf.sample @@ -38,24 +38,6 @@ MACHINE = "ccimx6sbc" -# -# Supported variants -# -# Maintain in sync with the same table in platform machine config file. -# -# Name WiFi[w] BT[b] Kinetis[k] Proc[q|dl] DDR[1024|512|256] -# --------------------------------------------------------------------------- -# wbkq1024 Y Y Y quad/dual 1024MiB (0x01,0x02) -# wbq512 Y Y N quad/dual 512MiB (0x03,0x06) -# wbq1024 Y Y N quad/dual 1024MiB (0x04) -# wq1024 Y N N quad/dual 1024MiB (0x05) -# wdl256 Y N N duallite/solo 256MiB (0x07) -# q512 N N N quad/dual 512MiB (0x08) -# dl256 N N N duallite/solo 256MiB (0x09) -# wdl512 Y N N duallite/solo 512MiB (0x0A) -# wbdl1024 Y Y N duallite/solo 1024MiB (0x0B) -MACHINE_VARIANT = "wbkq1024" - # # Use Digi's internal git repositories #