summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2020-10-19 09:29:05 -0400
committerTom Rini <trini@konsulko.com>2020-10-19 09:29:05 -0400
commit7ec87e4192215815b658c3f8b34e4be010103149 (patch)
treee3236ed54452a5efa60a2081038a480fa8d480bf /include
parente3e9bfab46cf61f9a7cd64145faf74be3466a8c3 (diff)
parentdc470834a1ea50749c19ebac2c34e0edb898ab18 (diff)
downloadu-boot-7ec87e4192215815b658c3f8b34e4be010103149.tar.gz
u-boot-7ec87e4192215815b658c3f8b34e4be010103149.tar.xz
u-boot-7ec87e4192215815b658c3f8b34e4be010103149.zip
Merge tag 'u-boot-atmel-2021.01-b' of https://gitlab.denx.de/u-boot/custodians/u-boot-atmel
Second set of u-boot-atmel features for 2021.01 cycle: This feature set brings the rework of the clock tree for sam9x60 SoC. This makes the clock tree fully compatible with Common Clock Framework and allows full clock configuration in U-Boot. This means that the sam9x60 boards can boot now using U-Boot. This also includes the definitions for sam9x60 SiPs and a divisor fix for the clock on sama7g5 SoC.
Diffstat (limited to 'include')
-rw-r--r--include/configs/sam9x60ek.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/configs/sam9x60ek.h b/include/configs/sam9x60ek.h
index 19714402ca..6a6f1de41d 100644
--- a/include/configs/sam9x60ek.h
+++ b/include/configs/sam9x60ek.h
@@ -40,7 +40,8 @@
#define CONFIG_SYS_SDRAM_SIZE 0x10000000 /* 256 megs */
#define CONFIG_SYS_INIT_SP_ADDR \
- (CONFIG_SYS_SDRAM_BASE + 16 * 1024 - GENERATED_GBL_DATA_SIZE)
+ (CONFIG_SYS_SDRAM_BASE + 16 * 1024 + CONFIG_SYS_MALLOC_F_LEN - \
+ GENERATED_GBL_DATA_SIZE)
/* NAND flash */
#ifdef CONFIG_CMD_NAND