suppression des variables de conf de la machine pour les mettre dans la configuration de la distribution

This commit is contained in:
2023-05-09 15:43:41 +00:00
parent efa5e71add
commit 2bcf07b5b6

View File

@@ -4,8 +4,6 @@
require conf/machine/include/ti33x.inc
IMAGE_CLASSES += "sdcard_image-pengwyn"
IMAGE_FSTYPES = "tar.bz2 ext4 wic"
WKS_FILE ?= "pengwyn-yocto.wks.in"
@@ -13,8 +11,6 @@ WKS_FILE ?= "pengwyn-yocto.wks.in"
SERIAL_CONSOLES = "115200;ttyS0 115200;ttyO0 115200;ttyAMA0"
SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
#EXTRA_IMAGEDEPENDS += "virtual/bootloader virtual/dtb"
##########################################################
#
# Bootloader
@@ -25,25 +21,25 @@ PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"
PREFERRED_VERSION_u-boot ?= "u-boot-ti-staging_2023.01%"
# The file type for the Secondary Program Loader (SPL)
SPL_BINARY = "spl/u-boot-spl.bin"
SPL_SUFFIX = "bin"
UBOOT_SUFFIX = "img"
#SPL_BINARY = "spl/u-boot-spl.bin"
#SPL_SUFFIX = "bin"
SPL_BINARY ?= "MLO"
UBOOT_SUFFIX ?= "img"
UBOOT_MACHINE = "pengwyn_defconfig"
UBOOT_ENTRYPOINT = "0x81000000"
UBOOT_LOADADDRESS = "0x81000000"
#UBOOT_DTB_LOADADDRESS = "0x80F80000"
UBOOT_DTB_LOADADDRESS = "0x81e00000"
# Localtion of the directory containing the RSA key and certificate used for signing image
UBOOT_SIGN_KEYDIR = "${PWD}/scle_keys"
# keys name in keydir (eg. "dev.crt", "dev.key")
UBOOT_SIGN_KEYNAME = "scle_kernel"
UBOOT_SIGN_ENABLE = "1"
# Localtion of the directory containing the RSA key and certificate used for signing bootloader
SPL_SIGN_KEYDIR = "${PWD}/scle_keys"
SPL_SIGN_KEYNAME = "scle_uboot"
SPL_SIGN_ENABLE = "1"
## Localtion of the directory containing the RSA key and certificate used for signing image
#UBOOT_SIGN_KEYDIR = "${PWD}/scle_keys"
## keys name in keydir (eg. "dev.crt", "dev.key")
#UBOOT_SIGN_KEYNAME = "scle_kernel"
#UBOOT_SIGN_ENABLE = "1"
#
## Localtion of the directory containing the RSA key and certificate used for signing bootloader
#SPL_SIGN_KEYDIR = "${PWD}/scle_keys"
#SPL_SIGN_KEYNAME = "scle_uboot"
#SPL_SIGN_ENABLE = "1"
##########################################################
#
@@ -51,16 +47,16 @@ SPL_SIGN_ENABLE = "1"
#
##########################################################
# Enable use of a U-Boot fitImage
UBOOT_FITIMAGE_ENABLE = "1"
# U-Boot fitImage Hash Algo
UBOOT_FIT_HASH_ALG = "sha256"
# U-Boot fitImage Signature Algo
UBOOT_FIT_SIGN_ALG = "rsa2048"
# Generate keys for signing U-Boot fitImage
UBOOT_FIT_GENERATE_KEYS = "1"
# Size of private keys in number of bits
UBOOT_FIT_SIGN_NUMBITS = "2048"
## Enable use of a U-Boot fitImage
#UBOOT_FITIMAGE_ENABLE = "1"
## U-Boot fitImage Hash Algo
#UBOOT_FIT_HASH_ALG = "sha256"
## U-Boot fitImage Signature Algo
#UBOOT_FIT_SIGN_ALG = "rsa2048"
## Generate keys for signing U-Boot fitImage
#UBOOT_FIT_GENERATE_KEYS = "1"
## Size of private keys in number of bits
#UBOOT_FIT_SIGN_NUMBITS = "2048"
##########################################################
#
@@ -68,15 +64,15 @@ UBOOT_FIT_SIGN_NUMBITS = "2048"
#
##########################################################
# Decides whether to generate the keys for signing fitImage if they dont already exist
FIT_GENERATE_KEYS = "1"
# Specifies the hash algorithm used in creating the FIT Image
FIT_HASH_ALG = "sha256"
# Specifies the signature algorithm used in creating the FIT Image
FIT_SIGN_ALG = "rsa4096"
# Size of private key in number of bits used in fitImage
FIT_SIGN_NUMBITS = "4096"
FIT_SIGN_INDIVIDUAL = "1"
## Decides whether to generate the keys for signing fitImage if they dont already exist
#FIT_GENERATE_KEYS = "1"
## Specifies the hash algorithm used in creating the FIT Image
#FIT_HASH_ALG = "sha256"
## Specifies the signature algorithm used in creating the FIT Image
#FIT_SIGN_ALG = "rsa4096"
## Size of private key in number of bits used in fitImage
#FIT_SIGN_NUMBITS = "4096"
#FIT_SIGN_INDIVIDUAL = "1"
##########################################################
#
@@ -87,11 +83,11 @@ FIT_SIGN_INDIVIDUAL = "1"
PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
PREFERRED_VERSION_linux-ti-staging ?= "5.4%"
KERNEL_CLASSES ?= " kernel-fitimage "
KERNEL_IMAGETYPE = "fitImage"
#KERNEL_CLASSES ?= " kernel-fitimage "
#KERNEL_IMAGETYPE = "fitImage"
KERNEL_IMAGETYPE ?= "uImage"
KERNEL_DEVICETREE = ""
KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
#KERNEL_EXTRA_ARGS += "LOADADDR=0x80A00000"
##########################################################
#
@@ -104,11 +100,19 @@ PREFERRED_VERSION_dtb ?= "1.0%"
MACHINE_FEATURES = "usbgadget usbhost vfat"
#IMAGE_BOOT_FILES = " \
# MLO \
# u-boot.${UBOOT_SUFFIX} \
# uEnv.txt \
# fitImage \
# devicetree/am335x-pengwyn.dtb \
# "
IMAGE_BOOT_FILES = " \
MLO \
u-boot.${UBOOT_SUFFIX} \
uEnv.txt \
fitImage \
uImage \
devicetree/am335x-pengwyn.dtb \
"