Modify some recipts for newer yocto update and kernel defconfig file to better s…

…upport power management

Modify some recipts for newer yocto update and kernel defconfig file to better s…
…upport power management
Eric Lee
1 parent aef74ae3e9
Showing 18 changed files with 85 additions and 95 deletions Side-by-side Diff
recipes-core/base-files/base-files_%.bbappend
recipes-core/busybox/busybox_%.bbappend
recipes-core/busybox/busybox_1.23.1.bbappend
recipes-core/init-ifupdown/init-ifupdown_%.bbappend
recipes-core/initscripts/initscripts_1.0.bbappend
recipes-core/udev/eudev/dra7xx/udev-cache.default
recipes-core/udev/eudev/keystone/udev-cache.default
recipes-core/udev/eudev/local.rules
recipes-core/udev/eudev/usb1-rules.sh
recipes-core/udev/eudev/usb2-rules.sh
recipes-core/udev/eudev_%.bbappend
recipes-core/udev/udev/dra7xx/udev-cache.default
recipes-core/udev/udev/local.rules
recipes-core/udev/udev/usb1-rules.sh
recipes-core/udev/udev/usb2-rules.sh
recipes-core/udev/udev_%.bbappend
recipes-kernel/linux/linux-smarct437x-staging-4.4/defconfig
recipes-kernel/linux/linux-smarct437x-staging_4.4.bb
 # look for files in this layer first
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
  
-PR_append = "-smarc4"
+PR_append = ".smarc4"
+# look for files in this layer first
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+PR_append = ".smarc1"
+
+SRC_URI += " \
+	file://defconfig \
+"
-# look for files in this layer first
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-PR_append = "-smarc1"
-
-SRC_URI += " \
-	file://defconfig \
-"
 # look for files in this layer first
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
  
