From 75c0e15f7cbe6361e87b55dfdc990ca0d6ccbc39 Mon Sep 17 00:00:00 2001
From: David Pitt <dpitt@gitlab.riscosopen.org>
Date: Sat, 30 May 2020 10:09:24 +0100
Subject: [PATCH] Update table for 4B revision 1.4

Detail:
  The 8GB model has a new PCB revision too.
Admin:
  Submission from David Pitt.

Version 0.85. Tagged as 'HAL_BCM2835-0_85'
---
 VersionNum  | 22 +++++++++++-----------
 hdr/BCM2835 |  1 +
 s/GPIO      |  2 ++
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/VersionNum b/VersionNum
index 0a5bed2..5f211a9 100644
--- a/VersionNum
+++ b/VersionNum
@@ -1,21 +1,21 @@
-/* (0.84)
+/* (0.85)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  *
  */
-#define Module_MajorVersion_CMHG        0.84
-#define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                02 Apr 2020
+#define Module_MajorVersion_CMHG        0.85
+#define Module_MinorVersion_CMHG
+#define Module_Date_CMHG                30 May 2020
 
-#define Module_MajorVersion             "0.84"
-#define Module_Version                  84
+#define Module_MajorVersion             "0.85"
+#define Module_Version                  85
 #define Module_MinorVersion             ""
-#define Module_Date                     "02 Apr 2020"
+#define Module_Date                     "30 May 2020"
 
-#define Module_ApplicationDate          "02-Apr-20"
+#define Module_ApplicationDate          "30-May-20"
 
 #define Module_ComponentName            "HAL_BCM2835"
 
-#define Module_FullVersion              "0.84"
-#define Module_HelpVersion              "0.84 (02 Apr 2020)"
-#define Module_LibraryVersionInfo       "0:84"
+#define Module_FullVersion              "0.85"
+#define Module_HelpVersion              "0.85 (30 May 2020)"
+#define Module_LibraryVersionInfo       "0:85"
diff --git a/hdr/BCM2835 b/hdr/BCM2835
index 38144e1..90747c6 100644
--- a/hdr/BCM2835
+++ b/hdr/BCM2835
@@ -331,6 +331,7 @@ BoardRevision_Mem_512M      *   1 :SHL: BoardRevision_Mem_Shift
 BoardRevision_Mem_1G        *   2 :SHL: BoardRevision_Mem_Shift
 BoardRevision_Mem_2G        *   3 :SHL: BoardRevision_Mem_Shift
 BoardRevision_Mem_4G        *   4 :SHL: BoardRevision_Mem_Shift
+BoardRevision_Mem_8G        *   5 :SHL: BoardRevision_Mem_Shift
 BoardRevision_Manuf_Shift   *  16
 BoardRevision_Manuf_Mask    *  15 :SHL: BoardRevision_Manuf_Shift
 BoardRevision_Manuf_Sony    *   0 :SHL: BoardRevision_Manuf_Shift
diff --git a/s/GPIO b/s/GPIO
index be183d1..6fafd07 100644
--- a/s/GPIO
+++ b/s/GPIO
@@ -325,6 +325,8 @@ GPIO_Board_Conversion_Table
         DCD     GPIORevision_RaspberryPi_Mk4_B
         DCD     BoardRevision_Mem_4G+BoardRevision_Model_B4+(2:SHL:BoardRevision_Rev_Shift)
         DCD     GPIORevision_RaspberryPi_Mk4_B
+        DCD     BoardRevision_Mem_8G+BoardRevision_Model_B4+(4:SHL:BoardRevision_Rev_Shift)
+        DCD     GPIORevision_RaspberryPi_Mk4_B
         DCD     &FF
 
         ; Initialise our HAL devices
-- 
GitLab