diff options
| author | Tom Rini <[email protected]> | 2021-06-23 08:45:09 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-06-23 08:45:09 -0400 |
| commit | 6fc0a2f76bc285dc4bc80f55452311385e6c3d57 (patch) | |
| tree | aa741bbc7cb8e0208b7e21c870fdc39f9ca99ae6 /include | |
| parent | 1ce892cb1ce970d8ee6ffcecc22351c84e67fca4 (diff) | |
| parent | b2710faf82998d7be9e4eef554063a5e27e88ec9 (diff) | |
Merge branch '2021-06-22-assorted-fixes'
- Assorted minor bugfixes
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/socfpga_soc64_common.h | 1 | ||||
| -rw-r--r-- | include/malloc.h | 9 |
2 files changed, 5 insertions, 5 deletions
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 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 [email protected] + 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 [email protected] * 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? |