vincent/meta-pengwyn
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

correction de la conf machine

Browse Source
This commit is contained in:
BENOIT Vincent
2023-04-25 06:01:17 +00:00
parent e9fff8b7f3
commit 93fa1a26cf
7 changed files with 54 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
conf/machine/pengwyn.conf
View File

@@ -1,27 +1,18 @@
#@TYPE: Machine
#@NAME: AM335x Pengwyn
#@DESCRIPTION: Machine configuration for the Silica Pengwyn Board
#@DESCRIPTION: Machine configuration for the Silica Pengwyn Board
require conf/machine/include/ti33x.inc
IMAGE_CLASSES += "sdcard_image-pengwyn"
#IMAGE_FSTYPES ?= "tar.bz2 ext4 wic wic.bmap"
IMAGE_FSTYPES = "tar.bz2 ext4"
#MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image kernel-devicetree"
MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image kernel-modules"
#MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image"
# A list of machine-dependent packages not essential for booting the image.
# Thus, the build does not fail if the packages do not exist.
# However, the packages are required for a fully-featured image
#MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
# Normally AM335 boards use ttyS0, but ICE uses ttyS3, so try both
SERIAL_CONSOLES = "115200;ttyS0 115200;ttyO0 115200;ttyAMA0"
SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
EXTRA_IMAGEDEPENDS += "virtual/bootloader virtual/dtb"
#EXTRA_IMAGEDEPENDS += "virtual/bootloader virtual/dtb"
##########################################################
#
@@ -30,7 +21,6 @@ EXTRA_IMAGEDEPENDS += "virtual/bootloader virtual/dtb"
##########################################################
PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"
#PREFERRED_VERSION_u-boot ?= "u-boot-ti-staging_2020.07%"
PREFERRED_VERSION_u-boot ?= "u-boot-ti-staging_2023.01%"
# The file type for the Secondary Program Loader (SPL)
@@ -38,8 +28,6 @@ SPL_BINARY = "spl/u-boot-spl.bin"
SPL_SUFFIX = "bin"
UBOOT_SUFFIX = "img"
UBOOT_MACHINE = "pengwyn_defconfig"
#UBOOT_ENTRYPOINT = "0x80008000"
#UBOOT_LOADADDRESS = "0x80008000"
UBOOT_ENTRYPOINT = "0x80800000"
UBOOT_LOADADDRESS = "0x80800000"
UBOOT_DTB_LOADADDRESS = "0x80F80000"
@@ -66,11 +54,11 @@ UBOOT_FITIMAGE_ENABLE = "1"
# U-Boot fitImage Hash Algo
UBOOT_FIT_HASH_ALG = "sha256"
# U-Boot fitImage Signature Algo
UBOOT_FIT_SIGN_ALG = "rsa4096"
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 = "4096"
UBOOT_FIT_SIGN_NUMBITS = "2048"
##########################################################
#
@@ -96,22 +84,9 @@ FIT_SIGN_NUMBITS = "4096"
PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
PREFERRED_VERSION_linux-ti-staging ?= "5.4%"
#KERNEL_IMAGETYPE = "zImage"
#KERNEL_IMAGETYPE = "uImage"
KERNEL_CLASSES ?= " kernel-fitimage "
KERNEL_IMAGETYPE = "fitImage"
# Not necessary => see devicetree recipe
#KERNEL_DEVICETREE = "am335x-pengwyn.dtb"
# Remove dtb from ti33x.inc
#KERNEL_DEVICETREE:remove = " \
# am335x-evm.dtb \
# am335x-evmsk.dtb \
# am335x-icev2.dtb \
# am335x-pocketbeagle.dtb am335x-bone.dtb am335x-boneblue.dtb \
# am335x-bonegreen.dtb am335x-bonegreen-wireless.dtb \
# am335x-boneblack.dtb am335x-boneblack-wireless.dtb \
# am335x-sancloud-bbe.dtb \
#"
KERNEL_DEVICETREE = ""
KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
##########################################################
@@ -125,7 +100,6 @@ PREFERRED_VERSION_dtb ?= "1.0%"
MACHINE_FEATURES = "usbgadget usbhost vfat"
#IMAGE_BOOT_FILES = "MLO u-boot.${UBOOT_SUFFIX} uEnv.txt uImage devicetree/am335x-pengwyn.dtb"
IMAGE_BOOT_FILES = "MLO u-boot.${UBOOT_SUFFIX} uEnv.txt fitImage devicetree/am335x-pengwyn.dtb"
RM_WORK_EXCLUDE += "u-boot-ti-staging linux-ti-staging"

