cleanup patches
This commit is contained in:
Peter Robinson
parent
584544f9bf
commit
30e13635d3
@ -1,43 +0,0 @@
|
|||||||
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)
|
|
||||||
{
|
|
||||||
@ -1,42 +0,0 @@
|
|||||||
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
|
|
||||||
@ -1,59 +0,0 @@
|
|||||||
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" \
|
|
||||||
File diff suppressed because it is too large
Load Diff
@ -1,80 +0,0 @@
|
|||||||
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
|
|
||||||
@ -1,52 +0,0 @@
|
|||||||
From patchwork Tue May 17 22:54:47 2016
|
|
||||||
Content-Type: text/plain; charset="utf-8"
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Transfer-Encoding: 7bit
|
|
||||||
Subject: [U-Boot] efi_loader: Clean up system table on exit
|
|
||||||
From: Alexander Graf <agraf@suse.de>
|
|
||||||
X-Patchwork-Id: 623319
|
|
||||||
Message-Id: <1463525687-231924-1-git-send-email-agraf@suse.de>
|
|
||||||
To: u-boot@lists.denx.de
|
|
||||||
Cc: leif.lindholm@linaro.org
|
|
||||||
Date: Wed, 18 May 2016 00:54:47 +0200
|
|
||||||
|
|
||||||
We put the system table into our runtime services data section so that
|
|
||||||
payloads may still access it after exit_boot_services. However, most fields
|
|
||||||
in it are quite useless once we're in that state, so let's just patch them
|
|
||||||
out.
|
|
||||||
|
|
||||||
With this patch we don't get spurious warnings when running EFI binaries
|
|
||||||
anymore.
|
|
||||||
|
|
||||||
Signed-off-by: Alexander Graf <agraf@suse.de>
|
|
||||||
---
|
|
||||||
lib/efi_loader/efi_runtime.c | 16 ++++++++++++++++
|
|
||||||
1 file changed, 16 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/lib/efi_loader/efi_runtime.c b/lib/efi_loader/efi_runtime.c
|
|
||||||
index 3ee27ca..11d0126 100644
|
|
||||||
--- a/lib/efi_loader/efi_runtime.c
|
|
||||||
+++ b/lib/efi_loader/efi_runtime.c
|
|
||||||
@@ -125,6 +125,22 @@ static const struct efi_runtime_detach_list_struct efi_runtime_detach_list[] = {
|
|
||||||
/* RTC accessors are gone */
|
|
||||||
.ptr = &efi_runtime_services.get_time,
|
|
||||||
.patchto = &efi_device_error,
|
|
||||||
+ }, {
|
|
||||||
+ /* Clean up system table */
|
|
||||||
+ .ptr = &systab.con_in,
|
|
||||||
+ .patchto = NULL,
|
|
||||||
+ }, {
|
|
||||||
+ /* Clean up system table */
|
|
||||||
+ .ptr = &systab.con_out,
|
|
||||||
+ .patchto = NULL,
|
|
||||||
+ }, {
|
|
||||||
+ /* Clean up system table */
|
|
||||||
+ .ptr = &systab.std_err,
|
|
||||||
+ .patchto = NULL,
|
|
||||||
+ }, {
|
|
||||||
+ /* Clean up system table */
|
|
||||||
+ .ptr = &systab.boottime,
|
|
||||||
+ .patchto = NULL,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
@ -1,42 +0,0 @@
|
|||||||
From patchwork Wed May 18 00:04:24 2016
|
|
||||||
Content-Type: text/plain; charset="utf-8"
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Transfer-Encoding: 7bit
|
|
||||||
Subject: [U-Boot] efi_loader: gop: Don't expose fb address
|
|
||||||
From: Alexander Graf <agraf@suse.de>
|
|
||||||
X-Patchwork-Id: 623328
|
|
||||||
Message-Id: <1463529864-31027-1-git-send-email-agraf@suse.de>
|
|
||||||
To: u-boot@lists.denx.de
|
|
||||||
Cc: leif.lindholm@linaro.org, Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
|
||||||
Date: Wed, 18 May 2016 02:04:24 +0200
|
|
||||||
|
|
||||||
Recently Linux is gaining support for efifb on AArch64 and that support actually
|
|
||||||
tries to make use of the frame buffer address we expose to it via gop.
|
|
||||||
|
|
||||||
While this wouldn't be bad in theory, in practice it means a few bad things
|
|
||||||
|
|
||||||
1) We expose 16bit frame buffers as 32bit today
|
|
||||||
2) Linux can't deal with overlapping non-PCI regions between efifb and
|
|
||||||
a different frame buffer driver
|
|
||||||
|
|
||||||
For now, let's just disable exposure of the frame buffer address. Most OSs that
|
|
||||||
get booted will have a native driver for the GPU anyway.
|
|
||||||
|
|
||||||
Signed-off-by: Alexander Graf <agraf@suse.de>
|
|
||||||
---
|
|
||||||
lib/efi_loader/efi_gop.c | 2 --
|
|
||||||
1 file changed, 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/lib/efi_loader/efi_gop.c b/lib/efi_loader/efi_gop.c
|
|
||||||
index bdd62bc..6c3115c 100644
|
|
||||||
--- a/lib/efi_loader/efi_gop.c
|
|
||||||
+++ b/lib/efi_loader/efi_gop.c
|
|
||||||
@@ -136,8 +136,6 @@ int efi_gop_register(void)
|
|
||||||
gopobj->mode.max_mode = 1;
|
|
||||||
gopobj->mode.info = &gopobj->info;
|
|
||||||
gopobj->mode.info_size = sizeof(gopobj->info);
|
|
||||||
- gopobj->mode.fb_base = gd->fb_base;
|
|
||||||
- gopobj->mode.fb_size = lcd_get_size(&line_len);
|
|
||||||
|
|
||||||
gopobj->info.version = 0;
|
|
||||||
gopobj->info.width = panel_info.vl_col;
|
|
||||||
@ -12,11 +12,11 @@ Source0: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}%{?candidate:-%{candida
|
|||||||
Source1: armv7-boards
|
Source1: armv7-boards
|
||||||
Source2: armv8-boards
|
Source2: armv8-boards
|
||||||
|
|
||||||
Patch2: add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch
|
Patch1: add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch
|
||||||
Patch3: port-utilite-to-distro-generic-boot-commands.patch
|
Patch2: port-utilite-to-distro-generic-boot-commands.patch
|
||||||
Patch4: mvebu-enable-generic-distro-boot-config.patch
|
Patch3: mvebu-enable-generic-distro-boot-config.patch
|
||||||
Patch5: RESEND-sunxi-mmc-increase-status-register-polling-rate-for-data-transfers.patch
|
Patch4: sunxi-mmc-increase-status-register-polling-rate-for-data-transfers.patch
|
||||||
Patch6: net-Add-EMAC-driver-for-H3-A83T-A64-SoCs..patch
|
Patch5: net-Add-EMAC-driver-for-H3-A83T-A64-SoCs..patch
|
||||||
|
|
||||||
BuildRequires: bc
|
BuildRequires: bc
|
||||||
BuildRequires: dtc
|
BuildRequires: dtc
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user