arm-bsp/u-boot: Add support for 32-bit FVP BASE machine
PATCH 1/3 arm-bsp/u-boot: Add support for 32-bit FVP BASE machine
--- ...-Add-vexpress_aemv8a_aarch32-variant.patch | 181 ++++++++++++++++++ .../recipes-bsp/u-boot/u-boot_%.bbappend | 5 + 2 files changed, 186 insertions(+) create mode 100644 meta-arm-bsp/recipes-bsp/u-boot/files/fvp-base-arm32/0001-Add-vexpress_aemv8a_aarch32-variant.patch
meta-arm-bsp/recipes-bsp/u-boot/files/fvp-base-arm32/0001-Add-vexpress_aemv8a_aarch32-variant.patch new file +181 -0
@@ -0,0 +1,181 @@ +From d627bdf9b11964b694aaf464c5c88ad9b339f03f Mon Sep 17 00:00:00 2001 +From: Anders Dellien <[email protected]> +Date: Thu, 23 Jul 2020 17:32:55 +0100 +Subject: [PATCH] Add vexpress_aemv8a_aarch32 variant + +The ARM AEMv8 FVP model can be run in Aarch64 or Aarch32 mode. Aarch32 +support is enable per-CPU when launching the model, eg: + +-C cluster0.cpu0.CONFIG64=0 + +This patch adds a new defconfig and some variant specific selections in +vexpress_armv8a.h. + +This patch is co-authored with Soby Mathew <[email protected]>. + +Upstream-status: Denied + +For upstream discussion, please visit +https://www.mail-archive.com/[email protected]/msg233429.html + +Signed-off-by: Ryan Harkin <[email protected]> +Signed-off-by: Asha R <[email protected]> +Signed-off-by: Anders Dellien <[email protected]> +--- + arch/arm/Kconfig | 5 +++ + board/armltd/vexpress64/Kconfig | 2 +- + configs/vexpress_aemv8a_aarch32_defconfig | 40 +++++++++++++++++++++++ + include/configs/vexpress_aemv8a.h | 28 +++++++++++----- + 4 files changed, 65 insertions(+), 10 deletions(-) + create mode 100644 configs/vexpress_aemv8a_aarch32_defconfig + +diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig +index 36c9c2fecd..99972cdf65 100644 +--- a/arch/arm/Kconfig ++++ b/arch/arm/Kconfig +@@ -1088,6 +1088,11 @@ config TARGET_VEXPRESS64_BASE_FVP + select PL01X_SERIAL + select SEMIHOSTING + ++config TARGET_VEXPRESS64_BASE_FVP_AARCH32 ++ bool "Support Versatile Express ARMv8a 32-bit FVP BASE model" ++ select CPU_V7A ++ select SEMIHOSTING ++ + config TARGET_VEXPRESS64_JUNO + bool "Support Versatile Express Juno Development Platform" + select ARM64 +diff --git a/board/armltd/vexpress64/Kconfig b/board/armltd/vexpress64/Kconfig +index 9014418433..75545e9ea1 100644 +--- a/board/armltd/vexpress64/Kconfig ++++ b/board/armltd/vexpress64/Kconfig +@@ -1,4 +1,4 @@ +-if TARGET_VEXPRESS64_BASE_FVP || TARGET_VEXPRESS64_JUNO ++if TARGET_VEXPRESS64_BASE_FVP || TARGET_VEXPRESS64_JUNO || TARGET_VEXPRESS64_BASE_FVP_AARCH32 + + config SYS_BOARD + default "vexpress64" +diff --git a/configs/vexpress_aemv8a_aarch32_defconfig b/configs/vexpress_aemv8a_aarch32_defconfig +new file mode 100644 +index 0000000000..cf1e8d5cae +--- /dev/null ++++ b/configs/vexpress_aemv8a_aarch32_defconfig +@@ -0,0 +1,40 @@ ++CONFIG_ARM=y ++CONFIG_TARGET_VEXPRESS64_BASE_FVP_AARCH32=y ++CONFIG_SYS_MALLOC_F_LEN=0x2000 ++CONFIG_IDENT_STRING=" vexpress_aemv8a fvp aarch32" ++CONFIG_BOOTDELAY=1 ++CONFIG_SYS_TEXT_BASE=0x88000000 ++CONFIG_USE_BOOTARGS=y ++CONFIG_BOOTARGS="console=ttyAMA0 earlycon=pl011,0x1c090000 debug user_debug=31 systemd.log_target=null root=/dev/vda2 rw androidboot.hardware=fvpbase rootwait loglevel=9" ++# CONFIG_DISPLAY_CPUINFO is not set ++# CONFIG_DISPLAY_BOARDINFO is not set ++CONFIG_HUSH_PARSER=y ++CONFIG_SYS_PROMPT="fvp32# " ++CONFIG_CMD_BOOTZ=y ++# CONFIG_CMD_CONSOLE is not set ++# CONFIG_CMD_IMLS is not set ++# CONFIG_CMD_XIMG is not set ++# CONFIG_CMD_EDITENV is not set ++# CONFIG_CMD_ENV_EXISTS is not set ++CONFIG_CMD_MEMTEST=y ++CONFIG_MTD_NOR_FLASH=y ++# CONFIG_CMD_LOADS is not set ++CONFIG_CMD_ARMFLASH=y ++# CONFIG_CMD_FPGA is not set ++# CONFIG_CMD_ITEST is not set ++# CONFIG_CMD_SETEXPR is not set ++CONFIG_CMD_DHCP=y ++# CONFIG_CMD_NFS is not set ++CONFIG_CMD_MII=y ++CONFIG_CMD_PING=y ++CONFIG_CMD_CACHE=y ++# CONFIG_CMD_MISC is not set ++CONFIG_CMD_FAT=y ++CONFIG_DM=y ++CONFIG_DM_SERIAL=y ++CONFIG_OF_LIBFDT=y ++CONFIG_FLASH_CFI_DRIVER=y ++CONFIG_SYS_FLASH_CFI=y ++CONFIG_SYS_ARCH_TIMER=y ++CONFIG_DM_SERIAL=y ++CONFIG_PL01X_SERIAL=y +diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h +index 9a9cec414c..cf0e4a951c 100644 +--- a/include/configs/vexpress_aemv8a.h ++++ b/include/configs/vexpress_aemv8a.h +@@ -7,7 +7,8 @@ + #ifndef __VEXPRESS_AEMV8A_H + #define __VEXPRESS_AEMV8A_H + +-#ifdef CONFIG_TARGET_VEXPRESS64_BASE_FVP ++#if defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP) || \ ++ defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP_AARCH32) + #ifndef CONFIG_SEMIHOSTING + #error CONFIG_TARGET_VEXPRESS64_BASE_FVP requires CONFIG_SEMIHOSTING + #endif +@@ -15,8 +16,17 @@ + + #define CONFIG_REMAKE_ELF + ++#ifdef CONFIG_ARM64 ++#define HIGH_ADDR "0xffffffffffffffff" ++#define BOOT_TYPE "booti" ++#else ++#define HIGH_ADDR "0xffffffff" ++#define BOOT_TYPE "bootz" ++#endif ++ + /* Link Definitions */ +-#ifdef CONFIG_TARGET_VEXPRESS64_BASE_FVP ++#if defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP) || \ ++ defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP_AARCH32) + /* ATF loads u-boot here for BASE_FVP model */ + #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x03f00000) + #elif CONFIG_TARGET_VEXPRESS64_JUNO +@@ -82,7 +92,8 @@ + #define GICR_BASE (0x2f100000) + #else + +-#ifdef CONFIG_TARGET_VEXPRESS64_BASE_FVP ++#if defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP) || \ ++ defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP_AARCH32) + #define GICD_BASE (0x2f000000) + #define GICC_BASE (0x2c000000) + #elif CONFIG_TARGET_VEXPRESS64_JUNO +@@ -169,7 +180,8 @@ + "booti ${kernel_addr} ${initrd_param} ${fdt_addr}" + + +-#elif CONFIG_TARGET_VEXPRESS64_BASE_FVP ++#elif defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP) || \ ++ defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP_AARCH32) + #define CONFIG_EXTRA_ENV_SETTINGS \ + "kernel_name=Image\0" \ + "kernel_addr=0x80080000\0" \ +@@ -177,8 +189,8 @@ + "initrd_addr=0x88000000\0" \ + "fdtfile=devtree.dtb\0" \ + "fdt_addr=0x83000000\0" \ +- "fdt_high=0xffffffffffffffff\0" \ +- "initrd_high=0xffffffffffffffff\0" ++ "fdt_high=" HIGH_ADDR "\0" \ ++ "initrd_high=" HIGH_ADDR "\0" + + #define CONFIG_BOOTCOMMAND "smhload ${kernel_name} ${kernel_addr}; " \ + "smhload ${fdtfile} ${fdt_addr}; " \ +@@ -186,9 +198,7 @@ + "initrd_end; " \ + "fdt addr ${fdt_addr}; fdt resize; " \ + "fdt chosen ${initrd_addr} ${initrd_end}; " \ +- "booti $kernel_addr - $fdt_addr" +- +- ++ BOOT_TYPE " $kernel_addr - $fdt_addr" + #endif + + /* Monitor Command Prompt */ +-- +2.17.1 +
meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend +5 -0
@@ -21,6 +21,11 @@ SRC_URI_append_foundation-armv8 = " file://u-boot_vexpress_fvp.patch" # SRC_URI_append_fvp-base = " file://u-boot_vexpress_fvp.patch" +# +# FVP BASE ARM32 KMACHINE +# +SRC_URI_append_fvp-base-arm32 = " file://0001-Add-vexpress_aemv8a_aarch32-variant.patch" + # # Juno KMACHINE #
--
2.17.1
IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.
PATCH 2/3 arm-bsp/trusted-firmware-a: Add support for 32-bit FVP_BASE machine
--- .../trusted-firmware-a-fvp-arm32.inc | 12 ++++++++++++ .../trusted-firmware-a_2.2.bbappend | 1 + 2 files changed, 13 insertions(+) create mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-fvp-arm32.inc
meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-fvp-arm32.inc new file +12 -0
@@ -0,0 +1,12 @@ +# Armv7-A FVP specific TFA parameters + +COMPATIBLE_MACHINE = "fvp-base-arm32" +TFA_PLATFORM = "fvp" +TFA_UBOOT = "1" +TFA_BUILD_TARGET = "dtbs bl1 bl1 bl32 fip" + +EXTRA_OEMAKE_append = " \ + ARCH=aarch32 \ + AARCH32_SP=sp_min \ + " +
meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.2.bbappend +1 -0
@@ -2,6 +2,7 @@ MACHINE_TFA_REQUIRE ?= "" MACHINE_TFA_REQUIRE_n1sdp = "trusted-firmware-a-n1sdp.inc" +MACHINE_TFA_REQUIRE_fvp-base-arm32 = "trusted-firmware-a-fvp-arm32.inc" require ${MACHINE_TFA_REQUIRE}
--
2.17.1
IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.
PATCH 3/3 arm-bsp: Introduce 32-bit FVP-BASE platform and BSP
In reply to Anders DellienAlso refactor fvp-common.inc to contain definitions shared between fvp-base, fvp-base-arm32 and foundation-armv8
--- .../conf/machine/foundation-armv8.conf | 13 +- meta-arm-bsp/conf/machine/fvp-base-arm32.conf | 17 + meta-arm-bsp/conf/machine/fvp-base.conf | 13 +- meta-arm-bsp/conf/machine/fvp-common.inc | 17 +- meta-arm-bsp/documentation/fvp-base-arm32.md | 61 ++ .../bsp/arm-platforms/fvp-arm32-standard.scc | 7 + .../bsp/arm-platforms/fvp-arm32.scc | 16 + .../0001-ARM-vexpress-enable-GICv3.patch | 31 + .../bsp/arm-platforms/fvp-arm32/fvp-board.cfg | 12 + .../arm-platforms/fvp-arm32/fvp-features.cfg | 25 + .../bsp/arm-platforms/fvp/fvp-net.cfg | 1 + .../linux/files/fvp-base-arm32-dts.patch | 580 ++++++++++++++++++ .../linux/linux-arm-platforms.inc | 8 + 13 files changed, 781 insertions(+), 20 deletions(-) create mode 100644 meta-arm-bsp/conf/machine/fvp-base-arm32.conf create mode 100644 meta-arm-bsp/documentation/fvp-base-arm32.md create mode 100644 meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp-arm32-standard.scc create mode 100644 meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp-arm32.scc create mode 100644 meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp-arm32/0001-ARM-vexpress-enable-GICv3.patch create mode 100644 meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp-arm32/fvp-board.cfg create mode 100644 meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp-arm32/fvp-features.cfg create mode 100644 meta-arm-bsp/recipes-kernel/linux/files/fvp-base-arm32-dts.patch
meta-arm-bsp/conf/machine/foundation-armv8.conf +8 -5
@@ -5,10 +5,13 @@ #@DESCRIPTION: Machine configuration for Armv8-A Foundation Platform model require conf/machine/fvp-common.inc +require conf/machine/include/arm/arch-armv8a.inc -KERNEL_DEVICETREE = "arm/foundation-v8-gicv3-psci.dtb" +TUNE_FEATURES = "aarch64" + +# FVP u-boot configuration +UBOOT_MACHINE = "vexpress_aemv8a_semi_defconfig" -# Use haveged as a source of entropy instead of rng-tools (Needed for ssh). -# rngd (Part of rng-tools) takes ~7 mins to init resulting in a slow boot time. -PACKAGE_EXCLUDE_append = " rng-tools" -MACHINE_EXTRA_RRECOMMENDS += "haveged" +KERNEL_IMAGETYPE = "Image" + +KERNEL_DEVICETREE = "arm/foundation-v8-gicv3-psci.dtb"
meta-arm-bsp/conf/machine/fvp-base-arm32.conf new file +17 -0
@@ -0,0 +1,17 @@ +# Configuration for Armv7-A Base Platform FVP + +#@TYPE: Machine +#@NAME: Armv7-A Base Platform FVP machine +#@DESCRIPTION: Machine configuration for Armv7-A Base Platform FVP model + +require conf/machine/fvp-common.inc +require conf/machine/include/arm/arch-armv7a.inc + +KERNEL_IMAGETYPE = "zImage" + +PREFERRED_VERSION_trusted-firmware-a ?= "2.2%" + +# FVP u-boot configuration +UBOOT_MACHINE = "vexpress_aemv8a_aarch32_defconfig" + +KERNEL_DEVICETREE = "arm/fvp-base-gicv3-psci-custom.dtb"
meta-arm-bsp/conf/machine/fvp-base.conf +8 -5
@@ -5,10 +5,13 @@ #@DESCRIPTION: Machine configuration for Armv8-A Base Platform FVP model require conf/machine/fvp-common.inc +require conf/machine/include/arm/arch-armv8a.inc -KERNEL_DEVICETREE = "arm/fvp-base-gicv3-psci-custom.dtb" +TUNE_FEATURES = "aarch64" + +# FVP u-boot configuration +UBOOT_MACHINE = "vexpress_aemv8a_semi_defconfig" -# Use haveged as a source of entropy instead of rng-tools (Needed for ssh). -# rngd (Part of rng-tools) takes ~7 mins to init resulting in a slow boot time. -PACKAGE_EXCLUDE_append = " rng-tools" -MACHINE_EXTRA_RRECOMMENDS += "haveged" +KERNEL_IMAGETYPE = "Image" + +KERNEL_DEVICETREE = "arm/fvp-base-gicv3-psci-custom.dtb"
meta-arm-bsp/conf/machine/fvp-common.inc +7 -10
@@ -1,18 +1,12 @@ # FVP common parameters # -# Capturing FVP common configurations (Armv8-A Base Platform FVP and -# Armv8-A Foundation Platform). +# Capturing FVP common configurations (Armv8-A Base Platform FVP, +# Armv8-A Foundation Platform and Armv7-A Base Platform FVP). # -TUNE_FEATURES = "aarch64" - -require conf/machine/include/arm/arch-armv8a.inc - MACHINE_FEATURES = "optee" -KERNEL_IMAGETYPE = "Image" - IMAGE_CLASSES += "image_types_disk_img" IMAGE_FSTYPES += "disk.img"
@@ -39,5 +33,8 @@ PREFERRED_VERSION_linux-yocto ?= "5.4%" EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-boot" -# FVP u-boot configuration -UBOOT_MACHINE = "vexpress_aemv8a_semi_defconfig" +# Use haveged as a source of entropy instead of rng-tools (Needed for ssh). +# rngd (Part of rng-tools) takes ~7 mins to init resulting in a slow boot time. +PACKAGE_EXCLUDE_append = " rng-tools" +MACHINE_EXTRA_RRECOMMENDS += "haveged" +
meta-arm-bsp/documentation/fvp-base-arm32.md new file +61 -0
61 lines not on this page · raw message
meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp-arm32-standard.scc new file +7 -0
@@ -0,0 +1,7 @@ +define KMACHINE fvp-arm32 +define KTYPE standard +define KARCH arm +define KMETA_EXTERNAL_BSP t + +include fvp-arm32.scc +
meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp-arm32.scc new file +16 -0
@@ -0,0 +1,16 @@ +include features/input/input.scc +include cfg/timer/no_hz.scc + +patch fvp-arm32/0001-ARM-vexpress-enable-GICv3.patch + +kconf hardware fvp-arm32/fvp-board.cfg +kconf hardware fvp-arm32/fvp-features.cfg +kconf hardware fvp/fvp-net.cfg +kconf hardware fvp/fvp-rtc.cfg +kconf hardware fvp/fvp-serial.cfg +kconf hardware fvp/fvp-virtio.cfg +kconf hardware fvp/fvp-cfi.cfg +kconf hardware fvp/fvp-drm.cfg +kconf hardware fvp/fvp-timer.cfg +kconf hardware fvp/fvp-virtio.cfg +kconf hardware fvp/fvp-watchdog.cfg
meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp-arm32/0001-ARM-vexpress-enable-GICv3.patch new file +31 -0
@@ -0,0 +1,31 @@ +From 5dbb6c4267b1e46ed08359be363d8bc9b6a79397 Mon Sep 17 00:00:00 2001 +From: Ryan Harkin <[email protected]> +Date: Wed, 16 Nov 2016 14:43:02 +0000 +Subject: [PATCH] ARM: vexpress: enable GICv3 + +Upstream-Status: Pending + +ARMv8 targets such as ARM's FVP Cortex-A32 model can run the 32-bit +ARMv7 kernel. And these targets often contain GICv3. + +Signed-off-by: Ryan Harkin <[email protected]> +Signed-off-by: Jon Medhurst <[email protected]> +--- + arch/arm/mach-vexpress/Kconfig | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/arm/mach-vexpress/Kconfig b/arch/arm/mach-vexpress/Kconfig +index 7c728ebc0b33..ed579382d41f 100644 +--- a/arch/arm/mach-vexpress/Kconfig ++++ b/arch/arm/mach-vexpress/Kconfig +@@ -4,6 +4,7 @@ menuconfig ARCH_VEXPRESS + select ARCH_SUPPORTS_BIG_ENDIAN + select ARM_AMBA + select ARM_GIC ++ select ARM_GIC_V3 + select ARM_GLOBAL_TIMER + select ARM_TIMER_SP804 + select COMMON_CLK_VERSATILE +-- +2.17.1 +
meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp-arm32/fvp-board.cfg new file +12 -0
@@ -0,0 +1,12 @@ +CONFIG_ARM=y + +CONFIG_ARCH_VEXPRESS=y +CONFIG_SMP=y +CONFIG_NR_CPUS=8 +CONFIG_HOTPLUG_CPU=y + +CONFIG_REGULATOR=y +CONFIG_REGULATOR_FIXED_VOLTAGE=y + +CONFIG_CPU_IDLE=y +CONFIG_ARM_CPUIDLE=y
meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp-arm32/fvp-features.cfg new file +25 -0
@@ -0,0 +1,25 @@ +CONFIG_BLK_DEV_INITRD=y +CONFIG_EXT4_FS=y +CONFIG_BINFMT_SCRIPT=y +CONFIG_BINFMT_MISC=y +CONFIG_PRINTK_TIME=y +CONFIG_HIGHMEM=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_TMPFS_XATTR=y +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_DEBUG_FS=y +CONFIG_GENERIC_SCHED_CLOCK=y +CONFIG_CLKDEV_LOOKUP=y +CONFIG_NET=y +CONFIG_NETDEVICES=y +CONFIG_UNIX=y +CONFIG_ETHERNET=y +CONFIG_VFP=y +CONFIG_VFPv3=y +CONFIG_NEON=y +CONFIG_KERNEL_MODE_NEON=y +
meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp/fvp-net.cfg +1 -0
@@ -1,2 +1,3 @@ +CONFIG_NET_VENDOR_SMSC=y CONFIG_SMSC911X=y CONFIG_SMC91X=y
meta-arm-bsp/recipes-kernel/linux/files/fvp-base-arm32-dts.patch new file +580 -0
580 lines not on this page · raw message
meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc +8 -0
@@ -11,6 +11,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}:${THISDIR}/files:" SRC_URI_KMETA = "file://arm-platforms-kmeta;type=kmeta;name=arm-platforms-kmeta;destsuffix=arm-platforms-kmeta" SRC_URI_append_foundation-armv8 = " ${SRC_URI_KMETA}" SRC_URI_append_fvp-base = " ${SRC_URI_KMETA}" +SRC_URI_append_fvp-base-arm32 = " ${SRC_URI_KMETA}" SRC_URI_append_juno = " ${SRC_URI_KMETA}" SRC_URI_append_gem5-arm64 = " ${SRC_URI_KMETA}" SRCREV_arm-platforms-kmeta = "6147e82375aa9df8f2a162d42ea6406c79c854c5"
@@ -34,6 +35,13 @@ COMPATIBLE_MACHINE_fvp-base = "fvp-base" KMACHINE_fvp-base = "fvp" SRC_URI_append_fvp-base = " file://fvp-base-dts.patch" +# +# FVP BASE ARM32 KMACHINE +# +COMPATIBLE_MACHINE_fvp-base-arm32 = "fvp-base-arm32" +KMACHINE_fvp-base-arm32 = "fvp-arm32" +SRC_URI_append_fvp-base-arm32 = " file://fvp-base-arm32-dts.patch" + # # Juno KMACHINE #
--
2.17.1
IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.
This series does not compile
ERROR: linux-yocto-5.4.51+gitAUTOINC+caafbdfe38_fed60f1c8e-r0 do_patch: Could not apply patches for fvp-arm32.
ERROR: linux-yocto-5.4.51+gitAUTOINC+caafbdfe38_fed60f1c8e-r0 do_patch: Patch failures can be resolved in the linux source directory /home/jdm/yocto/poky/build/tmp/work-shared/fvp-base-arm32/kernel-source)
ERROR: linux-yocto-5.4.51+gitAUTOINC+caafbdfe38_fed60f1c8e-r0 do_patch: Execution of '/home/jdm/yocto/poky/build/tmp/work/fvp_base_arm32-poky-linux-gnueabi/linux-yocto/5.4.51+gitAUTOINC+caafbdfe38_fed60f1c8e-r0/temp/run.do_patch.26941' failed with exit code 1:
(1/2) 0001-ARM-vexpress-enable-GICv3.patch
[INFO]: check of .kernel-meta//patches//bsp/arm-platforms/fvp-arm32/0001-ARM-vexpress-enable-GICv3.patch with "git am" did not pass, trying reduced context.
[INFO]: Context reduced git-am of .kernel-meta//patches//bsp/arm-platforms/fvp-arm32/0001-ARM-vexpress-enable-GICv3.patch with "git am" did not work, trying "apply".
error: patch failed: arch/arm/mach-vexpress/Kconfig:4
error: arch/arm/mach-vexpress/Kconfig: patch does not apply
[ERROR]: Application of .kernel-meta//patches//bsp/arm-platforms/fvp-arm32/0001-ARM-vexpress-enable-GICv3.patch failed.
Patch needs to be refreshed. Sample resolution script:
.git/rebase-apply/resolve_rejects
WARNING: exit code 1 from a shell command.
ERROR: Logfile of failure stored in: /home/jdm/yocto/poky/build/tmp/work/fvp_base_arm32-poky-linux-gnueabi/linux-yocto/5.4.51+gitAUTOINC+caafbdfe38_fed60f1c8e-r0/temp/log.do_patch.26941 Log data follows:
| DEBUG: Executing python function extend_recipe_sysroot | NOTE: Direct dependencies are ['virtual:native:/home/jdm/yocto/poky/meta/recipes-devtools/patch/patch_2.7.6.bb:do_populate_sysroot', '/home/jdm/yocto/poky/meta/recipes-devtools/quilt/quilt-native_0.66.bb:do_populate_sysroot', '/home/jdm/yocto/poky/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb:do_populate_sysroot'] | NOTE: Installed into sysroot: [] | NOTE: Skipping as already exists in sysroot: ['patch-native', 'quilt-native', 'kern-tools-native', 'gnu-config-native', 'autoconf-native', 'automake-native', 'libtool-native', 'attr-native', 'm4-native', 'texinfo-dummy-native', 'gettext-minimal-native'] | DEBUG: Python function extend_recipe_sysroot finished | DEBUG: Executing shell function do_patch | (1/2) 0001-ARM-vexpress-enable-GICv3.patch | [INFO]: check of .kernel-meta//patches//bsp/arm-platforms/fvp-arm32/0001-ARM-vexpress-enable-GICv3.patch with "git am" did not pass, trying reduced context. | [INFO]: Context reduced git-am of .kernel-meta//patches//bsp/arm-platforms/fvp-arm32/0001-ARM-vexpress-enable-GICv3.patch with "git am" did not work, trying "apply". | error: patch failed: arch/arm/mach-vexpress/Kconfig:4 | error: arch/arm/mach-vexpress/Kconfig: patch does not apply | [ERROR]: Application of .kernel-meta//patches//bsp/arm-platforms/fvp-arm32/0001-ARM-vexpress-enable-GICv3.patch failed. | Patch needs to be refreshed. Sample resolution script: | .git/rebase-apply/resolve_rejects | ERROR: Could not apply patches for fvp-arm32. | ERROR: Patch failures can be resolved in the linux source directory /home/jdm/yocto/poky/build/tmp/work-shared/fvp-base-arm32/kernel-source) | WARNING: exit code 1 from a shell command. | ERROR: Execution of '/home/jdm/yocto/poky/build/tmp/work/fvp_base_arm32-poky-linux-gnueabi/linux-yocto/5.4.51+gitAUTOINC+caafbdfe38_fed60f1c8e-r0/temp/run.do_patch.26941' failed with exit code 1: | (1/2) 0001-ARM-vexpress-enable-GICv3.patch | [INFO]: check of .kernel-meta//patches//bsp/arm-platforms/fvp-arm32/0001-ARM-vexpress-enable-GICv3.patch with "git am" did not pass, trying reduced context. | [INFO]: Context reduced git-am of .kernel-meta//patches//bsp/arm-platforms/fvp-arm32/0001-ARM-vexpress-enable-GICv3.patch with "git am" did not work, trying "apply". | error: patch failed: arch/arm/mach-vexpress/Kconfig:4 | error: arch/arm/mach-vexpress/Kconfig: patch does not apply | [ERROR]: Application of .kernel-meta//patches//bsp/arm-platforms/fvp-arm32/0001-ARM-vexpress-enable-GICv3.patch failed. | Patch needs to be refreshed. Sample resolution script: | .git/rebase-apply/resolve_rejects | WARNING: exit code 1 from a shell command. |
ERROR: Task (/home/jdm/yocto/poky/meta/recipes-kernel/linux/linux-yocto_5.4.bb:do_patch) failed with exit code '1'
Please fix the issue and push a v2.
Thanks,
Jon
Quoted 217 lines · Anders Dellien
Change-Id I48ec5607c216b1c15d2fedc1375f3f0a914c9937Signed-off-by Anders Dellien <[email protected]>--- ...-Add-vexpress_aemv8a_aarch32-variant.patch | 181 ++++++++++++++++++ .../recipes-bsp/u-boot/u-boot_%.bbappend | 5 + 2 files changed, 186 insertions(+) create mode 100644 meta-arm-bsp/recipes-bsp/u-boot/files/fvp-base-arm32/0001-Add-vexpress_aemv8a_aarch32-variant.patchmeta-arm-bsp/recipes-bsp/u-boot/files/fvp-base-arm32/0001-Add-vexpress_aemv8a_aarch32-variant.patch new file +181
-0@@ -0,0 +1,181 @@ +From d627bdf9b11964b694aaf464c5c88ad9b339f03f Mon Sep 17 00:00:00 2001 +From: Anders Dellien <[email protected]> +Date: Thu, 23 Jul 2020 17:32:55 +0100 +Subject: [PATCH] Add vexpress_aemv8a_aarch32 variant + +The ARM AEMv8 FVP model can be run in Aarch64 or Aarch32 mode. Aarch32 +support is enable per-CPU when launching the model, eg: + +-C cluster0.cpu0.CONFIG64=0 + +This patch adds a new defconfig and some variant specific selections in +vexpress_armv8a.h. + +This patch is co-authored with Soby Mathew <[email protected]>. + +Upstream-status: Denied + +For upstream discussion, please visit +https://www.mail-archive.com/[email protected]/msg233429.html + +Signed-off-by: Ryan Harkin <[email protected]> +Signed-off-by: Asha R <[email protected]> +Signed-off-by: Anders Dellien <[email protected]> +--- + arch/arm/Kconfig | 5 +++ + board/armltd/vexpress64/Kconfig | 2 +- + configs/vexpress_aemv8a_aarch32_defconfig | 40 +++++++++++++++++++++++ + include/configs/vexpress_aemv8a.h | 28 +++++++++++----- + 4 files changed, 65 insertions(+), 10 deletions(-) + create mode 100644 configs/vexpress_aemv8a_aarch32_defconfig + +diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig +index 36c9c2fecd..99972cdf65 100644 +--- a/arch/arm/Kconfig ++++ b/arch/arm/Kconfig +@@ -1088,6 +1088,11 @@ config TARGET_VEXPRESS64_BASE_FVP + select PL01X_SERIAL + select SEMIHOSTING + ++config TARGET_VEXPRESS64_BASE_FVP_AARCH32 ++ bool "Support Versatile Express ARMv8a 32-bit FVP BASE model" ++ select CPU_V7A ++ select SEMIHOSTING ++ + config TARGET_VEXPRESS64_JUNO + bool "Support Versatile Express Juno Development Platform" + select ARM64 +diff --git a/board/armltd/vexpress64/Kconfig b/board/armltd/vexpress64/Kconfig +index 9014418433..75545e9ea1 100644 +--- a/board/armltd/vexpress64/Kconfig ++++ b/board/armltd/vexpress64/Kconfig +@@ -1,4 +1,4 @@ +-if TARGET_VEXPRESS64_BASE_FVP || TARGET_VEXPRESS64_JUNO ++if TARGET_VEXPRESS64_BASE_FVP || TARGET_VEXPRESS64_JUNO || TARGET_VEXPRESS64_BASE_FVP_AARCH32 + + config SYS_BOARD + default "vexpress64" +diff --git a/configs/vexpress_aemv8a_aarch32_defconfig b/configs/vexpress_aemv8a_aarch32_defconfig +new file mode 100644 +index 0000000000..cf1e8d5cae +--- /dev/null ++++ b/configs/vexpress_aemv8a_aarch32_defconfig +@@ -0,0 +1,40 @@ ++CONFIG_ARM=y ++CONFIG_TARGET_VEXPRESS64_BASE_FVP_AARCH32=y ++CONFIG_SYS_MALLOC_F_LEN=0x2000 ++CONFIG_IDENT_STRING=" vexpress_aemv8a fvp aarch32" ++CONFIG_BOOTDELAY=1 ++CONFIG_SYS_TEXT_BASE=0x88000000 ++CONFIG_USE_BOOTARGS=y ++CONFIG_BOOTARGS="console=ttyAMA0 earlycon=pl011,0x1c090000 debug user_debug=31 systemd.log_target=null root=/dev/vda2 rw androidboot.hardware=fvpbase rootwait loglevel=9" ++# CONFIG_DISPLAY_CPUINFO is not set ++# CONFIG_DISPLAY_BOARDINFO is not set ++CONFIG_HUSH_PARSER=y ++CONFIG_SYS_PROMPT="fvp32# " ++CONFIG_CMD_BOOTZ=y ++# CONFIG_CMD_CONSOLE is not set ++# CONFIG_CMD_IMLS is not set ++# CONFIG_CMD_XIMG is not set ++# CONFIG_CMD_EDITENV is not set ++# CONFIG_CMD_ENV_EXISTS is not set ++CONFIG_CMD_MEMTEST=y ++CONFIG_MTD_NOR_FLASH=y ++# CONFIG_CMD_LOADS is not set ++CONFIG_CMD_ARMFLASH=y ++# CONFIG_CMD_FPGA is not set ++# CONFIG_CMD_ITEST is not set ++# CONFIG_CMD_SETEXPR is not set ++CONFIG_CMD_DHCP=y ++# CONFIG_CMD_NFS is not set ++CONFIG_CMD_MII=y ++CONFIG_CMD_PING=y ++CONFIG_CMD_CACHE=y ++# CONFIG_CMD_MISC is not set ++CONFIG_CMD_FAT=y ++CONFIG_DM=y ++CONFIG_DM_SERIAL=y ++CONFIG_OF_LIBFDT=y ++CONFIG_FLASH_CFI_DRIVER=y ++CONFIG_SYS_FLASH_CFI=y ++CONFIG_SYS_ARCH_TIMER=y ++CONFIG_DM_SERIAL=y ++CONFIG_PL01X_SERIAL=y +diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h +index 9a9cec414c..cf0e4a951c 100644 +--- a/include/configs/vexpress_aemv8a.h ++++ b/include/configs/vexpress_aemv8a.h +@@ -7,7 +7,8 @@ + #ifndef __VEXPRESS_AEMV8A_H + #define __VEXPRESS_AEMV8A_H + +-#ifdef CONFIG_TARGET_VEXPRESS64_BASE_FVP ++#if defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP) || \ ++ defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP_AARCH32) + #ifndef CONFIG_SEMIHOSTING + #error CONFIG_TARGET_VEXPRESS64_BASE_FVP requires CONFIG_SEMIHOSTING + #endif +@@ -15,8 +16,17 @@ + + #define CONFIG_REMAKE_ELF + ++#ifdef CONFIG_ARM64 ++#define HIGH_ADDR "0xffffffffffffffff" ++#define BOOT_TYPE "booti" ++#else ++#define HIGH_ADDR "0xffffffff" ++#define BOOT_TYPE "bootz" ++#endif ++ + /* Link Definitions */ +-#ifdef CONFIG_TARGET_VEXPRESS64_BASE_FVP ++#if defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP) || \ ++ defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP_AARCH32) + /* ATF loads u-boot here for BASE_FVP model */ + #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x03f00000) + #elif CONFIG_TARGET_VEXPRESS64_JUNO +@@ -82,7 +92,8 @@ + #define GICR_BASE (0x2f100000) + #else + +-#ifdef CONFIG_TARGET_VEXPRESS64_BASE_FVP ++#if defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP) || \ ++ defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP_AARCH32) + #define GICD_BASE (0x2f000000) + #define GICC_BASE (0x2c000000) + #elif CONFIG_TARGET_VEXPRESS64_JUNO +@@ -169,7 +180,8 @@ + "booti ${kernel_addr} ${initrd_param} ${fdt_addr}" + + +-#elif CONFIG_TARGET_VEXPRESS64_BASE_FVP ++#elif defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP) || \ ++ defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP_AARCH32) + #define CONFIG_EXTRA_ENV_SETTINGS \ + "kernel_name=Image\0" \ + "kernel_addr=0x80080000\0" \ +@@ -177,8 +189,8 @@ + "initrd_addr=0x88000000\0" \ + "fdtfile=devtree.dtb\0" \ + "fdt_addr=0x83000000\0" \ +- "fdt_high=0xffffffffffffffff\0" \ +- "initrd_high=0xffffffffffffffff\0" ++ "fdt_high=" HIGH_ADDR "\0" \ ++ "initrd_high=" HIGH_ADDR "\0" + + #define CONFIG_BOOTCOMMAND "smhload ${kernel_name} ${kernel_addr}; " \ + "smhload ${fdtfile} ${fdt_addr}; " \ +@@ -186,9 +198,7 @@ + "initrd_end; " \ + "fdt addr ${fdt_addr}; fdt resize; " \ + "fdt chosen ${initrd_addr} ${initrd_end}; " \ +- "booti $kernel_addr - $fdt_addr" +- +- ++ BOOT_TYPE " $kernel_addr - $fdt_addr" + #endif + + /* Monitor Command Prompt */ +-- +2.17.1 +meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend +5
-1@@ -21,6 +21,11 @@ SRC_URI_append_foundation-armv8 = " file://u-boot_vexpress_fvp.patch" # SRC_URI_append_fvp-base = " file://u-boot_vexpress_fvp.patch" +# +# FVP BASE ARM32 KMACHINE +# +SRC_URI_append_fvp-base-arm32 = " file://0001-Add-vexpress_aemv8a_aarch32-variant.patch" + # # Juno KMACHINE # --2.17.1
IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 45 lines · Jon Mason via lists.yoctoproject.org
This series does not compile
ERROR: linux-yocto-5.4.51+gitAUTOINC+caafbdfe38_fed60f1c8e-r0
do_patch: Could not apply patches for fvp-arm32.
ERROR: linux-yocto-5.4.51+gitAUTOINC+caafbdfe38_fed60f1c8e-r0do_patch: Patch failures can be resolved in the linux source directory/home/jdm/yocto/poky/build/tmp/work-shared/fvp-base-arm32/kernel-source)
ERROR: linux-yocto-5.4.51+gitAUTOINC+caafbdfe38_fed60f1c8e-r0do_patch: Execution of '/home/jdm/yocto/poky/build/tmp/work/fvp_base_arm32-poky-linux-gnueabi/linux-yocto/5.4.51+gitAUTOINC+caafbdfe38_fed60f1c8e-r0/temp/run.do_patch.26941' failed with exit code 1:
(1/2) 0001-ARM-vexpress-enable-GICv3.patch
[INFO]: check of .kernel-meta//patches//bsp/arm-platforms/fvp-arm32/0001-ARM-vexpress-enable-GICv3.patch with "git am" did not pass, trying reduced context.
[INFO]: Context reduced git-am of .kernel-meta//patches//bsp/arm-platforms/fvp-arm32/0001-ARM-vexpress-enable-GICv3.patch with "git am" did not work, trying "apply".
error: patch failed:arch/arm/mach-vexpress/Kconfig:4
error:arch/arm/mach-vexpress/Kconfig: patch does not apply
[ERROR]: Application of .kernel-meta//patches//bsp/arm-platforms/fvp-arm32/0001-ARM-vexpress-enable-GICv3.patch failed.
Patch needs to be refreshed. Sample resolution script:
.git/rebase-apply/resolve_rejects
WARNING: exit code 1 from a shell command.ERROR: Logfile of failure stored in:
/home/jdm/yocto/poky/build/tmp/work/fvp_base_arm32-poky-linux-gnueabi/linux-yocto/5.4.51+gitAUTOINC+caafbdfe38_fed60f1c8e-r0/temp/log.do_patch.26941Log data follows:| DEBUG: Executing python function extend_recipe_sysroot | NOTE: Direct dependencies are ['virtual:native:/home/jdm/yocto/poky/meta/recipes-devtools/patch/patch_2.7.6.bb:do_populate_sysroot', '/home/jdm/yocto/poky/meta/recipes-devtools/quilt/quilt-native_0.66.bb:do_populate_sysroot', '/home/jdm/yocto/poky/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb:do_populate_sysroot'] | NOTE: Installed into sysroot: [] | NOTE: Skipping as already exists in sysroot: ['patch-native', 'quilt-native', 'kern-tools-native', 'gnu-config-native', 'autoconf-native', 'automake-native', 'libtool-native', 'attr-native', 'm4-native', 'texinfo-dummy-native', 'gettext-minimal-native'] | DEBUG: Python function extend_recipe_sysroot finished | DEBUG: Executing shell function do_patch | (1/2) 0001-ARM-vexpress-enable-GICv3.patch | [INFO]: check of .kernel-meta//patches//bsp/arm-platforms/fvp-arm32/0001-ARM-vexpress-enable-GICv3.patch with "git am" did not pass, trying reduced context. | [INFO]: Context reduced git-am of .kernel-meta//patches//bsp/arm-platforms/fvp-arm32/0001-ARM-vexpress-enable-GICv3.patch with "git am" did not work, trying "apply". | error: patch failed: arch/arm/mach-vexpress/Kconfig:4 | error: arch/arm/mach-vexpress/Kconfig: patch does not apply | [ERROR]: Application of .kernel-meta//patches//bsp/arm-platforms/fvp-arm32/0001-ARM-vexpress-enable-GICv3.patch failed. | Patch needs to be refreshed. Sample resolution script: | .git/rebase-apply/resolve_rejects | ERROR: Could not apply patches for fvp-arm32. | ERROR: Patch failures can be resolved in the linux source directory /home/jdm/yocto/poky/build/tmp/work-shared/fvp-base-arm32/kernel-source) | WARNING: exit code 1 from a shell command. | ERROR: Execution of '/home/jdm/yocto/poky/build/tmp/work/fvp_base_arm32-poky-linux-gnueabi/linux-yocto/5.4.51+gitAUTOINC+caafbdfe38_fed60f1c8e-r0/temp/run.do_patch.26941' failed with exit code 1: | (1/2) 0001-ARM-vexpress-enable-GICv3.patch | [INFO]: check of .kernel-meta//patches//bsp/arm-platforms/fvp-arm32/0001-ARM-vexpress-enable-GICv3.patch with "git am" did not pass, trying reduced context. | [INFO]: Context reduced git-am of .kernel-meta//patches//bsp/arm-platforms/fvp-arm32/0001-ARM-vexpress-enable-GICv3.patch with "git am" did not work, trying "apply". | error: patch failed: arch/arm/mach-vexpress/Kconfig:4 | error: arch/arm/mach-vexpress/Kconfig: patch does not apply | [ERROR]: Application of .kernel-meta//patches//bsp/arm-platforms/fvp-arm32/0001-ARM-vexpress-enable-GICv3.patch failed. | Patch needs to be refreshed. Sample resolution script: | .git/rebase-apply/resolve_rejects | WARNING: exit code 1 from a shell command. |
Quoted 7 lines
ERROR: Task (/home/jdm/yocto/poky/meta/recipes-kernel/linux/linux-yocto_5.4.bb:do_patch) failed with exit code '1'
Please fix the issue and push a v2.
Thanks,
Jon
Per an offline discussion, this seems to be resulting from a SMTP issue. After pulling the patches from an internal git server, I can confirm everything is building. So, applying to master.
Thanks,
Jon
Quoted 223 lines · Anders Dellien
Quoted 217 lines
Change-Id I48ec5607c216b1c15d2fedc1375f3f0a914c9937Signed-off-by Anders Dellien <[email protected]>--- ...-Add-vexpress_aemv8a_aarch32-variant.patch | 181 ++++++++++++++++++ .../recipes-bsp/u-boot/u-boot_%.bbappend | 5 + 2 files changed, 186 insertions(+) create mode 100644 meta-arm-bsp/recipes-bsp/u-boot/files/fvp-base-arm32/0001-Add-vexpress_aemv8a_aarch32-variant.patchmeta-arm-bsp/recipes-bsp/u-boot/files/fvp-base-arm32/0001-Add-vexpress_aemv8a_aarch32-variant.patch new file +181
-0@@ -0,0 +1,181 @@ +From d627bdf9b11964b694aaf464c5c88ad9b339f03f Mon Sep 17 00:00:00 2001 +From: Anders Dellien <[email protected]> +Date: Thu, 23 Jul 2020 17:32:55 +0100 +Subject: [PATCH] Add vexpress_aemv8a_aarch32 variant + +The ARM AEMv8 FVP model can be run in Aarch64 or Aarch32 mode. Aarch32 +support is enable per-CPU when launching the model, eg: + +-C cluster0.cpu0.CONFIG64=0 + +This patch adds a new defconfig and some variant specific selections in +vexpress_armv8a.h. + +This patch is co-authored with Soby Mathew <[email protected]>. + +Upstream-status: Denied + +For upstream discussion, please visit +https://www.mail-archive.com/[email protected]/msg233429.html + +Signed-off-by: Ryan Harkin <[email protected]> +Signed-off-by: Asha R <[email protected]> +Signed-off-by: Anders Dellien <[email protected]> +--- + arch/arm/Kconfig | 5 +++ + board/armltd/vexpress64/Kconfig | 2 +- + configs/vexpress_aemv8a_aarch32_defconfig | 40 +++++++++++++++++++++++ + include/configs/vexpress_aemv8a.h | 28 +++++++++++----- + 4 files changed, 65 insertions(+), 10 deletions(-) + create mode 100644 configs/vexpress_aemv8a_aarch32_defconfig + +diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig +index 36c9c2fecd..99972cdf65 100644 +--- a/arch/arm/Kconfig ++++ b/arch/arm/Kconfig +@@ -1088,6 +1088,11 @@ config TARGET_VEXPRESS64_BASE_FVP + select PL01X_SERIAL + select SEMIHOSTING + ++config TARGET_VEXPRESS64_BASE_FVP_AARCH32 ++ bool "Support Versatile Express ARMv8a 32-bit FVP BASE model" ++ select CPU_V7A ++ select SEMIHOSTING ++ + config TARGET_VEXPRESS64_JUNO + bool "Support Versatile Express Juno Development Platform" + select ARM64 +diff --git a/board/armltd/vexpress64/Kconfig b/board/armltd/vexpress64/Kconfig +index 9014418433..75545e9ea1 100644 +--- a/board/armltd/vexpress64/Kconfig ++++ b/board/armltd/vexpress64/Kconfig +@@ -1,4 +1,4 @@ +-if TARGET_VEXPRESS64_BASE_FVP || TARGET_VEXPRESS64_JUNO ++if TARGET_VEXPRESS64_BASE_FVP || TARGET_VEXPRESS64_JUNO || TARGET_VEXPRESS64_BASE_FVP_AARCH32 + + config SYS_BOARD + default "vexpress64" +diff --git a/configs/vexpress_aemv8a_aarch32_defconfig b/configs/vexpress_aemv8a_aarch32_defconfig +new file mode 100644 +index 0000000000..cf1e8d5cae +--- /dev/null ++++ b/configs/vexpress_aemv8a_aarch32_defconfig +@@ -0,0 +1,40 @@ ++CONFIG_ARM=y ++CONFIG_TARGET_VEXPRESS64_BASE_FVP_AARCH32=y ++CONFIG_SYS_MALLOC_F_LEN=0x2000 ++CONFIG_IDENT_STRING=" vexpress_aemv8a fvp aarch32" ++CONFIG_BOOTDELAY=1 ++CONFIG_SYS_TEXT_BASE=0x88000000 ++CONFIG_USE_BOOTARGS=y ++CONFIG_BOOTARGS="console=ttyAMA0 earlycon=pl011,0x1c090000 debug user_debug=31 systemd.log_target=null root=/dev/vda2 rw androidboot.hardware=fvpbase rootwait loglevel=9" ++# CONFIG_DISPLAY_CPUINFO is not set ++# CONFIG_DISPLAY_BOARDINFO is not set ++CONFIG_HUSH_PARSER=y ++CONFIG_SYS_PROMPT="fvp32# " ++CONFIG_CMD_BOOTZ=y ++# CONFIG_CMD_CONSOLE is not set ++# CONFIG_CMD_IMLS is not set ++# CONFIG_CMD_XIMG is not set ++# CONFIG_CMD_EDITENV is not set ++# CONFIG_CMD_ENV_EXISTS is not set ++CONFIG_CMD_MEMTEST=y ++CONFIG_MTD_NOR_FLASH=y ++# CONFIG_CMD_LOADS is not set ++CONFIG_CMD_ARMFLASH=y ++# CONFIG_CMD_FPGA is not set ++# CONFIG_CMD_ITEST is not set ++# CONFIG_CMD_SETEXPR is not set ++CONFIG_CMD_DHCP=y ++# CONFIG_CMD_NFS is not set ++CONFIG_CMD_MII=y ++CONFIG_CMD_PING=y ++CONFIG_CMD_CACHE=y ++# CONFIG_CMD_MISC is not set ++CONFIG_CMD_FAT=y ++CONFIG_DM=y ++CONFIG_DM_SERIAL=y ++CONFIG_OF_LIBFDT=y ++CONFIG_FLASH_CFI_DRIVER=y ++CONFIG_SYS_FLASH_CFI=y ++CONFIG_SYS_ARCH_TIMER=y ++CONFIG_DM_SERIAL=y ++CONFIG_PL01X_SERIAL=y +diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h +index 9a9cec414c..cf0e4a951c 100644 +--- a/include/configs/vexpress_aemv8a.h ++++ b/include/configs/vexpress_aemv8a.h +@@ -7,7 +7,8 @@ + #ifndef __VEXPRESS_AEMV8A_H + #define __VEXPRESS_AEMV8A_H + +-#ifdef CONFIG_TARGET_VEXPRESS64_BASE_FVP ++#if defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP) || \ ++ defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP_AARCH32) + #ifndef CONFIG_SEMIHOSTING + #error CONFIG_TARGET_VEXPRESS64_BASE_FVP requires CONFIG_SEMIHOSTING + #endif +@@ -15,8 +16,17 @@ + + #define CONFIG_REMAKE_ELF + ++#ifdef CONFIG_ARM64 ++#define HIGH_ADDR "0xffffffffffffffff" ++#define BOOT_TYPE "booti" ++#else ++#define HIGH_ADDR "0xffffffff" ++#define BOOT_TYPE "bootz" ++#endif ++ + /* Link Definitions */ +-#ifdef CONFIG_TARGET_VEXPRESS64_BASE_FVP ++#if defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP) || \ ++ defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP_AARCH32) + /* ATF loads u-boot here for BASE_FVP model */ + #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x03f00000) + #elif CONFIG_TARGET_VEXPRESS64_JUNO +@@ -82,7 +92,8 @@ + #define GICR_BASE (0x2f100000) + #else + +-#ifdef CONFIG_TARGET_VEXPRESS64_BASE_FVP ++#if defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP) || \ ++ defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP_AARCH32) + #define GICD_BASE (0x2f000000) + #define GICC_BASE (0x2c000000) + #elif CONFIG_TARGET_VEXPRESS64_JUNO +@@ -169,7 +180,8 @@ + "booti ${kernel_addr} ${initrd_param} ${fdt_addr}" + + +-#elif CONFIG_TARGET_VEXPRESS64_BASE_FVP ++#elif defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP) || \ ++ defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP_AARCH32) + #define CONFIG_EXTRA_ENV_SETTINGS \ + "kernel_name=Image\0" \ + "kernel_addr=0x80080000\0" \ +@@ -177,8 +189,8 @@ + "initrd_addr=0x88000000\0" \ + "fdtfile=devtree.dtb\0" \ + "fdt_addr=0x83000000\0" \ +- "fdt_high=0xffffffffffffffff\0" \ +- "initrd_high=0xffffffffffffffff\0" ++ "fdt_high=" HIGH_ADDR "\0" \ ++ "initrd_high=" HIGH_ADDR "\0" + + #define CONFIG_BOOTCOMMAND "smhload ${kernel_name} ${kernel_addr}; " \ + "smhload ${fdtfile} ${fdt_addr}; " \ +@@ -186,9 +198,7 @@ + "initrd_end; " \ + "fdt addr ${fdt_addr}; fdt resize; " \ + "fdt chosen ${initrd_addr} ${initrd_end}; " \ +- "booti $kernel_addr - $fdt_addr" +- +- ++ BOOT_TYPE " $kernel_addr - $fdt_addr" + #endif + + /* Monitor Command Prompt */ +-- +2.17.1 +meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend +5
-1@@ -21,6 +21,11 @@ SRC_URI_append_foundation-armv8 = " file://u-boot_vexpress_fvp.patch" # SRC_URI_append_fvp-base = " file://u-boot_vexpress_fvp.patch" +# +# FVP BASE ARM32 KMACHINE +# +SRC_URI_append_fvp-base-arm32 = " file://0001-Add-vexpress_aemv8a_aarch32-variant.patch" + # # Juno KMACHINE # --2.17.1
IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.