From 4d21484b4469e861e7550b86e2c2df7d1b4f8779 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 14 Mar 2016 17:24:42 +0000 Subject: [PATCH] 2016.03 GA --- sources | 2 +- sunxi-chip-enable-composite-video-out.patch | 35 ++++++++++++++++++ ...i-fix-DCDC2-output-in-CHIP_defconfig.patch | 37 +++++++++++++++++++ uboot-tools.spec | 9 ++++- 4 files changed, 80 insertions(+), 3 deletions(-) create mode 100644 sunxi-chip-enable-composite-video-out.patch create mode 100644 sunxi-fix-DCDC2-output-in-CHIP_defconfig.patch diff --git a/sources b/sources index 981debc..e5e30a7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f1bb42e6274ccebf8fc38af483e5322d u-boot-2016.03-rc3.tar.bz2 +973c1d896be751321cc3aafa564f64b2 u-boot-2016.03.tar.bz2 diff --git a/sunxi-chip-enable-composite-video-out.patch b/sunxi-chip-enable-composite-video-out.patch new file mode 100644 index 0000000..dc8656b --- /dev/null +++ b/sunxi-chip-enable-composite-video-out.patch @@ -0,0 +1,35 @@ +From patchwork Mon Mar 7 12:50:20 2016 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [U-Boot] sunxi: chip: enable composite video out +From: Maxime Ripard +X-Patchwork-Id: 592941 +Message-Id: <1457355020-13676-1-git-send-email-maxime.ripard@free-electrons.com> +To: Hans de Goede +Cc: u-boot@lists.denx.de, Alex Kaplan +Date: Mon, 7 Mar 2016 13:50:20 +0100 + +From: Alex Kaplan + +The CHIP has a composite video output in the mini-Jack connector, alongside +with the 2 audio channels. Enable this output in U-Boot. + +Signed-off-by: Alex Kaplan +Signed-off-by: Maxime Ripard +--- + configs/CHIP_defconfig | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configs/CHIP_defconfig b/configs/CHIP_defconfig +index 3135d1c88e79..4f99d1efdf9e 100644 +--- a/configs/CHIP_defconfig ++++ b/configs/CHIP_defconfig +@@ -4,6 +4,7 @@ CONFIG_MACH_SUN5I=y + CONFIG_DRAM_TIMINGS_DDR3_800E_1066G_1333J=y + # CONFIG_MMC is not set + CONFIG_USB0_VBUS_PIN="PB10" ++CONFIG_VIDEO_COMPOSITE=y + CONFIG_DEFAULT_DEVICE_TREE="sun5i-r8-chip" + CONFIG_SPL=y + CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2" diff --git a/sunxi-fix-DCDC2-output-in-CHIP_defconfig.patch b/sunxi-fix-DCDC2-output-in-CHIP_defconfig.patch new file mode 100644 index 0000000..f6a3c66 --- /dev/null +++ b/sunxi-fix-DCDC2-output-in-CHIP_defconfig.patch @@ -0,0 +1,37 @@ +From patchwork Mon Mar 7 12:44:11 2016 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [U-Boot] sunxi: fix DCDC2 output in CHIP_defconfig +From: Maxime Ripard +X-Patchwork-Id: 592940 +Message-Id: <1457354651-10083-1-git-send-email-maxime.ripard@free-electrons.com> +To: Hans de Goede +Cc: u-boot@lists.denx.de +Date: Mon, 7 Mar 2016 13:44:11 +0100 + +From: Boris Brezillon + +Unlike the datasheet recommendation, the R8 SoC requires a 1.4V supply +for its CPU when operating at 1Ghz. + +Rely on the default value specified in the Kconfig entry. + +Signed-off-by: Boris Brezillon +Signed-off-by: Maxime Ripard +--- + configs/CHIP_defconfig | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/configs/CHIP_defconfig b/configs/CHIP_defconfig +index 78b2c511bfa2..3135d1c88e79 100644 +--- a/configs/CHIP_defconfig ++++ b/configs/CHIP_defconfig +@@ -9,7 +9,6 @@ CONFIG_SPL=y + CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2" + # CONFIG_CMD_IMLS is not set + CONFIG_CMD_GPIO=y +-CONFIG_AXP_DCDC2_VOLT=1300 + CONFIG_AXP_ALDO3_VOLT=3300 + CONFIG_AXP_ALDO4_VOLT=3300 + CONFIG_USB_MUSB_GADGET=y diff --git a/uboot-tools.spec b/uboot-tools.spec index 9abf0c8..e6c2cb2 100644 --- a/uboot-tools.spec +++ b/uboot-tools.spec @@ -1,8 +1,8 @@ -%global candidate rc3 +#global candidate rc3 Name: uboot-tools Version: 2016.03 -Release: 0.4%{?candidate:.%{candidate}}%{?dist} +Release: 1%{?candidate:.%{candidate}}%{?dist} Summary: U-Boot utilities Group: Development/Tools @@ -16,6 +16,8 @@ Patch2: 0005-port-utilite-to-distro-generic-boot-commands.patch Patch3: 0001-Copy-gcc5-over-to-compiler-gcc6.h-as-a-beginning-of-.patch Patch4: mvebu-enable-generic-distro-boot-config.patch Patch5: 0001-WIP-RPi-3-32-bit-port.patch +Patch6: sunxi-chip-enable-composite-video-out.patch +Patch7: sunxi-fix-DCDC2-output-in-CHIP_defconfig.patch BuildRequires: bc BuildRequires: dtc @@ -165,6 +167,9 @@ install -p -m 0644 tools/env/fw_env.config $RPM_BUILD_ROOT%{_sysconfdir} %endif %changelog +* Mon Mar 14 2016 Peter Robinson 2016.03-1 +- Update to 2016.03 GA + * Sun Mar 6 2016 Peter Robinson 2016.03-0.4rc3 - Minor cleanups and new devices