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

meta-digi: Change xmx for imx. 

Just a cosmetic name change for the merged wired and wireless platforms.

This and related commits fixes https://jira.digi.com/browse/DEL-188.

Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
This commit is contained in:
Alex Gonzalez 2013-02-12 16:22:35 +01:00
parent 3505e019a1
commit 6042a70fbc
50 changed files with 148 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
meta-digi-arm/classes/image_types_digi.bbclass
View File

@ -25,9 +25,9 @@ load_platform_data() {
eval "${_pl}_mio=\"$(echo ${_mio} | tr ',' ' ')\""
eval "${_pl}_sub=\"$(echo ${_sub} | tr ',' ' ')\""
done<<-_EOF_
ccardxmx28js 2047 128 126976 2048 -
ccxmx51js 4095,1023 128,512 129024,520192 2048,4096 512,1024
ccxmx53js 4095,1023 128,512 129024,520192 2048,4096 512,1024
ccardimx28js 2047 128 126976 2048 -
ccimx51js 4095,1023 128,512 129024,520192 2048,4096 512,1024
ccimx53js 4095,1023 128,512 129024,520192 2048,4096 512,1024
_EOF_
# Set generic variables for current MACHINE
nimg="$(eval echo \${${MACHINE}_peb} | wc -w)"
@ -46,7 +46,7 @@ IMAGE_CMD_jffs2() {
for i in $(seq 1 ${nimg}); do
eval peb_it="\${peb${i}}"
# Do not use '-p (padding)' option. It breaks 'ccardxmx28js' flash images [JIRA:DEL-218]
# Do not use '-p (padding)' option. It breaks 'ccardimx28js' flash images [JIRA:DEL-218]
mkfs.jffs2 -n -e ${peb_it} -d ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.${peb_it}.rootfs.jffs2
done
}
@ -57,7 +57,7 @@ IMAGE_CMD_sum.jffs2() {
for i in $(seq 1 ${nimg}); do
eval peb_it="\${peb${i}}"
# Do not use '-p (padding)' option. It breaks 'ccardxmx28js' flash images [JIRA:DEL-218]
# Do not use '-p (padding)' option. It breaks 'ccardimx28js' flash images [JIRA:DEL-218]
mkfs.jffs2 -n -e ${peb_it} -d ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.${peb_it}.rootfs.jffs2
sumtool -e ${peb_it} -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.${peb_it}.rootfs.jffs2 -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.${peb_it}.rootfs.sum.jffs2
rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.${peb_it}.rootfs.jffs2

2
meta-digi-arm/conf/machine/ccardxmx28js.conf → meta-digi-arm/conf/machine/ccardimx28js.conf
View File

@ -19,7 +19,7 @@ UBOOT_SYMLINK = 'u-boot-${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "
KERNEL_IMAGETYPE = "uImage"
# Digi's kernel does not use device tree.
# KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/ccardxmx28js.dts"
# KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/ccardimx28js.dts"
MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-module-atheros"

2
meta-digi-arm/conf/machine/ccxmx51js.conf → meta-digi-arm/conf/machine/ccimx51js.conf
View File

@ -8,7 +8,7 @@ include conf/machine/include/tune-cortexa8.inc
SOC_FAMILY = "mx51:mx5"
# Digi's kernel does not use device trees.
# KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/ccxmx51js.dts"
# KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/ccimx51js.dts"
MACHINE_FEATURES += " wifi accel-video"

0
meta-digi-arm/conf/machine/ccxmx53js.conf → meta-digi-arm/conf/machine/ccimx53js.conf
View File

2
meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardxmx28js/asound.inline.state → meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28js/asound.inline.state
View File

@ -1,4 +1,4 @@
state.ccardxmx28 {
state.ccardimx28 {
control.1 {
comment.access 'read write'
comment.type ENUMERATED

2
meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardxmx28js/asound.inline_play.state → meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28js/asound.inline_play.state
View File

@ -1,4 +1,4 @@
state.ccardxmx28 {
state.ccardimx28 {
control.1 {
comment.access 'read write'
comment.type ENUMERATED

2
meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardxmx28js/asound.micro.state → meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28js/asound.micro.state
View File

@ -1,4 +1,4 @@
state.ccardxmx28 {
state.ccardimx28 {
control.1 {
comment.access 'read write'
comment.type ENUMERATED

2
meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardxmx28js/asound.micro_play.state → meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28js/asound.micro_play.state
View File

@ -1,4 +1,4 @@
state.ccardxmx28 {
state.ccardimx28 {
control.1 {
comment.access 'read write'
comment.type ENUMERATED

2
meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardxmx28js/asound.play.state → meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28js/asound.play.state
View File

@ -1,4 +1,4 @@
state.ccardxmx28 {
state.ccardimx28 {
control.1 {
comment.access 'read write'
comment.type ENUMERATED

0
meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardxmx28js/asound.state → meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28js/asound.state
View File

0
meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccxmx51js/asound.inline.state → meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx51js/asound.inline.state
View File

0
meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccxmx51js/asound.inline_play.state → meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx51js/asound.inline_play.state
View File

0
meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccxmx51js/asound.micro.state → meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx51js/asound.micro.state
View File

0
meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccxmx51js/asound.micro_play.state → meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx51js/asound.micro_play.state
View File

0
meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccxmx51js/asound.play.state → meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx51js/asound.play.state
View File

0
meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccxmx51js/asound.state → meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx51js/asound.state
View File

2
meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccxmx53js/asound.inline.state → meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53js/asound.inline.state
View File

@ -1,4 +1,4 @@
state.imxccxmx53 {
state.imxccimx53 {
control.1 {
comment.access 'read write'
comment.type ENUMERATED

2
meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccxmx53js/asound.inline_play.state → meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53js/asound.inline_play.state
View File

@ -1,4 +1,4 @@
state.imxccxmx53 {
state.imxccimx53 {
control.1 {
comment.access 'read write'
comment.type ENUMERATED

2
meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccxmx53js/asound.micro.state → meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53js/asound.micro.state
View File

@ -1,4 +1,4 @@
state.imxccxmx53 {
state.imxccimx53 {
control.1 {
comment.access 'read write'
comment.type ENUMERATED

2
meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccxmx53js/asound.micro_play.state → meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53js/asound.micro_play.state
View File

@ -1,4 +1,4 @@
state.imxccxmx53 {
state.imxccximx53 {
control.1 {
comment.access 'read write'
comment.type ENUMERATED

2
meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccxmx53js/asound.play.state → meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53js/asound.play.state
View File

@ -1,4 +1,4 @@
state.imxccxmx53 {
state.imxccimx53 {
control.1 {
comment.access 'read write'
comment.type ENUMERATED

0
meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccxmx53js/asound.state → meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53js/asound.state
View File

2
meta-digi-arm/recipes-bsp/imx-bootlets-del/imx-bootlets-del_git.bb
View File

@ -32,4 +32,4 @@ do_install () {
FILES_${PN} = "/boot"
PACKAGE_ARCH = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE = "(ccardxmx28js)"
COMPATIBLE_MACHINE = "(ccardimx28js)"

6
meta-digi-arm/recipes-bsp/u-boot/u-boot-imx_2009.08.bbappend
View File

@ -6,11 +6,11 @@ PR_append = "+del.r0"
SRC_URI = "${DIGI_LOG_GIT}u-boot-denx.git;tag=hpalacio/del-6.x"
DEPENDS_mxs_ccardxmx28js += "elftosb-native imx-bootlets-del"
DEPENDS_mxs_ccardimx28js += "elftosb-native imx-bootlets-del"
UBOOT_MAKE_TARGET_ccardxmx28js = "u-boot-ivt.sb"
UBOOT_MAKE_TARGET_ccardimx28js = "u-boot-ivt.sb"
BOOTLETSDIR_mxs = "BOOTLETS_DIR=${STAGING_DIR_TARGET}/boot/"
EXTRA_OEMAKE += '${BOOTLETSDIR}'
COMPATIBLE_MACHINE = "(ccardxmx28js|ccxmx51js|ccxmx53js)"
COMPATIBLE_MACHINE = "(ccardimx28js|ccimx51js|ccimx53js)"

2
meta-digi-arm/recipes-kernel/kernel-module-atheros/files/atheros
View File

@ -61,7 +61,7 @@ rm -f ${RAM_DRIVE}/${MAC_FILENAME}
# appropriate calibration file is loaded.
#
US_CODE="0x0"
REGION_CODE="$(cat /sys/kernel/ccardxmx28/mod_cert)"
REGION_CODE="$(cat /sys/kernel/ccardimx28/mod_cert)"
if [ -z "${REGION_CODE}" -o "${US_CODE}" = "${REGION_CODE}" ]; then
BDATA_SOURCE=Digi_6203-6233-US.bin
else

2
meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros_git.bb
View File

@ -58,4 +58,4 @@ FILES_${PN} += " /lib/firmware/ath6k/AR6003/hw2.1.1/athtcmd_ram.bin \
/lib/firmware/ath6k/AR6003/hw2.1.1/Digi_6203-6233-US.bin \
/lib/firmware/ath6k/AR6003/hw2.1.1/Digi_6203-6233-World.bin "
COMPATIBLE_MACHINE = "(ccardxmx28js)"
COMPATIBLE_MACHINE = "(ccardimx28js)"

10
meta-digi-arm/recipes-kernel/kernel-module-redpine/files/redpine
View File

@ -66,17 +66,17 @@ wdmode=`cat /proc/cmdline | sed 's/\s/\n/g' | awk '/wdmode/ {print}' | sed 's/wd
# | platform | crystal_freq |
# +---------------------+--------------+
# | cwme9210js | 20000000 |
# | ccxmx51js (rev = 0) | 20000000 |
# | ccxmx51js (rev > 0) | 40000000 |
# | ccxmx53js | 40000000 |
# | ccimx51js (rev = 0) | 20000000 |
# | ccimx51js (rev > 0) | 40000000 |
# | ccimx53js | 40000000 |
# +---------------------+--------------+
#
# Default is 20MHz, so in that case we don't need to set the parameter on load.
read -r platform < /sys/kernel/machine/name
if [ "${platform}" = "ccxmx53" ]; then
if [ "${platform}" = "ccimx53" ]; then
CRYSTAL_FREQ=40000000
else
mod_rev="/sys/kernel/ccxmx51/mod_rev"
mod_rev="/sys/kernel/ccimx51/mod_rev"
[ -f "${mod_rev}" ] && [ "$(cat ${mod_rev})" -gt "0" ] && CRYSTAL_FREQ=40000000
fi

2
meta-digi-arm/recipes-kernel/kernel-module-redpine/kernel-module-redpine_git.bb
View File

@ -50,4 +50,4 @@ FILES_${PN} += " /lib/firmware/redpine/tadm \
/lib/firmware/redpine/taim \
/lib/firmware/redpine/instructionSet "
COMPATIBLE_MACHINE = "(ccxmx51js|ccxmx53js)"
COMPATIBLE_MACHINE = "(ccimx51js|ccimx53js)"

2
meta-digi-arm/recipes-kernel/linux-libc-headers/linux-libc-headers-imx_2.6.35.3.bbappend
View File

@ -1,7 +1,7 @@
# Copyright (C) 2012 Digi International
PR_append = "+del.r0"
# Machine override would be: SRCREV_ccxmx53js_mx5 = "agonzal/yocto"
# Machine override would be: SRCREV_ccimx53js_mx5 = "agonzal/yocto"
SRCREV_mxs = "agonzal/yocto"
SRCREV_mx5 = "agonzal/yocto"
SRC_URI = "${DIGI_LOG_GIT}linux-2.6.git"

4
meta-digi-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bbappend
View File

@ -13,9 +13,9 @@ SRC_URI = "${DIGI_LOG_GIT}linux-2.6.git \
file://defconfig \
"
# Override 'ccardxmx28js' SRC_URI so the 'SRC_URI_append_mxs' patches
# Override 'ccardimx28js' SRC_URI so the 'SRC_URI_append_mxs' patches
# from FSL layer are *not* applied
SRC_URI_ccardxmx28js_mxs = "${DIGI_LOG_GIT}linux-2.6.git \
SRC_URI_ccardimx28js_mxs = "${DIGI_LOG_GIT}linux-2.6.git \
file://defconfig \
"
FILES_kernel-image += "/boot/config*"

38
meta-digi-arm/recipes-kernel/linux/linux-imx_2.6.35.3/ccardxmx28js/defconfig → meta-digi-arm/recipes-kernel/linux/linux-imx_2.6.35.3/ccardimx28js/defconfig
View File

@ -240,16 +240,18 @@ CONFIG_DMA_ZONE_SIZE=32
#
CONFIG_ARCH_MX28=y
# CONFIG_ARCH_MX23 is not set
CONFIG_MODULE_CCARDXMX28=y
CONFIG_MODULE_CCARDIMX28=y
# CONFIG_MACH_MX28EVK is not set
# CONFIG_MACH_CPX2 is not set
CONFIG_MACH_CCARDXMX28JS=y
# CONFIG_MACH_CCARDXMX28 is not set
CONFIG_MACH_CCARDIMX28JS=y
# CONFIG_MACH_CCARDIMX28 is not set
# CONFIG_MACH_WR21 is not set
CONFIG_CCARDXMX28_AUTODETECT_MODULE=y
# CONFIG_JSCCARDXMX28_V1 is not set
CONFIG_JSCCARDXMX28_VX=y
# CONFIG_JSCCARDXMX28_CUSTOM is not set
CONFIG_CCARDIMX28_AUTODETECT_MODULE=y
# CONFIG_CCARDIMX28_V1 is not set
# CONFIG_CCARDIMX28_VX is not set
# CONFIG_JSCCARDIMX28_V1 is not set
CONFIG_JSCCARDIMX28_VX=y
# CONFIG_JSCCARDIMX28_CUSTOM is not set
CONFIG_MTD_DIGI_REMOVE_DEFAULT_FREESCALE_PARTITION=y
CONFIG_NO_OTP_MAC_ADDRESS=y
CONFIG_VECTORS_PHY_ADDR=0
@ -266,16 +268,26 @@ CONFIG_CCMX28_CAN1=y
#
# Ethernet Options
#
# CONFIG_CCARDXMX28_ENET0_LEDS is not set
CONFIG_CCARDXMX28_ENET1=y
# CONFIG_CCARDXMX28_ENET1_LEDS is not set
# CONFIG_CCARDIMX28_ENET0_LEDS is not set
CONFIG_CCARDIMX28_ENET1=y
# CONFIG_CCARDIMX28_ENET1_LEDS is not set
#
# SPI options
#
# CONFIG_CCARDXMX28_SPI_SSP1_ENABLE is not set
CONFIG_CCARDXMX28_SPI_SSP3_ENABLE=y
CONFIG_CCARDXMX28_DISP_DATABUS_WIDTH=24
# CONFIG_CCARDIMX28_SPI_SSP1_ENABLE is not set
CONFIG_CCARDIMX28_SPI_SSP3_ENABLE=y
#
# Video Options
#
# CONFIG_CCARDIMX28_16_BITSPERPIXEL is not set
# CONFIG_CCARDIMX28_24_BITSPERPIXEL is not set
CONFIG_CCARDIMX28_32_BITSPERPIXEL=y
CONFIG_CCARDIMX28_DEFAULT_VIDEO_BPP=32
CONFIG_CCARDIMX28_DISP_RGB666=y
# CONFIG_CCARDIMX28_DISP_RGB888 is not set
CONFIG_CCARDIMX28_DISP_DATABUS_WIDTH=18
CONFIG_DMA_ZONE=y
CONFIG_MXS_CONSISTENT_DMA_SIZE=32
CONFIG_MXS_ICOLL=y

40
meta-digi-arm/recipes-kernel/linux/linux-imx_2.6.35.3/ccxmx51js/defconfig → meta-digi-arm/recipes-kernel/linux/linux-imx_2.6.35.3/ccimx51js/defconfig
View File

@ -249,23 +249,23 @@ CONFIG_ARCH_MX51=y
CONFIG_FORCE_MAX_ZONEORDER=13
# CONFIG_MACH_MX51_3DS is not set
# CONFIG_MACH_MX51_BABBAGE is not set
CONFIG_MODULE_CCXMX5X=y
CONFIG_MODULE_CCXMX51=y
CONFIG_MODULE_CCIMX5X=y
CONFIG_MODULE_CCIMX51=y
CONFIG_LATE_CPU_CLK_ENABLE=y
CONFIG_MACH_CCXMX51JS=y
# CONFIG_MACH_CCXMX51 is not set
# CONFIG_JSCCXMX51_V1 is not set
CONFIG_JSCCXMX51_V2=y
# CONFIG_JSCCXMX51_CUSTOM is not set
CONFIG_MACH_CCIMX51JS=y
# CONFIG_MACH_CCIMX51 is not set
# CONFIG_JSCCIMX51_V1 is not set
CONFIG_JSCCIMX51_V2=y
# CONFIG_JSCCIMX51_CUSTOM is not set
# CONFIG_MACH_MX53_EVK is not set
# CONFIG_MACH_MX53_ARD is not set
# CONFIG_MACH_MX53_SMD is not set
# CONFIG_MACH_MX53_LOCO is not set
# CONFIG_MACH_CCXMX53JS is not set
# CONFIG_MACH_CCXMX53 is not set
# CONFIG_MACH_CCIMX53JS is not set
# CONFIG_MACH_CCIMX53 is not set
# CONFIG_CERTMX53_V1 is not set
# CONFIG_JSCCXMX53_V2 is not set
# CONFIG_JSCCXMX53_CUSTOM is not set
# CONFIG_JSCCIMX53_V2 is not set
# CONFIG_JSCCIMX53_CUSTOM is not set
# CONFIG_MACH_MX50_ARM2 is not set
# CONFIG_MACH_MX50_RDP is not set
@ -277,7 +277,7 @@ CONFIG_ARCH_MXC_HAS_NFC_V3=y
CONFIG_ARCH_MXC_HAS_NFC_V3_2=y
# CONFIG_MXC_BLUETOOTH_RFKILL is not set
# CONFIG_MXC_ENABLE_WARM_RESET is not set
CONFIG_CCXMX5X_PM_POWER_BUTTON=y
CONFIG_CCIMX5X_PM_POWER_BUTTON=y
#
# Serial Port Options
@ -339,12 +339,12 @@ CONFIG_ESDHCI_MXC_SELECT3=y
#
# Video Interface(s)
#
CONFIG_CCXMX5X_DEFAULT_VIDEO_32BPP=y
# CONFIG_CCXMX5X_DEFAULT_VIDEO_16BPP is not set
CONFIG_CCXMX5X_DEFAULT_VIDEO_BPP=32
CONFIG_CCXMX5X_DISP0=y
# CONFIG_CCXMX5X_DISP0_RGB888 is not set
CONFIG_CCXMX5X_DISP0_RGB666=y
CONFIG_CCIMX5X_DEFAULT_VIDEO_32BPP=y
# CONFIG_CCIMX5X_DEFAULT_VIDEO_16BPP is not set
CONFIG_CCIMX5X_DEFAULT_VIDEO_BPP=32
CONFIG_CCIMX5X_DISP0=y
# CONFIG_CCIMX5X_DISP0_RGB888 is not set
CONFIG_CCIMX5X_DISP0_RGB666=y
#
# To enable the Display 2 Video interface, disable the FEC (under network drivers)
@ -1364,10 +1364,10 @@ CONFIG_SND_MXC_SOC=y
CONFIG_SND_MXC_SOC_SSI=y
# CONFIG_SND_MXC_SOC_IRAM is not set
# CONFIG_SND_SOC_IMX_3STACK_SGTL5000 is not set
# CONFIG_SND_SOC_IMX_CCXMX53_SGTL5000 is not set
# CONFIG_SND_SOC_IMX_CCIMX53_SGTL5000 is not set
# CONFIG_SND_SOC_IMX_3STACK_AK4647 is not set
# CONFIG_SND_SOC_IMX_3STACK_WM8580 is not set
CONFIG_SND_SOC_IMX_CCXMX51_WM8753=y
CONFIG_SND_SOC_IMX_CCIMX51_WM8753=y
# CONFIG_SND_SOC_IMX_3STACK_AK5702 is not set
# CONFIG_SND_SOC_IMX_3STACK_BLUETOOTH is not set
# CONFIG_SND_SOC_IMX_3STACK_CS42888 is not set

54
meta-digi-arm/recipes-kernel/linux/linux-imx_2.6.35.3/ccxmx53js/defconfig → meta-digi-arm/recipes-kernel/linux/linux-imx_2.6.35.3/ccimx53js/defconfig
View File

@ -249,23 +249,23 @@ CONFIG_ARCH_MX53=y
CONFIG_FORCE_MAX_ZONEORDER=13
# CONFIG_MACH_MX51_3DS is not set
# CONFIG_MACH_MX51_BABBAGE is not set
CONFIG_MODULE_CCXMX5X=y
# CONFIG_MACH_CCXMX51JS is not set
# CONFIG_MACH_CCXMX51 is not set
# CONFIG_JSCCXMX51_V1 is not set
# CONFIG_JSCCXMX51_V2 is not set
# CONFIG_JSCCXMX51_CUSTOM is not set
CONFIG_MODULE_CCIMX5X=y
# CONFIG_MACH_CCIMX51JS is not set
# CONFIG_MACH_CCIMX51 is not set
# CONFIG_JSCCIMX51_V1 is not set
# CONFIG_JSCCIMX51_V2 is not set
# CONFIG_JSCCIMX51_CUSTOM is not set
# CONFIG_MACH_MX53_EVK is not set
# CONFIG_MACH_MX53_ARD is not set
# CONFIG_MACH_MX53_SMD is not set
# CONFIG_MACH_MX53_LOCO is not set
CONFIG_I2C_IMX_RECOVER_FROM_STUCK=y
CONFIG_MODULE_CCXMX53=y
CONFIG_MACH_CCXMX53JS=y
# CONFIG_MACH_CCXMX53 is not set
CONFIG_MODULE_CCIMX53=y
CONFIG_MACH_CCIMX53JS=y
# CONFIG_MACH_CCIMX53 is not set
# CONFIG_CERTMX53_V1 is not set
CONFIG_JSCCXMX53_V2=y
# CONFIG_JSCCXMX53_CUSTOM is not set
CONFIG_JSCCIMX53_V2=y
# CONFIG_JSCCIMX53_CUSTOM is not set
# CONFIG_MACH_MX50_ARM2 is not set
# CONFIG_MACH_MX50_RDP is not set
@ -277,7 +277,7 @@ CONFIG_ARCH_MXC_HAS_NFC_V3=y
CONFIG_ARCH_MXC_HAS_NFC_V3_2=y
# CONFIG_MXC_BLUETOOTH_RFKILL is not set
# CONFIG_MXC_ENABLE_WARM_RESET is not set
CONFIG_CCXMX5X_PM_POWER_BUTTON=y
CONFIG_CCIMX5X_PM_POWER_BUTTON=y
#
# Serial Port Options
@ -349,8 +349,8 @@ CONFIG_CONFIG_MXC_I2C3_FAST=y
#
# CAN Port Options
#
CONFIG_CCXMX53_CAN1=y
CONFIG_CCXMX53_CAN2=y
CONFIG_CCIMX53_CAN1=y
CONFIG_CCIMX53_CAN2=y
#
# SD/MMC Interface options
@ -361,17 +361,17 @@ CONFIG_ESDHCI_MXC_SELECT3=y
#
# Video Interface(s)
#
CONFIG_CCXMX5X_DEFAULT_VIDEO_32BPP=y
# CONFIG_CCXMX5X_DEFAULT_VIDEO_16BPP is not set
CONFIG_CCXMX5X_DEFAULT_VIDEO_BPP=32
CONFIG_CCXMX5X_DISP0=y
CONFIG_CCXMX5X_DISP0_RGB888=y
# CONFIG_CCXMX5X_DISP0_RGB666 is not set
CONFIG_CCXMX5X_DISP1=y
CONFIG_CCXMX5X_DISP1_RGB888=y
# CONFIG_CCXMX5X_DISP1_RGB666 is not set
# CONFIG_CCWMX5X_SECOND_TOUCH is not set
# CONFIG_CCWMX5X_FUSION_MULTITOUCH is not set
CONFIG_CCIMX5X_DEFAULT_VIDEO_32BPP=y
# CONFIG_CCIMX5X_DEFAULT_VIDEO_16BPP is not set
CONFIG_CCIMX5X_DEFAULT_VIDEO_BPP=32
CONFIG_CCIMX5X_DISP0=y
CONFIG_CCIMX5X_DISP0_RGB888=y
# CONFIG_CCIMX5X_DISP0_RGB666 is not set
CONFIG_CCIMX5X_DISP1=y
CONFIG_CCIMX5X_DISP1_RGB888=y
# CONFIG_CCIMX5X_DISP1_RGB666 is not set
# CONFIG_CCIMX5X_SECOND_TOUCH is not set
# CONFIG_CCIMX5X_FUSION_MULTITOUCH is not set
CONFIG_IRAM_ALLOC=y
CONFIG_DMA_ZONE_SIZE=184
CONFIG_ISP1504_MXC=y
@ -1512,10 +1512,10 @@ CONFIG_SND_MXC_SOC=y
CONFIG_SND_MXC_SOC_SSI=y
# CONFIG_SND_MXC_SOC_IRAM is not set
# CONFIG_SND_SOC_IMX_3STACK_SGTL5000 is not set
CONFIG_SND_SOC_IMX_CCXMX53_SGTL5000=y
CONFIG_SND_SOC_IMX_CCIMX53_SGTL5000=y
# CONFIG_SND_SOC_IMX_3STACK_AK4647 is not set
# CONFIG_SND_SOC_IMX_3STACK_WM8580 is not set
# CONFIG_SND_SOC_IMX_CCXMX51_WM8753 is not set
# CONFIG_SND_SOC_IMX_CCIMX51_WM8753 is not set
# CONFIG_SND_SOC_IMX_3STACK_AK5702 is not set
# CONFIG_SND_SOC_IMX_3STACK_BLUETOOTH is not set
# CONFIG_SND_SOC_IMX_3STACK_CS42888 is not set

4
meta-digi-del/recipes-connectivity/btfilter/files/S65bluez-bg.sh
View File

@ -24,7 +24,7 @@ ccardwmx28js_bt_init() {
# Exit if this hardware does not support Bluetooth
#
BLUE_TOOTH_VARIANTS="0x02 0x03 0x04"
MOD_VARIANT="$(cat /sys/kernel/ccardxmx28/mod_variant)"
MOD_VARIANT="$(cat /sys/kernel/ccardimx28/mod_variant)"
if ! echo ${BLUE_TOOTH_VARIANTS} | grep -qs ${MOD_VARIANT}; then
[ -z "${quietboot}" ] && echo "${SCRIPTNAME}: FAILED (variant ${MOD_VARIANT} does not support bluetooth)"
exit
@ -93,7 +93,7 @@ ccardwmx28js_bt_init() {
# Initialize driver for 'ccardwmx28js'
read -r platform < /sys/kernel/machine/name
[ "${platform}" = "ccardxmx28" ] && ccardwmx28js_bt_init
[ "${platform}" = "ccardimx28" ] && ccardwmx28js_bt_init
# Run bluetooth daemon
if hciconfig hci0 up && bluetoothd; then

0
meta-digi-del/recipes-connectivity/wpa-supplicant/wpa-supplicant/ccardxmx28js/defconfig → meta-digi-del/recipes-connectivity/wpa-supplicant/wpa-supplicant/ccardimx28js/defconfig
View File

0
meta-digi-del/recipes-connectivity/wpa-supplicant/wpa-supplicant/ccardxmx28js/wpa_supplicant.conf → meta-digi-del/recipes-connectivity/wpa-supplicant/wpa-supplicant/ccardimx28js/wpa_supplicant.conf
View File

0
meta-digi-del/recipes-connectivity/wpa-supplicant/wpa-supplicant/ccxmx51js/defconfig → meta-digi-del/recipes-connectivity/wpa-supplicant/wpa-supplicant/ccimx51js/defconfig
View File

0
meta-digi-del/recipes-connectivity/wpa-supplicant/wpa-supplicant/ccxmx51js/wpa_supplicant.conf → meta-digi-del/recipes-connectivity/wpa-supplicant/wpa-supplicant/ccimx51js/wpa_supplicant.conf
View File

0
meta-digi-del/recipes-connectivity/wpa-supplicant/wpa-supplicant/ccxmx53js/defconfig → meta-digi-del/recipes-connectivity/wpa-supplicant/wpa-supplicant/ccimx53js/defconfig
View File

0
meta-digi-del/recipes-connectivity/wpa-supplicant/wpa-supplicant/ccxmx53js/wpa_supplicant.conf → meta-digi-del/recipes-connectivity/wpa-supplicant/wpa-supplicant/ccimx53js/wpa_supplicant.conf
View File

6
meta-digi-del/recipes-digi/del-examples/files/accelerometer_test/accelerometer_calibrate
View File

@ -10,7 +10,7 @@
# under the terms of the GNU General Public License version 2 as published by
# the Free Software Foundation.
#
# !Description: calibrate CCXMX5X accelerometer
# !Description: calibrate CCIMX5X accelerometer
#
# The calibration details for this particular accelerometer (MMA7455L) are in
# Freescale's Application Note AN3745.
@ -26,8 +26,8 @@ while read _pl _name _i2c _invertXY; do
eval "${_pl}_i2c=\"${_i2c}\""
eval "${_pl}_invertXY=\"${_invertXY}\""
done<<-_EOF_
ccxmx51 mma7455l 1-001d y
ccxmx53 mma7455l 2-001d
ccimx51 mma7455l 1-001d y
ccimx53 mma7455l 2-001d
_EOF_
eval SYSFS_I2C_PATH="/sys/bus/i2c/drivers/\${${DEL_PLATFORM}_name}/\${${DEL_PLATFORM}_i2c}"

4
meta-digi-del/recipes-digi/del-examples/files/accelerometer_test/accelerometer_init
View File

@ -22,8 +22,8 @@ while read _pl _name _i2c; do
eval "${_pl}_name=\"${_name}\""
eval "${_pl}_i2c=\"${_i2c}\""
done<<-_EOF_
ccxmx51 mma7455l 1-001d
ccxmx53 mma7455l 2-001d
ccimx51 mma7455l 1-001d
ccimx53 mma7455l 2-001d
_EOF_
eval SYSFS_I2C_PATH="/sys/bus/i2c/drivers/\${${DEL_PLATFORM}_name}/\${${DEL_PLATFORM}_i2c}"

20
meta-digi-del/recipes-digi/del-examples/files/adc_test/adc_test.c
View File

@ -19,10 +19,10 @@
#include <string.h>
#include <unistd.h>
#if defined(CCXMX51JS) || defined(CCXMX53JS)
#if defined(CCIMX51JS) || defined(CCIMX53JS)
#include <linux/pmic_adc.h>
#include <sys/ioctl.h>
#elif defined(CCARDXMX28JS)
#elif defined(CCARDIMX28JS)
#include <linux/mxs-lradc.h>
#include <sys/ioctl.h>
#endif
@ -30,16 +30,16 @@
#define PROGRAM "adc_test"
#define VERSION "2.0"
#if defined(CCXMX53JS)
#if defined(CCIMX53JS)
# define ADC_MAX_CHANNELS 10
#elif defined(CCXMX51JS)
#elif defined(CCIMX51JS)
# define ADC_MAX_CHANNELS 8
#endif
#if defined(CCXMX51JS) || defined(CCXMX53JS)
#if defined(CCIMX51JS) || defined(CCIMX53JS)
# define ADC_CONVERT_IOCTL PMIC_ADC_CONVERT
# define ADC_CHARDEV "/dev/pmic_adc"
#elif defined(CCARDXMX28JS)
#elif defined(CCARDIMX28JS)
# define ADC_MAX_CHANNELS 7
# define ADC_CONVERT_IOCTL LRADC_CONVERT
# define ADC_CHARDEV "/dev/mxs_lradc"
@ -181,7 +181,7 @@ int main(int argc, char *argv[])
{0, 0, 0, 0},
};
#if defined(CCXMX51JS) || defined(CCXMX53JS) || defined(CCARDXMX28JS)
#if defined(CCIMX51JS) || defined(CCIMX53JS) || defined(CCARDIMX28JS)
t_adc_convert_param adc_convert_param;
#else
unsigned short int adcval;
@ -242,7 +242,7 @@ int main(int argc, char *argv[])
char *end;
int chnr = strtol(var, &end, 10);
if ((chnr >= 0) && (chnr < ADC_MAX_CHANNELS) && (var != end)) {
#if defined(CCXMX51JS) || defined(CCXMX53JS) || defined(CCARDXMX28JS)
#if defined(CCIMX51JS) || defined(CCIMX53JS) || defined(CCARDIMX28JS)
sprintf(device_name, ADC_CHARDEV);
#else
snprintf(device_name, 30, "%s%d", ADC_CHARDEV, chnr);
@ -276,10 +276,10 @@ int main(int argc, char *argv[])
k = j % ADC_MAX_SAMPLE_BUFFER;
for (i = 0; i < ADC_MAX_CHANNELS; i++) {
if (channel[i].fd >= 0) {
#if defined(CCXMX51JS) || defined(CCXMX53JS) || defined(CCARDXMX28JS)
#if defined(CCIMX51JS) || defined(CCIMX53JS) || defined(CCARDIMX28JS)
memset(&adc_convert_param,0,sizeof(adc_convert_param));
adc_convert_param.channel = channel[i].channel;
#if defined(CCXMX51JS)
#if defined(CCIMX51JS)
/* The PMIC ADC driver maps GEN_PURPOSE_AD5,GEN_PURPOSE_AD6 and
* GEN_PURPOSE_AD7 to channels 10,11,12*/
if( adc_convert_param.channel > 4 )

12
meta-digi-del/recipes-digi/del-examples/files/gpio_test/gpio_test.c
View File

@ -28,9 +28,9 @@
#define MX28_GPIO(port,pin) (port * 32 + pin)
typedef enum {
CCARDXMX28JS = 0,
CCXMX51JS,
CCXMX53JS,
CCARDIMX28JS = 0,
CCIMX51JS,
CCIMX53JS,
PLAT_NONE
} platform_e;
@ -51,9 +51,9 @@ static struct {
int pullup_in;
char pullup_descr[15];
} plat_list[PLAT_NONE + 1] = {
MK(CCARDXMX28JS, "ccardxmx28", "BUTTON2", "LED2", MX28_GPIO(2,9), MX28_GPIO(3,4), 1, GPIO_UNDEFINED, ""),
MK(CCXMX51JS, "ccxmx51", "BUTTON2", "LED2", 1 /*GPIO1_1*/, 73 /*GPIO3_9*/, 1, GPIO_UNDEFINED, ""),
MK(CCXMX53JS, "ccxmx53", "BUTTON2", "LED2", MX5X_GPIO(4,1), MX5X_GPIO(7,12), 1, GPIO_UNDEFINED, ""),
MK(CCARDIMX28JS, "ccardimx28", "BUTTON2", "LED2", MX28_GPIO(2,9), MX28_GPIO(3,4), 1, GPIO_UNDEFINED, ""),
MK(CCIMX51JS, "ccimx51", "BUTTON2", "LED2", 1 /*GPIO1_1*/, 73 /*GPIO3_9*/, 1, GPIO_UNDEFINED, ""),
MK(CCIMX53JS, "ccimx53", "BUTTON2", "LED2", MX5X_GPIO(4,1), MX5X_GPIO(7,12), 1, GPIO_UNDEFINED, ""),
MK(PLAT_NONE, "", "", "", 0, 0, 0, GPIO_UNDEFINED, "") /* always last */
};
#undef MK

24
meta-digi-del/recipes-digi/libdigi/libdigi/digi-platforms.h
View File

@ -97,18 +97,18 @@
#define MACH_TYPE_CCARDWMX28JS_NAME "ccardwmx28js"
#define MACH_TYPE_CCARDMX28JS 3918
#define MACH_TYPE_CCARDMX28JS_NAME "ccardmx28js"
#define MACH_TYPE_CCXMX53 9980
#define MACH_TYPE_CCXMX53_NAME "ccxmx53"
#define MACH_TYPE_CCXMX53JS 9981
#define MACH_TYPE_CCXMX53JS_NAME "ccxmx53js"
#define MACH_TYPE_CCXMX51 9982
#define MACH_TYPE_CCXMX51_NAME "ccxmx51"
#define MACH_TYPE_CCXMX51JS 9983
#define MACH_TYPE_CCXMX51JS_NAME "ccxmx51js"
#define MACH_TYPE_CCARDXMX28 9984
#define MACH_TYPE_CCARDXMX28_NAME "ccardxmx28"
#define MACH_TYPE_CCARDXMX28JS 9985
#define MACH_TYPE_CCARDXMX28JS_NAME "ccardxmx28js"
#define MACH_TYPE_CCIMX53 9980
#define MACH_TYPE_CCIMX53_NAME "ccimx53"
#define MACH_TYPE_CCIMX53JS 9981
#define MACH_TYPE_CCIMX53JS_NAME "ccimx53js"
#define MACH_TYPE_CCIMX51 9982
#define MACH_TYPE_CCIMX51_NAME "ccimx51"
#define MACH_TYPE_CCIMX51JS 9983
#define MACH_TYPE_CCIMX51JS_NAME "ccimx51js"
#define MACH_TYPE_CCARDIMX28 9984
#define MACH_TYPE_CCARDIMX28_NAME "ccardimx28"
#define MACH_TYPE_CCARDIMX28JS 9985
#define MACH_TYPE_CCARDIMX28JS_NAME "ccardimx28js"
int get_platform_id(void);
char is_nand_oob_atomic(void);

12
meta-digi-del/recipes-digi/libdigi/libdigi/platform.c
View File

@ -54,20 +54,20 @@ char is_nand_oob_atomic(void)
MACH_TYPE_CCMX51JS == platform_id ||
MACH_TYPE_CCWMX51 == platform_id ||
MACH_TYPE_CCWMX51JS == platform_id ||
MACH_TYPE_CCXMX51 == platform_id ||
MACH_TYPE_CCXMX51JS == platform_id ||
MACH_TYPE_CCIMX51 == platform_id ||
MACH_TYPE_CCIMX51JS == platform_id ||
MACH_TYPE_CCMX53 == platform_id ||
MACH_TYPE_CCMX53JS == platform_id ||
MACH_TYPE_CCWMX53 == platform_id ||
MACH_TYPE_CCWMX53JS == platform_id ||
MACH_TYPE_CCXMX53 == platform_id ||
MACH_TYPE_CCXMX53JS == platform_id ||
MACH_TYPE_CCIMX53 == platform_id ||
MACH_TYPE_CCIMX53JS == platform_id ||
MACH_TYPE_CCARDMX28 == platform_id ||
MACH_TYPE_CCARDMX28JS == platform_id ||
MACH_TYPE_CCARDWMX28 == platform_id ||
MACH_TYPE_CCARDWMX28JS == platform_id ||
MACH_TYPE_CCARDXMX28 == platform_id ||
MACH_TYPE_CCARDXMX28JS == platform_id) {
MACH_TYPE_CCARDIMX28 == platform_id ||
MACH_TYPE_CCARDIMX28JS == platform_id) {
return 1;
}

6
meta-digi-del/recipes-digi/packagegroups/packagegroup-del-examples.bb
View File

@ -18,14 +18,14 @@ RDEPENDS_${PN} = "\
del-examples-watchdog \
"
RDEPENDS_${PN}_append_ccardxmx28js = "\
RDEPENDS_${PN}_append_ccardimx28js = "\
del-examples-bt \
del-examples-btconfig \
del-examples-can \
del-examples-hdp \
"
RDEPENDS_${PN}_append_ccxmx51js = "\
RDEPENDS_${PN}_append_ccimx51js = "\
del-examples-accelerometer \
del-examples-battery \
del-examples-opengles \
@ -33,7 +33,7 @@ RDEPENDS_${PN}_append_ccxmx51js = "\
del-examples-v4l2 \
"
RDEPENDS_${PN}_append_ccxmx53js = "\
RDEPENDS_${PN}_append_ccimx53js = "\
del-examples-accelerometer \
del-examples-can \
del-examples-opengles \

0
meta-digi-del/recipes-graphics/xinput-calibrator/ccardxmx28js/pointercal.xinput → meta-digi-del/recipes-graphics/xinput-calibrator/ccardimx28js/pointercal.xinput
View File

0
meta-digi-del/recipes-graphics/xinput-calibrator/ccxmx51js/pointercal.xinput → meta-digi-del/recipes-graphics/xinput-calibrator/ccimx51js/pointercal.xinput
View File

0
meta-digi-del/recipes-graphics/xinput-calibrator/ccxmx53js/pointercal.xinput → meta-digi-del/recipes-graphics/xinput-calibrator/ccimx53js/pointercal.xinput
View File