mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-25 22:20:45 +00:00
Merge branch '2023-06-19-corstone1000-fwu-updates' into next
To quote the author: Now that the nvmxip block driver is merged we can add on top of it the platform code to use GPT and FWU metadata in the Corstone1000. But first, push 2 fixes that are needed to make all this work: - move nvmxip header to include - setup fwu metadata structures as packed (we have a 32bit writer - Secure enclave Cortex-M0 and a 64bit reader host Cortex-A35)
This commit is contained in:
Tom Rini
commit
dd9484a828
7 changed files with 97 additions and 16 deletions
|
|
@ -38,7 +38,7 @@
|
|||
reg = <0x88200000 0x77e00000>;
|
||||
};
|
||||
|
||||
nvmxip-qspi@08000000 {
|
||||
nvmxip: nvmxip-qspi@08000000 {
|
||||
compatible = "nvmxip,qspi";
|
||||
reg = <0x08000000 0x2000000>;
|
||||
lba_shift = <9>;
|
||||
|
|
@ -106,6 +106,11 @@
|
|||
method = "smc";
|
||||
};
|
||||
|
||||
fwu-mdata {
|
||||
compatible = "u-boot,fwu-mdata-gpt";
|
||||
fwu-mdata-store = <&nvmxip>;
|
||||
};
|
||||
|
||||
soc {
|
||||
compatible = "simple-bus";
|
||||
#address-cells = <1>;
|
||||
|
|
|
|||
|
|
@ -5,14 +5,25 @@
|
|||
* Rui Miguel Silva <rui.silva@linaro.org>
|
||||
*/
|
||||
|
||||
#include <blk.h>
|
||||
#include <common.h>
|
||||
#include <cpu_func.h>
|
||||
#include <dm.h>
|
||||
#include <env.h>
|
||||
#include <fwu.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 */
|
||||
|
|
@ -87,6 +98,66 @@ int dram_init_banksize(void)
|
|||
return 0;
|
||||
}
|
||||
|
||||
void reset_cpu(void)
|
||||
void fwu_plat_get_bootidx(uint *boot_idx)
|
||||
{
|
||||
int ret;
|
||||
|
||||
/*
|
||||
* in our platform, the Secure Enclave is the one who controls
|
||||
* all the boot tries and status, so, every time we get here
|
||||
* we know that the we are booting from the active index
|
||||
*/
|
||||
ret = fwu_get_active_index(boot_idx);
|
||||
if (ret < 0) {
|
||||
*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,13 +1,5 @@
|
|||
/* SPDX-License-Identifier: GPL-2.0+ */
|
||||
|
||||
usb_pgood_delay=250
|
||||
boot_bank_flag=0x08002000
|
||||
kernel_addr_bank_0=0x083EE000
|
||||
kernel_addr_bank_1=0x0936E000
|
||||
retrieve_kernel_load_addr=
|
||||
if itest.l *${boot_bank_flag} == 0; then
|
||||
setenv kernel_addr $kernel_addr_bank_0;
|
||||
else
|
||||
setenv kernel_addr $kernel_addr_bank_1;
|
||||
fi;
|
||||
boot_bank_flag=0x08005006
|
||||
kernel_addr_r=0x88200000
|
||||
|
|
|
|||
|
|
@ -15,19 +15,25 @@ CONFIG_DISTRO_DEFAULTS=y
|
|||
CONFIG_BOOTDELAY=3
|
||||
CONFIG_USE_BOOTARGS=y
|
||||
CONFIG_BOOTARGS="console=ttyAMA0 loglevel=9 ip=dhcp earlyprintk"
|
||||
CONFIG_BOOTCOMMAND="run retrieve_kernel_load_addr; echo Loading kernel from $kernel_addr to memory ... ; loadm $kernel_addr $kernel_addr_r 0xc00000; usb start; usb reset; run distro_bootcmd; bootefi $kernel_addr_r $fdtcontroladdr;"
|
||||
CONFIG_BOOTCOMMAND="echo Loading kernel from $kernel_addr to memory ... ; loadm $kernel_addr $kernel_addr_r 0xc00000; usb start; usb reset; run distro_bootcmd; bootefi $kernel_addr_r $fdtcontroladdr;"
|
||||
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
|
||||
CONFIG_CMD_FWU_METADATA=y
|
||||
CONFIG_CMD_BOOTZ=y
|
||||
CONFIG_SYS_BOOTM_LEN=0x800000
|
||||
# CONFIG_CMD_XIMG is not set
|
||||
CONFIG_CMD_NVMXIP=y
|
||||
CONFIG_CMD_GPT=y
|
||||
# CONFIG_RANDOM_UUID is not set
|
||||
CONFIG_CMD_LOADM=y
|
||||
# CONFIG_CMD_LOADS is not set
|
||||
CONFIG_CMD_MMC=y
|
||||
CONFIG_CMD_USB=y
|
||||
# CONFIG_CMD_SETEXPR is not set
|
||||
# CONFIG_CMD_NFS is not set
|
||||
|
|
@ -39,6 +45,8 @@ CONFIG_OF_CONTROL=y
|
|||
CONFIG_VERSION_VARIABLE=y
|
||||
CONFIG_NET_RANDOM_ETHADDR=y
|
||||
CONFIG_REGMAP=y
|
||||
CONFIG_FWU_MDATA=y
|
||||
CONFIG_FWU_MDATA_GPT_BLK=y
|
||||
CONFIG_MISC=y
|
||||
# CONFIG_MMC is not set
|
||||
CONFIG_NVMXIP_QSPI=y
|
||||
|
|
@ -50,6 +58,10 @@ CONFIG_RAM=y
|
|||
CONFIG_DM_RTC=y
|
||||
CONFIG_RTC_EMULATION=y
|
||||
CONFIG_DM_SERIAL=y
|
||||
CONFIG_SYSRESET=y
|
||||
CONFIG_USB=y
|
||||
CONFIG_USB_ISP1760=y
|
||||
CONFIG_EFI_CAPSULE_ON_DISK=y
|
||||
CONFIG_EFI_IGNORE_OSINDICATIONS=y
|
||||
CONFIG_FWU_MULTI_BANK_UPDATE=y
|
||||
CONFIG_ERRNO_STR=y
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
#if !defined _FWU_MDATA_H_
|
||||
#define _FWU_MDATA_H_
|
||||
|
||||
#include <linux/compiler_attributes.h>
|
||||
#include <efi.h>
|
||||
|
||||
/**
|
||||
|
|
@ -22,7 +23,7 @@ struct fwu_image_bank_info {
|
|||
efi_guid_t image_uuid;
|
||||
uint32_t accepted;
|
||||
uint32_t reserved;
|
||||
};
|
||||
} __packed;
|
||||
|
||||
/**
|
||||
* struct fwu_image_entry - information for a particular type of image
|
||||
|
|
@ -38,7 +39,7 @@ struct fwu_image_entry {
|
|||
efi_guid_t image_type_uuid;
|
||||
efi_guid_t location_uuid;
|
||||
struct fwu_image_bank_info img_bank_info[CONFIG_FWU_NUM_BANKS];
|
||||
};
|
||||
} __packed;
|
||||
|
||||
/**
|
||||
* struct fwu_mdata - FWU metadata structure for multi-bank updates
|
||||
|
|
@ -62,6 +63,6 @@ struct fwu_mdata {
|
|||
uint32_t previous_active_index;
|
||||
|
||||
struct fwu_image_entry img_entry[CONFIG_FWU_NUM_IMAGES_PER_BANK];
|
||||
};
|
||||
} __packed;
|
||||
|
||||
#endif /* _FWU_MDATA_H_ */
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
#include <linux/bitops.h>
|
||||
#include <test/test.h>
|
||||
#include <test/ut.h>
|
||||
#include "../../drivers/mtd/nvmxip/nvmxip.h"
|
||||
#include <nvmxip.h>
|
||||
|
||||
/* NVMXIP devices described in the device tree */
|
||||
#define SANDBOX_NVMXIP_DEVICES 2
|
||||
|
|
|
|||
Loading…
Reference in a new issue