mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-24 21:54:01 +00:00
vexpress64: juno: add default NOR flash boot
This modifies the vexpress64 Juno configuration so that it will by default load and boot a kernel and a device tree from the images stored in the NOR flash. When we are at it, also define the proper command line for the Juno and indicate that the USB stick (/dev/sda1) is the default root file system. Reviewed-by: Tom Rini <trini@konsulko.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
parent
4bb6650632
commit
10d1491b3d
1 changed files with 29 additions and 1 deletions
|
@ -198,7 +198,34 @@
|
|||
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
|
||||
|
||||
/* Initial environment variables */
|
||||
#ifdef CONFIG_TARGET_VEXPRESS64_BASE_FVP
|
||||
#ifdef CONFIG_TARGET_VEXPRESS64_JUNO
|
||||
/*
|
||||
* Defines where the kernel and FDT exist in NOR flash and where it will
|
||||
* be copied into DRAM
|
||||
*/
|
||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||
"kernel_name=Image\0" \
|
||||
"kernel_addr=0x80000000\0" \
|
||||
"fdt_name=juno\0" \
|
||||
"fdt_addr=0x83000000\0" \
|
||||
"fdt_high=0xffffffffffffffff\0" \
|
||||
"initrd_high=0xffffffffffffffff\0" \
|
||||
|
||||
/* Assume we boot with root on the first partition of a USB stick */
|
||||
#define CONFIG_BOOTARGS "console=ttyAMA0,115200n8 " \
|
||||
"root=/dev/sda1 rw " \
|
||||
"earlyprintk=pl011,0x7ff80000 debug user_debug=31 "\
|
||||
"loglevel=9"
|
||||
|
||||
/* Copy the kernel and FDT to DRAM memory and boot */
|
||||
#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}"
|
||||
|
||||
#define CONFIG_BOOTDELAY 1
|
||||
|
||||
#elif CONFIG_TARGET_VEXPRESS64_BASE_FVP
|
||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||
"kernel_name=uImage\0" \
|
||||
"kernel_addr=0x80000000\0" \
|
||||
|
@ -246,6 +273,7 @@
|
|||
#define CONFIG_SYS_NO_FLASH
|
||||
#else
|
||||
#define CONFIG_CMD_FLASH
|
||||
#define CONFIG_CMD_ARMFLASH
|
||||
#define CONFIG_SYS_FLASH_CFI 1
|
||||
#define CONFIG_FLASH_CFI_DRIVER 1
|
||||
#define CONFIG_SYS_FLASH_BASE 0x08000000
|
||||
|
|
Loading…
Reference in a new issue