[U-Boot] [PATCH] powerpc/83xx: fix build failure
Remove duplicated SDRAM_INTERVAL_BSTOPRE from mpc83xx.h, which has been defined in fsl_ddr_sdram.h
Signed-off-by: Shengzhou Liu Shengzhou.Liu@freescale.com --- include/mpc83xx.h | 1 - 1 file changed, 1 deletion(-)
diff --git a/include/mpc83xx.h b/include/mpc83xx.h index a6d721a..b5a0bbf 100644 --- a/include/mpc83xx.h +++ b/include/mpc83xx.h @@ -1297,7 +1297,6 @@ */ #define SDRAM_INTERVAL_REFINT 0x3FFF0000 #define SDRAM_INTERVAL_REFINT_SHIFT 16 -#define SDRAM_INTERVAL_BSTOPRE 0x00003FFF #define SDRAM_INTERVAL_BSTOPRE_SHIFT 0
/*
Hi Shengzhou,
On Thu, Jan 14, 2016 at 6:45 PM, Shengzhou Liu Shengzhou.Liu@freescale.com wrote:
Remove duplicated SDRAM_INTERVAL_BSTOPRE from mpc83xx.h, which has been defined in fsl_ddr_sdram.h
I don't see SDRAM_INTERVAL_BSTOPRE is defined in fsl_ddr_sdram.h?
Signed-off-by: Shengzhou Liu Shengzhou.Liu@freescale.com
include/mpc83xx.h | 1 - 1 file changed, 1 deletion(-)
diff --git a/include/mpc83xx.h b/include/mpc83xx.h index a6d721a..b5a0bbf 100644 --- a/include/mpc83xx.h +++ b/include/mpc83xx.h @@ -1297,7 +1297,6 @@ */ #define SDRAM_INTERVAL_REFINT 0x3FFF0000 #define SDRAM_INTERVAL_REFINT_SHIFT 16 -#define SDRAM_INTERVAL_BSTOPRE 0x00003FFF #define SDRAM_INTERVAL_BSTOPRE_SHIFT 0
/*
Regards, Bin
On Thu, Jan 14, 2016 at 11:00:01PM +0800, Bin Meng wrote:
Hi Shengzhou,
On Thu, Jan 14, 2016 at 6:45 PM, Shengzhou Liu Shengzhou.Liu@freescale.com wrote:
Remove duplicated SDRAM_INTERVAL_BSTOPRE from mpc83xx.h, which has been defined in fsl_ddr_sdram.h
I don't see SDRAM_INTERVAL_BSTOPRE is defined in fsl_ddr_sdram.h?
Indeed, I assume this is supposed to be against some internal or work in progress tree? Thanks!
On Thu, Jan 14, 2016 at 06:45:30PM +0800, Shengzhou Liu wrote:
Remove duplicated SDRAM_INTERVAL_BSTOPRE from mpc83xx.h, which has been defined in fsl_ddr_sdram.h
Signed-off-by: Shengzhou Liu Shengzhou.Liu@freescale.com
Applied to u-boot/master, thanks!
Hi Tom,
On Thu, Jan 21, 2016 at 5:01 AM, Tom Rini trini@konsulko.com wrote:
On Thu, Jan 14, 2016 at 06:45:30PM +0800, Shengzhou Liu wrote:
Remove duplicated SDRAM_INTERVAL_BSTOPRE from mpc83xx.h, which has been defined in fsl_ddr_sdram.h
Signed-off-by: Shengzhou Liu Shengzhou.Liu@freescale.com
Applied to u-boot/master, thanks!
--
IMHO, if it is a WIP, this patch should be squashed into the patch which broke the build as it has not been merged upstream yet. Am I missing anything?
Regards, Bin
On Thu, Jan 21, 2016 at 09:22:43AM +0800, Bin Meng wrote:
Hi Tom,
On Thu, Jan 21, 2016 at 5:01 AM, Tom Rini trini@konsulko.com wrote:
On Thu, Jan 14, 2016 at 06:45:30PM +0800, Shengzhou Liu wrote:
Remove duplicated SDRAM_INTERVAL_BSTOPRE from mpc83xx.h, which has been defined in fsl_ddr_sdram.h
Signed-off-by: Shengzhou Liu Shengzhou.Liu@freescale.com
Applied to u-boot/master, thanks!
IMHO, if it is a WIP, this patch should be squashed into the patch which broke the build as it has not been merged upstream yet. Am I missing anything?
Mess-up on my part, but... SDRAM_INTERVAL_BSTOPRE isn't used _anywhere_ only SDRAM_INTERVAL_BSTOPRE_SHIFT so nothing broke.
Hi Tom,
On Thu, Jan 21, 2016 at 9:27 AM, Tom Rini trini@konsulko.com wrote:
On Thu, Jan 21, 2016 at 09:22:43AM +0800, Bin Meng wrote:
Hi Tom,
On Thu, Jan 21, 2016 at 5:01 AM, Tom Rini trini@konsulko.com wrote:
On Thu, Jan 14, 2016 at 06:45:30PM +0800, Shengzhou Liu wrote:
Remove duplicated SDRAM_INTERVAL_BSTOPRE from mpc83xx.h, which has been defined in fsl_ddr_sdram.h
Signed-off-by: Shengzhou Liu Shengzhou.Liu@freescale.com
Applied to u-boot/master, thanks!
IMHO, if it is a WIP, this patch should be squashed into the patch which broke the build as it has not been merged upstream yet. Am I missing anything?
Mess-up on my part, but... SDRAM_INTERVAL_BSTOPRE isn't used _anywhere_ only SDRAM_INTERVAL_BSTOPRE_SHIFT so nothing broke.
Yep, I just grep this and found nothing, which is different from what I grepped last time. Something must have been merged upstream recently. But if this is the case, then the commit title should really say: powerpc/83xx: Remove useless SDRAM_INTERVAL_BSTOPRE instead of saying 'fix build failure'.
Regards, Bin
participants (3)
-
Bin Meng -
Shengzhou Liu -
Tom Rini