[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 6/9] hw/xtensa/xtfpga: add memory info to bootparam
From: |
Max Filippov |
Subject: |
[Qemu-devel] [PATCH 6/9] hw/xtensa/xtfpga: add memory info to bootparam |
Date: |
Mon, 23 Jun 2014 20:12:53 +0400 |
Signed-off-by: Max Filippov <address@hidden>
---
hw/xtensa/bootparam.h | 9 +++++++++
hw/xtensa/xtfpga.c | 9 ++++++++-
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/hw/xtensa/bootparam.h b/hw/xtensa/bootparam.h
index e839bee..955f4e8 100644
--- a/hw/xtensa/bootparam.h
+++ b/hw/xtensa/bootparam.h
@@ -16,6 +16,15 @@ typedef struct BpTag {
uint16_t size;
} BpTag;
+typedef struct BpMemInfo {
+ uint32_t type;
+ uint32_t start;
+ uint32_t end;
+} BpMemInfo;
+
+#define MEMORY_TYPE_CONVENTIONAL 0x1000
+#define MEMORY_TYPE_NONE 0x2000
+
static inline size_t get_tag_size(size_t data_size)
{
return data_size + sizeof(BpTag) + 4;
diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c
index 689d078..97e5842 100644
--- a/hw/xtensa/xtfpga.c
+++ b/hw/xtensa/xtfpga.c
@@ -237,9 +237,14 @@ static void lx_init(const LxBoardDesc *board, MachineState
*machine)
/* Use presence of kernel file name as 'boot from SRAM' switch. */
if (kernel_filename) {
- size_t bp_size = 2 * get_tag_size(0);
+ size_t bp_size = 3 * get_tag_size(0); /* first/last and memory tags */
uint32_t tagptr = 0xfe000000 + board->sram_size;
uint32_t cur_tagptr;
+ BpMemInfo memory_location = {
+ .type = tswap32(MEMORY_TYPE_CONVENTIONAL),
+ .start = tswap32(0),
+ .end = tswap32(machine->ram_size),
+ };
rom = g_malloc(sizeof(*rom));
memory_region_init_ram(rom, NULL, "lx60.sram", board->sram_size);
@@ -253,6 +258,8 @@ static void lx_init(const LxBoardDesc *board, MachineState
*machine)
/* Put kernel bootparameters to the end of that SRAM */
tagptr = (tagptr - bp_size) & ~0xff;
cur_tagptr = put_tag(tagptr, BP_TAG_FIRST, 0, NULL);
+ cur_tagptr = put_tag(cur_tagptr, BP_TAG_MEMORY,
+ sizeof(memory_location), &memory_location);
if (kernel_cmdline) {
cur_tagptr = put_tag(cur_tagptr, BP_TAG_COMMAND_LINE,
--
1.8.1.4
- [Qemu-devel] [PATCH 0/9] target-xtensa: linux booting improvements, Max Filippov, 2014/06/23
- [Qemu-devel] [PATCH 1/9] hw/xtensa: remove extraneous xtensa_ prefix from file names, Max Filippov, 2014/06/23
- [Qemu-devel] [PATCH 5/9] hw/xtensa/xtfpga: refactor bootparameters filling, Max Filippov, 2014/06/23
- [Qemu-devel] [PATCH 2/9] hw/xtensa: replace fprintfs with error_report, Max Filippov, 2014/06/23
- [Qemu-devel] [PATCH 3/9] hw/xtensa/xtfpga: retrieve parameters from machine_opts, Max Filippov, 2014/06/23
- [Qemu-devel] [PATCH 4/9] hw/xtensa/xtfpga: use symbolic constants for bootparam tags, Max Filippov, 2014/06/23
- [Qemu-devel] [PATCH 7/9] hw/xtensa/xtfpga: implement uImage loading, Max Filippov, 2014/06/23
- [Qemu-devel] [PATCH 8/9] hw/xtensa/xtfpga: implement DTB loading, Max Filippov, 2014/06/23
- [Qemu-devel] [PATCH 6/9] hw/xtensa/xtfpga: add memory info to bootparam,
Max Filippov <=
- [Qemu-devel] [PATCH 9/9] hw/xtensa/xtfpga: implement initrd loading, Max Filippov, 2014/06/23