[18/30] hw/microblaze: use the BYTE-based definitions

Message ID	20180215042900.16078-19-f4bug@amsat.org
State	New
Headers	show Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <f4bug@amsat.org> To: qemu-devel@nongnu.org Date: Thu, 15 Feb 2018 01:28:48 -0300 Message-Id: <20180215042900.16078-19-f4bug@amsat.org> In-Reply-To: <20180215042900.16078-1-f4bug@amsat.org> References: <20180215042900.16078-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH 18/30] hw/microblaze: use the BYTE-based definitions Precedence: list Cc: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= <f4bug@amsat.org> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>
Series	hw: use the BYTE-based definitions when useful \| expand [00/30] hw: use the BYTE-based definitions when useful [01/30] util/cutils: extract byte-based definitions into a new header: "qemu/cunits.h" [02/30] hw: include "qemu/cunits.h" and clean unused "qemu/cutils.h" [03/30] hw/block/nvme: include the "qemu/cutils.h" in the source file [04/30] hw/lm32/milkymist: remove unused include [05/30] hw/mips/r4k: constify params_size [06/30] hw/mips: use the BYTE-based definitions [07/30] hw/arm: use the BYTE-based definitions [08/30] hw/i386: use the BYTE-based definitions [09/30] hw/sparc: use the BYTE-based definitions [10/30] hw/ppc: use the BYTE-based definitions [11/30] hw/s390x: use the BYTE-based definitions [12/30] hw/hppa: use the BYTE-based definitions [13/30] hw/xtensa: use the BYTE-based definitions [14/30] hw/alpha: use the BYTE-based definitions [15/30] hw/lm32: use the BYTE-based definitions [16/30] hw/sh4: use the BYTE-based definitions [17/30] hw/tricore: use the BYTE-based definitions [18/30] hw/microblaze: use the BYTE-based definitions [19/30] hw/nios2: use the BYTE-based definitions [20/30] hw/cris: use the BYTE-based definitions [21/30] hw/misc: use the BYTE-based definitions [22/30] hw/display: use the BYTE-based definitions [23/30] hw/net: use the BYTE-based definitions [24/30] hw/ipack: use the BYTE-based definitions [25/30] hw/scsi: use the BYTE-based definitions [26/30] hw/smbios: use the BYTE-based definitions [27/30] vfio/pci: use the BYTE-based definitions [28/30] ivshmem: use the BYTE-based definitions [29/30] tpm: use the BYTE-based definitions [30/30] xen: use the BYTE-based definitions

Message ID

20180215042900.16078-19-f4bug@amsat.org

State

New

Headers

From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <f4bug@amsat.org>
To: qemu-devel@nongnu.org
Date: Thu, 15 Feb 2018 01:28:48 -0300
Message-Id: <20180215042900.16078-19-f4bug@amsat.org>
In-Reply-To: <20180215042900.16078-1-f4bug@amsat.org>
References: <20180215042900.16078-1-f4bug@amsat.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [Qemu-devel] [PATCH 18/30] hw/microblaze: use the BYTE-based
	definitions
Precedence: list
Cc: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, =?utf-8?q?Philippe_Mat?=
	=?utf-8?q?hieu-Daud=C3=A9?= <f4bug@amsat.org>
Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org
Sender: "Qemu-devel"
	<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>

Series

hw: use the BYTE-based definitions when useful | expand

Commit Message

Philippe Mathieu-Daudé Feb. 15, 2018, 4:28 a.m. UTC

It ease code review, unit is explicit.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/microblaze/petalogix_ml605_mmu.c      | 6 +++---
 hw/microblaze/petalogix_s3adsp1800_mmu.c | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c
index b664dc0f9c..d2b316fcba 100644
--- a/hw/microblaze/petalogix_ml605_mmu.c
+++ b/hw/microblaze/petalogix_ml605_mmu.c
@@ -45,8 +45,8 @@ 
 
 #include "hw/stream.h"
 
-#define LMB_BRAM_SIZE  (128 * 1024)
-#define FLASH_SIZE     (32 * 1024 * 1024)
+#define LMB_BRAM_SIZE  (128 * K_BYTE)
+#define FLASH_SIZE     (32 * M_BYTE)
 
 #define BINARY_DEVICE_TREE_FILE "petalogix-ml605.dtb"
 
@@ -110,7 +110,7 @@  petalogix_ml605_init(MachineState *machine)
     pflash_cfi01_register(FLASH_BASEADDR,
                           NULL, "petalogix_ml605.flash", FLASH_SIZE,
                           dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
-                          (64 * 1024), FLASH_SIZE >> 16,
+                          64 * K_BYTE, FLASH_SIZE >> 16,
                           2, 0x89, 0x18, 0x0000, 0x0, 0);
 
 
diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c b/hw/microblaze/petalogix_s3adsp1800_mmu.c
index 5cb4deb69e..d93f7184a5 100644
--- a/hw/microblaze/petalogix_s3adsp1800_mmu.c
+++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c
@@ -40,8 +40,8 @@ 
 
 #include "boot.h"
 
-#define LMB_BRAM_SIZE  (128 * 1024)
-#define FLASH_SIZE     (16 * 1024 * 1024)
+#define LMB_BRAM_SIZE  (128 * K_BYTE)
+#define FLASH_SIZE     (16 * M_BYTE)
 
 #define BINARY_DEVICE_TREE_FILE "petalogix-s3adsp1800.dtb"
 
@@ -88,7 +88,7 @@  petalogix_s3adsp1800_init(MachineState *machine)
     pflash_cfi01_register(FLASH_BASEADDR,
                           NULL, "petalogix_s3adsp1800.flash", FLASH_SIZE,
                           dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
-                          (64 * 1024), FLASH_SIZE >> 16,
+                          64 * K_BYTE, FLASH_SIZE >> 16,
                           1, 0x89, 0x18, 0x0000, 0x0, 1);
 
     dev = qdev_create(NULL, "xlnx.xps-intc");

[18/30] hw/microblaze: use the BYTE-based definitions

Commit Message

Patch