Skip to contentSkip to conversation

board/freescale:Remove use of CONFIG_SPL_NAND_MINIMAL

PATCH New Prabhakar Kushwaha 3 participants 3 messages Dec 11, 2013 – Jan 2, 2014

lore
Share & tools
lore

Prabhakar Kushwaha

author
#0 lore raw

PATCH v2 1/1 board/freescale:Remove use of CONFIG_SPL_NAND_MINIMAL

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 <[email protected]>

---
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(-)
README +3 -0
index 265e81e..88a4722 100644
@@ -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
board/freescale/bsc9131rdb/tlb.c +1 -1
index 669fe8a..c8ecf5d 100644
@@ -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),
board/freescale/bsc9132qds/tlb.c +1 -1
index 02655e9..07febc2 100644
@@ -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),
board/freescale/p1010rdb/tlb.c +1 -1
index a7af0f6..a3d36b3 100644
@@ -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),
include/configs/BSC9131RDB.h +1 -1
index 499d8c2..783d996 100644
@@ -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"
include/configs/BSC9132QDS.h +1 -1
index a6601fe..f7cd955 100644
@@ -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"
include/configs/P1010RDB.h +1 -1
index eab386a..22538fc 100644
@@ -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"
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH v2 1/1 board/freescale:Remove use of CONFIG_SPL_NAND_MINIMAL

Quoted 10 lines · Prabhakar Kushwaha

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 <[email protected]>

---
Changes for v2: Incorporated Scott's comments
- Add CONFIG_SPL_NAND_BOOT in README

Applied to u-boot-mpc85xx/master. Thanks.

York

#2 lore raw

PATCH v2 1/1 board/freescale:Remove use of CONFIG_SPL_NAND_MINIMAL

In reply to Prabhakar Kushwaha
Quoted 24 lines · Prabhakar Kushwaha

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 <[email protected]>

---
Changes for v2: Incorporated Scott's comments

(quoted diff) +0 -0
 	 - 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(-)
README +0 -0
index 265e81e..88a4722 100644

README FIT uImage format: · line 3249

Quoted 5 lines
README +2 -0
@@ -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