lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

powerpc: Initialize btext subsystem later, after prom_init

Browse Source 
We were initializing the btext stuff from prom_init(), thus breaking
the rule that all communication between prom_init() and the rest of
the kernel has to be via the flattened device tree.  This removes
the btext initialization calls from prom_init() and initializes it
instead after the device tree is unflattened.  It would be nice to
do it earlier, but that needs some more infrastructure to find the
properties we need in the flattened device tree.

Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Paul Mackerras
2005-10-17 19:20:46 +10:00
parent 7dffb72028
commit 30cd4a4e9c
4 changed files with 4 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
arch/powerpc/kernel/setup_32.c
View File

@ -294,8 +294,6 @@ unsigned long __init early_init(unsigned long dt_ptr)
{
unsigned long offset = reloc_offset();
reloc_got2(offset);
/*
* Identify the CPU type and fix up code sections
* that depend on which cpu we have.
@ -303,12 +301,6 @@ unsigned long __init early_init(unsigned long dt_ptr)
identify_cpu(offset, 0);
do_cpu_ftr_fixups(offset);
#ifdef CONFIG_BOOTX_TEXT
btext_prepare_BAT();
#endif
reloc_got2(-offset);
return KERNELBASE + offset;
}
@ -578,13 +570,13 @@ void __init setup_arch(char **cmdline_p)
/* so udelay does something sensible, assume <= 1000 bogomips */
loops_per_jiffy = 500000000 / HZ;
#ifdef CONFIG_BOOTX_TEXT
map_boot_text();
#endif
unflatten_device_tree();
finish_device_tree();
#ifdef CONFIG_BOOTX_TEXT
init_boot_display();
#endif
#ifdef CONFIG_PPC_MULTIPLATFORM
/* This could be called "early setup arch", it must be done
* now because xmon need it