Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 084647125227b870267859d544c91c03743816dc

Authored by David Gibson
Committed by Paul Mackerras
1 parent 131208c5bb
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[POWERPC] Make more OF-related bootwrapper functions available to non-OF platforms 

Commit 2e6016133755eb3cc44e8efab92573d23ed75888 split up
arch/powerpc/boot/of.c so that some OF functions can be used on
platforms that don't want to use the overall OF platform boot code.
This is useful on things like PReP which can have an OF implementation
which is useful for debugging output, but inadequate for booting.

However, that commit didn't export quite enough things to make a
usable OF console on a non-OF system.  In particular, the device tree
manipulation performed to initialize the OF console code must
explicitly use the OF device tree, rather than the flattened device
tree, even if the system is otherwise booting using a flattened device
tree.  This makes it so.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>

Showing 4 changed files with 45 additions and 39 deletions Side-by-side Diff

arch/powerpc/boot/of.c
Diff comments   View file @ 0846471
... ... @@ -63,36 +63,6 @@
63 63 }
64 64 }
65 65  
66   -static void *of_vmlinux_alloc(unsigned long size)
67   -{
68   - void *p = malloc(size);
69   -
70   - if (!p)
71   - fatal("Can't allocate memory for kernel image!\n\r");
72   -
73   - return p;
74   -}
75   -
76   -/*
77   - * OF device tree routines
78   - */
79   -static void *of_finddevice(const char *name)
80   -{
81   - return (phandle) of_call_prom("finddevice", 1, 1, name);
82   -}
83   -
84   -static int of_getprop(const void *phandle, const char *name, void *buf,
85   - const int buflen)
86   -{
87   - return of_call_prom("getprop", 4, 1, phandle, name, buf, buflen);
88   -}
89   -
90   -static int of_setprop(const void *phandle, const char *name, const void *buf,
91   - const int buflen)
92   -{
93   - return of_call_prom("setprop", 4, 1, phandle, name, buf, buflen);
94   -}
95   -
96 66 void platform_init(unsigned long a1, unsigned long a2, void *promptr)
97 67 {
98 68 platform_ops.image_hdr = of_image_hdr;
arch/powerpc/boot/of.h
Diff comments   View file @ 0846471
... ... @@ -7,7 +7,13 @@
7 7 void of_init(void *promptr);
8 8 int of_call_prom(const char *service, int nargs, int nret, ...);
9 9 void *of_claim(unsigned long virt, unsigned long size, unsigned long align);
  10 +void *of_vmlinux_alloc(unsigned long size);
10 11 void of_exit(void);
  12 +void *of_finddevice(const char *name);
  13 +int of_getprop(const void *phandle, const char *name, void *buf,
  14 + const int buflen);
  15 +int of_setprop(const void *phandle, const char *name, const void *buf,
  16 + const int buflen);
11 17  
12 18 /* Console functions */
13 19 void of_console_init(void);
arch/powerpc/boot/ofconsole.c
Diff comments   View file @ 0846471
... ... @@ -24,10 +24,10 @@
24 24 {
25 25 void *devp;
26 26  
27   - if (((devp = finddevice("/chosen")) != NULL)
28   - && (getprop(devp, "stdout", &of_stdout_handle,
29   - sizeof(of_stdout_handle))
30   - == sizeof(of_stdout_handle)))
  27 + if (((devp = of_finddevice("/chosen")) != NULL)
  28 + && (of_getprop(devp, "stdout", &of_stdout_handle,
  29 + sizeof(of_stdout_handle))
  30 + == sizeof(of_stdout_handle)))
31 31 return 0;
32 32  
33 33 return -1;
arch/powerpc/boot/oflib.c
Diff comments   View file @ 0846471
... ... @@ -110,25 +110,25 @@
110 110 phandle oprom, chosen;
111 111 char version[64];
112 112  
113   - oprom = finddevice("/openprom");
  113 + oprom = of_finddevice("/openprom");
114 114 if (oprom == (phandle) -1)
115 115 return 0;
116   - if (getprop(oprom, "model", version, sizeof(version)) <= 0)
  116 + if (of_getprop(oprom, "model", version, sizeof(version)) <= 0)
117 117 return 0;
118 118 version[sizeof(version)-1] = 0;
119 119 printf("OF version = '%s'\r\n", version);
120 120 if (!string_match(version, "Open Firmware, 1.")
121 121 && !string_match(version, "FirmWorks,3."))
122 122 return 0;
123   - chosen = finddevice("/chosen");
  123 + chosen = of_finddevice("/chosen");
124 124 if (chosen == (phandle) -1) {
125   - chosen = finddevice("/chosen@0");
  125 + chosen = of_finddevice("/chosen@0");
126 126 if (chosen == (phandle) -1) {
127 127 printf("no chosen\n");
128 128 return 0;
129 129 }
130 130 }
131   - if (getprop(chosen, "mmu", &chosen_mmu, sizeof(chosen_mmu)) <= 0) {
  131 + if (of_getprop(chosen, "mmu", &chosen_mmu, sizeof(chosen_mmu)) <= 0) {
132 132 printf("no mmu\n");
133 133 return 0;
134 134 }
135 135  
... ... @@ -166,8 +166,38 @@
166 166 return (void *) virt;
167 167 }
168 168  
  169 +void *of_vmlinux_alloc(unsigned long size)
  170 +{
  171 + void *p = malloc(size);
  172 +
  173 + if (!p)
  174 + fatal("Can't allocate memory for kernel image!\n\r");
  175 +
  176 + return p;
  177 +}
  178 +
169 179 void of_exit(void)
170 180 {
171 181 of_call_prom("exit", 0, 0);
  182 +}
  183 +
  184 +/*
  185 + * OF device tree routines
  186 + */
  187 +void *of_finddevice(const char *name)
  188 +{
  189 + return (phandle) of_call_prom("finddevice", 1, 1, name);
  190 +}
  191 +
  192 +int of_getprop(const void *phandle, const char *name, void *buf,
  193 + const int buflen)
  194 +{
  195 + return of_call_prom("getprop", 4, 1, phandle, name, buf, buflen);
  196 +}
  197 +
  198 +int of_setprop(const void *phandle, const char *name, const void *buf,
  199 + const int buflen)
  200 +{
  201 + return of_call_prom("setprop", 4, 1, phandle, name, buf, buflen);
172 202 }