Merge branch 'master' of git://git.denx.de/u-boot-imx

[platform/kernel/u-boot.git] / Makefile

diff --git a/Makefile b/Makefile
index 0f1601e..1445e8b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -38,9 +38,9 @@ HOSTARCH := $(shell uname -m | \
            -e s/sun4u/sparc64/ \
            -e s/arm.*/arm/ \
            -e s/sa110/arm/ \
-           -e s/powerpc/ppc/ \
-           -e s/ppc64/ppc/ \
-           -e s/macppc/ppc/)
+           -e s/ppc64/powerpc/ \
+           -e s/ppc/powerpc/ \
+           -e s/macppc/powerpc/)
 
 HOSTOS := $(shell uname -s | tr '[:upper:]' '[:lower:]' | \
            sed -e 's/\(cygwin\).*/cygwin/')
@@ -313,7 +313,7 @@ $(obj)u-boot.ldr.srec:      $(obj)u-boot.ldr
                $(OBJCOPY) ${OBJCFLAGS} -O srec $< $@ -I binary
 
 $(obj)u-boot.img:      $(obj)u-boot.bin
-               ./tools/mkimage -A $(ARCH) -T firmware -C none \
+               $(obj)tools/mkimage -A $(ARCH) -T firmware -C none \
                -a $(TEXT_BASE) -e 0 \
                -n $(shell sed -n -e 's/.*U_BOOT_VERSION//p' $(VERSION_FILE) | \
                        sed -e 's/"[     ]*$$/ for $(BOARD) board"/') \
@@ -1357,6 +1357,9 @@ HH405_config:     unconfig
 HUB405_config: unconfig
        @$(MKCONFIG) $(@:_config=) powerpc ppc4xx hub405 esd
 
+icon_config:   unconfig
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx icon mosaixtech
+
 # Compact-Center(codename intip) & DevCon-Center use different U-Boot images
 intip_config \
 devconcenter_config:   unconfig
@@ -2940,6 +2943,10 @@ davinci_dm365evm_config :        unconfig
 davinci_dm6467evm_config :     unconfig
        @$(MKCONFIG) $(@:_config=) arm arm926ejs dm6467evm davinci davinci
 
+guruplug_config: unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm926ejs $(@:_config=) Marvell kirkwood
+
+magnesium_config       \
 imx27lite_config:      unconfig
        @$(MKCONFIG) $(@:_config=) arm arm926ejs imx27lite logicpd mx27
 
@@ -3537,6 +3544,12 @@ PK1C20_config : unconfig
 PCI5441_config : unconfig
        @$(MKCONFIG)  PCI5441 nios2 nios2 pci5441 psyent
 
+# nios2 generic boards
+NIOS2_GENERIC = nios2-generic
+
+$(NIOS2_GENERIC:%=%_config) : unconfig
+       @$(MKCONFIG) $(@:_config=) nios2 nios2 nios2-generic altera
+
 #========================================================================
 ## Microblaze
 #========================================================================