corstone1000: set kernel_addr based on boot_idx

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>

diff --git a/board/armltd/corstone1000/corstone1000.c b/board/armltd/corstone1000/corstone1000.c
index 1bead7a0a8b43ece59e8f9b6ac8e0c8abf30627d..a4567449f1be99a0ea17573d4d8fa27752f8e6c8 100644 (file)
--- a/board/armltd/corstone1000/corstone1000.c
+++ b/board/armltd/corstone1000/corstone1000.c
@@ -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;
 }

diff --git a/configs/corstone1000_defconfig b/configs/corstone1000_defconfig
index 2d391048cd67c4480c965987176ff066145c0eef..5be5335bdfc192e66dd13c35d2820c61d34a7904 100644 (file)
--- a/configs/corstone1000_defconfig
+++ b/configs/corstone1000_defconfig
@@ -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