diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-03-28 18:50:01 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-03-28 18:50:01 +0100 |
| commit | 009d75ccc11d27b9a083375a88bb93cb746b4800 (patch) | |
| tree | 12abe9fcf437d58b73ee1fa8d422548560deaae5 /board/nvidia/common/common.mk | |
| parent | 417c55803118eb8e350d5ab8ba6583fb39f4e2e3 (diff) | |
| parent | d53e340edf65ff253d3a7b06ebe60501045892e3 (diff) | |
| download | u-boot-imx-009d75ccc11d27b9a083375a88bb93cb746b4800.zip u-boot-imx-009d75ccc11d27b9a083375a88bb93cb746b4800.tar.gz u-boot-imx-009d75ccc11d27b9a083375a88bb93cb746b4800.tar.bz2 | |
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Conflicts:
drivers/spi/tegra20_sflash.c
include/fdtdec.h
lib/fdtdec.c
Diffstat (limited to 'board/nvidia/common/common.mk')
| -rw-r--r-- | board/nvidia/common/common.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/board/nvidia/common/common.mk b/board/nvidia/common/common.mk index bd6202c..d9bcb85 100644 --- a/board/nvidia/common/common.mk +++ b/board/nvidia/common/common.mk @@ -1,4 +1,3 @@ # common options for all tegra boards COBJS-y += ../../nvidia/common/board.o -COBJS-$(CONFIG_SPI_UART_SWITCH) += ../../nvidia/common/uart-spi-switch.o COBJS-$(CONFIG_TEGRA_CLOCK_SCALING) += ../../nvidia/common/emc.o |