V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

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

This commit is contained in:
Albert ARIBAUD 2014-07-01 15:48:25 +02:00
parent e99f30e105 fe7b7cd266
commit 019b57cc1d
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/cpu/armv7/tegra20/display.c
View File

@ -328,7 +328,7 @@ static int tegra_display_decode_config(const void *blob,
rgb = fdt_subnode_offset(blob, node, "rgb"); rgb = fdt_subnode_offset(blob, node, "rgb");
config->panel_node = fdtdec_lookup_phandle(blob, rgb, "nvidia,panel"); 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__); debug("%s: Cannot find panel information\n", __func__);
return -1; return -1;
} }

9
include/configs/tegra-common-post.h
View File

@ -101,13 +101,12 @@
\ \
"do_sysboot_boot=" \ "do_sysboot_boot=" \
"sysboot ${devtype} ${devnum}:${rootpart} any " \ "sysboot ${devtype} ${devnum}:${rootpart} any " \
"${scriptaddr} ${prefix}extlinux.conf\0" \ "${scriptaddr} ${prefix}extlinux/extlinux.conf\0" \
\ \
"sysboot_boot=" \ "sysboot_boot=" \
"if test -e ${devtype} ${devnum}:${rootpart} " \ "if test -e ${devtype} ${devnum}:${rootpart} " \
"${prefix}extlinux.conf; then " \ "${prefix}extlinux/extlinux.conf; then " \
"echo Found extlinux config " \ "echo Found ${prefix}extlinux/extlinux.conf; " \
"${prefix}extlinux.conf; " \
"run do_sysboot_boot; " \ "run do_sysboot_boot; " \
"echo SCRIPT FAILED: continuing...; " \ "echo SCRIPT FAILED: continuing...; " \
"fi\0" \ "fi\0" \
@ -174,6 +173,8 @@
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
TEGRA_DEVICE_SETTINGS \ TEGRA_DEVICE_SETTINGS \
MEM_LAYOUT_ENV_SETTINGS \ MEM_LAYOUT_ENV_SETTINGS \
"fdt_high=ffffffff\0" \
"initrd_high=ffffffff\0" \
BOOTCMDS_COMMON \ BOOTCMDS_COMMON \
BOARD_EXTRA_ENV_SETTINGS BOARD_EXTRA_ENV_SETTINGS

2
include/configs/tegra-common-ums.h
View File

@ -6,7 +6,7 @@
*/ */
#ifndef _TEGRA_COMMON_UMS_H_ #ifndef _TEGRA_COMMON_UMS_H_
#define _TEGRA_COMMON_UMS_H #define _TEGRA_COMMON_UMS_H_
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_SPL_BUILD
/* USB gadget, and mass storage protocol */ /* USB gadget, and mass storage protocol */