Merge "Revert "Change LibartImgDeviceBaseAddress to 0x60000000""

This commit is contained in:
Mathieu Chartier 2018-09-18 07:11:33 +00:00 committed by Gerrit Code Review
commit ab033dc684

View file

@ -660,7 +660,16 @@ func (c *config) LibartImgHostBaseAddress() string {
} }
func (c *config) LibartImgDeviceBaseAddress() string { func (c *config) LibartImgDeviceBaseAddress() string {
return "0x60000000" archType := Common
if len(c.Targets[Device]) > 0 {
archType = c.Targets[Device][0].Arch.ArchType
}
switch archType {
default:
return "0x70000000"
case Mips, Mips64:
return "0x5C000000"
}
} }
func (c *config) ArtUseReadBarrier() bool { func (c *config) ArtUseReadBarrier() bool {