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

[karo-tx-uboot.git] / board / karo / tx6 / tx6qdl.c

diff --git a/board/karo/tx6/tx6qdl.c b/board/karo/tx6/tx6qdl.c
index c41f0d46d3effd0e956b6380dbfd8dd6ea364ef4..d60d868ebcb4153f2f508e82222699051673394f 100644 (file)
--- a/board/karo/tx6/tx6qdl.c
+++ b/board/karo/tx6/tx6qdl.c
@@ -819,8 +819,8 @@ static const struct gpio stk5_lcd_gpios[] = {
 void lcd_ctrl_init(void *lcdbase)
 {
        int color_depth = 24;
-       char *video_mode = getenv("video_mode");
-       char *vm;
+       const char *video_mode = getenv("video_mode");
+       const char *vm;
        unsigned long val;
        int refresh = 60;
        struct fb_videomode *p = &tx6_fb_modes[0];
@@ -998,7 +998,7 @@ void lcd_ctrl_init(void *lcdbase)
        if (p != &fb_mode) {
                int ret;
 
-               printf("Creating new display-timing node from '%s'\n",
+               debug("Creating new display-timing node from '%s'\n",
                        video_mode);
                ret = karo_fdt_create_fb_mode(working_fdt, video_mode, p);
                if (ret)
@@ -1176,7 +1176,7 @@ void ft_board_setup(void *blob, bd_t *bd)
 {
        const char *baseboard = getenv("baseboard");
        int stk5_v5 = baseboard != NULL && (strcmp(baseboard, "stk5-v5") == 0);
-       char *video_mode = getenv("video_mode");
+       const char *video_mode = getenv("video_mode");
 
        karo_fdt_enable_node(blob, "stk5led", !stk5_v5);