brcm47xx: update bcma and ssb to master-2011-07-21
[openwrt.git] / target / linux / brcm47xx / patches-2.6.38 / 019-fix-boot.patch
1 --- a/arch/mips/kernel/head.S
2 +++ b/arch/mips/kernel/head.S
3 @@ -121,14 +121,6 @@
4 #endif
5 .endm
6
7 -#ifndef CONFIG_NO_EXCEPT_FILL
8 - /*
9 - * Reserved space for exception handlers.
10 - * Necessary for machines which link their kernels at KSEG0.
11 - */
12 - .fill 0x400
13 -#endif
14 -
15 EXPORT(_stext)
16
17 #ifdef CONFIG_BOOT_RAW
18 @@ -141,6 +133,14 @@ FEXPORT(__kernel_entry)
19 j kernel_entry
20 #endif
21
22 +#ifndef CONFIG_NO_EXCEPT_FILL
23 + /*
24 + * Reserved space for exception handlers.
25 + * Necessary for machines which link their kernels at KSEG0.
26 + */
27 + .fill 0x400
28 +#endif
29 +
30 #ifdef CONFIG_IMAGE_CMDLINE_HACK
31 .ascii "CMDLINE:"
32 EXPORT(__image_cmdline)
33 --- a/arch/mips/Kconfig
34 +++ b/arch/mips/Kconfig
35 @@ -85,6 +85,7 @@ config ATH79
36
37 config BCM47XX
38 bool "Broadcom BCM47XX based boards"
39 + select BOOT_RAW
40 select CEVT_R4K
41 select CSRC_R4K
42 select DMA_NONCOHERENT
This page took 0.046928 seconds and 5 git commands to generate.