diff options
author | Ivan Mikhaylov <ivan@de.ibm.com> | 2017-10-24 21:17:24 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-02-21 05:44:07 +0300 |
commit | 4b2430e4e04bf9e8ec55baffaf0bcdedd2e9b4e0 (patch) | |
tree | 88390acfe110f774de373ce60ba0f3c82da13530 | |
parent | 7829e5f0640e09300a2e6723b64ed13e8687da00 (diff) | |
download | openbmc-4b2430e4e04bf9e8ec55baffaf0bcdedd2e9b4e0.tar.xz |
add sunray2, fsp2 based soc
* add fsp2 meta
* add sunray2 evaluation board
* create zobmc ppc kernel for fsp2 based boards
* remove phosphor gpio keys
* only -k core-image-minimal working fine for now due to
problems with workbook and ipmi dependencies
Change-Id: Id84614a78bc875206ccc0450885261258e4adb26
Signed-off-by: Ivan Mikhaylov <ivan@de.ibm.com>
14 files changed, 336 insertions, 0 deletions
diff --git a/meta-openbmc-bsp/meta-ibm/meta-fsp2/COPYING.MIT b/meta-openbmc-bsp/meta-ibm/meta-fsp2/COPYING.MIT new file mode 100644 index 000000000..fb950dc69 --- /dev/null +++ b/meta-openbmc-bsp/meta-ibm/meta-fsp2/COPYING.MIT @@ -0,0 +1,17 @@ +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/meta-openbmc-bsp/meta-ibm/meta-fsp2/COPYING.apache-2.0 b/meta-openbmc-bsp/meta-ibm/meta-fsp2/COPYING.apache-2.0 new file mode 100644 index 000000000..67db85882 --- /dev/null +++ b/meta-openbmc-bsp/meta-ibm/meta-fsp2/COPYING.apache-2.0 @@ -0,0 +1,175 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. diff --git a/meta-openbmc-bsp/meta-ibm/meta-fsp2/LICENSE b/meta-openbmc-bsp/meta-ibm/meta-fsp2/LICENSE new file mode 100644 index 000000000..2bf823dc4 --- /dev/null +++ b/meta-openbmc-bsp/meta-ibm/meta-fsp2/LICENSE @@ -0,0 +1,12 @@ +Different components of Phosphor OpenBMC are under different licenses (a mix +of MIT and Apache-2.0). Please see: + +COPYING.Apache-2.0 +COPYING.MIT (MIT) + +All metadata is MIT licensed unless otherwise stated. Source code +included in tree for individual recipes is under the LICENSE stated in +the associated recipe (.bb file) unless otherwise stated. + +License information for any other files is either explicitly stated +or defaults to Apache-2.0. diff --git a/meta-openbmc-bsp/meta-ibm/meta-fsp2/conf/layer.conf b/meta-openbmc-bsp/meta-ibm/meta-fsp2/conf/layer.conf new file mode 100644 index 000000000..062415b36 --- /dev/null +++ b/meta-openbmc-bsp/meta-ibm/meta-fsp2/conf/layer.conf @@ -0,0 +1,9 @@ +# We have a conf and classes directory, add to BBPATH +BBPATH .= ":${LAYERDIR}" + +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ + ${LAYERDIR}/recipes-*/*/*.bbappend" + +BBFILE_PATTERN_fsp2 = "^${LAYERDIR}" +BBFILE_COLLECTIONS += "fsp2" +LAYERVERSION_fsp2 = "1" diff --git a/meta-openbmc-bsp/meta-ibm/meta-fsp2/conf/machine/include/fsp2.inc b/meta-openbmc-bsp/meta-ibm/meta-fsp2/conf/machine/include/fsp2.inc new file mode 100644 index 000000000..a053d37d3 --- /dev/null +++ b/meta-openbmc-bsp/meta-ibm/meta-fsp2/conf/machine/include/fsp2.inc @@ -0,0 +1,13 @@ +#@TYPE: Machine +#@NAME: fsp2 +#@DESCRIPTION: evaluation machine board configuration for the fsp2 ppc476 + +PREFERRED_PROVIDER_virtual/kernel ?= "linux-fsp2" + +DEFAULTTUNE = "powerpc-nf" + +SERIAL_CONSOLES = "115200;ttyS0" + +MACHINEOVERRIDES .= ":fsp2" + +require conf/machine/include/powerpc/arch-powerpc.inc diff --git a/meta-openbmc-bsp/meta-ibm/meta-fsp2/conf/machine/sunray2.conf b/meta-openbmc-bsp/meta-ibm/meta-fsp2/conf/machine/sunray2.conf new file mode 100644 index 000000000..e61487f7f --- /dev/null +++ b/meta-openbmc-bsp/meta-ibm/meta-fsp2/conf/machine/sunray2.conf @@ -0,0 +1,11 @@ +MACHINE = "sunray2" +KERNEL_DEVICETREE = "fsp2.dtb" +KBUILD_DEFCONFIG = "44x/fsp2_defconfig" + +require conf/machine/include/fsp2.inc + +#dummy uboot settings +UBOOT_MACHINE_sunray2 = "mpc8308_p1m_defconfig" +UBOOT_ENTRYPOINT = "0x0" +UBOOT_LOADADDRESS = "0x0" + diff --git a/meta-openbmc-bsp/meta-ibm/meta-fsp2/recipes-kernel/linux/linux-fsp2.inc b/meta-openbmc-bsp/meta-ibm/meta-fsp2/recipes-kernel/linux/linux-fsp2.inc new file mode 100644 index 000000000..5b339a227 --- /dev/null +++ b/meta-openbmc-bsp/meta-ibm/meta-fsp2/recipes-kernel/linux/linux-fsp2.inc @@ -0,0 +1,30 @@ +DESCRIPTION = "Linux kernel for the FSP2 system on a chip" +SECTION = "kernel" +LICENSE = "GPLv2" + +KCONFIG_MODE="--alldefconfig" + +KSRC ?= "git://github.com/openbmc/linux;protocol=git;branch=dev-4.13" +SRC_URI = "${KSRC}" + +LINUX_VERSION_EXTENSION ?= "-${SRCREV}" + +PV = "${LINUX_VERSION}+git${SRCPV}" + +COMPATIBLE_MACHINE_${MACHINE} = "^${MACHINE}$" + +do_patch_append() { + for DTB in "${KERNEL_DEVICETREE}"; do + DT=`basename ${DTB} .dtb` + if [ -r "${WORKDIR}/${DT}.dts" ]; then + cp ${WORKDIR}/${DT}.dts \ + ${STAGING_KERNEL_DIR}/arch/${ARCH}/boot/dts + fi + done +} + +inherit kernel +require recipes-kernel/linux/linux-yocto.inc + +KERNEL_FEATURES_remove = "phosphor-gpio-keys" +INSANE_SKIP_kernel-vmlinux = "ldflags" diff --git a/meta-openbmc-bsp/meta-ibm/meta-fsp2/recipes-kernel/linux/linux-fsp2_4.13.bb b/meta-openbmc-bsp/meta-ibm/meta-fsp2/recipes-kernel/linux/linux-fsp2_4.13.bb new file mode 100644 index 000000000..1c2929bab --- /dev/null +++ b/meta-openbmc-bsp/meta-ibm/meta-fsp2/recipes-kernel/linux/linux-fsp2_4.13.bb @@ -0,0 +1,5 @@ +LINUX_VERSION ?= "4.13.16" + +SRCREV="61dd33b93ddde2f996d087c1129e4309c97822a2" + +require linux-fsp2.inc diff --git a/meta-openbmc-bsp/meta-ibm/meta-fsp2/recipes.txt b/meta-openbmc-bsp/meta-ibm/meta-fsp2/recipes.txt new file mode 100644 index 000000000..149509f3e --- /dev/null +++ b/meta-openbmc-bsp/meta-ibm/meta-fsp2/recipes.txt @@ -0,0 +1,2 @@ +recipes-bsp - Anything with links to specific hardware or hardware configuration information +recipes-kernel - The kernel and generic applications/libraries with strong kernel dependencies diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-z/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-z/conf/bblayers.conf.sample new file mode 100644 index 000000000..ab8c3a54f --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-z/conf/bblayers.conf.sample @@ -0,0 +1,24 @@ +# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf +# changes incompatibly +LCONF_VERSION = "6" + +BBPATH = "${TOPDIR}" +BBFILES ?= "" + +BBLAYERS ?= " \ + ##OEROOT##/meta \ + ##OEROOT##/meta-poky \ + ##OEROOT##/import-layers/meta-openembedded/meta-oe/ \ + ##OEROOT##/import-layers/meta-openembedded/meta-filesystems/ \ + ##OEROOT##/import-layers/meta-openembedded/meta-networking/ \ + ##OEROOT##/import-layers/meta-openembedded/meta-python/ \ + ##OEROOT##/meta-phosphor \ + ##OEROOT##/meta-openbmc-bsp/meta-ibm/meta-fsp2 \ + ##OEROOT##/meta-openbmc-machines/meta-openpower \ + ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm \ + ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm/meta-z \ +" +BBLAYERS_NON_REMOVABLE ?= " \ + ##OEROOT##/meta \ + ##OEROOT##/meta-poky \ + " diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-z/conf/conf-notes.txt b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-z/conf/conf-notes.txt new file mode 100644 index 000000000..9b3c01a55 --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-z/conf/conf-notes.txt @@ -0,0 +1,2 @@ +Common targets are: + obmc-phosphor-image diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-z/conf/layer.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-z/conf/layer.conf new file mode 100644 index 000000000..790dc69e8 --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-z/conf/layer.conf @@ -0,0 +1,5 @@ +# We have a conf and classes directory, add to BBPATH +BBPATH .= ":${LAYERDIR}" + +BBFILE_COLLECTIONS += "ibm-z" +BBFILE_PATTERN_ibm-z = "" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-z/conf/local.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-z/conf/local.conf.sample new file mode 100644 index 000000000..988416f1a --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-z/conf/local.conf.sample @@ -0,0 +1,18 @@ +MACHINE ??= "ibm-z" +DISTRO ?= "openbmc-phosphor" +PACKAGE_CLASSES ?= "package_rpm" +SANITY_TESTED_DISTROS_append ?= " *" +EXTRA_IMAGE_FEATURES = "debug-tweaks" +USER_CLASSES ?= "buildstats image-mklibs image-prelink" +PATCHRESOLVE = "noop" +BB_DISKMON_DIRS = "\ + STOPTASKS,${TMPDIR},1G,100K \ + STOPTASKS,${DL_DIR},1G,100K \ + STOPTASKS,${SSTATE_DIR},1G,100K \ + STOPTASKS,/tmp,100M,100K \ + ABORT,${TMPDIR},100M,1K \ + ABORT,${DL_DIR},100M,1K \ + ABORT,${SSTATE_DIR},100M,1K \ + ABORT,/tmp,10M,1K" +CONF_VERSION = "1" +INHERIT += "extrausers" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-z/conf/machine/ibm-z.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-z/conf/machine/ibm-z.conf new file mode 100644 index 000000000..90765bd2b --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-z/conf/machine/ibm-z.conf @@ -0,0 +1,13 @@ +MACHINE = "ibm-z" +KERNEL_DEVICETREE = "fsp2.dtb" +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 + +#dummy uboot settings +UBOOT_MACHINE_sunray2 = "mpc8308_p1m_defconfig" +UBOOT_ENTRYPOINT = "0x0" +UBOOT_LOADADDRESS = "0x0" + |