mirror of
https://git.yoctoproject.org/meta-arm
synced 2026-05-07 04:58:57 +00:00
arm-bsp: update tc0 platform with latest u-boot
Use 2020.10 u-boot as it has tc0 platform merged in upstream. Signed-off-by: Usama Arif <usama.arif@arm.com> Change-Id: Ia7da8b96a4509cee25b096f6637c036fef910b48 Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
Usama Arif
Jon Mason
@@ -10,7 +10,7 @@ require conf/machine/include/arm/arch-armv8a.inc
|
|||||||
|
|
||||||
# Das U-boot
|
# Das U-boot
|
||||||
UBOOT_MACHINE ?= "total_compute_defconfig"
|
UBOOT_MACHINE ?= "total_compute_defconfig"
|
||||||
PREFERRED_VERSION_u-boot ?= "2020.07"
|
PREFERRED_VERSION_u-boot ?= "2020.10"
|
||||||
|
|
||||||
# Trusted firmware A v2.3
|
# Trusted firmware A v2.3
|
||||||
PREFERRED_PROVIDER_virtual/trusted-firmware-a ?= "trusted-firmware-a"
|
PREFERRED_PROVIDER_virtual/trusted-firmware-a ?= "trusted-firmware-a"
|
||||||
|
|||||||
-307
@@ -1,307 +0,0 @@
|
|||||||
From 854c5d7b8a010d47da38735f15a31d0b7d10ae3c Mon Sep 17 00:00:00 2001
|
|
||||||
From: Usama Arif <usama.arif@arm.com>
|
|
||||||
Date: Fri, 3 Jul 2020 10:26:56 +0100
|
|
||||||
Subject: [PATCH] Add support for Total Compute
|
|
||||||
|
|
||||||
This includes basic platform patch support and boots
|
|
||||||
kernel and ramdisk that have been sideloaded in DRAM.
|
|
||||||
|
|
||||||
Change-Id: I2e35a1d983efd1d27572f671cad5a9fe4ad68ee6
|
|
||||||
Signed-off-by: Usama Arif <usama.arif@arm.com>
|
|
||||||
Upstream-Status: Pending
|
|
||||||
---
|
|
||||||
arch/arm/Kconfig | 9 +++
|
|
||||||
board/armltd/totalcompute/Kconfig | 12 ++++
|
|
||||||
board/armltd/totalcompute/MAINTAINERS | 6 ++
|
|
||||||
board/armltd/totalcompute/Makefile | 6 ++
|
|
||||||
board/armltd/totalcompute/totalcompute.c | 74 +++++++++++++++++++++++
|
|
||||||
configs/total_compute_defconfig | 39 ++++++++++++
|
|
||||||
include/configs/total_compute.h | 77 ++++++++++++++++++++++++
|
|
||||||
7 files changed, 223 insertions(+)
|
|
||||||
create mode 100644 board/armltd/totalcompute/Kconfig
|
|
||||||
create mode 100644 board/armltd/totalcompute/MAINTAINERS
|
|
||||||
create mode 100644 board/armltd/totalcompute/Makefile
|
|
||||||
create mode 100644 board/armltd/totalcompute/totalcompute.c
|
|
||||||
create mode 100644 configs/total_compute_defconfig
|
|
||||||
create mode 100644 include/configs/total_compute.h
|
|
||||||
|
|
||||||
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
|
|
||||||
index 36c9c2fecd0..b423b7655b6 100644
|
|
||||||
--- a/arch/arm/Kconfig
|
|
||||||
+++ b/arch/arm/Kconfig
|
|
||||||
@@ -635,6 +635,14 @@ config TARGET_VEXPRESS_CA15_TC2
|
|
||||||
select CPU_V7_HAS_VIRT
|
|
||||||
select PL011_SERIAL
|
|
||||||
|
|
||||||
+config TARGET_TOTAL_COMPUTE
|
|
||||||
+ bool "Support Total Compute Platform"
|
|
||||||
+ select ARM64
|
|
||||||
+ select PL01X_SERIAL
|
|
||||||
+ select DM
|
|
||||||
+ select DM_SERIAL
|
|
||||||
+ select DM_ETH
|
|
||||||
+
|
|
||||||
config ARCH_BCMSTB
|
|
||||||
bool "Broadcom BCM7XXX family"
|
|
||||||
select CPU_V7A
|
|
||||||
@@ -1774,6 +1782,7 @@ source "arch/arm/cpu/armv8/Kconfig"
|
|
||||||
|
|
||||||
source "arch/arm/mach-imx/Kconfig"
|
|
||||||
|
|
||||||
+source "board/armltd/totalcompute/Kconfig"
|
|
||||||
source "board/bosch/shc/Kconfig"
|
|
||||||
source "board/bosch/guardian/Kconfig"
|
|
||||||
source "board/CarMediaLab/flea3/Kconfig"
|
|
||||||
diff --git a/board/armltd/totalcompute/Kconfig b/board/armltd/totalcompute/Kconfig
|
|
||||||
new file mode 100644
|
|
||||||
index 00000000000..8bd8c30a6b5
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/board/armltd/totalcompute/Kconfig
|
|
||||||
@@ -0,0 +1,12 @@
|
|
||||||
+if TARGET_TOTAL_COMPUTE
|
|
||||||
+
|
|
||||||
+config SYS_BOARD
|
|
||||||
+ default "totalcompute"
|
|
||||||
+
|
|
||||||
+config SYS_VENDOR
|
|
||||||
+ default "armltd"
|
|
||||||
+
|
|
||||||
+config SYS_CONFIG_NAME
|
|
||||||
+ default "total_compute"
|
|
||||||
+
|
|
||||||
+endif
|
|
||||||
diff --git a/board/armltd/totalcompute/MAINTAINERS b/board/armltd/totalcompute/MAINTAINERS
|
|
||||||
new file mode 100644
|
|
||||||
index 00000000000..bb09a90a309
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/board/armltd/totalcompute/MAINTAINERS
|
|
||||||
@@ -0,0 +1,6 @@
|
|
||||||
+TOTAL_COMPUTE BOARD
|
|
||||||
+M: Usama Arif <usama.arif@arm.com>
|
|
||||||
+S: Maintained
|
|
||||||
+F: board/armltd/totalcompute/
|
|
||||||
+F: include/configs/total_compute.h
|
|
||||||
+F: configs/total_compute_defconfig
|
|
||||||
diff --git a/board/armltd/totalcompute/Makefile b/board/armltd/totalcompute/Makefile
|
|
||||||
new file mode 100644
|
|
||||||
index 00000000000..4c40afef723
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/board/armltd/totalcompute/Makefile
|
|
||||||
@@ -0,0 +1,6 @@
|
|
||||||
+# SPDX-License-Identifier: GPL-2.0+
|
|
||||||
+#
|
|
||||||
+# (C) Copyright 2020 ARM Limited
|
|
||||||
+# Usama Arif <usama.arif@arm.com>
|
|
||||||
+
|
|
||||||
+obj-y := totalcompute.o
|
|
||||||
diff --git a/board/armltd/totalcompute/totalcompute.c b/board/armltd/totalcompute/totalcompute.c
|
|
||||||
new file mode 100644
|
|
||||||
index 00000000000..21247e4ef0f
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/board/armltd/totalcompute/totalcompute.c
|
|
||||||
@@ -0,0 +1,74 @@
|
|
||||||
+// SPDX-License-Identifier: GPL-2.0+
|
|
||||||
+/*
|
|
||||||
+ * (C) Copyright 2020 ARM Limited
|
|
||||||
+ * Usama Arif <usama.arif@arm.com>
|
|
||||||
+ */
|
|
||||||
+#include <common.h>
|
|
||||||
+#include <dm.h>
|
|
||||||
+#include <init.h>
|
|
||||||
+#include <malloc.h>
|
|
||||||
+#include <errno.h>
|
|
||||||
+#include <netdev.h>
|
|
||||||
+#include <asm/io.h>
|
|
||||||
+#include <linux/compiler.h>
|
|
||||||
+#include <dm/platform_data/serial_pl01x.h>
|
|
||||||
+#include <asm/armv8/mmu.h>
|
|
||||||
+
|
|
||||||
+DECLARE_GLOBAL_DATA_PTR;
|
|
||||||
+
|
|
||||||
+static const struct pl01x_serial_platdata serial_platdata = {
|
|
||||||
+ .base = UART0_BASE,
|
|
||||||
+ .type = TYPE_PL011,
|
|
||||||
+ .clock = CONFIG_PL011_CLOCK,
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+U_BOOT_DEVICE(total_compute_serials) = {
|
|
||||||
+ .name = "serial_pl01x",
|
|
||||||
+ .platdata = &serial_platdata,
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+static struct mm_region total_compute_mem_map[] = {
|
|
||||||
+ {
|
|
||||||
+ .virt = 0x0UL,
|
|
||||||
+ .phys = 0x0UL,
|
|
||||||
+ .size = 0x80000000UL,
|
|
||||||
+ .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
|
|
||||||
+ PTE_BLOCK_NON_SHARE |
|
|
||||||
+ PTE_BLOCK_PXN | PTE_BLOCK_UXN
|
|
||||||
+ }, {
|
|
||||||
+ .virt = 0x80000000UL,
|
|
||||||
+ .phys = 0x80000000UL,
|
|
||||||
+ .size = 0xff80000000UL,
|
|
||||||
+ .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
|
|
||||||
+ PTE_BLOCK_INNER_SHARE
|
|
||||||
+ }, {
|
|
||||||
+ /* List terminator */
|
|
||||||
+ 0,
|
|
||||||
+ }
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+struct mm_region *mem_map = total_compute_mem_map;
|
|
||||||
+
|
|
||||||
+int board_init(void)
|
|
||||||
+{
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+int dram_init(void)
|
|
||||||
+{
|
|
||||||
+ gd->ram_size = PHYS_SDRAM_1_SIZE;
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+int dram_init_banksize(void)
|
|
||||||
+{
|
|
||||||
+ gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
|
|
||||||
+ gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void reset_cpu(ulong addr)
|
|
||||||
+{
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
diff --git a/configs/total_compute_defconfig b/configs/total_compute_defconfig
|
|
||||||
new file mode 100644
|
|
||||||
index 00000000000..31d97dddc21
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/configs/total_compute_defconfig
|
|
||||||
@@ -0,0 +1,39 @@
|
|
||||||
+CONFIG_ARM=y
|
|
||||||
+CONFIG_TARGET_TOTAL_COMPUTE=y
|
|
||||||
+CONFIG_SYS_TEXT_BASE=0xe0000000
|
|
||||||
+CONFIG_SYS_MALLOC_F_LEN=0x2000
|
|
||||||
+CONFIG_ENV_SIZE=0x10000
|
|
||||||
+CONFIG_NR_DRAM_BANKS=2
|
|
||||||
+CONFIG_DISTRO_DEFAULTS=y
|
|
||||||
+CONFIG_BOOTDELAY=1
|
|
||||||
+CONFIG_USE_BOOTARGS=y
|
|
||||||
+CONFIG_BOOTARGS="console=ttyAMA0 debug user_debug=31 earlycon=pl011,0x7ff80000 loglevel=9 androidboot.hardware=total_compute video=640x480-32@60 root=/dev/vda2 ip=dhcp androidboot.selinux=permissive"
|
|
||||||
+# CONFIG_USE_BOOTCOMMAND is not set
|
|
||||||
+# CONFIG_DISPLAY_CPUINFO is not set
|
|
||||||
+# CONFIG_DISPLAY_BOARDINFO is not set
|
|
||||||
+CONFIG_SYS_PROMPT="TOTAL_COMPUTE# "
|
|
||||||
+# CONFIG_CMD_CONSOLE is not set
|
|
||||||
+# CONFIG_CMD_XIMG is not set
|
|
||||||
+# CONFIG_CMD_EDITENV is not set
|
|
||||||
+CONFIG_CMD_MEMTEST=y
|
|
||||||
+CONFIG_SYS_MEMTEST_START=0x80000000
|
|
||||||
+CONFIG_SYS_MEMTEST_END=0xff000000
|
|
||||||
+CONFIG_CMD_ARMFLASH=y
|
|
||||||
+# CONFIG_CMD_LOADS is not set
|
|
||||||
+# CONFIG_CMD_ITEST is not set
|
|
||||||
+# CONFIG_CMD_SETEXPR is not set
|
|
||||||
+# CONFIG_CMD_NFS is not set
|
|
||||||
+CONFIG_CMD_CACHE=y
|
|
||||||
+# CONFIG_CMD_MISC is not set
|
|
||||||
+CONFIG_CMD_UBI=y
|
|
||||||
+# CONFIG_ISO_PARTITION is not set
|
|
||||||
+# CONFIG_EFI_PARTITION is not set
|
|
||||||
+# CONFIG_MMC is not set
|
|
||||||
+CONFIG_MTD=y
|
|
||||||
+CONFIG_MTD_DEVICE=y
|
|
||||||
+CONFIG_MTD_NOR_FLASH=y
|
|
||||||
+CONFIG_FLASH_CFI_DRIVER=y
|
|
||||||
+CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
|
|
||||||
+CONFIG_SYS_FLASH_PROTECTION=y
|
|
||||||
+CONFIG_SYS_FLASH_CFI=y
|
|
||||||
+CONFIG_OF_LIBFDT=y
|
|
||||||
diff --git a/include/configs/total_compute.h b/include/configs/total_compute.h
|
|
||||||
new file mode 100644
|
|
||||||
index 00000000000..54086205db6
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/include/configs/total_compute.h
|
|
||||||
@@ -0,0 +1,77 @@
|
|
||||||
+/* SPDX-License-Identifier: GPL-2.0+ */
|
|
||||||
+/*
|
|
||||||
+ * Configuration for Total Compute. Parts were derived from other ARM
|
|
||||||
+ * configurations.
|
|
||||||
+ * (C) Copyright 2020 ARM Limited
|
|
||||||
+ * Usama Arif <usama.arif@arm.com>
|
|
||||||
+ */
|
|
||||||
+
|
|
||||||
+#ifndef __TOTAL_COMPUTE_H
|
|
||||||
+#define __TOTAL_COMPUTE_H
|
|
||||||
+
|
|
||||||
+#define CONFIG_REMAKE_ELF
|
|
||||||
+
|
|
||||||
+/* Link Definitions */
|
|
||||||
+#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x7fff0)
|
|
||||||
+#define CONFIG_ENV_SIZE 0x10000
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+#define CONFIG_SYS_BOOTM_LEN (64 << 20)
|
|
||||||
+
|
|
||||||
+#define UART0_BASE 0x7ff80000
|
|
||||||
+
|
|
||||||
+/* Generic Timer Definitions */
|
|
||||||
+#define COUNTER_FREQUENCY (0x1800000) /* 24MHz */
|
|
||||||
+
|
|
||||||
+/* Generic Interrupt Controller Definitions */
|
|
||||||
+
|
|
||||||
+#define GICD_BASE (0x2C010000)
|
|
||||||
+#define GICC_BASE (0x2C02f000)
|
|
||||||
+
|
|
||||||
+/* Size of malloc() pool */
|
|
||||||
+#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (8 << 20))
|
|
||||||
+
|
|
||||||
+/* PL011 Serial Configuration */
|
|
||||||
+#define CONFIG_PL011_CLOCK 7372800
|
|
||||||
+
|
|
||||||
+/* BOOTP options */
|
|
||||||
+#define CONFIG_BOOTP_BOOTFILESIZE
|
|
||||||
+
|
|
||||||
+/* Miscellaneous configurable options */
|
|
||||||
+#define CONFIG_SYS_LOAD_ADDR 0x90000000
|
|
||||||
+
|
|
||||||
+/* Physical Memory Map */
|
|
||||||
+#define PHYS_SDRAM_1 0x80000000
|
|
||||||
+/* Top 32MB reserved for secure world use */
|
|
||||||
+#define DRAM_SEC_SIZE 0x02000000
|
|
||||||
+#define PHYS_SDRAM_1_SIZE 0x80000000 - DRAM_SEC_SIZE
|
|
||||||
+#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
|
|
||||||
+
|
|
||||||
+/* Enable memtest */
|
|
||||||
+#define CONFIG_SYS_MEMTEST_START PHYS_SDRAM_1
|
|
||||||
+#define CONFIG_SYS_MEMTEST_END (PHYS_SDRAM_1 + PHYS_SDRAM_1_SIZE)
|
|
||||||
+
|
|
||||||
+#define CONFIG_EXTRA_ENV_SETTINGS \
|
|
||||||
+ "kernel_addr_r=0x80080000\0" \
|
|
||||||
+ "initrd_addr_r=0x88000000\0" \
|
|
||||||
+ "fdt_addr_r=0x83000000\0" \
|
|
||||||
+ "fdt_high=0xffffffffffffffff\0" \
|
|
||||||
+ "initrd_high=0xffffffffffffffff\0"
|
|
||||||
+
|
|
||||||
+#define CONFIG_BOOTCOMMAND "booti ${kernel_addr_r} ${initrd_addr_r} ${fdt_addr_r}"
|
|
||||||
+
|
|
||||||
+/* Monitor Command Prompt */
|
|
||||||
+#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
|
|
||||||
+#define CONFIG_SYS_MAXARGS 64 /* max command args */
|
|
||||||
+
|
|
||||||
+#define CONFIG_SYS_FLASH_BASE 0x0C000000
|
|
||||||
+/* 256 x 256KiB sectors */
|
|
||||||
+#define CONFIG_SYS_MAX_FLASH_SECT 256
|
|
||||||
+
|
|
||||||
+#define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_32BIT
|
|
||||||
+#define CONFIG_SYS_MAX_FLASH_BANKS 1
|
|
||||||
+
|
|
||||||
+#define CONFIG_SYS_FLASH_EMPTY_INFO /* flinfo indicates empty blocks */
|
|
||||||
+#define FLASH_MAX_SECTOR_SIZE 0x00040000
|
|
||||||
+
|
|
||||||
+#endif /* __TOTAL_COMPUTE_H */
|
|
||||||
--
|
|
||||||
2.17.1
|
|
||||||
|
|
||||||
@@ -25,8 +25,3 @@ SRC_URI_append_fvp-base-arm32 = " file://0001-Add-vexpress_aemv8a_aarch32-varian
|
|||||||
# Juno KMACHINE
|
# Juno KMACHINE
|
||||||
#
|
#
|
||||||
SRC_URI_append_juno = " file://u-boot_vexpress_uenv.patch"
|
SRC_URI_append_juno = " file://u-boot_vexpress_uenv.patch"
|
||||||
|
|
||||||
#
|
|
||||||
# Total Compute KMACHINE
|
|
||||||
#
|
|
||||||
SRC_URI_append_tc0 = " file://0001-Add-support-for-Total-Compute.patch"
|
|
||||||
|
|||||||
Reference in New Issue
Block a user