mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-30 00:20:44 +09:00
ARM: uniphier: set {kernel, ramdisk, fdt}_addr_r at boot-time
The base of DRAM will be changed for the next generation SoC. The addresses needed for booting the kernel should be shifted according to the DRAM base. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
parent
7095678787
commit
2ce6b82d34
@ -139,5 +139,9 @@ int board_late_init(void)
|
|||||||
|
|
||||||
uniphier_set_env_addr("loadaddr", "loadaddr_offset");
|
uniphier_set_env_addr("loadaddr", "loadaddr_offset");
|
||||||
|
|
||||||
|
uniphier_set_env_addr("kernel_addr_r", "kernel_addr_r_offset");
|
||||||
|
uniphier_set_env_addr("ramdisk_addr_r", "ramdisk_addr_r_offset");
|
||||||
|
uniphier_set_env_addr("fdt_addr_r", "fdt_addr_r_offset");
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -121,8 +121,8 @@
|
|||||||
|
|
||||||
#ifdef CONFIG_FIT
|
#ifdef CONFIG_FIT
|
||||||
#define CONFIG_BOOTFILE "fitImage"
|
#define CONFIG_BOOTFILE "fitImage"
|
||||||
|
#define KERNEL_ADDR_R_OFFSET "0x05100000"
|
||||||
#define LINUXBOOT_ENV_SETTINGS \
|
#define LINUXBOOT_ENV_SETTINGS \
|
||||||
"kernel_addr_r=0x85100000\0" \
|
|
||||||
"tftpboot=tftpboot $kernel_addr_r $bootfile &&" \
|
"tftpboot=tftpboot $kernel_addr_r $bootfile &&" \
|
||||||
"bootm $kernel_addr_r\0" \
|
"bootm $kernel_addr_r\0" \
|
||||||
"__nfsboot=run tftpboot\0"
|
"__nfsboot=run tftpboot\0"
|
||||||
@ -130,17 +130,13 @@
|
|||||||
#ifdef CONFIG_ARM64
|
#ifdef CONFIG_ARM64
|
||||||
#define CONFIG_BOOTFILE "Image"
|
#define CONFIG_BOOTFILE "Image"
|
||||||
#define LINUXBOOT_CMD "booti"
|
#define LINUXBOOT_CMD "booti"
|
||||||
#define KERNEL_ADDR_R "kernel_addr_r=0x82080000\0"
|
#define KERNEL_ADDR_R_OFFSET "0x02080000"
|
||||||
#else
|
#else
|
||||||
#define CONFIG_BOOTFILE "zImage"
|
#define CONFIG_BOOTFILE "zImage"
|
||||||
#define LINUXBOOT_CMD "bootz"
|
#define LINUXBOOT_CMD "bootz"
|
||||||
#define KERNEL_ADDR_R "kernel_addr_r=0x80208000\0"
|
#define KERNEL_ADDR_R_OFFSET "0x00208000"
|
||||||
#endif
|
#endif
|
||||||
#define LINUXBOOT_ENV_SETTINGS \
|
#define LINUXBOOT_ENV_SETTINGS \
|
||||||
"fdt_addr_r=0x85100000\0" \
|
|
||||||
KERNEL_ADDR_R \
|
|
||||||
"ramdisk_addr_r=0x86000000\0" \
|
|
||||||
"ramdisk_file=rootfs.cpio.gz\0" \
|
|
||||||
"boot_common=setexpr bootm_low $kernel_addr_r '&' fe000000 && " \
|
"boot_common=setexpr bootm_low $kernel_addr_r '&' fe000000 && " \
|
||||||
LINUXBOOT_CMD " $kernel_addr_r $ramdisk_addr_r $fdt_addr_r\0" \
|
LINUXBOOT_CMD " $kernel_addr_r $ramdisk_addr_r $fdt_addr_r\0" \
|
||||||
"tftpboot=tftpboot $kernel_addr_r $bootfile && " \
|
"tftpboot=tftpboot $kernel_addr_r $bootfile && " \
|
||||||
@ -155,6 +151,10 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||||
|
"fdt_addr_r_offset=0x05100000\0" \
|
||||||
|
"kernel_addr_r_offset=" KERNEL_ADDR_R_OFFSET "\0" \
|
||||||
|
"ramdisk_addr_r_offset=0x06000000\0" \
|
||||||
|
"ramdisk_file=rootfs.cpio.gz\0" \
|
||||||
"netdev=eth0\0" \
|
"netdev=eth0\0" \
|
||||||
"initrd_high=0xffffffffffffffff\0" \
|
"initrd_high=0xffffffffffffffff\0" \
|
||||||
"loadaddr_offset=0x05000000\0" \
|
"loadaddr_offset=0x05000000\0" \
|
||||||
|
Loading…
Reference in New Issue
Block a user