From a77d47ae9cdde4f6fce43a2c4c14b72f11712563 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 3 Feb 2016 08:01:31 +0000 Subject: [PATCH] 2016.03 RC1 --- ...-rm-Jetson-TK1-PMIC-GPIO-programming.patch | 59 --------------- ...leBones-enable-CONFIG_AUTOBOOT_KEYED.patch | 73 ------------------- sources | 2 +- uboot-tools.spec | 11 +-- 4 files changed, 7 insertions(+), 138 deletions(-) delete mode 100644 0001-ARM-tegra-rm-Jetson-TK1-PMIC-GPIO-programming.patch delete mode 100644 0001-am335x-BeagleBones-enable-CONFIG_AUTOBOOT_KEYED.patch diff --git a/0001-ARM-tegra-rm-Jetson-TK1-PMIC-GPIO-programming.patch b/0001-ARM-tegra-rm-Jetson-TK1-PMIC-GPIO-programming.patch deleted file mode 100644 index 9ff6bc4..0000000 --- a/0001-ARM-tegra-rm-Jetson-TK1-PMIC-GPIO-programming.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 85e3926adef34b6ea22275f040efbbd7b1f63a20 Mon Sep 17 00:00:00 2001 -From: Peter Robinson -Date: Tue, 19 Jan 2016 07:26:15 +0000 -Subject: [PATCH] ARM: tegra: rm Jetson TK1 PMIC GPIO programming - -From: Stephen Warren - -The PMIC is configured such that its GPIOs have the correct configuration -at power-up, so no programming is required. - -In fact, the current programming is actively wrong, since: - -(a) the AS3722 driver configures the GPIO to be an output before setting -its output value, which causes a 0v glitch on the output. - -(b) the AS3722 driver configures the GPIO to drive a high voltage from its -VSUP_GPIO power source rather than its VDD_GPIO_LV power source, so the pin -drives 5V not 1.8V as desired. - -Solve these problems by removing the code which configures the PMIC GPIOs. - -Note that this patch was tested directly on top of v2016.01; since then, -commit 96350f729c42 "dm: tegra: net: Convert tegra boards to driver model -for Ethernet" prevents PCIe from being initialized. Alternatively, simply -revert that commit to get PCIe Ethernet working again, then apply this -patch to test. - -Signed-off-by: Stephen Warren ---- - board/nvidia/jetson-tk1/jetson-tk1.c | 13 ------------- - 1 file changed, 13 deletions(-) - -diff --git a/board/nvidia/jetson-tk1/jetson-tk1.c b/board/nvidia/jetson-tk1/jetson-tk1.c -index 52425a8..fdc61ea 100644 ---- a/board/nvidia/jetson-tk1/jetson-tk1.c -+++ b/board/nvidia/jetson-tk1/jetson-tk1.c -@@ -58,19 +58,6 @@ int tegra_pcie_board_init(void) - return err; - } - -- err = as3722_gpio_configure(pmic, 1, AS3722_GPIO_OUTPUT_VDDH | -- AS3722_GPIO_INVERT); -- if (err < 0) { -- error("failed to configure GPIO#1 as output: %d\n", err); -- return err; -- } -- -- err = as3722_gpio_direction_output(pmic, 2, 1); -- if (err < 0) { -- error("failed to set GPIO#2 high: %d\n", err); -- return err; -- } -- - return 0; - } - --- -2.5.0 - diff --git a/0001-am335x-BeagleBones-enable-CONFIG_AUTOBOOT_KEYED.patch b/0001-am335x-BeagleBones-enable-CONFIG_AUTOBOOT_KEYED.patch deleted file mode 100644 index d345b43..0000000 --- a/0001-am335x-BeagleBones-enable-CONFIG_AUTOBOOT_KEYED.patch +++ /dev/null @@ -1,73 +0,0 @@ -From patchwork Thu Jan 14 18:15:25 2016 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: [U-Boot] am335x: BeagleBones enable CONFIG_AUTOBOOT_KEYED -From: robertcnelson@gmail.com -X-Patchwork-Id: 567617 -Message-Id: <1452795325-29694-1-git-send-email-robertcnelson@gmail.com> -To: u-boot@lists.denx.de -Cc: trini@ti.com, Tom Rini -Date: Thu, 14 Jan 2016 12:15:25 -0600 - -On startup, the BeagleBone family of boards can occationally halt at -the U-Boot prompt. Due to U-Boot receiving random data on the usart. - -Migrate BeagleBone based boards to use CONFIG_AUTOBOOT_KEYED, user -will now have to enter the key to get to U-Boot prompt - -Signed-off-by: Robert Nelson -CC: Craig McQueen -CC: Tom Rini -Reviewed-by: Tom Rini ---- - configs/am335x_boneblack_defconfig | 4 ++++ - configs/am335x_boneblack_vboot_defconfig | 4 ++++ - configs/am335x_evm_defconfig | 4 ++++ - 3 files changed, 12 insertions(+) - -diff --git a/configs/am335x_boneblack_defconfig b/configs/am335x_boneblack_defconfig -index 3030a95..8803da5 100644 ---- a/configs/am335x_boneblack_defconfig -+++ b/configs/am335x_boneblack_defconfig -@@ -4,6 +4,10 @@ CONFIG_SPL_STACK_R_ADDR=0x82000000 - CONFIG_SPL=y - CONFIG_SPL_STACK_R=y - CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT" -+CONFIG_AUTOBOOT_KEYED=y -+CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" -+CONFIG_AUTOBOOT_DELAY_STR="d" -+CONFIG_AUTOBOOT_STOP_STR=" " - # CONFIG_CMD_IMLS is not set - # CONFIG_CMD_FLASH is not set - CONFIG_CMD_GPIO=y -diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig -index ad40b07..5dcb942 100644 ---- a/configs/am335x_boneblack_vboot_defconfig -+++ b/configs/am335x_boneblack_vboot_defconfig -@@ -8,6 +8,10 @@ CONFIG_FIT=y - CONFIG_FIT_VERBOSE=y - CONFIG_FIT_SIGNATURE=y - CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT,ENABLE_VBOOT" -+CONFIG_AUTOBOOT_KEYED=y -+CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" -+CONFIG_AUTOBOOT_DELAY_STR="d" -+CONFIG_AUTOBOOT_STOP_STR=" " - # CONFIG_CMD_IMLS is not set - # CONFIG_CMD_FLASH is not set - CONFIG_CMD_GPIO=y -diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig -index 27cb881..7753ab5 100644 ---- a/configs/am335x_evm_defconfig -+++ b/configs/am335x_evm_defconfig -@@ -4,6 +4,10 @@ CONFIG_SPL_STACK_R_ADDR=0x82000000 - CONFIG_SPL=y - CONFIG_SPL_STACK_R=y - CONFIG_SYS_EXTRA_OPTIONS="NAND" -+CONFIG_AUTOBOOT_KEYED=y -+CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" -+CONFIG_AUTOBOOT_DELAY_STR="d" -+CONFIG_AUTOBOOT_STOP_STR=" " - # CONFIG_CMD_IMLS is not set - # CONFIG_CMD_FLASH is not set - CONFIG_CMD_GPIO=y diff --git a/sources b/sources index 26aa05b..24b61b1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7d4f65fd43d4d706f5c5650e020d899d u-boot-2016.01.tar.bz2 +cb549a4337924dd37fc99ec2d88818ee u-boot-2016.03-rc1.tar.bz2 diff --git a/uboot-tools.spec b/uboot-tools.spec index 0beea28..05c0ea3 100644 --- a/uboot-tools.spec +++ b/uboot-tools.spec @@ -1,8 +1,8 @@ -#global candidate rc4 +%global candidate rc1 Name: uboot-tools -Version: 2016.01 -Release: 3%{?candidate:.%{candidate}}%{?dist} +Version: 2016.03 +Release: 0.1%{?candidate:.%{candidate}}%{?dist} Summary: U-Boot utilities Group: Development/Tools @@ -13,8 +13,6 @@ Source1: armv7-boards Patch1: 0004-Add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch Patch2: 0005-port-utilite-to-distro-generic-boot-commands.patch -Patch3: 0001-am335x-BeagleBones-enable-CONFIG_AUTOBOOT_KEYED.patch -Patch4: 0001-ARM-tegra-rm-Jetson-TK1-PMIC-GPIO-programming.patch Patch5: 0001-wandboard-fix-variable-name-so-PXE-boot-works.patch BuildRequires: bc @@ -165,6 +163,9 @@ install -p -m 0644 tools/env/fw_env.config $RPM_BUILD_ROOT%{_sysconfdir} %endif %changelog +* Wed Feb 3 2016 Peter Robinson 2016.03-0.1rc1 +- Update to 2016.03 RC1 + * Wed Jan 20 2016 Peter Robinson 2016.01-3 - Fix PXE boot on Wandboard (rhbz #1299957)