Skip to content

Commit da1ffb9

Browse files
committed
yosemite4: Initial commit for meta-yosemite4n
Summary: - Add the meta-yosemite4n layer for Nuvoton management board. This is a Linux Foundation-based machine and already upstream. - Add a u-boot patch for factory memory testing purpose. - Add kernel driver patches that are still under upstream review. - cpld-fw-handler: enable the update-ebr-init Test Plan: bitbake yosemite4n-image - Build Pass Signed-off-by: Marvin Lin <[email protected]> Signed-off-by: Joseph Liu <[email protected]>
1 parent 21edc27 commit da1ffb9

File tree

47 files changed

+11075
-1
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+11075
-1
lines changed
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
FILESEXTRAPATHS:prepend := "${THISDIR}/6.6:"
2+
3+
LINUX_NUVOTON_PATCHES_INC ?= ""
4+
LINUX_NUVOTON_PATCHES_INC:openbmc-fb-lf = "linux-patches-6.6.inc"
5+
6+
include ${LINUX_NUVOTON_PATCHES_INC}
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# We have a conf and classes directory, add to BBPATH
2+
BBPATH .= ":${LAYERDIR}"
3+
4+
# We have recipes-* directories, add to BBFILES
5+
BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
6+
${LAYERDIR}/recipes-*/*/*.bbappend"
7+
8+
# Ignore bbappend related to ASPEED in meta-yosemite4
9+
BBMASK += ".*aspeed.*\.bbappend"
10+
11+
BBFILE_COLLECTIONS += "fb-yosemite4n-layer"
12+
BBFILE_PATTERN_fb-yosemite4n-layer := "^${LAYERDIR}/"
13+
LAYERVERSION_fb-yosemite4n-layer = "1"
14+
LAYERSERIES_COMPAT_fb-yosemite4n-layer = "scarthgap nanbield kirkstone"

meta-facebook/meta-yosemite4/meta-yosemite4n/conf/machine/yosemite4n.conf

Whitespace-only changes.
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
2+
# changes incompatibly
3+
LCONF_VERSION = "8"
4+
5+
BBPATH = "${TOPDIR}"
6+
BBFILES ?= ""
7+
8+
BBLAYERS ?= " \
9+
##OEROOT##/meta \
10+
##OEROOT##/meta-openembedded/meta-oe \
11+
##OEROOT##/meta-openembedded/meta-networking \
12+
##OEROOT##/meta-openembedded/meta-python \
13+
##OEROOT##/meta-security/meta-tpm \
14+
##OEROOT##/meta-phosphor \
15+
##OEROOT##/meta-arm/meta-arm \
16+
##OEROOT##/meta-arm/meta-arm-toolchain \
17+
##OEROOT##/meta-nuvoton \
18+
##OEROOT##/meta-facebook \
19+
##OEROOT##/meta-facebook/meta-yosemite4 \
20+
##OEROOT##/meta-facebook/meta-yosemite4/meta-yosemite4n \
21+
##OEROOT##/../.. \
22+
##OEROOT##/../../meta-facebook \
23+
##OEROOT##/../../meta-facebook/meta-yosemite4 \
24+
##OEROOT##/../../meta-facebook/meta-yosemite4/meta-yosemite4n \
25+
"
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Common targets are:
2+
yosemite4n-image
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#
2+
# Local configuration file for building the OpenBMC image.
3+
#
4+
MACHINE ??= "yosemite4n"
5+
DISTRO ?= "openbmc-fb-lf"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
From fd6c1631c9075161df703e7928063f4acf498113 Mon Sep 17 00:00:00 2001
2+
From: RickyWu-wiwynn <[email protected]>
3+
Date: Mon, 8 Apr 2024 18:07:34 +0800
4+
Subject: [PATCH] cmd: mem: set test result of mtest to enviroment variable
5+
6+
---
7+
cmd/mem.c | 16 ++++++++++++++++
8+
1 file changed, 16 insertions(+)
9+
10+
diff --git a/cmd/mem.c b/cmd/mem.c
11+
index 5f4e865462..4dee413fea 100644
12+
--- a/cmd/mem.c
13+
+++ b/cmd/mem.c
14+
@@ -1204,6 +1204,15 @@ static ulong mem_test_quick(vu_long *buf, ulong start_addr, ulong end_addr,
15+
static int do_mem_mtest(struct cmd_tbl *cmdtp, int flag, int argc,
16+
char *const argv[])
17+
{
18+
+ char *is_done;
19+
+ is_done = env_get("memtest_result");
20+
+ if (is_done != NULL) {
21+
+ env_set("memtest_result", "");
22+
+ env_set("preboot", "");
23+
+ env_save();
24+
+ return 0;
25+
+ }
26+
+
27+
ulong start, end;
28+
vu_long scratch_space;
29+
vu_long *buf, *dummy = &scratch_space;
30+
@@ -1273,6 +1282,13 @@ static int do_mem_mtest(struct cmd_tbl *cmdtp, int flag, int argc,
31+
32+
printf("\nTested %d iteration(s) with %lu errors.\n", iteration, count);
33+
34+
+ if (errs == 0) {
35+
+ env_set("memtest_result", "pass");
36+
+ } else {
37+
+ env_set("memtest_result", "fail");
38+
+ }
39+
+ env_save();
40+
+
41+
return errs != 0;
42+
}
43+
#endif /* CONFIG_CMD_MEMTEST */
44+
--
45+
2.25.1
46+
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
2+
3+
SRC_URI:append = " file://0003-cmd-mem-set-test-result-of-mtest-to-enviroment-varia.patch"
4+
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
require recipes-core/images/yosemite4-image.bb
2+
3+
IMAGE_INSTALL:remove = " packagegroup-openbmc-tests2"
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
EXTRA_OEMESON:append = " -Dupdate-ebr-init=enabled"
2+

0 commit comments

Comments
 (0)