Skip to contentSkip to conversation

riscv: sifive/fu540: Booting from SPI

PATCH Superseded Jagan Teki 3 participants 20 messages May 19, 2020 – May 25, 2020

Subsystems (2)

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Jagan Teki

author
#0 lore raw

v2 cover riscv: sifive/fu540: Booting from SPI

This series support Boot from SPI on SiFive FU540 HiFive Unleashed board, with improved version of detecting bootmode at runtime.

Previous version changes are at [1].

Changes for v2:
- fu540 board driver
- runtime bootmode detection
- rebase on Pragnesh v11 series

[1] https://patchwork.ozlabs.org/project/uboot/cover/20200420140514.25847-1-jagan at amarulasolutions.com/

Any inputs?
Jagan.

Jagan Teki (9):
spl: Try to get SPL boot device via board_get_int
dt-bindings: board: Document sifive,fu540-modeselect
riscv: dts: fu540-c000-u-boot: Add sifive,fu540-modeselect
drivers: Add fu540 board driver
sifive: fu540: Add Booting from SPI
env: Enable SPI flash env for SiFive FU540
sifive: fu540: Mark the default env as SPI flash
sifive: fu540: Add boot flash script offset, size
sifive: fu540: Enable SF distro bootcmd

 arch/riscv/cpu/fu540/Kconfig                  | 15 ++++
 arch/riscv/dts/fu540-c000-u-boot.dtsi         |  7 ++
 .../dts/hifive-unleashed-a00-u-boot.dtsi      | 12 +++
 board/sifive/fu540/Kconfig                    |  1 +
 board/sifive/fu540/fu540.c                    | 12 ---
 common/spl/spl.c                              | 14 ++-
 configs/sifive_fu540_defconfig                |  4 +
 doc/board/sifive/fu540.rst                    | 41 +++++++++
 .../board/sifive,fu540-modeselect.txt         | 15 ++++
 drivers/board/Kconfig                         |  8 ++
 drivers/board/Makefile                        |  1 +
 drivers/board/fu540.c                         | 86 +++++++++++++++++++
 include/board.h                               |  9 ++
 include/configs/sifive-fu540.h                |  7 +-
 14 files changed, 218 insertions(+), 14 deletions(-)
 create mode 100644 doc/device-tree-bindings/board/sifive,fu540-modeselect.txt
 create mode 100644 drivers/board/fu540.c
Signature · 1 line
2.20.1
author
#1 lore raw

PATCH v2 1/9 spl: Try to get SPL boot device via board_get_int

Usually, the associated board would supply spl boot device using spl_boot_device() but some boards have board driver that are possible to supply boot device via board_get_int with BOARD_SPL_BOOT_DEVICE id.

This patch add support for those.

Cc Mario Six <[email protected]>
Cc Tom Rini <[email protected]>
Cc Simon Glass <[email protected]>
Cc Jean-Jacques Hiblot <[email protected]>

---
Changes for v2:
- new patch

 common/spl/spl.c | 14 +++++++++++++-
 include/board.h  |  9 +++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
common/spl/spl.c +13 -1
index fc5cbbbeba..a07b71b3c1 100644
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <bloblist.h>
 #include <binman_sym.h>
+#include <board.h>
 #include <dm.h>
 #include <handoff.h>
 #include <hang.h>
@@ -483,9 +484,20 @@ int spl_init(void)
 #define BOOT_DEVICE_NONE 0xdeadbeef
 #endif
 
+__weak u32 spl_boot_device(void)
+{
+	return 0;
+}
+
 __weak void board_boot_order(u32 *spl_boot_list)
 {
-	spl_boot_list[0] = spl_boot_device();
+	struct udevice *board;
+
+	if (!board_get(&board))
+		board_get_int(board, BOARD_SPL_BOOT_DEVICE,
+			      (int *)&spl_boot_list[0]);
+	else
+		spl_boot_list[0] = spl_boot_device();
 }
 
 static struct spl_image_loader *spl_ll_find_loader(uint boot_device)
include/board.h +9 -0
index 678b652b0a..ce4eaba38d 100644
@@ -211,3 +211,12 @@ static inline int board_get_fit_loadable(struct udevice *dev, int index,
 }
 
 #endif
+
+/**
+ * Common board unique identifier
+ *
+ * @BOARD_SPL_BOOT_DEVICE:	id to get SPL boot device.
+ */
+enum common_ids {
+	BOARD_SPL_BOOT_DEVICE,
+};
Signature · 1 line
2.20.1
#2 lore raw

PATCH v2 1/9 spl: Try to get SPL boot device via board_get_int

Quoted 61 lines · Jagan Teki

Usually, the associated board would supply spl boot device using spl_boot_device() but some boards have board driver that are possible to supply boot device via board_get_int with BOARD_SPL_BOOT_DEVICE id.

This patch add support for those.

Cc Mario Six <[email protected]>
Cc Tom Rini <[email protected]>
Cc Simon Glass <[email protected]>
Cc Jean-Jacques Hiblot <[email protected]>

---
Changes for v2:
- new patch

 common/spl/spl.c | 14 +++++++++++++-
 include/board.h  |  9 +++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
common/spl/spl.c +13 -1
index fc5cbbbeba..a07b71b3c1 100644
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <bloblist.h>
 #include <binman_sym.h>
+#include <board.h>
 #include <dm.h>
 #include <handoff.h>
 #include <hang.h>
@@ -483,9 +484,20 @@ int spl_init(void)
 #define BOOT_DEVICE_NONE 0xdeadbeef
 #endif
 
+__weak u32 spl_boot_device(void)
+{
+	return 0;
+}
+
 __weak void board_boot_order(u32 *spl_boot_list)
 {
-	spl_boot_list[0] = spl_boot_device();
+	struct udevice *board;
+
+	if (!board_get(&board))
+		board_get_int(board, BOARD_SPL_BOOT_DEVICE,
+			      (int *)&spl_boot_list[0]);
+	else
+		spl_boot_list[0] = spl_boot_device();
 }
 
 static struct spl_image_loader *spl_ll_find_loader(uint boot_device)
