| Message ID | 1351757631-7725-1-git-send-email-tie-fei.zang@freescale.com |
|---|---|
| State | Superseded |
| Delegated to: | Andy Fleming |
| Headers | show |
On Thu, Nov 1, 2012 at 3:13 AM, Roy Zang <tie-fei.zang@freescale.com> wrote: > board configuration file is included before asm/config_mpc85xx.h. > however, CONFIG_FSL_SATA_V2 is defined in asm/config_mpc85xx.h. > it will never take effective in the board configuration file for > this kind of code : > > #ifdef CONFIG_FSL_SATA_V2 > ... > #endif > > To solve this problem, move CONFIG_FSL_SATA_V2 to board > configuration header file. http://patchwork.ozlabs.org/patch/126958/
On Thu, Nov 1, 2012 at 11:20 AM, Tabi Timur-B04825 <b04825@freescale.com> wrote: > >> To solve this problem, move CONFIG_FSL_SATA_V2 to board >> configuration header file. > > http://patchwork.ozlabs.org/patch/126958/ To be clear, I think you should say in the patch description that your patch effectively reverts mine.
> -----Original Message----- > From: Tabi Timur-B04825 > Sent: Friday, November 02, 2012 12:25 AM > To: Tabi Timur-B04825 > Cc: Zang Roy-R61911; u-boot@lists.denx.de; afleming@gmail.com > Subject: Re: [U-Boot] [PATCH] powerpc/corenet_ds: move SATA config to > board configuration > > On Thu, Nov 1, 2012 at 11:20 AM, Tabi Timur-B04825 <b04825@freescale.com> > wrote: > > > >> To solve this problem, move CONFIG_FSL_SATA_V2 to board configuration > >> header file. > > > > http://patchwork.ozlabs.org/patch/126958/ > > To be clear, I think you should say in the patch description that your > patch effectively reverts mine. I noticed your patch. OK, I will re-post the patch to add the description. Roy
diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h index 03baaee..8916d5e 100644 --- a/arch/powerpc/include/asm/config_mpc85xx.h +++ b/arch/powerpc/include/asm/config_mpc85xx.h @@ -318,7 +318,6 @@ #define CONFIG_SYS_FSL_NUM_CC_PLLS 2 #define CONFIG_SYS_FSL_NUM_LAWS 32 #define CONFIG_SYS_FSL_SEC_COMPAT 4 -#define CONFIG_FSL_SATA_V2 #define CONFIG_SYS_NUM_FMAN 1 #define CONFIG_SYS_NUM_FM1_DTSEC 5 #define CONFIG_SYS_NUM_FM1_10GEC 1 @@ -350,7 +349,6 @@ #define CONFIG_SYS_FSL_NUM_CC_PLLS 2 #define CONFIG_SYS_FSL_NUM_LAWS 32 #define CONFIG_SYS_FSL_SEC_COMPAT 4 -#define CONFIG_FSL_SATA_V2 #define CONFIG_SYS_NUM_FMAN 1 #define CONFIG_SYS_NUM_FM1_DTSEC 5 #define CONFIG_SYS_NUM_FM1_10GEC 1 @@ -425,7 +423,6 @@ #define CONFIG_SYS_FSL_NUM_CC_PLLS 2 #define CONFIG_SYS_FSL_NUM_LAWS 32 #define CONFIG_SYS_FSL_SEC_COMPAT 4 -#define CONFIG_FSL_SATA_V2 #define CONFIG_SYS_NUM_FMAN 1 #define CONFIG_SYS_NUM_FM1_DTSEC 5 #define CONFIG_SYS_NUM_FM1_10GEC 1 diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index 5cdb628..8509d20 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -560,8 +560,10 @@ unsigned long get_board_sys_clk(unsigned long dummy); #endif /* CONFIG_PCI */ /* SATA */ +#define CONFIG_FSL_SATA_V2 + +#ifdef CONFIG_FSL_SATA_V2 #define CONFIG_FSL_SATA -#ifdef CONFIG_FSL_SATA #define CONFIG_LIBATA #define CONFIG_SYS_SATA_MAX_DEVICE 2 diff --git a/include/configs/P3041DS.h b/include/configs/P3041DS.h index cf184e7..ce8f9b0 100644 --- a/include/configs/P3041DS.h +++ b/include/configs/P3041DS.h @@ -32,6 +32,7 @@ #define CONFIG_MMC #define CONFIG_NAND_FSL_ELBC +#define CONFIG_FSL_SATA_V2 #define CONFIG_PCIE3 #define CONFIG_PCIE4 #define CONFIG_SYS_DPAA_RMAN diff --git a/include/configs/P5020DS.h b/include/configs/P5020DS.h index 7018d7a..778230d 100644 --- a/include/configs/P5020DS.h +++ b/include/configs/P5020DS.h @@ -32,6 +32,7 @@ #define CONFIG_MMC #define CONFIG_NAND_FSL_ELBC +#define CONFIG_FSL_SATA_V2 #define CONFIG_PCIE3 #define CONFIG_PCIE4 #define CONFIG_SYS_FSL_RAID_ENGINE
board configuration file is included before asm/config_mpc85xx.h. however, CONFIG_FSL_SATA_V2 is defined in asm/config_mpc85xx.h. it will never take effective in the board configuration file for this kind of code : #ifdef CONFIG_FSL_SATA_V2 ... #endif To solve this problem, move CONFIG_FSL_SATA_V2 to board configuration header file. Signed-off-by: Roy Zang <tie-fei.zang@freescale.com> --- arch/powerpc/include/asm/config_mpc85xx.h | 3 --- include/configs/P2041RDB.h | 4 +++- include/configs/P3041DS.h | 1 + include/configs/P5020DS.h | 1 + 4 files changed, 5 insertions(+), 4 deletions(-)