aboutsummaryrefslogtreecommitdiff
path: root/boot
diff options
context:
space:
mode:
Diffstat (limited to 'boot')
-rw-r--r--boot/afboot-stm32/afboot-stm32.hash2
-rw-r--r--boot/afboot-stm32/afboot-stm32.mk4
-rw-r--r--boot/at91bootstrap3/Config.in4
-rw-r--r--boot/at91bootstrap3/at91bootstrap3.hash2
-rw-r--r--boot/barebox/Config.in4
-rw-r--r--boot/barebox/barebox.hash6
-rw-r--r--boot/mv-ddr-marvell/0001-mv_ddr-mv_ddr4_training_leveling.c-uninitialized-var.patch31
-rw-r--r--boot/opensbi/opensbi.hash2
-rw-r--r--boot/opensbi/opensbi.mk4
-rw-r--r--boot/optee-os/3.4.0/optee-os.hash4
-rw-r--r--boot/optee-os/Config.in18
-rw-r--r--boot/optee-os/optee-os.hash4
-rw-r--r--boot/optee-os/optee-os.mk11
13 files changed, 65 insertions, 31 deletions
diff --git a/boot/afboot-stm32/afboot-stm32.hash b/boot/afboot-stm32/afboot-stm32.hash
index d23b74ad21..431fbc3305 100644
--- a/boot/afboot-stm32/afboot-stm32.hash
+++ b/boot/afboot-stm32/afboot-stm32.hash
@@ -1,2 +1,2 @@
# Locally calculated
-sha256 dbd715c8b99f7d266f74a04707a4dac76b75b31321f24dee5256a6348260530c afboot-stm32-v0.1.tar.gz
+sha256 dbd715c8b99f7d266f74a04707a4dac76b75b31321f24dee5256a6348260530c afboot-stm32-0.1.tar.gz
diff --git a/boot/afboot-stm32/afboot-stm32.mk b/boot/afboot-stm32/afboot-stm32.mk
index 5e221cf364..ee17fab5ff 100644
--- a/boot/afboot-stm32/afboot-stm32.mk
+++ b/boot/afboot-stm32/afboot-stm32.mk
@@ -4,8 +4,8 @@
#
################################################################################
-AFBOOT_STM32_VERSION = v0.1
-AFBOOT_STM32_SITE = $(call github,mcoquelin-stm32,afboot-stm32,$(AFBOOT_STM32_VERSION))
+AFBOOT_STM32_VERSION = 0.1
+AFBOOT_STM32_SITE = $(call github,mcoquelin-stm32,afboot-stm32,v$(AFBOOT_STM32_VERSION))
AFBOOT_STM32_INSTALL_IMAGES = YES
AFBOOT_STM32_INSTALL_TARGET = NO
diff --git a/boot/at91bootstrap3/Config.in b/boot/at91bootstrap3/Config.in
index f6c310af23..afdc7e77ea 100644
--- a/boot/at91bootstrap3/Config.in
+++ b/boot/at91bootstrap3/Config.in
@@ -19,7 +19,7 @@ choice
prompt "AT91 Bootstrap 3 version"
config BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION
- bool "3.8.6"
+ bool "3.8.12"
config BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT
bool "Custom Git repository"
@@ -44,7 +44,7 @@ endif
config BR2_TARGET_AT91BOOTSTRAP3_VERSION
string
- default "v3.8.6" if BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION
+ default "v3.8.12" if BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION
default BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION \
if BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT
diff --git a/boot/at91bootstrap3/at91bootstrap3.hash b/boot/at91bootstrap3/at91bootstrap3.hash
index e904a46e50..cfeb9c8dc0 100644
--- a/boot/at91bootstrap3/at91bootstrap3.hash
+++ b/boot/at91bootstrap3/at91bootstrap3.hash
@@ -1,2 +1,2 @@
# Locally calculated
-sha256 a2e9ec6f42ee3b5a805fe215257b63070b6c498d57c568c46fcb18fd1b38ea7e at91bootstrap3-v3.8.6.tar.gz
+sha256 e25324b6f38725ad2ebfd946cb9e144f0d5889e2885992c7196a82b41fe45ee4 at91bootstrap3-v3.8.12.tar.gz
diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in
index 6d639e31e9..d919cacc57 100644
--- a/boot/barebox/Config.in
+++ b/boot/barebox/Config.in
@@ -12,7 +12,7 @@ choice
Select the specific Barebox version you want to use
config BR2_TARGET_BAREBOX_LATEST_VERSION
- bool "2019.04.0"
+ bool "2019.05.0"
config BR2_TARGET_BAREBOX_CUSTOM_VERSION
bool "Custom version"
@@ -40,7 +40,7 @@ endif
config BR2_TARGET_BAREBOX_VERSION
string
- default "2019.04.0" if BR2_TARGET_BAREBOX_LATEST_VERSION
+ default "2019.05.0" if BR2_TARGET_BAREBOX_LATEST_VERSION
default BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION
default "custom" if BR2_TARGET_BAREBOX_CUSTOM_TARBALL
default BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT
diff --git a/boot/barebox/barebox.hash b/boot/barebox/barebox.hash
index dfbd94fca8..fb371ab671 100644
--- a/boot/barebox/barebox.hash
+++ b/boot/barebox/barebox.hash
@@ -1,5 +1,5 @@
-# From https://www.barebox.org/download/barebox-2019.04.0.tar.bz2.md5
-md5 2d9619dfe6aaaf3b10d6327486e18571 barebox-2019.04.0.tar.bz2
+# From https://www.barebox.org/download/barebox-2019.05.0.tar.bz2.md5
+md5 2e721cce90f1ea1492710ca23680311f barebox-2019.05.0.tar.bz2
# Locally calculated
-sha256 d2834b612228b82bbaa713b26dec1fa770123bb02727400e4c56f6f2bffb01cc barebox-2019.04.0.tar.bz2
+sha256 704bb09b2bf1347e43ebb9138da32a7e1b4d13892fd187be98f4f9dae000501d barebox-2019.05.0.tar.bz2
diff --git a/boot/mv-ddr-marvell/0001-mv_ddr-mv_ddr4_training_leveling.c-uninitialized-var.patch b/boot/mv-ddr-marvell/0001-mv_ddr-mv_ddr4_training_leveling.c-uninitialized-var.patch
new file mode 100644
index 0000000000..eada18b473
--- /dev/null
+++ b/boot/mv-ddr-marvell/0001-mv_ddr-mv_ddr4_training_leveling.c-uninitialized-var.patch
@@ -0,0 +1,31 @@
+From 5867fcad6e88af3d843bfa831648d84a53732d57 Mon Sep 17 00:00:00 2001
+From: Heinrich Schuchardt <xypron.glpk@gmx.de>
+Date: Wed, 19 Dec 2018 17:17:13 +0100
+Subject: [PATCH] mv_ddr: mv_ddr4_training_leveling.c: uninitialized variable
+
+With GCC 8.2 uninitialized variables lead to a build error.
+
+Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Upstream status: commit 5867fcad6e8
+
+ mv_ddr4_training_leveling.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mv_ddr4_training_leveling.c b/mv_ddr4_training_leveling.c
+index 144e21a03c01..cb95389f5466 100644
+--- a/mv_ddr4_training_leveling.c
++++ b/mv_ddr4_training_leveling.c
+@@ -368,7 +368,7 @@ static int mv_ddr4_dynamic_pb_wl_supp(u32 dev_num, enum mv_wl_supp_mode ecc_mode
+ u32 subphy_num = ddr3_tip_dev_attr_get(dev_num, MV_ATTR_OCTET_PER_INTERFACE);
+ u8 compare_result = 0;
+ u32 orig_phase;
+- u32 rd_data, wr_data;
++ u32 rd_data, wr_data = 0;
+ u32 flag, step;
+ struct mv_ddr_topology_map *tm = mv_ddr_topology_map_get();
+ u32 ecc_phy_access_id;
+--
+2.20.1
+
diff --git a/boot/opensbi/opensbi.hash b/boot/opensbi/opensbi.hash
index 822c2dc9ce..d8449f573a 100644
--- a/boot/opensbi/opensbi.hash
+++ b/boot/opensbi/opensbi.hash
@@ -1,2 +1,2 @@
# locally computed
-sha256 07f18b73abf3b85aabe5bead19a923716c100d30eb58033459f39c3a224be300 opensbi-v0.3.tar.gz
+sha256 07f18b73abf3b85aabe5bead19a923716c100d30eb58033459f39c3a224be300 opensbi-0.3.tar.gz
diff --git a/boot/opensbi/opensbi.mk b/boot/opensbi/opensbi.mk
index b0b413abf9..45a3fc4859 100644
--- a/boot/opensbi/opensbi.mk
+++ b/boot/opensbi/opensbi.mk
@@ -4,8 +4,8 @@
#
################################################################################
-OPENSBI_VERSION = v0.3
-OPENSBI_SITE = $(call github,riscv,opensbi,$(OPENSBI_VERSION))
+OPENSBI_VERSION = 0.3
+OPENSBI_SITE = $(call github,riscv,opensbi,v$(OPENSBI_VERSION))
OPENSBI_LICENSE = BSD-2-Clause
OPENSBI_LICENSE_FILES = COPYING.BSD
OPENSBI_INSTALL_TARGET = NO
diff --git a/boot/optee-os/3.4.0/optee-os.hash b/boot/optee-os/3.4.0/optee-os.hash
deleted file mode 100644
index 07afdfac8f..0000000000
--- a/boot/optee-os/3.4.0/optee-os.hash
+++ /dev/null
@@ -1,4 +0,0 @@
-# From https://github.com/OP-TEE/optee_os/archive/3.4.0.tar.gz
-sha256 51d42ac7aa780ec8d8ee471eff689a29a7621aacace046722b1490b62ec2d481 optee-os-3.4.0.tar.gz
-# Locally computed
-sha256 fda8385993f112d7ca61b88b54ba5b4cbeec7e43a0f9b317d5186703c1985e8f LICENSE
diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in
index a1f1b910ac..bd685b58bf 100644
--- a/boot/optee-os/Config.in
+++ b/boot/optee-os/Config.in
@@ -18,7 +18,7 @@ choice
Select the version of OP-TEE OS you want to use
config BR2_TARGET_OPTEE_OS_LATEST
- bool "3.4.0"
+ bool "3.5.0"
help
Use the latest release tag from the OP-TEE OS official Git
repository.
@@ -50,7 +50,7 @@ endif
config BR2_TARGET_OPTEE_OS_VERSION
string
- default "3.4.0" if BR2_TARGET_OPTEE_OS_LATEST
+ default "3.5.0" if BR2_TARGET_OPTEE_OS_LATEST
default BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION \
if BR2_TARGET_OPTEE_OS_CUSTOM_GIT
@@ -70,16 +70,16 @@ config BR2_TARGET_OPTEE_OS_SDK
installed in the staging directory /lib/optee.
config BR2_TARGET_OPTEE_OS_SERVICES
- bool "Build service TAs"
+ bool "Build service TAs and libs"
default y
select BR2_TARGET_OPTEE_OS_CORE
help
- This option installs the service trusted applications built
- from OP-TEE OS source tree. These are installed in the target
- /lib/optee_armtz directory as other trusted applications.
- At runtime OP-TEE OS can load trusted applications from this
- non-secure filesystem/directory into the secure world for
- execution.
+ This option installs the service trusted applications and
+ trusted shared libraries built from OP-TEE OS source tree.
+ These are installed in target /lib/optee_armtz directory
+ as other trusted applications. At runtime OP-TEE OS can
+ load these from this non-secure filesystem/directory into
+ the secure world for execution.
config BR2_TARGET_OPTEE_OS_PLATFORM
string "Target platform (mandatory)"
diff --git a/boot/optee-os/optee-os.hash b/boot/optee-os/optee-os.hash
new file mode 100644
index 0000000000..1c8f5d6b31
--- /dev/null
+++ b/boot/optee-os/optee-os.hash
@@ -0,0 +1,4 @@
+# From https://github.com/OP-TEE/optee_os/archive/3.5.0.tar.gz
+sha256 a02fe8e7fdee9653e9207059071735a839b1255fdaf311a2a6cfd185a4cee6a2 optee-os-3.5.0.tar.gz
+# Locally computed
+sha256 1247ee90858f4037b6cac63cbffddfed435d0d73c631b37d78c1e6e6ab3e5d1a LICENSE
diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk
index 6da20a9f3e..bd415512c7 100644
--- a/boot/optee-os/optee-os.mk
+++ b/boot/optee-os/optee-os.mk
@@ -75,10 +75,13 @@ endef
endif # BR2_TARGET_OPTEE_OS_CORE
ifeq ($(BR2_TARGET_OPTEE_OS_SERVICES),y)
-define OPTEE_OS_INSTALL_IMAGES_SERVICES
- mkdir -p $(TARGET_DIR)/lib/optee_armtz
- $(INSTALL) -D -m 444 -t $(TARGET_DIR)/lib/optee_armtz \
- $(@D)/$(OPTEE_OS_BUILDDIR_OUT)/ta/*/*.ta
+define OPTEE_OS_INSTALL_TARGET_CMDS
+ $(if $(wildcard $(@D)/$(OPTEE_OS_BUILDDIR_OUT)/ta/*/*.ta),
+ $(INSTALL) -D -m 444 -t $(TARGET_DIR)/lib/optee_armtz \
+ $(@D)/$(OPTEE_OS_BUILDDIR_OUT)/ta/*/*.ta)
+ $(if $(wildcard $(@D)/$(OPTEE_OS_LOCAL_SDK)/lib/*.ta),
+ $(INSTALL) -D -m 444 -t $(TARGET_DIR)/lib/optee_armtz \
+ $(@D)/$(OPTEE_OS_LOCAL_SDK)/lib/*.ta)
endef
endif # BR2_TARGET_OPTEE_OS_SERVICES