From a21be031ba9618b3132a5c6313809f5435b98af6 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Fri, 19 Apr 2024 13:22:20 -0600 Subject: u-boot-xlnx: Fix 2022.2 version and set defaults 2022.2 version was incorrectly specified before, fix this. Add the preferred_versions for u-boot related into conf/local.conf tied to the XILINX_RELEASE_VERSION. Add missing SRC_URI files as well. Signed-off-by: Mark Hatle --- meta-xilinx-core/conf/layer.conf | 6 +- .../recipes-bsp/u-boot/u-boot-tools-xlnx_2022.2.bb | 17 +++++ .../u-boot-v2022.01/microblaze-generic-top.h | 10 +++ .../u-boot/u-boot-v2022.01/microblaze-generic.cfg | 81 ++++++++++++++++++++++ .../recipes-bsp/u-boot/u-boot-xlnx-2022.2.inc | 2 +- 5 files changed, 113 insertions(+), 3 deletions(-) create mode 100644 meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2022.01/microblaze-generic-top.h create mode 100644 meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2022.01/microblaze-generic.cfg diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf index 993cd1bc..f7310bf1 100644 --- a/meta-xilinx-core/conf/layer.conf +++ b/meta-xilinx-core/conf/layer.conf @@ -65,8 +65,10 @@ XILINX_ATF_VERSION[v2023.1] = "2.8-xilinx-v2023.1%" XILINX_ATF_VERSION[v2023.2] = "2.8-xilinx-v2023.2%" PREFERRED_VERSION_arm-trusted-firmware ?= "${@d.getVarFlag('XILINX_ATF_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" -XILINX_UBOOT_VERSION[v2023.1] = "v2023.01-xilinx-v2023.1%" -XILINX_UBOOT_VERSION[v2023.2] = "v2023.01-xilinx-v2023.2%" +XILINX_UBOOT_VERSION[v2022.1] = "1:v2021.01-xilinx-v2022.1%" +XILINX_UBOOT_VERSION[v2022.2] = "1:v2022.01-xilinx-v2022.2%" +XILINX_UBOOT_VERSION[v2023.1] = "1:v2023.01-xilinx-v2023.1%" +XILINX_UBOOT_VERSION[v2023.2] = "1:v2023.01-xilinx-v2023.2%" PREFERRED_VERSION_u-boot-xlnx ?= "${@d.getVarFlag('XILINX_UBOOT_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" PREFERRED_VERSION_u-boot-tools-xlnx ?= "${@d.getVarFlag('XILINX_UBOOT_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2022.2.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2022.2.bb index 44636872..6b033f0f 100644 --- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2022.2.bb +++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2022.2.bb @@ -19,3 +19,20 @@ do_compile () { oe_runmake -C ${S} cross_tools NO_SDL=1 O=${B} } +# mkeficapsule is not available in this version of u-boot +PROVIDES:remove = "${MLPREFIX}u-boot-mkeficapsule" +PROVIDES:class-native:remove = "u-boot-mkeficapsule-native" +PACKAGES:remove = "${PN}-mkeficapsule" +RDEPENDS:${PN}:remove = "${PN}-mkeficapsule" + +do_install:prepend() { + # Avoid do_install failure + mkdir -p tools + touch tools/mkeficapsule +} + +do_install:append() { + # Avoid failure + rm -rf ${D}${bindir}/uboot-mkeficapsule + rm -rf ${D}${bindir}/mkeficapsule +} diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2022.01/microblaze-generic-top.h b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2022.01/microblaze-generic-top.h new file mode 100644 index 00000000..08c1c16c --- /dev/null +++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2022.01/microblaze-generic-top.h @@ -0,0 +1,10 @@ +/* + * This file is use for addition u-boot configurations for microblaze. + */ +#include + +/* Core microblaze boot configurations */ +#define XILINX_USE_DCACHE 1 +#define CONFIG_CMD_IRQ +#define CONFIG_DCACHE +#define CONFIG_ICACHE \ No newline at end of file diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2022.01/microblaze-generic.cfg b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2022.01/microblaze-generic.cfg new file mode 100644 index 00000000..0f784f73 --- /dev/null +++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2022.01/microblaze-generic.cfg @@ -0,0 +1,81 @@ +# SPDX-License-Identifier: MIT + +#........................................................................ +# WARNING +# +# This file is a u-boot configuration fragment, and not a full u-boot +# configuration file. The final u-boot configuration is made up of +# an assembly of processed fragments, each of which is designed to +# capture a specific part of the final configuration (e.g. platform +# configuration, feature configuration, and board specific hardware +# configuration). For more information on u-boot configuration, please +# refer the product documentation. +# +#....................................................................... + +# +# Definitions for Generic Microbalze machine. +# +CONFIG_BOOTDELAY=4 +CONFIG_SYS_TEXT_BASE=0x80100000 +CONFIG_SYS_PROMPT="U-Boot>" +CONFIG_SYS_CONFIG_NAME="microblaze-generic-top" +CONFIG_BOOT_SCRIPT_OFFSET=0x1F00000 +# CONFIG_SYS_NS16550 is not set +# CONFIG_SYS_FLASH_USE_BUFFER_WRITE is not set +# CONFIG_SYS_FLASH_CFI is not set +# CONFIG_FLASH_CFI_DRIVER is not set +# CONFIG_CMD_FLASH is not set +# CONFIG_CMD_IMLS is not set +# CONFIG_MTD_NOR_FLASH is not set +# CONFIG_MTD_DEVICE is not set +# CONFIG_SYS_FLASH_PROTECTION is not set +# CONFIG_SPI_FLASH_SST is not set +# CONFIG_XILINX_EMACLITE is not set +# CONFIG_PHY_VITESSE is not set +# CONFIG_CMD_EXT2 is not set +# CONFIG_CMD_EXT4 is not set +# CONFIG_CMD_EXT4_WRITE is not set +# CONFIG_CMD_FAT is not set +# CONFIG_DOS_PARTITION is not set +# CONFIG_FAT_WRITE is not set +CONFIG_DM=y +CONFIG_SYS_MALLOC_F=y +CONFIG_XILINX_UARTLITE=y +CONFIG_XILINX_AXIEMAC=y +CONFIG_PHY_XILINX=y +CONFIG_PHY_TI=y +CONFIG_NET=y +CONFIG_PHY_GIGE=y +CONFIG_NETDEVICES=y +CONFIG_CMD_NET=y +CONFIG_DM_ETH=y +CONFIG_CMD_PING=y +CONFIG_CMD_DHCP=y +CONFIG_PHYLIB=y +CONFIG_CMD_TFTPPUT=y +CONFIG_CMD_NFS=y +CONFIG_CMD_MII=y +CONFIG_PHY_MARVELL=y +CONFIG_PHY_REALTEK=y +CONFIG_PHY_NATSEMI=y +CONFIG_XILINX_SPI=y +CONFIG_CMD_SPI=y +CONFIG_CMD_SF=y +CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_BAR=y +CONFIG_DM_SPI_FLASH=y +CONFIG_DM_SPI=y +CONFIG_SPI_FLASH_SPANSION=y +CONFIG_SPI_FLASH_STMICRO=y +CONFIG_SPI_FLASH_WINBOND=y +CONFIG_SPI_FLASH_MACRONIX=y +CONFIG_SPI=y +CONFIG_SPI_FLASH_ISSI=y +# CONFIG_BOOTARGS is not set +# CONFIG_USE_BOOTARGS is not set +# CONFIG_SPL is not set +# CONFIG_I2C_EEPROM is not set +# CONFIG_CMD_EEPROM is not set +# CONFIG_SYS_I2C_EEPROM_ADDR is not set +# CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW is not set diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2022.2.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2022.2.inc index 6415861d..f9b8f52b 100644 --- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2022.2.inc +++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2022.2.inc @@ -1,4 +1,4 @@ -UBOOT_VERSION = "v2021.01" +UBOOT_VERSION = "v2022.01" UBRANCH ?= "xlnx_rebase_v2022.01" -- cgit v1.2.3-54-g00ecf