Skip to contentSkip to conversation

Kconfig: Make CMD_SPL_NAND_OFS only available when proper memory is used

PATCH Superseded Lukasz Majewski 2 participants 5 messages May 16, 2019

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 Kconfig: Make CMD_SPL_NAND_OFS only available when proper memory is used

This commit makes the CMD_SPL_NAND_OFS only visible when we use NAND memory.
Before this change it was present when only CMD_SPL was enabled (and would stay when board with other falcon boot medium is used).

---

 cmd/Kconfig | 1 +
 1 file changed, 1 insertion(+)
cmd/Kconfig +1 -0
index 0d36da2a5c..7bc275f135 100644
@@ -327,6 +327,7 @@ config CMD_SPL
 config CMD_SPL_NAND_OFS
 	hex "Offset of OS command line args for Falcon-mode NAND boot"
 	depends on CMD_SPL
+	depends on CMD_SPL && (TPL_NAND_SUPPORT || SPL_NAND_SUPPORT)
 	default 0
 	help
 	  This provides the offset of the command line arguments for Linux
Signature · 1 line
2.11.0
#1 lore raw

PATCH 2/4 Kconfig: cosmetic: Update description of CMD_SPL_NAND_OFS

The CMD_SPL_NAND_OFS description was a bit misleading, has been updated.

---

 cmd/Kconfig | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
cmd/Kconfig +1 -2
index 7bc275f135..4dec190a38 100644
@@ -325,8 +325,7 @@ config CMD_SPL
 	  command.
 
 config CMD_SPL_NAND_OFS
-	hex "Offset of OS command line args for Falcon-mode NAND boot"
-	depends on CMD_SPL
+	hex "Offset of OS args or dtb for Falcon-mode NAND boot"
 	depends on CMD_SPL && (TPL_NAND_SUPPORT || SPL_NAND_SUPPORT)
 	default 0
 	help
Signature · 1 line
2.11.0
#2 lore raw

PATCH 3/4 Kconfig: Add CMD_SPL_NOR_OFS config for falcon boot argument offset

In reply to Lukasz Majewski

This option will provide the offset in the parallel NOR flash memory to, which the falcon boot data is stored.

---

 cmd/Kconfig | 8 ++++++++
 1 file changed, 8 insertions(+)
cmd/Kconfig +8 -0
index 4dec190a38..b4b10cce00 100644
@@ -334,6 +334,14 @@ config CMD_SPL_NAND_OFS
 	  for full information about how to use this option (and also see
 	  board/gateworks/gw_ventana/README for an example).
 
+config CMD_SPL_NOR_OFS
+	hex "Offset of OS args or dtb for Falcon-mode NOR boot"
+	depends on CMD_SPL && SPL_NOR_SUPPORT
+	default 0
+	help
+	  This provides the offset of the command line arguments or dtb for
+	  Linux when booting from NOR in Falcon mode.
+
 config CMD_SPL_WRITE_SIZE
 	hex "Size of argument area"
 	depends on CMD_SPL
Signature · 1 line
2.11.0
#3 lore raw

PATCH 4/4 doc: Update parallel NOR flash related information in README.falcon

In reply to Lukasz Majewski

This commit updates the doc/README.falcon regarding Falcon boot on NOR flash memories.

---

 doc/README.falcon | 3 +++
 1 file changed, 3 insertions(+)
doc/README.falcon +3 -0
index 9a7f0bc235..204f4b12b6 100644
@@ -67,6 +67,9 @@ CONFIG_SYS_NAND_SPL_KERNEL_OFFS	Offset in NAND where the kernel is stored
 
 CONFIG_CMD_SPL_NAND_OFS	Offset in NAND where the parameters area was saved.
 
+CONFIG_CMD_SPL_NOR_OFS	Offset in NOR where the parameters area was saved.
+			(Please refer to MCCMON6 board's configuraiton)
+
 CONFIG_CMD_SPL_WRITE_SIZE 	Size of the parameters area to be copied
 
 CONFIG_SPL_OS_BOOT	Activate Falcon Mode.
Signature · 1 line
2.11.0
#4 lore raw

PATCH 4/4 doc: Update parallel NOR flash related information in README.falcon

doc/README.falcon CONFIG_SYS_NAND_SPL_KERNEL_OFFS Offset in NAND where the kernel is stored · line 71

Quoted 4 lines · Lukasz Majewski

CONFIG_CMD_SPL_NAND_OFS Offset in NAND where the parameters area was saved.

doc/README.falcon +2 -0
+CONFIG_CMD_SPL_NOR_OFS Offset in NOR where the parameters area was saved.
+                       (Please refer to MCCMON6 board's configuraiton)

Typo: configuration.

Also, it is not very obvious for the reader where the MCCMON6 board configuration is located.

It would be easier to explicitly mention configs/mccmon6_nor_defconfig as an example.