Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 23:24:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

corstone1000: set kernel_addr based on boot_idx

Browse source 
We need to distinguish between boot banks and from which
partition to load the kernel+initramfs to memory.

For that, fetch the boot index, fetch the correspondent
partition, calculate the correct kernel address and
then set the env variable kernel_addr with that value.

Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
This commit is contained in:
Rui Miguel Silva 2023-06-12 09:09:19 +01:00 committed by Tom Rini
parent bc91ca4b8b
commit 17c744c3ea
2 changed files with 56 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
board/armltd/corstone1000/corstone1000.c
View file

@ -5,16 +5,24 @@
* Rui Miguel Silva <rui.silva@linaro.org>
*/
#include <blk.h>
#include <common.h>
#include <cpu_func.h>
#include <dm.h>
#include <env.h>
#include <env.h>
#include <netdev.h>
#include <nvmxip.h>
#include <part.h>
#include <dm/platform_data/serial_pl01x.h>
#include <asm/armv8/mmu.h>
#include <asm/global_data.h>
#define CORSTONE1000_KERNEL_PARTS 2
#define CORSTONE1000_KERNEL_PRIMARY "kernel_primary"
#define CORSTONE1000_KERNEL_SECONDARY "kernel_secondary"
static int corstone1000_boot_idx;
static struct mm_region corstone1000_mem_map[] = {
{
/* CVM */
@ -103,6 +111,52 @@ void fwu_plat_get_bootidx(uint *boot_idx)
*boot_idx = CONFIG_FWU_NUM_BANKS;
log_err("corstone1000: failed to read active index\n");
}
}
int board_late_init(void)
{
struct disk_partition part_info;
struct udevice *dev, *bdev;
struct nvmxip_plat *plat;
struct blk_desc *desc;
int ret;
ret = uclass_first_device_err(UCLASS_NVMXIP, &dev);
if (ret < 0) {
log_err("Cannot find kernel device\n");
return ret;
}
plat = dev_get_plat(dev);
device_find_first_child(dev, &bdev);
desc = dev_get_uclass_plat(bdev);
ret = fwu_get_active_index(&corstone1000_boot_idx);
if (ret < 0) {
log_err("corstone1000: failed to read boot index\n");
return ret;
}
if (!corstone1000_boot_idx)
ret = part_get_info_by_name(desc, CORSTONE1000_KERNEL_PRIMARY,
&part_info);
else
ret = part_get_info_by_name(desc, CORSTONE1000_KERNEL_SECONDARY,
&part_info);
if (ret < 0) {
log_err("failed to fetch kernel partition index: %d\n",
corstone1000_boot_idx);
return ret;
}
ret = 0;
ret |= env_set_hex("kernel_addr", plat->phys_base +
(part_info.start * part_info.blksz));
ret |= env_set_hex("kernel_size", part_info.size * part_info.blksz);
if (ret < 0)
log_err("failed to setup kernel addr and size\n");
return ret;
}

1
configs/corstone1000_defconfig
View file

@ -20,6 +20,7 @@ CONFIG_CONSOLE_RECORD=y
CONFIG_LOGLEVEL=7
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_BOARD_LATE_INIT=y
CONFIG_SYS_MAXARGS=64
CONFIG_SYS_CBSIZE=512
# CONFIG_CMD_CONSOLE is not set