[oe-commits] org.oe.dev linux-efika-2.6.19-rc6.bb: Bring patch local, was no longer available online.

[likewise commit]

linux-efika-2.6.19-rc6.bb: Bring patch local, was no longer available online.

Author: likewise at openembedded.org
Branch: org.openembedded.dev
Revision: 548157e6cd17d49950d2b216414b1570f06705db
ViewMTN: http://monotone.openembedded.org/revision.psp?id=548157e6cd17d49950d2b216414b1570f06705db
Files:
1
packages/linux/linux-efika/0001-powerpc-Add-device-tree-fixup-for-the-EFIKA.txt
packages/linux/linux-efika_2.6.18+2.6.19-rc6.bb
Diffs:

#
# mt diff -r6f54d314925e61cac9f7a6c66544fa07c6281950 -r548157e6cd17d49950d2b216414b1570f06705db
#
# 
# 
# add_file "packages/linux/linux-efika/0001-powerpc-Add-device-tree-fixup-for-the-EFIKA.txt"
#  content [8405cd0cd4013cbd3ab806cb7ab3e6860b56d244]
# 
# patch "packages/linux/linux-efika_2.6.18+2.6.19-rc6.bb"
#  from [06382c243ca16578b84f66e7542adebbc64a76a5]
#    to [26c6ea4ead01ea2614688932a93b68c6215afdac]
# 
============================================================
--- packages/linux/linux-efika/0001-powerpc-Add-device-tree-fixup-for-the-EFIKA.txt	8405cd0cd4013cbd3ab806cb7ab3e6860b56d244
+++ packages/linux/linux-efika/0001-powerpc-Add-device-tree-fixup-for-the-EFIKA.txt	8405cd0cd4013cbd3ab806cb7ab3e6860b56d244
@@ -0,0 +1,99 @@
+From 6c8a0f1870285e82dc473d31ac297d570460dd66 Mon Sep 17 00:00:00 2001
+From: Sylvain Munaut <tnt at 246tNt.com>
+Date: Thu, 21 Dec 2006 22:26:39 +0100
+Subject: [PATCH] powerpc: Add device tree fixup for the EFIKA
+
+We make the efika device tree compliant with the defined bindings
+(at least compliant enough). We also add some missing bits.
+
+Signed-off-by: Sylvain Munaut <tnt at 246tNt.com>
+---
+ arch/powerpc/kernel/prom_init.c |   74 +++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 74 insertions(+), 0 deletions(-)
+
+diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
+index 520ef42..294e875 100644
+--- a/arch/powerpc/kernel/prom_init.c
++++ b/arch/powerpc/kernel/prom_init.c
+@@ -2117,11 +2117,78 @@ #else
+ #define fixup_device_tree_pmac()
+ #endif
+ 
++#ifdef CONFIG_PPC_EFIKA
++/* The current fw of the Efika has a device tree needs quite a few
++ * fixups to be compliant with the mpc52xx bindings. It's currently
++ * unknown if it will ever be compliant (come on bPlan ...) so we do fixups.
++ * NOTE that we (barely) tolerate it because the EFIKA was out before
++ * the bindings were finished, for any new boards -> RTFM ! */
++
++struct subst_entry {
++	char *path;
++	char *property;
++	void *value;
++	int value_len;
++};
++
++static void __init fixup_device_tree_efika(void)
++{
++	/* Substitution table */
++	#define prop_cstr(x) x, sizeof(x)
++	int prop_sound_irq[3] = { 2, 2, 0 };
++	struct subst_entry efika_subst_table[] = {
++		{ "/builtin/sound",	"compatible",	prop_cstr("mpc5200b-psc-ac97\0mpc52xx-psc-ac97") },
++		{ "/builtin/sound",	"interrupts",	prop_sound_irq, sizeof(prop_sound_irq) },
++		{}
++	};
++	#undef prop_cstr
++
++	/* Vars */
++	u32 node;
++	char prop[64];
++	int rv, i;
++
++	/* Check if we're really running on a EFIKA */
++	node = call_prom("finddevice", 1, 1, ADDR("/"));
++	if (!PHANDLE_VALID(node))
++		return;
++
++	rv = prom_getprop(node, "model", prop, sizeof(prop));
++	if (rv == PROM_ERROR)
++		return;
++	if (strcmp(prop, "EFIKA5K2"))
++		return;
++
++	prom_printf("Applying EFIKA device tree fixups\n");
++
++	/* Process substitution table */
++	for (i=0; efika_subst_table[i].path; i++) {
++		struct subst_entry *se = &efika_subst_table[i];
++
++		node = call_prom("finddevice", 1, 1, ADDR(se->path));
++		if (!PHANDLE_VALID(node)) {
++			prom_printf("fixup_device_tree_efika: ",
++				"skipped entry %x - not found\n", i);
++			continue;
++		}
++
++		rv = prom_setprop(node, se->path, se->property,
++					se->value, se->value_len );
++		if (rv == PROM_ERROR)
++			prom_printf("fixup_device_tree_efika: ",
++				"skipped entry %x - setprop error\n", i);
++	}
++}
++#else
++#define fixup_device_tree_efika()
++#endif
++
+ static void __init fixup_device_tree(void)
+ {
+ 	fixup_device_tree_maple();
+ 	fixup_device_tree_chrp();
+ 	fixup_device_tree_pmac();
++	fixup_device_tree_efika();
+ }
+ 
+ static void __init prom_find_boot_cpu(void)
+-- 
+1.4.2
+
============================================================
--- packages/linux/linux-efika_2.6.18+2.6.19-rc6.bb	06382c243ca16578b84f66e7542adebbc64a76a5
+++ packages/linux/linux-efika_2.6.18+2.6.19-rc6.bb	26c6ea4ead01ea2614688932a93b68c6215afdac
@@ -1,13 +1,13 @@ LICENSE = "GPL"
 DESCRIPTION = "Linux Kernel for the EFIKA dev platform"
 SECTION = "kernel"
 LICENSE = "GPL"
-PR = "r2"
+PR = "r3"
 
 COMPATIBLE_MACHINE = "efika"
 
 SRC_URI = "http://www.efika.de/download/linux-2.6.19-rc6_efika.tgz \
            file://0001-sound-Add-support-for-the-MPC52xx-PSC-AC97-Link.txt;patch=1 \
-           http://www.246tnt.com/files/0001-powerpc-Add-device-tree-fixup-for-the-EFIKA.txt;patch=1 \
+           file://0001-powerpc-Add-device-tree-fixup-for-the-EFIKA.txt;patch=1 \
            file://defconfig \
 		   "
 #	http://www.246tnt.com/files/0001-sound-Add-support-for-the-MPC52xx-PSC-AC97-Link.txt;patch=1 \
@@ -23,7 +23,7 @@ do_configure() {
 
 do_configure() {
 		install -m 644 ${WORKDIR}/defconfig ${S}/.config
-		make ARCH=${ARCH} oldconfig
+		yes | make ARCH=${ARCH} oldconfig
 }
 
 do_deploy() {