3
recipes-bsp/u-boot/files2/0002-add-target-pengwyn.patch
View File

@@ -9,7 +9,7 @@
endif
--- a/arch/arm/mach-omap2/am33xx/Kconfig
+++ b/arch/arm/mach-omap2/am33xx/Kconfig
@@ -105,6 +105,29 @@ config TARGET_AM335X_SL50
@@ -105,6 +105,30 @@ config TARGET_AM335X_SL50
select DM_SERIAL
imply CMD_DM
@@ -20,6 +20,7 @@
+ select DM_GPIO
+ select DM_SERIAL
+ imply CMD_DM
+ imply CMD_MMC
+ imply SPL_DM
+ imply SPL_DM_SEQ_ALIAS
+ imply SPL_ENV_SUPPORT

4
recipes-bsp/u-boot/files2/am335x_pengwyn.h
View File

@@ -24,12 +24,12 @@
"fdtaddr=0x80F80000\0" \
"bootpart=0:2\0" \
"bootdir=/boot\0" \
"bootfile=zImage\0" \
"bootfile=fitImage\0" \
"fdtfile=am335x-pengwyn.dtb\0" \
"console=ttyO0,115200n8\0" \
"optargs=\0" \
"mmcdev=0\0" \
"mmcroot=/dev/mmcblk0p2 ro\0" \
"mmcroot=/dev/mmcblk0p2 rw\0" \
"mmcrootfstype=ext4 rootwait\0" \
"rootpath=/export/rootfs\0" \
"nfsopts=nolock\0" \

2
recipes-bsp/u-boot/files2/pengwyn_defconfig
View File

@@ -17,7 +17,7 @@ CONFIG_TIMESTAMP=y
CONFIG_SPL_LOAD_FIT=y
# CONFIG_USE_SPL_FIT_GENERATOR is not set
CONFIG_OF_BOARD_SETUP=y
#CONFIG_BOOTCOMMAND="run findfdt; run init_console; run finduuid; run distro_bootcmd"
CONFIG_BOOTCOMMAND="run mmcboot;"
CONFIG_LOGLEVEL=3
CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_ARCH_MISC_INIT=y

6
recipes-bsp/u-boot/files2/uEnv.txt
View File

@@ -8,7 +8,7 @@ bootdelay=2
bootdir=/boot
bootenv=uEnv.txt
bootfile=fitImage
bootpart=0:2
bootpart=0:1
console=ttyS0,115200n8
cpu=armv7
ethact=cpsw
@@ -16,7 +16,7 @@ ethaddr=00:18:30:fc:c0:35
fdtaddr=0x80F80000
fdtfile=am335x-pengwyn.dtb
importbootenv=echo Importing environment from mmc ...; env import -t $loadaddr $filesize
loadaddr=0x80600000
loadaddr=0x80200000
loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}
loadfdt=fatload mmc ${mmcdev} ${fdtaddr} ${fdtfile}
loadimage=fatload mmc ${mmcdev} ${loadaddr} ${bootfile}
@@ -24,7 +24,7 @@ mmcargs=setenv bootargs console=${console} ${optargs} root=${mmcroot} rootfstype
mmcboot=mmc dev ${mmcdev}; if mmc rescan; then echo SD/MMC found on device ${mmcdev};if run loadbootenv; then echo Loaded environment from ${bootenv};run importbootenv;fi;if test -n $uenvcmd; then echo Running uenvcmd ...;run uenvcmd;fi;if run loadimage; then run loadfdt;run mmcloados;fi;fi;
mmcdev=0
mmcloados=run mmcargs; bootm ${loadaddr} - ${fdtaddr};
mmcroot=/dev/mmcblk0p2 rw
mmcroot=/dev/mmcblk0p2 ro
mmcrootfstype=ext4 rootwait
mtddevname=SPL
mtddevnum=0

