Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 927c258a authored by Paul Mackerras's avatar Paul Mackerras
Browse files

Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into merge

parents d3d3d3cd 8939700e

arch/powerpc/boot/.gitignore

+3 −5
Original line number Diff line number Diff line
@@ -20,21 +20,19 @@ kernel-vmlinux.strip.gz 
mktree

uImage

cuImage.*

dtbImage.*

treeImage.*

zImage

zImage.initrd

zImage.bin.*

zImage.chrp

zImage.coff

zImage.coff.lds

zImage.ep*

zImage.holly

zImage.iseries

zImage.*lds

zImage.miboot

zImage.pmac

zImage.pseries

zImage.redboot*

zImage.sandpoint

zImage.vmode

zconf.h

zlib.h

zutil.h

arch/powerpc/boot/Makefile

+4 −2
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ $(obj)/zImage.lds $(obj)/zImage.coff.lds $(obj)/zImage.ps3.lds: $(obj)/%: $(srct 
	@cp $< $@



clean-files := $(zlib) $(zlibheader) $(zliblinuxheader) \

		empty.c zImage zImage.coff.lds zImage.ps3.lds zImage.lds

		empty.c zImage.coff.lds zImage.ps3.lds zImage.lds



quiet_cmd_bootcc = BOOTCC  $@

      cmd_bootcc = $(CROSS32CC) -Wp,-MD,$(depfile) $(BOOTCFLAGS) -c -o $@ $<
@@ -339,7 +339,9 @@ install: $(CONFIGURE) $(addprefix $(obj)/, $(image-y)) 
	sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)" $<



# anything not in $(targets)

clean-files += $(image-) $(initrd-) zImage zImage.initrd cuImage.* treeImage.* \

clean-files += $(image-) $(initrd-) cuImage.* dtbImage.* treeImage.* \

	zImage zImage.initrd zImage.chrp zImage.coff zImage.holly \

	zImage.iseries zImage.miboot zImage.pmac zImage.pseries \

	otheros.bld *.dtb



# clean up files cached by wrapper

arch/powerpc/boot/dts/mpc8377_mds.dts

+13 −5
Original line number Diff line number Diff line
@@ -271,27 +271,35 @@ 
		dma@82a8 {

			#address-cells = <1>;

			#size-cells = <1>;

			compatible = "fsl,mpc8349-dma";

			compatible = "fsl,mpc8377-dma", "fsl,elo-dma";

			reg = <0x82a8 4>;

			ranges = <0 0x8100 0x1a8>;

			interrupt-parent = <&ipic>;

			interrupts = <0x47 8>;

			cell-index = <0>;

			dma-channel@0 {

				compatible = "fsl,mpc8349-dma-channel";

				compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel";

				reg = <0 0x80>;

				interrupt-parent = <&ipic>;

				interrupts = <0x47 8>;

			};

			dma-channel@80 {

				compatible = "fsl,mpc8349-dma-channel";

				compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel";

				reg = <0x80 0x80>;

				interrupt-parent = <&ipic>;

				interrupts = <0x47 8>;

			};

			dma-channel@100 {

				compatible = "fsl,mpc8349-dma-channel";

				compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel";

				reg = <0x100 0x80>;

				interrupt-parent = <&ipic>;

				interrupts = <0x47 8>;

			};

			dma-channel@180 {

				compatible = "fsl,mpc8349-dma-channel";

				compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel";

				reg = <0x180 0x28>;

				interrupt-parent = <&ipic>;

				interrupts = <0x47 8>;

			};

		};

lib/lmb.c

+2 −1
Original line number Diff line number Diff line
@@ -48,7 +48,8 @@ void lmb_dump_all(void) 
	}



	pr_info("    reserved.cnt	  = 0x%lx\n", lmb.reserved.cnt);

	pr_info("    reserved.size	  = 0x%lx\n", lmb.reserved.size);

	pr_info("    reserved.size	  = 0x%llx\n",

	    (unsigned long long)lmb.memory.size);

	for (i=0; i < lmb.reserved.cnt ;i++) {

		pr_info("    reserved.region[0x%lx].base       = 0x%llx\n",

		    i, (unsigned long long)lmb.reserved.region[i].base);