Skip to contentSkip to conversation

arm: mvebu: db-88f6720: Fix CONFIG_SPL_TEXT_BASE and remove wrong memory layout

PATCH In review Pali Rohár 2 participants 3 messages Jan 12, 2022 – Jan 14, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm: mvebu: db-88f6720: Fix CONFIG_SPL_TEXT_BASE and remove wrong memory layout

Memory layout in the comment is from Armada XP platform which uses load address 0x40004030. DB-88f6720 is Armada 375 platform which uses same load address as Armada 38x which is 0x40000030.

Currently SPL support for Armada 375 is unfinished and does not work. There is missing Serdes initialization and DDR3 training code. So nobody noticed that CONFIG_SPL_* options are not correct.

Fix at least CONFIG_SPL_TEXT_BASE constant and remove incorrect comments about memory layout. So it is not misleading.

---
 configs/db-88f6720_defconfig |  2 +-
 include/configs/db-88f6720.h | 15 +--------------
 2 files changed, 2 insertions(+), 15 deletions(-)
configs/db-88f6720_defconfig +1 -1
index 32a7349993ca..2e8f4c00de50 100644
@@ -11,7 +11,7 @@ CONFIG_ENV_SIZE=0x10000
 CONFIG_ENV_OFFSET=0x100000
 CONFIG_ENV_SECT_SIZE=0x10000
 CONFIG_DEFAULT_DEVICE_TREE="armada-375-db"
-CONFIG_SPL_TEXT_BASE=0x40004030
+CONFIG_SPL_TEXT_BASE=0x40000030
 CONFIG_SPL_SERIAL=y
 CONFIG_SPL=y
 CONFIG_DEBUG_UART_BASE=0xf1012000
include/configs/db-88f6720.h +1 -14
index 19fc669f89d1..cf9e44d17c32 100644
@@ -32,22 +32,9 @@
  */
 #include "mv-common.h"
 
-/*
- * Memory layout while starting into the bin_hdr via the
- * BootROM:
- *
- * 0x4000.4000 - 0x4003.4000	headers space (192KiB)
- * 0x4000.4030			bin_hdr start address
- * 0x4003.4000 - 0x4004.7c00	BootROM memory allocations (15KiB)
- * 0x4007.fffc			BootROM stack top
- *
- * The address space between 0x4007.fffc and 0x400f.fff is not locked in
- * L2 cache thus cannot be used.
- */
-
 /* SPL */
 /* Defines for SPL */
-#define CONFIG_SPL_MAX_SIZE		((128 << 10) - 0x4030)
+#define CONFIG_SPL_MAX_SIZE		((128 << 10) - 0x0030)
 
 #define CONFIG_SPL_BSS_START_ADDR	(0x40000000 + (128 << 10))
 #define CONFIG_SPL_BSS_MAX_SIZE		(16 << 10)
Signature · 1 line
2.20.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 4 lines · Pali Rohár

Memory layout in the comment is from Armada XP platform which uses load address 0x40004030. DB-88f6720 is Armada 375 platform which uses same load address as Armada 38x which is 0x40000030.

Quoted 8 lines

Currently SPL support for Armada 375 is unfinished and does not work. There is missing Serdes initialization and DDR3 training code. So nobody noticed that CONFIG_SPL_* options are not correct.

Fix at least CONFIG_SPL_TEXT_BASE constant and remove incorrect comments about memory layout. So it is not misleading.

Thanks,
Stefan

Quoted 37 lines
---
  configs/db-88f6720_defconfig |  2 +-
  include/configs/db-88f6720.h | 15 +--------------
  2 files changed, 2 insertions(+), 15 deletions(-)
configs/db-88f6720_defconfig +1 -1
index 32a7349993ca..2e8f4c00de50 100644
@@ -11,7 +11,7 @@ CONFIG_ENV_SIZE=0x10000
  CONFIG_ENV_OFFSET=0x100000
  CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_DEFAULT_DEVICE_TREE="armada-375-db"
-CONFIG_SPL_TEXT_BASE=0x40004030
+CONFIG_SPL_TEXT_BASE=0x40000030
  CONFIG_SPL_SERIAL=y
  CONFIG_SPL=y
  CONFIG_DEBUG_UART_BASE=0xf1012000
