diff --git a/linux-11.01.05.03/Rules.make b/linux-11.01.05.03/Rules.make index ffeb39124..22b3bbc77 100644 --- a/linux-11.01.05.03/Rules.make +++ b/linux-11.01.05.03/Rules.make @@ -1,4 +1,6 @@ +RT_FRAGMENT?=ti_early_display.config + ### COMMON CONFIG ### CFLAGS?= @@ -15,7 +17,7 @@ DESTDIR?=/media/$(USER)/rootfs # Root of the boot partition to install boot binaries BOOTFS?=/media/$(USER)/boot -MAKE_JOBS?=1 +MAKE_JOBS?=6 ### TI SDK CONFIG ### #Points to the root of the TI SDK diff --git a/linux-11.01.05.03/board-support/core-secdev-k3/fitImage.its b/linux-11.01.05.03/board-support/core-secdev-k3/fitImage.its new file mode 100644 index 000000000..69084b255 --- /dev/null +++ b/linux-11.01.05.03/board-support/core-secdev-k3/fitImage.its @@ -0,0 +1,40 @@ +/dts-v1/; + +/ { + description = "Kernel fitImage"; + #address-cells = <1>; + + images { + kernel-sec { + description = "Linux kernel"; + data = /incbin/("Image.sec"); + type = "kernel"; + arch = "arm64"; + os = "linux"; + compression = "none"; + load = <0x82000000>; + entry = <0x82000000>; + }; + + fdt-sec { + description = "Flattened Device Tree blob"; + data = /incbin/("falcon.dtb.sec"); + type = "flat_dt"; + arch = "arm64"; + compression = "none"; + load = <0x88000000>; + entry = <0x88000000>; + }; + }; + + configurations { + default = "conf-falcon"; + conf-falcon { + description = "Pre-signed Linux kernel, FDT blob"; + bootargs = "console=ttyS2,115200n8 earlycon=ns16550a,mmio32,0x2800000 quiet"; + kernel = "kernel-sec"; + fdt = "fdt-sec"; + }; + }; +}; + diff --git a/linux-11.01.05.03/board-support/core-secdev-k3/make_falcon.sh b/linux-11.01.05.03/board-support/core-secdev-k3/make_falcon.sh new file mode 100755 index 000000000..1fa405ea3 --- /dev/null +++ b/linux-11.01.05.03/board-support/core-secdev-k3/make_falcon.sh @@ -0,0 +1,11 @@ + +export DTS_FOLDER=${PSDKLA}/board-support/ti-linux-kernel-6.12.35+git-ti/arch/arm64/boot/dts/ti +export DTB=${DTS_FOLDER}/k3-am62p5-sk-overlay.dtb +export IMAGE=${PSDKLA}/board-support/ti-linux-kernel-6.12.35+git-ti/arch/arm64/boot/Image + +cp $IMAGE Image +cp $DTB falcon.dtb +./scripts/secure-binary-image.sh Image Image.sec +./scripts/secure-binary-image.sh falcon.dtb falcon.dtb.sec +mkimage -f fitImage.its fitImage + diff --git a/linux-11.01.05.03/board-support/prebuilt-images/am62pxx-evm/u-boot-spl.bin-am62pxx-evm b/linux-11.01.05.03/board-support/prebuilt-images/am62pxx-evm/u-boot-spl.bin-am62pxx-evm.backup similarity index 100% rename from linux-11.01.05.03/board-support/prebuilt-images/am62pxx-evm/u-boot-spl.bin-am62pxx-evm rename to linux-11.01.05.03/board-support/prebuilt-images/am62pxx-evm/u-boot-spl.bin-am62pxx-evm.backup diff --git a/linux-11.01.05.03/board-support/ti-linux-kernel-6.12.35+git-ti/arch/arm64/boot/dts/ti/Makefile b/linux-11.01.05.03/board-support/ti-linux-kernel-6.12.35+git-ti/arch/arm64/boot/dts/ti/Makefile index e8029e510..1902fcba4 100644 --- a/linux-11.01.05.03/board-support/ti-linux-kernel-6.12.35+git-ti/arch/arm64/boot/dts/ti/Makefile +++ b/linux-11.01.05.03/board-support/ti-linux-kernel-6.12.35+git-ti/arch/arm64/boot/dts/ti/Makefile @@ -79,6 +79,7 @@ dtb-$(CONFIG_ARCH_K3) += k3-am62p5-sk-microtips-mf101hie-panel.dtbo dtb-$(CONFIG_ARCH_K3) += k3-am62p5-sk-microtips-mf103hie-lcd2.dtbo dtb-$(CONFIG_ARCH_K3) += k3-am62p5-sk-microtips-mf070zima-lcd3.dtbo dtb-$(CONFIG_ARCH_K3) += k3-am62p5-sk-rpi-hdr-ehrpwm.dtbo +dtb-$(CONFIG_ARCH_K3) += k3-am62p5-sk-tfa-overlay.dtbo # Common overlays for SK-AM62* family of boards dtb-$(CONFIG_ARCH_K3) += k3-am62x-sk-csi2-ov5640.dtbo diff --git a/linux-11.01.05.03/board-support/ti-linux-kernel-6.12.35+git-ti/arch/arm64/boot/dts/ti/k3-am62p5-sk-tfa-overlay.dtso b/linux-11.01.05.03/board-support/ti-linux-kernel-6.12.35+git-ti/arch/arm64/boot/dts/ti/k3-am62p5-sk-tfa-overlay.dtso new file mode 100644 index 000000000..cb63437ac --- /dev/null +++ b/linux-11.01.05.03/board-support/ti-linux-kernel-6.12.35+git-ti/arch/arm64/boot/dts/ti/k3-am62p5-sk-tfa-overlay.dtso @@ -0,0 +1,25 @@ +/* + Modified by Jeff + + Used to load the ATF at 0x80000000 for Falcon mode +*/ + +/dts-v1/; +/plugin/; + +/ { + #address-cells = <0x02>; + #size-cells = <0x02>; + fragment@0 { + #address-cells = <0x02>; + #size-cells = <0x02>; + ranges; + target-path = "/reserved-memory/tfa@9e780000"; + __overlay__ { + #address-cells = <0x02>; + #size-cells = <0x02>; + ranges; + reg = <0x00 0x80000000 0x00 0x80000>; + }; + }; +}; diff --git a/linux-11.01.05.03/board-support/ti-linux-kernel-6.12.35+git-ti/arch/arm64/boot/dts/ti/k3-am62p5-sk.dts b/linux-11.01.05.03/board-support/ti-linux-kernel-6.12.35+git-ti/arch/arm64/boot/dts/ti/k3-am62p5-sk.dts index 64ebd9686..8972b5302 100644 --- a/linux-11.01.05.03/board-support/ti-linux-kernel-6.12.35+git-ti/arch/arm64/boot/dts/ti/k3-am62p5-sk.dts +++ b/linux-11.01.05.03/board-support/ti-linux-kernel-6.12.35+git-ti/arch/arm64/boot/dts/ti/k3-am62p5-sk.dts @@ -29,7 +29,7 @@ chosen { #address-cells = <2>; #size-cells = <2>; ranges; - bootargs = "console=ttyS2,115200n8 earlycon=ns16550a,mmio32,0x2800000 root=/dev/mmcblk1p2 rw rootfstype=ext4 rootwait loglevel=4"; + bootargs = "console=ttyS2,115200n8 root=/dev/mmcblk1p2 quiet loglevle=0"; stdout-path = &main_uart0; @@ -590,6 +590,8 @@ &fss { }; &mailbox0_cluster0 { + status = "okay"; + mbox_r5_0: mbox-r5-0 { ti,mbox-rx = <0 0 0>; ti,mbox-tx = <1 0 0>; @@ -597,6 +599,8 @@ mbox_r5_0: mbox-r5-0 { }; &mailbox0_cluster1 { + status = "okay"; + mbox_mcu_r5_0: mbox-mcu-r5-0 { ti,mbox-rx = <0 0 0>; ti,mbox-tx = <1 0 0>; @@ -614,7 +618,9 @@ &wkup_r5fss0_core0 { }; &mcu_r5fss0 { + //Jeff marked due to fast boot status = "okay"; + //status = "disabled"; }; &mcu_r5fss0_core0 { diff --git a/linux-11.01.05.03/board-support/ti-linux-kernel-6.12.35+git-ti/arch/arm64/configs/defconfig b/linux-11.01.05.03/board-support/ti-linux-kernel-6.12.35+git-ti/arch/arm64/configs/defconfig index 36082d40f..9e57eaeab 100644 --- a/linux-11.01.05.03/board-support/ti-linux-kernel-6.12.35+git-ti/arch/arm64/configs/defconfig +++ b/linux-11.01.05.03/board-support/ti-linux-kernel-6.12.35+git-ti/arch/arm64/configs/defconfig @@ -1839,3 +1839,16 @@ CONFIG_CORESIGHT_STM=m CONFIG_CORESIGHT_CPU_DEBUG=m CONFIG_CORESIGHT_CTI=m CONFIG_MEMTEST=y +CONFIG_INITRAMFS_SOURCE="/home/user/projects/am62p_v11.1/linux-11.01.05.03/filesystem/am62pxx-evm/tte-initramfs.cpio" + +CONFIG_CMDLINE="console=ttyS2,115200n8 quiet" + diff --git a/linux-11.01.05.03/board-support/ti-linux-kernel-6.12.35+git-ti/drivers/media/i2c/ov0x01g.c b/linux-11.01.05.03/board-support/ti-linux-kernel-6.12.35+git-ti/drivers/media/i2c/ov0x01g.c index c81e92328..0decb9a88 100644 --- a/linux-11.01.05.03/board-support/ti-linux-kernel-6.12.35+git-ti/drivers/media/i2c/ov0x01g.c +++ b/linux-11.01.05.03/board-support/ti-linux-kernel-6.12.35+git-ti/drivers/media/i2c/ov0x01g.c @@ -23,6 +23,7 @@ #include "ov0x01g.h" #define printf printk +#define dev_info(...) static inline struct OV0X01G *to_OV0X01G(struct v4l2_subdev *sd) { @@ -901,10 +902,11 @@ static int OV0X01G_probe(struct i2c_client *client) //if (ret < 0) // return ret; ret = OV0X01G_detect(OV0X01G); - if (ret < 0) - return ret; - dev_err(OV0X01G->dev, + if (ret < 0) { + dev_err(OV0X01G->dev, "%s: OV0X01G_detect pass %d\n", __func__, ret); + return ret; + } /* Initialize the subdev and its controls. */ //msleep(120); OV0X01G_reset(OV0X01G); diff --git a/linux-11.01.05.03/board-support/ti-linux-kernel-6.12.35+git-ti/drivers/remoteproc/ti_k3_r5_remoteproc.c b/linux-11.01.05.03/board-support/ti-linux-kernel-6.12.35+git-ti/drivers/remoteproc/ti_k3_r5_remoteproc.c index 0ea868d29..8e1f8bf7a 100644 --- a/linux-11.01.05.03/board-support/ti-linux-kernel-6.12.35+git-ti/drivers/remoteproc/ti_k3_r5_remoteproc.c +++ b/linux-11.01.05.03/board-support/ti-linux-kernel-6.12.35+git-ti/drivers/remoteproc/ti_k3_r5_remoteproc.c @@ -261,6 +261,10 @@ static void k3_r5_rproc_mbox_callback(struct mbox_client *client, void *data) const char *name = kproc->rproc->name; u32 msg = omap_mbox_message(data); + /* Do not forward message from a detached core */ + if (kproc->rproc->state == RPROC_DETACHED) + return; + dev_dbg(dev, "mbox msg: 0x%x\n", msg); switch (msg) { @@ -315,6 +319,10 @@ static void k3_r5_rproc_kick(struct rproc *rproc, int vqid) mbox_msg_t msg = (mbox_msg_t)vqid; int ret; + /* Do not forward message from a detached core */ + if (kproc->rproc->state == RPROC_DETACHED) + return; + /* send the index of the triggered virtqueue in the mailbox payload */ ret = mbox_send_message(kproc->mbox, (void *)msg); if (ret < 0) diff --git a/linux-11.01.05.03/board-support/ti-linux-kernel-6.12.35+git-ti/kernel/configs/ti_early_display.config b/linux-11.01.05.03/board-support/ti-linux-kernel-6.12.35+git-ti/kernel/configs/ti_early_display.config index 06aee4454..3cf363727 100644 --- a/linux-11.01.05.03/board-support/ti-linux-kernel-6.12.35+git-ti/kernel/configs/ti_early_display.config +++ b/linux-11.01.05.03/board-support/ti-linux-kernel-6.12.35+git-ti/kernel/configs/ti_early_display.config @@ -42,7 +42,7 @@ CONFIG_PTP_1588_CLOCK=m # Remove MMC support # # This reduces kernel image size by 137.2KB and reduces boot time by 32ms -CONFIG_MMC=m +#CONFIG_MMC=m ### Additional reduction ### @@ -124,7 +124,7 @@ CONFIG_HWMON=m CONFIG_HWSPINLOCK=n CONFIG_I2C_ALGOBIT=m CONFIG_IIO=m -CONFIG_INTERCONNECT=n +#CONFIG_INTERCONNECT=n CONFIG_MD=n CONFIG_MEMORY=n CONFIG_NEW_LEDS=n @@ -157,7 +157,7 @@ CONFIG_RESET_SIMPLE=n CONFIG_RPMSG_KDRV=m CONFIG_RPMSG_KDRV_ETH_SWITCH=m CONFIG_RPMSG_VIRTIO=m -CONFIG_SCSI=m +#CONFIG_SCSI=m CONFIG_SERIO_AMBAKMI=m CONFIG_SERIO_LIBPS2=m CONFIG_TUN=m @@ -214,7 +214,7 @@ CONFIG_DRM=y CONFIG_DRM_TIDSS=y CONFIG_FB_SIMPLE=y CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_DRM_PANEL_LVDS=y +CONFIG_DRM_PANEL_LVDS=n CONFIG_DRM_PANEL_SIMPLE=y CONFIG_FRAMEBUFFER_CONSOLE=n CONFIG_LOGO=n diff --git a/linux-11.01.05.03/board-support/ti-u-boot-2025.01+git/board/ti/am62px/am62px.env b/linux-11.01.05.03/board-support/ti-u-boot-2025.01+git/board/ti/am62px/am62px.env index 68c9225f0..034867ed1 100644 --- a/linux-11.01.05.03/board-support/ti-u-boot-2025.01+git/board/ti/am62px/am62px.env +++ b/linux-11.01.05.03/board-support/ti-u-boot-2025.01+git/board/ti/am62px/am62px.env @@ -10,7 +10,7 @@ rproc_fw_binaries= 0 /lib/firmware/am62p-mcu-r5f0_0-fw name_kern=Image console=ttyS2,115200n8 -args_all=setenv optargs ${optargs} earlycon=ns16550a,mmio32,0x02800000 loglevel=4 +args_all=setenv optargs ${optargs} earlycon=ns16550a,mmio32,0x02800000 quiet ${mtdparts} run_kern=booti ${loadaddr} ${rd_spec} ${fdtaddr} diff --git a/linux-11.01.05.03/board-support/ti-u-boot-2025.01+git/configs/am62px_evm_a53_defconfig b/linux-11.01.05.03/board-support/ti-u-boot-2025.01+git/configs/am62px_evm_a53_defconfig index 72cc626d2..d564da487 100644 --- a/linux-11.01.05.03/board-support/ti-u-boot-2025.01+git/configs/am62px_evm_a53_defconfig +++ b/linux-11.01.05.03/board-support/ti-u-boot-2025.01+git/configs/am62px_evm_a53_defconfig @@ -168,6 +168,7 @@ CONFIG_SPL_USB_STORAGE=y CONFIG_FS_FAT_MAX_CLUSTSIZE=16384 CONFIG_EFI_SET_TIME=y CONFIG_SPL_GZIP=y +CONFIG_BOOTDELAY=0 #include #include diff --git a/linux-11.01.05.03/makerules/Makefile_linux b/linux-11.01.05.03/makerules/Makefile_linux index 5cd1f7f6a..30ad1bc86 100644 --- a/linux-11.01.05.03/makerules/Makefile_linux +++ b/linux-11.01.05.03/makerules/Makefile_linux @@ -1,5 +1,5 @@ # Kernel build targets -linux: linux-dtbs u-boot +linux: linux-dtbs @echo ================================= @echo Building the Linux Kernel @echo ================================= @@ -14,17 +14,17 @@ linux: linux-dtbs u-boot mkimage -r -f $(LINUXKERNEL_INSTALL_DIR)/fitImage-its-$(YOCTO_MACHINE) -k $(UBOOT_SRC_DIR)/arch/arm/mach-k3/keys -K $(TI_SDK_PATH)/board-support/u-boot-build/$(MKIMAGE_DTB_FILE) $(TI_SDK_PATH)/board-support/built-images/fitImage # Rebuild uboot a53 (binman) for FitImage -ifeq ($(SOC), am62l) - $(MAKE) -j $(MAKE_JOBS) -C $(UBOOT_SRC_DIR) ARCH=arm CROSS_COMPILE=$(CROSS_COMPILE) CC="$(CC)" \ - BINMAN_INDIRS=$(TI_LINUX_FIRMWARE) BL1=$(UBOOT_AP_TRUSTED_ROM) BL31=$(UBOOT_ATF) TEE=$(UBOOT_TEE) \ - O=$(TI_SDK_PATH)/board-support/u-boot-build/a53 -else - $(MAKE) -j $(MAKE_JOBS) -C $(UBOOT_SRC_DIR) ARCH=arm CROSS_COMPILE=$(CROSS_COMPILE) CC="$(CC)" \ - BINMAN_INDIRS=$(TI_LINUX_FIRMWARE) BL31=$(UBOOT_ATF) TEE=$(UBOOT_TEE) TI_DM=$(TI_DM) \ - O=$(TI_SDK_PATH)/board-support/u-boot-build/a53 -endif +#ifeq ($(SOC), am62l) +# $(MAKE) -j $(MAKE_JOBS) -C $(UBOOT_SRC_DIR) ARCH=arm CROSS_COMPILE=$(CROSS_COMPILE) CC="$(CC)" \ +# BINMAN_INDIRS=$(TI_LINUX_FIRMWARE) BL1=$(UBOOT_AP_TRUSTED_ROM) BL31=$(UBOOT_ATF) TEE=$(UBOOT_TEE) \ +# O=$(TI_SDK_PATH)/board-support/u-boot-build/a53 +#else +# $(MAKE) -j $(MAKE_JOBS) -C $(UBOOT_SRC_DIR) ARCH=arm CROSS_COMPILE=$(CROSS_COMPILE) CC="$(CC)" \ +# BINMAN_INDIRS=$(TI_LINUX_FIRMWARE) BL31=$(UBOOT_ATF) TEE=$(UBOOT_TEE) TI_DM=$(TI_DM) \ +# O=$(TI_SDK_PATH)/board-support/u-boot-build/a53 +#endif -linux_stage: linux-dtbs_stage u-boot_stage +linux_stage: linux-dtbs_stage cp $(LINUXKERNEL_INSTALL_DIR)/arch/arm64/boot/Image $(TI_SDK_PATH)/board-support/built-images linux_install: linux_stage linux-dtbs_install @@ -37,7 +37,7 @@ linux_install: linux_stage linux-dtbs_install exit 1; \ fi install -d $(DESTDIR)/boot - install $(TI_SDK_PATH)/board-support/built-images/fitImage $(DESTDIR)/boot + #install $(TI_SDK_PATH)/board-support/built-images/fitImage $(DESTDIR)/boot install $(TI_SDK_PATH)/board-support/built-images/Image $(DESTDIR)/boot install $(LINUXKERNEL_INSTALL_DIR)/vmlinux $(DESTDIR)/boot install $(LINUXKERNEL_INSTALL_DIR)/System.map $(DESTDIR)/boot diff --git a/linux-11.01.05.03/makerules/Makefile_ti-img-rogue-driver b/linux-11.01.05.03/makerules/Makefile_ti-img-rogue-driver index 035fbefc6..1d3c19880 100644 --- a/linux-11.01.05.03/makerules/Makefile_ti-img-rogue-driver +++ b/linux-11.01.05.03/makerules/Makefile_ti-img-rogue-driver @@ -1,6 +1,6 @@ # ti-img-rogue-driver -ti-img-rogue-driver: linux +ti-img-rogue-driver: @echo ===================================== @echo Building ti-img-rogue-driver @echo ===================================== diff --git a/linux-11.01.05.03/makerules/Makefile_u-boot b/linux-11.01.05.03/makerules/Makefile_u-boot index 9e8ff3b01..0befe7fe7 100644 --- a/linux-11.01.05.03/makerules/Makefile_u-boot +++ b/linux-11.01.05.03/makerules/Makefile_u-boot @@ -1,3 +1,8 @@ +#set for u-boot-a53_falcon +LNX_FW_PATH=$(TI_LINUX_FIRMWARE) +NEW_ATF=$(PSDKLA)/board-support/trusted-firmware-a-2.13+git/build/k3/lite/release/bl31.bin +NEW_TEE=$(PSDKLA)/board-support/optee-os-4.6.0+git/out/arm-plat-k3/core/tee-raw.bin + u-boot: $(if $(filter am62l,$(SOC)), atf u-boot-a53, u-boot-r5 u-boot-a53) u-boot_clean: $(if $(filter am62l,$(SOC)), u-boot-a53_clean, u-boot-r5_clean u-boot-a53_clean) @@ -19,6 +24,22 @@ else O=$(TI_SDK_PATH)/board-support/u-boot-build/a53 endif +u-boot-a53_falcon: + @echo =================================== + @echo Building U-boot for A53 Falcon + @echo =================================== + mkdir -p $(TI_SDK_PATH)/board-support/u-boot-build/a53_falcon + $(MAKE) -j $(MAKE_JOBS) -C $(UBOOT_SRC_DIR) ARCH=arm $(UBOOT_MACHINE) O=$(TI_SDK_PATH)/board-support/u-boot-build/a53_falcon + +ifeq ($(SOC), am62l) + $(warning Target u-boot-a53_falcon isn't applicable for AM62L) + $(error Skipping with a warning message) +else + $(MAKE) -j $(MAKE_JOBS) -C $(UBOOT_SRC_DIR) ARCH=arm CROSS_COMPILE=$(CROSS_COMPILE) CC="$(CC)" \ + BINMAN_INDIRS=$(LNX_FW_PATH) BL31=$(NEW_ATF) TEE=$(NEW_TEE) TI_DM=$(TI_DM) \ + O=$(TI_SDK_PATH)/board-support/u-boot-build/a53_falcon +endif + u-boot-a53_clean: @echo =================================== @echo Cleaning U-boot for A53 @@ -54,6 +75,21 @@ endif $(MAKE) -C $(UBOOT_SRC_DIR) CROSS_COMPILE=$(CROSS_COMPILE_ARMV7) O=$(TI_SDK_PATH)/board-support/u-boot-build/r5 \ distclean +u-boot-r5_falcon: + +ifeq ($(SOC), am62l) + $(warning Target u-boot-r5 isn't applicable for AM62L) + $(error Skipping with a warning message) +endif + + @echo =================================== + @echo Building U-boot for R5 Falcon + @echo =================================== + mkdir -p $(TI_SDK_PATH)/board-support/u-boot-build/r5_falcon + $(MAKE) -j $(MAKE_JOBS) -C $(UBOOT_SRC_DIR) ARCH=arm $(UBOOT_MACHINE_R5) O=$(TI_SDK_PATH)/board-support/u-boot-build/r5_falcon + $(MAKE) -j $(MAKE_JOBS) -C $(UBOOT_SRC_DIR) ARCH=arm k3_r5_falcon.config O=$(TI_SDK_PATH)/board-support/u-boot-build/r5_falcon + $(MAKE) -j $(MAKE_JOBS) -C $(UBOOT_SRC_DIR) ARCH=arm CROSS_COMPILE=$(CROSS_COMPILE_ARMV7) \ + BINMAN_INDIRS=$(TI_LINUX_FIRMWARE) O=$(TI_SDK_PATH)/board-support/u-boot-build/r5_falcon u-boot_stage: mkdir -p $(TI_SDK_PATH)/board-support/built-images diff --git a/mcu_plus_sdk_am62px_11_01_00_16/source/drivers/device_manager/sciclient_direct/sciclient_direct_wrapper.c b/mcu_plus_sdk_am62px_11_01_00_16/source/drivers/device_manager/sciclient_direct/sciclient_direct_wrapper.c index 7c809c822..2bdc2e095 100644 --- a/mcu_plus_sdk_am62px_11_01_00_16/source/drivers/device_manager/sciclient_direct/sciclient_direct_wrapper.c +++ b/mcu_plus_sdk_am62px_11_01_00_16/source/drivers/device_manager/sciclient_direct/sciclient_direct_wrapper.c @@ -210,6 +210,7 @@ int32_t Sciclient_getVersionCheck(uint32_t doLog) { if(doLog != 0U) { +#if 0 //disable by Jeff due to "Boot Time Optimizations" DebugP_log("\r\n"); DebugP_log("SYSFW Firmware Version %s\r\n", (char *) response.str); @@ -217,6 +218,7 @@ int32_t Sciclient_getVersionCheck(uint32_t doLog) DebugP_log("SYSFW ABI revision %d.%d\r\n", response.abi_major, response.abi_minor); DebugP_log("\r\n"); +#endif } } else @@ -224,7 +226,9 @@ int32_t Sciclient_getVersionCheck(uint32_t doLog) status = SystemP_FAILURE; if(doLog != 0U) { +#if 0 //disable by Jeff due to "Boot Time Optimizations" DebugP_log("\r\n"); +#endif DebugP_logError("[ERROR] Sciclient get version failed !!!\r\n"); } } diff --git a/mcu_plus_sdk_am62px_11_01_00_16/tools/boot/linuxAppimageGen/board/am62px-sk/config.mak b/mcu_plus_sdk_am62px_11_01_00_16/tools/boot/linuxAppimageGen/board/am62px-sk/config.mak index c6c774d7d..c0aec95f1 100644 --- a/mcu_plus_sdk_am62px_11_01_00_16/tools/boot/linuxAppimageGen/board/am62px-sk/config.mak +++ b/mcu_plus_sdk_am62px_11_01_00_16/tools/boot/linuxAppimageGen/board/am62px-sk/config.mak @@ -5,7 +5,8 @@ #PSDK_LINUX_PATH=$(TOOLS_PATH)/ti-processor-sdk-linux-am62pxx-evm-11.01.05.03 #Path for prebuit images in Processor SDK linux -PSDK_LINUX_PREBUILT_IMAGES?=$(PSDKLA)/board-support/prebuilt-images/am62pxx-evm-display-cluster +#PSDK_LINUX_PREBUILT_IMAGES?=$(PSDKLA)/board-support/prebuilt-images/am62pxx-evm-display-cluster +PSDK_LINUX_PREBUILT_IMAGES?=$(PSDKLA)/board-support/prebuilt-images/am62pxx-evm #PSDK_LINUX_PREBUILT_IMAGES?=$(PSDKRA)/downloads FALCON_MODE?=0 @@ -18,7 +19,8 @@ SPL_BIN_NAME=u-boot-spl.bin-am62pxx-evm ifeq ($(FALCON_MODE), 1) #Load Kernel directly KERN_BIN_NAME=Image -FDT_BIN_NAME=k3-am62p5-sk.dtb +#FDT_BIN_NAME=k3-am62p5-sk.dtb +FDT_BIN_NAME=k3-am62p5-sk-overlay.dtb #Linux image load address ATF_LOAD_ADDR=0x9e780000 diff --git a/mcu_plus_sdk_am62px_11_01_00_16/tools/boot/linuxAppimageGen/makefile b/mcu_plus_sdk_am62px_11_01_00_16/tools/boot/linuxAppimageGen/makefile index 6b04ae4da..ca063d6d0 100644 --- a/mcu_plus_sdk_am62px_11_01_00_16/tools/boot/linuxAppimageGen/makefile +++ b/mcu_plus_sdk_am62px_11_01_00_16/tools/boot/linuxAppimageGen/makefile @@ -112,8 +112,8 @@ endif @echo . @echo Creating $(MULTI_CORE_IMAGE_GEN) LE $(SBL_DEV_ID) $(LINUX_BOOTIMAGE) $(COMBINED_APPIMAGE_PARAMS) >> $(BOOTIMAGE_TEMP_OUT_FILE) - @echo Copying u-boot.img - $(COPY) $(PSDK_LINUX_PREBUILT_IMAGES)/u-boot.img board/$(BOARD) + #@echo Copying u-boot.img + #$(COPY) $(PSDK_LINUX_PREBUILT_IMAGES)/u-boot.img board/$(BOARD) ifeq ($(DEVICE_TYPE),HS) # Sign the appimage using appimage signing script @@ -165,6 +165,9 @@ $(OPTEE_ELF): $(LD) -b binary -A aarch64 --oformat elf64-littleaarch64 --section-start=.data=$(OPTEE_LOAD_ADDR) -e $(OPTEE_LOAD_ADDR) $(PSDK_LINUX_PREBUILT_IMAGES)/$(OPTEE_BIN_NAME) -o $(OPTEE_ELF) $(IMAGE_ELF): + #Jeff, there file u-boot-spl.bin-am62pxx-evm in prebuilt folder doesn't workable for custom board, copy new one without care about FALCON_MODE value + cp $(PSDKLA)/board-support/u-boot-build/a53/spl/u-boot-spl.bin $(PSDK_LINUX_PREBUILT_IMAGES)/$(SPL_BIN_NAME) + cp $(PSDKLA)/board-support/ti-linux-kernel-6.12.35+git-ti/arch/arm64/boot/dts/ti/k3-am62p5-sk-overlay.dtb $(PSDK_LINUX_PREBUILT_IMAGES)/ $(LD) -b binary -A aarch64 --oformat elf64-littleaarch64 --section-start=.data=$(IMAGE_LOAD_ADDR) -e $(IMAGE_LOAD_ADDR) $(PSDK_LINUX_PREBUILT_IMAGES)/$(IMAGE_BIN_NAME) -o $(IMAGE_ELF) ifeq ($(FALCON_MODE), 1)