summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2009-05-17 00:58:37 +0200
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2009-06-23 00:10:04 +0200
commit576afd4faeba1519bcb8c0083c3e4d45e5643a48 (patch)
treecaac0ea50cd26e899fccb6cdb428ccc6cced9b77 /Makefile
parent46937b27427688a56bf7f5944a92d962dc43c3fa (diff)
downloadu-boot-imx-576afd4faeba1519bcb8c0083c3e4d45e5643a48.zip
u-boot-imx-576afd4faeba1519bcb8c0083c3e4d45e5643a48.tar.gz
u-boot-imx-576afd4faeba1519bcb8c0083c3e4d45e5643a48.tar.bz2
integrator: merge integratorap and integratorcp
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Acked-by: Peter Pearse <peter.pearse@arm.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index a6f4231..ebb12e9 100644
--- a/Makefile
+++ b/Makefile
@@ -2809,7 +2809,7 @@ ap720t_config \
ap920t_config \
ap926ejs_config \
ap946es_config: unconfig
- @board/armltd/integratorap/split_by_variant.sh $@
+ @board/armltd/integrator/split_by_variant.sh ap $@
integratorcp_config \
cp_config \
@@ -2821,7 +2821,7 @@ cp966_config \
cp922_config \
cp922_XA10_config \
cp1026_config: unconfig
- @board/armltd/integratorcp/split_by_variant.sh $@
+ @board/armltd/integrator/split_by_variant.sh cp $@
davinci_dvevm_config : unconfig
@$(MKCONFIG) $(@:_config=) arm arm926ejs dvevm davinci davinci