-PR_append = "-smarc0"
+PR_append = ".smarc0"
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
-PR_append = "-smarc"
+PR_append = ".smarc"
  
 do_install_append(){
 ln -sf          ../init.d/networking  ${D}${sysconfdir}/rc5.d/S20networking
+# Default for /etc/init.d/udev
+
+# Comment this out to disable device cache
+#DEVCACHE="/etc/dev.tar"
+PROBE_PLATFORM_BUS="yes"
+# Default for /etc/init.d/udev
+
+# Comment this out to disable device cache
+#DEVCACHE="/etc/dev.tar"
+PROBE_PLATFORM_BUS="yes"
+# There are a number of modifiers that are allowed to be used in some
+# of the different fields. They provide the following subsitutions:
+#
+# %n the "kernel number" of the device.
+#    For example, 'sda3' has a "kernel number" of '3'
+# %e the smallest number for that name which does not matches an existing node
+# %k the kernel name for the device
+# %M the kernel major number for the device
+# %m the kernel minor number for the device
+# %b the bus id for the device
+# %c the string returned by the PROGRAM
+# %s{filename} the content of a sysfs attribute
+# %% the '%' char itself
+#
+
+# Try and modprobe for drivers for new hardware
+ACTION=="add", DEVPATH=="/devices/*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}"
+
+# Create a symlink to any touchscreen input device
+SUBSYSTEM=="input", KERNEL=="event[0-9]*", ENV{ID_INPUT_TOUCHSCREEN}=="1", SYMLINK+="input/touchscreen0"
+
+# Auto-mount any SD cards
+ACTION=="add", KERNEL=="mmcblk[0-9]p[0-9]", SUBSYSTEM=="block", RUN+="/etc/udev/scripts/mount.sh"
+ACTION=="remove", KERNEL=="mmcblk[0-9]p[0-9]", SUBSYSTEM=="block", RUN+="/etc/udev/scripts/mount.sh"
+ACTION=="add", DEVPATH=="/devices/44000000\.ocp/48880000\.omap_dwc3_1/48890000\.usb/udc*", RUN+="/usr/bin/usb1-rules.sh"
+ACTION=="add", DEVPATH=="/devices/44000000\.ocp/488c0000\.omap_dwc3_2/488d0000\.usb/udc*", RUN+="/usr/bin/usb2-rules.sh"
+#!bin/sh
+/sbin/modprobe g_ncm -r
+/sbin/modprobe g_ncm
+#!bin/sh
+/sbin/modprobe g_zero -r
+/sbin/modprobe g_zero
+# This fixes an issue with touchscreens not being detected with the default
+# local.rules.  This can be removed when this change is picked up and
+# meta-arago switches to Dora
+
+# look for files in this layer first
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+PR_append = ".smarc5"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+SRC_URI_append = " \
+                  file://usb1-rules.sh \
+                  file://usb2-rules.sh"
+
+do_install_append() {
+    install -d ${D}/${bindir}
+
+    install -m 0755 ${WORKDIR}/usb1-rules.sh ${D}${bindir}/usb1-rules.sh
+    install -m 0755 ${WORKDIR}/usb2-rules.sh ${D}${bindir}/usb2-rules.sh
+    ln -sf libudev.so.1 ${D}${base_libdir}/libudev.so.0
+}
-# Default for /etc/init.d/udev
-
-# Comment this out to disable device cache
-#DEVCACHE="/etc/dev.tar"
-PROBE_PLATFORM_BUS="yes"
-# There are a number of modifiers that are allowed to be used in some
-# of the different fields. They provide the following subsitutions:
-#
-# %n the "kernel number" of the device.
-#    For example, 'sda3' has a "kernel number" of '3'
-# %e the smallest number for that name which does not matches an existing node
-# %k the kernel name for the device
-# %M the kernel major number for the device
-# %m the kernel minor number for the device
-# %b the bus id for the device
-# %c the string returned by the PROGRAM
-# %s{filename} the content of a sysfs attribute
-# %% the '%' char itself
-#
-
-# Try and modprobe for drivers for new hardware
-ACTION=="add", DEVPATH=="/devices/*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}"
-
-# Create a symlink to any touchscreen input device
-SUBSYSTEM=="input", KERNEL=="event[0-9]*", ENV{ID_INPUT_TOUCHSCREEN}=="1", SYMLINK+="input/touchscreen0"
-
-# Auto-mount any SD cards
-ACTION=="add", KERNEL=="mmcblk[0-9]p[0-9]", SUBSYSTEM=="block", RUN+="/etc/udev/scripts/mount.sh"
-ACTION=="remove", KERNEL=="mmcblk[0-9]p[0-9]", SUBSYSTEM=="block", RUN+="/etc/udev/scripts/mount.sh"
-ACTION=="add", DEVPATH=="/devices/44000000\.ocp/48880000\.omap_dwc3_1/48890000\.usb/udc*", RUN+="/usr/bin/usb1-rules.sh"
-ACTION=="add", DEVPATH=="/devices/44000000\.ocp/488c0000\.omap_dwc3_2/488d0000\.usb/udc*", RUN+="/usr/bin/usb2-rules.sh"
-#!bin/sh
-/sbin/modprobe g_ncm -r
-/sbin/modprobe g_ncm
-#!bin/sh
-/sbin/modprobe g_zero -r
-/sbin/modprobe g_zero
-# This fixes an issue with touchscreens not being detected with the default
-# local.rules.  This can be removed when this change is picked up and
-# meta-arago switches to Dora
-
-# look for files in this layer first
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-PR_append = "-smarc4"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-SRC_URI_append = " \
-                  file://usb1-rules.sh \
-                  file://usb2-rules.sh"
-
-do_install_append() {
-    install -d ${D}/${bindir}
-
-    install -m 0755 ${WORKDIR}/usb1-rules.sh ${D}${bindir}/usb1-rules.sh
-    install -m 0755 ${WORKDIR}/usb2-rules.sh ${D}${bindir}/usb2-rules.sh
-}
@@ -604,12 +604,11 @@
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
-CONFIG_DT_IDLE_STATES=y
  
 #
 # ARM CPU Idle Drivers
 #
-CONFIG_ARM_CPUIDLE=y
+# CONFIG_ARM_CPUIDLE is not set
 # CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
  
 #
@@ -1169,7 +1168,6 @@
 CONFIG_FW_LOADER=y
 CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_EXTRA_FIRMWARE=""
-CONFIG_EXTRA_FIRMWARE_DIR="firmware"
 CONFIG_FW_LOADER_USER_HELPER=y
 CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
 CONFIG_WANT_DEV_COREDUMP=y
@@ -3671,7 +3669,10 @@
 # CONFIG_ASYNC_TX_DMA is not set
 # CONFIG_DMATEST is not set
 # CONFIG_AUXDISPLAY is not set
-# CONFIG_UIO is not set
+CONFIG_UIO=y
+CONFIG_UIO_PDRV_GENIRQ=y
+CONFIG_UIO_DMEM_GENIRQ=y
+# CONFIG_UIO_PRUSS is not set
 # CONFIG_VFIO is not set
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO=y
@@ -3763,7 +3764,7 @@
 # CONFIG_SOC_BRCMSTB is not set
 # CONFIG_SUNXI_SRAM is not set
 CONFIG_SOC_TI=y
-CONFIG_AMX3_PM=m
+CONFIG_AMX3_PM=y
 CONFIG_OPP_DOMAIN_TI=y
 CONFIG_WKUP_M3_IPC=y
 # CONFIG_PM_DEVFREQ is not set
  
@@ -3779,10 +3780,10 @@
 # CONFIG_EXTCON_SM5502 is not set
 CONFIG_EXTCON_USB_GPIO=m
 CONFIG_MEMORY=y
-# CONFIG_TI_EMIF is not set
+CONFIG_TI_EMIF=y
 CONFIG_OMAP_GPMC=y
-# CONFIG_OMAP_GPMC_DEBUG is not set
-CONFIG_TI_EMIF_SRAM=m
+CONFIG_OMAP_GPMC_DEBUG=y
+CONFIG_TI_EMIF_SRAM=y
 CONFIG_IIO=y
 CONFIG_IIO_BUFFER=y
 # CONFIG_IIO_BUFFER_CB is not set
@@ -4646,7 +4647,7 @@
 CONFIG_NLATTR=y
 CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
 # CONFIG_CORDIC is not set
-# CONFIG_DDR is not set
+CONFIG_DDR=y
 CONFIG_LIBFDT=y
 CONFIG_OID_REGISTRY=y
 CONFIG_FONT_SUPPORT=y
@@ -72,21 +72,4 @@
 SRC_URI = "${EMB_KERNEL_MIRROR};protocol=ssh;branch=${BRANCH} \
         file://defconfig \
 "
-
-# Add append for SDK-03.00.00.04 specific changes not in mainline
-MACHINE_KERNEL_PR_append = "-smarc2"
-
-EXTRAPATHS_prepend := "${THISDIR}/${P}:"
-
-require copy-defconfig.inc
-
-KERNEL_LOCALVERSION = "-g${@d.getVar('SRCPV', True).partition('+')[2][0:7]}"
-
-kernel_do_configure_prepend() {
-    if [ ! -e ${B}/.scmversion -a ! -e ${S}/.scmversion ]
-    then
-        echo ${KERNEL_LOCALVERSION} > ${B}/.scmversion
-        echo ${KERNEL_LOCALVERSION} > ${S}/.scmversion
-    fi
-}
1	1	# look for files in this layer first
2	2	FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
3	3
4		-PR_append = "-smarc4"
	4	+PR_append = ".smarc4"
	1	+# look for files in this layer first
	2	+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
	3	+
	4	+PR_append = ".smarc1"
	5	+
	6	+SRC_URI += " \
	7	+ file://defconfig \
	8	+"
1		-# look for files in this layer first
2		-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
3		-
4		-PR_append = "-smarc1"
5		-
6		-SRC_URI += " \
7		- file://defconfig \
8		-"
1	1	# look for files in this layer first
2	2	FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
3	3
4		-PR_append = "-smarc0"
	4	+PR_append = ".smarc0"
1	1	FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
2		-PR_append = "-smarc"
	2	+PR_append = ".smarc"
3	3
4	4	do_install_append(){
5	5	ln -sf ../init.d/networking ${D}${sysconfdir}/rc5.d/S20networking
	1	+# Default for /etc/init.d/udev
	2	+
	3	+# Comment this out to disable device cache
	4	+#DEVCACHE="/etc/dev.tar"
	5	+PROBE_PLATFORM_BUS="yes"
	1	+# There are a number of modifiers that are allowed to be used in some
	2	+# of the different fields. They provide the following subsitutions:
	3	+#
	4	+# %n the "kernel number" of the device.
	5	+# For example, 'sda3' has a "kernel number" of '3'
	6	+# %e the smallest number for that name which does not matches an existing node
	7	+# %k the kernel name for the device
	8	+# %M the kernel major number for the device
	9	+# %m the kernel minor number for the device
	10	+# %b the bus id for the device
	11	+# %c the string returned by the PROGRAM
	12	+# %s{filename} the content of a sysfs attribute
	13	+# %% the '%' char itself
	14	+#
	15	+
	16	+# Try and modprobe for drivers for new hardware
	17	+ACTION=="add", DEVPATH=="/devices/", ENV{MODALIAS}=="?", RUN+="/sbin/modprobe $env{MODALIAS}"
	18	+
	19	+# Create a symlink to any touchscreen input device
	20	+SUBSYSTEM=="input", KERNEL=="event[0-9]*", ENV{ID_INPUT_TOUCHSCREEN}=="1", SYMLINK+="input/touchscreen0"
	21	+
	22	+# Auto-mount any SD cards
	23	+ACTION=="add", KERNEL=="mmcblk[0-9]p[0-9]", SUBSYSTEM=="block", RUN+="/etc/udev/scripts/mount.sh"
	24	+ACTION=="remove", KERNEL=="mmcblk[0-9]p[0-9]", SUBSYSTEM=="block", RUN+="/etc/udev/scripts/mount.sh"
	25	+ACTION=="add", DEVPATH=="/devices/44000000\.ocp/48880000\.omap_dwc3_1/48890000\.usb/udc*", RUN+="/usr/bin/usb1-rules.sh"
	26	+ACTION=="add", DEVPATH=="/devices/44000000\.ocp/488c0000\.omap_dwc3_2/488d0000\.usb/udc*", RUN+="/usr/bin/usb2-rules.sh"
	1	+# This fixes an issue with touchscreens not being detected with the default
	2	+# local.rules. This can be removed when this change is picked up and
	3	+# meta-arago switches to Dora
	4	+
	5	+# look for files in this layer first
	6	+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
	7	+
	8	+PR_append = ".smarc5"
	9	+
	10	+PACKAGE_ARCH = "${MACHINE_ARCH}"
	11	+
	12	+SRC_URI_append = " \
	13	+ file://usb1-rules.sh \
	14	+ file://usb2-rules.sh"
	15	+
	16	+do_install_append() {
	17	+ install -d ${D}/${bindir}
	18	+
	19	+ install -m 0755 ${WORKDIR}/usb1-rules.sh ${D}${bindir}/usb1-rules.sh
	20	+ install -m 0755 ${WORKDIR}/usb2-rules.sh ${D}${bindir}/usb2-rules.sh
	21	+ ln -sf libudev.so.1 ${D}${base_libdir}/libudev.so.0
	22	+}
1		-# Default for /etc/init.d/udev
2		-
3		-# Comment this out to disable device cache
4		-#DEVCACHE="/etc/dev.tar"
5		-PROBE_PLATFORM_BUS="yes"
1		-# There are a number of modifiers that are allowed to be used in some
2		-# of the different fields. They provide the following subsitutions:
3		-#
4		-# %n the "kernel number" of the device.
5		-# For example, 'sda3' has a "kernel number" of '3'
6		-# %e the smallest number for that name which does not matches an existing node
7		-# %k the kernel name for the device
8		-# %M the kernel major number for the device
9		-# %m the kernel minor number for the device
10		-# %b the bus id for the device
11		-# %c the string returned by the PROGRAM
12		-# %s{filename} the content of a sysfs attribute
13		-# %% the '%' char itself
14		-#
15		-
16		-# Try and modprobe for drivers for new hardware
17		-ACTION=="add", DEVPATH=="/devices/", ENV{MODALIAS}=="?", RUN+="/sbin/modprobe $env{MODALIAS}"
18		-
19		-# Create a symlink to any touchscreen input device
20		-SUBSYSTEM=="input", KERNEL=="event[0-9]*", ENV{ID_INPUT_TOUCHSCREEN}=="1", SYMLINK+="input/touchscreen0"
21		-
22		-# Auto-mount any SD cards
23		-ACTION=="add", KERNEL=="mmcblk[0-9]p[0-9]", SUBSYSTEM=="block", RUN+="/etc/udev/scripts/mount.sh"
24		-ACTION=="remove", KERNEL=="mmcblk[0-9]p[0-9]", SUBSYSTEM=="block", RUN+="/etc/udev/scripts/mount.sh"
25		-ACTION=="add", DEVPATH=="/devices/44000000\.ocp/48880000\.omap_dwc3_1/48890000\.usb/udc*", RUN+="/usr/bin/usb1-rules.sh"
26		-ACTION=="add", DEVPATH=="/devices/44000000\.ocp/488c0000\.omap_dwc3_2/488d0000\.usb/udc*", RUN+="/usr/bin/usb2-rules.sh"