arm: mvebu: Replace hardcoded values 0x0030/0x4030 by proper calculation
These hardcoded values were calculated from CONFIG_SPL_TEXT_BASE macro. Now this macro is configurable via Kconfig, so calculate values 0x0030/0x4030 at compile time via CONFIG_SPL_TEXT_BASE option. Values 0x0030/0x4030 represents offset of CONFIG_SPL_TEXT_BASE from address 0x40000000. Signed-off-by: Pali Rohár <pali@kernel.org> Reviewed-by: Stefan Roese <sr@denx.de>
This commit is contained in:
@@ -53,7 +53,7 @@
|
|||||||
|
|
||||||
/* Defines for SPL */
|
/* Defines for SPL */
|
||||||
#define CONFIG_SPL_SIZE (140 << 10)
|
#define CONFIG_SPL_SIZE (140 << 10)
|
||||||
#define CONFIG_SPL_MAX_SIZE (CONFIG_SPL_SIZE - 0x0030)
|
#define CONFIG_SPL_MAX_SIZE (CONFIG_SPL_SIZE - (CONFIG_SPL_TEXT_BASE - 0x40000000))
|
||||||
|
|
||||||
#define CONFIG_SPL_BSS_START_ADDR (0x40000000 + CONFIG_SPL_SIZE)
|
#define CONFIG_SPL_BSS_START_ADDR (0x40000000 + CONFIG_SPL_SIZE)
|
||||||
#define CONFIG_SPL_BSS_MAX_SIZE (16 << 10)
|
#define CONFIG_SPL_BSS_MAX_SIZE (16 << 10)
|
||||||
|
@@ -34,7 +34,7 @@
|
|||||||
|
|
||||||
/* SPL */
|
/* SPL */
|
||||||
/* Defines for SPL */
|
/* Defines for SPL */
|
||||||
#define CONFIG_SPL_MAX_SIZE ((128 << 10) - 0x0030)
|
#define CONFIG_SPL_MAX_SIZE ((128 << 10) - (CONFIG_SPL_TEXT_BASE - 0x40000000))
|
||||||
|
|
||||||
#define CONFIG_SPL_BSS_START_ADDR (0x40000000 + (128 << 10))
|
#define CONFIG_SPL_BSS_START_ADDR (0x40000000 + (128 << 10))
|
||||||
#define CONFIG_SPL_BSS_MAX_SIZE (16 << 10)
|
#define CONFIG_SPL_BSS_MAX_SIZE (16 << 10)
|
||||||
|
@@ -41,7 +41,7 @@
|
|||||||
|
|
||||||
/* Defines for SPL */
|
/* Defines for SPL */
|
||||||
#define CONFIG_SPL_SIZE (140 << 10)
|
#define CONFIG_SPL_SIZE (140 << 10)
|
||||||
#define CONFIG_SPL_MAX_SIZE (CONFIG_SPL_SIZE - 0x0030)
|
#define CONFIG_SPL_MAX_SIZE (CONFIG_SPL_SIZE - (CONFIG_SPL_TEXT_BASE - 0x40000000))
|
||||||
|
|
||||||
#define CONFIG_SPL_BSS_START_ADDR (0x40000000 + CONFIG_SPL_SIZE)
|
#define CONFIG_SPL_BSS_START_ADDR (0x40000000 + CONFIG_SPL_SIZE)
|
||||||
#define CONFIG_SPL_BSS_MAX_SIZE (16 << 10)
|
#define CONFIG_SPL_BSS_MAX_SIZE (16 << 10)
|
||||||
|
@@ -50,7 +50,7 @@
|
|||||||
|
|
||||||
/* Defines for SPL */
|
/* Defines for SPL */
|
||||||
#define CONFIG_SPL_SIZE (140 << 10)
|
#define CONFIG_SPL_SIZE (140 << 10)
|
||||||
#define CONFIG_SPL_MAX_SIZE (CONFIG_SPL_SIZE - 0x0030)
|
#define CONFIG_SPL_MAX_SIZE (CONFIG_SPL_SIZE - (CONFIG_SPL_TEXT_BASE - 0x40000000))
|
||||||
|
|
||||||
#define CONFIG_SPL_BSS_START_ADDR (0x40000000 + CONFIG_SPL_SIZE)
|
#define CONFIG_SPL_BSS_START_ADDR (0x40000000 + CONFIG_SPL_SIZE)
|
||||||
#define CONFIG_SPL_BSS_MAX_SIZE (16 << 10)
|
#define CONFIG_SPL_BSS_MAX_SIZE (16 << 10)
|
||||||
|
@@ -59,7 +59,7 @@
|
|||||||
|
|
||||||
/* SPL */
|
/* SPL */
|
||||||
/* Defines for SPL */
|
/* Defines for SPL */
|
||||||
#define CONFIG_SPL_MAX_SIZE ((128 << 10) - 0x4030)
|
#define CONFIG_SPL_MAX_SIZE ((128 << 10) - (CONFIG_SPL_TEXT_BASE - 0x40000000))
|
||||||
|
|
||||||
#define CONFIG_SPL_BSS_START_ADDR (0x40000000 + (128 << 10))
|
#define CONFIG_SPL_BSS_START_ADDR (0x40000000 + (128 << 10))
|
||||||
#define CONFIG_SPL_BSS_MAX_SIZE (16 << 10)
|
#define CONFIG_SPL_BSS_MAX_SIZE (16 << 10)
|
||||||
|
@@ -45,7 +45,7 @@
|
|||||||
|
|
||||||
/* SPL */
|
/* SPL */
|
||||||
/* Defines for SPL */
|
/* Defines for SPL */
|
||||||
#define CONFIG_SPL_MAX_SIZE ((128 << 10) - 0x4030)
|
#define CONFIG_SPL_MAX_SIZE ((128 << 10) - (CONFIG_SPL_TEXT_BASE - 0x40000000))
|
||||||
|
|
||||||
#define CONFIG_SPL_BSS_START_ADDR (0x40000000 + (128 << 10))
|
#define CONFIG_SPL_BSS_START_ADDR (0x40000000 + (128 << 10))
|
||||||
#define CONFIG_SPL_BSS_MAX_SIZE (16 << 10)
|
#define CONFIG_SPL_BSS_MAX_SIZE (16 << 10)
|
||||||
|
@@ -53,7 +53,7 @@
|
|||||||
|
|
||||||
/* Defines for SPL */
|
/* Defines for SPL */
|
||||||
#define CONFIG_SPL_SIZE (140 << 10)
|
#define CONFIG_SPL_SIZE (140 << 10)
|
||||||
#define CONFIG_SPL_MAX_SIZE (CONFIG_SPL_SIZE - 0x0030)
|
#define CONFIG_SPL_MAX_SIZE (CONFIG_SPL_SIZE - (CONFIG_SPL_TEXT_BASE - 0x40000000))
|
||||||
|
|
||||||
#define CONFIG_SPL_BSS_START_ADDR (0x40000000 + CONFIG_SPL_SIZE)
|
#define CONFIG_SPL_BSS_START_ADDR (0x40000000 + CONFIG_SPL_SIZE)
|
||||||
#define CONFIG_SPL_BSS_MAX_SIZE (16 << 10)
|
#define CONFIG_SPL_BSS_MAX_SIZE (16 << 10)
|
||||||
|
@@ -48,7 +48,7 @@
|
|||||||
|
|
||||||
/* SPL */
|
/* SPL */
|
||||||
/* Defines for SPL */
|
/* Defines for SPL */
|
||||||
#define CONFIG_SPL_MAX_SIZE ((128 << 10) - 0x4030)
|
#define CONFIG_SPL_MAX_SIZE ((128 << 10) - (CONFIG_SPL_TEXT_BASE - 0x40000000))
|
||||||
|
|
||||||
#define CONFIG_SPL_BSS_START_ADDR (0x40000000 + (128 << 10))
|
#define CONFIG_SPL_BSS_START_ADDR (0x40000000 + (128 << 10))
|
||||||
#define CONFIG_SPL_BSS_MAX_SIZE (16 << 10)
|
#define CONFIG_SPL_BSS_MAX_SIZE (16 << 10)
|
||||||
|
@@ -77,7 +77,7 @@
|
|||||||
|
|
||||||
/* SPL */
|
/* SPL */
|
||||||
/* Defines for SPL */
|
/* Defines for SPL */
|
||||||
#define CONFIG_SPL_MAX_SIZE ((128 << 10) - 0x4030)
|
#define CONFIG_SPL_MAX_SIZE ((128 << 10) - (CONFIG_SPL_TEXT_BASE - 0x40000000))
|
||||||
|
|
||||||
#define CONFIG_SPL_BSS_START_ADDR (0x40000000 + (128 << 10))
|
#define CONFIG_SPL_BSS_START_ADDR (0x40000000 + (128 << 10))
|
||||||
#define CONFIG_SPL_BSS_MAX_SIZE (16 << 10)
|
#define CONFIG_SPL_BSS_MAX_SIZE (16 << 10)
|
||||||
|
@@ -28,7 +28,7 @@
|
|||||||
|
|
||||||
/* Defines for SPL */
|
/* Defines for SPL */
|
||||||
#define CONFIG_SPL_SIZE (140 << 10)
|
#define CONFIG_SPL_SIZE (140 << 10)
|
||||||
#define CONFIG_SPL_MAX_SIZE (CONFIG_SPL_SIZE - 0x0030)
|
#define CONFIG_SPL_MAX_SIZE (CONFIG_SPL_SIZE - (CONFIG_SPL_TEXT_BASE - 0x40000000))
|
||||||
|
|
||||||
#define CONFIG_SPL_BSS_START_ADDR (0x40000000 + CONFIG_SPL_SIZE)
|
#define CONFIG_SPL_BSS_START_ADDR (0x40000000 + CONFIG_SPL_SIZE)
|
||||||
#define CONFIG_SPL_BSS_MAX_SIZE (16 << 10)
|
#define CONFIG_SPL_BSS_MAX_SIZE (16 << 10)
|
||||||
|
@@ -68,7 +68,7 @@
|
|||||||
|
|
||||||
/* Defines for SPL */
|
/* Defines for SPL */
|
||||||
#define CONFIG_SPL_SIZE (140 << 10)
|
#define CONFIG_SPL_SIZE (140 << 10)
|
||||||
#define CONFIG_SPL_MAX_SIZE (CONFIG_SPL_SIZE - 0x0030)
|
#define CONFIG_SPL_MAX_SIZE (CONFIG_SPL_SIZE - (CONFIG_SPL_TEXT_BASE - 0x40000000))
|
||||||
|
|
||||||
#define CONFIG_SPL_BSS_START_ADDR (0x40000000 + CONFIG_SPL_SIZE)
|
#define CONFIG_SPL_BSS_START_ADDR (0x40000000 + CONFIG_SPL_SIZE)
|
||||||
#define CONFIG_SPL_BSS_MAX_SIZE (16 << 10)
|
#define CONFIG_SPL_BSS_MAX_SIZE (16 << 10)
|
||||||
|
Reference in New Issue
Block a user