Merge branch 'master' of git://git.denx.de/u-boot-tegra

This commit is contained in:
Tom Rini
2015-11-12 15:59:35 -05:00
30 changed files with 1355 additions and 671 deletions

View File

@@ -10,29 +10,23 @@
#if defined(CONFIG_TEGRA_GPU)
void config_gpu(void);
bool gpu_configured(void);
void tegra_gpu_config(void);
#else /* CONFIG_TEGRA_GPU */
static inline void config_gpu(void)
static inline void tegra_gpu_config(void)
{
}
static inline bool gpu_configured(void)
{
return false;
}
#endif /* CONFIG_TEGRA_GPU */
#if defined(CONFIG_OF_LIBFDT)
int gpu_enable_node(void *blob, const char *gpupath);
int tegra_gpu_enable_node(void *blob, const char *gpupath);
#else /* CONFIG_OF_LIBFDT */
static inline int gpu_enable_node(void *blob, const char *gpupath)
static inline int tegra_gpu_enable_node(void *blob, const char *gpupath)
{
return 0;
}