* [U-Boot-Users] [PATCH v3] 83xx: fix CFG_ENV_ADDR and CFG_ENV_SECT_SIZE definitions
@ 2007-11-05 15:34 Timur Tabi
2007-11-05 19:23 ` Wolfgang Denk
2007-11-19 23:13 ` Kim Phillips
0 siblings, 2 replies; 4+ messages in thread
From: Timur Tabi @ 2007-11-05 15:34 UTC (permalink / raw)
To: u-boot
Fix the definitions of CFG_ENV_ADDR and CFG_ENV_SECT_SIZE for all of the
currently-defined 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>
---
Reworded the changelog.
include/configs/MPC8313ERDB.h | 3 ++-
include/configs/MPC8323ERDB.h | 5 +++--
include/configs/MPC832XEMDS.h | 5 +++--
include/configs/MPC8349EMDS.h | 2 +-
include/configs/MPC8349ITX.h | 3 ++-
include/configs/MPC8360EMDS.h | 5 +++--
6 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h
index 6568fe1..0c3bc16 100644
--- a/include/configs/MPC8313ERDB.h
+++ b/include/configs/MPC8313ERDB.h
@@ -178,6 +178,7 @@
#define CFG_GBL_DATA_OFFSET (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE)
#define CFG_INIT_SP_OFFSET CFG_GBL_DATA_OFFSET
+/* CFG_MONITOR_LEN must be a multiple of CFG_ENV_SECT_SIZE */
#define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Mon */
#define CFG_MALLOC_LEN (512 * 1024) /* Reserved for malloc */
@@ -326,7 +327,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..558f94b 100644
--- a/include/configs/MPC8323ERDB.h
+++ b/include/configs/MPC8323ERDB.h
@@ -116,6 +116,7 @@
#undef CFG_RAMBOOT
#endif
+/* CFG_MONITOR_LEN must be a multiple of CFG_ENV_SECT_SIZE */
#define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Mon */
#define CFG_MALLOC_LEN (128 * 1024) /* Reserved for malloc */
@@ -354,8 +355,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..5345fc6 100644
--- a/include/configs/MPC832XEMDS.h
+++ b/include/configs/MPC832XEMDS.h
@@ -145,6 +145,7 @@
#undef CFG_RAMBOOT
#endif
+/* CFG_MONITOR_LEN must be a multiple of CFG_ENV_SECT_SIZE */
#define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Mon */
#define CFG_MALLOC_LEN (128 * 1024) /* Reserved for malloc */
@@ -410,8 +411,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..2a2e753 100644
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@ -261,6 +261,7 @@ boards, we say we have two, but don't display a message if we find only one. */
#define CFG_GBL_DATA_OFFSET (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE)
#define CFG_INIT_SP_OFFSET CFG_GBL_DATA_OFFSET
+/* CFG_MONITOR_LEN must be a multiple of CFG_ENV_SECT_SIZE */
#define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Mon */
#define CFG_MALLOC_LEN (128 * 1024) /* Reserved for malloc */
@@ -404,8 +405,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..8098951 100644
--- a/include/configs/MPC8360EMDS.h
+++ b/include/configs/MPC8360EMDS.h
@@ -170,6 +170,7 @@
#undef CFG_RAMBOOT
#endif
+/* CFG_MONITOR_LEN must be a multiple of CFG_ENV_SECT_SIZE */
#define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Mon */
#define CFG_MALLOC_LEN (128 * 1024) /* Reserved for malloc */
@@ -443,8 +444,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 */
--
1.5.2.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [U-Boot-Users] [PATCH v3] 83xx: fix CFG_ENV_ADDR and CFG_ENV_SECT_SIZE definitions
2007-11-05 15:34 [U-Boot-Users] [PATCH v3] 83xx: fix CFG_ENV_ADDR and CFG_ENV_SECT_SIZE definitions Timur Tabi
@ 2007-11-05 19:23 ` Wolfgang Denk
2007-11-05 19:26 ` Timur Tabi
2007-11-19 23:13 ` Kim Phillips
1 sibling, 1 reply; 4+ messages in thread
From: Wolfgang Denk @ 2007-11-05 19:23 UTC (permalink / raw)
To: u-boot
In message <1194276846902-git-send-email-timur@freescale.com> you wrote:
> Fix the definitions of CFG_ENV_ADDR and CFG_ENV_SECT_SIZE for all of the
> currently-defined 83xx boards. This change guarantees that the environment
> will be located on the first flash sector after the U-Boot image.
No, this comment is definitely wrong.
> include/configs/MPC8313ERDB.h | 3 ++-
> include/configs/MPC8323ERDB.h | 5 +++--
> include/configs/MPC832XEMDS.h | 5 +++--
> include/configs/MPC8349EMDS.h | 2 +-
> include/configs/MPC8349ITX.h | 3 ++-
> include/configs/MPC8360EMDS.h | 5 +++--
> 6 files changed, 14 insertions(+), 9 deletions(-)
You just touch some (Freescale) boards here. For exampole, you don't
touch the code for the TQM834x board.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Conceptual integrity in turn dictates that the design must proceed
from one mind, or from a very small number of agreeing resonant
minds. - Frederick Brooks Jr., "The Mythical Man Month"
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot-Users] [PATCH v3] 83xx: fix CFG_ENV_ADDR and CFG_ENV_SECT_SIZE definitions
2007-11-05 19:23 ` Wolfgang Denk
@ 2007-11-05 19:26 ` Timur Tabi
0 siblings, 0 replies; 4+ messages in thread
From: Timur Tabi @ 2007-11-05 19:26 UTC (permalink / raw)
To: u-boot
Wolfgang Denk wrote:
> In message <1194276846902-git-send-email-timur@freescale.com> you wrote:
>> Fix the definitions of CFG_ENV_ADDR and CFG_ENV_SECT_SIZE for all of the
>> currently-defined 83xx boards. This change guarantees that the environment
>> will be located on the first flash sector after the U-Boot image.
>
> No, this comment is definitely wrong.
Sorry, I understand now. I just kept thinking that "MPC83xx" == all 83xx. I
don't know what's wrong with me.
--
Timur Tabi
Linux kernel developer at Freescale
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot-Users] [PATCH v3] 83xx: fix CFG_ENV_ADDR and CFG_ENV_SECT_SIZE definitions
2007-11-05 15:34 [U-Boot-Users] [PATCH v3] 83xx: fix CFG_ENV_ADDR and CFG_ENV_SECT_SIZE definitions Timur Tabi
2007-11-05 19:23 ` Wolfgang Denk
@ 2007-11-19 23:13 ` Kim Phillips
1 sibling, 0 replies; 4+ messages in thread
From: Kim Phillips @ 2007-11-19 23:13 UTC (permalink / raw)
To: u-boot
On Mon, 5 Nov 2007 09:34:06 -0600
Timur Tabi <timur@freescale.com> wrote:
> Fix the definitions of CFG_ENV_ADDR and CFG_ENV_SECT_SIZE for all of the
> currently-defined 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>
Applied to mpc83xx branch of u-boot-mpc83xx.
Please base your 83xx patches on this branch in the future (I handled
extending this patch to 837x this time).
Kim
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2007-11-19 23:13 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-11-05 15:34 [U-Boot-Users] [PATCH v3] 83xx: fix CFG_ENV_ADDR and CFG_ENV_SECT_SIZE definitions Timur Tabi
2007-11-05 19:23 ` Wolfgang Denk
2007-11-05 19:26 ` Timur Tabi
2007-11-19 23:13 ` Kim Phillips
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox