|
 |
383d26 |
From 186549785eab7b0b7ac1063b942a317c80867766 Mon Sep 17 00:00:00 2001
|
|
|
383d26 |
From: Markus Armbruster <armbru@redhat.com>
|
|
|
383d26 |
Date: Fri, 17 May 2019 06:51:01 +0200
|
|
|
383d26 |
Subject: [PATCH 34/53] mips_malta: Delete disabled, broken DEBUG_BOARD_INIT
|
|
|
383d26 |
code
|
|
|
383d26 |
MIME-Version: 1.0
|
|
|
383d26 |
Content-Type: text/plain; charset=UTF-8
|
|
|
383d26 |
Content-Transfer-Encoding: 8bit
|
|
|
383d26 |
|
|
|
383d26 |
RH-Author: Markus Armbruster <armbru@redhat.com>
|
|
|
383d26 |
Message-id: <20190517065120.12028-13-armbru@redhat.com>
|
|
|
383d26 |
Patchwork-id: 88001
|
|
|
383d26 |
O-Subject: [RHEL-7.7 qemu-kvm-rhev PATCH v3 12/31] mips_malta: Delete disabled, broken DEBUG_BOARD_INIT code
|
|
|
383d26 |
Bugzilla: 1624009
|
|
|
383d26 |
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
383d26 |
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
383d26 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
383d26 |
|
|
|
383d26 |
The debug code under DEBUG_BOARD_INIT doesn't compile:
|
|
|
383d26 |
|
|
|
383d26 |
hw/mips/mips_malta.c:1273:16: error: implicit declaration of function ‘blk_name’; did you mean ‘basename’? [-Werror=implicit-function-declaration]
|
|
|
383d26 |
blk_name(dinfo->bdrv), fl_sectors);
|
|
|
383d26 |
^~~~~~~~
|
|
|
383d26 |
hw/mips/mips_malta.c:1273:16: error: nested extern declaration of ‘blk_name’ [-Werror=nested-externs]
|
|
|
383d26 |
hw/mips/mips_malta.c:1273:30: error: ‘DriveInfo’ {aka ‘struct DriveInfo’} has no member named ‘bdrv’
|
|
|
383d26 |
blk_name(dinfo->bdrv), fl_sectors);
|
|
|
383d26 |
^~
|
|
|
383d26 |
|
|
|
383d26 |
Delete it.
|
|
|
383d26 |
|
|
|
383d26 |
Reported-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
383d26 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
|
|
|
383d26 |
Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com>
|
|
|
383d26 |
Message-Id: <20190308094610.21210-11-armbru@redhat.com>
|
|
|
383d26 |
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
|
|
|
383d26 |
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
383d26 |
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
383d26 |
(cherry picked from commit 5a4abb197b2ee8e6c545a8ec6e0bf9ca4e470127)
|
|
|
383d26 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
383d26 |
---
|
|
|
383d26 |
hw/mips/mips_malta.c | 10 ----------
|
|
|
383d26 |
1 file changed, 10 deletions(-)
|
|
|
383d26 |
|
|
|
383d26 |
diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
|
|
|
383d26 |
index 88fd7d6..7f19bdc 100644
|
|
|
383d26 |
--- a/hw/mips/mips_malta.c
|
|
|
383d26 |
+++ b/hw/mips/mips_malta.c
|
|
|
383d26 |
@@ -58,8 +58,6 @@
|
|
|
383d26 |
#include "exec/semihost.h"
|
|
|
383d26 |
#include "hw/mips/cps.h"
|
|
|
383d26 |
|
|
|
383d26 |
-//#define DEBUG_BOARD_INIT
|
|
|
383d26 |
-
|
|
|
383d26 |
#define ENVP_ADDR 0x80002000l
|
|
|
383d26 |
#define ENVP_NB_ENTRIES 16
|
|
|
383d26 |
#define ENVP_ENTRY_SIZE 256
|
|
|
383d26 |
@@ -1066,14 +1064,6 @@ void mips_malta_init(MachineState *machine)
|
|
|
383d26 |
|
|
|
383d26 |
/* Load firmware in flash / BIOS. */
|
|
|
383d26 |
dinfo = drive_get(IF_PFLASH, 0, fl_idx);
|
|
|
383d26 |
-#ifdef DEBUG_BOARD_INIT
|
|
|
383d26 |
- if (dinfo) {
|
|
|
383d26 |
- printf("Register parallel flash %d size " TARGET_FMT_lx " at "
|
|
|
383d26 |
- "addr %08llx '%s' %x\n",
|
|
|
383d26 |
- fl_idx, bios_size, FLASH_ADDRESS,
|
|
|
383d26 |
- blk_name(dinfo->bdrv), fl_sectors);
|
|
|
383d26 |
- }
|
|
|
383d26 |
-#endif
|
|
|
383d26 |
fl = pflash_cfi01_register(FLASH_ADDRESS, NULL, "mips_malta.bios",
|
|
|
383d26 |
BIOS_SIZE,
|
|
|
383d26 |
dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
|
|
|
383d26 |
--
|
|
|
383d26 |
1.8.3.1
|
|
|
383d26 |
|