From patchwork Sun Sep 27 06:16:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shlomi Vaknin X-Patchwork-Id: 1371909 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=NDnvVvCv; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bzb5D5pCwz9sS8 for ; Sun, 27 Sep 2020 16:16:29 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4C15085F43; Sun, 27 Sep 2020 06:16:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vC0ZW6FqBjoF; Sun, 27 Sep 2020 06:16:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 06F6985F33; Sun, 27 Sep 2020 06:16:23 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 42B821BF3EE for ; Sun, 27 Sep 2020 06:16:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 3CE7486322 for ; Sun, 27 Sep 2020 06:16:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cRCQqaNfCrYE for ; Sun, 27 Sep 2020 06:16:19 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com [209.85.208.48]) by whitealder.osuosl.org (Postfix) with ESMTPS id 6422F862D2 for ; Sun, 27 Sep 2020 06:16:19 +0000 (UTC) Received: by mail-ed1-f48.google.com with SMTP id n13so6593227edo.10 for ; Sat, 26 Sep 2020 23:16:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=vbZO7r/eeMUYvIs/bAyzxjs1oc5b7TZfESk4UVHuNHE=; b=NDnvVvCva7WxbYJn93jWGq9MZ2C9YEmGsDluWfzj33PeaGAr1Wg3ullu11zKI4UIhV FbNm1FvY0BY+/VmJtMtxbEvuSKazxt5cG5Uguboa2wNngZBZC98PTMulGgUgCA1seVKs 0459wGUogxQTM+XPIgJdekpJbF03m52WiFLW8wnHtGw+u7usgkQ701h08hvl6Ml1MmgB DyD76Esc/5wKdKLz1rL8+sQBhD4FwWBqtKteuXxx+BQne2KSetXBM08qGTWojzIbGiVg 2zn04OdicQROckK2MI2OrVdPVBsFUbo9Vdeniira7Hhdqx5pcxMqxQ5G/BYzfE0UkVYl gtUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=vbZO7r/eeMUYvIs/bAyzxjs1oc5b7TZfESk4UVHuNHE=; b=or0d/xJ7+RwS/ynlI91QDvziOA0FDhpseNHWyoSsj+5rSjEKy6VsdhaQHD9qYQjPhR SY/lb/OJKxw3POlrOL9noWd5Jyn6b58ZvwR6pet5pHPFZ+S+VocqZJFDUpElDCI4zHvZ VbocYE0QaD067hb3ADWHqcg+YjUIIspTS9SWjtXUCMcrV1l38OSGdEO5VRqkbaNk3xa9 ZgndihS6ztcLWEnq68fFDt3nHJ6cj9PxztdhERRNjk4w+VnZIbJT+9G8qexyEnkHbDcb u9w08P50fbH5mqL/bS/b6nUobq+E+a6gH8LMEpoc+uxCn0BkMiwhF0wysm0OprinwmE3 WUfg== X-Gm-Message-State: AOAM532+5LjQfacM8y+9VKvqA7gBNPn63iMn0fE33gQTtQgNy5bs9Kg6 NLYTRMUCQZlBRo6ADfwKmYtdIJ2otR04kw== X-Google-Smtp-Source: ABdhPJy80V5B//x7tfJm6HcsIKSq4Rryh/2L+Bf4wqeD1TjlpmmJxCyNTVs52Uv0gdz0Siq+HvS9LA== X-Received: by 2002:a50:fd0a:: with SMTP id i10mr9458455eds.277.1601187377228; Sat, 26 Sep 2020 23:16:17 -0700 (PDT) Received: from localhost.localdomain ([141.226.11.208]) by smtp.gmail.com with ESMTPSA id k13sm6177694edj.92.2020.09.26.23.16.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Sep 2020 23:16:16 -0700 (PDT) From: Shlomi Vaknin To: buildroot@buildroot.org Date: Sun, 27 Sep 2020 09:16:06 +0300 Message-Id: <20200927061606.10239-1-shlomi.39sd@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] configs/stm32mp157c_dk2_trusted_defconfig: new platform X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Shlomi Vaknin Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Adding support for trusted configuration for stm32mp157c-dk2. In addtion, the following changes made to the original stm32mp157c_dk2_defconfig: 1. Enable gadget support and wifi support in `linux.config`. 2. Create a new dts file that contains the bindings for the wifi module. This was copied from the stm32 kernel fork. 3. A txt file for the wifi firmware. This was copied from the yocto bsp layer of st. Signed-off-by: Shlomi Vaknin --- .../common/stm32mp157-trusted/genimage.cfg | 23 +++ .../stm32mp157c-dk2-trusted/linux.config | 181 ++++++++++++++++++ .../overlay/boot/extlinux/extlinux.conf | 4 + .../brcmfmac43430-sdio.st,stm32mp157c-dk2.txt | 59 ++++++ .../stm32mp157c-dk2-trusted/readme.txt | 38 ++++ .../stm32mp157c-dk2-wifi.dts | 32 ++++ configs/stm32mp157c_dk2_trusted_defconfig | 40 ++++ 7 files changed, 377 insertions(+) create mode 100644 board/stmicroelectronics/common/stm32mp157-trusted/genimage.cfg create mode 100644 board/stmicroelectronics/stm32mp157c-dk2-trusted/linux.config create mode 100644 board/stmicroelectronics/stm32mp157c-dk2-trusted/overlay/boot/extlinux/extlinux.conf create mode 100644 board/stmicroelectronics/stm32mp157c-dk2-trusted/overlay/lib/firmware/brcm/brcmfmac43430-sdio.st,stm32mp157c-dk2.txt create mode 100644 board/stmicroelectronics/stm32mp157c-dk2-trusted/readme.txt create mode 100644 board/stmicroelectronics/stm32mp157c-dk2-trusted/stm32mp157c-dk2-wifi.dts create mode 100644 configs/stm32mp157c_dk2_trusted_defconfig diff --git a/board/stmicroelectronics/common/stm32mp157-trusted/genimage.cfg b/board/stmicroelectronics/common/stm32mp157-trusted/genimage.cfg new file mode 100644 index 0000000000..3b709f756d --- /dev/null +++ b/board/stmicroelectronics/common/stm32mp157-trusted/genimage.cfg @@ -0,0 +1,23 @@ +image sdcard.img { + hdimage { + gpt = "true" + } + + partition fsbl1 { + image = "tf-a-stm32mp157c-dk2.stm32" + } + + partition fsbl2 { + image = "tf-a-stm32mp157c-dk2.stm32" + } + + partition ssbl { + image = "u-boot.stm32" + } + + partition rootfs { + image = "rootfs.ext4" + partition-type = 0x83 + bootable = "yes" + } +} diff --git a/board/stmicroelectronics/stm32mp157c-dk2-trusted/linux.config b/board/stmicroelectronics/stm32mp157c-dk2-trusted/linux.config new file mode 100644 index 0000000000..5f53e48236 --- /dev/null +++ b/board/stmicroelectronics/stm32mp157c-dk2-trusted/linux.config @@ -0,0 +1,181 @@ +CONFIG_SYSVIPC=y +CONFIG_POSIX_MQUEUE=y +CONFIG_USELIB=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_PREEMPT=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=16 +CONFIG_BLK_DEV_INITRD=y +CONFIG_ARCH_STM32=y +CONFIG_ARM_THUMBEE=y +# CONFIG_CACHE_L2X0 is not set +CONFIG_ARM_ERRATA_430973=y +CONFIG_ARM_ERRATA_720789=y +CONFIG_ARM_ERRATA_754322=y +CONFIG_ARM_ERRATA_754327=y +CONFIG_ARM_ERRATA_764369=y +CONFIG_ARM_ERRATA_775420=y +CONFIG_ARM_ERRATA_798181=y +CONFIG_SMP=y +CONFIG_MCPM=y +CONFIG_HIGHMEM=y +CONFIG_FORCE_MAX_ZONEORDER=12 +CONFIG_SECCOMP=y +# CONFIG_ATAGS is not set +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_ARM_APPENDED_DTB=y +CONFIG_ARM_ATAG_DTB_COMPAT=y +CONFIG_VFP=y +CONFIG_NEON=y +CONFIG_KERNEL_MODE_NEON=y +CONFIG_ARM_CRYPTO=y +CONFIG_MODULES=y +CONFIG_MODULE_FORCE_LOAD=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODVERSIONS=y +CONFIG_PARTITION_ADVANCED=y +CONFIG_CMDLINE_PARTITION=y +CONFIG_CMA=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_CAN=y +CONFIG_CAN_M_CAN=y +CONFIG_CFG80211=m +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_SIMPLE_PM_BUS=y +CONFIG_MTD=y +CONFIG_MTD_CMDLINE_PARTS=y +CONFIG_MTD_BLOCK=y +CONFIG_MTD_SPI_NOR=y +# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set +CONFIG_MTD_UBI=y +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_SIZE=65536 +CONFIG_SRAM=y +CONFIG_EEPROM_AT24=y +CONFIG_NETDEVICES=y +CONFIG_VIRTIO_NET=y +CONFIG_KS8851=y +CONFIG_SMSC911X=y +CONFIG_STMMAC_ETH=y +CONFIG_DWMAC_DWC_QOS_ETH=y +CONFIG_MDIO_BITBANG=y +CONFIG_BRCMFMAC=m +CONFIG_INPUT_JOYDEV=y +CONFIG_INPUT_EVDEV=y +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_EDT_FT5X06=y +CONFIG_INPUT_MISC=y +CONFIG_INPUT_STPMIC1_ONKEY=y +CONFIG_SERIAL_STM32=y +CONFIG_SERIAL_STM32_CONSOLE=y +CONFIG_SERIAL_DEV_BUS=y +CONFIG_HW_RANDOM=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_STM32F7=y +CONFIG_SPI=y +CONFIG_SPI_STM32=y +CONFIG_SPI_STM32_QSPI=y +CONFIG_PINCTRL_SINGLE=y +CONFIG_PINCTRL_STMFX=y +CONFIG_POWER_RESET=y +CONFIG_POWER_RESET_GPIO=y +CONFIG_POWER_RESET_GPIO_RESTART=y +CONFIG_POWER_RESET_SYSCON=y +CONFIG_POWER_RESET_SYSCON_POWEROFF=y +CONFIG_SYSCON_REBOOT_MODE=y +CONFIG_WATCHDOG=y +CONFIG_STPMIC1_WATCHDOG=y +CONFIG_MFD_STM32_LPTIMER=y +CONFIG_MFD_STPMIC1=y +CONFIG_REGULATOR=y +CONFIG_REGULATOR_FIXED_VOLTAGE=y +CONFIG_REGULATOR_STM32_VREFBUF=y +CONFIG_REGULATOR_STM32_PWR=y +CONFIG_REGULATOR_STPMIC1=y +CONFIG_DRM=y +CONFIG_DRM_STM=y +CONFIG_DRM_STM_DSI=y +CONFIG_DRM_PANEL_ORISETECH_OTM8009A=y +CONFIG_DRM_SII902X=y +CONFIG_BACKLIGHT_CLASS_DEVICE=y +# CONFIG_BACKLIGHT_GENERIC is not set +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y +CONFIG_SOUND=y +CONFIG_SND=y +CONFIG_SND_DYNAMIC_MINORS=y +CONFIG_USB=y +CONFIG_USB_OTG=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_PLATFORM=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_HCD_PLATFORM=y +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_OHCI_HCD_PLATFORM=y +CONFIG_USB_DWC2=y +CONFIG_USB_CHIPIDEA=y +CONFIG_USB_CHIPIDEA_HOST=y +CONFIG_USB_ISP1760=y +CONFIG_USB_ISP1760_HOST_ROLE=y +CONFIG_USB_HSIC_USB3503=y +CONFIG_USB_GPIO_VBUS=y +CONFIG_USB_ISP1301=y +CONFIG_USB_ULPI=y +CONFIG_USB_GADGET=y +CONFIG_USB_CONFIGFS=m +CONFIG_USB_CONFIGFS_ACM=y +CONFIG_USB_CONFIGFS_ECM=y +CONFIG_USB_CONFIGFS_MASS_STORAGE=y +CONFIG_TYPEC=y +CONFIG_MMC=y +CONFIG_MMC_BLOCK_MINORS=16 +CONFIG_MMC_ARMMMCI=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_PLTFM=y +CONFIG_MMC_DW=y +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +CONFIG_LEDS_GPIO=y +CONFIG_LEDS_PWM=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_STM32=y +CONFIG_DMADEVICES=y +CONFIG_STM32_DMA=y +CONFIG_STM32_DMAMUX=y +CONFIG_STM32_MDMA=y +CONFIG_HWSPINLOCK=y +CONFIG_HWSPINLOCK_STM32=y +CONFIG_STM32_IPCC=y +CONFIG_REMOTEPROC=y +CONFIG_STM32_RPROC=y +CONFIG_RPMSG_VIRTIO=y +CONFIG_IIO=y +CONFIG_IIO_SW_TRIGGER=y +CONFIG_SD_ADC_MODULATOR=y +CONFIG_STM32_ADC_CORE=y +CONFIG_STM32_ADC=y +CONFIG_STM32_DFSDM_ADC=y +CONFIG_STM32_DAC=y +CONFIG_IIO_HRTIMER_TRIGGER=y +CONFIG_IIO_STM32_LPTIMER_TRIGGER=y +CONFIG_PWM=y +CONFIG_PWM_STM32=y +CONFIG_PWM_STM32_LP=y +CONFIG_PHY_STM32_USBPHYC=y +CONFIG_NVMEM_STM32_ROMEM=y +CONFIG_EXT4_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_CRYPTO_SHA256=y +CONFIG_DMA_CMA=y +CONFIG_CMA_SIZE_MBYTES=128 +CONFIG_PRINTK_TIME=y diff --git a/board/stmicroelectronics/stm32mp157c-dk2-trusted/overlay/boot/extlinux/extlinux.conf b/board/stmicroelectronics/stm32mp157c-dk2-trusted/overlay/boot/extlinux/extlinux.conf new file mode 100644 index 0000000000..a6595971a8 --- /dev/null +++ b/board/stmicroelectronics/stm32mp157c-dk2-trusted/overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label stm32mp157c-dk2-buildroot + kernel /boot/zImage + devicetree /boot/stm32mp157c-dk2-wifi.dtb + append root=/dev/mmcblk0p4 rootwait diff --git a/board/stmicroelectronics/stm32mp157c-dk2-trusted/overlay/lib/firmware/brcm/brcmfmac43430-sdio.st,stm32mp157c-dk2.txt b/board/stmicroelectronics/stm32mp157c-dk2-trusted/overlay/lib/firmware/brcm/brcmfmac43430-sdio.st,stm32mp157c-dk2.txt new file mode 100644 index 0000000000..b36de8837f --- /dev/null +++ b/board/stmicroelectronics/stm32mp157c-dk2-trusted/overlay/lib/firmware/brcm/brcmfmac43430-sdio.st,stm32mp157c-dk2.txt @@ -0,0 +1,59 @@ +# NVRAM file for BCM943430WLSELG +# 2.4 GHz, 20 MHz BW mode + +# The following parameter values are just placeholders, need to be updated. +manfid=0x2d0 +prodid=0x0726 +vendid=0x14e4 +devid=0x43e2 +boardtype=0x0726 +boardrev=0x1202 +boardnum=22 +macaddr=00:90:4c:c5:12:38 +sromrev=11 +boardflags=0x00404201 +boardflags3=0x08000000 +xtalfreq=37400 +#xtalfreq=19200 +nocrc=1 +ag0=255 +aa2g=1 +ccode=ALL + +pa0itssit=0x20 +extpagain2g=0 + +#PA parameters for 2.4GHz, measured at CHIP OUTPUT +pa2ga0=-168,7161,-820 +AvVmid_c0=0x0,0xc8 +cckpwroffset0=5 + +# PPR params +maxp2ga0=84 +txpwrbckof=6 +cckbw202gpo=0 +legofdmbw202gpo=0x66111111 +mcsbw202gpo=0x77711111 +propbw202gpo=0xdd + +# OFDM IIR : +ofdmdigfilttype=18 +ofdmdigfilttypebe=18 +# PAPD mode: +papdmode=1 +papdvalidtest=1 +pacalidx2g=32 +papdepsoffset=-36 +papdendidx=61 + +il0macaddr=00:90:4c:c5:12:38 +wl0id=0x431b + +deadman_to=0xffffffff +# muxenab: 0x1 for UART enable, 0x2 for GPIOs, 0x8 for JTAG +muxenab=0x1 +# CLDO PWM voltage settings - 0x4 - 1.1 volt +#cldo_pwm=0x4 + +#VCO freq 326.4MHz +spurconfig=0x3 diff --git a/board/stmicroelectronics/stm32mp157c-dk2-trusted/readme.txt b/board/stmicroelectronics/stm32mp157c-dk2-trusted/readme.txt new file mode 100644 index 0000000000..dabf2f018a --- /dev/null +++ b/board/stmicroelectronics/stm32mp157c-dk2-trusted/readme.txt @@ -0,0 +1,38 @@ +STM32MP157C Discovery Kit v2 + +Intro +===== + +This configuration supports the STM32MP157C Discovery Kit 2 (DK2) +platform: + + https://www.st.com/en/evaluation-tools/stm32mp157c-dk2.html + +How to build +============ + + $ make stm32mp157c_dk2_trusted_defconfig + $ make + +How to write the microSD card +============================= + +Once the build process is finished you will have an image called +"sdcard.img" in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an microSD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX + +Boot the board +============== + + (1) Insert the microSD card in connector CN15 + + (2) Plug a micro-USB cable in connector CN11 and run your serial + communication program on /dev/ttyACM0. + + (3) Plug a USB-C cable in CN6 to power-up the board. + + (4) The system will start, with the console on UART, but also visible + on the screen. diff --git a/board/stmicroelectronics/stm32mp157c-dk2-trusted/stm32mp157c-dk2-wifi.dts b/board/stmicroelectronics/stm32mp157c-dk2-trusted/stm32mp157c-dk2-wifi.dts new file mode 100644 index 0000000000..89747d2b5f --- /dev/null +++ b/board/stmicroelectronics/stm32mp157c-dk2-trusted/stm32mp157c-dk2-wifi.dts @@ -0,0 +1,32 @@ +/dts-v1/; + +#include "stm32mp157c-dk2.dts" + +/ { + wifi_pwrseq: wifi-pwrseq { + compatible = "mmc-pwrseq-simple"; + reset-gpios = <&gpioh 4 GPIO_ACTIVE_LOW>; + }; +}; + +/* Wifi */ +&sdmmc2 { + arm,primecell-periphid = <0x10153180>; + pinctrl-names = "default", "opendrain", "sleep"; + pinctrl-0 = <&sdmmc2_b4_pins_a>; + pinctrl-1 = <&sdmmc2_b4_od_pins_a>; + pinctrl-2 = <&sdmmc2_b4_sleep_pins_a>; + non-removable; + st,neg-edge; + bus-width = <4>; + vmmc-supply = <&v3v3>; + mmc-pwrseq = <&wifi_pwrseq>; + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + brcmf: bcrmf@1 { + reg = <1>; + compatible = "brcm,bcm4329-fmac"; + }; +}; diff --git a/configs/stm32mp157c_dk2_trusted_defconfig b/configs/stm32mp157c_dk2_trusted_defconfig new file mode 100644 index 0000000000..e5cf8909da --- /dev/null +++ b/configs/stm32mp157c_dk2_trusted_defconfig @@ -0,0 +1,40 @@ +BR2_arm=y +BR2_cortex_a7=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7=y +BR2_ROOTFS_OVERLAY="board/stmicroelectronics/stm32mp157c-dk2-trusted/overlay/" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/stmicroelectronics/common/stm32mp157-trusted/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.7.10" +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32mp157c-dk2-trusted/linux.config" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32mp157c-dk2" +BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/stmicroelectronics/stm32mp157c-dk2-trusted/stm32mp157c-dk2-wifi.dts" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_PACKAGE_LINUX_FIRMWARE=y +BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=y +BR2_PACKAGE_WIRELESS_REGDB=y +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_PACKAGE_WPA_SUPPLICANT_CLI=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="stm32mp1" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=sp_min DTB_FILE_NAME=stm32mp157c-dk2.dtb" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="*.stm32" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32mp15_trusted" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/stmicroelectronics/stm32mp157c-dk2/uboot-fragment.config" +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.stm32" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=stm32mp157c-dk2" +BR2_PACKAGE_HOST_GENIMAGE=y From patchwork Fri Oct 2 14:24:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shlomi Vaknin X-Patchwork-Id: 1375791 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=J9ziviP0; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4C2shJ5tqcz9sSC for ; Sat, 3 Oct 2020 00:24:48 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id E573786C70; Fri, 2 Oct 2020 14:24:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6g6ngZlNCSZD; Fri, 2 Oct 2020 14:24:45 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 0256E86C43; Fri, 2 Oct 2020 14:24:45 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id CDF4E1BF311 for ; Fri, 2 Oct 2020 14:24:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id BCBF5274DB for ; Fri, 2 Oct 2020 14:24:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hZND-6O68srO for ; Fri, 2 Oct 2020 14:24:41 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ej1-f66.google.com (mail-ej1-f66.google.com [209.85.218.66]) by silver.osuosl.org (Postfix) with ESMTPS id 4CB892000F for ; Fri, 2 Oct 2020 14:24:41 +0000 (UTC) Received: by mail-ej1-f66.google.com with SMTP id md26so2228907ejb.10 for ; Fri, 02 Oct 2020 07:24:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bdfAgHNLYhhLKo6UVxuQ3wsAdrer8kzo2t5Jh7Z6tpQ=; b=J9ziviP0zmdlkEkQMqZfnARqyK46QPUyBhwn8m0ZbD/nv3ZkktIqJCbIHiWNGRF1pY fmpJQE0XQ4jqVK/XHH7YtcdwZSuiZx3PGHmz8t5PfMjpUjcro2DtKxUCP0PQ/7X0QeXC L2llev1uMFJ4siTCj8YReVs4wY+TLhg5wEO4S+JE+opZI3OhZcQXVR2pXFSN9d07ygKU TZWt6od6b+q04C+1A9yzfHoSU73mr41DptwBI2aRRytdbfNqL0HRWVoFeP6sJOkcxOxg F9LBfIsVWD1HCUaH+bt9qvJxwLZSLxtohSPCwlFWrr+PjtkKHlwpwYHD9vySrU7u1o9y 6WCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bdfAgHNLYhhLKo6UVxuQ3wsAdrer8kzo2t5Jh7Z6tpQ=; b=QYiakjwIdnCuhiXFtgkpuoSX+zH1fM0ZXSOp2tT74bKv7MTffZa2nUm8LAap0ImHC5 t6HnwkEF8M9FWF1QC6ewkYZq4mD+V0r0gZOa7dDYtdt5qqUO+IPVtv41hypo2eSVylME tvtTG6RkdTcleCX8roy9yYBae2BsN1W/ZkSFKTe7Q0GKpb7pWGAhT67W4y50V9vYJmrC 7Qff1V8RIBdw42QJ42FTa7yS1xIHWOv1vJlTCCsMZPblzd+tKexDS3INA1lWdmA6GVW6 DfDPpdH1EytEsbBeTGFHh8Okp/G4AvJJ2fCCZiw8/htRwDp47iv0DVk8coEXPg+x7H1W Ev5g== X-Gm-Message-State: AOAM5324Z4BHxJjqgB8tADpLQqMjeO1xmYS5GgvgBvuwvnWM3Wg796Bv Gp6p/LDc0ncUsyp/tOrt6DZThxYwptY2HYE4 X-Google-Smtp-Source: ABdhPJxWw62ALPKUwZLJh04AeJ7WkprzebQW8tGU3J+CkZ7WzsNIolaZXUIu5sz6MX4wFY3mW608pg== X-Received: by 2002:a17:906:68d2:: with SMTP id y18mr2565117ejr.197.1601648679328; Fri, 02 Oct 2020 07:24:39 -0700 (PDT) Received: from localhost.localdomain ([141.226.11.208]) by smtp.gmail.com with ESMTPSA id u15sm1217079edq.96.2020.10.02.07.24.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Oct 2020 07:24:38 -0700 (PDT) From: Shlomi Vaknin To: buildroot@buildroot.org Date: Fri, 2 Oct 2020 17:24:24 +0300 Message-Id: <20201002142426.1375026-2-shlomi.39sd@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201002142426.1375026-1-shlomi.39sd@gmail.com> References: <20200927061606.10239-1-shlomi.39sd@gmail.com> <20201002142426.1375026-1-shlomi.39sd@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 2/4] configs/stm32mp157*: use trusted configuration X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Shlomi Vaknin , Bartosz Bilas , Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Adding support for trusted configuration for stm32mp157c-dk2 and stm32mp157a-dk1. This patch change using uboot spl as fsbl to using arm trusted firmware. The reason for this change is that st recommends to use this configuration (or optee) and not the basic. In addtion, this commit enables gadget support in `linux.config`. Signed-off-by: Shlomi Vaknin --- .../genimage.cfg | 6 ++--- .../stm32mp157a-dk1/linux.config | 24 +++++++------------ .../stm32mp157c-dk2/genimage.cfg | 23 ++++++++++++++++++ .../stm32mp157c-dk2/linux.config | 20 +++++++--------- configs/stm32mp157a_dk1_defconfig | 13 ++++++---- configs/stm32mp157c_dk2_defconfig | 13 ++++++---- 6 files changed, 58 insertions(+), 41 deletions(-) rename board/stmicroelectronics/{common/stm32mp157 => stm32mp157a-dk1}/genimage.cfg (66%) create mode 100644 board/stmicroelectronics/stm32mp157c-dk2/genimage.cfg diff --git a/board/stmicroelectronics/common/stm32mp157/genimage.cfg b/board/stmicroelectronics/stm32mp157a-dk1/genimage.cfg similarity index 66% rename from board/stmicroelectronics/common/stm32mp157/genimage.cfg rename to board/stmicroelectronics/stm32mp157a-dk1/genimage.cfg index d1ce530cc5..9ba22a981f 100644 --- a/board/stmicroelectronics/common/stm32mp157/genimage.cfg +++ b/board/stmicroelectronics/stm32mp157a-dk1/genimage.cfg @@ -4,15 +4,15 @@ image sdcard.img { } partition fsbl1 { - image = "u-boot-spl.stm32" + image = "tf-a-stm32mp157a-dk1.stm32" } partition fsbl2 { - image = "u-boot-spl.stm32" + image = "tf-a-stm32mp157a-dk1.stm32" } partition ssbl { - image = "u-boot.img" + image = "u-boot.stm32" } partition rootfs { diff --git a/board/stmicroelectronics/stm32mp157a-dk1/linux.config b/board/stmicroelectronics/stm32mp157a-dk1/linux.config index 95c834e431..47729ea97c 100644 --- a/board/stmicroelectronics/stm32mp157a-dk1/linux.config +++ b/board/stmicroelectronics/stm32mp157a-dk1/linux.config @@ -47,15 +47,10 @@ CONFIG_CAN=y CONFIG_CAN_M_CAN=y CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y -CONFIG_DMA_CMA=y -CONFIG_CMA_SIZE_MBYTES=128 CONFIG_SIMPLE_PM_BUS=y CONFIG_MTD=y CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_BLOCK=y -CONFIG_MTD_M25P80=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_STM32_FMC2=y CONFIG_MTD_SPI_NOR=y # CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set CONFIG_MTD_UBI=y @@ -107,13 +102,6 @@ CONFIG_REGULATOR_STPMIC1=y CONFIG_DRM=y CONFIG_DRM_STM=y CONFIG_DRM_STM_DSI=y -# CONFIG_DRM_PANEL_ORISETECH_OTM8009A is not set -# CONFIG_DRM_SII902X is not set -# CONFIG_BACKLIGHT_LCD_SUPPORT is not set -# CONFIG_LCD_CLASS_DEVICE is not set -# CONFIG_BACKLIGHT_CLASS_DEVICE is not set -# CONFIG_BACKLIGHT_GENERIC is not set -# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set CONFIG_SOUND=y CONFIG_SND=y CONFIG_SND_DYNAMIC_MINORS=y @@ -129,12 +117,17 @@ CONFIG_USB_DWC2=y CONFIG_USB_CHIPIDEA=y CONFIG_USB_CHIPIDEA_HOST=y CONFIG_USB_ISP1760=y +CONFIG_USB_ISP1760_HOST_ROLE=y CONFIG_USB_HSIC_USB3503=y CONFIG_USB_GPIO_VBUS=y CONFIG_USB_ISP1301=y CONFIG_USB_ULPI=y +CONFIG_USB_GADGET=y +CONFIG_USB_CONFIGFS=m +CONFIG_USB_CONFIGFS_ACM=y +CONFIG_USB_CONFIGFS_ECM=y +CONFIG_USB_CONFIGFS_MASS_STORAGE=y CONFIG_TYPEC=y -CONFIG_TYPEC_STUSB=y CONFIG_MMC=y CONFIG_MMC_BLOCK_MINORS=16 CONFIG_MMC_ARMMMCI=y @@ -157,15 +150,12 @@ CONFIG_STM32_IPCC=y CONFIG_REMOTEPROC=y CONFIG_STM32_RPROC=y CONFIG_RPMSG_VIRTIO=y -CONFIG_RPMSG_TTY=y CONFIG_IIO=y CONFIG_IIO_SW_TRIGGER=y CONFIG_SD_ADC_MODULATOR=y CONFIG_STM32_ADC_CORE=y CONFIG_STM32_ADC=y -CONFIG_STM32_ADC_TEMP=y CONFIG_STM32_DFSDM_ADC=y -CONFIG_STM32_LPTIMER_CNT=y CONFIG_STM32_DAC=y CONFIG_IIO_HRTIMER_TRIGGER=y CONFIG_IIO_STM32_LPTIMER_TRIGGER=y @@ -179,4 +169,6 @@ CONFIG_MSDOS_FS=y CONFIG_VFAT_FS=y CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y +CONFIG_DMA_CMA=y +CONFIG_CMA_SIZE_MBYTES=128 CONFIG_PRINTK_TIME=y diff --git a/board/stmicroelectronics/stm32mp157c-dk2/genimage.cfg b/board/stmicroelectronics/stm32mp157c-dk2/genimage.cfg new file mode 100644 index 0000000000..3b709f756d --- /dev/null +++ b/board/stmicroelectronics/stm32mp157c-dk2/genimage.cfg @@ -0,0 +1,23 @@ +image sdcard.img { + hdimage { + gpt = "true" + } + + partition fsbl1 { + image = "tf-a-stm32mp157c-dk2.stm32" + } + + partition fsbl2 { + image = "tf-a-stm32mp157c-dk2.stm32" + } + + partition ssbl { + image = "u-boot.stm32" + } + + partition rootfs { + image = "rootfs.ext4" + partition-type = 0x83 + bootable = "yes" + } +} diff --git a/board/stmicroelectronics/stm32mp157c-dk2/linux.config b/board/stmicroelectronics/stm32mp157c-dk2/linux.config index 878a0c39f1..c03eb748b4 100644 --- a/board/stmicroelectronics/stm32mp157c-dk2/linux.config +++ b/board/stmicroelectronics/stm32mp157c-dk2/linux.config @@ -47,15 +47,10 @@ CONFIG_CAN=y CONFIG_CAN_M_CAN=y CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y -CONFIG_DMA_CMA=y -CONFIG_CMA_SIZE_MBYTES=128 CONFIG_SIMPLE_PM_BUS=y CONFIG_MTD=y CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_BLOCK=y -CONFIG_MTD_M25P80=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_STM32_FMC2=y CONFIG_MTD_SPI_NOR=y # CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set CONFIG_MTD_UBI=y @@ -82,7 +77,6 @@ CONFIG_SERIAL_STM32_CONSOLE=y CONFIG_SERIAL_DEV_BUS=y CONFIG_HW_RANDOM=y CONFIG_I2C_CHARDEV=y -CONFIG_I2C_MUX=y CONFIG_I2C_STM32F7=y CONFIG_SPI=y CONFIG_SPI_STM32=y @@ -109,8 +103,6 @@ CONFIG_DRM_STM=y CONFIG_DRM_STM_DSI=y CONFIG_DRM_PANEL_ORISETECH_OTM8009A=y CONFIG_DRM_SII902X=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -# CONFIG_LCD_CLASS_DEVICE is not set CONFIG_BACKLIGHT_CLASS_DEVICE=y # CONFIG_BACKLIGHT_GENERIC is not set CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y @@ -129,12 +121,17 @@ CONFIG_USB_DWC2=y CONFIG_USB_CHIPIDEA=y CONFIG_USB_CHIPIDEA_HOST=y CONFIG_USB_ISP1760=y +CONFIG_USB_ISP1760_HOST_ROLE=y CONFIG_USB_HSIC_USB3503=y CONFIG_USB_GPIO_VBUS=y CONFIG_USB_ISP1301=y CONFIG_USB_ULPI=y +CONFIG_USB_GADGET=y +CONFIG_USB_CONFIGFS=m +CONFIG_USB_CONFIGFS_ACM=y +CONFIG_USB_CONFIGFS_ECM=y +CONFIG_USB_CONFIGFS_MASS_STORAGE=y CONFIG_TYPEC=y -CONFIG_TYPEC_STUSB=y CONFIG_MMC=y CONFIG_MMC_BLOCK_MINORS=16 CONFIG_MMC_ARMMMCI=y @@ -157,15 +154,12 @@ CONFIG_STM32_IPCC=y CONFIG_REMOTEPROC=y CONFIG_STM32_RPROC=y CONFIG_RPMSG_VIRTIO=y -CONFIG_RPMSG_TTY=y CONFIG_IIO=y CONFIG_IIO_SW_TRIGGER=y CONFIG_SD_ADC_MODULATOR=y CONFIG_STM32_ADC_CORE=y CONFIG_STM32_ADC=y -CONFIG_STM32_ADC_TEMP=y CONFIG_STM32_DFSDM_ADC=y -CONFIG_STM32_LPTIMER_CNT=y CONFIG_STM32_DAC=y CONFIG_IIO_HRTIMER_TRIGGER=y CONFIG_IIO_STM32_LPTIMER_TRIGGER=y @@ -179,4 +173,6 @@ CONFIG_MSDOS_FS=y CONFIG_VFAT_FS=y CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y +CONFIG_DMA_CMA=y +CONFIG_CMA_SIZE_MBYTES=128 CONFIG_PRINTK_TIME=y diff --git a/configs/stm32mp157a_dk1_defconfig b/configs/stm32mp157a_dk1_defconfig index f172539c02..8197fcc31b 100644 --- a/configs/stm32mp157a_dk1_defconfig +++ b/configs/stm32mp157a_dk1_defconfig @@ -3,7 +3,7 @@ BR2_cortex_a7=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7=y BR2_ROOTFS_OVERLAY="board/stmicroelectronics/stm32mp157a-dk1/overlay/" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/stmicroelectronics/common/stm32mp157/genimage.cfg" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/stmicroelectronics/stm32mp157a-dk1/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.7.10" @@ -16,15 +16,18 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="stm32mp1" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=sp_min DTB_FILE_NAME=stm32mp157a-dk1.dtb" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="*.stm32" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32mp15_basic" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32mp15_trusted" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/stmicroelectronics/stm32mp157a-dk1/uboot-fragment.config" # BR2_TARGET_UBOOT_FORMAT_BIN is not set -BR2_TARGET_UBOOT_FORMAT_IMG=y -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl.stm32" +BR2_TARGET_UBOOT_FORMAT_STM32=y BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=stm32mp157a-dk1" BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/stm32mp157c_dk2_defconfig b/configs/stm32mp157c_dk2_defconfig index 49cfb0733c..15e1e85f69 100644 --- a/configs/stm32mp157c_dk2_defconfig +++ b/configs/stm32mp157c_dk2_defconfig @@ -3,7 +3,7 @@ BR2_cortex_a7=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7=y BR2_ROOTFS_OVERLAY="board/stmicroelectronics/stm32mp157c-dk2/overlay/" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/stmicroelectronics/common/stm32mp157/genimage.cfg" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/stmicroelectronics/stm32mp157c-dk2/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.7.10" @@ -16,15 +16,18 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="stm32mp1" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=sp_min DTB_FILE_NAME=stm32mp157c-dk2.dtb" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="*.stm32" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32mp15_basic" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32mp15_trusted" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/stmicroelectronics/stm32mp157c-dk2/uboot-fragment.config" # BR2_TARGET_UBOOT_FORMAT_BIN is not set -BR2_TARGET_UBOOT_FORMAT_IMG=y -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl.stm32" +BR2_TARGET_UBOOT_FORMAT_STM32=y BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=stm32mp157c-dk2" BR2_PACKAGE_HOST_GENIMAGE=y