rpms/uboot-tools
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Enhanced PINE64 support, Add USB storage support to CHIP

Browse Source
This commit is contained in:
Peter Robinson 2016-05-14 09:52:43 +01:00
parent c56130ee24
commit bed2a9c0b0
12 changed files with 2225 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
0001-Revert-ti_armv7_common.h-Fix-U-Boot-location-on-eMMC.patch Normal file
View File

@ -0,0 +1,33 @@
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

52
0001-sunxi-mctl_mem_matches-Add-missing-memory-barrier.patch Normal file
View File

@ -0,0 +1,52 @@
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

35
0002-Revert-omap3-Use-raw-SPL-by-default-for-mmc1.patch Normal file
View File

@ -0,0 +1,35 @@
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

130
U-Boot-1-6-arm-arm64-Move-barrier-instructions-into-separate-header.patch Normal file
View File

@ -0,0 +1,130 @@
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>

43
U-Boot-2-6-Revert-sunxi-Reserve-ATF-memory-space-on-A64.patch Normal file
View File

@ -0,0 +1,43 @@
From patchwork Wed May 4 21:15:30 2016
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [U-Boot,2/6] Revert "sunxi: Reserve ATF memory space on A64"
From: Andre Przywara <andre.przywara@arm.com>
X-Patchwork-Id: 618676
Message-Id: <1462396534-32390-3-git-send-email-andre.przywara@arm.com>
To: Hans de Goede <hdegoede@redhat.com>,
Ian Campbell <ijc@hellion.org.uk>
Cc: Andre Przywara <andre.przywara@arm.com>, u-boot@lists.denx.de
Date: Wed, 4 May 2016 22:15:30 +0100
The ARM Trusted Firmware (ATF) code now lives in SRAM on the Pine64/A64,
so we can claim the whole of DRAM for OS use.
This reverts commit 3ffe39ed2b66af71c7271d0cef2a248b5bf7dfdb.
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
---
board/sunxi/board.c | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index 3cf3614..ccf4129 100644
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -133,15 +133,6 @@ int dram_init(void)
return 0;
}
-#ifdef CONFIG_MACH_SUN50I
-void dram_init_banksize(void)
-{
- /* We need to reserve the first 16MB of RAM for ATF */
- gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE + (16 * 1024 * 1024);
- gd->bd->bi_dram[0].size = get_effective_memsize() - (16 * 1024 * 1024);
-}
-#endif
-
#if defined(CONFIG_NAND_SUNXI) && defined(CONFIG_SPL_BUILD)
static void nand_pinmux_setup(void)
{

42
U-Boot-3-6-arm64-sunxi-reserve-space-for-boot0-header.patch Normal file
View File

@ -0,0 +1,42 @@
From patchwork Wed May 4 21:15:31 2016
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [U-Boot,3/6] arm64: sunxi: reserve space for boot0 header
From: Andre Przywara <andre.przywara@arm.com>
X-Patchwork-Id: 618678
Message-Id: <1462396534-32390-4-git-send-email-andre.przywara@arm.com>
To: Hans de Goede <hdegoede@redhat.com>,
Ian Campbell <ijc@hellion.org.uk>
Cc: Andre Przywara <andre.przywara@arm.com>, u-boot@lists.denx.de
Date: Wed, 4 May 2016 22:15:31 +0100
The Allwinner provided boot0 boot loader requires a header before the
U-Boot binary to both check its validity and to find other blobs to
load. There is a tool called boot0img which fills the header
appropriately.
Reserve some space at the beginning of the binary to later hold the
header if needed.
Please note that the header is jumped over already by U-Boot anyway,
so filling the header is optional and can be skipped if for instance
boot0 is not used.
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
---
arch/arm/cpu/armv8/start.S | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/arm/cpu/armv8/start.S b/arch/arm/cpu/armv8/start.S
index deb44a8..b4c4867 100644
--- a/arch/arm/cpu/armv8/start.S
+++ b/arch/arm/cpu/armv8/start.S
@@ -21,6 +21,9 @@
_start:
b reset
+#ifdef CONFIG_ARCH_SUNXI
+ .space 0x5fc /* can be filled with a boot0 header if needed */
+#endif
.align 3
.globl _TEXT_BASE

59
U-Boot-4-6-arm64-sunxi-adjust-default-load-addresses.patch Normal file
View File

@ -0,0 +1,59 @@
From patchwork Wed May 4 21:15:32 2016
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [U-Boot,4/6] arm64: sunxi: adjust default load addresses
From: Andre Przywara <andre.przywara@arm.com>
X-Patchwork-Id: 618679
Message-Id: <1462396534-32390-5-git-send-email-andre.przywara@arm.com>
To: Hans de Goede <hdegoede@redhat.com>,
Ian Campbell <ijc@hellion.org.uk>
Cc: Andre Przywara <andre.przywara@arm.com>, u-boot@lists.denx.de
Date: Wed, 4 May 2016 22:15:32 +0100
As arm64 has slightly different expectations about load addresses, lets
use a different set of default addresses for things like the kernel.
As arm64 kernels don't come with a decompressor right now, reserve some
more space for really big uncompressed kernels.
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
---
include/configs/sunxi-common.h | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 2406115..16f1a2c 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -390,6 +390,23 @@ extern int soft_i2c_gpio_scl;
#define CONFIG_PRE_CONSOLE_BUFFER
#define CONFIG_PRE_CON_BUF_SZ 4096 /* Aprox 2 80*25 screens */
+#ifdef CONFIG_ARM64
+/*
+ * Boards seem to come with at least 512MB of DRAM.
+ * The kernel should go at 512K, which is the default text offset (that will
+ * be adjusted at runtime if needed).
+ * There is no compression for arm64 kernels (yet), so leave some space
+ * for really big kernels, say 256MB for now.
+ * Scripts, PXE and DTBs should go afterwards, leaving the rest for the initrd.
+ * Align the initrd to a 2MB page.
+ */
+#define KERNEL_ADDR_R __stringify(SDRAM_OFFSET(0080000))
+#define FDT_ADDR_R __stringify(SDRAM_OFFSET(FA00000))
+#define SCRIPT_ADDR_R __stringify(SDRAM_OFFSET(FC00000))
+#define PXEFILE_ADDR_R __stringify(SDRAM_OFFSET(FD00000))
+#define RAMDISK_ADDR_R __stringify(SDRAM_OFFSET(FE00000))
+
+#else
/*
* 160M RAM (256M minimum minus 64MB heap + 32MB for u-boot, stack, fb, etc.
* 32M uncompressed kernel, 16M compressed kernel, 1M fdt,
@@ -401,6 +418,7 @@ extern int soft_i2c_gpio_scl;
#define SCRIPT_ADDR_R __stringify(SDRAM_OFFSET(3100000))
#define PXEFILE_ADDR_R __stringify(SDRAM_OFFSET(3200000))
#define RAMDISK_ADDR_R __stringify(SDRAM_OFFSET(3300000))
+#endif
#define MEM_LAYOUT_ENV_SETTINGS \
"bootm_size=0xa000000\0" \

1703
U-Boot-5-6-arm64-Pine64-update-FDT-files.patch Normal file
View File

File diff suppressed because it is too large Load Diff

80
U-Boot-6-6-Pine64-rename-defconfig.patch Normal file
View File

@ -0,0 +1,80 @@
From patchwork Wed May 4 21:15:34 2016
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [U-Boot,6/6] Pine64: rename defconfig
From: Andre Przywara <andre.przywara@arm.com>
X-Patchwork-Id: 618681
Message-Id: <1462396534-32390-7-git-send-email-andre.przywara@arm.com>
To: Hans de Goede <hdegoede@redhat.com>,
Ian Campbell <ijc@hellion.org.uk>
Cc: Andre Przywara <andre.przywara@arm.com>, u-boot@lists.denx.de
Date: Wed, 4 May 2016 22:15:34 +0100
Rename the defconfig file for the Pine64 from pine64_plus_defconfig to
pine64_defconfig.
The differences between the two versions (more RAM and a different
Ethernet PHY) don't justify two board versions, so lets stick with the
generic name and try to differentiate between the versions at runtime
if this is needed later.
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
---
configs/pine64_defconfig | 20 ++++++++++++++++++++
configs/pine64_plus_defconfig | 20 --------------------
2 files changed, 20 insertions(+), 20 deletions(-)
create mode 100644 configs/pine64_defconfig
delete mode 100644 configs/pine64_plus_defconfig
diff --git a/configs/pine64_defconfig b/configs/pine64_defconfig
new file mode 100644
index 0000000..0977334
--- /dev/null
+++ b/configs/pine64_defconfig
@@ -0,0 +1,20 @@
+CONFIG_ARM=y
+CONFIG_ARCH_SUNXI=y
+CONFIG_MACH_SUN50I=y
+CONFIG_DRAM_CLK=672
+CONFIG_DRAM_ZQ=3881915
+# CONFIG_VIDEO is not set
+CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-pine64-plus"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_HUSH_PARSER=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+CONFIG_CMD_MMC=y
+# CONFIG_CMD_FPGA is not set
+CONFIG_CMD_DHCP=y
+CONFIG_CMD_MII=y
+CONFIG_CMD_PING=y
+CONFIG_CMD_EXT2=y
+CONFIG_CMD_EXT4=y
+CONFIG_CMD_FAT=y
+CONFIG_CMD_FS_GENERIC=y
diff --git a/configs/pine64_plus_defconfig b/configs/pine64_plus_defconfig
deleted file mode 100644
index 0977334..0000000
--- a/configs/pine64_plus_defconfig
+++ /dev/null
@@ -1,20 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARCH_SUNXI=y
-CONFIG_MACH_SUN50I=y
-CONFIG_DRAM_CLK=672
-CONFIG_DRAM_ZQ=3881915
-# CONFIG_VIDEO is not set
-CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-pine64-plus"
-# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_HUSH_PARSER=y
-# CONFIG_CMD_IMLS is not set
-# CONFIG_CMD_FLASH is not set
-CONFIG_CMD_MMC=y
-# CONFIG_CMD_FPGA is not set
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_EXT2=y
-CONFIG_CMD_EXT4=y
-CONFIG_CMD_FAT=y
-CONFIG_CMD_FS_GENERIC=y

2
armv8-boards
View File

@ -1,7 +1,7 @@
dragonboard410c dragonboard410c
hikey hikey
p2371-2180 p2371-2180
pine64_plus pine64
rpi_3 rpi_3
vexpress_aemv8a_dram vexpress_aemv8a_dram
vexpress_aemv8a_juno vexpress_aemv8a_juno

28
sunxi-Enable-USB-host-in-CHIP-defconfig.patch Normal file
View File

@ -0,0 +1,28 @@
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

22
uboot-tools.spec
View File

@ -2,7 +2,7 @@
Name: uboot-tools Name: uboot-tools
Version: 2016.05 Version: 2016.05
Release: 0.4%{?candidate:.%{candidate}}%{?dist} Release: 0.5%{?candidate:.%{candidate}}%{?dist}
Summary: U-Boot utilities Summary: U-Boot utilities
Group: Development/Tools Group: Development/Tools
@ -17,6 +17,17 @@ Patch2: 0004-Add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch
Patch3: 0005-port-utilite-to-distro-generic-boot-commands.patch Patch3: 0005-port-utilite-to-distro-generic-boot-commands.patch
Patch4: mvebu-enable-generic-distro-boot-config.patch Patch4: mvebu-enable-generic-distro-boot-config.patch
Patch5: U-Boot-video-ipu_common-fix-build-error.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
BuildRequires: bc BuildRequires: bc
BuildRequires: dtc BuildRequires: dtc
@ -174,8 +185,9 @@ install -p -m 0644 tools/env/fw_env.config $RPM_BUILD_ROOT%{_sysconfdir}
%files %files
%doc README doc/README.imximage doc/README.kwbimage doc/uImage.FIT %doc README doc/README.imximage doc/README.kwbimage doc/README.imximage
%doc doc/README.odroid doc/README.efi doc/README.imximage doc/README.rockchip %doc doc/README.distro doc/README.gpt doc/README.efi doc/uImage.FIT
%doc doc/README.odroid doc/README.rockchip
%{_bindir}/* %{_bindir}/*
%{_mandir}/man1/mkimage.1* %{_mandir}/man1/mkimage.1*
%dir %{_datadir}/uboot/ %dir %{_datadir}/uboot/
@ -192,6 +204,10 @@ install -p -m 0644 tools/env/fw_env.config $RPM_BUILD_ROOT%{_sysconfdir}
%endif %endif
%changelog %changelog
* Thu May 12 2016 Peter Robinson <pbrobinson@fedoraproject.org> 2016.05-0.5rc3
- Add USB storage support to CHIP
- Enhanced PINE64 support
* Thu Apr 28 2016 Peter Robinson <pbrobinson@fedoraproject.org> 2016.05-0.4rc3 * Thu Apr 28 2016 Peter Robinson <pbrobinson@fedoraproject.org> 2016.05-0.4rc3
- Upstream fix for i.MX6 breakage - Upstream fix for i.MX6 breakage
- Rebase mvebu distro boot patch - Rebase mvebu distro boot patch