Commit 58047c6c1b34133acdde0ce579dd1899bcb05876
1 parent
94d5945021
Exists in
8m_4.19.35_1.0.0_warrior
Make changes for hardware rev. 00E0
Showing 5 changed files with 2 additions and 77 deletions Side-by-side Diff
recipes-bsp/imx-atf/imx-atf/imx8m-atf-ddr-timing.patch
1 | -diff --git a/plat/imx/common/include/dram.h b/plat/imx/common/include/dram.h | |
2 | -index bf0b384..8b5f90c 100644 | |
3 | ---- a/plat/imx/common/include/dram.h | |
4 | -+++ b/plat/imx/common/include/dram.h | |
5 | -@@ -41,6 +41,8 @@ struct dram_cfg_param { | |
6 | - }; | |
7 | - | |
8 | - struct dram_timing_info { | |
9 | -+ /* ddrphy firmware offset */ | |
10 | -+ unsigned int ddrphy_fw_offset; | |
11 | - /* umctl2 config */ | |
12 | - struct dram_cfg_param *ddrc_cfg; | |
13 | - unsigned int ddrc_cfg_num; |
recipes-bsp/imx-atf/imx-atf/imx8m-atf-fix-derate-enable.patch
1 | -diff --git a/plat/imx/common/imx8m/lpddr4_dvfs.c b/plat/imx/common/imx8m/lpddr4_dvfs.c | |
2 | -index b3ea27b..b19bada 100644 | |
3 | ---- a/plat/imx/common/imx8m/lpddr4_dvfs.c | |
4 | -+++ b/plat/imx/common/imx8m/lpddr4_dvfs.c | |
5 | -@@ -20,6 +20,7 @@ void lpddr4_swffc(struct dram_info *info, unsigned int init_fsp, | |
6 | - unsigned int mr, emr, emr2, emr3; | |
7 | - unsigned int mr11, mr12, mr22, mr14; | |
8 | - unsigned int tmp; | |
9 | -+ unsigned int derate_backup[3]; | |
10 | - | |
11 | - /* 1. program targetd UMCTL2_REGS_FREQ1/2/3,already done, skip it. */ | |
12 | - | |
13 | -@@ -109,14 +110,17 @@ void lpddr4_swffc(struct dram_info *info, unsigned int init_fsp, | |
14 | - | |
15 | - /* 10. Disable automatic derating: derate_enable */ | |
16 | - tmp= mmio_read_32(DDRC_DERATEEN(0)); | |
17 | -+ derate_backup[0] = tmp; | |
18 | - tmp &= ~0x1; | |
19 | - mmio_write_32(DDRC_DERATEEN(0), tmp); | |
20 | - | |
21 | - tmp= mmio_read_32(DDRC_FREQ1_DERATEEN(0)); | |
22 | -+ derate_backup[1] = tmp; | |
23 | - tmp &= ~0x1; | |
24 | - mmio_write_32(DDRC_FREQ1_DERATEEN(0), tmp); | |
25 | - | |
26 | - tmp= mmio_read_32(DDRC_FREQ2_DERATEEN(0)); | |
27 | -+ derate_backup[2] = tmp; | |
28 | - tmp &= ~0x1; | |
29 | - mmio_write_32(DDRC_FREQ2_DERATEEN(0), tmp); | |
30 | - | |
31 | -@@ -346,10 +350,9 @@ void lpddr4_swffc(struct dram_info *info, unsigned int init_fsp, | |
32 | - mmio_write_32(DDRC_ZQCTL0(0), tmp); | |
33 | - } | |
34 | - | |
35 | -- /* 40. re-emable automatic derating: derate_enable */ | |
36 | -- tmp= mmio_read_32(DDRC_DERATEEN(0)); | |
37 | -- tmp &= 0xFFFFFFFE; | |
38 | -- mmio_write_32(DDRC_DERATEEN(0), tmp); | |
39 | -+ mmio_write_32(DDRC_DERATEEN(0), derate_backup[0]); | |
40 | -+ mmio_write_32(DDRC_FREQ1_DERATEEN(0), derate_backup[1]); | |
41 | -+ mmio_write_32(DDRC_FREQ2_DERATEEN(0), derate_backup[2]); | |
42 | - | |
43 | - /* 41. write 1 to PCTRL.port_en */ | |
44 | - mmio_write_32(DDRC_PCTRL_0(0), 0x1); | |
45 | -diff --git a/plat/imx/common/imx8m/lpddr4_retention.c b/plat/imx/common/imx8m/lpddr4_retention.c | |
46 | -index 8cc44c8..9cdca3d 100644 | |
47 | ---- a/plat/imx/common/imx8m/lpddr4_retention.c | |
48 | -+++ b/plat/imx/common/imx8m/lpddr4_retention.c | |
49 | -@@ -250,7 +250,6 @@ void lpddr4_exit_retention(void) | |
50 | - INFO("wait STAT to normal state\n"); | |
51 | - } | |
52 | - | |
53 | -- mmio_write_32(DDRC_DERATEEN(0), 0x00000302); | |
54 | - | |
55 | - mmio_write_32(DDRC_PCTRL_0(0), 0x00000001); | |
56 | - /* dis_auto-refresh is set to 0 */ |
recipes-bsp/imx-atf/imx-atf_2.0.bbappend
recipes-bsp/u-boot/u-boot-smarcimx8m_2019.04.bb
... | ... | @@ -15,7 +15,7 @@ |
15 | 15 | UBOOT_SRC ?= "${EMB_UBOOT_MIRROR};protocol=ssh" |
16 | 16 | SRCBRANCH = "smarc_8m-imx_v2019.04_4.19.35_1.1.0" |
17 | 17 | SRC_URI = "${UBOOT_SRC};branch=${SRCBRANCH}" |
18 | -SRCREV = "f7cc15046cf48b28161cc164cd36c7c0813dc39f" | |
18 | +SRCREV = "98ddf5324018cd67bc8c65e706b1c9ba23b53533" | |
19 | 19 | |
20 | 20 | S = "${WORKDIR}/git" |
21 | 21 |
recipes-kernel/linux/linux-smarcimx8m_4.19.35.bb
... | ... | @@ -23,7 +23,7 @@ |
23 | 23 | |
24 | 24 | KERNEL_SRC ?= "git@git.embedian.com:developer/smarc-fsl-linux-kernel.git;protocol=git" |
25 | 25 | SRC_URI = "${EMB_KERNEL_MIRROR};protocol=ssh;branch=${SRCBRANCH}" |
26 | -SRCREV = "5f714b4332c239ffedb4958085c952ba8fe93aca" | |
26 | +SRCREV = "da41c6f782cba0fac48938cbd4497806c7fbbedb" | |
27 | 27 | |
28 | 28 | S = "${WORKDIR}/git" |
29 | 29 |