diff --git a/0001-wandboard-add-support-for-generic-distro-boot.patch b/0001-wandboard-add-support-for-generic-distro-boot.patch index f46272d..f0b4826 100644 --- a/0001-wandboard-add-support-for-generic-distro-boot.patch +++ b/0001-wandboard-add-support-for-generic-distro-boot.patch @@ -1,14 +1,14 @@ -From 5a8f9d701fd16b4e1821b6699e18df683dbe9d7d Mon Sep 17 00:00:00 2001 +From f0b1a1a1a41a74ee64f2a68fc7348d9d9e33c84c Mon Sep 17 00:00:00 2001 From: Peter Robinson -Date: Tue, 4 Aug 2015 09:35:43 +0100 -Subject: [PATCH 1/5] wandboard: add support for generic distro boot +Date: Wed, 15 Jul 2015 11:30:24 +0100 +Subject: [PATCH 1/9] 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 +index f05b55a..b3ad82a 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -54,9 +54,6 @@ @@ -21,9 +21,9 @@ index f4e9cf2..1e346c1 100644 #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 +@@ -89,17 +86,29 @@ + #define CONFIG_MXC_OCOTP + #endif +#ifndef CONFIG_SPL_BUILD +#include @@ -55,7 +55,7 @@ index f4e9cf2..1e346c1 100644 "ip_dyn=yes\0" \ "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \ "mmcpart=1\0" \ -@@ -113,7 +122,7 @@ +@@ -118,7 +127,7 @@ "mmc write ${loadaddr} 0x2 ${fw_sz}; " \ "fi; " \ "fi\0" \ @@ -64,7 +64,7 @@ index f4e9cf2..1e346c1 100644 "root=${mmcroot}; run videoargs\0" \ "videoargs=" \ "setenv nextcon 0; " \ -@@ -162,7 +171,7 @@ +@@ -167,7 +176,7 @@ "else " \ "bootz; " \ "fi;\0" \ @@ -73,7 +73,7 @@ index f4e9cf2..1e346c1 100644 "root=/dev/nfs " \ "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \ "netboot=echo Booting from net ...; " \ -@@ -197,9 +206,11 @@ +@@ -202,9 +211,11 @@ "setenv fdtfile imx6dl-wandboard-revb1.dtb; fi; " \ "if test $fdtfile = undefined; then " \ "echo WARNING: Could not determine dtb to use; fi; \0" \ @@ -85,7 +85,7 @@ index f4e9cf2..1e346c1 100644 "mmc dev ${mmcdev}; if mmc rescan; then " \ "if run loadbootscript; then " \ "run bootscript; " \ -@@ -211,6 +222,10 @@ +@@ -216,6 +227,10 @@ "fi; " \ "else run netboot; fi" diff --git a/0002-am33xx-add-support-for-generic-distro-boot.patch b/0002-am33xx-add-support-for-generic-distro-boot.patch index 987915d..e6438fc 100644 --- a/0002-am33xx-add-support-for-generic-distro-boot.patch +++ b/0002-am33xx-add-support-for-generic-distro-boot.patch @@ -1,7 +1,7 @@ -From 18836113635324d0272ac06c761b3fb419a90676 Mon Sep 17 00:00:00 2001 +From c47ac887df62e802776f0d666e3626c852640a2d Mon Sep 17 00:00:00 2001 From: Peter Robinson -Date: Tue, 4 Aug 2015 09:36:08 +0100 -Subject: [PATCH 2/5] am33xx: add support for generic distro boot +Date: Tue, 23 Jun 2015 00:53:25 +0100 +Subject: [PATCH 2/9] am33xx: add support for generic distro boot --- include/configs/am335x_evm.h | 28 ++++++++++++++++++---------- @@ -9,7 +9,7 @@ Subject: [PATCH 2/5] am33xx: add support for generic distro boot 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h -index 633391b..f81e7a6 100644 +index 035c156..81f8331 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -18,6 +18,21 @@ @@ -64,10 +64,10 @@ index 633391b..f81e7a6 100644 #define CONFIG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */ #define CONFIG_SYS_NS16550_COM2 0x48022000 /* UART1 */ diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h -index 6dc5ebd..64949b8 100644 +index 0aea7d1..d6073b2 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h -@@ -52,6 +52,7 @@ +@@ -54,6 +54,7 @@ #define DEFAULT_LINUX_BOOT_ENV \ "loadaddr=0x82000000\0" \ "kernel_addr_r=0x82000000\0" \ diff --git a/0003-Switch-omap4-boards-to-use-config_distro_defaults-an.patch b/0003-Switch-omap4-boards-to-use-config_distro_defaults-an.patch index 95fc263..9fcb52b 100644 --- a/0003-Switch-omap4-boards-to-use-config_distro_defaults-an.patch +++ b/0003-Switch-omap4-boards-to-use-config_distro_defaults-an.patch @@ -1,19 +1,22 @@ -From 50a199d4ea2f6901e572a803e1bb33d250cd2acd Mon Sep 17 00:00:00 2001 +From 304a082f0ac1cb2f1ad70c3be76568e2496d94af Mon Sep 17 00:00:00 2001 From: Peter Robinson -Date: Tue, 4 Aug 2015 09:36:49 +0100 -Subject: [PATCH 3/5] Switch omap4 boards to use config_distro_defaults and - config_distro_bootcmd +Date: Thu, 2 Jul 2015 23:26:44 +0100 +Subject: [PATCH 3/9] Switch omap4 boards to use config_distro_defaults and + config_distro_bootcmd. +Add pxefile_addr_r to DEFAULT_LINUX_BOOT_ENV, as pxefile_addr_r is used +to store the pxe boot configuation file in config_distro_defaults. +adjust adress of scriptaddr to be unique --- include/configs/ti_armv7_common.h | 3 ++- include/configs/ti_omap4_common.h | 41 ++++++++++++++++----------------------- 2 files changed, 19 insertions(+), 25 deletions(-) diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h -index 64949b8..523e2ec 100644 +index d6073b2..3523e67 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h -@@ -52,7 +52,8 @@ +@@ -54,7 +54,8 @@ #define DEFAULT_LINUX_BOOT_ENV \ "loadaddr=0x82000000\0" \ "kernel_addr_r=0x82000000\0" \ @@ -24,7 +27,7 @@ index 64949b8..523e2ec 100644 "fdt_addr_r=0x88000000\0" \ "rdaddr=0x88080000\0" \ diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h -index b299aed..e0f2035 100644 +index e966134..51b7265 100644 --- a/include/configs/ti_omap4_common.h +++ b/include/configs/ti_omap4_common.h @@ -78,6 +78,18 @@ diff --git a/0004-Add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch b/0004-Add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch index aa057e7..b7d30d1 100644 --- a/0004-Add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch +++ b/0004-Add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch @@ -1,7 +1,7 @@ -From 0fbd61016856c536998ce3ef248079cbf4de0777 Mon Sep 17 00:00:00 2001 +From d61dda6e7dff4ae510699e72eca523d453efb082 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 2 Jul 2015 23:28:56 +0100 -Subject: [PATCH 4/5] Add BOOTENV_INIT_COMMAND for commands that may be needed +Subject: [PATCH 4/9] Add BOOTENV_INIT_COMMAND for commands that may be needed to run before bootcmd, such as setting the fdt file variables for platfroms that detect on boot. @@ -10,7 +10,7 @@ Subject: [PATCH 4/5] Add BOOTENV_INIT_COMMAND for commands that may be needed 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h -index 3a360ca4..dcad4c8 100644 +index 3a360ca..dcad4c8 100644 --- a/include/config_distro_bootcmd.h +++ b/include/config_distro_bootcmd.h @@ -176,6 +176,10 @@ diff --git a/0005-port-utilite-to-distro-generic-boot-commands.patch b/0005-port-utilite-to-distro-generic-boot-commands.patch index 95b6a18..e306963 100644 --- a/0005-port-utilite-to-distro-generic-boot-commands.patch +++ b/0005-port-utilite-to-distro-generic-boot-commands.patch @@ -1,14 +1,14 @@ -From dec80e7e7b8ae019adf5fda70a5be838d11ae7ea Mon Sep 17 00:00:00 2001 +From f09b9edc5269edfdf803b5cd10eb01a3ad3b779f Mon Sep 17 00:00:00 2001 From: Peter Robinson -Date: Tue, 4 Aug 2015 09:37:38 +0100 -Subject: [PATCH 5/5] port utilite to distro generic boot commands +Date: Fri, 3 Jul 2015 00:08:05 +0100 +Subject: [PATCH 5/9] port utilite to distro generic boot commands --- include/configs/cm_fx6.h | 107 ++++++++++++----------------------------------- 1 file changed, 27 insertions(+), 80 deletions(-) diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h -index bbd9f38..2fb8b7f 100644 +index 231f4ba..8a2e46c 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -11,6 +11,7 @@ @@ -19,7 +19,7 @@ index bbd9f38..2fb8b7f 100644 #include "mx6_common.h" /* Machine config */ -@@ -65,97 +66,43 @@ +@@ -66,97 +67,43 @@ #define CONFIG_ENV_SIZE (8 * 1024) #define CONFIG_ENV_OFFSET (768 * 1024) diff --git a/0006-mx6-utilite-disable-logos.patch b/0006-mx6-utilite-disable-logos.patch new file mode 100644 index 0000000..a287401 --- /dev/null +++ b/0006-mx6-utilite-disable-logos.patch @@ -0,0 +1,29 @@ +From 0a50f653c44cef7685d8300ddccb2c7476cbed71 Mon Sep 17 00:00:00 2001 +From: Peter Robinson +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 + diff --git a/0007-ARM-tegra-move-VPR-configuration-to-a-later-stage.patch b/0007-ARM-tegra-move-VPR-configuration-to-a-later-stage.patch new file mode 100644 index 0000000..1c36c07 --- /dev/null +++ b/0007-ARM-tegra-move-VPR-configuration-to-a-later-stage.patch @@ -0,0 +1,239 @@ +From e20acc67fd6ddd5c359e2d93ca0894222fedd30b Mon Sep 17 00:00:00 2001 +From: Alexandre Courbot +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 +Cc: Stephen Warren +Cc: Tom Warren +--- + 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 ++ * ++ * 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 + #include + #include ++#include + #ifdef CONFIG_TEGRA_CLOCK_SCALING + #include + #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 . ++ */ ++ ++/* Tegra vpr routines */ ++ ++#include ++#include ++#include ++#include ++ ++#include ++ ++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 . +- */ +- +-/* Tegra vpr routines */ +- +-#include +-#include +-#include +-#include +- +-/* 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 + diff --git a/0008-ARM-tegra-enable-GPU-DT-node-when-appropriate.patch b/0008-ARM-tegra-enable-GPU-DT-node-when-appropriate.patch new file mode 100644 index 0000000..9a72a78 --- /dev/null +++ b/0008-ARM-tegra-enable-GPU-DT-node-when-appropriate.patch @@ -0,0 +1,146 @@ +From e512e16b155d9eba97764cb64cdcaa4e5b1953fc Mon Sep 17 00:00:00 2001 +From: Alexandre Courbot +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 +Cc: Stephen Warren +Cc: Tom Warren +--- + 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 + #include ++#include + + #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 + #include + #include ++#include + #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 + diff --git a/0009-ARM-fix-pandaboard-es-and-a4-revision-ID.patch b/0009-ARM-fix-pandaboard-es-and-a4-revision-ID.patch new file mode 100644 index 0000000..438528d --- /dev/null +++ b/0009-ARM-fix-pandaboard-es-and-a4-revision-ID.patch @@ -0,0 +1,40 @@ +From 52c90ebd27e0a30e8a225e42499522aeb52510d0 Mon Sep 17 00:00:00 2001 +From: "dbatzle@dcbcyber.com" +Date: Wed, 26 Aug 2015 00:45:58 +0100 +Subject: [PATCH 9/9] ARM fix pandaboard es and a4 revision ID + +board_name environment variable was not getting set correctly for +Pandaboard A4 and ES + +Signed-off-by: David Batzle +CC:Albert Aribaud +CC: Tom Rini +--- + board/ti/panda/panda.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/board/ti/panda/panda.c b/board/ti/panda/panda.c +index 783ba35..92e1b63 100644 +--- a/board/ti/panda/panda.c ++++ b/board/ti/panda/panda.c +@@ -101,7 +101,7 @@ int get_board_revision(void) + board_id4 = gpio_get_value(PANDA_ES_BOARD_ID_4_GPIO); + + #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG +- setenv("board_name", strcat(CONFIG_SYS_BOARD, "-es")); ++ setenv("board_name", "panda-es"); + #endif + board_id = ((board_id4 << 4) | (board_id3 << 3) | + (board_id2 << 2) | (board_id1 << 1) | (board_id0)); +@@ -115,7 +115,7 @@ int get_board_revision(void) + + #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG + if ((board_id >= 0x3) && (processor_rev == OMAP4430_ES2_3)) +- setenv("board_name", strcat(CONFIG_SYS_BOARD, "-a4")); ++ setenv("board_name", "panda-a4"); + #endif + } + +-- +2.5.0 + diff --git a/armv7-boards b/armv7-boards index 92ae585..a577e31 100644 --- a/armv7-boards +++ b/armv7-boards @@ -23,21 +23,20 @@ db-mv784mp-gp forfun_q88db highbank Hummingbird_A31 -hummingboard_solo Hyundai_A7HD i12-tvbox -Inet_86VS +iNet_86VS Ippo_q8h_v1_2 Ippo_q8h_v5 jesurun_q5 jetson-tk1 Linksprite_pcDuino Linksprite_pcDuino3 -Linksprite_pcDuino3_fdt Linksprite_pcDuino3_Nano marsboard Marsboard_A10 Mele_A1000 +Mele_A1000G_quad Mele_I7 Mele_M3 Mele_M5 @@ -49,6 +48,7 @@ mk802ii MK808C MSI_Primo73 MSI_Primo81 +mx6cuboxi novena nyan-big odroid @@ -69,7 +69,7 @@ snowball sunxi_Gemei_G9 trimslice TZX-Q8-713B7 -udoo +udoo_quad UTOO_P66 vexpress_ca15_tc2 vexpress_ca9x4 diff --git a/uboot-tools.spec b/uboot-tools.spec index 1aebcef..a337a95 100644 --- a/uboot-tools.spec +++ b/uboot-tools.spec @@ -1,35 +1,35 @@ -#global candidate rc1 +#global candidate rc3 -Name: uboot-tools -Version: 2015.04 -Release: 3%{?candidate:.%{candidate}}%{?dist} -Summary: U-Boot utilities +Name: uboot-tools +Version: 2015.07 +Release: 5%{?candidate:.%{candidate}}%{?dist} +Summary: U-Boot utilities -Group: Development/Tools -License: GPLv2+ BSD LGPL-2.1+ LGPL-2.0+ -URL: http://www.denx.de/wiki/U-Boot -Source0: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}%{?candidate:-%{candidate}}.tar.bz2 -Source1: armv7-boards +Group: Development/Tools +License: GPLv2+ BSD LGPL-2.1+ LGPL-2.0+ +URL: http://www.denx.de/wiki/U-Boot +Source0: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}%{?candidate:-%{candidate}}.tar.bz2 +Source1: armv7-boards -Patch1: 0001-make-sure-that-the-filesystem-is-a-type-of-fat.patch -Patch2: 0002-Add-BOOTENV_POST_COMMAND-which-is-appended-to-the-en.patch -Patch3: 0003-Only-set-CONFIG_BOOTDELAY-if-not-already-set.patch -Patch4: 0004-Switch-am335x_evm.h-to-use-config_distro_defaults-an.patch -Patch5: 0005-add-back-adding-console-to-the-bootargs-if-not-prese.patch -Patch6: 0006-wandboard-port-to-generic-distro-booting.patch -Patch7: 0007-Switch-omap4-boards-to-use-config_distro_defaults-an.patch -Patch8: 0008-port-utilite-to-distro-generic-boot-commands.patch -Patch9: 0009-RiOT-board-set-console-speed.patch -Patch10: 0010-Add-support-for-loading-environment-from-uEnv.txt-in.patch -Patch11: 0011-Add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch -Patch12: 0012-beagle-board-use-ext-support-in-the-SPL.patch -Patch13: 0013-WANDBOARD-run-the-dsitro-bootcmd-first-before-fallin.patch -Patch14: 0014-BBB-tell-u-boot-to-look-in-the-first-partition-to-lo.patch -Patch15: 0001-omap4-distro-boot-partition-fixup.patch +Patch1: 0001-wandboard-add-support-for-generic-distro-boot.patch +Patch2: 0002-am33xx-add-support-for-generic-distro-boot.patch +Patch3: 0003-Switch-omap4-boards-to-use-config_distro_defaults-an.patch +Patch4: 0004-Add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch +Patch5: 0005-port-utilite-to-distro-generic-boot-commands.patch +Patch6: 0006-mx6-utilite-disable-logos.patch +# http://patchwork.ozlabs.org/patch/493287/ +Patch7: 0007-ARM-tegra-move-VPR-configuration-to-a-later-stage.patch +# http://patchwork.ozlabs.org/patch/493288/ +Patch8: 0008-ARM-tegra-enable-GPU-DT-node-when-appropriate.patch +Patch9: 0009-ARM-fix-pandaboard-es-and-a4-revision-ID.patch -BuildRequires: dtc, openssl-devel -BuildRequires: fedora-logos, netpbm-progs -BuildRequires: git, bc +BuildRequires: bc +BuildRequires: dtc +BuildRequires: fedora-logos +BuildRequires: git +BuildRequires: netpbm-progs +BuildRequires: openssl-devel +BuildRequires: SDL-devel Requires: dtc %description @@ -171,6 +171,39 @@ install -p -m 0644 tools/env/fw_env.config $RPM_BUILD_ROOT%{_sysconfdir} %endif %changelog +* Sat Sep 12 2015 Peter Robinson 2015.07-5 +- Add patch to fix detection of Panda ES/A4 + +* Fri Aug 7 2015 Peter Robinson 2015.07-4 +- Add tegra patches to enable GPU + +* Mon Aug 3 2015 Peter Robinson 2015.07-3 +- Drop some unused u-boot binaries +- Minor cleanups + +* Thu Jul 16 2015 Peter Robinson 2015.07-2 +- Disable boot splash on Utilite (cm_fx6) + +* Wed Jul 15 2015 Peter Robinson 2015.07-1 +- Update to 2015.07 GA + +* Thu Jul 2 2015 Peter Robinson 2015.07-0.4rc3 +- Update to 2015.07rc3 +- Some fixes for omap4/am33xx/imx6 devices + +* Mon Jun 22 2015 Peter Robinson 2015.07-0.3rc2 +- Initial rebase of BBB/panda/wandboard generic distro boot support + +* Tue Jun 16 2015 Peter Robinson 2015.07-0.2rc2 +- Enable i.MX6 marsboard and warp +- Use upstream build fix +- Add patch to fix Raspberry Pi timer speed + +* Tue Jun 9 2015 Peter Robinson 2015.07-0.1rc2 +- Initial rebase to 2015.07rc2 +- Enable mx6cuboxi, 32 bit vexpress +- Update builds for name changes, merges etc + * Wed May 27 2015 Peter Robinson 2015.04-3 - Enable Zynq microzed, zed and zybo