diff options
author | Aidan MacDonald <amachronic@protonmail.com> | 2021-04-15 03:00:04 +0100 |
---|---|---|
committer | Aidan MacDonald <amachronic@protonmail.com> | 2021-04-17 20:24:07 +0000 |
commit | 01d1eb425874813864d12d72c93e6e74ab92ac1f (patch) | |
tree | e4bc6171342e1ef4160b2e32653f5668f9be3d69 /firmware/target/mips/ingenic_x1000/spl-x1000.c | |
parent | e123c5d2f27e9efbef8b4264f1576e4e10ba7b82 (diff) | |
download | rockbox-01d1eb425874813864d12d72c93e6e74ab92ac1f.tar.gz rockbox-01d1eb425874813864d12d72c93e6e74ab92ac1f.zip |
FiiO M3K/X1000: Do system clock initialization in the SPL
Initializing the clocks in the SPL brings Rockbox in line with
how the FiiO M3K's original SPL works. It's likely other X1000
devices do this too.
There was a logic error in the previous setup: the code falsely
assumed that DDR memory would always be running from MPLL, but
it would be switched to APLL by the bootloader. Rockbox would
then try to re-init APLL, albeit with the same parameters. Maybe
this was the cause of the boot hang on some units.
Change-Id: I64064585e491bbdf1e95fe9428c91a9314f2a917
Diffstat (limited to 'firmware/target/mips/ingenic_x1000/spl-x1000.c')
-rw-r--r-- | firmware/target/mips/ingenic_x1000/spl-x1000.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/firmware/target/mips/ingenic_x1000/spl-x1000.c b/firmware/target/mips/ingenic_x1000/spl-x1000.c index 59e0fb687d..e6d87066b5 100644 --- a/firmware/target/mips/ingenic_x1000/spl-x1000.c +++ b/firmware/target/mips/ingenic_x1000/spl-x1000.c | |||
@@ -279,7 +279,8 @@ void main(void) | |||
279 | if(nandread(opt->nand_addr, opt->nand_size, (void*)opt->load_addr)) | 279 | if(nandread(opt->nand_addr, opt->nand_size, (void*)opt->load_addr)) |
280 | spl_error(); | 280 | spl_error(); |
281 | 281 | ||
282 | /* TODO: implement dual boot */ | 282 | /* Let target handle necessary pre-boot setup */ |
283 | spl_handle_pre_boot(option); | ||
283 | 284 | ||
284 | /* Reading the Linux command line from the bootloader is handled by | 285 | /* Reading the Linux command line from the bootloader is handled by |
285 | * arch/mips/xburst/core/prom.c -- see Ingenic kernel sources. | 286 | * arch/mips/xburst/core/prom.c -- see Ingenic kernel sources. |