diff --git a/recipes-bsp/imx-atf/imx-atf/imx8m-atf-ddr-timing.patch b/recipes-bsp/imx-atf/imx-atf/imx8m-atf-ddr-timing.patch deleted file mode 100644 index b6cae1b..0000000 --- a/recipes-bsp/imx-atf/imx-atf/imx8m-atf-ddr-timing.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/plat/imx/common/include/dram.h b/plat/imx/common/include/dram.h -index bf0b384..8b5f90c 100644 ---- a/plat/imx/common/include/dram.h -+++ b/plat/imx/common/include/dram.h -@@ -41,6 +41,8 @@ struct dram_cfg_param { - }; - - struct dram_timing_info { -+ /* ddrphy firmware offset */ -+ unsigned int ddrphy_fw_offset; - /* umctl2 config */ - struct dram_cfg_param *ddrc_cfg; - unsigned int ddrc_cfg_num; diff --git a/recipes-bsp/imx-atf/imx-atf/imx8m-atf-fix-derate-enable.patch b/recipes-bsp/imx-atf/imx-atf/imx8m-atf-fix-derate-enable.patch deleted file mode 100644 index 0195ed2..0000000 --- a/recipes-bsp/imx-atf/imx-atf/imx8m-atf-fix-derate-enable.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/plat/imx/common/imx8m/lpddr4_dvfs.c b/plat/imx/common/imx8m/lpddr4_dvfs.c -index b3ea27b..b19bada 100644 ---- a/plat/imx/common/imx8m/lpddr4_dvfs.c -+++ b/plat/imx/common/imx8m/lpddr4_dvfs.c -@@ -20,6 +20,7 @@ void lpddr4_swffc(struct dram_info *info, unsigned int init_fsp, - unsigned int mr, emr, emr2, emr3; - unsigned int mr11, mr12, mr22, mr14; - unsigned int tmp; -+ unsigned int derate_backup[3]; - - /* 1. program targetd UMCTL2_REGS_FREQ1/2/3,already done, skip it. */ - -@@ -109,14 +110,17 @@ void lpddr4_swffc(struct dram_info *info, unsigned int init_fsp, - - /* 10. Disable automatic derating: derate_enable */ - tmp= mmio_read_32(DDRC_DERATEEN(0)); -+ derate_backup[0] = tmp; - tmp &= ~0x1; - mmio_write_32(DDRC_DERATEEN(0), tmp); - - tmp= mmio_read_32(DDRC_FREQ1_DERATEEN(0)); -+ derate_backup[1] = tmp; - tmp &= ~0x1; - mmio_write_32(DDRC_FREQ1_DERATEEN(0), tmp); - - tmp= mmio_read_32(DDRC_FREQ2_DERATEEN(0)); -+ derate_backup[2] = tmp; - tmp &= ~0x1; - mmio_write_32(DDRC_FREQ2_DERATEEN(0), tmp); - -@@ -346,10 +350,9 @@ void lpddr4_swffc(struct dram_info *info, unsigned int init_fsp, - mmio_write_32(DDRC_ZQCTL0(0), tmp); - } - -- /* 40. re-emable automatic derating: derate_enable */ -- tmp= mmio_read_32(DDRC_DERATEEN(0)); -- tmp &= 0xFFFFFFFE; -- mmio_write_32(DDRC_DERATEEN(0), tmp); -+ mmio_write_32(DDRC_DERATEEN(0), derate_backup[0]); -+ mmio_write_32(DDRC_FREQ1_DERATEEN(0), derate_backup[1]); -+ mmio_write_32(DDRC_FREQ2_DERATEEN(0), derate_backup[2]); - - /* 41. write 1 to PCTRL.port_en */ - mmio_write_32(DDRC_PCTRL_0(0), 0x1); -diff --git a/plat/imx/common/imx8m/lpddr4_retention.c b/plat/imx/common/imx8m/lpddr4_retention.c -index 8cc44c8..9cdca3d 100644 ---- a/plat/imx/common/imx8m/lpddr4_retention.c -+++ b/plat/imx/common/imx8m/lpddr4_retention.c -@@ -250,7 +250,6 @@ void lpddr4_exit_retention(void) - INFO("wait STAT to normal state\n"); - } - -- mmio_write_32(DDRC_DERATEEN(0), 0x00000302); - - mmio_write_32(DDRC_PCTRL_0(0), 0x00000001); - /* dis_auto-refresh is set to 0 */ diff --git a/recipes-bsp/imx-atf/imx-atf_2.0.bbappend b/recipes-bsp/imx-atf/imx-atf_2.0.bbappend deleted file mode 100644 index 3c66719..0000000 --- a/recipes-bsp/imx-atf/imx-atf_2.0.bbappend +++ /dev/null @@ -1,6 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI_append = " \ - file://imx8m-atf-ddr-timing.patch \ - file://imx8m-atf-fix-derate-enable.patch \ -" diff --git a/recipes-bsp/u-boot/u-boot-smarcimx8m_2019.04.bb b/recipes-bsp/u-boot/u-boot-smarcimx8m_2019.04.bb index ea5e4a0..f5e5dd5 100644 --- a/recipes-bsp/u-boot/u-boot-smarcimx8m_2019.04.bb +++ b/recipes-bsp/u-boot/u-boot-smarcimx8m_2019.04.bb @@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a UBOOT_SRC ?= "${EMB_UBOOT_MIRROR};protocol=ssh" SRCBRANCH = "smarc_8m-imx_v2019.04_4.19.35_1.1.0" SRC_URI = "${UBOOT_SRC};branch=${SRCBRANCH}" -SRCREV = "f7cc15046cf48b28161cc164cd36c7c0813dc39f" +SRCREV = "98ddf5324018cd67bc8c65e706b1c9ba23b53533" S = "${WORKDIR}/git" diff --git a/recipes-kernel/linux/linux-smarcimx8m_4.19.35.bb b/recipes-kernel/linux/linux-smarcimx8m_4.19.35.bb index a98c5e4..456a4dd 100644 --- a/recipes-kernel/linux/linux-smarcimx8m_4.19.35.bb +++ b/recipes-kernel/linux/linux-smarcimx8m_4.19.35.bb @@ -23,7 +23,7 @@ DEFAULT_DTB = "fsl-smarcimx8mq" KERNEL_SRC ?= "git@git.embedian.com:developer/smarc-fsl-linux-kernel.git;protocol=git" SRC_URI = "${EMB_KERNEL_MIRROR};protocol=ssh;branch=${SRCBRANCH}" -SRCREV = "5f714b4332c239ffedb4958085c952ba8fe93aca" +SRCREV = "da41c6f782cba0fac48938cbd4497806c7fbbedb" S = "${WORKDIR}/git"