karo: prevent video_mode variable from being clobbered by karo_fdt_set_display()

[karo-tx-uboot.git] / board / karo / common / karo.h

diff --git a/board/karo/common/karo.h b/board/karo/common/karo.h
index dbfa58e56649431e531a2be725e7bb170edeff89..854994df11dfbb11e16018c97092d898a68b14d7 100644 (file)
--- a/board/karo/common/karo.h
+++ b/board/karo/common/karo.h
@@ -21,6 +21,7 @@ void karo_fdt_remove_node(void *blob, const char *node);
 void karo_fdt_move_fdt(void);
 void karo_fdt_fixup_touchpanel(void *blob);
 void karo_fdt_fixup_usb_otg(void *blob, const char *node, const char *phy);
+void karo_fdt_fixup_flexcan(void *blob, int xcvr_present);
 void karo_fdt_del_prop(void *blob, const char *compat, phys_addr_t offs,
                const char *prop);
 void karo_fdt_enable_node(void *blob, const char *node, int enable);
@@ -30,6 +31,8 @@ int karo_fdt_get_fb_mode(void *blob, const char *name,
 int karo_fdt_update_fb_mode(void *blob, const char *name);
 int karo_fdt_create_fb_mode(void *blob, const char *name,
                        struct fb_videomode *mode);
+const char *karo_fdt_set_display(const char *video_mode, const char *lcd_path,
+                               const char *lvds_path);
 #else
 static inline void karo_fdt_remove_node(void *blob, const char *node)
 {
@@ -44,6 +47,9 @@ static inline void karo_fdt_fixup_usb_otg(void *blob, const char *node,
                                        const char *phy)
 {
 }
+static inline void karo_fdt_fixup_flexcan(void *blob, int xcvr_present)
+{
+}
 static inline void karo_fdt_del_prop(void *blob, const char *compat,
                                phys_addr_t offs, const char *prop)
 {
@@ -71,6 +77,11 @@ static inline int karo_fdt_create_fb_mode(void *blob,
 {
        return 0;
 }
+static inline const char *karo_fdt_set_display(const char *video_mode, const char *lcd_path,
+                                       const char *lvds_path)
+{
+       return video_mode;
+}
 #endif
 
 int karo_load_splashimage(int mode);