Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master'

diff --git a/arch/arm/cpu/armv7/tegra20/display.c b/arch/arm/cpu/armv7/tegra20/display.c
index 488f0c639dd088d183ec1c2058e1f08d6e0df087..fd77f3f0eff368e5a0a83762390826b79f3eada3 100644 (file)
--- a/arch/arm/cpu/armv7/tegra20/display.c
+++ b/arch/arm/cpu/armv7/tegra20/display.c
@@ -328,7 +328,7 @@ static int tegra_display_decode_config(const void *blob,
        rgb = fdt_subnode_offset(blob, node, "rgb");
 
        config->panel_node = fdtdec_lookup_phandle(blob, rgb, "nvidia,panel");
-       if (!config->panel_node < 0) {
+       if (config->panel_node < 0) {
                debug("%s: Cannot find panel information\n", __func__);
                return -1;
        }

diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h
index 76dad4e88cd932da1b803ad80badc74f748ffd22..1c770c90fecaa3d98a144f5dcfe523c531a36f07 100644 (file)
--- a/include/configs/tegra-common-post.h
+++ b/include/configs/tegra-common-post.h
@@ -101,13 +101,12 @@
        \
        "do_sysboot_boot="                                                \
                "sysboot ${devtype} ${devnum}:${rootpart} any "           \
-                       "${scriptaddr} ${prefix}extlinux.conf\0"          \
+                       "${scriptaddr} ${prefix}extlinux/extlinux.conf\0" \
        \
        "sysboot_boot="                                                   \
                "if test -e ${devtype} ${devnum}:${rootpart} "            \
-                               "${prefix}extlinux.conf; then "           \
-                       "echo Found extlinux config "                     \
-                               "${prefix}extlinux.conf; "                \
+                               "${prefix}extlinux/extlinux.conf; then "  \
+                       "echo Found ${prefix}extlinux/extlinux.conf; "    \
                        "run do_sysboot_boot; "                           \
                        "echo SCRIPT FAILED: continuing...; "             \
                "fi\0"                                                    \
@@ -174,6 +173,8 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
        TEGRA_DEVICE_SETTINGS \
        MEM_LAYOUT_ENV_SETTINGS \
+       "fdt_high=ffffffff\0" \
+       "initrd_high=ffffffff\0" \
        BOOTCMDS_COMMON \
        BOARD_EXTRA_ENV_SETTINGS
 

diff --git a/include/configs/tegra-common-ums.h b/include/configs/tegra-common-ums.h
index 7bd8960a3297eae3a4bda9b58a97a37b53c989dd..578ca68b578181db7cb09ac6b81a0fbbf789977e 100644 (file)
--- a/include/configs/tegra-common-ums.h
+++ b/include/configs/tegra-common-ums.h
@@ -6,7 +6,7 @@
  */
 
 #ifndef _TEGRA_COMMON_UMS_H_
-#define _TEGRA_COMMON_UMS_H
+#define _TEGRA_COMMON_UMS_H_
 
 #ifndef CONFIG_SPL_BUILD
 /* USB gadget, and mass storage protocol */