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>
diff --git a/meta-ibm/conf/machine/include/ibm.inc b/meta-ibm/conf/machine/include/ibm.inc
deleted file mode 100644
index c79ddd7..0000000
--- 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 f23cac1..1ba2000 100644
--- a/meta-ibm/meta-palmetto/conf/machine/palmetto.conf
+++ b/meta-ibm/meta-palmetto/conf/machine/palmetto.conf
@@ -3,7 +3,7 @@
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 67e1601..ddbc7db 100644
--- a/meta-ibm/meta-romulus/conf/machine/romulus.conf
+++ b/meta-ibm/meta-romulus/conf/machine/romulus.conf
@@ -7,7 +7,7 @@
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 6514043..c6f9434 100644
--- a/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf
+++ b/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf
@@ -10,7 +10,7 @@
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 47bfb07..b9d1824 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 @@
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"