2016.05 GA
This commit is contained in:
Peter Robinson
parent
bed2a9c0b0
commit
8b3a2c7342
@ -1,33 +0,0 @@
|
||||
From f188357a155a5b7d6906f081c6e7265f6d6086ec Mon Sep 17 00:00:00 2001
|
||||
From: Tom Rini <trini@konsulko.com>
|
||||
Date: Mon, 2 May 2016 08:49:53 -0400
|
||||
Subject: [PATCH 01/53] Revert "ti_armv7_common.h: Fix U-Boot location on eMMC"
|
||||
|
||||
We cannot change the long standing hard-coded offset for raw boot mode
|
||||
for everyone to accommodate how Android expects things to be done here.
|
||||
|
||||
This reverts commit ef5ebe951bec72631cdbc7cef9079e6c684e5d0b.
|
||||
|
||||
Signed-off-by: Tom Rini <trini@konsulko.com>
|
||||
---
|
||||
include/configs/ti_armv7_common.h | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
|
||||
index 2c7d542..7db0881 100644
|
||||
--- a/include/configs/ti_armv7_common.h
|
||||
+++ b/include/configs/ti_armv7_common.h
|
||||
@@ -219,8 +219,8 @@
|
||||
#endif
|
||||
|
||||
/* RAW SD card / eMMC locations. */
|
||||
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x200 /* address 0x40000 */
|
||||
-#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x300 /* 384 KB */
|
||||
+#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /* address 0x60000 */
|
||||
+#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x200 /* 256 KB */
|
||||
|
||||
/* FAT sd card locations. */
|
||||
#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@ -1,52 +0,0 @@
|
||||
From bfb33f0bc45b9ee92ed2f85107cf20b9bfdf9f8a Mon Sep 17 00:00:00 2001
|
||||
From: Hans de Goede <hdegoede@redhat.com>
|
||||
Date: Thu, 14 Apr 2016 18:53:32 +0200
|
||||
Subject: [PATCH 01/61] sunxi: mctl_mem_matches: Add missing memory barrier
|
||||
|
||||
We are running with the caches disabled when mctl_mem_matches gets called,
|
||||
but the cpu's write buffer is still there and can still get in the way,
|
||||
add a memory barrier to fix this.
|
||||
|
||||
This avoids mctl_mem_matches always returning false in some cases, which
|
||||
was resulting in:
|
||||
|
||||
U-Boot SPL 2015.07 (Apr 14 2016 - 18:47:26)
|
||||
DRAM: 1024 MiB
|
||||
|
||||
U-Boot 2015.07 (Apr 14 2016 - 18:47:26 +0200) Allwinner Technology
|
||||
|
||||
CPU: Allwinner A23 (SUN8I)
|
||||
DRAM: 512 MiB
|
||||
|
||||
Where 512 MiB is the right amount, but the DRAM controller would be
|
||||
initialized for 1024 MiB.
|
||||
|
||||
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
||||
Acked-by: Ian Campbell <ijc@hellion.org.uk>
|
||||
---
|
||||
arch/arm/mach-sunxi/dram_helpers.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/arch/arm/mach-sunxi/dram_helpers.c b/arch/arm/mach-sunxi/dram_helpers.c
|
||||
index 50318d2..e0c823a 100644
|
||||
--- a/arch/arm/mach-sunxi/dram_helpers.c
|
||||
+++ b/arch/arm/mach-sunxi/dram_helpers.c
|
||||
@@ -7,6 +7,7 @@
|
||||
*/
|
||||
|
||||
#include <common.h>
|
||||
+#include <asm/armv7.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/arch/dram.h>
|
||||
|
||||
@@ -31,6 +32,7 @@ bool mctl_mem_matches(u32 offset)
|
||||
/* Try to write different values to RAM at two addresses */
|
||||
writel(0, CONFIG_SYS_SDRAM_BASE);
|
||||
writel(0xaa55aa55, (ulong)CONFIG_SYS_SDRAM_BASE + offset);
|
||||
+ DSB;
|
||||
/* Check if the same value is actually observed when reading back */
|
||||
return readl(CONFIG_SYS_SDRAM_BASE) ==
|
||||
readl((ulong)CONFIG_SYS_SDRAM_BASE + offset);
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
From 821c89d38cb6832f162b5b20ec86f07610407c25 Mon Sep 17 00:00:00 2001
|
||||
From: Tom Rini <trini@konsulko.com>
|
||||
Date: Mon, 2 May 2016 10:52:51 -0400
|
||||
Subject: [PATCH 02/53] Revert "omap3: Use raw SPL by default for mmc1"
|
||||
|
||||
Unfortunately with this change we now are unable to do FS mode boots
|
||||
from MMC1 as with the way the code works today we will always load and
|
||||
assume that the hard-coded raw location contains U-Boot. Further, we
|
||||
cannot fix this by just changing other logic to try FS-then-RAW as it
|
||||
would also make us have to ignore what order the ROM is telling us to
|
||||
try.
|
||||
|
||||
This reverts commit 22d90d560a2b01c47f180e196e6c6485eb8e65db.
|
||||
|
||||
Signed-off-by: Tom Rini <trini@konsulko.com>
|
||||
---
|
||||
arch/arm/cpu/armv7/omap-common/boot-common.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/arch/arm/cpu/armv7/omap-common/boot-common.c b/arch/arm/cpu/armv7/omap-common/boot-common.c
|
||||
index ed9ba7b..0456263 100644
|
||||
--- a/arch/arm/cpu/armv7/omap-common/boot-common.c
|
||||
+++ b/arch/arm/cpu/armv7/omap-common/boot-common.c
|
||||
@@ -111,6 +111,8 @@ void save_omap_boot_params(void)
|
||||
(boot_device <= MMC_BOOT_DEVICES_END)) {
|
||||
switch (boot_device) {
|
||||
case BOOT_DEVICE_MMC1:
|
||||
+ boot_mode = MMCSD_MODE_FS;
|
||||
+ break;
|
||||
case BOOT_DEVICE_MMC2:
|
||||
boot_mode = MMCSD_MODE_RAW;
|
||||
break;
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
# FIXME! Already present in Fedora as uboot-tools.
|
||||
# No need for cloning from upstream git.
|
||||
#
|
||||
# git git://git.denx.de/u-boot.git
|
||||
if [ ! -f $BUILDDIR/u-boot/README ]
|
||||
then
|
||||
cd $BUILDDIR
|
||||
git clone git://git.denx.de/u-boot.git
|
||||
fi
|
||||
cd $BUILDDIR/u-boot
|
||||
make $J distclean
|
||||
make $J CROSS_COMPILE=${TARGET}- omap4_panda_config
|
||||
make $J CROSS_COMPILE=${TARGET}- u-boot.img
|
||||
mkdirp $ROOTFS/boot
|
||||
cp u-boot.img $ROOTFS/boot/u-boot.img
|
||||
@ -1,130 +0,0 @@
|
||||
From patchwork Wed May 4 21:15:29 2016
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: [U-Boot,
|
||||
1/6] arm/arm64: Move barrier instructions into separate header
|
||||
From: Andre Przywara <andre.przywara@arm.com>
|
||||
X-Patchwork-Id: 618677
|
||||
Message-Id: <1462396534-32390-2-git-send-email-andre.przywara@arm.com>
|
||||
To: Hans de Goede <hdegoede@redhat.com>,
|
||||
Ian Campbell <ijc@hellion.org.uk>
|
||||
Cc: u-boot@lists.denx.de, Andre Przywara <andre.przywara@arm.com>,
|
||||
Valentine Barshak <valentine.barshak@cogentembedded.com>,
|
||||
Aneesh V <aneesh@ti.com>
|
||||
Date: Wed, 4 May 2016 22:15:29 +0100
|
||||
|
||||
Commit bfb33f0bc45b ("sunxi: mctl_mem_matches: Add missing memory
|
||||
barrier") broke compilation for the Pine64, as dram_helper.c now
|
||||
includes <asm/armv7.h>, which does not compile on arm64.
|
||||
|
||||
Fix this by moving all barrier instructions into a separate header
|
||||
file, which can easily be shared between arm and arm64.
|
||||
Also extend the inline assembly to take the "sy" argument, which is
|
||||
optional for ARMv7, but mandatory for v8.
|
||||
|
||||
This fixes compilation for 64-bit sunxi boards (Pine64).
|
||||
|
||||
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
|
||||
---
|
||||
arch/arm/include/asm/armv7.h | 21 +-----------------
|
||||
arch/arm/include/asm/barriers.h | 44 ++++++++++++++++++++++++++++++++++++++
|
||||
arch/arm/mach-sunxi/dram_helpers.c | 2 +-
|
||||
3 files changed, 46 insertions(+), 21 deletions(-)
|
||||
create mode 100644 arch/arm/include/asm/barriers.h
|
||||
|
||||
diff --git a/arch/arm/include/asm/armv7.h b/arch/arm/include/asm/armv7.h
|
||||
index 30e7939..423fc70 100644
|
||||
--- a/arch/arm/include/asm/armv7.h
|
||||
+++ b/arch/arm/include/asm/armv7.h
|
||||
@@ -59,26 +59,7 @@
|
||||
#ifndef __ASSEMBLY__
|
||||
#include <linux/types.h>
|
||||
#include <asm/io.h>
|
||||
-
|
||||
-/*
|
||||
- * CP15 Barrier instructions
|
||||
- * Please note that we have separate barrier instructions in ARMv7
|
||||
- * However, we use the CP15 based instructtions because we use
|
||||
- * -march=armv5 in U-Boot
|
||||
- */
|
||||
-#define CP15ISB asm volatile ("mcr p15, 0, %0, c7, c5, 4" : : "r" (0))
|
||||
-#define CP15DSB asm volatile ("mcr p15, 0, %0, c7, c10, 4" : : "r" (0))
|
||||
-#define CP15DMB asm volatile ("mcr p15, 0, %0, c7, c10, 5" : : "r" (0))
|
||||
-
|
||||
-#ifdef __ARM_ARCH_7A__
|
||||
-#define ISB asm volatile ("isb" : : : "memory")
|
||||
-#define DSB asm volatile ("dsb" : : : "memory")
|
||||
-#define DMB asm volatile ("dmb" : : : "memory")
|
||||
-#else
|
||||
-#define ISB CP15ISB
|
||||
-#define DSB CP15DSB
|
||||
-#define DMB CP15DMB
|
||||
-#endif
|
||||
+#include <asm/barriers.h>
|
||||
|
||||
/*
|
||||
* Workaround for ARM errata # 798870
|
||||
diff --git a/arch/arm/include/asm/barriers.h b/arch/arm/include/asm/barriers.h
|
||||
new file mode 100644
|
||||
index 0000000..37870f9
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/include/asm/barriers.h
|
||||
@@ -0,0 +1,44 @@
|
||||
+/*
|
||||
+ * Copyright (C) 2016 ARM Ltd.
|
||||
+ *
|
||||
+ * ARM and ARM64 barrier instructions
|
||||
+ * split from armv7.h to allow sharing between ARM and ARM64
|
||||
+ *
|
||||
+ * Original copyright in armv7.h was:
|
||||
+ * (C) Copyright 2010 Texas Instruments, <www.ti.com> Aneesh V <aneesh@ti.com>
|
||||
+ *
|
||||
+ * Much of the original barrier code was contributed by:
|
||||
+ * Valentine Barshak <valentine.barshak@cogentembedded.com>
|
||||
+ *
|
||||
+ * SPDX-License-Identifier: GPL-2.0+
|
||||
+ */
|
||||
+#ifndef __BARRIERS_H__
|
||||
+#define __BARRIERS_H__
|
||||
+
|
||||
+#ifndef __ASSEMBLY__
|
||||
+
|
||||
+#ifndef CONFIG_ARM64
|
||||
+/*
|
||||
+ * CP15 Barrier instructions
|
||||
+ * Please note that we have separate barrier instructions in ARMv7
|
||||
+ * However, we use the CP15 based instructtions because we use
|
||||
+ * -march=armv5 in U-Boot
|
||||
+ */
|
||||
+#define CP15ISB asm volatile ("mcr p15, 0, %0, c7, c5, 4" : : "r" (0))
|
||||
+#define CP15DSB asm volatile ("mcr p15, 0, %0, c7, c10, 4" : : "r" (0))
|
||||
+#define CP15DMB asm volatile ("mcr p15, 0, %0, c7, c10, 5" : : "r" (0))
|
||||
+
|
||||
+#endif /* !CONFIG_ARM64 */
|
||||
+
|
||||
+#if defined(__ARM_ARCH_7A__) || defined(CONFIG_ARM64)
|
||||
+#define ISB asm volatile ("isb sy" : : : "memory")
|
||||
+#define DSB asm volatile ("dsb sy" : : : "memory")
|
||||
+#define DMB asm volatile ("dmb sy" : : : "memory")
|
||||
+#else
|
||||
+#define ISB CP15ISB
|
||||
+#define DSB CP15DSB
|
||||
+#define DMB CP15DMB
|
||||
+#endif
|
||||
+
|
||||
+#endif /* __ASSEMBLY__ */
|
||||
+#endif /* __BARRIERS_H__ */
|
||||
diff --git a/arch/arm/mach-sunxi/dram_helpers.c b/arch/arm/mach-sunxi/dram_helpers.c
|
||||
index e0c823a..20b430f 100644
|
||||
--- a/arch/arm/mach-sunxi/dram_helpers.c
|
||||
+++ b/arch/arm/mach-sunxi/dram_helpers.c
|
||||
@@ -7,7 +7,7 @@
|
||||
*/
|
||||
|
||||
#include <common.h>
|
||||
-#include <asm/armv7.h>
|
||||
+#include <asm/barriers.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/arch/dram.h>
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
61871453158263feab3d303e9f6b7867 u-boot-2016.05-rc3.tar.bz2
|
||||
3a8613d753dfa707c937991a35404510 u-boot-2016.05.tar.bz2
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
From patchwork Thu May 12 17:29:37 2016
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: [U-Boot] sunxi: Enable USB host in CHIP defconfig
|
||||
From: Hans de Goede <hdegoede@redhat.com>
|
||||
X-Patchwork-Id: 621695
|
||||
Message-Id: <1463074177-3321-1-git-send-email-hdegoede@redhat.com>
|
||||
To: Ian Campbell <ijc+uboot@hellion.org.uk>
|
||||
Cc: Dennis Gilmore <dennis@ausil.us>, u-boot@lists.denx.de
|
||||
Date: Thu, 12 May 2016 19:29:37 +0200
|
||||
|
||||
Reported-and-tested-by: Dennis Gilmore <dennis@ausil.us>
|
||||
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
||||
Acked-by: Ian Campbell <ijc@hellion.org.uk>
|
||||
---
|
||||
configs/CHIP_defconfig | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/configs/CHIP_defconfig b/configs/CHIP_defconfig
|
||||
index 0eca229..cbbec47 100644
|
||||
--- a/configs/CHIP_defconfig
|
||||
+++ b/configs/CHIP_defconfig
|
||||
@@ -29,3 +29,4 @@ CONFIG_USB_GADGET_DOWNLOAD=y
|
||||
CONFIG_G_DNL_MANUFACTURER="Allwinner Technology"
|
||||
CONFIG_G_DNL_VENDOR_NUM=0x1f3a
|
||||
CONFIG_G_DNL_PRODUCT_NUM=0x1010
|
||||
+CONFIG_USB_EHCI_HCD=y
|
||||
@ -1,8 +1,8 @@
|
||||
%global candidate rc3
|
||||
#global candidate rc3
|
||||
|
||||
Name: uboot-tools
|
||||
Version: 2016.05
|
||||
Release: 0.5%{?candidate:.%{candidate}}%{?dist}
|
||||
Release: 1%{?candidate:.%{candidate}}%{?dist}
|
||||
Summary: U-Boot utilities
|
||||
|
||||
Group: Development/Tools
|
||||
@ -17,17 +17,12 @@ Patch2: 0004-Add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch
|
||||
Patch3: 0005-port-utilite-to-distro-generic-boot-commands.patch
|
||||
Patch4: mvebu-enable-generic-distro-boot-config.patch
|
||||
Patch5: U-Boot-video-ipu_common-fix-build-error.patch
|
||||
Patch6: sunxi-Enable-USB-host-in-CHIP-defconfig.patch
|
||||
Patch7: 0001-Revert-ti_armv7_common.h-Fix-U-Boot-location-on-eMMC.patch
|
||||
Patch8: 0002-Revert-omap3-Use-raw-SPL-by-default-for-mmc1.patch
|
||||
|
||||
Patch10: 0001-sunxi-mctl_mem_matches-Add-missing-memory-barrier.patch
|
||||
Patch11: U-Boot-1-6-arm-arm64-Move-barrier-instructions-into-separate-header.patch
|
||||
Patch12: U-Boot-2-6-Revert-sunxi-Reserve-ATF-memory-space-on-A64.patch
|
||||
Patch13: U-Boot-3-6-arm64-sunxi-reserve-space-for-boot0-header.patch
|
||||
Patch14: U-Boot-4-6-arm64-sunxi-adjust-default-load-addresses.patch
|
||||
Patch15: U-Boot-5-6-arm64-Pine64-update-FDT-files.patch
|
||||
Patch16: U-Boot-6-6-Pine64-rename-defconfig.patch
|
||||
Patch11: U-Boot-2-6-Revert-sunxi-Reserve-ATF-memory-space-on-A64.patch
|
||||
Patch12: U-Boot-3-6-arm64-sunxi-reserve-space-for-boot0-header.patch
|
||||
Patch13: U-Boot-4-6-arm64-sunxi-adjust-default-load-addresses.patch
|
||||
Patch14: U-Boot-5-6-arm64-Pine64-update-FDT-files.patch
|
||||
Patch15: U-Boot-6-6-Pine64-rename-defconfig.patch
|
||||
|
||||
BuildRequires: bc
|
||||
BuildRequires: dtc
|
||||
@ -204,6 +199,9 @@ install -p -m 0644 tools/env/fw_env.config $RPM_BUILD_ROOT%{_sysconfdir}
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon May 16 2016 Peter Robinson <pbrobinson@fedoraproject.org> 2016.05-1
|
||||
- Update to 2016.05 GA
|
||||
|
||||
* Thu May 12 2016 Peter Robinson <pbrobinson@fedoraproject.org> 2016.05-0.5rc3
|
||||
- Add USB storage support to CHIP
|
||||
- Enhanced PINE64 support
|
||||
|
||||
Loading…
Reference in New Issue
Block a user