diff options
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 c79ddd7774..0000000000 --- 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 f23cac1158..1ba2000133 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 67e1601c3f..ddbc7dbb88 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 65140437a9..c6f9434293 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 47bfb07407..b9d182453b 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" |