Restore pcm051_rev3_defconfig config
PATCH 1/1 Restore pcm051_rev3_defconfig config
pcm051_rev3_defconfig config (Phytec Wega board) has been dropped in
64efd11d ("arm: Remove pcm051 board")due to expired migration deadlines. Here, pcm051_rev3_defconfig support is reintroduced.
--- arch/arm/dts/am335x-wega-rdk-u-boot.dtsi | 12 ++++ board/phytec/phycore_am335x_r2/board.c | 26 +++++++++ configs/pcm051_rev3_defconfig | 70 ++++++++++++++++++++++++ scripts/config_whitelist.txt | 1 + 4 files changed, 109 insertions(+) create mode 100644 configs/pcm051_rev3_defconfig
arch/arm/dts/am335x-wega-rdk-u-boot.dtsi +12 -0
@@ -16,6 +16,18 @@ ocp { u-boot,dm-pre-reloc; + + l4_wkup@44c00000 { + u-boot,dm-pre-reloc; + + segment@200000 { + u-boot,dm-pre-reloc; + + target-module@9000 { + u-boot,dm-pre-reloc; + }; + }; + }; }; };
board/phytec/phycore_am335x_r2/board.c +26 -0
@@ -31,7 +31,11 @@ DECLARE_GLOBAL_DATA_PTR;static struct ctrl_dev *cdev = (struct ctrl_dev *)CTRL_DEVICE_BASE ;/* DDR RAM defines */ +#if defined(CONFIG_REV13 ) +#define DDR_CLK_MHZ 303/* DDR_DPLL_MULT value */ +#else #define DDR_CLK_MHZ 400/* DDR_DPLL_MULT value */ +#endif // CONFIG_REV13 #define OSC (V_OSCK / 1000000)const struct dpll_params dpll_ddr = {
@@ -65,6 +69,7 @@ enum {PHYCORE_R2_MT41K128M16JT_256MB ,PHYCORE_R2_MT41K256M16TW107IT_512MB ,PHYCORE_R2_MT41K512M16HA125IT_1024MB , + PHYCORE_R13_MT41K256M16HA125E_256MB, }; struct am335x_sdram_timings {
@@ -127,10 +132,30 @@ static struct am335x_sdram_timings physom_timings[] = { .datawrsratio0 = 0x82, }, }, + [PHYCORE_R13_MT41K256M16HA125E_256MB ] = { + .ddr3_emif_reg_data = { + .sdram_config =MT41K256M16HA125E_EMIF_SDCFG , + .ref_ctrl =MT41K256M16HA125E_EMIF_SDREF , + .sdram_tim1 =MT41K256M16HA125E_EMIF_TIM1 , + .sdram_tim2 =MT41K256M16HA125E_EMIF_TIM2 , + .sdram_tim3 =MT41K256M16HA125E_EMIF_TIM3 , + .zq_config =MT41K256M16HA125E_ZQ_CFG , + .emif_ddr_phy_ctlr_1 =MT41K256M16HA125E_EMIF_READ_LATENCY |PHY_EN_DYN_PWRDN , + }, + .ddr3_data = { + .datardsratio0 =MT41K256M16HA125E_RD_DQS , + .datawdsratio0 =MT41K256M16HA125E_WR_DQS , + .datafwsratio0 =MT41K256M16HA125E_PHY_FIFO_WE , + .datawrsratio0 =MT41K256M16HA125E_PHY_WR_DATA , + }, + }, };void sdram_init (void ) { +#if defined(CONFIG_REV13 ) +int ram_type_index =PHYCORE_R13_MT41K256M16HA125E_256MB ; +#else /* Configure memory to maximum supported size for detection */ int ram_type_index =PHYCORE_R2_MT41K512M16HA125IT_1024MB ;
@@ -157,6 +182,7 @@ void sdram_init(void) ram_type_index =PHYCORE_R2_MT41K128M16JT_256MB ;break ; } +#endif config_ddr(DDR_CLK_MHZ, &ioregs, &physom_timings[ram_type_index].ddr3_data, &ddr3_cmd_ctrl_data,
configs/pcm051_rev3_defconfig new file +70 -0
70 lines not on this page · raw message
scripts/config_whitelist.txt +1 -0
@@ -389,6 +389,7 @@ CONFIG_RAMBOOT_TEXT_BASE CONFIG_RAMDISK_ADDR CONFIG_RD_LVL CONFIG_RESET_VECTOR_ADDRESS +CONFIG_REV13 CONFIG_ROCKCHIP_SDHCI_MAX_FREQ CONFIG_ROOTPATH CONFIG_RTC_DS1337
Signature · 1 line
2.26.2
Quoted 7 lines · Matwey V. Kornilov
pcm051_rev3_defconfigconfig (Phytec Wega board) has been dropped in64efd11d ("arm: Remove pcm051 board")due to expired migration deadlines. Here,
pcm051_rev3_defconfigsupport is reintroduced.
Quoted 6 lines
Signed-off-by Matwey V. Kornilov <[email protected]>--- arch/arm/dts/am335x-wega-rdk-u-boot.dtsi | 12 ++++ board/phytec/phycore_am335x_r2/board.c | 26 +++++++++ configs/pcm051_rev3_defconfig | 70 ++++++++++++++++++++++++ scripts/config_whitelist.txt | 1 +
You cannot add symbols to the whitelist, it must be handled in Kconfig or at runtime.
Signature · 1 line
Tom
PATCH v2 1/1 Restore pcm051_rev3_defconfig config
pcm051_rev3_defconfig config (Phytec Wega board) has been dropped in
64efd11d ("arm: Remove pcm051 board")due to expired migration deadlines. Here, pcm051_rev3_defconfig support is reintroduced.
---
Changes since v1:
- Do not add symbols to whitelist
arch/arm/dts/am335x-wega-rdk-u-boot.dtsi | 12 +++++ board/phytec/phycore_am335x_r2/Kconfig | 2 +- board/phytec/phycore_am335x_r2/board.c | 26 +++++++++ configs/pcm051_rev3_defconfig | 69 ++++++++++++++++++++++++ 4 files changed, 108 insertions(+), 1 deletion(-) create mode 100644 configs/pcm051_rev3_defconfig
arch/arm/dts/am335x-wega-rdk-u-boot.dtsi +12 -0
@@ -16,6 +16,18 @@ ocp { u-boot,dm-pre-reloc; + + l4_wkup@44c00000 { + u-boot,dm-pre-reloc; + + segment@200000 { + u-boot,dm-pre-reloc; + + target-module@9000 { + u-boot,dm-pre-reloc; + }; + }; + }; }; };
board/phytec/phycore_am335x_r2/Kconfig +1 -1
@@ -1,4 +1,4 @@ -if TARGET_PHYCORE_AM335X_R2 +if TARGET_PCM051 || TARGET_PHYCORE_AM335X_R2 config SYS_BOARD default "phycore_am335x_r2"
board/phytec/phycore_am335x_r2/board.c +26 -0
@@ -31,7 +31,11 @@ DECLARE_GLOBAL_DATA_PTR;static struct ctrl_dev *cdev = (struct ctrl_dev *)CTRL_DEVICE_BASE ;/* DDR RAM defines */ +#if defined(CONFIG_TARGET_PCM051 ) +#define DDR_CLK_MHZ 303/* DDR_DPLL_MULT value */ +#else #define DDR_CLK_MHZ 400/* DDR_DPLL_MULT value */ +#endif #define OSC (V_OSCK / 1000000)const struct dpll_params dpll_ddr = {
@@ -65,6 +69,7 @@ enum {PHYCORE_R2_MT41K128M16JT_256MB ,PHYCORE_R2_MT41K256M16TW107IT_512MB ,PHYCORE_R2_MT41K512M16HA125IT_1024MB , + PHYCORE_R13_MT41K256M16HA125E_256MB, }; struct am335x_sdram_timings {
@@ -127,10 +132,30 @@ static struct am335x_sdram_timings physom_timings[] = { .datawrsratio0 = 0x82, }, }, + [PHYCORE_R13_MT41K256M16HA125E_256MB ] = { + .ddr3_emif_reg_data = { + .sdram_config =MT41K256M16HA125E_EMIF_SDCFG , + .ref_ctrl =MT41K256M16HA125E_EMIF_SDREF , + .sdram_tim1 =MT41K256M16HA125E_EMIF_TIM1 , + .sdram_tim2 =MT41K256M16HA125E_EMIF_TIM2 , + .sdram_tim3 =MT41K256M16HA125E_EMIF_TIM3 , + .zq_config =MT41K256M16HA125E_ZQ_CFG , + .emif_ddr_phy_ctlr_1 =MT41K256M16HA125E_EMIF_READ_LATENCY |PHY_EN_DYN_PWRDN , + }, + .ddr3_data = { + .datardsratio0 =MT41K256M16HA125E_RD_DQS , + .datawdsratio0 =MT41K256M16HA125E_WR_DQS , + .datafwsratio0 =MT41K256M16HA125E_PHY_FIFO_WE , + .datawrsratio0 =MT41K256M16HA125E_PHY_WR_DATA , + }, + }, };void sdram_init (void ) { +#if defined(CONFIG_TARGET_PCM051 ) +int ram_type_index =PHYCORE_R13_MT41K256M16HA125E_256MB ; +#else /* Configure memory to maximum supported size for detection */ int ram_type_index =PHYCORE_R2_MT41K512M16HA125IT_1024MB ;
@@ -157,6 +182,7 @@ void sdram_init(void) ram_type_index =PHYCORE_R2_MT41K128M16JT_256MB ;break ; } +#endif config_ddr(DDR_CLK_MHZ, &ioregs, &physom_timings[ram_type_index].ddr3_data, &ddr3_cmd_ctrl_data,
configs/pcm051_rev3_defconfig new file +69 -0
69 lines not on this page · raw message
Signature · 1 line
2.26.2
Quoted 8 lines · Matwey V. Kornilov
pcm051_rev3_defconfigconfig (Phytec Wega board) has been dropped in64efd11d ("arm: Remove pcm051 board")due to expired migration deadlines. Here,
pcm051_rev3_defconfigsupport is reintroduced.Signed-off-by Matwey V. Kornilov <[email protected]>
Signature · 1 line
Tom
Quoted 9 lines · Matwey V. Kornilov
pcm051_rev3_defconfigconfig (Phytec Wega board) has been dropped in64efd11d ("arm: Remove pcm051 board")due to expired migration deadlines. Here,
pcm051_rev3_defconfigsupport is reintroduced.Signed-off-by Matwey V. Kornilov <[email protected]>Reviewed-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom