public
/
meta-st-stm32mp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MACHINE: update configuration 

Update board definition:
- add stm32mp157d-dk1 in extlinux
- remove stm32mp135d-dk from machine

Remove space-fixup option for UBIFS generation

Increase the flashlayout partition size for rootfs on emmc and sdcard to
leave large free space on rootfs partition.

Signed-off-by: Romuald JEANNE <romuald.jeanne@st.com>
This commit is contained in:
Lionel VITTE 2022-06-29 08:55:34 +02:00 committed by bernard PUEL
parent 1becb4e422
commit 5826b67079
5 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
conf/machine/include/st-machine-common-stm32mp.inc
View File

@ -314,13 +314,13 @@ MULTIUBI_BUILD += "${@bb.utils.contains('BOOTDEVICE_LABELS', 'spinand-2-128', 's
# UBI Args for NAND by default on MB1262 (Micron MT29F8G16ABACAH4) # UBI Args for NAND by default on MB1262 (Micron MT29F8G16ABACAH4)
# LEB = BLOCK_SIZE - (2 * page size): 256*1024 - (2*4096) # LEB = BLOCK_SIZE - (2 * page size): 256*1024 - (2*4096)
MKUBIFS_ARGS:nand_4_256 = "--min-io-size 4096 --leb-size 253952 --max-leb-cnt 4096 --space-fixup" MKUBIFS_ARGS:nand_4_256 = "--min-io-size 4096 --leb-size 253952 --max-leb-cnt 4096"
UBINIZE_ARGS:nand_4_256 = "--min-io-size 4096 --peb-size 256KiB" UBINIZE_ARGS:nand_4_256 = "--min-io-size 4096 --peb-size 256KiB"
# Set extra size required for UBIFS volume size (KiB) # Set extra size required for UBIFS volume size (KiB)
EXTRA_UBIFS_SIZE:nand_4_256 = "2304" EXTRA_UBIFS_SIZE:nand_4_256 = "2304"
# UBI Args for SPI NAND by default on MB1262 (Micron MT29F2G01ABA) # UBI Args for SPI NAND by default on MB1262 (Micron MT29F2G01ABA)
# LEB = BLOCK_SIZE - (2 * page size): 128*1024 - (2*2048) # LEB = BLOCK_SIZE - (2 * page size): 128*1024 - (2*2048)
MKUBIFS_ARGS:spinand_2_128 = "--min-io-size 2048 --leb-size 126976 --max-leb-cnt 2048 --space-fixup" MKUBIFS_ARGS:spinand_2_128 = "--min-io-size 2048 --leb-size 126976 --max-leb-cnt 2048"
UBINIZE_ARGS:spinand_2_128 = "--min-io-size 2048 --peb-size 128KiB" UBINIZE_ARGS:spinand_2_128 = "--min-io-size 2048 --peb-size 128KiB"
# Set extra size required for UBIFS volume size (KiB) # Set extra size required for UBIFS volume size (KiB)
EXTRA_UBIFS_SIZE:spinand_2_128 = "1408" EXTRA_UBIFS_SIZE:spinand_2_128 = "1408"

4
conf/machine/include/st-machine-extlinux-config-stm32mp.inc
View File

