diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-12-10 22:46:48 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-12-10 22:46:48 +0100 |
| commit | b96a661aeadb1b68d1b589b47f99ce9d6b2769df (patch) | |
| tree | 4df62e827b8d33686bbd6da9d08e96fd7314eef2 /Makefile | |
| parent | 84d018268a8af1d9f271b398748652c5112e951a (diff) | |
| parent | 8ba1604d342076c29e375fa3196106eed1f84b2a (diff) | |
| download | u-boot-imx-b96a661aeadb1b68d1b589b47f99ce9d6b2769df.zip u-boot-imx-b96a661aeadb1b68d1b589b47f99ce9d6b2769df.tar.gz u-boot-imx-b96a661aeadb1b68d1b589b47f99ce9d6b2769df.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
* 'master' of git://git.denx.de/u-boot-arm:
M28: Cleanup memsize.o OOT build
i.MX28: Move SPL to arch/arm/cpu/arm926ejs/mx28
M28: Fix typo
M28: Document that units has to be set to sectors on SD bootcard
i.mx: i.mx6q: add the initial support for i.mx6q ARM2 board
i.mx: mxc_gpio: add the i.mx6q support
i.mx: add the initial support for freescale i.MX6Q processor
i.mx: introduce the armv7/imx-common folder
S5PC2XX: Rename S5pc2XX to exynos
tegra2: Don't use board pointer before it is set up
tegra2: Remove unneeded 'dynamic ram size' message
tegra2: Remove unused low-level Tegra2 UART code
tegra2: Remove unneeded config option
tegra2: Remove unneeded boot code
tegra2: Enable instruction cache
arm: Move CP15 init out of cpu_init_crit()
tegra2: Simplify tegra_start() boot path
tegra2: Add arch_cpu_init() to fire up Cortex-A9
tegra2: Use new GPIO APIs in gpio_config_uart()
tegra2: Add support for Ventana
tegra2: Modify MMC driver to handle power and cd GPIOs
tegra2: Move board_mmc_init into board files
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 9 insertions, 1 deletions
@@ -296,10 +296,18 @@ LIBS += post/libpost.o ifneq ($(CONFIG_AM335X)$(CONFIG_OMAP34XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX),) LIBS += $(CPUDIR)/omap-common/libomap-common.o endif + +ifeq ($(SOC),mx5) +LIBS += $(CPUDIR)/imx-common/libimx-common.o +endif +ifeq ($(SOC),mx6) +LIBS += $(CPUDIR)/imx-common/libimx-common.o +endif + ifeq ($(SOC),s5pc1xx) LIBS += $(CPUDIR)/s5p-common/libs5p-common.o endif -ifeq ($(SOC),s5pc2xx) +ifeq ($(SOC),exynos) LIBS += $(CPUDIR)/s5p-common/libs5p-common.o endif |