[U-Boot-Users] 83xx: fix CFG_ENV_ADDR and CFG_ENV_SECT_SIZE definitions
Fix the definitions of CFG_ENV_ADDR and CFG_ENV_SECT_SIZE for all the 83xx boards. This change guarantees that the environment will be located on the first flash sector after the U-Boot image.
Signed-off-by: Timur Tabi timur@freescale.com --- include/configs/MPC8313ERDB.h | 2 +- include/configs/MPC8323ERDB.h | 4 ++-- include/configs/MPC832XEMDS.h | 4 ++-- include/configs/MPC8349EMDS.h | 2 +- include/configs/MPC8349ITX.h | 2 +- include/configs/MPC8360EMDS.h | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h index 6568fe1..7f4ad31 100644 --- a/include/configs/MPC8313ERDB.h +++ b/include/configs/MPC8313ERDB.h @@ -326,7 +326,7 @@ */ #ifndef CFG_RAMBOOT #define CFG_ENV_IS_IN_FLASH 1 - #define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) + #define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) #define CFG_ENV_SECT_SIZE 0x10000 /* 64K(one sector) for env */ #define CFG_ENV_SIZE 0x2000
diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h index 376973b..dec89d6 100644 --- a/include/configs/MPC8323ERDB.h +++ b/include/configs/MPC8323ERDB.h @@ -354,8 +354,8 @@ */ #ifndef CFG_RAMBOOT #define CFG_ENV_IS_IN_FLASH 1 - #define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) - #define CFG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ + #define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) + #define CFG_ENV_SECT_SIZE 0x20000 #define CFG_ENV_SIZE 0x2000 #else #define CFG_NO_FLASH 1 /* Flash is not usable now */ diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h index c9c6d88..c8dec0b 100644 --- a/include/configs/MPC832XEMDS.h +++ b/include/configs/MPC832XEMDS.h @@ -410,8 +410,8 @@ */ #ifndef CFG_RAMBOOT #define CFG_ENV_IS_IN_FLASH 1 - #define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) - #define CFG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ + #define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) + #define CFG_ENV_SECT_SIZE 0x20000 #define CFG_ENV_SIZE 0x2000 #else #define CFG_NO_FLASH 1 /* Flash is not usable now */ diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index 92555ba..7d5b17b 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -456,7 +456,7 @@ */ #ifndef CFG_RAMBOOT #define CFG_ENV_IS_IN_FLASH 1 - #define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) + #define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) #define CFG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */ #define CFG_ENV_SIZE 0x2000
diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h index 54cab52..5988ac1 100644 --- a/include/configs/MPC8349ITX.h +++ b/include/configs/MPC8349ITX.h @@ -404,8 +404,8 @@ boards, we say we have two, but don't display a message if we find only one. */
#ifndef CFG_RAMBOOT #define CFG_ENV_IS_IN_FLASH + #define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) #define CFG_ENV_SECT_SIZE 0x10000 /* 64K (one sector) for environment */ - #define CFG_ENV_ADDR (CFG_MONITOR_BASE + (4 * CFG_ENV_SECT_SIZE)) #define CFG_ENV_SIZE 0x2000 #else #define CFG_NO_FLASH /* Flash is not usable now */ diff --git a/include/configs/MPC8360EMDS.h b/include/configs/MPC8360EMDS.h index 41f062c..2d68aa3 100644 --- a/include/configs/MPC8360EMDS.h +++ b/include/configs/MPC8360EMDS.h @@ -443,8 +443,8 @@
#ifndef CFG_RAMBOOT #define CFG_ENV_IS_IN_FLASH 1 - #define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) - #define CFG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ + #define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) + #define CFG_ENV_SECT_SIZE 0x20000 #define CFG_ENV_SIZE 0x2000 #else #define CFG_NO_FLASH 1 /* Flash is not usable now */
Timur Tabi wrote:
Fix the definitions of CFG_ENV_ADDR and CFG_ENV_SECT_SIZE for all the 83xx boards. This change guarantees that the environment will be located on the first flash sector after the U-Boot image.
Signed-off-by: Timur Tabi timur@freescale.com
- #define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
Hi Timur,
IMHO this would work only if the sum of CFG_MONITOR_BASE + CFG_MONITOR_LEN is sector aligned. Did you set CFG_MONITOR_LEN appropriately? (Just to avoid unexpected behaviour)
Best regards Jens
Jens Gehrlein wrote:
IMHO this would work only if the sum of CFG_MONITOR_BASE + CFG_MONITOR_LEN is sector aligned. Did you set CFG_MONITOR_LEN appropriately? (Just to avoid unexpected behaviour)
I'm under the assumption that CFG_MONITOR_LEN is always supposed to be a multiple of the sector size. Should I add comments to the header files to state that explicitly?
Timur Tabi wrote:
Jens Gehrlein wrote:
IMHO this would work only if the sum of CFG_MONITOR_BASE + CFG_MONITOR_LEN is sector aligned. Did you set CFG_MONITOR_LEN appropriately? (Just to avoid unexpected behaviour)
I'm under the assumption that CFG_MONITOR_LEN is always supposed to be a multiple of the sector size. Should I add comments to the header files to state that explicitly?
It's just, because I saw implementations, where CFG_MONITOR_LEN was an arbitrary value. It depends on how the developer interpretes this define and how it is used in the cpu and board specific code.
Maybe a comment would help, but I leave the decision to you.
Best regards Jens
In message 11938442162401-git-send-email-timur@freescale.com you wrote:
Fix the definitions of CFG_ENV_ADDR and CFG_ENV_SECT_SIZE for all the 83xx boards. This change guarantees that the environment will be located on the first flash sector after the U-Boot image.
Signed-off-by: Timur Tabi timur@freescale.com
include/configs/MPC8313ERDB.h | 2 +- include/configs/MPC8323ERDB.h | 4 ++-- include/configs/MPC832XEMDS.h | 4 ++-- include/configs/MPC8349EMDS.h | 2 +- include/configs/MPC8349ITX.h | 2 +- include/configs/MPC8360EMDS.h | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-)
The comment is clearly wrong. Thsi does not apply to *all* 83xx boards (there is a whole world outside of FSL, actually). Please fix and resubmit.
Best regards,
Wolfgang Denk
Wolfgang Denk wrote:
The comment is clearly wrong. Thsi does not apply to *all* 83xx boards (there is a whole world outside of FSL, actually). Please fix and resubmit.
I said "all the 83xx boards", not "all 83xx" boards. Technically, there's a difference. However, I see your point and I will reword the comment.
participants (3)
-
Jens Gehrlein -
Timur Tabi -
Wolfgang Denk