From patchwork Mon Dec 30 11:09:50 2019 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: 1216346 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="hQPvj1Oa"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47mZVT5xyRz9sPc for ; Mon, 30 Dec 2019 22:10:57 +1100 (AEDT) Received: from localhost ([::1]:60442 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ilswp-0005ye-3R for incoming@patchwork.ozlabs.org; Mon, 30 Dec 2019 06:10:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35313) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ilsvx-0005U3-I7 for qemu-devel@nongnu.org; Mon, 30 Dec 2019 06:10:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ilsvw-00037v-HL for qemu-devel@nongnu.org; Mon, 30 Dec 2019 06:10:01 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:54521) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ilsvw-00037l-BH; Mon, 30 Dec 2019 06:10:00 -0500 Received: by mail-wm1-x343.google.com with SMTP id b19so13627679wmj.4; Mon, 30 Dec 2019 03:10:00 -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 :mime-version:content-transfer-encoding; bh=+HcL6RtbH65y2vmENayC1ied30BzD+pn5ZQNQGLUrBQ=; b=hQPvj1OaisvygzpRuEp32g/qa0ZCf5LboT4oqXYdZ223T58Ji8kTSxBSy9rXFpl2Ss NgnO0ruPpOCdXexFf2Bc4Xe83kPnCkhaeCwxM8BJu7AkioUZ/YmMuHni6zIQfFPnsDX2 kvOc0zoa7XxvlJpLUKN+VqOce5TGb0LlVkw5Lr+vq+FGQvqX1QAJmTOYa1SWlF4xRa3i QDAmYMuLtzB2RvC3f7+Ztnb/TiqJ7DtO4q9iMKxeuC1mdOK4eMS8EGSuFNtOHiEUVFRJ r/iE6P3g+Kl6K/vE1ltzq1TyRR2UqJKF7ki7MHtZz7FZepg9OznOPFXJ4QRz8YBsO/nm wcZA== 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:mime-version:content-transfer-encoding; bh=+HcL6RtbH65y2vmENayC1ied30BzD+pn5ZQNQGLUrBQ=; b=gYuiXuHFtjRIyo4q9Lz5OMbx9rOOICGATpaKAACHicujsFOSpE2/lkixBkFFB5sfw2 aw5BAe11GChXM6NVCfWCy6F3LnUUzSPN47wWT3PVi5FHVLFQAmX/w1X4QbQX02UIRb3k B+zc7P0q8SeV0TT3PsU7lKObiiXyQdJM3Z7ksw767gjtRdCU/DlDLja1RRtpJGTt9eEV bXOydnvdNT01gcOAUrbM3KLYx2XHwdHlBHgVdBc3VAP0jCjUQ/ErJAHKksegWmxkrSOw R93JN2JvrBwEpseEg3wEwKYj31HjiKaGoBCOm6cwddCwV/A1D6Ei/1xojor8wpap8KE0 YjAQ== X-Gm-Message-State: APjAAAVVtk2EG5cU5wPDg0ekdFeJeN5ACPDM3J6+qX3NWttn8ZkNA8Jn yDgfVMfjwIcF+Fn0yuCt7DOvN+8dWUQ= X-Google-Smtp-Source: APXvYqxsmqQkY1HPJM7aueqp5klPFsLd8r9fDd5mZ4/txGE0UhDGbxiQx0jGeQMBm/sgQKMnoYok9Q== X-Received: by 2002:a7b:c151:: with SMTP id z17mr33970422wmi.137.1577704199196; Mon, 30 Dec 2019 03:09:59 -0800 (PST) Received: from x1w.redhat.com ([2a01:cb18:8372:6b00:691b:aac5:8837:d4da]) by smtp.gmail.com with ESMTPSA id p15sm20442738wma.40.2019.12.30.03.09.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Dec 2019 03:09:58 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 3/6] hw/arm/allwinner-a10: Move SoC definitions out of header Date: Mon, 30 Dec 2019 12:09:50 +0100 Message-Id: <20191230110953.25496-4-f4bug@amsat.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191230110953.25496-1-f4bug@amsat.org> References: <20191230110953.25496-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?b?YXVkw6k=?= , Wainer dos Santos Moschetta , Beniamino Galvani , Niek Linnenbank , qemu-arm@nongnu.org, Willian Rampazzo , Cleber Rosa Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" These definitions are specific to the A10 SoC and don't need to be exported to the different Allwinner peripherals. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Peter Maydell --- include/hw/arm/allwinner-a10.h | 6 ------ hw/arm/allwinner-a10.c | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/hw/arm/allwinner-a10.h b/include/hw/arm/allwinner-a10.h index 7d2d215630..941c61e533 100644 --- a/include/hw/arm/allwinner-a10.h +++ b/include/hw/arm/allwinner-a10.h @@ -12,12 +12,6 @@ #include "target/arm/cpu.h" -#define AW_A10_PIC_REG_BASE 0x01c20400 -#define AW_A10_PIT_REG_BASE 0x01c20c00 -#define AW_A10_UART0_REG_BASE 0x01c28000 -#define AW_A10_EMAC_BASE 0x01c0b000 -#define AW_A10_SATA_BASE 0x01c18000 - #define AW_A10_SDRAM_BASE 0x40000000 #define TYPE_AW_A10 "allwinner-a10" diff --git a/hw/arm/allwinner-a10.c b/hw/arm/allwinner-a10.c index 118032c8c7..0f1af5a880 100644 --- a/hw/arm/allwinner-a10.c +++ b/hw/arm/allwinner-a10.c @@ -25,6 +25,12 @@ #include "hw/misc/unimp.h" #include "sysemu/sysemu.h" +#define AW_A10_PIC_REG_BASE 0x01c20400 +#define AW_A10_PIT_REG_BASE 0x01c20c00 +#define AW_A10_UART0_REG_BASE 0x01c28000 +#define AW_A10_EMAC_BASE 0x01c0b000 +#define AW_A10_SATA_BASE 0x01c18000 + static void aw_a10_init(Object *obj) { AwA10State *s = AW_A10(obj);