aboutsummaryrefslogtreecommitdiff
path: root/boot/Config.in
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <peter@korsgaard.com>2019-03-05 10:59:38 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2019-03-05 10:59:38 +0100
commitda49312af9e0c3e7f6df50e7d6f77e1fa2921b7a (patch)
tree4831ddfa987ac9181b59f82e587af5ad6ed3a70f /boot/Config.in
parentd29ec62899ed7fafefd0a3fddee61683648421fa (diff)
parente675e9a0473f39b60ab66d94a61ac9c077ed438f (diff)
downloadbuildroot-da49312af9e0c3e7f6df50e7d6f77e1fa2921b7a.tar.gz
buildroot-da49312af9e0c3e7f6df50e7d6f77e1fa2921b7a.tar.bz2
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'boot/Config.in')
-rw-r--r--boot/Config.in1
1 files changed, 1 insertions, 0 deletions
diff --git a/boot/Config.in b/boot/Config.in
index 11856fd9c7..74481e7545 100644
--- a/boot/Config.in
+++ b/boot/Config.in
@@ -13,6 +13,7 @@ source "boot/gummiboot/Config.in"
source "boot/lpc32xxcdl/Config.in"
source "boot/mv-ddr-marvell/Config.in"
source "boot/mxs-bootlets/Config.in"
+source "boot/optee-os/Config.in"
source "boot/riscv-pk/Config.in"
source "boot/s500-bootloader/Config.in"
source "boot/shim/Config.in"