diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-02-04 16:25:54 -0500 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-02-06 11:29:25 -0500 |
| commit | 1aaa08f1fade2d88cfdb7bb40b41c91a6296fdc3 (patch) | |
| tree | 83db9cf29770b57f800fc44e7d2c3339d622628e /meta-ibm | |
| parent | 6af98c1b5d37122f1d96356cbe4748c36b652b5b (diff) | |
| download | talos-openbmc-1aaa08f1fade2d88cfdb7bb40b41c91a6296fdc3.tar.gz talos-openbmc-1aaa08f1fade2d88cfdb7bb40b41c91a6296fdc3.zip | |
ibm: remove useless ibm.inc configuration file
ibm.inc simply includes openpower.inc. That, and meta-ibm is a distro
policy layer and doesn't enable any specific hardware.
Update machine configurations to include openpower.inc directly. Add a
conf/distro/include/ibm.inc to meta-ibm at a later time when meta-ibm
has distro policy to apply.
(From meta-ibm rev: 3d1be91f99c646b350c02bfe1004a019cd436c13)
Change-Id: I4bf1e9badba105f4ed10c478f7d5473e3f169791
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-ibm')
| -rw-r--r-- | meta-ibm/conf/machine/include/ibm.inc | 1 | ||||
| -rw-r--r-- | meta-ibm/meta-palmetto/conf/machine/palmetto.conf | 2 | ||||
| -rw-r--r-- | meta-ibm/meta-romulus/conf/machine/romulus.conf | 2 | ||||
| -rw-r--r-- | meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf | 2 | ||||
| -rw-r--r-- | meta-ibm/meta-z/conf/machine/ibm-z.conf | 2 |
5 files changed, 4 insertions, 5 deletions
diff --git a/meta-ibm/conf/machine/include/ibm.inc b/meta-ibm/conf/machine/include/ibm.inc deleted file mode 100644 index c79ddd777..000000000 --- a/meta-ibm/conf/machine/include/ibm.inc +++ /dev/null @@ -1 +0,0 @@ -require conf/machine/include/openpower.inc diff --git a/meta-ibm/meta-palmetto/conf/machine/palmetto.conf b/meta-ibm/meta-palmetto/conf/machine/palmetto.conf index f23cac115..1ba200013 100644 --- a/meta-ibm/meta-palmetto/conf/machine/palmetto.conf +++ b/meta-ibm/meta-palmetto/conf/machine/palmetto.conf @@ -3,7 +3,7 @@ KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb" require conf/machine/include/ast2400.inc require conf/machine/include/obmc-bsp-common.inc -require conf/machine/include/ibm.inc +require conf/machine/include/openpower.inc require conf/machine/include/p8.inc UBOOT_MACHINE_palmetto = "ast_g4_ncsi_config" diff --git a/meta-ibm/meta-romulus/conf/machine/romulus.conf b/meta-ibm/meta-romulus/conf/machine/romulus.conf index 67e1601c3..ddbc7dbb8 100644 --- a/meta-ibm/meta-romulus/conf/machine/romulus.conf +++ b/meta-ibm/meta-romulus/conf/machine/romulus.conf @@ -7,7 +7,7 @@ PREFERRED_PROVIDER_virtual/p9-vcs-workaround = '' require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc -require conf/machine/include/ibm.inc +require conf/machine/include/openpower.inc require conf/machine/include/p9.inc PHOSPHOR_MRW_LICENSE = "Apache-2.0" diff --git a/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf b/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf index 65140437a..c6f943429 100644 --- a/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf +++ b/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf @@ -10,7 +10,7 @@ PREFERRED_PROVIDER_virtual/p9-vcs-workaround = '' require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc -require conf/machine/include/ibm.inc +require conf/machine/include/openpower.inc require conf/machine/include/p9.inc PHOSPHOR_MRW_LICENSE = "Apache-2.0" diff --git a/meta-ibm/meta-z/conf/machine/ibm-z.conf b/meta-ibm/meta-z/conf/machine/ibm-z.conf index 47bfb0740..b9d182453 100644 --- a/meta-ibm/meta-z/conf/machine/ibm-z.conf +++ b/meta-ibm/meta-z/conf/machine/ibm-z.conf @@ -4,7 +4,7 @@ KBUILD_DEFCONFIG = "44x/fsp2_defconfig" require conf/machine/include/fsp2.inc require conf/machine/include/obmc-bsp-common.inc -require conf/machine/include/ibm.inc +require conf/machine/include/openpower.inc UBOOT_MACHINE_sunray2 = "fsp2_defconfig" UBOOT_ENTRYPOINT = "0x10000000" |
