aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ppc/boot
diff options
context:
space:
mode:
Diffstat (limited to 'arch/ppc/boot')
-rw-r--r--arch/ppc/boot/simple/Makefile2
-rw-r--r--arch/ppc/boot/simple/head.S9
2 files changed, 0 insertions, 11 deletions
diff --git a/arch/ppc/boot/simple/Makefile b/arch/ppc/boot/simple/Makefile
index 3e187fe0f599..7e975aa98404 100644
--- a/arch/ppc/boot/simple/Makefile
+++ b/arch/ppc/boot/simple/Makefile
@@ -154,8 +154,6 @@ zimageinitrd-$(CONFIG_LITE5200) := zImage.initrd-STRIPELF
154 154
155# This is a treeboot that needs init functions until the 155# This is a treeboot that needs init functions until the
156# boot rom is sorted out (i.e. this is short lived) 156# boot rom is sorted out (i.e. this is short lived)
157extra-aflags-$(CONFIG_REDWOOD_4) := -Wa,-m405
158extra.o-$(CONFIG_REDWOOD_4) := rw4/rw4_init.o rw4/rw4_init_brd.o
159EXTRA_AFLAGS := $(extra-aflags-y) 157EXTRA_AFLAGS := $(extra-aflags-y)
160# head.o needs to get the cacheflags defined. 158# head.o needs to get the cacheflags defined.
161AFLAGS_head.o += $(cacheflag-y) 159AFLAGS_head.o += $(cacheflag-y)
diff --git a/arch/ppc/boot/simple/head.S b/arch/ppc/boot/simple/head.S
index 524053202bb4..5e4adc298bf9 100644
--- a/arch/ppc/boot/simple/head.S
+++ b/arch/ppc/boot/simple/head.S
@@ -120,15 +120,6 @@ haveOF:
120 mtspr SPRN_DER,r4 120 mtspr SPRN_DER,r4
121#endif 121#endif
122 122
123#ifdef CONFIG_REDWOOD_4
124 /* All of this Redwood 4 stuff will soon disappear when the
125 * boot rom is straightened out.
126 */
127 mr r29, r3 /* Easier than changing the other code */
128 bl HdwInit
129 mr r3, r29
130#endif
131
132#if defined(CONFIG_MBX) || defined(CONFIG_RPX8260) || defined(CONFIG_PPC_PREP) 123#if defined(CONFIG_MBX) || defined(CONFIG_RPX8260) || defined(CONFIG_PPC_PREP)
133 mr r4,r29 /* put the board info pointer where the relocate 124 mr r4,r29 /* put the board info pointer where the relocate
134 * routine will find it 125 * routine will find it