summaryrefslogtreecommitdiff
path: root/meta-phosphor
diff options
context:
space:
mode:
Diffstat (limited to 'meta-phosphor')
-rw-r--r--meta-phosphor/aspeed-layer/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend1
-rw-r--r--meta-phosphor/nuvoton-layer/recipes-bsp/u-boot/u-boot-nuvoton_%.bbappend1
-rw-r--r--meta-phosphor/recipes-bsp/u-boot/files/disable-u-boot-shell.cfg2
-rw-r--r--meta-phosphor/recipes-bsp/u-boot/u-boot-obmc.inc5
4 files changed, 9 insertions, 0 deletions
diff --git a/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend b/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend
index 452ef7ecc..6ae4b1b3b 100644
--- a/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend
+++ b/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend
@@ -1,3 +1,4 @@
FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
require u-boot-aspeed.inc
+require recipes-bsp/u-boot/u-boot-obmc.inc
diff --git a/meta-phosphor/nuvoton-layer/recipes-bsp/u-boot/u-boot-nuvoton_%.bbappend b/meta-phosphor/nuvoton-layer/recipes-bsp/u-boot/u-boot-nuvoton_%.bbappend
new file mode 100644
index 000000000..ab57dadb3
--- /dev/null
+++ b/meta-phosphor/nuvoton-layer/recipes-bsp/u-boot/u-boot-nuvoton_%.bbappend
@@ -0,0 +1 @@
+require recipes-bsp/u-boot/u-boot-obmc.inc
diff --git a/meta-phosphor/recipes-bsp/u-boot/files/disable-u-boot-shell.cfg b/meta-phosphor/recipes-bsp/u-boot/files/disable-u-boot-shell.cfg
new file mode 100644
index 000000000..8876eb271
--- /dev/null
+++ b/meta-phosphor/recipes-bsp/u-boot/files/disable-u-boot-shell.cfg
@@ -0,0 +1,2 @@
+# Setting boot delay to -2 disables entering into U-boot shell
+CONFIG_BOOTDELAY=-2
diff --git a/meta-phosphor/recipes-bsp/u-boot/u-boot-obmc.inc b/meta-phosphor/recipes-bsp/u-boot/u-boot-obmc.inc
new file mode 100644
index 000000000..47529af44
--- /dev/null
+++ b/meta-phosphor/recipes-bsp/u-boot/u-boot-obmc.inc
@@ -0,0 +1,5 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+
+SRC_URI:append = '${@bb.utils.contains_any("DISTRO_FEATURES", "disable-u-boot-shell", \
+ " file://disable-u-boot-shell.cfg", \
+ "", d)}'