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

Commit 4b575f3e authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

Merge remote-tracking branch 'jwb/next' into next

parents f7723f0e a8e616b9

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -3876,7 +3876,7 @@ F: arch/powerpc/platforms/512x/ 
F:	arch/powerpc/platforms/52xx/



LINUX FOR POWERPC EMBEDDED PPC4XX

M:	Josh Boyer <jwboyer@linux.vnet.ibm.com>

M:	Josh Boyer <jwboyer@gmail.com>

M:	Matt Porter <mporter@kernel.crashing.org>

W:	http://www.penguinppc.org/

L:	linuxppc-dev@lists.ozlabs.org

arch/powerpc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -842,7 +842,7 @@ config LOWMEM_CAM_NUM 


config RELOCATABLE

	bool "Build a relocatable kernel (EXPERIMENTAL)"

	depends on EXPERIMENTAL && ADVANCED_OPTIONS && FLATMEM && FSL_BOOKE

	depends on EXPERIMENTAL && ADVANCED_OPTIONS && FLATMEM && (FSL_BOOKE || PPC_47x)

	help

	  This builds a kernel image that is capable of running at the

	  location the kernel is loaded at (some alignment restrictions may

arch/powerpc/boot/dts/taishan.dts

+2 −2
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ 
				rx-fifo-size = <4096>;

				tx-fifo-size = <2048>;

				phy-mode = "rgmii";

				phy-map = <0x00000001>;

				phy-address = <1>;

				rgmii-device = <&RGMII0>;

				rgmii-channel = <0>;

 				zmii-device = <&ZMII0>;
@@ -361,7 +361,7 @@ 
				rx-fifo-size = <4096>;

				tx-fifo-size = <2048>;

				phy-mode = "rgmii";

				phy-map = <0x00000003>;

				phy-address = <3>;

				rgmii-device = <&RGMII0>;

				rgmii-channel = <1>;

 				zmii-device = <&ZMII0>;

arch/powerpc/boot/treeboot-iss4xx.c

+22 −1
Original line number Diff line number Diff line
@@ -34,11 +34,31 @@ 


BSS_STACK(4096);



static u32 ibm4xx_memstart;



static void iss_4xx_fixups(void)

{

	void *memory;

	u32 reg[3];



	memory = finddevice("/memory");

	if (!memory)

		fatal("Can't find memory node\n");

	/* This assumes #address-cells = 2, #size-cells =1 and that */

	getprop(memory, "reg", reg, sizeof(reg));

	if (reg[2])

		/* If the device tree specifies the memory range, use it */

		ibm4xx_memstart = reg[1];

	else

		/* othersize, read it from the SDRAM controller */

		ibm4xx_sdram_fixup_memsize();

}



static void *iss_4xx_vmlinux_alloc(unsigned long size)

{

	return (void *)ibm4xx_memstart;

}



#define SPRN_PIR	0x11E	/* Processor Indentification Register */

void platform_init(void)

{
@@ -48,6 +68,7 @@ void platform_init(void) 


	simple_alloc_init(_end, avail_ram, 128, 64);

	platform_ops.fixups = iss_4xx_fixups;

	platform_ops.vmlinux_alloc = iss_4xx_vmlinux_alloc;

	platform_ops.exit = ibm44x_dbcr_reset;

	pir_reg = mfspr(SPRN_PIR);

	fdt_set_boot_cpuid_phys(_dtb_start, pir_reg);

arch/powerpc/configs/44x/iss476-smp_defconfig

+3 −3
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@ CONFIG_SMP=y 
CONFIG_EXPERIMENTAL=y

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

CONFIG_SPARSE_IRQ=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_SYSFS_DEPRECATED_V2=y

CONFIG_BLK_DEV_INITRD=y

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

CONFIG_EXPERT=y
@@ -21,10 +21,11 @@ CONFIG_ISS4xx=y 
CONFIG_HZ_100=y

CONFIG_MATH_EMULATION=y

CONFIG_IRQ_ALL_CPUS=y

CONFIG_SPARSE_IRQ=y

CONFIG_CMDLINE_BOOL=y

CONFIG_CMDLINE="root=/dev/issblk0"

# CONFIG_PCI is not set

CONFIG_ADVANCED_OPTIONS=y

CONFIG_RELOCATABLE=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y
@@ -67,7 +68,6 @@ CONFIG_EXT3_FS=y 
# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set

CONFIG_EXT3_FS_POSIX_ACL=y

CONFIG_EXT3_FS_SECURITY=y

CONFIG_INOTIFY=y

CONFIG_PROC_KCORE=y

CONFIG_TMPFS=y

CONFIG_CRAMFS=y