From 58ca1838e372a60781b6b03c7b7a12dce2270e50 Mon Sep 17 00:00:00 2001 From: Ting Liu Date: Wed, 7 Jan 2015 17:54:59 +0800 Subject: udev-extraconf: replace bbappend with own recipe * introduce variable RULE for DPAA FMan ethernet ports name rule. * use 72-fsl-dpaa-persistent-networking.rules for t1024, same as e6500. Signed-off-by: Ting Liu --- .../machine/include/qoriq-default-settings.inc | 2 +- .../71-fsl-dpaa-persistent-networking.rules | 20 ------------------ .../72-fsl-dpaa-persistent-networking.rules | 24 ---------------------- .../udev/udev-extraconf/qoriq-ppc/automount.rules | 23 --------------------- .../recipes-core/udev/udev-extraconf_%.bbappend | 15 -------------- meta-fsl-ppc/recipes-core/udev/udev-rules-qoriq.bb | 23 +++++++++++++++++++++ .../71-fsl-dpaa-persistent-networking.rules | 20 ++++++++++++++++++ .../72-fsl-dpaa-persistent-networking.rules | 24 ++++++++++++++++++++++ .../udev-rules-qoriq/qoriq-ppc/automount.rules | 23 +++++++++++++++++++++ 9 files changed, 91 insertions(+), 83 deletions(-) delete mode 100644 meta-fsl-ppc/recipes-core/udev/udev-extraconf/qoriq-ppc/71-fsl-dpaa-persistent-networking.rules delete mode 100644 meta-fsl-ppc/recipes-core/udev/udev-extraconf/qoriq-ppc/72-fsl-dpaa-persistent-networking.rules delete mode 100644 meta-fsl-ppc/recipes-core/udev/udev-extraconf/qoriq-ppc/automount.rules delete mode 100644 meta-fsl-ppc/recipes-core/udev/udev-extraconf_%.bbappend create mode 100644 meta-fsl-ppc/recipes-core/udev/udev-rules-qoriq.bb create mode 100644 meta-fsl-ppc/recipes-core/udev/udev-rules-qoriq/qoriq-ppc/71-fsl-dpaa-persistent-networking.rules create mode 100644 meta-fsl-ppc/recipes-core/udev/udev-rules-qoriq/qoriq-ppc/72-fsl-dpaa-persistent-networking.rules create mode 100644 meta-fsl-ppc/recipes-core/udev/udev-rules-qoriq/qoriq-ppc/automount.rules (limited to 'meta-fsl-ppc') diff --git a/meta-fsl-ppc/conf/machine/include/qoriq-default-settings.inc b/meta-fsl-ppc/conf/machine/include/qoriq-default-settings.inc index 4c8b84248..539f6a1d2 100644 --- a/meta-fsl-ppc/conf/machine/include/qoriq-default-settings.inc +++ b/meta-fsl-ppc/conf/machine/include/qoriq-default-settings.inc @@ -1,5 +1,5 @@ MACHINE_FEATURES = "keyboard pci ext2 ext3 serial" -MACHINE_EXTRA_RRECOMMENDS += "udev-extraconf kernel-modules" +MACHINE_EXTRA_RRECOMMENDS += "udev-rules-qoriq kernel-modules" IMAGE_CLASSES += "image_types_uboot" EXTRA_IMAGEDEPENDS += "u-boot" diff --git a/meta-fsl-ppc/recipes-core/udev/udev-extraconf/qoriq-ppc/71-fsl-dpaa-persistent-networking.rules b/meta-fsl-ppc/recipes-core/udev/udev-extraconf/qoriq-ppc/71-fsl-dpaa-persistent-networking.rules deleted file mode 100644 index 6c6dc354f..000000000 --- a/meta-fsl-ppc/recipes-core/udev/udev-extraconf/qoriq-ppc/71-fsl-dpaa-persistent-networking.rules +++ /dev/null @@ -1,20 +0,0 @@ -# Rules for handling naming the DPAA FMan ethernet ports in a consistent way -SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe4e0000", NAME="fm1-gb0" -SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe4e2000", NAME="fm1-gb1" -SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe4e4000", NAME="fm1-gb2" -SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe4e6000", NAME="fm1-gb3" -SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe4e8000", NAME="fm1-gb4" -SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe4f0000", NAME="fm1-10g" -SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe5e0000", NAME="fm2-gb0" -SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe5e2000", NAME="fm2-gb1" -SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe5e4000", NAME="fm2-gb2" -SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe5e6000", NAME="fm2-gb3" -SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe5e8000", NAME="fm2-gb4" -SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe5f0000", NAME="fm2-10g" - -# P1023 has its Fman @ different offsets -SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ff7e0000", NAME="fm1-gb0" -SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ff7e2000", NAME="fm1-gb1" - -# Rename macless0 port to "macless0" -SUBSYSTEM=="net", ATTR{device_type}=="macless0", NAME="macless0" diff --git a/meta-fsl-ppc/recipes-core/udev/udev-extraconf/qoriq-ppc/72-fsl-dpaa-persistent-networking.rules b/meta-fsl-ppc/recipes-core/udev/udev-extraconf/qoriq-ppc/72-fsl-dpaa-persistent-networking.rules deleted file mode 100644 index d0eec9ce1..000000000 --- a/meta-fsl-ppc/recipes-core/udev/udev-extraconf/qoriq-ppc/72-fsl-dpaa-persistent-networking.rules +++ /dev/null @@ -1,24 +0,0 @@ -# Rules for handling naming the DPAA FMan ethernet ports in a consistent way -SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe4e0000", NAME="fm1-mac1" -SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe4e2000", NAME="fm1-mac2" -SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe4e4000", NAME="fm1-mac3" -SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe4e6000", NAME="fm1-mac4" -SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe4e8000", NAME="fm1-mac5" -SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe4ea000", NAME="fm1-mac6" -SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe4ec000", NAME="fm1-mac7" -SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe4ee000", NAME="fm1-mac8" -SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe4f0000", NAME="fm1-mac9" -SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe4f2000", NAME="fm1-mac10" -SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe5e0000", NAME="fm2-mac1" -SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe5e2000", NAME="fm2-mac2" -SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe5e4000", NAME="fm2-mac3" -SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe5e6000", NAME="fm2-mac4" -SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe5e8000", NAME="fm2-mac5" -SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe5ea000", NAME="fm2-mac6" -SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe5ec000", NAME="fm2-mac7" -SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe5ee000", NAME="fm2-mac8" -SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe5f0000", NAME="fm2-mac9" -SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe5f2000", NAME="fm2-mac10" - -# Rename macless0 to "macless0" -SUBSYSTEM=="net", ATTR{device_type}=="macless0", NAME="macless0" diff --git a/meta-fsl-ppc/recipes-core/udev/udev-extraconf/qoriq-ppc/automount.rules b/meta-fsl-ppc/recipes-core/udev/udev-extraconf/qoriq-ppc/automount.rules deleted file mode 100644 index a47efdab5..000000000 --- a/meta-fsl-ppc/recipes-core/udev/udev-extraconf/qoriq-ppc/automount.rules +++ /dev/null @@ -1,23 +0,0 @@ -# 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 -# - -SUBSYSTEM=="block", ENV{DEVTYPE}=="partition", GOTO="automount_end" - -# Media automounting -SUBSYSTEM=="block", ACTION=="add" RUN+="/etc/udev/scripts/mount.sh" -SUBSYSTEM=="block", ACTION=="remove" RUN+="/etc/udev/scripts/mount.sh" - -LABEL="automount_end" - diff --git a/meta-fsl-ppc/recipes-core/udev/udev-extraconf_%.bbappend b/meta-fsl-ppc/recipes-core/udev/udev-extraconf_%.bbappend deleted file mode 100644 index 896e75f64..000000000 --- a/meta-fsl-ppc/recipes-core/udev/udev-extraconf_%.bbappend +++ /dev/null @@ -1,15 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" - -SRC_URI_append_qoriq-ppc = " file://${@bb.utils.contains("TUNE_FEATURES", "e6500", \ - "72-fsl-dpaa-persistent-networking.rules", "71-fsl-dpaa-persistent-networking.rules", d)}" - -do_install_append_qoriq-ppc () { - install -d ${D}${sysconfdir}/udev/rules.d/ - install -m 0644 ${WORKDIR}/*-fsl-dpaa-persistent-networking.rules ${D}${sysconfdir}/udev/rules.d - - # skip mmc rpmb partitions - echo "/dev/mmcblk.*rpmb" >>${D}${sysconfdir}/udev/mount.blacklist - # skip nbd (network block device) - echo "/dev/nbd*" >>${D}${sysconfdir}/udev/mount.blacklist -} - diff --git a/meta-fsl-ppc/recipes-core/udev/udev-rules-qoriq.bb b/meta-fsl-ppc/recipes-core/udev/udev-rules-qoriq.bb new file mode 100644 index 000000000..546f9e8dd --- /dev/null +++ b/meta-fsl-ppc/recipes-core/udev/udev-rules-qoriq.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "udev rules for Freescale QorIQ SOCs" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690" + +SRC_URI = "\ + file://71-fsl-dpaa-persistent-networking.rules \ + file://72-fsl-dpaa-persistent-networking.rules \ +" +RULE ?= "71-fsl-dpaa-persistent-networking.rules" +RULE_e6500 = "72-fsl-dpaa-persistent-networking.rules" +RULE_e6500-64b = "72-fsl-dpaa-persistent-networking.rules" +RULE_t1024 = "72-fsl-dpaa-persistent-networking.rules" + +do_install () { + install -d ${D}${sysconfdir}/udev/rules.d/ + install -m 0644 ${WORKDIR}/${RULE} ${D}${sysconfdir}/udev/rules.d/ + + # skip mmc rpmb partitions + echo "/dev/mmcblk.*rpmb" >>${D}${sysconfdir}/udev/mount.blacklist + # skip nbd (network block device) + echo "/dev/nbd*" >>${D}${sysconfdir}/udev/mount.blacklist +} + diff --git a/meta-fsl-ppc/recipes-core/udev/udev-rules-qoriq/qoriq-ppc/71-fsl-dpaa-persistent-networking.rules b/meta-fsl-ppc/recipes-core/udev/udev-rules-qoriq/qoriq-ppc/71-fsl-dpaa-persistent-networking.rules new file mode 100644 index 000000000..6c6dc354f --- /dev/null +++ b/meta-fsl-ppc/recipes-core/udev/udev-rules-qoriq/qoriq-ppc/71-fsl-dpaa-persistent-networking.rules @@ -0,0 +1,20 @@ +# Rules for handling naming the DPAA FMan ethernet ports in a consistent way +SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe4e0000", NAME="fm1-gb0" +SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe4e2000", NAME="fm1-gb1" +SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe4e4000", NAME="fm1-gb2" +SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe4e6000", NAME="fm1-gb3" +SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe4e8000", NAME="fm1-gb4" +SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe4f0000", NAME="fm1-10g" +SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe5e0000", NAME="fm2-gb0" +SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe5e2000", NAME="fm2-gb1" +SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe5e4000", NAME="fm2-gb2" +SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe5e6000", NAME="fm2-gb3" +SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe5e8000", NAME="fm2-gb4" +SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe5f0000", NAME="fm2-10g" + +# P1023 has its Fman @ different offsets +SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ff7e0000", NAME="fm1-gb0" +SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ff7e2000", NAME="fm1-gb1" + +# Rename macless0 port to "macless0" +SUBSYSTEM=="net", ATTR{device_type}=="macless0", NAME="macless0" diff --git a/meta-fsl-ppc/recipes-core/udev/udev-rules-qoriq/qoriq-ppc/72-fsl-dpaa-persistent-networking.rules b/meta-fsl-ppc/recipes-core/udev/udev-rules-qoriq/qoriq-ppc/72-fsl-dpaa-persistent-networking.rules new file mode 100644 index 000000000..d0eec9ce1 --- /dev/null +++ b/meta-fsl-ppc/recipes-core/udev/udev-rules-qoriq/qoriq-ppc/72-fsl-dpaa-persistent-networking.rules @@ -0,0 +1,24 @@ +# Rules for handling naming the DPAA FMan ethernet ports in a consistent way +SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe4e0000", NAME="fm1-mac1" +SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe4e2000", NAME="fm1-mac2" +SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe4e4000", NAME="fm1-mac3" +SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe4e6000", NAME="fm1-mac4" +SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe4e8000", NAME="fm1-mac5" +SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe4ea000", NAME="fm1-mac6" +SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe4ec000", NAME="fm1-mac7" +SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe4ee000", NAME="fm1-mac8" +SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe4f0000", NAME="fm1-mac9" +SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe4f2000", NAME="fm1-mac10" +SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe5e0000", NAME="fm2-mac1" +SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe5e2000", NAME="fm2-mac2" +SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe5e4000", NAME="fm2-mac3" +SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe5e6000", NAME="fm2-mac4" +SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe5e8000", NAME="fm2-mac5" +SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe5ea000", NAME="fm2-mac6" +SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe5ec000", NAME="fm2-mac7" +SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe5ee000", NAME="fm2-mac8" +SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe5f0000", NAME="fm2-mac9" +SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="ffe5f2000", NAME="fm2-mac10" + +# Rename macless0 to "macless0" +SUBSYSTEM=="net", ATTR{device_type}=="macless0", NAME="macless0" diff --git a/meta-fsl-ppc/recipes-core/udev/udev-rules-qoriq/qoriq-ppc/automount.rules b/meta-fsl-ppc/recipes-core/udev/udev-rules-qoriq/qoriq-ppc/automount.rules new file mode 100644 index 000000000..a47efdab5 --- /dev/null +++ b/meta-fsl-ppc/recipes-core/udev/udev-rules-qoriq/qoriq-ppc/automount.rules @@ -0,0 +1,23 @@ +# 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 +# + +SUBSYSTEM=="block", ENV{DEVTYPE}=="partition", GOTO="automount_end" + +# Media automounting +SUBSYSTEM=="block", ACTION=="add" RUN+="/etc/udev/scripts/mount.sh" +SUBSYSTEM=="block", ACTION=="remove" RUN+="/etc/udev/scripts/mount.sh" + +LABEL="automount_end" + -- cgit v1.2.3-54-g00ecf