diff options
| author | Aurora pro automerger <aurora-pro-automerger@google.com> | 2022-04-28 17:59:17 +0800 |
|---|---|---|
| committer | John Scheible <johnscheible@google.com> | 2022-05-02 22:33:52 +0000 |
| commit | 27bed782f3a828674c0f1584cf355bf592c382be (patch) | |
| tree | 79f6f3410eece25889b3cfc80dcd156ec5b543c6 /Makefile | |
| parent | a96a198c9328b06866df39ebd420b0f3fd58ce51 (diff) | |
| download | gs201-27bed782f3a828674c0f1584cf355bf592c382be.tar.gz | |
[Copybara Auto Merge] Merge branch 'gs201-release' into 'android13-gs-pixel-5.10'
gxp: check BLK is on during power state transition
gxp: prepare more worker structures for async jobs
gxp: Cleanup virt<->phys core translation APIs
gxp: switch mux to make sure LPM works
gxp: init has_vd_lock field of gxp_client
gxp: Clean up variable names and update variable type
gxp: remove gxp-tmp.h
gxp: move scratchpad macros from tmp to firmware.h
gxp: remove no-iommu support
gxp: remove SYNC_ macros from tmp.h
gxp: remove DOORBELL macros
gxp: move PSM macros to lpm.h
gxp: Check for valid VD in mb_eventfd IOCTLs
gxp: Firmware startup and Core-On optimizations
gxp: Move ownership of user response queues
gxp: move macros from tmp.h to bpm.c
gxp: remove legacy software mailbox support
gxp: Add gxp-eventfd interface
gxp: remove unused macros from gxp-tmp.h
gxp: bind page tables per virtual device
Bug: 176979630
Bug: 207037425
Bug: 207038856
Bug: 209083969
Bug: 225059930
Bug: 226211187
Bug: 227145352
Bug: 227693917
Bug: 227694164
Bug: 228233514
Bug: 228921329
Bug: 229095276
Bug: 229584236
GitOrigin-RevId: d2c00e3ee2d71e551d41adfa5bcc6bec79379db3
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Change-Id: Ia92e12a2ab46eadc2876bcdb7ed3c04e223b3901
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 27 |
1 files changed, 6 insertions, 21 deletions
@@ -12,8 +12,10 @@ gxp-objs += \ gxp-debugfs.o \ gxp-dmabuf.o \ gxp-doorbell.o \ + gxp-eventfd.o \ gxp-firmware.o \ gxp-firmware-data.o \ + gxp-hw-mailbox-driver.o \ gxp-lpm.o \ gxp-mailbox.o \ gxp-mapping.o \ @@ -52,29 +54,12 @@ ifdef CONFIG_GXP_TEST GXP_PLATFORM = CLOUDRIPPER endif -# Default to using the HW mailbox and SysMMU -GXP_SW_MAILBOX ?= 0 -GXP_HAS_SYSMMU ?= 1 - -# Setup the linked mailbox implementation and definitions. -ifeq ($(GXP_SW_MAILBOX),1) - ccflags-y += -DCONFIG_GXP_USE_SW_MAILBOX - gxp-objs += gxp-sw-mailbox-driver.o -else - gxp-objs += gxp-hw-mailbox-driver.o -endif - # Setup which version of the gxp-dma interface is used. -ifeq ($(GXP_HAS_SYSMMU),1) - ccflags-y += -DCONFIG_GXP_HAS_SYSMMU - # For gem5, need to adopt dma interface without aux domain. - ifeq ($(GXP_PLATFORM), GEM5) - gxp-objs += gxp-dma-iommu-gem5.o - else - gxp-objs += gxp-dma-iommu.o - endif +# For gem5, need to adopt dma interface without aux domain. +ifeq ($(GXP_PLATFORM), GEM5) + gxp-objs += gxp-dma-iommu-gem5.o else - gxp-objs += gxp-dma-rmem.o + gxp-objs += gxp-dma-iommu.o endif ccflags-y += -DCONFIG_GXP_$(GXP_PLATFORM) |