From e7dc9bd2dcf3f55ed6fd7a8453ba695ea96ac19c Mon Sep 17 00:00:00 2001 From: Max Filippov Date: Mon, 5 Nov 2012 07:36:00 +0400 Subject: [PATCH] --- yaml --- r: 347257 b: refs/heads/master c: 0322cabd39e27614772595abb395871e86ebff66 h: refs/heads/master i: 347255: 9dfa40543337a5f70ac30052f85321be79996460 v: v3 --- [refs] | 2 +- trunk/arch/xtensa/boot/Makefile | 3 ++- trunk/arch/xtensa/boot/boot-uboot/Makefile | 14 ++++++++++++++ 3 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 trunk/arch/xtensa/boot/boot-uboot/Makefile diff --git a/[refs] b/[refs] index 1be715f03a3f..c042ae579d31 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f5ec298e56587462d91320c9e49f3e38f2beb17 +refs/heads/master: 0322cabd39e27614772595abb395871e86ebff66 diff --git a/trunk/arch/xtensa/boot/Makefile b/trunk/arch/xtensa/boot/Makefile index 4453859ebc78..ff974fc2935b 100644 --- a/trunk/arch/xtensa/boot/Makefile +++ b/trunk/arch/xtensa/boot/Makefile @@ -22,7 +22,7 @@ subdir-y := lib # Subdirs for the boot loader(s) bootdir-$(CONFIG_XTENSA_PLATFORM_ISS) += boot-elf -bootdir-$(CONFIG_XTENSA_PLATFORM_XT2000) += boot-redboot boot-elf +bootdir-$(CONFIG_XTENSA_PLATFORM_XT2000) += boot-redboot boot-elf boot-uboot zImage Image: $(bootdir-y) @@ -41,3 +41,4 @@ vmlinux.bin.gz: vmlinux.bin FORCE boot-elf: vmlinux.bin boot-redboot: vmlinux.bin.gz +boot-uboot: vmlinux.bin.gz diff --git a/trunk/arch/xtensa/boot/boot-uboot/Makefile b/trunk/arch/xtensa/boot/boot-uboot/Makefile new file mode 100644 index 000000000000..bfbf8af582f1 --- /dev/null +++ b/trunk/arch/xtensa/boot/boot-uboot/Makefile @@ -0,0 +1,14 @@ +# +# This file is subject to the terms and conditions of the GNU General Public +# License. See the file "COPYING" in the main directory of this archive +# for more details. +# + +UIMAGE_LOADADDR = 0xd0001000 +UIMAGE_COMPRESSION = gzip + +$(obj)/../uImage: vmlinux.bin.gz FORCE + $(call if_changed,uimage) + $(Q)$(kecho) ' Kernel: $@ is ready' + +zImage: $(obj)/../uImage