[U-Boot] [PATCH] katmai: change default config

[U-Boot] [PATCH] katmai: change default config

[Yuri Tikhonov]

 Hello,

 This patch enables support for EXT2, and increases the
CONFIG_SYS_BOOTMAPSZ size for the default configuration
of the katmai boards to use them as the RAID-reference
AMCC setups.

 EXT2 enabling allows one to boot kernels from the EXT2
formatted Compact Flash cards.

 CONFIG_SYS_BOOTMAPSZ increasing allows one to boot the
Linux kernels, which use PAGE_SIZE of 256KB. Otherwise,
the memory area with DTB file (which is placed at the
end of the bootmap area) will turn out to be overlapped
with the BSS segment of the 256KB kernel, and zeroed
in early_init() of Linux.

 Actually, increasing of the bootmap size could be done
via setting of the bootm_size U-Boot variable, but it looks
like the current U-Boot implementation have some bootm_size-
related functionality lost. In many places through the U-Boot
code the CONFIG_SYS_BOOTMAPSZ definition is used directly
(instead of trying to read the corresponding value from the
environment). The same is truth for the boot_jump_linux()
function in lib_ppc/bootm.c, where U-Boot transfers control
to Linux passing the CONFIG_SYS_BOOTMAPSZ (not bootm_size)
value to the booting kernel.

Signed-off-by: Yuri Tikhonov <yur@emcraft.com>
Signed-off-by: Ilya Yanok <yanok@emcraft.com>
---
 include/configs/katmai.h |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/include/configs/katmai.h b/include/configs/katmai.h
index 58694cc..74e0ecd 100644
--- a/include/configs/katmai.h
+++ b/include/configs/katmai.h
@@ -53,6 +53,13 @@
 #define CONFIG_HOSTNAME		katmai
 #include "amcc-common.h"
 
+/*
+ * For booting 256K-paged Linux we should have 16MB of memory
+ * for Linux initial memory map
+ */
+#undef CONFIG_SYS_BOOTMAPSZ
+#define CONFIG_SYS_BOOTMAPSZ	(16 << 20)
+
 #define CONFIG_BOARD_EARLY_INIT_F 1	/* Call board_pre_init		*/
 #undef  CONFIG_SHOW_BOOT_PROGRESS
 
@@ -189,6 +196,7 @@
 /*
  * Commands additional to the ones defined in amcc-common.h
  */
+#define CONFIG_CMD_EXT2
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_SDRAM
-- 
1.5.6.1


-- 
Yuri Tikhonov, Senior Software Engineer
Emcraft Systems, www.emcraft.com

[U-Boot] [PATCH] katmai: change default config

[Stefan Roese]

On Friday 14 November 2008, Yuri Tikhonov wrote:
>  Hello,
>

Please remove this "Hello," from the commit text next time.

>  This patch enables support for EXT2, and increases the
> CONFIG_SYS_BOOTMAPSZ size for the default configuration
> of the katmai boards to use them as the RAID-reference
> AMCC setups.
>
>  EXT2 enabling allows one to boot kernels from the EXT2
> formatted Compact Flash cards.
>
>  CONFIG_SYS_BOOTMAPSZ increasing allows one to boot the
> Linux kernels, which use PAGE_SIZE of 256KB. Otherwise,
> the memory area with DTB file (which is placed at the
> end of the bootmap area) will turn out to be overlapped
> with the BSS segment of the 256KB kernel, and zeroed
> in early_init() of Linux.
>
>  Actually, increasing of the bootmap size could be done
> via setting of the bootm_size U-Boot variable, but it looks
> like the current U-Boot implementation have some bootm_size-
> related functionality lost. In many places through the U-Boot
> code the CONFIG_SYS_BOOTMAPSZ definition is used directly
> (instead of trying to read the corresponding value from the
> environment). The same is truth for the boot_jump_linux()
> function in lib_ppc/bootm.c, where U-Boot transfers control
> to Linux passing the CONFIG_SYS_BOOTMAPSZ (not bootm_size)
> value to the booting kernel.
>
> Signed-off-by: Yuri Tikhonov <yur@emcraft.com>
> Signed-off-by: Ilya Yanok <yanok@emcraft.com>

Applied to 4xx/master. Thanks.

Best regards,
Stefan

=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================