[U-Boot] [PATCH 1/3] powerpc: updates for the keymile boards

[Heiko Schocher]

Hello Wolfgang,

Wolfgang Denk wrote:
> Dear Heiko Schocher,
> 
> In message <4A55C0A2.2010803 at denx.de> you wrote:
>> - CONFIG_SYS_MAX_I2C_BUS changed to 1
>>   We use only one I2C hardwarecontroller on this boards, so
>>   change the CONFIG_SYS_MAX_I2C_BUS to 1.
>> - common: dont print errormsg if second IVM Block lacks.
>> - 82xx, mgcoge: fix double mtdpart entry in environment
>> - 82xx, mgcoge: activate on second Flash the second bank.
>> - common: CONFIG_ENV_SIZE 0x4000 for all keymile boards
>> - common: Change malloc size to 1MByte for all Keymile boards
>>     We need a bigger malloc area for the environment support (128k)
>>     on some Keymile boards (kmeter1) and the upcoming UBI support.
>>     Change it to 1MB for all Keymile boards to be on the save side.
>>     Also define CONFIG_SYS_64BIT_VSPRINTF which is needed for
>>     UBI/UBIFS support.
>> - Add UBI support to all Keymile boards
>> - change manner of writing "/localbus/ranges" node
>>     instead of writting the complete "/localbus/ranges" node
>>     before booting Linux, only update the ranges entries
>>     which gets dynamical detected (size of flashes).
>>     This is needed, because keymile adds in the DTS
>>     "/localbus/ranges" node entries, which u-boot must
>>     not overwrite/delete.
>> - kmeter, mgcoge: define 2 seperate regions needed for the Intel P30 chips
>>     The Intel P30 chip has 2 non-identical chips on
>>     one die, so we need to define 2 seperate regions
>>     that are scanned by physmap_of independantly.
>> - kmeter1: Add MTD concat support to Keymile boards
>> - 82xx, mgcoge: add "unlock=yes" to default environment
>> - added CONFIG_MTD_DEVICE to get in sync with mainline code
>>
>> Signed-off-by: Heiko Schocher <hs at denx.de>
>> Signed-off-by: Stefan Roese <sr at denx.de>
>> ---
>>  board/keymile/common/common.c    |   35 ++++++++++++++++++--
>>  board/keymile/common/common.h    |   10 ++++++
>>  board/keymile/km8xx/km8xx.c      |   42 ++++++++++++++++--------
>>  board/keymile/kmeter1/kmeter1.c  |   51 +++++++++++++++++++++++++++++
>>  board/keymile/mgcoge/mgcoge.c    |   67 +++++++++++++++++++++++++++-----------
>>  include/configs/keymile-common.h |   17 +++++++++-
>>  include/configs/km8xx.h          |    2 -
>>  include/configs/kmeter1.h        |    7 +---
>>  include/configs/mgcoge.h         |   24 +++++++------
>>  include/i2c.h                    |    2 +
>>  10 files changed, 202 insertions(+), 55 deletions(-)
> 
> Applied - after fixing a merge confligt in include/configs/kmeter1.h
> 
> Please check that everything is OK.

Hmm.. this chunk is missing:

diff --git a/include/configs/kmeter1.h b/include/configs/kmeter1.h
index 19da133..1735683 100644
--- a/include/configs/kmeter1.h
+++ b/include/configs/kmeter1.h
@@ -158,7 +158,6 @@
 #endif

 #define CONFIG_SYS_MONITOR_LEN		(384 * 1024) /* Reserve 256 kB for Mon */
-#define CONFIG_SYS_MALLOC_LEN		(128 * 1024) /* Reserved for malloc */

 /*
  * Initial RAM Base Address Setup


so, if actual compiling the kmeter1, I get a compile error, following patch
solves it:

[PATCH] 83xx, kmeter: fix compile error

CONFIG_SYS_MALLOC_LEN is defined in the board config, and
the keymile-common.h, which collects common options used
by all keymile-boards. This results in a compile error
when compiling the kmeter1 board. So remove this define
in the board config file.

Signed-off-by: Heiko Schocher <hs at denx.de>
---
 include/configs/kmeter1.h |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/include/configs/kmeter1.h b/include/configs/kmeter1.h
index 347b47c..7e16c56 100644
--- a/include/configs/kmeter1.h
+++ b/include/configs/kmeter1.h
@@ -158,7 +158,6 @@
 #endif

 #define CONFIG_SYS_MONITOR_LEN		(384 * 1024) /* Reserve 384 kB for Mon */
-#define CONFIG_SYS_MALLOC_LEN		(128 * 1024) /* Reserved for malloc */

 /*
  * Initial RAM Base Address Setup
-- 
1.6.0.6

bye
Heiko
-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany