summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorRyan Harkin <ryan.harkin@linaro.org>2015-10-09 17:18:06 +0100
committerTom Rini <trini@konsulko.com>2015-10-11 17:12:05 -0400
commit4a6bdb59e1b33b62fce79c417b0ecc958408fec8 (patch)
tree418a6a1f322e7c030fffd953360ac4c275b01e3e /include
parent6607d397c2a5ecd2fe7c940331da29692bab671e (diff)
downloadu-boot-imx-4a6bdb59e1b33b62fce79c417b0ecc958408fec8.zip
u-boot-imx-4a6bdb59e1b33b62fce79c417b0ecc958408fec8.tar.gz
u-boot-imx-4a6bdb59e1b33b62fce79c417b0ecc958408fec8.tar.bz2
vexpress64: juno: add optional initrd
Some OS images require an initrd on Juno. If the file ramdisk.img exists in NOR flash, then we load it and pass the address to the kernel. Otherwise, we pass the "-" parameter as before. Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org> Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'include')
-rw-r--r--include/configs/vexpress_aemv8a.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h
index f9fa2ce..99dd8b6 100644
--- a/include/configs/vexpress_aemv8a.h
+++ b/include/configs/vexpress_aemv8a.h
@@ -189,6 +189,8 @@
#define CONFIG_EXTRA_ENV_SETTINGS \
"kernel_name=Image\0" \
"kernel_addr=0x80000000\0" \
+ "initrd_name=ramdisk.img\0" \
+ "initrd_addr=0x84000000\0" \
"fdt_name=juno\0" \
"fdt_addr=0x83000000\0" \
"fdt_high=0xffffffffffffffff\0" \
@@ -207,7 +209,12 @@
#define CONFIG_BOOTCOMMAND "afs load ${kernel_name} ${kernel_addr} ; " \
"afs load ${fdt_name} ${fdt_addr} ; " \
"fdt addr ${fdt_addr}; fdt resize; " \
- "booti ${kernel_addr} - ${fdt_addr}"
+ "if afs load ${initrd_name} ${initrd_addr} ; "\
+ "then "\
+ " setenv initrd_param ${initrd_addr}; "\
+ " else setenv initrd_param -; "\
+ "fi ; " \
+ "booti ${kernel_addr} ${initrd_param} ${fdt_addr}"
#define CONFIG_BOOTDELAY 1