diff options
| author | Gary King <gking@nvidia.com> | 2009-12-15 11:37:07 -0800 |
|---|---|---|
| committer | Gary King <gking@nvidia.com> | 2009-12-15 18:47:16 -0800 |
| commit | d2d48be99e7313b5d319f4601870f0701030e129 (patch) | |
| tree | abdbf836dbdfdd85ad1b0f5801af93d3ac011b14 /arch | |
| parent | 0bea96a80ebd2b9364d704651d090f174b064639 (diff) | |
tegra: fix nvec, nvddk and top-level Makefiles
copies NV_DEBUG and NV_IS_AVP compiler define logic into top-level Makefile.
fixes nvec Makefile to include the correct directory
fixes syntax error in nvddk Makefile
Change-Id: I439c00861fc9230ff135201a42fa979abdc29905
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-tegra/Makefile | 9 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/nvddk/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/nvec/smbus/Makefile | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile index dea16e4d80ca..f057f88368af 100644 --- a/arch/arm/mach-tegra/Makefile +++ b/arch/arm/mach-tegra/Makefile @@ -1,3 +1,12 @@ +ccflags-y += -DNV_IS_AVP=0 +ccflags-y += -DNV_OAL=0 +ccflags-y += -DNV_USE_FUSE_CLOCK_ENABLE=0 +ifeq ($(CONFIG_MACH_TEGRA_GENERIC_DEBUG),y) +ccflags-y += -DNV_DEBUG=1 +else +ccflags-y += -DNV_DEBUG=0 +endif + # Mandatory components obj-y += clock.o obj-y += io.o diff --git a/arch/arm/mach-tegra/nvddk/Makefile b/arch/arm/mach-tegra/nvddk/Makefile index bc852f5479af..15a897de16bf 100644 --- a/arch/arm/mach-tegra/nvddk/Makefile +++ b/arch/arm/mach-tegra/nvddk/Makefile @@ -10,7 +10,7 @@ endif ccflags-y += -Iarch/arm/mach-tegra/include/hwinc ccflags-y += -Iarch/arm/mach-tegra/nvddk/ -ifeq ($(filter y,$(CONFIG_USB_TEGRA) $(CONFIG_USB_TEGRA_HCD))) +ifneq ($(filter y,$(CONFIG_USB_TEGRA) $(CONFIG_USB_TEGRA_HCD)),) obj-y += nvddk_usbphy.o obj-y += nvddk_usbphy_ap16.o obj-y += nvddk_usbphy_ap20.o diff --git a/arch/arm/mach-tegra/nvec/smbus/Makefile b/arch/arm/mach-tegra/nvec/smbus/Makefile index e399b2e3d5af..6fa4ed98ebf9 100644 --- a/arch/arm/mach-tegra/nvec/smbus/Makefile +++ b/arch/arm/mach-tegra/nvec/smbus/Makefile @@ -5,6 +5,6 @@ else ccflags-y += -DNV_DEBUG=0 endif -ccflags-y += -Iarch/arm/mach-tegra/drivers/nvec +ccflags-y += -Iarch/arm/mach-tegra/nvec obj-y += nvec_i2c_transport.o obj-y += nvec_smbus_packet.o |