include/configs/db-88f6720.h +0 -10
index 19fc669f89d1..cf9e44d17c32 100644
@@ -32,22 +32,9 @@
   */
  #include "mv-common.h"
 
-/*
- * Memory layout while starting into the bin_hdr via the
- * BootROM:
- *
- * 0x4000.4000 - 0x4003.4000	headers space (192KiB)
- * 0x4000.4030			bin_hdr start address
- * 0x4003.4000 - 0x4004.7c00	BootROM memory allocations (15KiB)
- * 0x4007.fffc			BootROM stack top
- *
- * The address space between 0x4007.fffc and 0x400f.fff is not locked in

include/configs/db-88f6720.h line 40

Quoted 10 lines
include/configs/db-88f6720.h +1 -4
- * L2 cache thus cannot be used.
- */
-
  /* SPL */
  /* Defines for SPL */
-#define CONFIG_SPL_MAX_SIZE		((128 << 10) - 0x4030)
+#define CONFIG_SPL_MAX_SIZE		((128 << 10) - 0x0030)
 
  #define CONFIG_SPL_BSS_START_ADDR	(0x40000000 + (128 << 10))
  #define CONFIG_SPL_BSS_MAX_SIZE		(16 << 10)

Viele Grüße,
Stefan Roese

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]
#2 lore raw
In reply to Pali Rohár
Quoted 4 lines · Pali Rohár

Memory layout in the comment is from Armada XP platform which uses load address 0x40004030. DB-88f6720 is Armada 375 platform which uses same load address as Armada 38x which is 0x40000030.

Quoted 8 lines

Currently SPL support for Armada 375 is unfinished and does not work. There is missing Serdes initialization and DDR3 training code. So nobody noticed that CONFIG_SPL_* options are not correct.

Fix at least CONFIG_SPL_TEXT_BASE constant and remove incorrect comments about memory layout. So it is not misleading.

Applied to u-boot-marvell/master

Thanks,
Stefan

Quoted 37 lines
---
  configs/db-88f6720_defconfig |  2 +-
  include/configs/db-88f6720.h | 15 +--------------
  2 files changed, 2 insertions(+), 15 deletions(-)
configs/db-88f6720_defconfig +1 -1
index 32a7349993ca..2e8f4c00de50 100644
@@ -11,7 +11,7 @@ CONFIG_ENV_SIZE=0x10000
  CONFIG_ENV_OFFSET=0x100000
  CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_DEFAULT_DEVICE_TREE="armada-375-db"
-CONFIG_SPL_TEXT_BASE=0x40004030
+CONFIG_SPL_TEXT_BASE=0x40000030
  CONFIG_SPL_SERIAL=y
  CONFIG_SPL=y
  CONFIG_DEBUG_UART_BASE=0xf1012000
include/configs/db-88f6720.h +0 -10
index 19fc669f89d1..cf9e44d17c32 100644
@@ -32,22 +32,9 @@
   */
  #include "mv-common.h"
 
-/*
- * Memory layout while starting into the bin_hdr via the
- * BootROM:
- *
- * 0x4000.4000 - 0x4003.4000	headers space (192KiB)
- * 0x4000.4030			bin_hdr start address
- * 0x4003.4000 - 0x4004.7c00	BootROM memory allocations (15KiB)
- * 0x4007.fffc			BootROM stack top
- *
- * The address space between 0x4007.fffc and 0x400f.fff is not locked in

include/configs/db-88f6720.h line 40

Quoted 10 lines
include/configs/db-88f6720.h +1 -4
- * L2 cache thus cannot be used.
- */
-
  /* SPL */
  /* Defines for SPL */
-#define CONFIG_SPL_MAX_SIZE		((128 << 10) - 0x4030)
+#define CONFIG_SPL_MAX_SIZE		((128 << 10) - 0x0030)
 
  #define CONFIG_SPL_BSS_START_ADDR	(0x40000000 + (128 << 10))
  #define CONFIG_SPL_BSS_MAX_SIZE		(16 << 10)

Viele Grüße,
Stefan Roese

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]