Andrew Geissler | 2daf84b | 2023-03-31 09:57:23 -0500 | [diff] [blame^] | 1 | From 7c694af3fd5de372349f740b62cd3d909483fe2e Mon Sep 17 00:00:00 2001 |
| 2 | From: Rui Miguel Silva <rui.silva@linaro.org> |
| 3 | Date: Wed, 1 Feb 2023 16:19:40 +0000 |
| 4 | Subject: [PATCH 40/43] corstone1000: add nvmxip, fwu-mdata and gpt options |
| 5 | |
| 6 | Enable the newest features: nvmxip, fwu-metadata and |
| 7 | gpt. Commands to print the partition info, gpt info |
| 8 | and fwu metadata will be available. |
| 9 | |
| 10 | Upstream-Status: Pending |
| 11 | Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org> |
| 12 | --- |
| 13 | configs/corstone1000_defconfig | 31 +++++++++++++++++++------------ |
| 14 | fs/fs.c | 5 +++++ |
| 15 | 2 files changed, 24 insertions(+), 12 deletions(-) |
| 16 | |
| 17 | diff --git a/configs/corstone1000_defconfig b/configs/corstone1000_defconfig |
| 18 | index e009faee0252..711cf13592db 100644 |
| 19 | --- a/configs/corstone1000_defconfig |
| 20 | +++ b/configs/corstone1000_defconfig |
| 21 | @@ -4,13 +4,15 @@ CONFIG_TARGET_CORSTONE1000=y |
| 22 | CONFIG_TEXT_BASE=0x80000000 |
| 23 | CONFIG_SYS_MALLOC_LEN=0x2000000 |
| 24 | CONFIG_NR_DRAM_BANKS=1 |
| 25 | +CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y |
| 26 | +CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x83f00000 |
| 27 | +CONFIG_DM_GPIO=y |
| 28 | CONFIG_DEFAULT_DEVICE_TREE="corstone1000-mps3" |
| 29 | CONFIG_SYS_PROMPT="corstone1000# " |
| 30 | CONFIG_IDENT_STRING=" corstone1000 aarch64 " |
| 31 | CONFIG_SYS_LOAD_ADDR=0x82100000 |
| 32 | +CONFIG_FWU_NUM_IMAGES_PER_BANK=4 |
| 33 | CONFIG_DISTRO_DEFAULTS=y |
| 34 | -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y |
| 35 | -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x83f00000 |
| 36 | CONFIG_FIT=y |
| 37 | CONFIG_BOOTDELAY=3 |
| 38 | CONFIG_USE_BOOTARGS=y |
| 39 | @@ -23,11 +25,16 @@ CONFIG_LOGLEVEL=7 |
| 40 | CONFIG_SYS_MAXARGS=64 |
| 41 | CONFIG_SYS_CBSIZE=512 |
| 42 | # CONFIG_CMD_CONSOLE is not set |
| 43 | +CONFIG_CMD_FWU_METADATA=y |
| 44 | CONFIG_CMD_BOOTZ=y |
| 45 | CONFIG_SYS_BOOTM_LEN=0x800000 |
| 46 | # CONFIG_CMD_XIMG is not set |
| 47 | +CONFIG_CMD_NVMXIP=y |
| 48 | +CONFIG_CMD_GPT=y |
| 49 | +# CONFIG_RANDOM_UUID is not set |
| 50 | CONFIG_CMD_LOADM=y |
| 51 | # CONFIG_CMD_LOADS is not set |
| 52 | +CONFIG_CMD_MMC=y |
| 53 | CONFIG_CMD_USB=y |
| 54 | # CONFIG_CMD_SETEXPR is not set |
| 55 | # CONFIG_CMD_NFS is not set |
| 56 | @@ -39,29 +46,29 @@ CONFIG_OF_CONTROL=y |
| 57 | CONFIG_VERSION_VARIABLE=y |
| 58 | CONFIG_NET_RANDOM_ETHADDR=y |
| 59 | CONFIG_REGMAP=y |
| 60 | -CONFIG_MISC=y |
| 61 | +CONFIG_ARM_FFA_TRANSPORT=y |
| 62 | CONFIG_CLK=y |
| 63 | -CONFIG_CMD_MMC=y |
| 64 | -CONFIG_DM_MMC=y |
| 65 | +CONFIG_FWU_MDATA=y |
| 66 | +CONFIG_FWU_MDATA_GPT_BLK=y |
| 67 | +CONFIG_MISC=y |
| 68 | CONFIG_ARM_PL180_MMCI=y |
| 69 | -CONFIG_MMC_SDHCI_ADMA_HELPERS=y |
| 70 | -CONFIG_MMC_WRITE=y |
| 71 | -CONFIG_DM_GPIO=y |
| 72 | CONFIG_PHYLIB=y |
| 73 | CONFIG_PHY_SMSC=y |
| 74 | CONFIG_SMC911X=y |
| 75 | +CONFIG_NVMXIP_QSPI=y |
| 76 | CONFIG_PHY=y |
| 77 | CONFIG_RAM=y |
| 78 | CONFIG_DM_RTC=y |
| 79 | CONFIG_RTC_EMULATION=y |
| 80 | CONFIG_DM_SERIAL=y |
| 81 | +CONFIG_SYSRESET=y |
| 82 | CONFIG_USB=y |
| 83 | CONFIG_USB_ISP1760=y |
| 84 | CONFIG_ERRNO_STR=y |
| 85 | -CONFIG_NVMXIP_QSPI=y |
| 86 | -CONFIG_CMD_NVMXIP=y |
| 87 | CONFIG_EFI_MM_COMM_TEE=y |
| 88 | -CONFIG_ARM_FFA_TRANSPORT=y |
| 89 | CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y |
| 90 | +CONFIG_EFI_CAPSULE_ON_DISK=y |
| 91 | +CONFIG_EFI_IGNORE_OSINDICATIONS=y |
| 92 | CONFIG_EFI_CAPSULE_FIRMWARE_FIT=y |
| 93 | -CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y |
| 94 | +CONFIG_FWU_MULTI_BANK_UPDATE=y |
| 95 | +# CONFIG_TOOLS_MKEFICAPSULE is not set |
| 96 | diff --git a/fs/fs.c b/fs/fs.c |
| 97 | index 8324b4a22f20..f54955a2b7f6 100644 |
| 98 | --- a/fs/fs.c |
| 99 | +++ b/fs/fs.c |
| 100 | @@ -437,11 +437,13 @@ int fs_set_blk_dev(const char *ifname, const char *dev_part_str, int fstype) |
| 101 | } |
| 102 | #endif |
| 103 | |
| 104 | + log_err("RUI: fs_set_blk_dev fstype: %d\n", fstype); |
| 105 | part = part_get_info_by_dev_and_name_or_num(ifname, dev_part_str, &fs_dev_desc, |
| 106 | &fs_partition, 1); |
| 107 | if (part < 0) |
| 108 | return -1; |
| 109 | |
| 110 | + log_err("RUI: fs_set_blk_dev 1\n"); |
| 111 | for (i = 0, info = fstypes; i < ARRAY_SIZE(fstypes); i++, info++) { |
| 112 | if (fstype != FS_TYPE_ANY && info->fstype != FS_TYPE_ANY && |
| 113 | fstype != info->fstype) |
| 114 | @@ -450,6 +452,8 @@ int fs_set_blk_dev(const char *ifname, const char *dev_part_str, int fstype) |
| 115 | if (!fs_dev_desc && !info->null_dev_desc_ok) |
| 116 | continue; |
| 117 | |
| 118 | + log_err("RUI: fs_set_blk_dev 2: info->fstype: %d part: %d\n", |
| 119 | + info->fstype, part); |
| 120 | if (!info->probe(fs_dev_desc, &fs_partition)) { |
| 121 | fs_type = info->fstype; |
| 122 | fs_dev_part = part; |
| 123 | @@ -457,6 +461,7 @@ int fs_set_blk_dev(const char *ifname, const char *dev_part_str, int fstype) |
| 124 | } |
| 125 | } |
| 126 | |
| 127 | + log_err("RUI: fs_set_blk_dev 3\n"); |
| 128 | return -1; |
| 129 | } |
| 130 | |
| 131 | -- |
| 132 | 2.39.2 |
| 133 | |