From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by mx.groups.io with SMTP id smtpd.web12.5471.1574858243138380965 for ; Wed, 27 Nov 2019 04:37:23 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@akeo-ie.20150623.gappssmtp.com header.s=20150623 header.b=Hjj/7T/4; spf=none, err=permanent DNS error (domain: akeo.ie, ip: 209.85.221.67, mailfrom: pete@akeo.ie) Received: by mail-wr1-f67.google.com with SMTP id c14so1877476wrn.7 for ; Wed, 27 Nov 2019 04:37:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akeo-ie.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/iaBdfHe5jGPlSQrbEu3RgpXur/TnLg+auGuhy9qGjQ=; b=Hjj/7T/4TeV+1iODxVbBEPLe/e2f0MimSZWkj+AMu8Zz8FB9a6p8mK7zliQBKNP4vy TmBTWkyMFjcUACxV3iq2JUP+ZLLf8xkdY635hfyjtBYDtOnJKKQv8dN7kqj5pye8a98D 99szbK4BNlCvGrPZe9FGl2PDfM5q5+iFZmM83y1Fs8xmTOHayXRyhOnwRqDsE1W+xRdk bvCykeDMWFxP+RK6YuS4I64+11X0cPDrWGLHaAt26JoOSURzOG3bwg4ZMCGMDEsmFwYw WMT8ohkN1HkyrkxcEFI4O1QdosI0US0f8uG8MZGXS9IB/EqVSkRoUfS9V//4NzwoN+rM JyhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/iaBdfHe5jGPlSQrbEu3RgpXur/TnLg+auGuhy9qGjQ=; b=Vo4kzskIUNLOiEDFDeLvjQwVGNzCWCGQ/Ley4UVbLOo63kWsT5WQ9YOMtt/6F8pm+a lp+J8sHZhsZmMDJAcbr34dj6XHV7m2etOMXnnI3Yed7mWkEXFpvxfss8LCj+pGowA6wY 6E1NG1XNeEAuagx1Lpkzaj17edkW5WYqVwwrH9jJhdx56UGU0epT/zgcpOGg2i+1jg+9 WIiIL41oCDRNDeivXEV6OK5S1wJ7PZ2YJ96JXsAicbEC4BQ6dR53QGc4LzhXh3b4GJCG j6dHi4ecsAfB/dZqi/DXL7QIYGWLrdge2y8RPvFvRqRoioxYTKPFSqpO4FEET15DEqBm qUkQ== X-Gm-Message-State: APjAAAUTI0jmdmg0eyValmL5D++gKVvIlrl0LwYD7FzsHg5RNHoJl8F2 dB1tAUisTXG69Lfqoj6zSyOUMaqZn8U= X-Google-Smtp-Source: APXvYqyal+yi0UI4ZvP8HXZChIzONk2uA3La9LBOZNWNdfwix3Pp2KovTSUPwPbTyiUqa7Zg8JmrDA== X-Received: by 2002:adf:b746:: with SMTP id n6mr42104658wre.65.1574858241368; Wed, 27 Nov 2019 04:37:21 -0800 (PST) Return-Path: Received: from localhost.localdomain ([84.203.37.1]) by smtp.gmail.com with ESMTPSA id p9sm18847833wrs.55.2019.11.27.04.37.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Nov 2019 04:37:20 -0800 (PST) From: "Pete Batard" To: devel@edk2.groups.io Cc: ard.biesheuvel@linaro.org, leif.lindholm@linaro.org, philmd@redhat.com, samer.el-haj-mahmoud@arm.com, andrey.warkentin@gmail.com Subject: [edk2-platforms][PATCH 1/5] Silicon/Bcm283x: Clean up Bcm2836.h header Date: Wed, 27 Nov 2019 12:37:02 +0000 Message-Id: <20191127123706.4604-2-pete@akeo.ie> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20191127123706.4604-1-pete@akeo.ie> References: <20191127123706.4604-1-pete@akeo.ie> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Add missing RNG registers, prefer reusing shorter define's instead of PCDs and clean up spacing. Signed-off-by: Pete Batard --- Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836.h | 23 ++++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836.h b/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836.h index 72c8e9dc4b14..744c7ac3b9f4 100644 --- a/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836.h +++ b/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836.h @@ -24,8 +24,7 @@ /* watchdog constants */ #define BCM2836_WDOG_OFFSET 0x00100000 -#define BCM2836_WDOG_BASE_ADDRESS (FixedPcdGet64 (PcdBcm283xRegistersAddress) \ - + BCM2836_WDOG_OFFSET) +#define BCM2836_WDOG_BASE_ADDRESS (BCM2836_SOC_REGISTERS + BCM2836_WDOG_OFFSET) #define BCM2836_WDOG_PASSWORD 0x5a000000 #define BCM2836_WDOG_RSTC_OFFSET 0x0000001c #define BCM2836_WDOG_WDOG_OFFSET 0x00000024 @@ -34,8 +33,7 @@ /* mailbox interface constants */ #define BCM2836_MBOX_OFFSET 0x0000b880 -#define BCM2836_MBOX_BASE_ADDRESS (FixedPcdGet64 (PcdBcm283xRegistersAddress) \ - + BCM2836_MBOX_OFFSET) +#define BCM2836_MBOX_BASE_ADDRESS (BCM2836_SOC_REGISTERS + BCM2836_MBOX_OFFSET) #define BCM2836_MBOX_READ_OFFSET 0x00000000 #define BCM2836_MBOX_STATUS_OFFSET 0x00000018 #define BCM2836_MBOX_CONFIG_OFFSET 0x0000001c @@ -51,12 +49,19 @@ #define BCM2836_INTC_TIMER_PENDING_OFFSET 0x00000060 /* random number generator */ -#define RNG_BASE_ADDRESS (BCM2836_SOC_REGISTERS + 0x00104000) +#define BCM2836_RNG_OFFSET 0x00104000 +#define RNG_BASE_ADDRESS (BCM2836_SOC_REGISTERS + BCM2836_RNG_OFFSET) -#define RNG_CTRL (RNG_BASE_ADDRESS + 0x0) -#define RNG_STATUS (RNG_BASE_ADDRESS + 0x4) -#define RNG_DATA (RNG_BASE_ADDRESS + 0x8) +#define RNG_CTRL (RNG_BASE_ADDRESS + 0x0) +#define RNG_STATUS (RNG_BASE_ADDRESS + 0x4) +#define RNG_DATA (RNG_BASE_ADDRESS + 0x8) +#define RNG_BIT_COUNT (RNG_BASE_ADDRESS + 0xc) +#define RNG_BIT_COUNT_THRESHOLD (RNG_BASE_ADDRESS + 0x10) +#define RNG_INT_STATUS (RNG_BASE_ADDRESS + 0x18) +#define RNG_INT_ENABLE (RNG_BASE_ADDRESS + 0x1c) +#define RNG_FIFO_DATA (RNG_BASE_ADDRESS + 0x20) +#define RNG_FIFO_COUNT (RNG_BASE_ADDRESS + 0x24) -#define RNG_CTRL_ENABLE 0x1 +#define RNG_CTRL_ENABLE 0x1 #endif /*__BCM2836_H__ */ -- 2.21.0.windows.1