diff options
15 files changed, 140 insertions, 26 deletions
diff --git a/recipes-bsp/u-boot/u-boot-distro-boot.bb b/recipes-bsp/u-boot/u-boot-distro-boot.bb index 4aa80fa..5f696df 100644 --- a/recipes-bsp/u-boot/u-boot-distro-boot.bb +++ b/recipes-bsp/u-boot/u-boot-distro-boot.bb @@ -9,6 +9,8 @@ SRC_URI = " \ file://boot.cmd.in \ " +APPEND ?= "" + KERNEL_BOOTCMD ??= "bootz" KERNEL_BOOTCMD:aarch64 ?= "booti" @@ -17,7 +19,7 @@ DTB_PREFIX ??= "${@d.getVar('KERNEL_DTB_PREFIX').replace("/", "_") if d.getVar(' inherit deploy do_deploy() { - sed -e 's/@@KERNEL_BOOTCMD@@/${KERNEL_BOOTCMD}/;s/@@KERNEL_IMAGETYPE@@/${KERNEL_IMAGETYPE}/;s/@@KERNEL_DTB_PREFIX@@/${DTB_PREFIX}/' \ + sed -e 's/@@KERNEL_BOOTCMD@@/${KERNEL_BOOTCMD}/;s/@@KERNEL_IMAGETYPE@@/${KERNEL_IMAGETYPE}/;s/@@KERNEL_DTB_PREFIX@@/${DTB_PREFIX}/;s/@@APPEND@@/${APPEND}/' \ "${WORKDIR}/boot.cmd.in" > boot.cmd mkimage -T script -C none -n "Distro boot script" -d boot.cmd boot.scr diff --git a/recipes-bsp/u-boot/u-boot-distro-boot/boot.cmd.in b/recipes-bsp/u-boot/u-boot-distro-boot/boot.cmd.in index 6969a55..9760ccc 100644 --- a/recipes-bsp/u-boot/u-boot-distro-boot/boot.cmd.in +++ b/recipes-bsp/u-boot/u-boot-distro-boot/boot.cmd.in @@ -67,11 +67,8 @@ if test "${root_devtype}" = ""; then fi fi -if test -n ${setup}; then - run setup -else - env set setupargs console=tty1 console=${console},${baudrate} consoleblank=0 -fi +env set appendargs @@APPEND@@ +env set setupargs console=tty1 console=${console},${baudrate} if test ${kernel_image} = "fitImage"; then env set kernel_addr_load ${ramdisk_addr_r} @@ -121,7 +118,7 @@ else fi fi -env set bootcmd_args 'run rootfsargs_set && env set bootargs ${defargs} ${rootfsargs} ${setupargs} ${vidargs} ${tdxargs}' +env set bootcmd_args 'run rootfsargs_set && env set bootargs ${rootfsargs} ${setupargs} ${appendargs} ${tdxargs}' if test ${skip_fdt_overlays} != 1; then env set bootcmd_overlays 'run load_overlays_file && run fdt_resize && run apply_overlays' else diff --git a/recipes-core/set-hostname/files/sethostname b/recipes-core/set-hostname/files/sethostname index 87e6320..aacb7ab 100644 --- a/recipes-core/set-hostname/files/sethostname +++ b/recipes-core/set-hostname/files/sethostname @@ -13,7 +13,7 @@ fi hostname=@@MACHINE@@"-"${serial} if [ -f /usr/bin/hostnamectl ]; then - /usr/bin/hostnamectl set-hostname ${hostname} + /usr/bin/hostnamectl set-hostname @@HOSTNAMECTL_OPT@@ ${hostname} else hostname ${hostname} fi diff --git a/recipes-core/set-hostname/set-hostname_1.0.bb b/recipes-core/set-hostname/set-hostname_1.1.bb index b39abdb..e9c3878 100644 --- a/recipes-core/set-hostname/set-hostname_1.0.bb +++ b/recipes-core/set-hostname/set-hostname_1.1.bb @@ -23,6 +23,8 @@ do_install () { install -d ${D}${bindir} install -m 0755 ${WORKDIR}/sethostname ${D}${bindir} sed -i "s/@@MACHINE@@/${MACHINE}/g" ${D}${bindir}/sethostname + sed -i "s/@@HOSTNAMECTL_OPT@@/${@bb.utils.contains('IMAGE_FEATURES','read-only-rootfs','--transient','',d)}/g" \ + ${D}${bindir}/sethostname if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d ${D}${systemd_system_unitdir} install -m 0644 ${WORKDIR}/set-hostname.service ${D}${systemd_system_unitdir} diff --git a/recipes-core/udev/files/10-toradex-wifi-ifnames.link b/recipes-core/udev/files/10-toradex-wifi-ifnames.link index 35d5d20..b00071a 100644 --- a/recipes-core/udev/files/10-toradex-wifi-ifnames.link +++ b/recipes-core/udev/files/10-toradex-wifi-ifnames.link @@ -1,5 +1,5 @@ [Match] -Driver=mwifiex_pcie +Driver=mwifiex_pcie mwifiex_sdio [Link] NamePolicy=keep kernel diff --git a/recipes-kernel/linux/linux-toradex-upstream-6.6/aarch64/defconfig b/recipes-kernel/linux/linux-toradex-upstream-6.6/aarch64/defconfig index 6fc8118..abccec4 100644 --- a/recipes-kernel/linux/linux-toradex-upstream-6.6/aarch64/defconfig +++ b/recipes-kernel/linux/linux-toradex-upstream-6.6/aarch64/defconfig @@ -31,6 +31,7 @@ CONFIG_SCHED_AUTOGROUP=y CONFIG_BLK_DEV_INITRD=y CONFIG_KALLSYMS_ALL=y CONFIG_PROFILING=y +CONFIG_KEXEC=y CONFIG_KEXEC_FILE=y CONFIG_CRASH_DUMP=y CONFIG_ARCH_K3=y @@ -372,12 +373,12 @@ CONFIG_SERIO_AMBAKMI=y CONFIG_LEGACY_PTY_COUNT=16 CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_NR_UARTS=6 +CONFIG_SERIAL_8250_RUNTIME_UARTS=6 CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_SHARE_IRQ=y CONFIG_SERIAL_8250_DW=y CONFIG_SERIAL_8250_OMAP=y -CONFIG_SERIAL_8250_NR_UARTS=6 -CONFIG_SERIAL_8250_RUNTIME_UARTS=6 CONFIG_SERIAL_OF_PLATFORM=y CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y @@ -457,6 +458,7 @@ CONFIG_GPIO_MAX77620=y CONFIG_POWER_RESET_BRCMSTB=y CONFIG_POWER_RESET_XGENE=y CONFIG_POWER_RESET_SYSCON=y +CONFIG_POWER_RESET_SYSCON_POWEROFF=y CONFIG_SYSCON_REBOOT_MODE=y CONFIG_NVMEM_REBOOT_MODE=m CONFIG_BATTERY_QCOM_BATTMGR=m @@ -940,7 +942,6 @@ CONFIG_INTERCONNECT_IMX8MQ=m CONFIG_INTERCONNECT_IMX8MP=y CONFIG_COUNTER=m CONFIG_HTE=y -CONFIG_EXFAT_FS=m CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y CONFIG_EXT4_FS_POSIX_ACL=y @@ -953,6 +954,7 @@ CONFIG_AUTOFS_FS=y CONFIG_FUSE_FS=m CONFIG_CUSE=m CONFIG_VFAT_FS=y +CONFIG_EXFAT_FS=m CONFIG_NTFS_FS=m CONFIG_NTFS_RW=y CONFIG_TMPFS_POSIX_ACL=y diff --git a/recipes-kernel/linux/linux-toradex-upstream-6.6/defconfig b/recipes-kernel/linux/linux-toradex-upstream-6.6/defconfig index 0bbb726..d2b8d0b 100644 --- a/recipes-kernel/linux/linux-toradex-upstream-6.6/defconfig +++ b/recipes-kernel/linux/linux-toradex-upstream-6.6/defconfig @@ -17,7 +17,6 @@ CONFIG_USER_NS=y CONFIG_RELAY=y CONFIG_BLK_DEV_INITRD=y CONFIG_EXPERT=y -CONFIG_KALLSYMS_ALL=y CONFIG_PERF_EVENTS=y CONFIG_ARCH_MULTI_V6=y CONFIG_ARCH_MXC=y @@ -77,7 +76,7 @@ CONFIG_RFKILL_INPUT=y CONFIG_PCI=y CONFIG_PCI_MSI=y # CONFIG_VGA_ARB is not set -CONFIG_PCI_IMX6=y +CONFIG_PCI_IMX6_HOST=y CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y # CONFIG_STANDALONE is not set @@ -123,9 +122,9 @@ CONFIG_NETDEVICES=y # CONFIG_NET_VENDOR_MICREL is not set # CONFIG_NET_VENDOR_MICROCHIP is not set # CONFIG_NET_VENDOR_NATSEMI is not set +# CONFIG_NET_VENDOR_QUALCOMM is not set # CONFIG_NET_VENDOR_SEEQ is not set CONFIG_SMC91X=y -CONFIG_SMC911X=y CONFIG_SMSC911X=y # CONFIG_NET_VENDOR_STMICRO is not set CONFIG_MICREL_PHY=y @@ -226,7 +225,6 @@ CONFIG_VIDEO_TC358743=m # CONFIG_CXD2880_SPI_DRV is not set CONFIG_IMX_IPUV3_CORE=y CONFIG_DRM=y -CONFIG_DRM_DEBUG_MODESET_LOCK=y CONFIG_DRM_PANEL_LVDS=y CONFIG_DRM_PANEL_SIMPLE=y CONFIG_DRM_PANEL_EDP=y @@ -243,11 +241,9 @@ CONFIG_DRM_ETNAVIV=y CONFIG_DRM_MXSFB=y CONFIG_FB=y CONFIG_FB_MODE_HELPERS=y -# CONFIG_FB_MX3 is not set CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_PWM=y CONFIG_BACKLIGHT_GPIO=y -CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_LOGO=y CONFIG_SOUND=y CONFIG_SND=y @@ -320,7 +316,6 @@ CONFIG_LEDS_TRIGGER_TIMER=y CONFIG_LEDS_TRIGGER_ONESHOT=y CONFIG_LEDS_TRIGGER_HEARTBEAT=y CONFIG_LEDS_TRIGGER_BACKLIGHT=y -CONFIG_LEDS_TRIGGER_GPIO=y CONFIG_LEDS_TRIGGER_DEFAULT_ON=y CONFIG_RTC_CLASS=y CONFIG_RTC_INTF_DEV_UIE_EMUL=y @@ -333,7 +328,6 @@ CONFIG_IMX_SDMA=m CONFIG_MXS_DMA=y CONFIG_DMATEST=m CONFIG_STAGING=y -CONFIG_R8188EU=m CONFIG_STAGING_MEDIA=y CONFIG_VIDEO_IMX_MEDIA=y CONFIG_COMMON_CLK_PWM=y @@ -357,7 +351,6 @@ CONFIG_NVMEM_SNVS_LPGPR=y CONFIG_TEE=y CONFIG_OPTEE=y CONFIG_MUX_MMIO=y -CONFIG_EXFAT_FS=m CONFIG_EXT2_FS=m CONFIG_EXT2_FS_XATTR=y CONFIG_EXT2_FS_POSIX_ACL=y @@ -368,8 +361,7 @@ CONFIG_EXT3_FS_SECURITY=y CONFIG_EXT4_FS=y CONFIG_QUOTA=y CONFIG_QUOTA_NETLINK_INTERFACE=y -# CONFIG_PRINT_QUOTA_WARNING is not set -CONFIG_AUTOFS4_FS=y +CONFIG_AUTOFS_FS=y CONFIG_FUSE_FS=m CONFIG_ISO9660_FS=m CONFIG_JOLIET=y @@ -377,6 +369,7 @@ CONFIG_ZISOFS=y CONFIG_UDF_FS=m CONFIG_MSDOS_FS=m CONFIG_VFAT_FS=y +CONFIG_EXFAT_FS=m CONFIG_NTFS3_FS=m CONFIG_TMPFS_POSIX_ACL=y CONFIG_JFFS2_FS=m @@ -401,6 +394,7 @@ CONFIG_CRYPTO_DEV_SAHARA=y CONFIG_CRYPTO_DEV_MXS_DCP=y CONFIG_CRC_CCITT=y CONFIG_CRC_T10DIF=y +CONFIG_CRC_ITU_T=y CONFIG_CRC7=m CONFIG_LIBCRC32C=m CONFIG_CMA_SIZE_MBYTES=256 diff --git a/recipes-kernel/linux/linux-toradex-upstream-6.6/toradex_imx_v6_v7.config b/recipes-kernel/linux/linux-toradex-upstream-6.6/toradex_imx_v6_v7.config index c63dc9d..7ba0d3d 100644 --- a/recipes-kernel/linux/linux-toradex-upstream-6.6/toradex_imx_v6_v7.config +++ b/recipes-kernel/linux/linux-toradex-upstream-6.6/toradex_imx_v6_v7.config @@ -134,6 +134,7 @@ CONFIG_FB_MX3=n CONFIG_RTC_DRV_MXC_V2=n CONFIG_PWM_IMX_TPM=n CONFIG_FSL_EDMA=n +CONFIG_GPIO_VF610=n # Disable not needed functionality CONFIG_KEXEC=n @@ -156,6 +157,7 @@ CONFIG_SERIO=n CONFIG_PTP_1588_CLOCK_KVM=n CONFIG_TOUCHSCREEN_ADS7846=n +CONFIG_TOUCHSCREEN_CYTTSP5=n CONFIG_TOUCHSCREEN_DA9052=n CONFIG_TOUCHSCREEN_EGALAX=n CONFIG_TOUCHSCREEN_GOODIX=n @@ -167,6 +169,7 @@ CONFIG_TOUCHSCREEN_MC13783=n CONFIG_TOUCHSCREEN_TSC2004=n CONFIG_TOUCHSCREEN_TSC2007=n CONFIG_TOUCHSCREEN_SX8654=n +CONFIG_SENSORS_SY7636A=n CONFIG_TOUCHSCREEN_COLIBRI_VF50=n CONFIG_I2C_MUX=n @@ -175,6 +178,7 @@ CONFIG_I2C_HELPER_AUTO=n CONFIG_I2C_ALGOPCF=n CONFIG_I2C_ALGOPCA=n +CONFIG_GPIO_BD71815=n CONFIG_GPIO_SIOX=n CONFIG_GPIO_MAX732X=n CONFIG_GPIO_PCA953X=n @@ -182,24 +186,32 @@ CONFIG_GPIO_PCF857X=n CONFIG_GPIO_STMPE=n CONFIG_GPIO_74X164=n +CONFIG_W1=n + CONFIG_RN5T618_POWER=n CONFIG_SENSORS_MC13783_ADC=n +CONFIG_SENSORS_PWM_FAN=n +CONFIG_IIO_ST_ACCEL_3AXIS=n CONFIG_DA9063_WATCHDOG=n CONFIG_DA9062_WATCHDOG=n +CONFIG_MFD_ROHM_BD71828=n CONFIG_MFD_DA9052_I2C=n CONFIG_MFD_DA9062=n CONFIG_MFD_DA9063=n CONFIG_MFD_MC13XXX_SPI=n CONFIG_MFD_MC13XXX_I2C=n +CONFIG_MFD_SY7636A=n +CONFIG_REGULATOR_BD71815=n CONFIG_REGULATOR_DA9052=n CONFIG_REGULATOR_DA9062=n CONFIG_REGULATOR_DA9063=n CONFIG_REGULATOR_LTC3676=n CONFIG_REGULATOR_MC13783=n CONFIG_REGULATOR_MC13892=n +CONFIG_REGULATOR_SY7636A=n CONFIG_DVB_NET=n @@ -211,6 +223,8 @@ CONFIG_VIDEO_TC358743=m CONFIG_CXD2880_SPI_DRV=n +CONFIG_DRM_I2C_NXP_TDA998X=n + # This compiles all media-related drivers as modules and disables TV stuff CONFIG_MEDIA_SUPPORT=y CONFIG_VIDEO_IMX_MEDIA=y @@ -239,6 +253,7 @@ CONFIG_SND_SOC_ES8328_SPI=n CONFIG_HID_WACOM=n CONFIG_I2C_HID_OF=n +CONFIG_RTC_DRV_BD70528=n CONFIG_RTC_DRV_ISL1208=n CONFIG_RTC_DRV_PCF8523=n CONFIG_RTC_DRV_PCF8563=n @@ -248,6 +263,8 @@ CONFIG_RTC_DRV_RV3029C2=n CONFIG_RTC_DRV_DA9063=n CONFIG_RTC_DRV_MC13XXX=n +CONFIG_COMMON_CLK_BD718XX=n + CONFIG_MMA8452=n CONFIG_RN5T618_ADC=n CONFIG_SENSORS_ISL29018=n @@ -263,6 +280,7 @@ CONFIG_WLCORE=n CONFIG_CS89x0_PLATFORM=n +CONFIG_NET_VENDOR_QUALCOMM=n CONFIG_AT803X_PHY=n CONFIG_USB_RTL8152=m CONFIG_USB_LAN78XX=m diff --git a/recipes-kernel/linux/linux-toradex-upstream-rt_6.6.bb b/recipes-kernel/linux/linux-toradex-upstream-rt_6.6.bb index 58f5a0e..7380678 100644 --- a/recipes-kernel/linux/linux-toradex-upstream-rt_6.6.bb +++ b/recipes-kernel/linux/linux-toradex-upstream-rt_6.6.bb @@ -1,8 +1,6 @@ LINUX_VERSION ?= "6.6.20-rt25" require recipes-kernel/linux/linux-toradex-upstream_6.6.bb -FILESEXTRAPATHS:prepend := "${THISDIR}/linux-toradex-upstream-6.6:" - SUMMARY = "Toradex mainline real-time Linux kernel" # To build the RT kernel we use the RT kernel git repo rather than applying # the RT patch on top of a vanilla kernel. diff --git a/recipes-kernel/linux/linux-toradex-upstream_6.6.bb b/recipes-kernel/linux/linux-toradex-upstream_6.6.bb index 1704c14..01b985a 100644 --- a/recipes-kernel/linux/linux-toradex-upstream_6.6.bb +++ b/recipes-kernel/linux/linux-toradex-upstream_6.6.bb @@ -1,6 +1,6 @@ require linux-toradex-upstream.inc -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-${PV}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/linux-toradex-upstream-6.6:" LINUX_REPO = "git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git" diff --git a/recipes-multimedia/alsa/alsa-ucm-conf-tdx/verdin-nau8822-HiFi.conf b/recipes-multimedia/alsa/alsa-ucm-conf-tdx/verdin-nau8822-HiFi.conf new file mode 100644 index 0000000..42aeffd --- /dev/null +++ b/recipes-multimedia/alsa/alsa-ucm-conf-tdx/verdin-nau8822-HiFi.conf @@ -0,0 +1,17 @@ +# Use case configuration for Toradex Verdin Development Carrier Board + +SectionDevice."Headphones" { + Comment "Headphones" + + BootSequence [ + cset "name='Headphone Volume' 50%" + ] + + EnableSequence [ + cset "name='Headphone Switch' on" + ] + + DisableSequence [ + cset "name='Headphone Switch' off" + ] +} diff --git a/recipes-multimedia/alsa/alsa-ucm-conf-tdx/verdin-nau8822.conf b/recipes-multimedia/alsa/alsa-ucm-conf-tdx/verdin-nau8822.conf new file mode 100644 index 0000000..fc3466b --- /dev/null +++ b/recipes-multimedia/alsa/alsa-ucm-conf-tdx/verdin-nau8822.conf @@ -0,0 +1,8 @@ +# Use case configuration for Toradex Verdin Development Carrier Board + +Syntax 4 + +SectionUseCase."HiFi" { + File "/Toradex/nau8822/verdin-nau8822-HiFi.conf" + Comment "Default" +} diff --git a/recipes-multimedia/alsa/alsa-ucm-conf-tdx/verdin-wm8904-HiFi.conf b/recipes-multimedia/alsa/alsa-ucm-conf-tdx/verdin-wm8904-HiFi.conf new file mode 100644 index 0000000..f4486cb --- /dev/null +++ b/recipes-multimedia/alsa/alsa-ucm-conf-tdx/verdin-wm8904-HiFi.conf @@ -0,0 +1,35 @@ +# Use case configuration for Toradex Dahlia Carrier Board + +SectionDevice."Headphone" { + Comment "Headphone" + + BootSequence [ + cset "name='Headphone Volume' 50%" + ] + + EnableSequence [ + cset "name='Headphone Switch' on" + ] + + DisableSequence [ + cset "name='Headphone Switch' off" + ] +} + +SectionDevice."Microphone" { + Comment "Microphone" + + BootSequence [ + cset "name='Left Capture Inverting Mux' 'IN1L'" + cset "name='Right Capture Inverting Mux' 'IN1R'" + cset "name='Capture Volume' 31" + ] + + EnableSequence [ + cset "name='Capture Switch' on" + ] + + DisableSequence [ + cset "name='Capture Switch' off" + ] +} diff --git a/recipes-multimedia/alsa/alsa-ucm-conf-tdx/verdin-wm8904.conf b/recipes-multimedia/alsa/alsa-ucm-conf-tdx/verdin-wm8904.conf new file mode 100644 index 0000000..64b68ce --- /dev/null +++ b/recipes-multimedia/alsa/alsa-ucm-conf-tdx/verdin-wm8904.conf @@ -0,0 +1,8 @@ +# Use case configuration for Toradex Dahlia Carrier Board + +Syntax 4 + +SectionUseCase."HiFi" { + File "/Toradex/wm8904/verdin-wm8904-HiFi.conf" + Comment "Default" +} diff --git a/recipes-multimedia/alsa/alsa-ucm-conf-tdx_1.0.bb b/recipes-multimedia/alsa/alsa-ucm-conf-tdx_1.0.bb new file mode 100644 index 0000000..06b19c5 --- /dev/null +++ b/recipes-multimedia/alsa/alsa-ucm-conf-tdx_1.0.bb @@ -0,0 +1,33 @@ +SUMMARY = "ALSA Use Case Manager configuration for Toradex Hardware" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9" + +RDEPENDS:${PN} = "alsa-ucm-conf" + +SRC_URI = "\ + file://verdin-nau8822-HiFi.conf \ + file://verdin-nau8822.conf \ + file://verdin-wm8904-HiFi.conf \ + file://verdin-wm8904.conf \ +" + +do_install () { + wm8904_dir="${D}${datadir}/alsa/ucm2/Toradex/wm8904" + nau8822_dir="${D}${datadir}/alsa/ucm2/Toradex/nau8822" + + install -d $wm8904_dir + install -m 0644 ${WORKDIR}/verdin-wm8904-HiFi.conf $wm8904_dir + install -m 0644 ${WORKDIR}/verdin-wm8904.conf $wm8904_dir + + install -d $nau8822_dir + install -m 0644 ${WORKDIR}/verdin-nau8822-HiFi.conf $nau8822_dir + install -m 0644 ${WORKDIR}/verdin-nau8822.conf $nau8822_dir + + install -d "${D}${datadir}/alsa/ucm2/conf.d/simple-card" + ln -fsr ${wm8904_dir}/verdin-wm8904.conf \ + "${D}${datadir}/alsa/ucm2/conf.d/simple-card" + ln -fsr ${nau8822_dir}/verdin-nau8822.conf \ + "${D}${datadir}/alsa/ucm2/conf.d/simple-card" +} + +FILES:${PN} = "${datadir}" |