add missing panda revision ID patch
This commit is contained in:
parent
1550facea0
commit
8d26081382
|
@ -1,101 +0,0 @@
|
||||||
From 4546255d8c19441cd1fb0724c94865c7549344bc Mon Sep 17 00:00:00 2001
|
|
||||||
From: Peter Robinson <pbrobinson@gmail.com>
|
|
||||||
Date: Tue, 4 Aug 2015 09:35:43 +0100
|
|
||||||
Subject: [PATCH 1/5] wandboard: add support for generic distro boot
|
|
||||||
|
|
||||||
---
|
|
||||||
include/configs/wandboard.h | 33 ++++++++++++++++++++++++---------
|
|
||||||
1 file changed, 24 insertions(+), 9 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
|
|
||||||
index f4e9cf2..1e346c1 100644
|
|
||||||
--- a/include/configs/wandboard.h
|
|
||||||
+++ b/include/configs/wandboard.h
|
|
||||||
@@ -54,9 +54,6 @@
|
|
||||||
#define CONFIG_MXC_USB_FLAGS 0
|
|
||||||
|
|
||||||
/* Ethernet Configuration */
|
|
||||||
-#define CONFIG_CMD_PING
|
|
||||||
-#define CONFIG_CMD_DHCP
|
|
||||||
-#define CONFIG_CMD_MII
|
|
||||||
#define CONFIG_FEC_MXC
|
|
||||||
#define CONFIG_MII
|
|
||||||
#define IMX_FEC_BASE ENET_BASE_ADDR
|
|
||||||
@@ -84,17 +81,29 @@
|
|
||||||
#define CONFIG_IMX_HDMI
|
|
||||||
#define CONFIG_IMX_VIDEO_SKIP
|
|
||||||
|
|
||||||
+#ifndef CONFIG_SPL_BUILD
|
|
||||||
+#include <config_distro_defaults.h>
|
|
||||||
+#include <config_distro_bootcmd.h>
|
|
||||||
+
|
|
||||||
+#define BOOT_TARGET_DEVICES(func) \
|
|
||||||
+ func(MMC, mmc, 0) \
|
|
||||||
+ func(PXE, pxe, na) \
|
|
||||||
+ func(DHCP, dhcp, na)
|
|
||||||
+
|
|
||||||
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
|
|
||||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
|
||||||
"script=boot.scr\0" \
|
|
||||||
"image=zImage\0" \
|
|
||||||
- "console=ttymxc0\0" \
|
|
||||||
+ "console=ttymxc0,115200\0" \
|
|
||||||
"splashpos=m,m\0" \
|
|
||||||
"fdtfile=undefined\0" \
|
|
||||||
- "fdt_high=0xffffffff\0" \
|
|
||||||
- "initrd_high=0xffffffff\0" \
|
|
||||||
- "fdt_addr=0x18000000\0" \
|
|
||||||
+ "fdt_addr_r=0x18000000\0" \
|
|
||||||
"boot_fdt=try\0" \
|
|
||||||
+ "pxefile_addr_r=0x17f00000\0" \
|
|
||||||
+ "scriptaddr=0x17e00000\0" \
|
|
||||||
+ "kernel_addr_r=0x11000000\0" \
|
|
||||||
+ "ramdisk_addr_r=0x18100000\0" \
|
|
||||||
+ "bootm_size=0x20000000\0" \
|
|
||||||
"ip_dyn=yes\0" \
|
|
||||||
"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
|
|
||||||
"mmcpart=1\0" \
|
|
||||||
@@ -113,7 +122,7 @@
|
|
||||||
"mmc write ${loadaddr} 0x2 ${fw_sz}; " \
|
|
||||||
"fi; " \
|
|
||||||
"fi\0" \
|
|
||||||
- "mmcargs=setenv bootargs console=${console},${baudrate} " \
|
|
||||||
+ "mmcargs=setenv bootargs console=${console} " \
|
|
||||||
"root=${mmcroot}; run videoargs\0" \
|
|
||||||
"videoargs=" \
|
|
||||||
"setenv nextcon 0; " \
|
|
||||||
@@ -162,7 +171,7 @@
|
|
||||||
"else " \
|
|
||||||
"bootz; " \
|
|
||||||
"fi;\0" \
|
|
||||||
- "netargs=setenv bootargs console=${console},${baudrate} " \
|
|
||||||
+ "netargs=setenv bootargs console=${console} " \
|
|
||||||
"root=/dev/nfs " \
|
|
||||||
"ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
|
|
||||||
"netboot=echo Booting from net ...; " \
|
|
||||||
@@ -197,9 +206,11 @@
|
|
||||||
"setenv fdtfile imx6dl-wandboard-revb1.dtb; fi; " \
|
|
||||||
"if test $fdtfile = undefined; then " \
|
|
||||||
"echo WARNING: Could not determine dtb to use; fi; \0" \
|
|
||||||
+ BOOTENV \
|
|
||||||
|
|
||||||
#define CONFIG_BOOTCOMMAND \
|
|
||||||
"run findfdt; " \
|
|
||||||
+ "run distro_bootcmd;" \
|
|
||||||
"mmc dev ${mmcdev}; if mmc rescan; then " \
|
|
||||||
"if run loadbootscript; then " \
|
|
||||||
"run bootscript; " \
|
|
||||||
@@ -211,6 +222,10 @@
|
|
||||||
"fi; " \
|
|
||||||
"else run netboot; fi"
|
|
||||||
|
|
||||||
+#else
|
|
||||||
+#define BOOT_TARGET_DEVICES
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
/* Physical Memory Map */
|
|
||||||
#define CONFIG_NR_DRAM_BANKS 1
|
|
||||||
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
|
|
||||||
--
|
|
||||||
2.5.0
|
|
||||||
|
|
|
@ -1,29 +0,0 @@
|
||||||
From 0a50f653c44cef7685d8300ddccb2c7476cbed71 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Peter Robinson <pbrobinson@gmail.com>
|
|
||||||
Date: Wed, 15 Jul 2015 12:37:44 +0100
|
|
||||||
Subject: [PATCH 6/9] mx6: utilite: disable logos
|
|
||||||
|
|
||||||
---
|
|
||||||
include/configs/cm_fx6.h | 8 --------
|
|
||||||
1 file changed, 8 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
|
|
||||||
index 8a2e46c..713d90a 100644
|
|
||||||
--- a/include/configs/cm_fx6.h
|
|
||||||
+++ b/include/configs/cm_fx6.h
|
|
||||||
@@ -212,12 +212,4 @@
|
|
||||||
#define CONFIG_CONSOLE_MUX
|
|
||||||
#define CONFIG_VIDEO_SW_CURSOR
|
|
||||||
|
|
||||||
-#define CONFIG_SPLASH_SCREEN
|
|
||||||
-#define CONFIG_SPLASH_SOURCE
|
|
||||||
-#define CONFIG_CMD_BMP
|
|
||||||
-#define CONFIG_VIDEO_BMP_RLE8
|
|
||||||
-
|
|
||||||
-#define CONFIG_VIDEO_LOGO
|
|
||||||
-#define CONFIG_VIDEO_BMP_LOGO
|
|
||||||
-
|
|
||||||
#endif /* __CONFIG_CM_FX6_H */
|
|
||||||
--
|
|
||||||
2.5.0
|
|
||||||
|
|
|
@ -1,239 +0,0 @@
|
||||||
From e20acc67fd6ddd5c359e2d93ca0894222fedd30b Mon Sep 17 00:00:00 2001
|
|
||||||
From: Alexandre Courbot <acourbot@nvidia.com>
|
|
||||||
Date: Thu, 9 Jul 2015 16:33:00 +0900
|
|
||||||
Subject: [PATCH 7/9] ARM: tegra: move VPR configuration to a later stage
|
|
||||||
|
|
||||||
U-boot is responsible for enabling the GPU DT node after all necessary
|
|
||||||
configuration (VPR setup for T124) is performed. In order to be able to
|
|
||||||
check whether this configuration has been performed right before booting
|
|
||||||
the kernel, make it happen during board_init().
|
|
||||||
|
|
||||||
Also move VPR configuration into the more generic gpu.c file, which will
|
|
||||||
also host other GPU-related functions, and let boards specify
|
|
||||||
individually whether they need VPR setup or not.
|
|
||||||
|
|
||||||
Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
|
|
||||||
Cc: Stephen Warren <swarren@nvidia.com>
|
|
||||||
Cc: Tom Warren <twarren@nvidia.com>
|
|
||||||
---
|
|
||||||
arch/arm/include/asm/arch-tegra/ap.h | 9 -------
|
|
||||||
arch/arm/include/asm/arch-tegra/gpu.h | 27 ++++++++++++++++++++
|
|
||||||
arch/arm/mach-tegra/Makefile | 2 +-
|
|
||||||
arch/arm/mach-tegra/ap.c | 3 ---
|
|
||||||
arch/arm/mach-tegra/board2.c | 3 +++
|
|
||||||
arch/arm/mach-tegra/gpu.c | 47 +++++++++++++++++++++++++++++++++++
|
|
||||||
arch/arm/mach-tegra/vpr.c | 35 --------------------------
|
|
||||||
include/configs/tegra124-common.h | 3 +++
|
|
||||||
8 files changed, 81 insertions(+), 48 deletions(-)
|
|
||||||
create mode 100644 arch/arm/include/asm/arch-tegra/gpu.h
|
|
||||||
create mode 100644 arch/arm/mach-tegra/gpu.c
|
|
||||||
delete mode 100644 arch/arm/mach-tegra/vpr.c
|
|
||||||
|
|
||||||
diff --git a/arch/arm/include/asm/arch-tegra/ap.h b/arch/arm/include/asm/arch-tegra/ap.h
|
|
||||||
index ca40e4e..2d58271 100644
|
|
||||||
--- a/arch/arm/include/asm/arch-tegra/ap.h
|
|
||||||
+++ b/arch/arm/include/asm/arch-tegra/ap.h
|
|
||||||
@@ -66,15 +66,6 @@ int tegra_get_sku_info(void);
|
|
||||||
/* Do any chip-specific cache config */
|
|
||||||
void config_cache(void);
|
|
||||||
|
|
||||||
-#if defined(CONFIG_TEGRA124)
|
|
||||||
-/* Do chip-specific vpr config */
|
|
||||||
-void config_vpr(void);
|
|
||||||
-#else
|
|
||||||
-static inline void config_vpr(void)
|
|
||||||
-{
|
|
||||||
-}
|
|
||||||
-#endif
|
|
||||||
-
|
|
||||||
#if defined(CONFIG_TEGRA_SUPPORT_NON_SECURE)
|
|
||||||
bool tegra_cpu_is_non_secure(void);
|
|
||||||
#endif
|
|
||||||
diff --git a/arch/arm/include/asm/arch-tegra/gpu.h b/arch/arm/include/asm/arch-tegra/gpu.h
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..b347a21
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/arch/arm/include/asm/arch-tegra/gpu.h
|
|
||||||
@@ -0,0 +1,27 @@
|
|
||||||
+/*
|
|
||||||
+ * (C) Copyright 2015
|
|
||||||
+ * NVIDIA Corporation <www.nvidia.com>
|
|
||||||
+ *
|
|
||||||
+ * SPDX-License-Identifier: GPL-2.0+
|
|
||||||
+ */
|
|
||||||
+
|
|
||||||
+#ifndef __ASM_ARCH_TEGRA_GPU_H
|
|
||||||
+#define __ASM_ARCH_TEGRA_GPU_H
|
|
||||||
+
|
|
||||||
+#if defined(CONFIG_TEGRA_GPU)
|
|
||||||
+
|
|
||||||
+void config_gpu(void);
|
|
||||||
+bool gpu_configured(void);
|
|
||||||
+
|
|
||||||
+#else /* CONFIG_TEGRA_GPU */
|
|
||||||
+
|
|
||||||
+static inline void config_gpu(void)
|
|
||||||
+{
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static inline bool gpu_configured(void)
|
|
||||||
+{
|
|
||||||
+ return false;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+#endif /* CONFIG_TEGRA_GPU */
|
|
||||||
diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile
|
|
||||||
index fefc180..f6f5583 100644
|
|
||||||
--- a/arch/arm/mach-tegra/Makefile
|
|
||||||
+++ b/arch/arm/mach-tegra/Makefile
|
|
||||||
@@ -24,7 +24,7 @@ obj-y += pinmux-common.o
|
|
||||||
obj-y += powergate.o
|
|
||||||
obj-y += xusb-padctl.o
|
|
||||||
obj-$(CONFIG_DISPLAY_CPUINFO) += sys_info.o
|
|
||||||
-obj-$(CONFIG_TEGRA124) += vpr.o
|
|
||||||
+obj-$(CONFIG_TEGRA_GPU) += gpu.o
|
|
||||||
obj-$(CONFIG_TEGRA_CLOCK_SCALING) += emc.o
|
|
||||||
|
|
||||||
ifndef CONFIG_SPL_BUILD
|
|
||||||
diff --git a/arch/arm/mach-tegra/ap.c b/arch/arm/mach-tegra/ap.c
|
|
||||||
index 0b94e8a..70613f9 100644
|
|
||||||
--- a/arch/arm/mach-tegra/ap.c
|
|
||||||
+++ b/arch/arm/mach-tegra/ap.c
|
|
||||||
@@ -218,7 +218,4 @@ void s_init(void)
|
|
||||||
|
|
||||||
/* enable SMMU */
|
|
||||||
smmu_enable();
|
|
||||||
-
|
|
||||||
- /* init vpr */
|
|
||||||
- config_vpr();
|
|
||||||
}
|
|
||||||
diff --git a/arch/arm/mach-tegra/board2.c b/arch/arm/mach-tegra/board2.c
|
|
||||||
index ce9b695..1d7c5ef 100644
|
|
||||||
--- a/arch/arm/mach-tegra/board2.c
|
|
||||||
+++ b/arch/arm/mach-tegra/board2.c
|
|
||||||
@@ -29,6 +29,7 @@
|
|
||||||
#include <asm/arch-tegra/sys_proto.h>
|
|
||||||
#include <asm/arch-tegra/uart.h>
|
|
||||||
#include <asm/arch-tegra/warmboot.h>
|
|
||||||
+#include <asm/arch-tegra/gpu.h>
|
|
||||||
#ifdef CONFIG_TEGRA_CLOCK_SCALING
|
|
||||||
#include <asm/arch/emc.h>
|
|
||||||
#endif
|
|
||||||
@@ -125,6 +126,8 @@ int board_init(void)
|
|
||||||
clock_init();
|
|
||||||
clock_verify();
|
|
||||||
|
|
||||||
+ config_gpu();
|
|
||||||
+
|
|
||||||
#ifdef CONFIG_TEGRA_SPI
|
|
||||||
pin_mux_spi();
|
|
||||||
#endif
|
|
||||||
diff --git a/arch/arm/mach-tegra/gpu.c b/arch/arm/mach-tegra/gpu.c
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..b2fa50b
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/arch/arm/mach-tegra/gpu.c
|
|
||||||
@@ -0,0 +1,47 @@
|
|
||||||
+/*
|
|
||||||
+ * Copyright (c) 2014-2015, NVIDIA CORPORATION. All rights reserved.
|
|
||||||
+ *
|
|
||||||
+ * This program is free software; you can redistribute it and/or modify it
|
|
||||||
+ * under the terms and conditions of the GNU General Public License,
|
|
||||||
+ * version 2, as published by the Free Software Foundation.
|
|
||||||
+ *
|
|
||||||
+ * This program is distributed in the hope it will be useful, but WITHOUT
|
|
||||||
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
||||||
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
||||||
+ * more details.
|
|
||||||
+ *
|
|
||||||
+ * You should have received a copy of the GNU General Public License
|
|
||||||
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
+ */
|
|
||||||
+
|
|
||||||
+/* Tegra vpr routines */
|
|
||||||
+
|
|
||||||
+#include <common.h>
|
|
||||||
+#include <asm/io.h>
|
|
||||||
+#include <asm/arch/tegra.h>
|
|
||||||
+#include <asm/arch/mc.h>
|
|
||||||
+
|
|
||||||
+#include <fdt_support.h>
|
|
||||||
+
|
|
||||||
+static bool _configured;
|
|
||||||
+
|
|
||||||
+void config_gpu(void)
|
|
||||||
+{
|
|
||||||
+ struct mc_ctlr *mc = (struct mc_ctlr *)NV_PA_MC_BASE;
|
|
||||||
+
|
|
||||||
+ /* Turn VPR off */
|
|
||||||
+ writel(0, &mc->mc_video_protect_size_mb);
|
|
||||||
+ writel(TEGRA_MC_VIDEO_PROTECT_REG_WRITE_ACCESS_DISABLED,
|
|
||||||
+ &mc->mc_video_protect_reg_ctrl);
|
|
||||||
+ /* read back to ensure the write went through */
|
|
||||||
+ readl(&mc->mc_video_protect_reg_ctrl);
|
|
||||||
+
|
|
||||||
+ debug("configured VPR\n");
|
|
||||||
+
|
|
||||||
+ _configured = true;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+bool vpr_configured(void)
|
|
||||||
+{
|
|
||||||
+ return _configured;
|
|
||||||
+}
|
|
||||||
diff --git a/arch/arm/mach-tegra/vpr.c b/arch/arm/mach-tegra/vpr.c
|
|
||||||
deleted file mode 100644
|
|
||||||
index f695811..0000000
|
|
||||||
--- a/arch/arm/mach-tegra/vpr.c
|
|
||||||
+++ /dev/null
|
|
||||||
@@ -1,35 +0,0 @@
|
|
||||||
-/*
|
|
||||||
- * Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved.
|
|
||||||
- *
|
|
||||||
- * This program is free software; you can redistribute it and/or modify it
|
|
||||||
- * under the terms and conditions of the GNU General Public License,
|
|
||||||
- * version 2, as published by the Free Software Foundation.
|
|
||||||
- *
|
|
||||||
- * This program is distributed in the hope it will be useful, but WITHOUT
|
|
||||||
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
||||||
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
||||||
- * more details.
|
|
||||||
- *
|
|
||||||
- * You should have received a copy of the GNU General Public License
|
|
||||||
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
- */
|
|
||||||
-
|
|
||||||
-/* Tegra vpr routines */
|
|
||||||
-
|
|
||||||
-#include <common.h>
|
|
||||||
-#include <asm/io.h>
|
|
||||||
-#include <asm/arch/tegra.h>
|
|
||||||
-#include <asm/arch/mc.h>
|
|
||||||
-
|
|
||||||
-/* Configures VPR. Right now, all we do is turn it off. */
|
|
||||||
-void config_vpr(void)
|
|
||||||
-{
|
|
||||||
- struct mc_ctlr *mc = (struct mc_ctlr *)NV_PA_MC_BASE;
|
|
||||||
-
|
|
||||||
- /* Turn VPR off */
|
|
||||||
- writel(0, &mc->mc_video_protect_size_mb);
|
|
||||||
- writel(TEGRA_MC_VIDEO_PROTECT_REG_WRITE_ACCESS_DISABLED,
|
|
||||||
- &mc->mc_video_protect_reg_ctrl);
|
|
||||||
- /* read back to ensure the write went through */
|
|
||||||
- readl(&mc->mc_video_protect_reg_ctrl);
|
|
||||||
-}
|
|
||||||
diff --git a/include/configs/tegra124-common.h b/include/configs/tegra124-common.h
|
|
||||||
index 1aee5c8..a05d2b5 100644
|
|
||||||
--- a/include/configs/tegra124-common.h
|
|
||||||
+++ b/include/configs/tegra124-common.h
|
|
||||||
@@ -70,4 +70,7 @@
|
|
||||||
#define CONFIG_USB_EHCI_TXFIFO_THRESH 0x10
|
|
||||||
#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 1
|
|
||||||
|
|
||||||
+/* GPU needs setup */
|
|
||||||
+#define CONFIG_TEGRA_GPU
|
|
||||||
+
|
|
||||||
#endif /* _TEGRA124_COMMON_H_ */
|
|
||||||
--
|
|
||||||
2.5.0
|
|
||||||
|
|
|
@ -1,146 +0,0 @@
|
||||||
From e512e16b155d9eba97764cb64cdcaa4e5b1953fc Mon Sep 17 00:00:00 2001
|
|
||||||
From: Alexandre Courbot <acourbot@nvidia.com>
|
|
||||||
Date: Thu, 9 Jul 2015 16:33:01 +0900
|
|
||||||
Subject: [PATCH 8/9] ARM: tegra: enable GPU DT node when appropriate
|
|
||||||
|
|
||||||
T124 requires some specific configuration (VPR setup) to be performed by
|
|
||||||
the bootloader before the GPU can be used. For this reason, the GPU node
|
|
||||||
in the device tree is disabled by default. This patch enables the node
|
|
||||||
if U-boot has performed VPR configuration.
|
|
||||||
|
|
||||||
Boards enabled by this patch are T124's Jetson TK1 and Venice 2.
|
|
||||||
|
|
||||||
Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
|
|
||||||
Cc: Stephen Warren <swarren@nvidia.com>
|
|
||||||
Cc: Tom Warren <twarren@nvidia.com>
|
|
||||||
---
|
|
||||||
arch/arm/include/asm/arch-tegra/gpu.h | 16 ++++++++++++++++
|
|
||||||
arch/arm/mach-tegra/gpu.c | 19 +++++++++++++++++++
|
|
||||||
board/nvidia/jetson-tk1/jetson-tk1.c | 8 ++++++++
|
|
||||||
board/nvidia/venice2/venice2.c | 8 ++++++++
|
|
||||||
include/configs/jetson-tk1.h | 2 ++
|
|
||||||
include/configs/venice2.h | 2 ++
|
|
||||||
6 files changed, 55 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/arch/arm/include/asm/arch-tegra/gpu.h b/arch/arm/include/asm/arch-tegra/gpu.h
|
|
||||||
index b347a21..eac73ed 100644
|
|
||||||
--- a/arch/arm/include/asm/arch-tegra/gpu.h
|
|
||||||
+++ b/arch/arm/include/asm/arch-tegra/gpu.h
|
|
||||||
@@ -25,3 +25,19 @@ static inline bool gpu_configured(void)
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif /* CONFIG_TEGRA_GPU */
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+#if defined(CONFIG_OF_LIBFDT)
|
|
||||||
+
|
|
||||||
+int gpu_enable_node(void *blob, const char *gpupath);
|
|
||||||
+
|
|
||||||
+#else /* CONFIG_OF_LIBFDT */
|
|
||||||
+
|
|
||||||
+static inline int gpu_enable_node(void *blob, const char *gpupath)
|
|
||||||
+{
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+#endif /* CONFIG_OF_LIBFDT */
|
|
||||||
+
|
|
||||||
+#endif
|
|
||||||
diff --git a/arch/arm/mach-tegra/gpu.c b/arch/arm/mach-tegra/gpu.c
|
|
||||||
index b2fa50b..4ea046d 100644
|
|
||||||
--- a/arch/arm/mach-tegra/gpu.c
|
|
||||||
+++ b/arch/arm/mach-tegra/gpu.c
|
|
||||||
@@ -45,3 +45,22 @@ bool vpr_configured(void)
|
|
||||||
{
|
|
||||||
return _configured;
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+#if defined(CONFIG_OF_LIBFDT)
|
|
||||||
+
|
|
||||||
+int gpu_enable_node(void *blob, const char *gpupath)
|
|
||||||
+{
|
|
||||||
+ int offset;
|
|
||||||
+
|
|
||||||
+ if (vpr_configured()) {
|
|
||||||
+ offset = fdt_path_offset(blob, gpupath);
|
|
||||||
+ if (offset > 0) {
|
|
||||||
+ fdt_status_okay(blob, offset);
|
|
||||||
+ debug("enabled GPU node %s\n", gpupath);
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+#endif
|
|
||||||
diff --git a/board/nvidia/jetson-tk1/jetson-tk1.c b/board/nvidia/jetson-tk1/jetson-tk1.c
|
|
||||||
index 52425a8..3c21767 100644
|
|
||||||
--- a/board/nvidia/jetson-tk1/jetson-tk1.c
|
|
||||||
+++ b/board/nvidia/jetson-tk1/jetson-tk1.c
|
|
||||||
@@ -11,6 +11,7 @@
|
|
||||||
|
|
||||||
#include <asm/arch/gpio.h>
|
|
||||||
#include <asm/arch/pinmux.h>
|
|
||||||
+#include <asm/arch-tegra/gpu.h>
|
|
||||||
|
|
||||||
#include "pinmux-config-jetson-tk1.h"
|
|
||||||
|
|
||||||
@@ -79,3 +80,10 @@ int board_eth_init(bd_t *bis)
|
|
||||||
return pci_eth_init(bis);
|
|
||||||
}
|
|
||||||
#endif /* PCI */
|
|
||||||
+
|
|
||||||
+int ft_board_setup(void *blob, bd_t *bd)
|
|
||||||
+{
|
|
||||||
+ gpu_enable_node(blob, "/gpu@0,57000000");
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
diff --git a/board/nvidia/venice2/venice2.c b/board/nvidia/venice2/venice2.c
|
|
||||||
index c56ef12..3e2b9a7 100644
|
|
||||||
--- a/board/nvidia/venice2/venice2.c
|
|
||||||
+++ b/board/nvidia/venice2/venice2.c
|
|
||||||
@@ -8,6 +8,7 @@
|
|
||||||
#include <common.h>
|
|
||||||
#include <asm/arch/gpio.h>
|
|
||||||
#include <asm/arch/pinmux.h>
|
|
||||||
+#include <asm/arch-tegra/gpu.h>
|
|
||||||
#include "pinmux-config-venice2.h"
|
|
||||||
|
|
||||||
/*
|
|
||||||
@@ -27,3 +28,10 @@ void pinmux_init(void)
|
|
||||||
pinmux_config_drvgrp_table(venice2_drvgrps,
|
|
||||||
ARRAY_SIZE(venice2_drvgrps));
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+int ft_board_setup(void *blob, bd_t *bd)
|
|
||||||
+{
|
|
||||||
+ gpu_enable_node(blob, "/gpu@0,57000000");
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h
|
|
||||||
index 3bbff28..b3e6496 100644
|
|
||||||
--- a/include/configs/jetson-tk1.h
|
|
||||||
+++ b/include/configs/jetson-tk1.h
|
|
||||||
@@ -82,4 +82,6 @@
|
|
||||||
#define CONFIG_ARMV7_SECURE_BASE 0xfff00000
|
|
||||||
#define CONFIG_ARMV7_SECURE_RESERVE_SIZE 0x00100000
|
|
||||||
|
|
||||||
+#define CONFIG_OF_BOARD_SETUP
|
|
||||||
+
|
|
||||||
#endif /* __CONFIG_H */
|
|
||||||
diff --git a/include/configs/venice2.h b/include/configs/venice2.h
|
|
||||||
index 1d9d053..bc5080a 100644
|
|
||||||
--- a/include/configs/venice2.h
|
|
||||||
+++ b/include/configs/venice2.h
|
|
||||||
@@ -64,4 +64,6 @@
|
|
||||||
#include "tegra-common-usb-gadget.h"
|
|
||||||
#include "tegra-common-post.h"
|
|
||||||
|
|
||||||
+#define CONFIG_OF_BOARD_SETUP
|
|
||||||
+
|
|
||||||
#endif /* __CONFIG_H */
|
|
||||||
--
|
|
||||||
2.5.0
|
|
||||||
|
|
|
@ -19,6 +19,7 @@ Patch5: 0005-port-utilite-to-distro-generic-boot-commands.patch
|
||||||
Patch6: fix-beaglex15-usb-xhci.patch
|
Patch6: fix-beaglex15-usb-xhci.patch
|
||||||
Patch7: 0001-image.c-Fix-non-Android-booting-with-ramdisk-and-or-.patch
|
Patch7: 0001-image.c-Fix-non-Android-booting-with-ramdisk-and-or-.patch
|
||||||
Patch8: U-Boot-board-ti-am335x-add-support-for-BeagleBone-Green.patch
|
Patch8: U-Boot-board-ti-am335x-add-support-for-BeagleBone-Green.patch
|
||||||
|
Patch9: 0009-ARM-fix-pandaboard-es-and-a4-revision-ID.patch
|
||||||
|
|
||||||
Patch10: 0002-fastboot-Implement-OEM-format-only-when-we-have-MMC-.patch
|
Patch10: 0002-fastboot-Implement-OEM-format-only-when-we-have-MMC-.patch
|
||||||
Patch11: 0003-mmc-Add-generic-Kconfig-option.patch
|
Patch11: 0003-mmc-Add-generic-Kconfig-option.patch
|
||||||
|
|
Loading…
Reference in New Issue