[PATCH openbmc v2 04/11] Remove duplicate kernel config fragments

[Brad Bishop]

On Wed, 2016-06-08 at 19:42 -0500, Joel Stanley wrote:
> On Wed, Jun 8, 2016 at 7:20 PM, OpenBMC Patches
> <openbmc-patches at stwcx.xyz> wrote:
> > From: Brad Bishop <bradleyb at fuzziesquirrel.com>
> >
> > Enable CONFIG_HWMON and nothing else in the base Phosphor layer.
> > Enable system specific modules in their respective layers.
> 
> I thought we agreed that we should put the CONFIG_HWMON in the
> respective layers too?

Oops.  Forgot.  Or was I trying to sneak it by?

Will fix.

> 
> >
> > Signed-off-by: Brad Bishop <bradleyb at fuzziesquirrel.com>
> > ---
> >  .../meta-ast2400/recipes-kernel/linux/linux-obmc/hwmon.cfg            | 4 ----
> >  .../meta-ast2400/recipes-kernel/linux/linux-obmc_%.bbappend           | 2 +-
> >  .../meta-firestone/recipes-kernel/linux/linux-obmc/firestone.cfg      | 3 ---
> >  .../meta-garrison/recipes-kernel/linux/linux-obmc/garrison.cfg        | 3 ---
> >  .../meta-palmetto/recipes-kernel/linux/linux-obmc/palmetto.cfg        | 1 -
> >  .../meta-barreleye/recipes-kernel/linux/linux-obmc/barreleye.cfg      | 3 +++
> >  .../meta-barreleye/recipes-kernel/linux/linux-obmc_%.bbappend         | 2 ++
> >  meta-phosphor/common/recipes-kernel/linux/linux-obmc/hwmon.cfg        | 1 +
> >  meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.4.bb           | 1 +
> >  9 files changed, 8 insertions(+), 12 deletions(-)
> >  delete mode 100644 meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/hwmon.cfg
> >  create mode 100644 meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-kernel/linux/linux-obmc/barreleye.cfg
> >  create mode 100644 meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-kernel/linux/linux-obmc_%.bbappend
> >  create mode 100644 meta-phosphor/common/recipes-kernel/linux/linux-obmc/hwmon.cfg
> >
> > diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/hwmon.cfg b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/hwmon.cfg
> > deleted file mode 100644
> > index 053fea3..0000000
> > --- a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/hwmon.cfg
> > +++ /dev/null
> > @@ -1,4 +0,0 @@
> > -CONFIG_HWMON=y
> > -CONFIG_SENSORS_NCT7904=y
> > -CONFIG_SENSORS_LM75=y
> > -CONFIG_EEPROM_AT24=y
> > diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc_%.bbappend b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc_%.bbappend
> > index bb6f06c..6d7ae27 100644
> > --- a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc_%.bbappend
> > +++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc_%.bbappend
> > @@ -1,2 +1,2 @@
> >  FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
> > -SRC_URI += "file://defconfig file://hwmon.cfg"
> > +SRC_URI += "file://defconfig"
> > diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-kernel/linux/linux-obmc/firestone.cfg b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-kernel/linux/linux-obmc/firestone.cfg
> > index 2594dec..63891b6 100644
> > --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-kernel/linux/linux-obmc/firestone.cfg
> > +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-kernel/linux/linux-obmc/firestone.cfg
> > @@ -1,4 +1 @@
> > -CONFIG_HWMON=y
> > -CONFIG_SENSORS_NCT7904=y
> > -CONFIG_EEPROM_AT24=y
> >  CONFIG_SENSORS_TMP421=y
> > diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-kernel/linux/linux-obmc/garrison.cfg b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-kernel/linux/linux-obmc/garrison.cfg
> > index 2594dec..63891b6 100644
> > --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-kernel/linux/linux-obmc/garrison.cfg
> > +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-kernel/linux/linux-obmc/garrison.cfg
> > @@ -1,4 +1 @@
> > -CONFIG_HWMON=y
> > -CONFIG_SENSORS_NCT7904=y
> > -CONFIG_EEPROM_AT24=y
> >  CONFIG_SENSORS_TMP421=y
> > diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-kernel/linux/linux-obmc/palmetto.cfg b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-kernel/linux/linux-obmc/palmetto.cfg
> > index 2594dec..498497e 100644
> > --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-kernel/linux/linux-obmc/palmetto.cfg
> > +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-kernel/linux/linux-obmc/palmetto.cfg
> > @@ -1,4 +1,3 @@
> > -CONFIG_HWMON=y
> >  CONFIG_SENSORS_NCT7904=y
> >  CONFIG_EEPROM_AT24=y
> >  CONFIG_SENSORS_TMP421=y
> > diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-kernel/linux/linux-obmc/barreleye.cfg b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-kernel/linux/linux-obmc/barreleye.cfg
> > new file mode 100644
> > index 0000000..f778394
> > --- /dev/null
> > +++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-kernel/linux/linux-obmc/barreleye.cfg
> > @@ -0,0 +1,3 @@
> > +CONFIG_SENSORS_NCT7904=y
> > +CONFIG_SENSORS_LM75=y
> > +CONFIG_EEPROM_AT24=y
> > diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-kernel/linux/linux-obmc_%.bbappend b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-kernel/linux/linux-obmc_%.bbappend
> > new file mode 100644
> > index 0000000..9e74ab4
> > --- /dev/null
> > +++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-kernel/linux/linux-obmc_%.bbappend
> > @@ -0,0 +1,2 @@
> > +FILESEXTRAPATHS_prepend := "${THISDIR}/linux-obmc:"
> > +SRC_URI += "file://barreleye.cfg"
> > diff --git a/meta-phosphor/common/recipes-kernel/linux/linux-obmc/hwmon.cfg b/meta-phosphor/common/recipes-kernel/linux/linux-obmc/hwmon.cfg
> > new file mode 100644
> > index 0000000..ff2b329
> > --- /dev/null
> > +++ b/meta-phosphor/common/recipes-kernel/linux/linux-obmc/hwmon.cfg
> > @@ -0,0 +1 @@
> > +CONFIG_HWMON=y
> > diff --git a/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.4.bb b/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.4.bb
> > index 47e3698..c0d8e38 100644
> > --- a/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.4.bb
> > +++ b/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.4.bb
> > @@ -6,6 +6,7 @@ KBRANCH ?= "dev-4.4"
> >  KCONFIG_MODE="--alldefconfig"
> >
> >  SRC_URI = "git://github.com/openbmc/linux;protocol=git;branch=${KBRANCH}"
> > +SRC_URI += "file://hwmon.cfg"
> >
> >  LINUX_VERSION ?= "4.4"
> >  LINUX_VERSION_EXTENSION ?= "-${SRCREV}"
> > --
> > 2.8.3
> >
> >
> > _______________________________________________
> > openbmc mailing list
> > openbmc at lists.ozlabs.org
> > https://lists.ozlabs.org/listinfo/openbmc