Merge branch 'tx51-devel' into uboot-merge

diff --cc board/karo/tx51/tx51.c
index 40f5598039bc7a69c4a4fd4c97c26bf2873fb0de,7e3bb68798677ad3f695ab01d499e823ca304f90..eff52076dd6957f684f922027bddaef0fb4b86c3
--- 1/board/karo/tx51/tx51.c
--- 2/board/karo/tx51/tx51.c
+++ b/board/karo/tx51/tx51.c
@@@ -791,10 -800,8 +805,9 @@@ void lcd_ctrl_init(void *lcdbase
        }
  
        karo_fdt_move_fdt();
 +      lcd_bl_polarity = karo_fdt_get_backlight_polarity(working_fdt);
  
-       vm = getenv("video_mode");
-       if (vm == NULL) {
+       if (video_mode == NULL) {
                debug("Disabling LCD\n");
                lcd_enabled = 0;
                return;

diff --cc include/configs/tx51.h
Simple merge