From 5ad9220bf7b54d958627dd8a0475a44c5a238f0a Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Sat, 29 May 2021 13:18:00 +0200 Subject: malloc: add SPDX license identifiers The original code is in the public domain. Licenses/README states that the general license for U-Boot is GPL 2.0+. So we can mark the malloc code as GPL 2.0+ too. Signed-off-by: Heinrich Schuchardt --- include/malloc.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/malloc.h b/include/malloc.h index 024b18be00e..1fbaf3755c7 100644 --- a/include/malloc.h +++ b/include/malloc.h @@ -1,12 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* - A version of malloc/free/realloc written by Doug Lea and released to the - public domain. Send questions/comments/complaints/performance data - to dl@cs.oswego.edu + This code is based on a version of malloc/free/realloc written by Doug Lea and + released to the public domain. Send questions/comments/complaints/performance + data to dl@cs.oswego.edu * VERSION 2.6.6 Sun Mar 5 19:10:03 2000 Doug Lea (dl at gee) Note: There may be an updated version of this malloc obtainable at - ftp://g.oswego.edu/pub/misc/malloc.c + http://g.oswego.edu/pub/misc/malloc.c Check before installing! * Why use this malloc? -- cgit v1.2.3 From 640e2cd6d4335bd1ec39d284cc913c3b90d608f0 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 3 Jun 2021 09:39:01 -0400 Subject: socfpga64: Do not define CONFIG_SYS_MEM_RESERVE_SECURE to 0 Based on the comment in socfpga_soc64_common.h, the intention is for CONFIG_SYS_MEM_RESERVE_SECURE to be unused. However, in the code we do: ... and that will evaluate to true. This leads to unwanted code being compiled. Further, as CONFIG_SYS_MEM_RESERVE_SECURE has not been migrated to Kconfig, this leads to a mismatch in the size of gd depending on if we have or have not also had also included yet. Remove the define as it's not needed. Cc: Siew Chin Lim Cc: Chee Hong Ang Cc: Dalon Westergreen Signed-off-by: Tom Rini --- include/configs/socfpga_soc64_common.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include') diff --git a/include/configs/socfpga_soc64_common.h b/include/configs/socfpga_soc64_common.h index 5afdb104543..38fd775b5b6 100644 --- a/include/configs/socfpga_soc64_common.h +++ b/include/configs/socfpga_soc64_common.h @@ -21,7 +21,6 @@ /* sysmgr.boot_scratch_cold4 & 5 (64bit) will be used for PSCI_CPU_ON call */ #define CPU_RELEASE_ADDR 0xFFD12210 #define CONFIG_SYS_CACHELINE_SIZE 64 -#define CONFIG_SYS_MEM_RESERVE_SECURE 0 /* using OCRAM, not DDR */ /* * U-Boot console configurations -- cgit v1.2.3