@ -73,11 +73,13 @@ UBOOT_EXTLINUX_TARGETS_EXTRA_CONFIG:target-nand += "${STM32MP_DT_FILES_EV}"
UBOOT_EXTLINUX_TARGETS_EXTRA_CONFIG:target-nor += "${STM32MP_DT_FILES_ED}" UBOOT_EXTLINUX_TARGETS_EXTRA_CONFIG:target-nor += "${STM32MP_DT_FILES_ED}"
UBOOT_EXTLINUX_TARGETS_EXTRA_CONFIG:target-nor += "${STM32MP_DT_FILES_EV}" UBOOT_EXTLINUX_TARGETS_EXTRA_CONFIG:target-nor += "${STM32MP_DT_FILES_EV}"
# Define extra label configuration # Define extra label configuration
UBOOT_EXTLINUX_TARGETS_EXTRA_CONFIG[stm32mp157d-dk1] += "stm32mp157d-dk1-a7-examples"
UBOOT_EXTLINUX_TARGETS_EXTRA_CONFIG[stm32mp157c-dk2] += "stm32mp157c-dk2-a7-examples" UBOOT_EXTLINUX_TARGETS_EXTRA_CONFIG[stm32mp157c-dk2] += "stm32mp157c-dk2-a7-examples"
UBOOT_EXTLINUX_TARGETS_EXTRA_CONFIG[stm32mp157f-dk2] += "stm32mp157f-dk2-a7-examples" UBOOT_EXTLINUX_TARGETS_EXTRA_CONFIG[stm32mp157f-dk2] += "stm32mp157f-dk2-a7-examples"
UBOOT_EXTLINUX_TARGETS_EXTRA_CONFIG[stm32mp157c-ev1] += "stm32mp157c-ev1-a7-examples" UBOOT_EXTLINUX_TARGETS_EXTRA_CONFIG[stm32mp157c-ev1] += "stm32mp157c-ev1-a7-examples"
UBOOT_EXTLINUX_TARGETS_EXTRA_CONFIG[stm32mp157f-ev1] += "stm32mp157f-ev1-a7-examples" UBOOT_EXTLINUX_TARGETS_EXTRA_CONFIG[stm32mp157f-ev1] += "stm32mp157f-ev1-a7-examples"
UBOOT_EXTLINUX_TARGETS_EXTRA_CONFIG[stm32mp157d-dk1] += "stm32mp157d-dk1-m4-examples"
UBOOT_EXTLINUX_TARGETS_EXTRA_CONFIG[stm32mp157c-dk2] += "stm32mp157c-dk2-m4-examples" UBOOT_EXTLINUX_TARGETS_EXTRA_CONFIG[stm32mp157c-dk2] += "stm32mp157c-dk2-m4-examples"
UBOOT_EXTLINUX_TARGETS_EXTRA_CONFIG[stm32mp157c-ev1] += "stm32mp157c-ev1-m4-examples" UBOOT_EXTLINUX_TARGETS_EXTRA_CONFIG[stm32mp157c-ev1] += "stm32mp157c-ev1-m4-examples"
UBOOT_EXTLINUX_TARGETS_EXTRA_CONFIG[stm32mp157f-dk2] += "stm32mp157f-dk2-m4-examples" UBOOT_EXTLINUX_TARGETS_EXTRA_CONFIG[stm32mp157f-dk2] += "stm32mp157f-dk2-m4-examples"
@ -89,6 +91,7 @@ UBOOT_EXTLINUX_TARGETS_EXTRA_CONFIG[stm32mp135f-dk] += "stm32mp135f-dk-a7-exampl
# Configure A7 examples labels # Configure A7 examples labels
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# Define FDT overrides for new A7 labels # Define FDT overrides for new A7 labels
UBOOT_EXTLINUX_FDT:stm32mp157d-dk1-a7-examples = "/stm32mp157d-dk1-a7-examples.dtb"
UBOOT_EXTLINUX_FDT:stm32mp157c-dk2-a7-examples = "/stm32mp157c-dk2-a7-examples.dtb" UBOOT_EXTLINUX_FDT:stm32mp157c-dk2-a7-examples = "/stm32mp157c-dk2-a7-examples.dtb"
UBOOT_EXTLINUX_FDT:stm32mp157c-ev1-a7-examples = "/stm32mp157c-ev1-a7-examples.dtb" UBOOT_EXTLINUX_FDT:stm32mp157c-ev1-a7-examples = "/stm32mp157c-ev1-a7-examples.dtb"
UBOOT_EXTLINUX_FDT:stm32mp157f-dk2-a7-examples = "/stm32mp157f-dk2-a7-examples.dtb" UBOOT_EXTLINUX_FDT:stm32mp157f-dk2-a7-examples = "/stm32mp157f-dk2-a7-examples.dtb"
@ -100,6 +103,7 @@ UBOOT_EXTLINUX_FDT:stm32mp135f-dk-a7-examples = "/stm32mp135f-dk-a7-examples.dtb
# Configure M4 examples labels # Configure M4 examples labels
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# Define FDT overrides for new M4 labels # Define FDT overrides for new M4 labels
UBOOT_EXTLINUX_FDT:stm32mp157d-dk1-m4-examples = "/stm32mp157d-dk1-m4-examples.dtb"
UBOOT_EXTLINUX_FDT:stm32mp157c-dk2-m4-examples = "/stm32mp157c-dk2-m4-examples.dtb" UBOOT_EXTLINUX_FDT:stm32mp157c-dk2-m4-examples = "/stm32mp157c-dk2-m4-examples.dtb"
UBOOT_EXTLINUX_FDT:stm32mp157c-ev1-m4-examples = "/stm32mp157c-ev1-m4-examples.dtb" UBOOT_EXTLINUX_FDT:stm32mp157c-ev1-m4-examples = "/stm32mp157c-ev1-m4-examples.dtb"
UBOOT_EXTLINUX_FDT:stm32mp157f-dk2-m4-examples = "/stm32mp157f-dk2-m4-examples.dtb" UBOOT_EXTLINUX_FDT:stm32mp157f-dk2-m4-examples = "/stm32mp157f-dk2-m4-examples.dtb"

6
conf/machine/include/st-machine-flashlayout-stm32mp.inc
View File

@ -255,10 +255,10 @@ FLASHLAYOUT_PARTITION_OFFSET:emmc:${STM32MP_FSBL2_NAME} = "${DEVICE_START_OFFSET
FLASHLAYOUT_PARTITION_SIZE:empty = "0" FLASHLAYOUT_PARTITION_SIZE:empty = "0"
# Override default partition size for rootfs to increase available free space # Override default partition size for rootfs to increase available free space
# 3GiB for emmc # 3GiB for emmc
#FLASHLAYOUT_PARTITION_SIZE:emmc:${STM32MP_ROOTFS_LABEL} = "3145728" FLASHLAYOUT_PARTITION_SIZE:emmc:${STM32MP_ROOTFS_LABEL} = "3145728"
# 4GiB for sdcard # 4GiB for sdcard
#FLASHLAYOUT_PARTITION_SIZE:nor-sdcard:${STM32MP_ROOTFS_LABEL} = "4194304" FLASHLAYOUT_PARTITION_SIZE:nor-sdcard:${STM32MP_ROOTFS_LABEL} = "4194304"
#FLASHLAYOUT_PARTITION_SIZE:sdcard:${STM32MP_ROOTFS_LABEL} = "4194304" FLASHLAYOUT_PARTITION_SIZE:sdcard:${STM32MP_ROOTFS_LABEL} = "4194304"
# Set binaries to use for each partition # Set binaries to use for each partition
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------

