summaryrefslogtreecommitdiff
path: root/meta-ibm/meta-witherspoon/conf
AgeCommit message (Collapse)AuthorFilesLines
2019-09-17Add Mihawk mac address syncAlvin Wang1-1/+4
(From meta-ibm rev: effd83bdc65d9ae8f9d000205f8d55e0c29557e4) Change-Id: I5d8fb1cd15e0b0bf2c2360631be8f259f42be98f Signed-off-by: Alvin Wang <alvinwang@msn.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-09-14meta-ibm: add tacoma systemBrad Bishop1-0/+24
The tacoma card is a boxelder replacement (witherspoon bmc card) with an ast2600 on it. By default use core-image-minimal as the initramfs. To add the full OpenBMC userspace set INITRAMFS_IMAGE="obmc-phosphor-image" in local.conf. Build instructions: TEMPLATECONF=meta-ibm/meta-witherspoon/conf . oe-init-build-env MACHINE=witherspoon-tacoma DISTRO=openbmc-openpower bitbake aspeed-image-norootfs (From meta-ibm rev: 77e917a89fd591bdc614aab362138f563460a316) Change-Id: I75374dbb3a01a66b2c70d96e56587a818262ebf8 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-09-10meta-ibm: Enable mac2 on mihawk platformBen_Pai1-0/+1
Since mihawk has share and dedicated two ports, so use two mac addresses. Tested:Use ip a command to see two mac addresses (From meta-ibm rev: ed92ee6fa8847511fbf2049e02ef3f8f0d7a7c70) Signed-off-by: Ben Pai <Ben_Pai@wistron.com> Change-Id: I43b3b78f7efd7e339e91bdc356283f6b9ffe1a5c Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-08-16witherspoon: Bump MRW versionAndrew Geissler1-1/+1
Pick up new IPMI clear sensor (From meta-ibm rev: 033ecca0a4321aba8000fd289c43aa38721255b2) Change-Id: I5c42bad754157bcae47463a1e8d6c0d1993e45d8 Signed-off-by: Andrew Geissler <geissonator@yahoo.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-08-14Add mihawk platform to meta-ibmBen_Pai2-0/+39
The contents of this up-stream include the following items 1.Basic function 2.Led settings 3.GPIO monitor (id button and power supply) 4.Linux dts patch. (From meta-ibm rev: c53430a2234917b71f29d7e61d6aea749c45a2fc) Change-Id: Id0e47fd9197c8b2a70cbc94888bd572255664cdd Signed-off-by: Ben Pai <Ben_Pai@wistron.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-07-26Update swift mrw to latest versionAndrew Geissler1-1/+1
A lot of cleanup of IPMI sensors in this update (From meta-ibm rev: e80fecfd67ea850b6dba5af303e97ad7f8896ea6) Change-Id: Icd26b566002bf34b09b936300e89cd1a8fa4b9a5 Signed-off-by: Andrew Geissler <geissonator@yahoo.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-07-24meta-ibm: add ibm-ac-server MACHINEOVERRIDEBrad Bishop1-0/+3
As of today the IBM(witherspoon) layer supports three of IBMs "Acclerated Compute" class of systems: witherspoon, witherspoon-128 and swift. Most of the bbappends are required for all three. Prior to this patch this was handled by bbappending without any override. This is counter to best practices and pollutes the metadata for layer users using recipes from meta-witherspoon. Add a new ibm-ac-server MACHINEOVERRIDE so that bbappends that work on all of IBM's AC systems can be overridden appropriately without having to explicitly list every system. (From meta-ibm rev: b770d19fc3e9774a1ad80be55b2f986d02847c26) Change-Id: I69ae41fa80612d1c019f031a02e32c01580b7939 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-07-24meta-ibm: witherspoon-128: MACHINEOVERRIDES fixupBrad Bishop1-1/+1
The ordering of the values in MACHINEOVERRIDES is wrong: MACHINEOVERRIDES="witherspoon-128:witherspoon" This means that: FOO_witherspoon = "bar" will override: FOO_witherspoon-128 = "baz" which is the opposite of expectation. The ordering is a function of config file include order and choice of the predot vs postdot operator. Use the same include ordering and dot operators as meta-fsl-arm to get the overrides to appear in MACHINEOVERRIDES in the correct order such that the expected semantics are provided and: FOO_witherspoon-128 = "bar" will override: FOO_witherspoon = "baz" (From meta-ibm rev: a12ff8392546591d8b52927da983dd76d2c0f1bd) Change-Id: I823e236bd0147cc058052d85778b522e74fabb28 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-07-23meta-ibm: local.conf.sample: add other machinesBrad Bishop1-0/+2
Do what poky does and add a (commented out) MACHINE entry for each supported machine. MACHINE=witherspoon remains the default. This makes is clear to anyone looking at local.conf.sample what machines are supported by the layer. (From meta-ibm rev: 275e64f3c4b4b6c6b84985f8000c3def18d1da0d) Change-Id: I83bd116e137aa9380a95abe5069f1a9c21df6983 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-06-11swift.conf: Build an ext4 imageAdriana Kobylak1-0/+2
Build an ext4 image for swift to be used in its eMMC chip. Tested: An ext4 image was built in addition to the current ubi ones. (From meta-ibm rev: 59bef037b63a73626434bfbfa22e1a53ca7133cd) Change-Id: I102b821754e2dd4998797f29bb935bd69324e8a3 Signed-off-by: Adriana Kobylak <anoo@us.ibm.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-06-04Swift: Bump MRW versionMatt Spinler1-1/+1
Pick up a change that assigns types to the panel and VRM cards so gen_openpower_fru.pl can find them when looking for VPD. (From meta-ibm rev: 318efca67822aa625b6868bcb08508e7695c5bf3) Signed-off-by: Matt Spinler <spinler@us.ibm.com> Change-Id: I26537326fb1fe0e653d3c7c470710c8a93cafb5e Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-05-29witherspoon-128: Use ${MACHINE} for device tree file nameAdriana Kobylak1-1/+1
Replace "witherspoon-128" with ${MACHINE} for the device tree file name as it's better practice to use bitbake variables instead of hard-coding values. Tested: Output of "bitbake obmc-phosphor-image -e": # pre-expansion value: # "${KMACHINE}-bmc-opp-${MACHINE}.dtb" KERNEL_DEVICETREE="aspeed-bmc-opp-witherspoon-128.dtb" (From meta-ibm rev: 8bbd213225ea5d6e3d1eb8537308f398dc85b6a2) Change-Id: I46e72947ddf47d3cbc20ab04f2b949ee717423cf Signed-off-by: Adriana Kobylak <anoo@us.ibm.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-05-29swift: Point to swift's kernel device treeAdriana Kobylak1-3/+1
The kernel device tree for swift has been merged upstream. Tested: Output of "bitbake obmc-phosphor-image -e": # pre-expansion value: # "${KMACHINE}-bmc-opp-${MACHINE}.dtb" KERNEL_DEVICETREE="aspeed-bmc-opp-swift.dtb" (From meta-ibm rev: b652e467727899419334e6bf8b5b63e3a4150b56) Change-Id: Ib7f4063234d1412bdbeb01044947d92c75df704e Signed-off-by: Adriana Kobylak <anoo@us.ibm.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-05-23swift: Increase read-write volume to 32MBAdriana Kobylak1-0/+5
Swift will be using UBI for its filesystem. Since it has 128MB flash chips, increase the size of the read-write volume to 32MB, same as witherspoon-128. (From meta-ibm rev: af07bab16662383dbf01ed4b7fae5083e66ae357) Change-Id: I631c69791e67f29903ae1e2377fc4414f33a0317 Signed-off-by: Adriana Kobylak <anoo@us.ibm.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-05-22meta-ibm: witherspoon: fans: drop unused variableBrad Bishop1-1/+0
meta-phosphor dropped support for native class config recipes and uses target class config recipes by default. Drop the reference to PHOSPHOR_FAN_CONFIG_USE_NATIVE_SYSROOT as it is no longer used in meta-phosphor. (From meta-ibm rev: bed9adaf6d89aa2ac42b91c06e4ee4be4e17c40e) Change-Id: I3cd896636924a59ecebd0eb25cad261f1bc070ab Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-05-21meta-ibm: witherspoon: fans: switch to non-nativeBrad Bishop1-2/+3
meta-phosphor recently enabled target class config recipes. Those are preferable to native class config recipes because native recipes cannot be overridden based on MACHINE, so switch to target class config recipes. Switching to target class recipes consists of temporarily setting PHOSPHOR_FAN_CONFIG_USE_NATIVE_SYSROOT to 0, overriding the phosphor distro default of 1. After all OpenBMC BSP layers have moved to target class config recipes PHOSPHOR_FAN_CONFIG_USE_NATIVE_SYSROOT can be removed from meta-phosphor and any BSP layers. Any references to -native recipes are replaced with their target class counterparts. Any -native bbappends are re-worked to apply to their target class counterparts. Finally, use BPN instead of PN when setting FILESEXTRAPATHS, to avoid unfortunate directory hierarchies if these bbappends are copy/pasted and then used to bbappend a native recipe. Since this patch moves to target class recipes, this is a noop; however, this avoids unfortunate directory hierarchies with native bbappends such as: meta-base/recipes-foo/bar/baz-native.bb meta-base/recipes-foo/bar/baz/a-file meta-append/recipes-foo/bar/baz-native.bbappend meta-append/recipes-foo/bar/baz-native/b-file Using "${THISDIR}/${BPN}:" enables a more sensible hierarchy: meta-base/recipes-foo/bar/baz-native.bb meta-base/recipes-foo/bar/baz/a-file meta-append/recipes-foo/bar/baz-native.bbappend meta-append/recipes-foo/bar/baz/b-file This behavior occurs because By default FILESPATH is set in base.bbclass (in OE-Core) to look for files in ${BP}, ${BPN} and files (and a number of subdirectories of those based on ${FILESOVERRIDES}). (From meta-ibm rev: 6587e6ca03ca50411bc11cf87b5e11971dfe343f) Change-Id: Ib2c3f0052c1e01a84416da2eb868a54d8810e750 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-05-10witherspoon-128: Add witherspoon MACHINEOVERRIDESAdriana Kobylak1-0/+1
The witherspoon and witherspoon-128 machines are mostly the same. Add "witherspoon" as a MACHINEOVERRIDES to witherspoon-128 so that machine-specific features that apply only to witherspoon, including file paths, can be added to both flavors of witherspoon automatically. Tested: Built witherspoon and witherspoon-128, flashed images on HW and verified witherspoon powered on. (From meta-ibm rev: 6f44bb26247289aa46c6d21f04617838e596294a) Change-Id: I18ce6dd799cb0ab52b37f1f1f3d64c6189af4cd8 Signed-off-by: Adriana Kobylak <anoo@us.ibm.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-05-09meta-witherspoon: layer.conf: set BBFILE_PATTERNBrad Bishop1-1/+1
Bitbake uses this regex to associate recipes and bbappends from BBFILES (which contains recipes and bbappends from -all- layers listed in bblayers.conf) to this layer. The association is then used to map the BBFILE_PRIORITY value for this layer onto the recipes provided by this layer. BBFILE_PRIORITY is used to determine which recipe to use when the same recipe appears in multiple layers. Without BBFILE_PATTERN set, recipes in this layer will get a default priority and not the priority specified in BBFILE_PRIORITY. This layer doesn't set a priority anyway, so functionally this patch is a noop but it is an improvement from a correctness standpoint, and it makes a warning go away: WARNING: No bb files matched BBFILE_PATTERN_foo-layer (From meta-ibm rev: ef6380a81fbd701b1052c12c8163498ba4e2de89) Change-Id: I1f4ab259befb094983df056c0f0f81cf8dc6f2e3 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-04-26Point to the real Swift MRWMatt Spinler1-3/+2
Tested: The image builds. The generated files look like a good start at least. (From meta-ibm rev: affeacabade12b73a4e009c7dd15d1f261db8528) Change-Id: Id80835c09cde4e6b61d40634406c3fa0e3752097 Signed-off-by: Matt Spinler <spinler@us.ibm.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-04-25meta-swift: Initial commitAdriana Kobylak1-0/+14
Create a new machine for Swift, a POWER9 system. It is initially based on Witherspoon but with 128MB NOR flash chips. - To build this machine: export MACHINE="swift"; \ export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE MACHINE"; \ bitbake obmc-phosphor-image (From meta-ibm rev: 12b1187ecfcf7d6438cb026d09f2c1b7c6e06cbc) Change-Id: I304ae026e1b2e027776981865b3f483d0898000f Signed-off-by: Adriana Kobylak <anoo@us.ibm.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-04-25witherspoon-128: Initial commitAdriana Kobylak1-0/+13
Create a machine/witherspoon-128.conf file to model a witherspoon system with 128MB flash chips. * New kernel device tree (witherspoon-128.dts). * Bigger read-write filesystem. Remove the default from the witherspoon layer (not needed as 6MB is the default) so that the size value can be overwritten by the witherspoon-128.conf. - To build this machine: export MACHINE="witherspoon-128"; \ export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE MACHINE"; \ bitbake obmc-phosphor-image Witherspoon-128 is a system based on Witherspoon but with 128MB flash chips. Create a device tree for this configuration. Since this system is just a bringup vehicle, the device tree will be carried as a patch instead of merging it in upstream linux. (From meta-ibm rev: 903fd3532aaa967ddc7124095304f50cd4c9557c) Change-Id: If02e8ad32fc2bff336d16c18513f2c238b28c28a Signed-off-by: Adriana Kobylak <anoo@us.ibm.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-04-07meta-ibm: remove phosphor-isolation from witherspoon and romulusLei YU1-1/+0
The distro feature phosphor-isolation is added into openbmc-openpower distro feature and becomes common for all openpower machines. So remove them from meta-witherspoon and meta-romulus. This shall be merged after the commit of adding phosphor-isolation in openbmc-openpower is merged. Tested: Verify the Romulus build picks phosphor-isolation distro feature (From meta-ibm rev: 90f4ccb72200c26d13d3bbd70b6eb7cd90c3dff7) Change-Id: I8e64bee92eaa7c69928399ceedec6f889a713156 Signed-off-by: Lei YU <mine260309@gmail.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-04-05meta-ibm: layer.conf: Add warrior compatibilityBrad Bishop1-1/+1
oe-core branched in preparation for the upcoming 2.7 Yocto release and as of 13e45ff requires core layer compatibility to "warrior" instead of "thud". We'll retain compatibility for both until we do our own branch or stop testing thud. (From meta-ibm rev: 97893b2c0bf39cfaee58ccfc4f85249f9a1d8abf) Change-Id: I2e772add384637011a80acf52861b88ac71be98b Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-02-06ibm: remove useless ibm.inc configuration fileBrad Bishop1-1/+1
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>
2019-02-05ibm: remove meta-webserver from bblayers.confBrad Bishop1-2/+0
With the recent move to bmcweb we don't need meta-webserver anymore. (From meta-ibm rev: a5231caf14dd78aa451621644bb60069eea17009) Change-Id: I92f760321d38f99e651e3a6ae4d689f0bfb337ff Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-01-10meta-witherspoon: Disable unnecessary hardware featuresAndrew Jeffery1-0/+1
(From meta-ibm rev: 3beaf3a6fad2bcd231eccc7c4a602c3627fac1de) Change-Id: Ifb877562ada116ce4012a7e314600e975c5e36c2 Signed-off-by: Andrew Jeffery <andrew@aj.id.au> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-01-09reset upstream subtrees to yocto 2.6Brad Bishop1-1/+1
Reset the following subtrees on thud HEAD: poky: 87e3a9739d meta-openembedded: 6094ae18c8 meta-security: 31dc4e7532 meta-raspberrypi: a48743dc36 meta-xilinx: c42016e2e6 Also re-apply backports that didn't make it into thud: poky: 17726d0 systemd-systemctl-native: handle Install wildcards meta-openembedded: 4321a5d libtinyxml2: update to 7.0.1 042f0a3 libcereal: Add native and nativesdk classes e23284f libcereal: Allow empty package 030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG 179a1b9 gtest: update to 1.8.1 Squashed OpenBMC subtree compatibility updates: meta-aspeed: Brad Bishop (1): aspeed: add yocto 2.6 compatibility meta-ibm: Brad Bishop (1): ibm: prepare for yocto 2.6 meta-ingrasys: Brad Bishop (1): ingrasys: set layer compatibility to yocto 2.6 meta-openpower: Brad Bishop (1): openpower: set layer compatibility to yocto 2.6 meta-phosphor: Brad Bishop (3): phosphor: set layer compatibility to thud phosphor: libgpg-error: drop patches phosphor: react to fitimage artifact rename Ed Tanous (4): Dropbear: upgrade options for latest upgrade yocto2.6: update openssl options busybox: remove upstream watchdog patch systemd: Rebase CONFIG_CGROUP_BPF patch Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-01-05witherspoon-xml: srcrev bump 6ca015dbd3..e76c2fc5aeMarri Devender Rao1-1/+1
To pull patches for TPM 1.Adding in Enumerator and FRU ID for TPM (From meta-ibm rev: 03df54000c9265b3b1a136422f00c9a2e9e31b72) Change-Id: I0e9cfcd4eb018875237ea423fbd760b78e44a7c2 Signed-off-by: Marri Devender Rao <devenrao@in.ibm.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2018-12-18ibm: remove setting root pw from local.confBrad Bishop1-4/+0
With meta-phosphor commit fd1f696f99 this is done by the distro configuration; so, no need to do it in local.conf. (From meta-ibm rev: 0525b1723095b6c47af7892ca90f328f92270815) Change-Id: I6fdbf055b24adf768efdd86132faa7f1fffc56f9 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2018-11-20ibm: Remove unused meta-poky layerBrad Bishop1-2/+0
The meta-poky layer is unused. Remove from the layer configuration. (From meta-ibm rev: 7bafd24c1b15a87e25c5386236527c863908121f) Change-Id: Ia589ac6a06af433e8af8cb858ec1a91af962768b Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2018-11-09meta-ibm: witherspoon: set mrw licensePatrick Venture1-0/+2
Set the license fields for the machine-readable-workbook. (From meta-ibm rev: 8983438cf78c7ef9c2df1dc22aaf4db1e5980c4e) Change-Id: I1d511e6c0c5c575df5f422d8d80e8c9ad9e52f05 Signed-off-by: Patrick Venture <venture@google.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2018-09-27witherspoon: Require openbmc-openpower configurationAndrew Jeffery1-2/+1
This avoids some redundancy, and Witherspoon is an OpenPOWER platform after-all. (From meta-ibm rev: 2d4ab95b7464f35d84af49c10e3da153f77b8901) Change-Id: Iabde073c0118a3423c1f880aa848ddeba79e48b5 Signed-off-by: Andrew Jeffery <andrew@aj.id.au> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2018-09-26phosphor-ipmi-config: Refactor phosphor-ipmi-config providerTom Joseph1-5/+0
The phopshor-ipmi-config provider witherspoon-ipmi-config is removed to use the default configuration files. cipher_list.json and dcmi_cap.json for the witherspoon is the same as the default configuration file. dcmi_sensors.json, dev_id.json and power_reading.json is specific to witherspoon. do_patch populates the aux field in dev_id.json for witherspoon. (From meta-ibm rev: 5e794ec57243fd8aced04118d8f9fc90a5bbd3a4) Change-Id: Icd355780524b6104f89390dbe0017d2c667e963c Signed-off-by: Tom Joseph <tomjoseph@in.ibm.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2018-09-24meta-ibm: Rename bb file collectionsBrad Bishop1-3/+3
Typical upstream layers have a -layer suffix. Rename collections from foo to foo-layer to match this de-facto standard. Some existing layers that use this convention include: openembedded-layer networking-layer perl-layer virtualization-layer (From meta-ibm rev: 32478afb0f68ba711b816d1dbaecf379c67cc928) Change-Id: I5c22956cf289263d5cef1e3c1babb2d1f5a10a3d Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2018-09-10phosphor-tiny: Enable tiny distro on witherspoonAndrew Geissler1-0/+1
Witherspoon is flash space constrained so enable new tiny distro feature to help alleviate this (From meta-ibm rev: 49f2b5b31a21eb3dea2d83d2d13551475ef4bb27) Change-Id: Ia3e90281d4c5da1c95cddb1b802f20c614b25885 Signed-off-by: Andrew Geissler <geissonator@yahoo.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2018-08-23[Subtree] Bring openbmc machines to top levelDave Cobbley6-0/+106
The new subtree model brings the subtrees up from the openbmc-machines layer. Change-Id: I58a03ae1be374bc79ae1438e65e888375d12d0c0 Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>