* [U-Boot] [PATCH] mpc85xx: clean up the old deep sleep framework
@ 2014-12-18 2:26 Tang Yuantian
2014-12-18 2:31 ` York Sun
2015-01-23 0:35 ` York Sun
0 siblings, 2 replies; 5+ messages in thread
From: Tang Yuantian @ 2014-12-18 2:26 UTC (permalink / raw)
To: u-boot
All the boards that support deep sleep feature are converted
to deep sleep generic board interface. The old interface which
support non-generic board is not used anymore. So clean it up.
Signed-off-by: Tang Yuantian <Yuantian.Tang@freescale.com>
---
arch/powerpc/cpu/mpc85xx/cpu_init.c | 10 +---------
arch/powerpc/lib/board.c | 21 ---------------------
2 files changed, 1 insertion(+), 30 deletions(-)
diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c
index 85d32fc..4cf8853 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c
@@ -424,7 +424,6 @@ void fsl_erratum_a007212_workaround(void)
ulong cpu_init_f(void)
{
- ulong flag = 0;
extern void m8560_cpm_reset (void);
#if defined(CONFIG_SYS_DCSRBAR_PHYS) || \
(defined(CONFIG_SECURE_BOOT) && defined(CONFIG_FSL_CORENET))
@@ -499,18 +498,11 @@ ulong cpu_init_f(void)
in_be32(&gur->dcsrcr);
#endif
-#ifdef CONFIG_SYS_DCSRBAR_PHYS
-#ifdef CONFIG_DEEP_SLEEP
- /* disable the console if boot from deep sleep */
- if (in_be32(&gur->scrtsr[0]) & (1 << 3))
- flag = GD_FLG_SILENT | GD_FLG_DISABLE_CONSOLE;
-#endif
-#endif
#ifdef CONFIG_SYS_FSL_ERRATUM_A007212
fsl_erratum_a007212_workaround();
#endif
- return flag;
+ return 0;
}
/* Implement a dummy function for those platforms w/o SERDES */
diff --git a/arch/powerpc/lib/board.c b/arch/powerpc/lib/board.c
index e6d5355..91645d3 100644
--- a/arch/powerpc/lib/board.c
+++ b/arch/powerpc/lib/board.c
@@ -346,13 +346,6 @@ void board_init_f(ulong bootflag)
#ifdef CONFIG_PRAM
ulong reg;
#endif
-#ifdef CONFIG_DEEP_SLEEP
- const ccsr_gur_t *gur = (void __iomem *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
- struct ccsr_scfg *scfg = (void *)CONFIG_SYS_MPC85xx_SCFG;
- u32 start_addr;
- typedef void (*func_t)(void);
- func_t kernel_resume;
-#endif
/* Pointer is writable since we allocated a register for it */
gd = (gd_t *) (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_GBL_DATA_OFFSET);
@@ -372,20 +365,6 @@ void board_init_f(ulong bootflag)
if ((*init_fnc_ptr) () != 0)
hang();
-#ifdef CONFIG_DEEP_SLEEP
- /* Jump to kernel in deep sleep case */
- if (in_be32(&gur->scrtsr[0]) & (1 << 3)) {
- l2cache_init();
-#if defined(CONFIG_RAMBOOT_PBL)
- disable_cpc_sram();
-#endif
- enable_cpc();
- start_addr = in_be32(&scfg->sparecr[1]);
- kernel_resume = (func_t)start_addr;
- kernel_resume();
- }
-#endif
-
#ifdef CONFIG_POST
post_bootmode_init();
post_run(NULL, POST_ROM | post_bootmode_get(NULL));
--
2.1.0.27.g96db324
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH] mpc85xx: clean up the old deep sleep framework
2014-12-18 2:26 [U-Boot] [PATCH] mpc85xx: clean up the old deep sleep framework Tang Yuantian
@ 2014-12-18 2:31 ` York Sun
2014-12-18 2:43 ` Yuantian Tang
2015-01-23 0:35 ` York Sun
1 sibling, 1 reply; 5+ messages in thread
From: York Sun @ 2014-12-18 2:31 UTC (permalink / raw)
To: u-boot
On 12/17/2014 06:26 PM, Tang Yuantian wrote:
> All the boards that support deep sleep feature are converted
> to deep sleep generic board interface. The old interface which
> support non-generic board is not used anymore. So clean it up.
>
> Signed-off-by: Tang Yuantian <Yuantian.Tang@freescale.com>
> ---
I know for sure we have some patches pending. It would be helpful if you list
all the dependency so I won't apply this one first. It will be a good habit for
all future patches.
York
^ permalink raw reply [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH] mpc85xx: clean up the old deep sleep framework
2014-12-18 2:31 ` York Sun
@ 2014-12-18 2:43 ` Yuantian Tang
2014-12-18 2:56 ` York Sun
0 siblings, 1 reply; 5+ messages in thread
From: Yuantian Tang @ 2014-12-18 2:43 UTC (permalink / raw)
To: u-boot
Hello York,
The following 3 patches, which are independent to each other, should be applied first before this one get applied.
You can apply these 4 patches in the order I sent them.
1. mpc85xx/t102xrdb: convert deep sleep to generic board interface
http://patchwork.ozlabs.org/patch/422189/
2. mpc85xx/t1040qds: convert deep sleep to generic board interface
http://patchwork.ozlabs.org/patch/422451/
3. mpc85xx/t102xqds: convert deep sleep to generic board interface
http://patchwork.ozlabs.org/patch/422447/
Thanks,
Yuantian
> -----Original Message-----
> From: York Sun [mailto:yorksun at freescale.com]
> Sent: Thursday, December 18, 2014 10:31 AM
> To: Tang Yuantian-B29983
> Cc: u-boot at lists.denx.de
> Subject: Re: [PATCH] mpc85xx: clean up the old deep sleep framework
>
> On 12/17/2014 06:26 PM, Tang Yuantian wrote:
> > All the boards that support deep sleep feature are converted to deep
> > sleep generic board interface. The old interface which support
> > non-generic board is not used anymore. So clean it up.
> >
> > Signed-off-by: Tang Yuantian <Yuantian.Tang@freescale.com>
> > ---
>
> I know for sure we have some patches pending. It would be helpful if you list all
> the dependency so I won't apply this one first. It will be a good habit for all future
> patches.
>
> York
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH] mpc85xx: clean up the old deep sleep framework
2014-12-18 2:43 ` Yuantian Tang
@ 2014-12-18 2:56 ` York Sun
0 siblings, 0 replies; 5+ messages in thread
From: York Sun @ 2014-12-18 2:56 UTC (permalink / raw)
To: u-boot
On 12/17/2014 06:43 PM, Tang Yuantian-B29983 wrote:
> Hello York,
>
> The following 3 patches, which are independent to each other, should be applied first before this one get applied.
> You can apply these 4 patches in the order I sent them.
>
> 1. mpc85xx/t102xrdb: convert deep sleep to generic board interface
> http://patchwork.ozlabs.org/patch/422189/
> 2. mpc85xx/t1040qds: convert deep sleep to generic board interface
> http://patchwork.ozlabs.org/patch/422451/
> 3. mpc85xx/t102xqds: convert deep sleep to generic board interface
> http://patchwork.ozlabs.org/patch/422447/
>
Thanks. This is what I need.
York
^ permalink raw reply [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH] mpc85xx: clean up the old deep sleep framework
2014-12-18 2:26 [U-Boot] [PATCH] mpc85xx: clean up the old deep sleep framework Tang Yuantian
2014-12-18 2:31 ` York Sun
@ 2015-01-23 0:35 ` York Sun
1 sibling, 0 replies; 5+ messages in thread
From: York Sun @ 2015-01-23 0:35 UTC (permalink / raw)
To: u-boot
On 12/17/2014 08:26 PM, Tang Yuantian wrote:
> All the boards that support deep sleep feature are converted
> to deep sleep generic board interface. The old interface which
> support non-generic board is not used anymore. So clean it up.
>
> Signed-off-by: Tang Yuantian <Yuantian.Tang@freescale.com>
> ---
Applied to u-boot-mpc85xx master branch, awaiting upstream.
York
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-01-23 0:35 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-12-18 2:26 [U-Boot] [PATCH] mpc85xx: clean up the old deep sleep framework Tang Yuantian
2014-12-18 2:31 ` York Sun
2014-12-18 2:43 ` Yuantian Tang
2014-12-18 2:56 ` York Sun
2015-01-23 0:35 ` York Sun
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.