This commit was manufactured by cvs2git to create tag 'BCM2835-0_75-1'.

Sprout from master 2018-04-10 19:40:00 UTC Robert Sprowson <rsprowson@gitlab.riscosopen.org> 'Debug UART typo & clarification'
Cherrypick from Pi3APlus 2018-10-26 19:31:38 UTC Ben Avison <bavison@gitlab.riscosopen.org> 'Add support for Pi model 3A+':
    hdr/BCM2835
    s/GPIO
    s/SDIO

hdr/BCM2835

@@ -364,6 +364,7 @@ BoardRevision_Model_Zero    *   9 :SHL: BoardRevision_Model_Shift
 BoardRevision_Model_Compute3 * 10 :SHL: BoardRevision_Model_Shift
 BoardRevision_Model_ZeroW   *  12 :SHL: BoardRevision_Model_Shift
 BoardRevision_Model_B3Plus  *  13 :SHL: BoardRevision_Model_Shift
+BoardRevision_Model_A3Plus  *  14 :SHL: BoardRevision_Model_Shift
 BoardRevision_Rev_Shift     *   0
 BoardRevision_Rev_Mask      *  15 :SHL: BoardRevision_Rev_Shift
 

s/GPIO

@@ -213,6 +213,7 @@ GPIORevision_RaspberryPi_Zero    #       1 ; Model Zero
 GPIORevision_RaspberryPi_ZeroW   #       1 ; Model ZeroW
 GPIORevision_RaspberryPi_Mk3_B   #       1 ; Model Pi 3 B
 GPIORevision_RaspberryPi_Mk3_BPlus #     1 ; Model Pi 3 B+
+GPIORevision_RaspberryPi_Mk3_APlus #     1 ; Model Pi 3 A+
 GPIORevision_RaspberryPi_Max     #       0
 
 Name_B_1 = "Raspberry Pi B PCB 1.0", 0
@@ -227,6 +228,7 @@ Name_Zero = "Raspberry Pi Zero", 0
 Name_ZeroW = "Raspberry Pi Zero W", 0
 Name_Mk3_B = "Raspberry Pi 3 Model B", 0
 Name_Mk3_BPlus = "Raspberry Pi 3 Model B+", 0
+Name_Mk3_APlus = "Raspberry Pi 3 Model A+", 0
 Name_Unknown = "Raspberry Pi Unknown", 0
         ALIGN
 
@@ -243,6 +245,7 @@ GPIO_Board_Names_Table ; same order as GPIORevision_RaspberryPi types
         DCD     Name_ZeroW
         DCD     Name_Mk3_B
         DCD     Name_Mk3_BPlus
+        DCD     Name_Mk3_APlus
         ASSERT  (.-GPIO_Board_Names_Table) :SHR: 2 = GPIORevision_RaspberryPi_Max
 
 ; Lookup table to determine board type (old style)
@@ -303,6 +306,8 @@ GPIO_Board_Conversion_Table
         DCD     GPIORevision_RaspberryPi_ZeroW
         DCD     BoardRevision_Mem_1G+BoardRevision_Model_B3Plus+(3:SHL:BoardRevision_Rev_Shift)
         DCD     GPIORevision_RaspberryPi_Mk3_BPlus
+        DCD     BoardRevision_Mem_512M+BoardRevision_Model_A3Plus+(0:SHL:BoardRevision_Rev_Shift)
+        DCD     GPIORevision_RaspberryPi_Mk3_APlus
         DCD     &FF
 
         ; Initialise our HAL devices

s/SDIO

@@ -388,6 +388,7 @@ SDIO_InitDevices ROUT
         ADDHS   a2, a2, #GetCardDetect_BPlus_Compute - GetCardDetect_AB
         TEQ     a3, #BoardRevision_Model_B3
         TEQNE   a3, #BoardRevision_Model_B3Plus
+        TEQ     a3, #BoardRevision_Model_A3Plus
         ADREQL  a1, SetActivity_B3
         STR     a1, SDHCIDevice + HALDevice_SDHCISetActivity
         STR     a2, SDHCIDevice + HALDevice_SDHCIGetCardDetect