Merge pull request #14 from paresh-bhagat12/am62l

cshilwant · web-flow · commit 70b055330e9c · 2025-02-28T14:54:34.000+05:30
diff --git a/Config.in b/Config.in
@@ -0,0 +1 @@
+source "$BR2_EXTERNAL_TI_PATH/package/ti-lvgl-demo/Config.in"
diff --git a/board/ti/am62lx-evm/genimage_ti.cfg b/board/ti/am62lx-evm/genimage_ti.cfg
@@ -3,7 +3,8 @@ image boot.vfat {
 		files = {
 			"tiboot3.bin",
 			"tispl.bin",
-			"u-boot.img"
+			"u-boot.img",
+			"uEnv.txt"
 		}
 	}
 
diff --git a/board/ti/am62lx-evm/post-build-ti.sh b/board/ti/am62lx-evm/post-build-ti.sh
@@ -32,5 +32,7 @@ mkdir -p $TARGET_DIR/lib/firmware/ti-connectivity
 
 cp $BINARIES_DIR/Image $TARGET_DIR/boot
 cp $BINARIES_DIR/$dtb_file $TARGET_DIR/boot/dtb/ti
+cp $BUILD_DIR/linux-*/arch/arm64/boot/dts/ti/k3-am62l3-evm-dsi-rpi-7inch-panel.dtbo $TARGET_DIR/boot/dtb/ti
 mv $BINARIES_DIR/tiboot3-am62lx-hs-fs-evm.bin $BINARIES_DIR/tiboot3.bin
 cp $BUILD_DIR/ti-k3-boot-firmware-*/ti-connectivity/* $TARGET_DIR/lib/firmware/ti-connectivity/
+cp $BR2_EXTERNAL_TI_PATH/board/ti/am62lx-evm/uEnv.txt $BINARIES_DIR/uEnv.txt
diff --git a/board/ti/am62lx-evm/uEnv.txt b/board/ti/am62lx-evm/uEnv.txt
@@ -0,0 +1,11 @@
+# This uEnv.txt file can contain additional environment settings that you
+# want to set in U-Boot at boot time.  This can be simple variables such
+# as the serverip or custom variables.  The format of this file is:
+#    variable=value
+# NOTE: This file will be evaluated after the bootcmd is run and the
+#       bootcmd must be set to load this file if it exists (this is the
+#       default on all newer U-Boot images.  This also means that some
+#       variables such as bootdelay cannot be changed by this file since
+#       it is not evaluated until the bootcmd is run.
+
+optargs=vt.global_cursor_default=0
diff --git a/board/ti/common/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/ti/common/patches/arm-trusted-firmware/arm-trusted-firmware.hash
@@ -2,3 +2,5 @@
 sha256  3a93cafbfd49f1bce19e97c4ad588d3db7b509be991e9c0d42b044baa0c69cbc  arm-trusted-firmware-00f1ec6b8740ccd403e641131e294aabacf2a48b.tar.gz
 sha256  b80e1869836242aba8d129e3194299834ab8037f144e7870939d44a290aa4ebe  arm-trusted-firmware-58b25570c9ef91753b14c2103f45f4be9dddb696.tar.gz
 sha256  78a76e525867547402cfbda177320014da593881922f50c5ac6860a83ccd4bbc  arm-trusted-firmware-5227171c079d0c7d22a6d37b5cec079c8c5bb4b1-git4.tar.gz
+sha256  14a42ca08132afe9cecce9edf0ecf112822fe6660dc097537dfb0af3834809fd  arm-trusted-firmware-c660da3784b824f920c1d2d7f768cb2ed5cf9d4c-git4.tar.gz
+sha256  f981eae9edb6afb7ef9578596f4c6ae45ed65b4427d3ae0fc590aa781473ac1d  arm-trusted-firmware-11.00.05-git4.tar.gz
diff --git a/board/ti/common/patches/linux/linux.hash b/board/ti/common/patches/linux/linux.hash
@@ -17,3 +17,5 @@ sha256  6734162de255d177f3a8856b6bb9303a73e5e614eed36417d87977b5925f40b0  linux-
 sha256  e0e57f997c306dd95623da3c4ac1906a15d29e79f3533a12fffcf88425e3f29e  linux-10.01.10-rt-git4.tar.gz
 sha256  c5f44a81ee8773ea927fd6a80f437ad0d80db0eb706d28da8507d846c26eaa9d  linux-11.00.02-git4.tar.gz
 sha256  e7580450300177b4ceb938988957456cd7a0dd4e383803b52fd41d2e505781af  linux-11.00.03-git4.tar.gz
+sha256  9b5b808e99d51af7550680896c704816390db118a49591f5be5d9ce15dae7f05  linux-11.00.04-git4.tar.gz
+sha256  40b6d9b869163ea56a5a14762acce1e5c1c72ac345d676c5e72d78df61ad02bf  linux-11.00.05-git4.tar.gz
diff --git a/board/ti/common/patches/ti-k3-boot-firmware/ti-k3-boot-firmware.hash b/board/ti/common/patches/ti-k3-boot-firmware/ti-k3-boot-firmware.hash
@@ -10,3 +10,5 @@ sha256  5738d04389efdafcaf0931b9e7311e80e8ae957f90af4f77379eaf1671d258d8  ti-lin
 sha256  ec88231d1ad53dae259d50f330a5f5f25e3a060e53eb40332f61ca8afcf44274  ti-linux-firmware-10.01.10.tar.xz
 sha256  4fc844a2b4fe7cc3ac25dceb61f71a7c7a4aa468c5cbf8c7cd323cba48c16f36  ti-linux-firmware-11.00.02.tar.xz
 sha256  ebd73893309aac5873937e406d5d6874eb66d197f3d48f603dd7becccf94b9da  ti-linux-firmware-11.00.03.tar.xz
+sha256  f765f9cf05bdca5b19dccdf87cb65623fb01241f0fbea8c6c70215a8c5ba3a58  ti-linux-firmware-11.00.04.tar.xz
+sha256  fc56916a637342c1342ff94fb6a3ad01f68385f352b9710093416605feccbe5b  ti-linux-firmware-11.00.05.tar.xz
diff --git a/board/ti/common/patches/uboot/uboot.hash b/board/ti/common/patches/uboot/uboot.hash
@@ -9,3 +9,5 @@ sha256  e44b3a8fddf6154d801ec86eed1ee0b7ccdf25a1f39cb2759dbc53ecfcb5f10f  uboot-
 sha256  35df1583984be44aa0c97c988c598a9c47c1259f4f2f04838c8871f83cc1c2be  uboot-10.01.10-git4.tar.gz
 sha256  bfdf0927bd0353be5c77af1e8b366e70f2b10ee470ad8a802f4d59f2b3f9c411  uboot-11.00.02-git4.tar.gz
 sha256  e7ca318ba589532ba8ebe2bced7fe19267488653dbc80ae7f30c4c53a19d1540  uboot-11.00.03-git4.tar.gz
+sha256  e84a125492b548ab5ea78fe7c298a3bafbccb62cc20299b99a5b954f33296c37  uboot-11.00.04-git4.tar.gz
+sha256  afe6f3c86e3878f07877d27edc22deda28160f546fcb9509c6cd703edfd3d962  uboot-11.00.05-git4.tar.gz
diff --git a/configs/ti_release_am62lx_evm_defconfig b/configs/ti_release_am62lx_evm_defconfig
@@ -1,39 +1,45 @@
 BR2_aarch64=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_11=y
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_TI_PATH)/board/ti/common/patches"
 BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
 BR2_TARGET_GENERIC_HOSTNAME="am62lxx-evm"
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
 BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_TI_PATH)/board/ti/am62lx-evm/rootfs-overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_TI_PATH)/board/ti/am62lx-evm/post-build-ti.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BR2_EXTERNAL_TI_PATH)/board/ti/common/am6xx/genimage_ti.cfg"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BR2_EXTERNAL_TI_PATH)/board/ti/am62lx-evm/genimage_ti.cfg"
 BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS="-d k3-am62l3-evm.dtb"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://git.ti.com/git/ti-linux-kernel/ti-linux-kernel.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="11.00.03"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="11.00.05"
 BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_DL_DIR)/linux/git/kernel/configs/ti_arm64_prune.config"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am62l3-evm"
 BR2_PACKAGE_LINUX_TOOLS_PERF=y
 BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
+BR2_PACKAGE_ALSA_UTILS=y
+BR2_PACKAGE_ALSA_UTILS_AMIXER=y
+BR2_PACKAGE_ALSA_UTILS_APLAY=y
 BR2_PACKAGE_GIT=y
+BR2_PACKAGE_SDL2=y
+BR2_PACKAGE_SDL2_IMAGE=y
 BR2_PACKAGE_WESTON=y
 BR2_PACKAGE_MEMTESTER=y
 BR2_PACKAGE_DROPBEAR=y
+BR2_PACKAGE_MOSQUITTO=y
 BR2_PACKAGE_BASH=y
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_ROOTFS_EXT2_SIZE="256M"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/TexasInstruments/arm-trusted-firmware.git"
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="5227171c079d0c7d22a6d37b5cec079c8c5bb4b1"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="11.00.05"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="am62l"
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="K3_PM_SYSTEM_SUSPEND=1"
 BR2_TARGET_OPTEE_OS=y
 BR2_TARGET_OPTEE_OS_CUSTOM_GIT=y
@@ -47,7 +53,7 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://git.ti.com/git/ti-u-boot/ti-u-boot.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="11.00.03"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="11.00.05"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am62lx_evm"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
@@ -62,3 +68,4 @@ BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="BL1=$(BINARIES_DIR)/bl1.bin TEE=$(BINARIES_DIR
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_MTOOLS=y
+BR2_PACKAGE_TI_LVGL_DEMO=y
diff --git a/configs/ti_release_am62lx_evm_rt_defconfig b/configs/ti_release_am62lx_evm_rt_defconfig
@@ -1,39 +1,45 @@
 BR2_aarch64=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_11=y
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_TI_PATH)/board/ti/common/patches"
 BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
 BR2_TARGET_GENERIC_HOSTNAME="am62lxx-evm"
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
 BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_TI_PATH)/board/ti/am62lx-evm/rootfs-overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_TI_PATH)/board/ti/am62lx-evm/post-build-ti.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BR2_EXTERNAL_TI_PATH)/board/ti/common/am6xx/genimage_ti.cfg"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BR2_EXTERNAL_TI_PATH)/board/ti/am62lx-evm/genimage_ti.cfg"
 BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS="-d k3-am62l3-evm.dtb"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://git.ti.com/git/ti-linux-kernel/ti-linux-kernel.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="11.00.03"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="11.00.05"
 BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_DL_DIR)/linux/git/kernel/configs/ti_arm64_prune.config $(BR2_DL_DIR)/linux/git/kernel/configs/ti_rt.config"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am62l3-evm"
 BR2_PACKAGE_LINUX_TOOLS_PERF=y
 BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
+BR2_PACKAGE_ALSA_UTILS=y
+BR2_PACKAGE_ALSA_UTILS_AMIXER=y
+BR2_PACKAGE_ALSA_UTILS_APLAY=y
 BR2_PACKAGE_GIT=y
+BR2_PACKAGE_SDL2=y
+BR2_PACKAGE_SDL2_IMAGE=y
 BR2_PACKAGE_WESTON=y
 BR2_PACKAGE_MEMTESTER=y
 BR2_PACKAGE_DROPBEAR=y
+BR2_PACKAGE_MOSQUITTO=y
 BR2_PACKAGE_BASH=y
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_ROOTFS_EXT2_SIZE="256M"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/TexasInstruments/arm-trusted-firmware.git"
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="5227171c079d0c7d22a6d37b5cec079c8c5bb4b1"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="11.00.05"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="am62l"
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="K3_PM_SYSTEM_SUSPEND=1"
 BR2_TARGET_OPTEE_OS=y
 BR2_TARGET_OPTEE_OS_CUSTOM_GIT=y
@@ -47,7 +53,7 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://git.ti.com/git/ti-u-boot/ti-u-boot.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="11.00.03"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="11.00.05"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am62lx_evm"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
@@ -62,3 +68,4 @@ BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="BL1=$(BINARIES_DIR)/bl1.bin TEE=$(BINARIES_DIR
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_MTOOLS=y
+BR2_PACKAGE_TI_LVGL_DEMO=y
diff --git a/external.mk b/external.mk
@@ -0,0 +1 @@
+include $(sort $(wildcard $(BR2_EXTERNAL_TI_PATH)/package/*/*.mk))
diff --git a/package/ti-lvgl-demo/Config.in b/package/ti-lvgl-demo/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_TI_LVGL_DEMO
+	bool "ti-lvgl-demo"
+	depends on BR2_PACKAGE_LIBDRM
+	depends on BR2_TOOLCHAIN_BUILDROOT_CXX
+	depends on BR2_PACKAGE_ALSA_UTILS
+	depends on BR2_PACKAGE_ALSA_UTILS_AMIXER
+	depends on BR2_PACKAGE_MOSQUITTO
+	depends on BR2_PACKAGE_SDL2
+	depends on BR2_PACKAGE_SDL2_IMAGE
+	help
+	  LVGL application for TI SoCs.
+
+	  https://github.com/TexasInstruments/ti-lvgl-demo
diff --git a/package/ti-lvgl-demo/ti-lvgl-demo.hash b/package/ti-lvgl-demo/ti-lvgl-demo.hash
@@ -0,0 +1,3 @@
+# Locally calculated sha256sum
+sha256  82add608e94578c15574a0d8eeae7cc831a8f466f4e205ba38e5056d89e8b841  ti-lvgl-demo-db276032668a1c4e81040cf4c3c00fabb79f383c-git4.tar.gz
+sha256  5c0fe9eb9ab69941916a2a6c82a643425408d114cca58d3790affd4ca9d898f2  ti-lvgl-demo-v11.00.05.02-git4.tar.gz
diff --git a/package/ti-lvgl-demo/ti-lvgl-demo.mk b/package/ti-lvgl-demo/ti-lvgl-demo.mk
@@ -0,0 +1,36 @@
+################################################################################
+#
+# ti-lvlg-demo
+#
+################################################################################
+
+TI_LVGL_DEMO_VERSION = v11.00.05.02
+TI_LVGL_DEMO_SITE = https://github.com/texasinstruments/ti-lvgl-demo.git
+TI_LVGL_DEMO_SITE_METHOD = git
+TI_LVGL_DEMO_GIT_SUBMODULES = YES
+TI_LVGL_DEMO_DEPENDENCIES = libdrm mosquitto alsa-utils
+TI_LVGL_DEMO_SUBDIR = lv_port_linux
+TI_LVGL_DEMO_LICENSE = MIT
+TI_LVGL_DEMO_LICENSE_FILES = LICENSE
+
+TI_LVGL_DEMO_CONF_OPTS += \
+	-S=$(@D)/$(TI_LVGL_DEMO_SUBDIR) \
+	-DCMAKE_CXX_FLAGS=-O3 \
+	-DCMAKE_C_FLAGS=-O3 \
+	-DCMAKE_C_FLAGS=-I$(STAGING_DIR)/usr/include/libdrm \
+	-DCMAKE_BUILD_TYPE=Release
+
+define TI_LVGL_DEMO_INSTALL_TARGET_CMDS
+	$(INSTALL) -d $(TARGET_DIR)/usr/bin/
+	$(INSTALL) -m 0755 $(@D)/$(TI_LVGL_DEMO_SUBDIR)/bin/lvglsim $(TARGET_DIR)/usr/bin
+	$(INSTALL) -d $(TARGET_DIR)/usr/lib/
+	cp -r $(@D)/$(TI_LVGL_DEMO_SUBDIR)/lvgl/lib/* $(TARGET_DIR)/usr/lib/
+	$(INSTALL) -d $(TARGET_DIR)/usr/share/ti-lvgl-demo/assets/
+	cp -r $(@D)/$(TI_LVGL_DEMO_SUBDIR)/lvgl/demos/high_res/assets/* $(TARGET_DIR)/usr/share/ti-lvgl-demo/assets/
+	$(INSTALL) -d $(TARGET_DIR)/usr/share/ti-lvgl-demo/slides/
+	cp -r $(@D)/$(TI_LVGL_DEMO_SUBDIR)/lvgl/demos/high_res/slides/* $(TARGET_DIR)/usr/share/ti-lvgl-demo/slides/
+	$(INSTALL) -d $(TARGET_DIR)/usr/share/ti-lvgl-demo/cert/
+	cp -r $(@D)/$(TI_LVGL_DEMO_SUBDIR)/certs/* $(TARGET_DIR)/usr/share/ti-lvgl-demo/cert/
+endef
+
+$(eval $(cmake-package))

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+source "$BR2_EXTERNAL_TI_PATH/package/ti-lvgl-demo/Config.in"`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,8 @@ image boot.vfat {`
`3`	`3`	`files = {`
`4`	`4`	`"tiboot3.bin",`
`5`	`5`	`"tispl.bin",`
`6`		`- "u-boot.img"`
	`6`	`+ "u-boot.img",`
	`7`	`+ "uEnv.txt"`
`7`	`8`	`}`
`8`	`9`	`}`
`9`	`10`