diff --git a/meta-digi-arm/conf/machine/ccimx51js.conf b/meta-digi-arm/conf/machine/ccimx51js.conf index 7d1590ace..1881a6d42 100644 --- a/meta-digi-arm/conf/machine/ccimx51js.conf +++ b/meta-digi-arm/conf/machine/ccimx51js.conf @@ -21,7 +21,7 @@ MACHINE_EXTRA_RRECOMMENDS += "kernel-module-mma7455l \" MACHINE_EXTRA_RRECOMMENDS += "kernel-module-scc2-driver \" MACHINE_EXTRA_RRECOMMENDS += "kernel-module-sahara \" MACHINE_EXTRA_RRECOMMENDS += "kernel-module-mt9v111-camera \" -MACHINE_EXTRA_RRECOMMENDS += "kernel-module-pmic_battery \" +MACHINE_EXTRA_RRECOMMENDS += "kernel-module-pmic-battery \" module_autoload_mma7455l = "mma7455l" module_autoload_scc2_driver = "scc2_driver" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14/ccardimx28js/config-fb.cfg b/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccardimx28js/config-fb.cfg similarity index 100% rename from meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14/ccardimx28js/config-fb.cfg rename to meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccardimx28js/config-fb.cfg diff --git a/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14/ccardimx28js/config-sound.cfg b/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccardimx28js/config-sound.cfg similarity index 100% rename from meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14/ccardimx28js/config-sound.cfg rename to meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccardimx28js/config-sound.cfg diff --git a/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14/ccardimx28js/config-touch.cfg b/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccardimx28js/config-touch.cfg similarity index 100% rename from meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14/ccardimx28js/config-touch.cfg rename to meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccardimx28js/config-touch.cfg diff --git a/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14/ccardimx28js/defconfig b/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccardimx28js/defconfig similarity index 100% rename from meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14/ccardimx28js/defconfig rename to meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccardimx28js/defconfig diff --git a/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14/ccimx53js/config-accel-module.cfg b/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccimx51js/config-accel-module.cfg similarity index 54% rename from meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14/ccimx53js/config-accel-module.cfg rename to meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccimx51js/config-accel-module.cfg index 152f695a0..4a1fc34e8 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14/ccimx53js/config-accel-module.cfg +++ b/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccimx51js/config-accel-module.cfg @@ -1,2 +1,2 @@ +CONFIG_INPUT_MISC=y CONFIG_INPUT_MMA7455L=m - diff --git a/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccimx51js/config-battery-module.cfg b/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccimx51js/config-battery-module.cfg new file mode 100644 index 000000000..3077e4820 --- /dev/null +++ b/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccimx51js/config-battery-module.cfg @@ -0,0 +1,2 @@ +CONFIG_POWER_SUPPLY=y +CONFIG_MXC_MC13892_BATTERY=m diff --git a/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14/ccimx53js/config-camera-module.cfg b/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccimx51js/config-camera-module.cfg similarity index 99% rename from meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14/ccimx53js/config-camera-module.cfg rename to meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccimx51js/config-camera-module.cfg index bf55f3bc8..23ae4ff7b 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14/ccimx53js/config-camera-module.cfg +++ b/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccimx51js/config-camera-module.cfg @@ -15,4 +15,3 @@ CONFIG_MXC_CAMERA_MICRON111_2=m CONFIG_MXC_IPU_PRP_VF_SDC=y CONFIG_MXC_IPU_PRP_ENC=y CONFIG_MXC_IPU_CSI_ENC=y - diff --git a/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14/ccimx53js/config-sahara-module.cfg b/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccimx51js/config-sahara-module.cfg similarity index 99% rename from meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14/ccimx53js/config-sahara-module.cfg rename to meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccimx51js/config-sahara-module.cfg index 750a84471..d08b7ab50 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14/ccimx53js/config-sahara-module.cfg +++ b/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccimx51js/config-sahara-module.cfg @@ -3,4 +3,3 @@ CONFIG_MXC_SECURITY_SCC2=m CONFIG_MXC_SAHARA=m # CONFIG_MXC_SAHARA_USER_MODE is not set # CONFIG_MXC_SAHARA_POLL_MODE is not set - diff --git a/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14/ccimx51js/defconfig b/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccimx51js/defconfig similarity index 100% rename from meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14/ccimx51js/defconfig rename to meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccimx51js/defconfig diff --git a/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14/ccimx51js/config-accel-module.cfg b/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccimx53js/config-accel-module.cfg similarity index 100% rename from meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14/ccimx51js/config-accel-module.cfg rename to meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccimx53js/config-accel-module.cfg diff --git a/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14/ccimx51js/config-camera-module.cfg b/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccimx53js/config-camera-module.cfg similarity index 100% rename from meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14/ccimx51js/config-camera-module.cfg rename to meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccimx53js/config-camera-module.cfg diff --git a/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14/ccimx51js/config-sahara-module.cfg b/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccimx53js/config-sahara-module.cfg similarity index 100% rename from meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14/ccimx51js/config-sahara-module.cfg rename to meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccimx53js/config-sahara-module.cfg diff --git a/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14/ccimx53js/defconfig b/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccimx53js/defconfig similarity index 100% rename from meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14/ccimx53js/defconfig rename to meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccimx53js/defconfig diff --git a/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14/cpx2/defconfig b/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/cpx2/defconfig similarity index 100% rename from meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14/cpx2/defconfig rename to meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/cpx2/defconfig diff --git a/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14.bb b/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14.bb index daca2baa2..395499202 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14.bb @@ -4,32 +4,28 @@ include linux-del.inc PR = "${INC_PR}.0" -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}_${PV}" +SRCREV = "${AUTOREV}" -SRCREV_mx5 = "${AUTOREV}" LOCALVERSION_mx5 = "mx5+master" - -KERNEL_CFG_FRAGS_mx5 = "file://config-accel-module.cfg file://config-sahara-module.cfg file://config-camera-module.cfg" -KERNEL_CFG_FRAGS_ccimx51js_mx5 = "file://config-battery-module.cfg" -SRC_URI = "${DIGI_LOG_GIT}linux-2.6.git;protocol=git;branch=refs/heads/master \ - file://defconfig \ - ${KERNEL_CFG_FRAGS} \ -" -# Override 'ccardimx28js' SRC_URI so the 'SRC_URI_append_mxs' patches -# from FSL layer are *not* applied -SRCREV_mxs = "${AUTOREV}" LOCALVERSION_mxs = "mxs+master" -KERNEL_CFG_FRAGS_ccardimx28js_mxs = "${@base_contains('DISTRO_FEATURES', 'x11', 'file://config-fb.cfg file://config-touch.cfg', '', d)}" -KERNEL_CFG_FRAGS_ccardimx28js_mxs += "${@base_contains('MACHINE_FEATURES', 'alsa', 'file://config-sound.cfg', '', d)}" -SRC_URI_ccardimx28js_mxs = "${DIGI_LOG_GIT}linux-2.6.git;protocol=git;branch=refs/heads/master \ - file://defconfig \ - ${KERNEL_CFG_FRAGS} \ -" -SRCREV_cpx2_mxs = "${AUTOREV}" LOCALVERSION_cpx2_mxs = "mxs+gateways_master" -SRC_URI_cpx2_mxs = "${DIGI_LOG_GIT}linux-2.6.git;protocol=git;branch=refs/heads/gateways/master \ - file://defconfig \ -" + +KERNEL_CFG_FRAGS ?= "" +KERNEL_CFG_FRAGS_append_mx5 = " file://config-accel-module.cfg file://config-sahara-module.cfg file://config-camera-module.cfg" +KERNEL_CFG_FRAGS_append_ccimx51js = " file://config-battery-module.cfg" +KERNEL_CFG_FRAGS_append_ccardimx28js = " ${@base_contains('DISTRO_FEATURES', 'x11', 'file://config-fb.cfg file://config-touch.cfg', '', d)}" +KERNEL_CFG_FRAGS_append_ccardimx28js = " ${@base_contains('MACHINE_FEATURES', 'alsa', 'file://config-sound.cfg', '', d)}" + +SRC_URI = " \ + ${DIGI_LOG_GIT}linux-2.6.git;protocol=git;branch=refs/heads/master \ + file://defconfig \ + ${KERNEL_CFG_FRAGS} \ + " + +SRC_URI_cpx2 = " \ + ${DIGI_LOG_GIT}linux-2.6.git;protocol=git;branch=refs/heads/gateways/master \ + file://defconfig \ + " FILES_kernel-image += "/boot/config*" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14/ccimx51js/config-battery-module.cfg b/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14/ccimx51js/config-battery-module.cfg deleted file mode 100644 index 4812bc6e2..000000000 --- a/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14/ccimx51js/config-battery-module.cfg +++ /dev/null @@ -1,3 +0,0 @@ -CONFIG_MXC_MC13892_BATTERY=m -CONFIG_MXC_MC13892_BATTERY_DEFAULT_CHARGING_CURRENT=40 - diff --git a/meta-digi-del/recipes-digi/del-examples/del-examples-battery.bb b/meta-digi-del/recipes-digi/del-examples/del-examples-battery.bb index e3f2de123..38e0481ed 100644 --- a/meta-digi-del/recipes-digi/del-examples/del-examples-battery.bb +++ b/meta-digi-del/recipes-digi/del-examples/del-examples-battery.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425 PR = "r0" -RDEPENDS_${PN} = "kernel-module-pmic_battery" +RDEPENDS_${PN} = "kernel-module-pmic-battery" SRC_URI = "file://battery_test"