Message ID | 1386745931-2799-1-git-send-email-prabhakar@freescale.com |
---|---|
State | Accepted |
Delegated to: | York Sun |
Headers | show |
On 12/10/2013 11:12 PM, Prabhakar Kushwaha wrote: > CONFIG_SPL_NAND_MINIMAL should not be used as it was defined for temporary > review purpose. > > So, use CONFIG_SPL_NAND_BOOT config. > > Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com> > --- > Changes for v2: Incorporated Scott's comments > - Add CONFIG_SPL_NAND_BOOT in README > Applied to u-boot-mpc85xx/master. Thanks. York
On Wed, 2013-12-11 at 12:42 +0530, Prabhakar Kushwaha wrote: > CONFIG_SPL_NAND_MINIMAL should not be used as it was defined for temporary > review purpose. > > So, use CONFIG_SPL_NAND_BOOT config. > > Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com> > --- > Changes for v2: Incorporated Scott's comments > - Add CONFIG_SPL_NAND_BOOT in README > > README | 3 +++ > board/freescale/bsc9131rdb/tlb.c | 2 +- > board/freescale/bsc9132qds/tlb.c | 2 +- > board/freescale/p1010rdb/tlb.c | 2 +- > include/configs/BSC9131RDB.h | 2 +- > include/configs/BSC9132QDS.h | 2 +- > include/configs/P1010RDB.h | 2 +- > 7 files changed, 9 insertions(+), 6 deletions(-) > > diff --git a/README b/README > index 265e81e..88a4722 100644 > --- a/README > +++ b/README > @@ -3245,6 +3245,9 @@ FIT uImage format: > Defines the size and behavior of the NAND that SPL uses > to read U-Boot > > + CONFIG_SPL_NAND_BOOT > + Add support NAND boot Is it really just adding support for NAND boot, or is it asserting that we are booting from NAND? -Scott
diff --git a/README b/README index 265e81e..88a4722 100644 --- a/README +++ b/README @@ -3245,6 +3245,9 @@ FIT uImage format: Defines the size and behavior of the NAND that SPL uses to read U-Boot + CONFIG_SPL_NAND_BOOT + Add support NAND boot + CONFIG_SYS_NAND_U_BOOT_OFFS Location in NAND to read U-Boot from diff --git a/board/freescale/bsc9131rdb/tlb.c b/board/freescale/bsc9131rdb/tlb.c index 669fe8a..c8ecf5d 100644 --- a/board/freescale/bsc9131rdb/tlb.c +++ b/board/freescale/bsc9131rdb/tlb.c @@ -30,7 +30,7 @@ struct fsl_e_tlb_entry tlb_table[] = { SET_TLB_ENTRY(1, 0xfffff000, 0xfffff000, MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, 0, 0, BOOKE_PAGESZ_4K, 1), -#ifdef CONFIG_SPL_NAND_MINIMAL +#ifdef CONFIG_SPL_NAND_BOOT SET_TLB_ENTRY(1, 0xffffe000, 0xffffe000, MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, 0, 10, BOOKE_PAGESZ_4K, 1), diff --git a/board/freescale/bsc9132qds/tlb.c b/board/freescale/bsc9132qds/tlb.c index 02655e9..07febc2 100644 --- a/board/freescale/bsc9132qds/tlb.c +++ b/board/freescale/bsc9132qds/tlb.c @@ -30,7 +30,7 @@ struct fsl_e_tlb_entry tlb_table[] = { SET_TLB_ENTRY(1, 0xfffff000, 0xfffff000, MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, 0, 0, BOOKE_PAGESZ_4K, 1), -#ifdef CONFIG_SPL_NAND_MINIMAL +#ifdef CONFIG_SPL_NAND_BOOT SET_TLB_ENTRY(1, 0xffffe000, 0xffffe000, MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, 0, 10, BOOKE_PAGESZ_4K, 1), diff --git a/board/freescale/p1010rdb/tlb.c b/board/freescale/p1010rdb/tlb.c index a7af0f6..a3d36b3 100644 --- a/board/freescale/p1010rdb/tlb.c +++ b/board/freescale/p1010rdb/tlb.c @@ -30,7 +30,7 @@ struct fsl_e_tlb_entry tlb_table[] = { SET_TLB_ENTRY(1, 0xfffff000, 0xfffff000, MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, 0, 0, BOOKE_PAGESZ_4K, 1), -#ifdef CONFIG_SPL_NAND_MINIMAL +#ifdef CONFIG_SPL_NAND_BOOT SET_TLB_ENTRY(1, 0xffffe000, 0xffffe000, MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, 0, 10, BOOKE_PAGESZ_4K, 1), diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h index 499d8c2..783d996 100644 --- a/include/configs/BSC9131RDB.h +++ b/include/configs/BSC9131RDB.h @@ -29,7 +29,7 @@ #define CONFIG_SPL_INIT_MINIMAL #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_NAND_SUPPORT -#define CONFIG_SPL_NAND_MINIMAL +#define CONFIG_SPL_NAND_BOOT #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index a6601fe..f7cd955 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -38,7 +38,7 @@ #define CONFIG_SPL_INIT_MINIMAL #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_NAND_SUPPORT -#define CONFIG_SPL_NAND_MINIMAL +#define CONFIG_SPL_NAND_BOOT #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index eab386a..22538fc 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -37,7 +37,7 @@ #define CONFIG_SPL_INIT_MINIMAL #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_NAND_SUPPORT -#define CONFIG_SPL_NAND_MINIMAL +#define CONFIG_SPL_NAND_BOOT #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TARGET "u-boot-with-spl.bin"
CONFIG_SPL_NAND_MINIMAL should not be used as it was defined for temporary review purpose. So, use CONFIG_SPL_NAND_BOOT config. Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com> --- Changes for v2: Incorporated Scott's comments - Add CONFIG_SPL_NAND_BOOT in README README | 3 +++ board/freescale/bsc9131rdb/tlb.c | 2 +- board/freescale/bsc9132qds/tlb.c | 2 +- board/freescale/p1010rdb/tlb.c | 2 +- include/configs/BSC9131RDB.h | 2 +- include/configs/BSC9132QDS.h | 2 +- include/configs/P1010RDB.h | 2 +- 7 files changed, 9 insertions(+), 6 deletions(-)