ArmPlatformPkg/PrePi: fix IS_XIP
This wasn't correctly testing for FD to be outside RAM, when RAM base immediately follows the FD. This is part of some cleanup for RPi4 in edk2-platform. Signed-off-by: Andrei Warkentin <awarkentin@vmware.com> Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
This commit is contained in:
		
				
					committed by
					
						
						mergify[bot]
					
				
			
			
				
	
			
			
			
						parent
						
							ced77332ca
						
					
				
				
					commit
					d6607d8b30
				
			@@ -22,7 +22,7 @@
 | 
				
			|||||||
#include "PrePi.h"
 | 
					#include "PrePi.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define IS_XIP() (((UINT64)FixedPcdGet64 (PcdFdBaseAddress) > mSystemMemoryEnd) || \
 | 
					#define IS_XIP() (((UINT64)FixedPcdGet64 (PcdFdBaseAddress) > mSystemMemoryEnd) || \
 | 
				
			||||||
                  ((FixedPcdGet64 (PcdFdBaseAddress) + FixedPcdGet32 (PcdFdSize)) < FixedPcdGet64 (PcdSystemMemoryBase)))
 | 
					                  ((FixedPcdGet64 (PcdFdBaseAddress) + FixedPcdGet32 (PcdFdSize)) <= FixedPcdGet64 (PcdSystemMemoryBase)))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
UINT64 mSystemMemoryEnd = FixedPcdGet64(PcdSystemMemoryBase) +
 | 
					UINT64 mSystemMemoryEnd = FixedPcdGet64(PcdSystemMemoryBase) +
 | 
				
			||||||
                          FixedPcdGet64(PcdSystemMemorySize) - 1;
 | 
					                          FixedPcdGet64(PcdSystemMemorySize) - 1;
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user