From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:59939) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RqQHa-0008Ia-UQ for qemu-devel@nongnu.org; Thu, 26 Jan 2012 09:26:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RqQHY-0001m3-N9 for qemu-devel@nongnu.org; Thu, 26 Jan 2012 09:26:34 -0500 Received: from mnementh.archaic.org.uk ([81.2.115.146]:35864) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RqQHY-0001kF-FW for qemu-devel@nongnu.org; Thu, 26 Jan 2012 09:26:32 -0500 From: Peter Maydell Date: Thu, 26 Jan 2012 14:02:19 +0000 Message-Id: <1327586540-7746-5-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1327586540-7746-1-git-send-email-peter.maydell@linaro.org> References: <1327586540-7746-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH 4/5] arm_boot: support board IDs more than 16 bits wide List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: qemu-devel@nongnu.org Support passing a board ID value to the kernel in r1 that is more than 16 bits wide. This is needed to pass the '-1 == invalid' value for boards which only support device tree booting. Signed-off-by: Peter Maydell Tested-by: Mark Langsdorf --- hw/arm_boot.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/hw/arm_boot.c b/hw/arm_boot.c index 35ca22f..5f163fd 100644 --- a/hw/arm_boot.c +++ b/hw/arm_boot.c @@ -20,10 +20,10 @@ /* The worlds second smallest bootloader. Set r0-r2, then jump to kernel. */ static uint32_t bootloader[] = { 0xe3a00000, /* mov r0, #0 */ - 0xe3a01000, /* mov r1, #0x?? */ - 0xe3811c00, /* orr r1, r1, #0x??00 */ - 0xe59f2000, /* ldr r2, [pc, #0] */ - 0xe59ff000, /* ldr pc, [pc, #0] */ + 0xe59f1004, /* ldr r1, [pc, #4] */ + 0xe59f2004, /* ldr r2, [pc, #4] */ + 0xe59ff004, /* ldr pc, [pc, #4] */ + 0, /* Board ID */ 0, /* Address of kernel args. Set by integratorcp_init. */ 0 /* Kernel entry point. Set by integratorcp_init. */ }; @@ -301,8 +301,7 @@ void arm_load_kernel(CPUState *env, struct arm_boot_info *info) } else { initrd_size = 0; } - bootloader[1] |= info->board_id & 0xff; - bootloader[2] |= (info->board_id >> 8) & 0xff; + bootloader[4] = info->board_id; bootloader[5] = info->loader_start + KERNEL_ARGS_ADDR; bootloader[6] = entry; for (n = 0; n < sizeof(bootloader) / 4; n++) { -- 1.7.1