aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Anderson <seanga2@gmail.com>2021-04-08 22:13:10 -0400
committerLeo Yu-Chi Liang <ycliang@andestech.com>2021-05-14 16:20:49 +0800
commit23058052de302af1e5fcc0c22a8dea97b25d61cd (patch)
tree84d9e8fe2b4beaa1084e0c466c8802b6c94977e4
parent2eebe5b373ffa14671279cdeae1d1eedbfd2b9fb (diff)
downloadu-boot-23058052de302af1e5fcc0c22a8dea97b25d61cd.zip
u-boot-23058052de302af1e5fcc0c22a8dea97b25d61cd.tar.gz
u-boot-23058052de302af1e5fcc0c22a8dea97b25d61cd.tar.bz2
riscv: Enable AI ram on K210
We just need to initialize all the clocks pre-reloc. The clock driver creates a bunch of devices, so we need to increase the pre-reloc malloc arena. Signed-off-by: Sean Anderson <seanga2@gmail.com>
-rw-r--r--board/sipeed/maix/maix.c12
-rw-r--r--configs/sipeed_maix_bitm_defconfig2
-rw-r--r--include/configs/sipeed-maix.h3
3 files changed, 14 insertions, 3 deletions
diff --git a/board/sipeed/maix/maix.c b/board/sipeed/maix/maix.c
index cbcb23c..6e58291 100644
--- a/board/sipeed/maix/maix.c
+++ b/board/sipeed/maix/maix.c
@@ -14,7 +14,7 @@ phys_size_t get_effective_memsize(void)
return CONFIG_SYS_SDRAM_SIZE;
}
-int board_init(void)
+static int sram_init(void)
{
int ret, i;
const char * const banks[] = { "sram0", "sram1", "airam" };
@@ -39,3 +39,13 @@ int board_init(void)
return 0;
}
+
+int board_early_init_f(void)
+{
+ return sram_init();
+}
+
+int board_init(void)
+{
+ return 0;
+}
diff --git a/configs/sipeed_maix_bitm_defconfig b/configs/sipeed_maix_bitm_defconfig
index 210848c..bd877cd 100644
--- a/configs/sipeed_maix_bitm_defconfig
+++ b/configs/sipeed_maix_bitm_defconfig
@@ -1,4 +1,5 @@
CONFIG_RISCV=y
+CONFIG_SYS_MALLOC_F_LEN=0x10000
CONFIG_ENV_SIZE=0x1000
CONFIG_ENV_OFFSET=0xfff000
CONFIG_ENV_SECT_SIZE=0x1000
@@ -7,6 +8,7 @@ CONFIG_ARCH_RV64I=y
CONFIG_STACK_SIZE=0x100000
CONFIG_USE_BOOTCOMMAND=y
CONFIG_BOOTCOMMAND="run k210_bootcmd"
+CONFIG_BOARD_EARLY_INIT_F=y
CONFIG_HUSH_PARSER=y
CONFIG_MTDIDS_DEFAULT="nor0=spi3:0"
CONFIG_MTDPARTS_DEFAULT="nor0:1M(u-boot),0x1000@0xfff000(env)"
diff --git a/include/configs/sipeed-maix.h b/include/configs/sipeed-maix.h
index 4c1ff98..0fbe8a5 100644
--- a/include/configs/sipeed-maix.h
+++ b/include/configs/sipeed-maix.h
@@ -15,8 +15,7 @@
#define CONFIG_SYS_CACHELINE_SIZE 64
#define CONFIG_SYS_SDRAM_BASE 0x80000000
-/* Don't relocate into AI ram since it isn't set up yet */
-#define CONFIG_SYS_SDRAM_SIZE (SZ_4M + SZ_2M)
+#define CONFIG_SYS_SDRAM_SIZE SZ_8M
#ifndef CONFIG_EXTRA_ENV_SETTINGS
#define CONFIG_EXTRA_ENV_SETTINGS \