From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43703) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wz6sI-00032X-Je for qemu-devel@nongnu.org; Mon, 23 Jun 2014 12:13:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wz6s9-0001kO-1H for qemu-devel@nongnu.org; Mon, 23 Jun 2014 12:13:42 -0400 Received: from mail-lb0-x232.google.com ([2a00:1450:4010:c04::232]:53980) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wz6s8-0001kD-PK for qemu-devel@nongnu.org; Mon, 23 Jun 2014 12:13:32 -0400 Received: by mail-lb0-f178.google.com with SMTP id 10so4831245lbg.37 for ; Mon, 23 Jun 2014 09:13:31 -0700 (PDT) From: Max Filippov Date: Mon, 23 Jun 2014 20:12:51 +0400 Message-Id: <1403539976-22581-5-git-send-email-jcmvbkbc@gmail.com> In-Reply-To: <1403539976-22581-1-git-send-email-jcmvbkbc@gmail.com> References: <1403539976-22581-1-git-send-email-jcmvbkbc@gmail.com> Subject: [Qemu-devel] [PATCH 4/9] hw/xtensa/xtfpga: use symbolic constants for bootparam tags List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Max Filippov , Waldemar Brodkorb Import bootparam tag names from linux/arch/xtensa/include/asm/bootparam.h No functional changes. Signed-off-by: Max Filippov --- hw/xtensa/bootparam.h | 10 ++++++++++ hw/xtensa/xtfpga.c | 6 +++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/hw/xtensa/bootparam.h b/hw/xtensa/bootparam.h index 38ef32b..e6cf3b1 100644 --- a/hw/xtensa/bootparam.h +++ b/hw/xtensa/bootparam.h @@ -1,6 +1,16 @@ #ifndef HW_XTENSA_BOOTPARAM #define HW_XTENSA_BOOTPARAM +#define BP_TAG_COMMAND_LINE 0x1001 /* command line (0-terminated string)*/ +#define BP_TAG_INITRD 0x1002 /* ramdisk addr and size (bp_meminfo) */ +#define BP_TAG_MEMORY 0x1003 /* memory addr and size (bp_meminfo) */ +#define BP_TAG_SERIAL_BAUDRATE 0x1004 /* baud rate of current console. */ +#define BP_TAG_SERIAL_PORT 0x1005 /* serial device of current console */ +#define BP_TAG_FDT 0x1006 /* flat device tree addr */ + +#define BP_TAG_FIRST 0x7B0B /* first tag with a version number */ +#define BP_TAG_LAST 0x7E0B /* last tag */ + typedef struct BpTag { uint16_t tag; uint16_t size; diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c index 0aa3eeb..6d070b0 100644 --- a/hw/xtensa/xtfpga.c +++ b/hw/xtensa/xtfpga.c @@ -250,12 +250,12 @@ static void lx_init(const LxBoardDesc *board, MachineState *machine) env->regs[2] = tagptr; - tagptr = put_tag(tagptr, 0x7b0b, 0, NULL); + tagptr = put_tag(tagptr, BP_TAG_FIRST, 0, NULL); if (cmdline_size > 1) { - tagptr = put_tag(tagptr, 0x1001, + tagptr = put_tag(tagptr, BP_TAG_COMMAND_LINE, cmdline_size, kernel_cmdline); } - tagptr = put_tag(tagptr, 0x7e0b, 0, NULL); + tagptr = put_tag(tagptr, BP_TAG_LAST, 0, NULL); } uint64_t elf_entry; uint64_t elf_lowaddr; -- 1.8.1.4