5
conf/machine/stm32mp1.conf
View File

@ -41,7 +41,7 @@ STM32MP_DT_FILES_DK += "stm32mp157c-dk2 stm32mp157f-dk2"
STM32MP_DT_FILES_ED += "stm32mp157c-ed1 stm32mp157f-ed1" STM32MP_DT_FILES_ED += "stm32mp157c-ed1 stm32mp157f-ed1"
STM32MP_DT_FILES_EV += "stm32mp157a-ev1 stm32mp157c-ev1 stm32mp157d-ev1 stm32mp157f-ev1" STM32MP_DT_FILES_EV += "stm32mp157a-ev1 stm32mp157c-ev1 stm32mp157d-ev1 stm32mp157f-ev1"
STM32MP_DT_FILES_DK += "stm32mp135d-dk stm32mp135f-dk" STM32MP_DT_FILES_DK += "stm32mp135f-dk"
# ========================================================================= # =========================================================================
# Machine features # Machine features
@ -66,18 +66,19 @@ WIFI_LIST += "linux-firmware-bcm43430"
KERNEL_MODULE_AUTOLOAD = "goodix" KERNEL_MODULE_AUTOLOAD = "goodix"
# Define the devicetree for Linux A7 examples # Define the devicetree for Linux A7 examples
LINUX_A7_EXAMPLES_DT += "stm32mp157d-dk1-a7-examples"
LINUX_A7_EXAMPLES_DT += "stm32mp157c-dk2-a7-examples" LINUX_A7_EXAMPLES_DT += "stm32mp157c-dk2-a7-examples"
LINUX_A7_EXAMPLES_DT += "stm32mp157c-ev1-a7-examples" LINUX_A7_EXAMPLES_DT += "stm32mp157c-ev1-a7-examples"
LINUX_A7_EXAMPLES_DT += "stm32mp157f-dk2-a7-examples" LINUX_A7_EXAMPLES_DT += "stm32mp157f-dk2-a7-examples"
LINUX_A7_EXAMPLES_DT += "stm32mp157f-ev1-a7-examples" LINUX_A7_EXAMPLES_DT += "stm32mp157f-ev1-a7-examples"
LINUX_A7_EXAMPLES_DT += "stm32mp135f-dk-a7-examples" LINUX_A7_EXAMPLES_DT += "stm32mp135f-dk-a7-examples"
LINUX_A7_EXAMPLES_DT += "stm32mp135d-dk-a7-examples"
# ========================================================================= # =========================================================================
# M4 copro # M4 copro
# ========================================================================= # =========================================================================
# Define the devicetree for M4 example # Define the devicetree for M4 example
CUBE_M4_EXAMPLES_DT += "stm32mp157d-dk1-m4-examples"
CUBE_M4_EXAMPLES_DT += "stm32mp157c-dk2-m4-examples" CUBE_M4_EXAMPLES_DT += "stm32mp157c-dk2-m4-examples"
CUBE_M4_EXAMPLES_DT += "stm32mp157c-ev1-m4-examples" CUBE_M4_EXAMPLES_DT += "stm32mp157c-ev1-m4-examples"
CUBE_M4_EXAMPLES_DT += "stm32mp157f-dk2-m4-examples" CUBE_M4_EXAMPLES_DT += "stm32mp157f-dk2-m4-examples"

3
conf/machine/stm32mp13-disco.conf
View File

@ -33,7 +33,6 @@ BOOTDEVICE_LABELS += "sdcard"
# Machine settings # Machine settings
# ========================================================================= # =========================================================================
# Define list of devicetree per board # Define list of devicetree per board
STM32MP_DT_FILES_DK += "stm32mp135d-dk"
STM32MP_DT_FILES_DK += "stm32mp135f-dk" STM32MP_DT_FILES_DK += "stm32mp135f-dk"
# ========================================================================= # =========================================================================
@ -57,8 +56,6 @@ WIFI_LIST += "linux-firmware-bcm43430"
# Define the devicetree for Linux A7 examples # Define the devicetree for Linux A7 examples
LINUX_A7_EXAMPLES_DT += "stm32mp135f-dk-a7-examples" LINUX_A7_EXAMPLES_DT += "stm32mp135f-dk-a7-examples"
LINUX_A7_EXAMPLES_DT += "stm32mp135d-dk-a7-examples"
# ========================================================================= # =========================================================================
# WIC for sdcard raw image # WIC for sdcard raw image