diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-07-01 15:48:25 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-07-01 15:48:25 +0200 |
| commit | 019b57cc1d280c3768e2e8a7ff22e07a64c2f670 (patch) | |
| tree | 7b0d64f79797ce3bd493d9246fc2dd42aff63211 | |
| parent | e99f30e105a253ee64bef1ef83b86a47e0d3b6f1 (diff) | |
| parent | fe7b7cd26683b29bed407bf5ab778e8d80201d73 (diff) | |
| download | u-boot-019b57cc1d280c3768e2e8a7ff22e07a64c2f670.tar.gz u-boot-019b57cc1d280c3768e2e8a7ff22e07a64c2f670.tar.xz u-boot-019b57cc1d280c3768e2e8a7ff22e07a64c2f670.zip | |
Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master'
| -rw-r--r-- | arch/arm/cpu/armv7/tegra20/display.c | 2 | ||||
| -rw-r--r-- | include/configs/tegra-common-post.h | 9 | ||||
| -rw-r--r-- | include/configs/tegra-common-ums.h | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/arch/arm/cpu/armv7/tegra20/display.c b/arch/arm/cpu/armv7/tegra20/display.c index 488f0c639d..fd77f3f0ef 100644 --- 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 76dad4e88c..1c770c90fe 100644 --- 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 7bd8960a32..578ca68b57 100644 --- 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 */ |