3
recipes-kernel/dts/devicetree_1.0.bb
View File

@@ -4,11 +4,10 @@ SUMMARY = "Device Tree for Silica Pengwyn Board"
LICENSE = "CLOSED"
FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
inherit devicetree
SRC_URI += " \
file://am335x-pengwyn.dts \
"
COMPATIBLE_MACHINE = "pengwyn"
COMPATIBLE_MACHINE = ".*(ti33x|pengwyn).*"

80
recipes-kernel/linux/linux-ti-staging_5.4.bb
View File

@@ -13,46 +13,46 @@ require recipes-kernel/linux/bundle-devicetree_${PACKREV}.inc
# Look in the generic major.minor directory for files
FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-5.4:"
# Pull in the devicetree files into the rootfs
RDEPENDS:${KERNEL_PACKAGE_NAME}-base += "kernel-devicetree"
# Add run-time dependency for PM firmware to the rootfs
RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:ti33x = " amx3-cm3"
RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:ti43x = " amx3-cm3"
# Add run-time dependency for VPE VPDMA firmware to the rootfs
RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:dra7xx = " vpdma-fw"
# Add run-time dependency for Goodix firmware to the rootfs
RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:dra7xx = " goodix-fw"
# Install boot-monitor skern file into /boot dir of rootfs
RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:keystone = " boot-monitor"
# Install ti-sci-fw into /boot dir of rootfs
RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:k2g = " ti-sci-fw"
# Add run-time dependency for SerDes firmware to the rootfs
RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:keystone = " serdes-fw"
# Add run-time dependency for QMSS PDSP firmware to the rootfs
RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:keystone = " qmss-pdsp-fw"
# Add run-time dependency for NETCP PA firmware to the rootfs
RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:k2hk = " netcp-pa-fw"
RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:k2e = " netcp-pa-fw"
RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:k2l = " netcp-pa-fw"
# Add run-time dependency for PRU Ethernet firmware to the rootfs
RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am57xx-evm = " prueth-fw"
RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am57xx-hs-evm = " prueth-fw"
RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:ti43x = " prueth-fw"
RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:ti33x = " prueth-fw"
RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:k2g = " prueth-fw"
RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am65xx = " prueth-fw-am65x"
# Add run-time dependency for Cadence MHDP firmware to the rootfs
RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j7-evm = " cadence-mhdp-fw"
## Pull in the devicetree files into the rootfs
#RDEPENDS:${KERNEL_PACKAGE_NAME}-base += "kernel-devicetree"
#
## Add run-time dependency for PM firmware to the rootfs
#RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:ti33x = " amx3-cm3"
#RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:ti43x = " amx3-cm3"
#
## Add run-time dependency for VPE VPDMA firmware to the rootfs
#RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:dra7xx = " vpdma-fw"
#
## Add run-time dependency for Goodix firmware to the rootfs
#RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:dra7xx = " goodix-fw"
#
## Install boot-monitor skern file into /boot dir of rootfs
#RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:keystone = " boot-monitor"
#
## Install ti-sci-fw into /boot dir of rootfs
#RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:k2g = " ti-sci-fw"
#
## Add run-time dependency for SerDes firmware to the rootfs
#RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:keystone = " serdes-fw"
#
## Add run-time dependency for QMSS PDSP firmware to the rootfs
#RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:keystone = " qmss-pdsp-fw"
#
## Add run-time dependency for NETCP PA firmware to the rootfs
#RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:k2hk = " netcp-pa-fw"
#RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:k2e = " netcp-pa-fw"
#RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:k2l = " netcp-pa-fw"
#
## Add run-time dependency for PRU Ethernet firmware to the rootfs
#RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am57xx-evm = " prueth-fw"
#RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am57xx-hs-evm = " prueth-fw"
#RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:ti43x = " prueth-fw"
#RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:ti33x = " prueth-fw"
#RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:k2g = " prueth-fw"
#RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am65xx = " prueth-fw-am65x"
#
## Add run-time dependency for Cadence MHDP firmware to the rootfs
#RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j7-evm = " cadence-mhdp-fw"
KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"