diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2012-05-02 18:27:26 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2012-05-02 18:27:26 +0000 |
commit | fa0ed4d09c5ba40e2945cae6d19249cb270e7778 (patch) | |
tree | d84102c9dfa6893dc11c30edbe8456c9217a02d9 /target/linux/mpc83xx/patches-2.6.36/019-powerpc_create_fit_uImages.patch | |
parent | b0d93742c9c898e00d13bfb2c4c309132d96c81a (diff) | |
download | master-187ad058-fa0ed4d09c5ba40e2945cae6d19249cb270e7778.tar.gz master-187ad058-fa0ed4d09c5ba40e2945cae6d19249cb270e7778.tar.bz2 master-187ad058-fa0ed4d09c5ba40e2945cae6d19249cb270e7778.zip |
mpc83xx: remove 2.6.36 support
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31555 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/mpc83xx/patches-2.6.36/019-powerpc_create_fit_uImages.patch')
-rw-r--r-- | target/linux/mpc83xx/patches-2.6.36/019-powerpc_create_fit_uImages.patch | 94 |
1 files changed, 0 insertions, 94 deletions
diff --git a/target/linux/mpc83xx/patches-2.6.36/019-powerpc_create_fit_uImages.patch b/target/linux/mpc83xx/patches-2.6.36/019-powerpc_create_fit_uImages.patch deleted file mode 100644 index bf4caa9a18..0000000000 --- a/target/linux/mpc83xx/patches-2.6.36/019-powerpc_create_fit_uImages.patch +++ /dev/null @@ -1,94 +0,0 @@ ---- a/arch/powerpc/Makefile -+++ b/arch/powerpc/Makefile -@@ -166,7 +166,8 @@ all: zImage - - # With make 3.82 we cannot mix normal and wildcard targets - BOOT_TARGETS1 := zImage zImage.initrd uImage --BOOT_TARGETS2 := zImage% dtbImage% treeImage.% cuImage.% simpleImage.% -+BOOT_TARGETS2 := uImage.fit.% zImage% dtbImage% treeImage.% cuImage.% \ -+ simpleImage.% - - PHONY += $(BOOT_TARGETS1) $(BOOT_TARGETS2) - -@@ -199,6 +200,7 @@ define archhelp - @echo '* zImage - Build default images selected by kernel config' - @echo ' zImage.* - Compressed kernel image (arch/$(ARCH)/boot/zImage.*)' - @echo ' uImage - U-Boot native image format' -+ @echo ' uImage.fit.<dt> - U-Boot Flattened Image Tree image format' - @echo ' cuImage.<dt> - Backwards compatible U-Boot image for older' - @echo ' versions which do not support device trees' - @echo ' dtbImage.<dt> - zImage with an embedded device tree blob' ---- a/arch/powerpc/boot/.gitignore -+++ b/arch/powerpc/boot/.gitignore -@@ -19,6 +19,7 @@ kernel-vmlinux.strip.c - kernel-vmlinux.strip.gz - mktree - uImage -+uImage.fit.* - cuImage.* - dtbImage.* - treeImage.* ---- a/arch/powerpc/boot/Makefile -+++ b/arch/powerpc/boot/Makefile -@@ -314,6 +314,9 @@ $(obj)/zImage.iseries: vmlinux - $(obj)/uImage: vmlinux $(wrapperbits) - $(call if_changed,wrap,uboot) - -+$(obj)/uImage.fit.%: vmlinux $(obj)/%.dtb $(wrapperbits) -+ $(call if_changed,wrap,uboot.fit,,$(obj)/$*.dtb) -+ - $(obj)/cuImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits) - $(call if_changed,wrap,cuboot-$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz) - -@@ -353,7 +356,7 @@ install: $(CONFIGURE) $(addprefix $(obj) - - # anything not in $(targets) - clean-files += $(image-) $(initrd-) cuImage.* dtbImage.* treeImage.* \ -- zImage zImage.initrd zImage.chrp zImage.coff zImage.holly \ -+ uImage.* zImage zImage.initrd zImage.chrp zImage.coff zImage.holly \ - zImage.iseries zImage.miboot zImage.pmac zImage.pseries \ - zImage.maple simpleImage.* otheros.bld *.dtb - ---- a/arch/powerpc/boot/wrapper -+++ b/arch/powerpc/boot/wrapper -@@ -46,6 +46,9 @@ CROSS= - # mkimage wrapper script - MKIMAGE=$srctree/scripts/mkuboot.sh - -+# script to generate an .its file for uImage.fit.* images -+MKITS=$srctree/scripts/mkits.sh -+ - # directory for object and other files used by this script - object=arch/powerpc/boot - objbin=$object -@@ -161,7 +164,7 @@ coff) - lds=$object/zImage.coff.lds - link_address='0x500000' - ;; --miboot|uboot) -+miboot|uboot|uboot.fit) - # miboot and U-boot want just the bare bits, not an ELF binary - ext=bin - objflags="-O binary" -@@ -282,6 +285,21 @@ uboot) - if [ -z "$cacheit" ]; then - rm -f "$vmz" - fi -+ exit 0 -+ ;; -+uboot.fit) -+ rm -f "$ofile" -+ ${MKITS} -A ppc -C gzip -a $membase -e $membase -v $version \ -+ -d "$srctree/$dtb" -k "$srctree/$vmz" -o "$object/uImage.its" -+ -+ # mkimage calls dtc for FIT images so use kernel dtc if necessary -+ export PATH=$PATH:$srctree/scripts/dtc -+ -+ ${MKIMAGE} -f "$object/uImage.its" "$ofile" -+ rm "$object/uImage.its" -+ if [ -z "$cacheit" ]; then -+ rm -f "$vmz" -+ fi - exit 0 - ;; - esac |