diff mbox

[6/9] hw/xtensa/xtfpga: add memory info to bootparam

Message ID 1403539976-22581-7-git-send-email-jcmvbkbc@gmail.com
State New
Headers show

Commit Message

Max Filippov June 23, 2014, 4:12 p.m. UTC 
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
---
 hw/xtensa/bootparam.h | 9 +++++++++
 hw/xtensa/xtfpga.c    | 9 ++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)
diff mbox

Patch

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,