From patchwork Thu Feb 15 04:28:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 873632 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="FJtECkJ+"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zhkM05N35z9sRW for ; Thu, 15 Feb 2018 15:49:00 +1100 (AEDT) Received: from localhost ([::1]:37651 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBTe-0007eC-QB for incoming@patchwork.ozlabs.org; Wed, 14 Feb 2018 23:48:58 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34498) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBBF-0007x5-IA for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:29:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emBBE-00045L-Nx for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:29:57 -0500 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:46695) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1emBBE-00045D-Iv for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:29:56 -0500 Received: by mail-qt0-x241.google.com with SMTP id u6so10464148qtg.13 for ; Wed, 14 Feb 2018 20:29:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=QkCdrNMlJKv3R27cWwWBA3R7h0LzsP+psEQVgHAoHvQ=; b=FJtECkJ+DXsYHi8uCMWH/a7+4VjbU7nGtZPhYY1ToB31b8jkycJ304WGeoo3x8x2gB ZS3l8/R3MOjHDY8T0hU0SNRsxgsvN3LFppNXSzZzc3n/LFG5nAM29AvTJT/C4OzIAn/r ZDg/Md8igsIINsa8CXsZn9P0+s/a+uDl5awgDPUnnDqIZfMvf1JpvUxwL8MKpBt36rv2 9yNtJuRVnFEENmk5Nqltwt3nSysjbAM+S+U0Td3IJfzcHJTv2RebC3CBIPVo8FvArEfK XsP4m3Tc3rV34K9iU1ta51MtuK+FLKlyY4+Roi203f1e5YzCTI0vsAFtf7bJquc8BkFU 66GQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=QkCdrNMlJKv3R27cWwWBA3R7h0LzsP+psEQVgHAoHvQ=; b=aqE2VGnILH/SzaRKRDNaxwqTRjzqXloXomD8zrwuVE9XKzZOYMreXyLkRirq3mTvvH VSvxjRuEBDFlI+6Aj//eSsBkoB93/HJ4j+u4LxqBOuxbB73PcZkrdjUu+JIjVCA//hYK +uEUTNv6uemHeGBhditIG2nHWRZiKdTrqqsYizk9Pc7clkvuv41AVLIRKywm01Ovbqws sLvWSmFisJZ4+k7+nrVa3WnxYKY6QAkLSnGuQ5CXeZl9uqpDtotFoLoK5qKJG6WIZCqr 010T8HJqkv7EZrRAqqT6v7Q1z8R3VOgs3MRk52EdR3/WaiGnF5mIXjxwuUaqEFeUuY4p yZkQ== X-Gm-Message-State: APf1xPDM4QVVwbJQnnTYhcTqNpKZtjofr290EaIF4SbmW4yJRH1cQZNm CytNDgIr2RP7HUUIPWe4ufvu/X+q X-Google-Smtp-Source: AH8x224pf3GanopOVWwHQW71FFnM8YCUPmsXJZ4cNV5ms2xDJ3P7uE972ukIOyQLZjwatEytphE7WA== X-Received: by 10.200.8.15 with SMTP id u15mr2304101qth.315.1518668995970; Wed, 14 Feb 2018 20:29:55 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id t33sm10680312qtc.14.2018.02.14.20.29.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2018 20:29:55 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Thu, 15 Feb 2018 01:28:45 -0300 Message-Id: <20180215042900.16078-16-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180215042900.16078-1-f4bug@amsat.org> References: <20180215042900.16078-1-f4bug@amsat.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::241 Subject: [Qemu-devel] [PATCH 15/30] hw/lm32: use the BYTE-based definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Walle , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" It ease code review, unit is explicit. Signed-off-by: Philippe Mathieu-Daudé --- hw/lm32/lm32_boards.c | 12 ++++++------ hw/lm32/milkymist.c | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/hw/lm32/lm32_boards.c b/hw/lm32/lm32_boards.c index 527bcc229c..15315101be 100644 --- a/hw/lm32/lm32_boards.c +++ b/hw/lm32/lm32_boards.c @@ -88,10 +88,10 @@ static void lm32_evr_init(MachineState *machine) /* memory map */ hwaddr flash_base = 0x04000000; - size_t flash_sector_size = 256 * 1024; - size_t flash_size = 32 * 1024 * 1024; + size_t flash_sector_size = 256 * K_BYTE; + size_t flash_size = 32 * M_BYTE; hwaddr ram_base = 0x08000000; - size_t ram_size = 64 * 1024 * 1024; + size_t ram_size = 64 * M_BYTE; hwaddr timer0_base = 0x80002000; hwaddr uart0_base = 0x80006000; hwaddr timer1_base = 0x8000a000; @@ -174,10 +174,10 @@ static void lm32_uclinux_init(MachineState *machine) /* memory map */ hwaddr flash_base = 0x04000000; - size_t flash_sector_size = 256 * 1024; - size_t flash_size = 32 * 1024 * 1024; + size_t flash_sector_size = 256 * K_BYTE; + size_t flash_size = 32 * M_BYTE; hwaddr ram_base = 0x08000000; - size_t ram_size = 64 * 1024 * 1024; + size_t ram_size = 64 * M_BYTE; hwaddr uart0_base = 0x80000000; hwaddr timer0_base = 0x80002000; hwaddr timer1_base = 0x80010000; diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c index c28379399f..b884b825bc 100644 --- a/hw/lm32/milkymist.c +++ b/hw/lm32/milkymist.c @@ -36,7 +36,7 @@ #define BIOS_FILENAME "mmone-bios.bin" #define BIOS_OFFSET 0x00860000 -#define BIOS_SIZE (512*1024) +#define BIOS_SIZE (512 * K_BYTE) #define KERNEL_LOAD_ADDR 0x40000000 typedef struct { @@ -95,10 +95,10 @@ milkymist_init(MachineState *machine) /* memory map */ hwaddr flash_base = 0x00000000; - size_t flash_sector_size = 128 * 1024; - size_t flash_size = 32 * 1024 * 1024; + size_t flash_sector_size = 128 * K_BYTE; + size_t flash_size = 32 * M_BYTE; hwaddr sdram_base = 0x40000000; - size_t sdram_size = 128 * 1024 * 1024; + size_t sdram_size = 128 * M_BYTE; hwaddr initrd_base = sdram_base + 0x1002000; hwaddr cmdline_base = sdram_base + 0x1000000;