Merge branch 'drm-patches' of ssh://master.kernel.org/pub/scm/linux/kernel/git/airlie...

[linux-2.6] / arch / powerpc / boot / ops.h

diff --git a/arch/powerpc/boot/ops.h b/arch/powerpc/boot/ops.h
index 4d0cfd73398544471fef6ba1c34dedf685b91f18..86077066cd7cae1a8c42f0f679f44431ebd241a7 100644 (file)
--- a/arch/powerpc/boot/ops.h
+++ b/arch/powerpc/boot/ops.h
@@ -19,11 +19,13 @@
 #define        MAX_PATH_LEN            256
 #define        MAX_PROP_LEN            256 /* What should this be? */
 
+typedef void (*kernel_entry_t)(unsigned long r3, unsigned long r4, void *r5);
+
 /* Platform specific operations */
 struct platform_ops {
        void    (*fixups)(void);
        void    (*image_hdr)(const void *);
-       void *  (*malloc)(u32 size);
+       void *  (*malloc)(unsigned long size);
        void    (*free)(void *ptr);
        void *  (*realloc)(void *ptr, unsigned long size);
        void    (*exit)(void);
@@ -51,7 +53,7 @@ extern struct dt_ops dt_ops;
 /* Console operations */
 struct console_ops {
        int     (*open)(void);
-       void    (*write)(char *buf, int len);
+       void    (*write)(const char *buf, int len);
        void    (*edit_cmdline)(char *buf, int len);
        void    (*close)(void);
        void    *data;
@@ -70,16 +72,21 @@ struct serial_console_data {
 struct loader_info {
        void *promptr;
        unsigned long initrd_addr, initrd_size;
+       char *cmdline;
+       int cmdline_len;
 };
 extern struct loader_info loader_info;
 
-void start(void *sp);
+void start(void);
 int ft_init(void *dt_blob, unsigned int max_size, unsigned int max_find_device);
 int serial_console_init(void);
 int ns16550_console_init(void *devp, struct serial_console_data *scdp);
-void *simple_alloc_init(char *base, u32 heap_size, u32 granularity,
-               u32 max_allocs);
-
+int mpsc_console_init(void *devp, struct serial_console_data *scdp);
+void *simple_alloc_init(char *base, unsigned long heap_size,
+                       unsigned long granularity, unsigned long max_allocs);
+extern void flush_cache(void *, unsigned long);
+int dt_xlate_reg(void *node, int res, unsigned long *addr, unsigned long *size);
+int dt_xlate_addr(void *node, u32 *buf, int buflen, unsigned long *xlated_addr);
 
 static inline void *finddevice(const char *name)
 {
@@ -96,6 +103,11 @@ static inline int setprop(void *devp, const char *name,
 {
        return (dt_ops.setprop) ? dt_ops.setprop(devp, name, buf, buflen) : -1;
 }
+#define setprop_val(devp, name, val) \
+       do { \
+               typeof(val) x = (val); \
+               setprop((devp), (name), &x, sizeof(x)); \
+       } while (0)
 
 static inline int setprop_str(void *devp, const char *name, const char *buf)
 {
@@ -141,7 +153,21 @@ static inline void *find_node_by_devtype(const void *prev,
        return find_node_by_prop_value_str(prev, "device_type", type);
 }
 
-static inline void *malloc(u32 size)
+void dt_fixup_memory(u64 start, u64 size);
+void dt_fixup_cpu_clocks(u32 cpufreq, u32 tbfreq, u32 busfreq);
+void dt_fixup_clock(const char *path, u32 freq);
+void __dt_fixup_mac_addresses(u32 startindex, ...);
+#define dt_fixup_mac_addresses(...) \
+       __dt_fixup_mac_addresses(0, __VA_ARGS__, NULL)
+
+
+static inline void *find_node_by_linuxphandle(const u32 linuxphandle)
+{
+       return find_node_by_prop_value(NULL, "linux,phandle",
+                       (char *)&linuxphandle, sizeof(u32));
+}
+
+static inline void *malloc(unsigned long size)
 {
        return (platform_ops.malloc) ? platform_ops.malloc(size) : NULL;
 }
@@ -158,6 +184,8 @@ static inline void exit(void)
                platform_ops.exit();
        for(;;);
 }
+#define fatal(args...) { printf(args); exit(); }
+
 
 #define BSS_STACK(size) \
        static char _bss_stack[size]; \