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

Commit 75e06e2d authored by Paul Mackerras's avatar Paul Mackerras
Browse files

Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx

parents 5bc97786 e0802967

arch/powerpc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -480,7 +480,7 @@ config MCA 
config PCI

	bool "PCI support" if 40x || CPM2 || PPC_83xx || PPC_85xx || PPC_86xx \

		|| PPC_MPC52xx || (EMBEDDED && (PPC_PSERIES || PPC_ISERIES)) \

		|| PPC_PS3

		|| PPC_PS3 || 44x

	default y if !40x && !CPM2 && !8xx && !PPC_83xx \

		&& !PPC_85xx && !PPC_86xx

	default PCI_PERMEDIA if !4xx && !CPM2 && !8xx

arch/powerpc/boot/4xx.c

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ void ibm4xx_denali_fixup_memsize(void) 
	val = DDR_GET_VAL(val, DDR_CS_MAP, DDR_CS_MAP_SHIFT);

	cs = 0;

	while (val) {

		if (val && 0x1)

		if (val & 0x1)

			cs++;

		val = val >> 1;

	}

arch/powerpc/boot/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -62,7 +62,8 @@ src-plat := of.c cuboot-52xx.c cuboot-824x.c cuboot-83xx.c cuboot-85xx.c holly.c 
		ps3-head.S ps3-hvcall.S ps3.c treeboot-bamboo.c cuboot-8xx.c \

		cuboot-pq2.c cuboot-sequoia.c treeboot-walnut.c cuboot-bamboo.c \

		fixed-head.S ep88xc.c cuboot-hpc2.c ep405.c cuboot-taishan.c \

		cuboot-katmai.c cuboot-rainier.c redboot-8xx.c ep8248e.c

		cuboot-katmai.c cuboot-rainier.c redboot-8xx.c ep8248e.c \

		cuboot-warp.c

src-boot := $(src-wlib) $(src-plat) empty.c



src-boot := $(addprefix $(obj)/, $(src-boot))
@@ -208,6 +209,7 @@ image-$(CONFIG_RAINIER) += cuImage.rainier 
image-$(CONFIG_WALNUT)			+= treeImage.walnut

image-$(CONFIG_TAISHAN)			+= cuImage.taishan

image-$(CONFIG_KATMAI)			+= cuImage.katmai

image-$(CONFIG_WARP)			+= cuImage.warp

endif



ifneq ($(CONFIG_REDBOOT),"")

arch/powerpc/boot/cuboot-warp.c

0 → 100644
+39 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2008 PIKA Technologies

 *   Sean MacLennan <smaclennan@pikatech.com>

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of the GNU General Public License version 2 as published

 * by the Free Software Foundation.

 */



#include "ops.h"

#include "4xx.h"

#include "cuboot.h"



#define TARGET_44x

#include "ppcboot.h"



static bd_t bd;



static void warp_fixups(void)

{

	unsigned long sysclk = 66000000;



	ibm440ep_fixup_clocks(sysclk, 11059200, 50000000);

	ibm4xx_sdram_fixup_memsize();

	ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");

	dt_fixup_mac_addresses(&bd.bi_enetaddr);

}





void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,

		   unsigned long r6, unsigned long r7)

{

	CUBOOT_INIT();



	platform_ops.fixups = warp_fixups;

	platform_ops.exit = ibm44x_dbcr_reset;

	fdt_init(_dtb_start);

	serial_console_init();

}

arch/powerpc/boot/dts/ebony.dts

+3 −2
Original line number Diff line number Diff line
@@ -158,9 +158,10 @@ 
					};

				};



				ds1743@1,0 {

				nvram@1,0 {

					/* NVRAM & RTC */

					compatible = "ds1743";

					compatible = "ds1743-nvram";

					#bytes = <2000>;

					reg = <1 0 2000>;

				};