include/board.h +0 -0
index 678b652b0a..ce4eaba38d 100644
@@ -211,3 +211,12 @@ static inline int board_get_fit_loadable(struct udevice *dev, int index,
 }
 

include/board.h static inline int board_get_fit_loadable(struct udevice *dev, int index, · line 222

Quoted 10 lines
include/board.h +9 -0
 #endif
+
+/**
+ * Common board unique identifier
+ *
+ * @BOARD_SPL_BOOT_DEVICE:	id to get SPL boot device.
+ */
+enum common_ids {
+	BOARD_SPL_BOOT_DEVICE,
+};

I don't understand why we need this abstraction. The intention of what we have today is that the generic SPL framework calls out to something to ask "what are we booted from?". Why can the board driver not just supply that information? Thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200520/c637c17d/attachment.sig>
author
#3 lore raw

PATCH v2 1/9 spl: Try to get SPL boot device via board_get_int

Quoted 64 lines · Tom Rini
Quoted 61 lines · Jagan Teki

Usually, the associated board would supply spl boot device using spl_boot_device() but some boards have board driver that are possible to supply boot device via board_get_int with BOARD_SPL_BOOT_DEVICE id.

This patch add support for those.

Cc Mario Six <[email protected]>
Cc Tom Rini <[email protected]>
Cc Simon Glass <[email protected]>
Cc Jean-Jacques Hiblot <[email protected]>

---
Changes for v2:
- new patch

 common/spl/spl.c | 14 +++++++++++++-
 include/board.h  |  9 +++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
common/spl/spl.c +13 -1
index fc5cbbbeba..a07b71b3c1 100644
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <bloblist.h>
 #include <binman_sym.h>
+#include <board.h>
 #include <dm.h>
 #include <handoff.h>
 #include <hang.h>
@@ -483,9 +484,20 @@ int spl_init(void)
 #define BOOT_DEVICE_NONE 0xdeadbeef
 #endif
 
+__weak u32 spl_boot_device(void)
+{
+     return 0;
+}
+
 __weak void board_boot_order(u32 *spl_boot_list)
 {
-     spl_boot_list[0] = spl_boot_device();
+     struct udevice *board;
+
+     if (!board_get(&board))
+             board_get_int(board, BOARD_SPL_BOOT_DEVICE,
+                           (int *)&spl_boot_list[0]);
+     else
+             spl_boot_list[0] = spl_boot_device();
 }
 
 static struct spl_image_loader *spl_ll_find_loader(uint boot_device)
include/board.h +0 -0
index 678b652b0a..ce4eaba38d 100644
@@ -211,3 +211,12 @@ static inline int board_get_fit_loadable(struct udevice *dev, int index,
 }
 
Quoted 15 lines

include/board.h static inline int board_get_fit_loadable(struct udevice *dev, int index, · line 222

Quoted 10 lines
include/board.h +9 -0
 #endif
+
+/**
+ * Common board unique identifier
+ *
+ * @BOARD_SPL_BOOT_DEVICE:   id to get SPL boot device.
+ */
+enum common_ids {
+     BOARD_SPL_BOOT_DEVICE,
+};

I don't understand why we need this abstraction. The intention of what we have today is that the generic SPL framework calls out to something to ask "what are we booted from?". Why can the board driver not just supply that information? Thanks!

Yes, we can update boot-device on respective areas by probing board driver and assign spl_boot_list[0] by explicitly define spl_boot_device function, but this change bypass all these codes. Just like how we did on SPL fit to load the concerned image via board driver.

152781d4641e0e4c37b3a32f699cf99aeec877c8
"spl: fit: Allow the board to tell if more images must be loaded from FIT"

Jagan.

#4 lore raw

PATCH v2 1/9 spl: Try to get SPL boot device via board_get_int

Quoted 81 lines · Jagan Teki
Quoted 64 lines · Tom Rini
Quoted 61 lines · Jagan Teki

Usually, the associated board would supply spl boot device using spl_boot_device() but some boards have board driver that are possible to supply boot device via board_get_int with BOARD_SPL_BOOT_DEVICE id.

This patch add support for those.

Cc Mario Six <[email protected]>
Cc Tom Rini <[email protected]>
Cc Simon Glass <[email protected]>
Cc Jean-Jacques Hiblot <[email protected]>

---
Changes for v2:
- new patch

 common/spl/spl.c | 14 +++++++++++++-
 include/board.h  |  9 +++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
common/spl/spl.c +13 -1
index fc5cbbbeba..a07b71b3c1 100644
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <bloblist.h>
 #include <binman_sym.h>
+#include <board.h>
 #include <dm.h>
 #include <handoff.h>
 #include <hang.h>
@@ -483,9 +484,20 @@ int spl_init(void)
 #define BOOT_DEVICE_NONE 0xdeadbeef
 #endif
 
+__weak u32 spl_boot_device(void)
+{
+     return 0;
+}
+
 __weak void board_boot_order(u32 *spl_boot_list)
 {
-     spl_boot_list[0] = spl_boot_device();
+     struct udevice *board;
+
+     if (!board_get(&board))
+             board_get_int(board, BOARD_SPL_BOOT_DEVICE,
+                           (int *)&spl_boot_list[0]);
+     else
+             spl_boot_list[0] = spl_boot_device();
 }
 
 static struct spl_image_loader *spl_ll_find_loader(uint boot_device)
include/board.h +0 -0
index 678b652b0a..ce4eaba38d 100644
@@ -211,3 +211,12 @@ static inline int board_get_fit_loadable(struct udevice *dev, int index,
 }
 
Quoted 15 lines

include/board.h static inline int board_get_fit_loadable(struct udevice *dev, int index, · line 222

Quoted 10 lines
include/board.h +9 -0
 #endif
+
+/**
+ * Common board unique identifier
+ *
+ * @BOARD_SPL_BOOT_DEVICE:   id to get SPL boot device.
+ */
+enum common_ids {
+     BOARD_SPL_BOOT_DEVICE,
+};

I don't understand why we need this abstraction. The intention of what we have today is that the generic SPL framework calls out to something to ask "what are we booted from?". Why can the board driver not just supply that information? Thanks!

Quoted 5 lines

Yes, we can update boot-device on respective areas by probing board driver and assign spl_boot_list[0] by explicitly define spl_boot_device function, but this change bypass all these codes. Just like how we did on SPL fit to load the concerned image via board driver.

I still don't get it, sorry. Why is spl_boot_device() not provided by the "board" driver to say what to boot in this case?

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200520/0211f759/attachment.sig>
author
#5 lore raw

PATCH v2 1/9 spl: Try to get SPL boot device via board_get_int

Quoted 83 lines · Tom Rini
Quoted 81 lines · Jagan Teki
Quoted 79 lines · Tom Rini
Quoted 61 lines · Jagan Teki

Usually, the associated board would supply spl boot device using spl_boot_device() but some boards have board driver that are possible to supply boot device via board_get_int with BOARD_SPL_BOOT_DEVICE id.

This patch add support for those.

Cc Mario Six <[email protected]>
Cc Tom Rini <[email protected]>
Cc Simon Glass <[email protected]>
Cc Jean-Jacques Hiblot <[email protected]>

---
Changes for v2:
- new patch

 common/spl/spl.c | 14 +++++++++++++-
 include/board.h  |  9 +++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
common/spl/spl.c +13 -1
index fc5cbbbeba..a07b71b3c1 100644
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <bloblist.h>
 #include <binman_sym.h>
+#include <board.h>
 #include <dm.h>
 #include <handoff.h>
 #include <hang.h>
@@ -483,9 +484,20 @@ int spl_init(void)
 #define BOOT_DEVICE_NONE 0xdeadbeef
 #endif
 
+__weak u32 spl_boot_device(void)
+{
+     return 0;
+}
+
 __weak void board_boot_order(u32 *spl_boot_list)
 {
-     spl_boot_list[0] = spl_boot_device();
+     struct udevice *board;
+
+     if (!board_get(&board))
+             board_get_int(board, BOARD_SPL_BOOT_DEVICE,
+                           (int *)&spl_boot_list[0]);
+     else
+             spl_boot_list[0] = spl_boot_device();
 }
 
 static struct spl_image_loader *spl_ll_find_loader(uint boot_device)
include/board.h +0 -0
index 678b652b0a..ce4eaba38d 100644
@@ -211,3 +211,12 @@ static inline int board_get_fit_loadable(struct udevice *dev, int index,
 }
 

include/board.h static inline int board_get_fit_loadable(struct udevice *dev, int index, · line 222

Quoted 10 lines
include/board.h +9 -0
 #endif
+
+/**
+ * Common board unique identifier
+ *
+ * @BOARD_SPL_BOOT_DEVICE:   id to get SPL boot device.
+ */
+enum common_ids {
+     BOARD_SPL_BOOT_DEVICE,
+};

I don't understand why we need this abstraction. The intention of what we have today is that the generic SPL framework calls out to something to ask "what are we booted from?". Why can the board driver not just supply that information? Thanks!

Quoted 8 lines
Quoted 5 lines

Yes, we can update boot-device on respective areas by probing board driver and assign spl_boot_list[0] by explicitly define spl_boot_device function, but this change bypass all these codes. Just like how we did on SPL fit to load the concerned image via board driver.

I still don't get it, sorry. Why is spl_boot_device() not provided by the "board" driver to say what to boot in this case?

That means, we have to add spl_boot_device in board-uclass.c ? so-that respective board driver shall use?

Jagan.

#6 lore raw

PATCH v2 1/9 spl: Try to get SPL boot device via board_get_int

Quoted 90 lines · Jagan Teki
Quoted 89 lines · Tom Rini
Quoted 86 lines · Jagan Teki
Quoted 64 lines · Tom Rini
Quoted 61 lines · Jagan Teki

Usually, the associated board would supply spl boot device using spl_boot_device() but some boards have board driver that are possible to supply boot device via board_get_int with BOARD_SPL_BOOT_DEVICE id.

This patch add support for those.

Cc Mario Six <[email protected]>
Cc Tom Rini <[email protected]>
Cc Simon Glass <[email protected]>
Cc Jean-Jacques Hiblot <[email protected]>

---
Changes for v2:
- new patch

 common/spl/spl.c | 14 +++++++++++++-
 include/board.h  |  9 +++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
common/spl/spl.c +13 -1
index fc5cbbbeba..a07b71b3c1 100644
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <bloblist.h>
 #include <binman_sym.h>
+#include <board.h>
 #include <dm.h>
 #include <handoff.h>
 #include <hang.h>
@@ -483,9 +484,20 @@ int spl_init(void)
 #define BOOT_DEVICE_NONE 0xdeadbeef
 #endif
 
+__weak u32 spl_boot_device(void)
+{
+     return 0;
+}
+
 __weak void board_boot_order(u32 *spl_boot_list)
 {
-     spl_boot_list[0] = spl_boot_device();
+     struct udevice *board;
+
+     if (!board_get(&board))
+             board_get_int(board, BOARD_SPL_BOOT_DEVICE,
+                           (int *)&spl_boot_list[0]);
+     else
+             spl_boot_list[0] = spl_boot_device();
 }
 
 static struct spl_image_loader *spl_ll_find_loader(uint boot_device)
include/board.h +0 -0
index 678b652b0a..ce4eaba38d 100644
@@ -211,3 +211,12 @@ static inline int board_get_fit_loadable(struct udevice *dev, int index,
 }
 
Quoted 15 lines

include/board.h static inline int board_get_fit_loadable(struct udevice *dev, int index, · line 222

Quoted 10 lines
include/board.h +9 -0
 #endif
+
+/**
+ * Common board unique identifier
+ *
+ * @BOARD_SPL_BOOT_DEVICE:   id to get SPL boot device.
+ */
+enum common_ids {
+     BOARD_SPL_BOOT_DEVICE,
+};

I don't understand why we need this abstraction. The intention of what we have today is that the generic SPL framework calls out to something to ask "what are we booted from?". Why can the board driver not just supply that information? Thanks!

Yes, we can update boot-device on respective areas by probing board driver and assign spl_boot_list[0] by explicitly define spl_boot_device function, but this change bypass all these codes. Just like how we did on SPL fit to load the concerned image via board driver.

Quoted 5 lines
Quoted 2 lines

I still don't get it, sorry. Why is spl_boot_device() not provided by the "board" driver to say what to boot in this case?

That means, we have to add spl_boot_device in board-uclass.c ? so-that respective board driver shall use?

Yes, or perhaps a board driver doesn't even make sense in this case and the existing abstraction should be used as is? This isn't a unique problem, it's something we've been handling in SPL since the beginning. In so far as we can now try and solve this problem with something DM-based instead of not, it should still I believe just be the same function call.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200522/4c67de72/attachment.sig>
author
#7 lore raw

PATCH v2 1/9 spl: Try to get SPL boot device via board_get_int

Quoted 98 lines · Tom Rini
Quoted 90 lines · Jagan Teki
Quoted 89 lines · Tom Rini
Quoted 86 lines · Jagan Teki
Quoted 64 lines · Tom Rini
Quoted 61 lines · Jagan Teki

Usually, the associated board would supply spl boot device using spl_boot_device() but some boards have board driver that are possible to supply boot device via board_get_int with BOARD_SPL_BOOT_DEVICE id.

This patch add support for those.

Cc Mario Six <[email protected]>
Cc Tom Rini <[email protected]>
Cc Simon Glass <[email protected]>
Cc Jean-Jacques Hiblot <[email protected]>

---
Changes for v2:
- new patch

 common/spl/spl.c | 14 +++++++++++++-
 include/board.h  |  9 +++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
common/spl/spl.c +13 -1
index fc5cbbbeba..a07b71b3c1 100644
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <bloblist.h>
 #include <binman_sym.h>
+#include <board.h>
 #include <dm.h>
 #include <handoff.h>
 #include <hang.h>
@@ -483,9 +484,20 @@ int spl_init(void)
 #define BOOT_DEVICE_NONE 0xdeadbeef
 #endif
 
+__weak u32 spl_boot_device(void)
+{
+     return 0;
+}
+
 __weak void board_boot_order(u32 *spl_boot_list)
 {
-     spl_boot_list[0] = spl_boot_device();
+     struct udevice *board;
+
+     if (!board_get(&board))
+             board_get_int(board, BOARD_SPL_BOOT_DEVICE,
+                           (int *)&spl_boot_list[0]);
+     else
+             spl_boot_list[0] = spl_boot_device();
 }
 
 static struct spl_image_loader *spl_ll_find_loader(uint boot_device)
include/board.h +0 -0
index 678b652b0a..ce4eaba38d 100644
@@ -211,3 +211,12 @@ static inline int board_get_fit_loadable(struct udevice *dev, int index,
 }
 
Quoted 15 lines

include/board.h static inline int board_get_fit_loadable(struct udevice *dev, int index, · line 222

Quoted 10 lines
include/board.h +9 -0
 #endif
+
+/**
+ * Common board unique identifier
+ *
+ * @BOARD_SPL_BOOT_DEVICE:   id to get SPL boot device.
+ */
+enum common_ids {
+     BOARD_SPL_BOOT_DEVICE,
+};

I don't understand why we need this abstraction. The intention of what we have today is that the generic SPL framework calls out to something to ask "what are we booted from?". Why can the board driver not just supply that information? Thanks!

Yes, we can update boot-device on respective areas by probing board driver and assign spl_boot_list[0] by explicitly define spl_boot_device function, but this change bypass all these codes. Just like how we did on SPL fit to load the concerned image via board driver.

Quoted 5 lines
Quoted 2 lines

I still don't get it, sorry. Why is spl_boot_device() not provided by the "board" driver to say what to boot in this case?

That means, we have to add spl_boot_device in board-uclass.c ? so-that respective board driver shall use?

Quoted 6 lines

Yes, or perhaps a board driver doesn't even make sense in this case and the existing abstraction should be used as is? This isn't a unique problem, it's something we've been handling in SPL since the beginning. In so far as we can now try and solve this problem with something DM-based instead of not, it should still I believe just be the same function call.

I don't understand why we have individual function calls though we have dm supported cases to get rid of those? then why would be the case for spl fit code to pump multiple images via dm board driver? What this patch is trying to do is fundamentally similar, like spl_fit is using a board driver to support multiple fit images where spl is using a board driver to support the desired boot device.

Jagan.

#8 lore raw

PATCH v2 1/9 spl: Try to get SPL boot device via board_get_int

Quoted 106 lines · Jagan Teki
Quoted 98 lines · Tom Rini
Quoted 90 lines · Jagan Teki
Quoted 89 lines · Tom Rini
Quoted 86 lines · Jagan Teki
Quoted 64 lines · Tom Rini
Quoted 61 lines · Jagan Teki

Usually, the associated board would supply spl boot device using spl_boot_device() but some boards have board driver that are possible to supply boot device via board_get_int with BOARD_SPL_BOOT_DEVICE id.

This patch add support for those.

Cc Mario Six <[email protected]>
Cc Tom Rini <[email protected]>
Cc Simon Glass <[email protected]>
Cc Jean-Jacques Hiblot <[email protected]>

---
Changes for v2:
- new patch

 common/spl/spl.c | 14 +++++++++++++-
 include/board.h  |  9 +++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
common/spl/spl.c +13 -1
index fc5cbbbeba..a07b71b3c1 100644
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <bloblist.h>
 #include <binman_sym.h>
+#include <board.h>
 #include <dm.h>
 #include <handoff.h>
 #include <hang.h>
@@ -483,9 +484,20 @@ int spl_init(void)
 #define BOOT_DEVICE_NONE 0xdeadbeef
 #endif
 
+__weak u32 spl_boot_device(void)
+{
+     return 0;
+}
+
 __weak void board_boot_order(u32 *spl_boot_list)
 {
-     spl_boot_list[0] = spl_boot_device();
+     struct udevice *board;
+
+     if (!board_get(&board))
+             board_get_int(board, BOARD_SPL_BOOT_DEVICE,
+                           (int *)&spl_boot_list[0]);
+     else
+             spl_boot_list[0] = spl_boot_device();
 }
 
 static struct spl_image_loader *spl_ll_find_loader(uint boot_device)
include/board.h +0 -0
index 678b652b0a..ce4eaba38d 100644
@@ -211,3 +211,12 @@ static inline int board_get_fit_loadable(struct udevice *dev, int index,
 }
 
Quoted 15 lines

include/board.h static inline int board_get_fit_loadable(struct udevice *dev, int index, · line 222

Quoted 10 lines
include/board.h +9 -0
 #endif
+
+/**
+ * Common board unique identifier
+ *
+ * @BOARD_SPL_BOOT_DEVICE:   id to get SPL boot device.
+ */
+enum common_ids {
+     BOARD_SPL_BOOT_DEVICE,
+};

I don't understand why we need this abstraction. The intention of what we have today is that the generic SPL framework calls out to something to ask "what are we booted from?". Why can the board driver not just supply that information? Thanks!

Yes, we can update boot-device on respective areas by probing board driver and assign spl_boot_list[0] by explicitly define spl_boot_device function, but this change bypass all these codes. Just like how we did on SPL fit to load the concerned image via board driver.

Quoted 5 lines
Quoted 2 lines

I still don't get it, sorry. Why is spl_boot_device() not provided by the "board" driver to say what to boot in this case?

That means, we have to add spl_boot_device in board-uclass.c ? so-that respective board driver shall use?

Quoted 6 lines

Yes, or perhaps a board driver doesn't even make sense in this case and the existing abstraction should be used as is? This isn't a unique problem, it's something we've been handling in SPL since the beginning. In so far as we can now try and solve this problem with something DM-based instead of not, it should still I believe just be the same function call.

Quoted 6 lines

I don't understand why we have individual function calls though we have dm supported cases to get rid of those? then why would be the case for spl fit code to pump multiple images via dm board driver? What this patch is trying to do is fundamentally similar, like spl_fit is using a board driver to support multiple fit images where spl is using a board driver to support the desired boot device.

Because when using DM it needs to be to improve things overall, not just duplicate them. We have an abstraction for "figure out what device we've booted from" already. I don't see how your changes are improving the situation, just making the same abstraction with more calls.

When we're dealing with SPL we need to be even more thoughtful than usual about size impacts. So the DM implementation of spl_boot_device() belongs elsewhere rather than making SPL do some checks and doing DM or not DM. Thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200525/835a584c/attachment.sig>
author
#9 lore raw

PATCH v2 2/9 dt-bindings: board: Document sifive,fu540-modeselect

In reply to Jagan Teki

Add dt-bindings documentation for sifive,fu540-modeselect board driver, which usually get runtime boot mode of fu540 boards.

---
Changes for v2:
- new patch

 .../board/sifive,fu540-modeselect.txt             | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 doc/device-tree-bindings/board/sifive,fu540-modeselect.txt
doc/device-tree-bindings/board/sifive,fu540-modeselect.txt new file +15 -0
new file mode 100644
index 0000000000..801c068390
@@ -0,0 +1,15 @@
+fu540 board driver
+
+This driver provides capabilities to get the current boot device for
+fu540 associated board.
+
+Required properties:
+- compatible:	should be "sifive,fu540-modeselect"
+- reg:		physical base address and size of fu540 modeselct
+
+Example:
+
+board: mode at 1000 {
+	compatible = "sifive,fu540-modeselect";
+	reg = <0x0 0x1000 0x0 0x1FFF>;
+};
Signature · 1 line
2.20.1
#10 lore raw

PATCH v2 2/9 dt-bindings: board: Document sifive, fu540-modeselect

Hi Jagan,

Quoted 20 lines · Jagan Teki

Add dt-bindings documentation for sifive,fu540-modeselect board driver, which usually get runtime boot mode of fu540 boards.

---
Changes for v2:
- new patch

 .../board/sifive,fu540-modeselect.txt             | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 doc/device-tree-bindings/board/sifive,fu540-modeselect.txt
doc/device-tree-bindings/board/sifive,fu540-modeselect.txt new file +0 -0
new file mode 100644
index 0000000000..801c068390

doc/device-tree-bindings/board/sifive,fu540-modeselect.txt line 4

Quoted 4 lines
doc/device-tree-bindings/board/sifive,fu540-modeselect.txt new file +4 -0
@@ -0,0 +1,15 @@
+fu540 board driver
+
+This driver provides capabilities to get the current boot device for
+fu540 associated board.

This is not a board specific setting, but a SoC specific setting. The MSEL is common for all FU540 based board.

doc/device-tree-bindings/board/sifive,fu540-modeselect.txt line 14

Quoted 10 lines
doc/device-tree-bindings/board/sifive,fu540-modeselect.txt new file +10 -0
+
+Required properties:
+- compatible:  should be "sifive,fu540-modeselect"
+- reg:         physical base address and size of fu540 modeselct
+
+Example:
+
+board: mode at 1000 {
+       compatible = "sifive,fu540-modeselect";
+       reg = <0x0 0x1000 0x0 0x1FFF>;

We should only map 4 bytes for mode select.

doc/device-tree-bindings/board/sifive,fu540-modeselect.txt

Quoted 2 lines
doc/device-tree-bindings/board/sifive,fu540-modeselect.txt new file +1 -1
+};
--

Regards,
Bin

author
#11 lore raw

PATCH v2 3/9 riscv: dts: fu540-c000-u-boot: Add sifive, fu540-modeselect

In reply to Jagan Teki

Add sifive,fu540-modeselect node, which usually get runtime boot mode of fu540 boards.

---
Changes for v2:
- new patch

 arch/riscv/dts/fu540-c000-u-boot.dtsi | 7 +++++++
 1 file changed, 7 insertions(+)
arch/riscv/dts/fu540-c000-u-boot.dtsi +7 -0
index fc91a7c987..0ccda0e59b 100644
@@ -48,6 +48,13 @@
 
 	soc {
 		u-boot,dm-spl;
+
+		board: mode at 1000 {
+			compatible = "sifive,fu540-modeselect";
+			reg = <0x0 0x1000 0x0 0x1FFF>;
+			u-boot,dm-spl;
+		};
+
 		otp: otp at 10070000 {
 			compatible = "sifive,fu540-c000-otp";
 			reg = <0x0 0x10070000 0x0 0x0FFF>;
Signature · 1 line
2.20.1
author
#12 lore raw

PATCH v2 4/9 drivers: Add fu540 board driver

In reply to Jagan Teki

Add fu540 board driver, which is used to get runtime boot mode of fu540 boards.

Cc Mario Six <[email protected]>
Cc Tom Rini <[email protected]>
Cc Simon Glass <[email protected]>
Cc Jean-Jacques Hiblot <[email protected]>

---
Changes for v2:
- new patch

 drivers/board/Kconfig  |  8 ++++
 drivers/board/Makefile |  1 +
 drivers/board/fu540.c  | 86 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 95 insertions(+)
 create mode 100644 drivers/board/fu540.c
drivers/board/Kconfig +8 -0
index 254f657049..306ee76bbd 100644
@@ -12,6 +12,14 @@ config SPL_BOARD
 	depends on SPL_DM
 	bool "Enable board driver support in SPL"
 
+config BOARD_FU540
+	bool "Enable board driver for the FU540 boards"
+	depends on RISCV
+	select SPL_BOARD
+	help
+	  Support querying board information for the fu540 boards, like
+	  get soc mode select, get SPL boot device and etc.
+
 config BOARD_GAZERBEAM
 	bool "Enable board driver for the Gazerbeam board"
 	help
drivers/board/Makefile +1 -0
index cc16361755..e924472779 100644
@@ -3,5 +3,6 @@
 # (C) Copyright 2017
 # Mario Six,  Guntermann & Drunck GmbH, mario.six at gdsys.cc
 obj-y += board-uclass.o
+obj-$(CONFIG_BOARD_FU540) += fu540.o
 obj-$(CONFIG_BOARD_GAZERBEAM) += gazerbeam.o
 obj-$(CONFIG_BOARD_SANDBOX) += sandbox.o
drivers/board/fu540.c new file +86 -0

86 lines not on this page · raw message

Signature · 1 line
2.20.1
author
#13 lore raw

PATCH v2 5/9 sifive: fu540: Add Booting from SPI

In reply to Jagan Teki

U-Boot SPL 2020.07-rc2-00156-gb9abb0716a-dirty (May 19 2020 - 21:56:17 +0530) Trying to boot from SPI

U-Boot 2020.07-rc2-00156-gb9abb0716a-dirty (May 19 2020 - 21:56:17 +0530)

CPU:   rv64imafdc
Model: SiFive HiFive Unleashed A00
DRAM:  8 GiB
No reserved memory region found in source FDT
MMC:   spi at 10050000:mmc at 0: 0
In:    serial at 10010000
Out:   serial at 10010000
Err:   serial at 10010000
Net:   eth0: ethernet at 10090000
Hit any key to stop autoboot:  0

---
Changes for v2:
- enable board driver
- comment spl-payloade-offset
- reference for SPI partition

 arch/riscv/cpu/fu540/Kconfig                  |  2 +
 .../dts/hifive-unleashed-a00-u-boot.dtsi      | 12 ++++++
 board/sifive/fu540/fu540.c                    | 12 ------
 configs/sifive_fu540_defconfig                |  4 ++
 doc/board/sifive/fu540.rst                    | 41 +++++++++++++++++++
 5 files changed, 59 insertions(+), 12 deletions(-)
arch/riscv/cpu/fu540/Kconfig +2 -0
index e9302e87c0..7a813a9ac8 100644
@@ -5,6 +5,8 @@
 config SIFIVE_FU540
 	bool
 	select ARCH_EARLY_INIT_R
+	imply BOARD
+	imply BOARD_FU540
 	imply CPU
 	imply CPU_RISCV
 	imply RISCV_TIMER
arch/riscv/dts/hifive-unleashed-a00-u-boot.dtsi +12 -0
index 303806454b..4b2b242deb 100644
@@ -12,6 +12,10 @@
 		spi2 = &qspi2;
 	};
 
+	config {
+		u-boot,spl-payload-offset = <0x105000>; /* loader2 @1044KB */
+	};
+
 	hfclk {
 		u-boot,dm-spl;
 	};
@@ -22,6 +26,14 @@
 
 };
 
+&qspi0 {
+	u-boot,dm-spl;
+
+	flash at 0 {
+		u-boot,dm-spl;
+	};
+};
+
 &qspi2 {
 	mmc at 0 {
 		u-boot,dm-spl;
board/sifive/fu540/fu540.c +0 -12
index 535ab60aed..a7b530b281 100644
@@ -116,18 +116,6 @@ int board_init(void)
 	return 0;
 }
 
-#ifdef CONFIG_SPL
-u32 spl_boot_device(void)
-{
-#ifdef CONFIG_SPL_MMC_SUPPORT
-	return BOOT_DEVICE_MMC1;
-#else
-	puts("Unknown boot device\n");
-	hang();
-#endif
-}
-#endif
-
 #ifdef CONFIG_SPL_LOAD_FIT
 int board_fit_config_name_match(const char *name)
 {
configs/sifive_fu540_defconfig +4 -0
index 8d412f8d6a..551d4b04a5 100644
@@ -2,9 +2,11 @@ CONFIG_RISCV=y
 CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_SYS_MALLOC_F_LEN=0x3000
 CONFIG_ENV_SIZE=0x20000
+CONFIG_SPL_DM_SPI=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_SPL=y
+CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_TARGET_SIFIVE_FU540=y
 CONFIG_ARCH_RV64I=y
@@ -15,9 +17,11 @@ CONFIG_MISC_INIT_R=y
 CONFIG_DISPLAY_CPUINFO=y
 CONFIG_DISPLAY_BOARDINFO=y
 CONFIG_SPL_SEPARATE_BSS=y
+CONFIG_SPL_SPI_LOAD=y
 CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_OF_BOARD_FIXUP=y
 CONFIG_DEFAULT_DEVICE_TREE="hifive-unleashed-a00"
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_SPL_CLK=y
 CONFIG_DM_MTD=y
doc/board/sifive/fu540.rst +41 -0

44 lines not on this page · raw message

Signature · 1 line
2.20.1
author
#14 lore raw

PATCH v2 6/9 env: Enable SPI flash env for SiFive FU540

In reply to Jagan Teki

SPI flash device on HiFive Unleashed has 32MiB Size.

This patch add SPI flash environment after U-Boot proper partition with a size of 128KiB.

SPI flash partition layout(32MiB):
0 - 34 : reserved for GPT header
35 - 39 : unused
40 - 2087 : loader1 (SPL, FSBL)
2088 - 10279 : loader2 (U-Boot proper, U-Boot)
10280 - 10535 : environment
10536 - 65494 : rootfs
65528 - 65536 : distro script

Note: the loader1 must start from 40th sector even though there are 6 free sectors prior since 40th sector is nearest flash sector boundary.?

---
Changes for v2:
- move env offsets from generic to cpu Kconfig

 arch/riscv/cpu/fu540/Kconfig | 13 +++++++++++++
 1 file changed, 13 insertions(+)
arch/riscv/cpu/fu540/Kconfig +13 -0
index 7a813a9ac8..417926d2cf 100644
@@ -15,3 +15,16 @@ config SIFIVE_FU540
 	imply SPL_CPU_SUPPORT
 	imply SPL_OPENSBI
 	imply SPL_LOAD_FIT
+
+if CONFIG_ENV_IS_IN_SPI_FLASH
+
+config ENV_OFFSET
+	default 0x505000
+
+config ENV_SIZE
+	default 0x20000
+
+config ENV_SECT_SIZE
+	default 0x10000
+
+endif # CONFIG_ENV_IS_IN_SPI_FLASH
Signature · 1 line
2.20.1
author
#15 lore raw

PATCH v2 7/9 sifive: fu540: Mark the default env as SPI flash

In reply to Jagan Teki

Mark the default U-Boot environment as SPI flash since this is an on board flash device.

---
Changes for v2:
- none

 board/sifive/fu540/Kconfig | 1 +
 1 file changed, 1 insertion(+)
board/sifive/fu540/Kconfig +1 -0
index 86193d7668..e1ba629e37 100644
@@ -27,6 +27,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select SIFIVE_FU540
 	select SUPPORT_SPL
+	select ENV_IS_IN_SPI_FLASH
 	select RAM
 	select SPL_RAM if SPL
 	imply CMD_DHCP
Signature · 1 line
2.20.1
author
#16 lore raw

PATCH v2 8/9 sifive: fu540: Add boot flash script offset, size

In reply to Jagan Teki

HiFive-Unleashed-A00 has SPI flash with 32MiB size. So, let's use the script offset at the end of 4K. This way it cannot overlap any offsets being used by software components in flash layout.

So, SF distrocmd will pick the script at desired script address and run.

---
Changes for v2:
- none

 include/configs/sifive-fu540.h | 2 ++
 1 file changed, 2 insertions(+)
include/configs/sifive-fu540.h +2 -0
index 72c841eb9b..68fda14d76 100644
@@ -62,6 +62,8 @@
 	"kernel_addr_r=0x84000000\0" \
 	"fdt_addr_r=0x88000000\0" \
 	"scriptaddr=0x88100000\0" \
+	"script_offset_f=0x1fff000\0" \
+	"script_size_f=0x1000\0" \
 	"pxefile_addr_r=0x88200000\0" \
 	"ramdisk_addr_r=0x88300000\0" \
 	"type_guid_gpt_loader1=" TYPE_GUID_LOADER1 "\0" \
Signature · 1 line
2.20.1
author
#17 lore raw

PATCH v2 9/9 sifive: fu540: Enable SF distro bootcmd

In reply to Jagan Teki

Enable SPI flash(SF) distro boot command in Sifive FU540.

This distro boot will read the boot script at specific location at the flash and start sourcing the same.

Included the SF device at the last of the target devices list since all the rest of the devices on the list have more possibility to boot the distribution due to the size of the SPI flash is concern.

---
Changes for v2:
- none

 include/configs/sifive-fu540.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
include/configs/sifive-fu540.h +4 -1
index 68fda14d76..f21411a701 100644
@@ -43,9 +43,11 @@
 #ifndef CONFIG_SPL_BUILD
 #define BOOT_TARGET_DEVICES(func) \
 	func(MMC, mmc, 0) \
+	func(SF, sf, 0) \
 	func(DHCP, dhcp, na)
 
 #include <config_distro_bootcmd.h>
+#include <environment/distro/sf.h>
 
 #define TYPE_GUID_LOADER1	"5B193300-FC78-40CD-8002-E86C45580B47"
 #define TYPE_GUID_LOADER2	"2E54B353-1271-4842-806F-E436D6AF6985"
@@ -70,7 +72,8 @@
 	"type_guid_gpt_loader2=" TYPE_GUID_LOADER2 "\0" \
 	"type_guid_gpt_system=" TYPE_GUID_SYSTEM "\0" \
 	"partitions=" PARTS_DEFAULT "\0" \
-	BOOTENV
+	BOOTENV \
+	BOOTENV_SF
 
 #define CONFIG_PREBOOT \
 	"setenv fdt_addr ${fdtcontroladdr};" \
Signature · 1 line
2.20.1
#18 lore raw

v2 cover riscv: sifive/fu540: Booting from SPI

In reply to Jagan Teki

Hi Jagan,

Quoted 6 lines · Jagan Teki

This series support Boot from SPI on SiFive FU540 HiFive Unleashed board, with improved version of detecting bootmode at runtime.

Previous version changes are at [1].

Quoted 8 lines

Changes for v2:
- fu540 board driver
- runtime bootmode detection
- rebase on Pragnesh v11 series

[1] https://patchwork.ozlabs.org/project/uboot/cover/20200420140514.25847-1-jagan at amarulasolutions.com/

Any inputs?

It looks this series does not build?

$ make sifive_fu540_defconfig
$ make -j32
scripts/kconfig/conf  --syncconfig Kconfig
.config:36:warning: symbol value '' invalid for ENV_OFFSET
.config:37:warning: symbol value '' invalid for ENV_SECT_SIZE
*
* Restart config...
*
*
* Environment
*
Environment is not stored (ENV_IS_NOWHERE) [N/y/?] n
Environment in EEPROM (ENV_IS_IN_EEPROM) [N/y/?] n
Environment is in a FAT filesystem (ENV_IS_IN_FAT) [N/y/?] n
Environment is in a EXT4 filesystem (ENV_IS_IN_EXT4) [N/y/?] n
Environment in flash memory (ENV_IS_IN_FLASH) [N/y/?] n
Environment in an MMC device (ENV_IS_IN_MMC) [N/y/?] n
Environment in a NAND device (ENV_IS_IN_NAND) [N/y/?] n
Environment in a non-volatile RAM (ENV_IS_IN_NVRAM) [N/y/?] n
Environment is in OneNAND (ENV_IS_IN_ONENAND) [N/y/?] n
Environment is in remote memory space (ENV_IS_IN_REMOTE) [N/y/?] n
Environment is in SPI flash (ENV_IS_IN_SPI_FLASH) [Y/?] y
  SPI flash bus for environment (USE_ENV_SPI_BUS) [N/y/?] n
  SPI flash chip select for environment (USE_ENV_SPI_CS) [N/y/?] n
  SPI flash max frequency for environment (USE_ENV_SPI_MAX_HZ) [N/y/?] n
  SPI flash mode for environment (USE_ENV_SPI_MODE) [N/y/?] n
Enable redundant environment support (SYS_REDUNDAND_ENVIRONMENT) [N/y/?] n
Environment address (ENV_ADDR) [0x0] 0x0
Environment offset (ENV_OFFSET) [] (NEW)
^Cscripts/kconfig/Makefile:75: recipe for target 'syncconfig' failed
make[2]: *** [syncconfig] Interrupt
Makefile:565: recipe for target 'syncconfig' failed
make[1]: *** [syncconfig] Interrupt

Regards,
Bin

#19 lore raw

v2 cover riscv: sifive/fu540: Booting from SPI

Quoted 46 lines · Bin Meng

Hi Jagan,

Quoted 6 lines · Jagan Teki

This series support Boot from SPI on SiFive FU540 HiFive Unleashed board, with improved version of detecting bootmode at runtime.

Previous version changes are at [1].

Quoted 8 lines

Changes for v2:
- fu540 board driver
- runtime bootmode detection
- rebase on Pragnesh v11 series

[1] https://patchwork.ozlabs.org/project/uboot/cover/20200420140514.25847-1-jagan at amarulasolutions.com/

Any inputs?

It looks this series does not build?

$ make sifive_fu540_defconfig
$ make -j32
scripts/kconfig/conf  --syncconfig Kconfig
.config:36:warning: symbol value '' invalid for ENV_OFFSET
.config:37:warning: symbol value '' invalid for ENV_SECT_SIZE
*
* Restart config...
*
*
* Environment
*
Environment is not stored (ENV_IS_NOWHERE) [N/y/?] n
Environment in EEPROM (ENV_IS_IN_EEPROM) [N/y/?] n
Environment is in a FAT filesystem (ENV_IS_IN_FAT) [N/y/?] n
Environment is in a EXT4 filesystem (ENV_IS_IN_EXT4) [N/y/?] n
Environment in flash memory (ENV_IS_IN_FLASH) [N/y/?] n
Environment in an MMC device (ENV_IS_IN_MMC) [N/y/?] n
Environment in a NAND device (ENV_IS_IN_NAND) [N/y/?] n
Environment in a non-volatile RAM (ENV_IS_IN_NVRAM) [N/y/?] n
Environment is in OneNAND (ENV_IS_IN_ONENAND) [N/y/?] n
Environment is in remote memory space (ENV_IS_IN_REMOTE) [N/y/?] n
Environment is in SPI flash (ENV_IS_IN_SPI_FLASH) [Y/?] y
  SPI flash bus for environment (USE_ENV_SPI_BUS) [N/y/?] n
  SPI flash chip select for environment (USE_ENV_SPI_CS) [N/y/?] n
  SPI flash max frequency for environment (USE_ENV_SPI_MAX_HZ) [N/y/?] n
Quoted 8 lines
  SPI flash mode for environment (USE_ENV_SPI_MODE) [N/y/?] n
Enable redundant environment support (SYS_REDUNDAND_ENVIRONMENT) [N/y/?] n
Environment address (ENV_ADDR) [0x0] 0x0
Environment offset (ENV_OFFSET) [] (NEW)
^Cscripts/kconfig/Makefile:75: recipe for target 'syncconfig' failed
make[2]: *** [syncconfig] Interrupt
Makefile:565: recipe for target 'syncconfig' failed
make[1]: *** [syncconfig] Interrupt

Simply fixed the build by:

arch/riscv/cpu/fu540/Kconfig +0 -4
index 417926d..64f2b93 100644
@@ -16,8 +16,6 @@ config SIFIVE_FU540
        imply SPL_OPENSBI
        imply SPL_LOAD_FIT
 
-if CONFIG_ENV_IS_IN_SPI_FLASH
-
 config ENV_OFFSET
        default 0x505000
 
@@ -26,5 +24,3 @@ config ENV_SIZE
 
 config ENV_SECT_SIZE
        default 0x10000
-
-endif # CONFIG_ENV_IS_IN_SPI_FLASH

Regards,
Bin