mirror of
https://github.com/u-boot/u-boot.git
synced 2024-12-16 08:13:28 +08:00
371b9e9c39
Commit 1e3d640316 (ARM: sheevaplug: redefine MTDPARTS) changed the partition
layout (without any description why), but didn't change the offset/size to
load the kernel from or the root=/dev/mtdblockX in the bootargs.
The 3MB forseen for a kernel is furthermore too little. A 4.4 build of
mvebu_v5_defconfig is 3.6MB:
-rw-r--r-- 1 peko peko 3.6M Jan 16 20:24 uImage.kirkwood-sheevaplug
When device tree support for sheevaplug was added to the kernel in commit
ee514b381e (ARM: Kirkwood: Add dts files for Sheevaplug and eSATA
Sheevaplug) a default flash partition layout (used if mtdparts= isn't passed
on the command line / CONFIG_MTD_CMDLINE_PARTS isn't enabled) with 1MB for
u-boot / environment, 4MB for the kernel and the rest for the rootfs, so use
that layout here and adjust the kernel loading to match.
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Stefan Roese <sr@denx.de>
113 lines
2.6 KiB
C
113 lines
2.6 KiB
C
/*
|
|
* (C) Copyright 2009-2014
|
|
* Gerald Kerma <dreagle@doukki.net>
|
|
* Marvell Semiconductor <www.marvell.com>
|
|
* Written-by: Prafulla Wadaskar <prafulla@marvell.com>
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0+
|
|
*/
|
|
|
|
#ifndef _CONFIG_SHEEVAPLUG_H
|
|
#define _CONFIG_SHEEVAPLUG_H
|
|
|
|
|
|
/*
|
|
* Version number information
|
|
*/
|
|
#define CONFIG_IDENT_STRING "\nMarvell-Sheevaplug"
|
|
|
|
/*
|
|
* High Level Configuration Options (easy to change)
|
|
*/
|
|
#define CONFIG_FEROCEON_88FR131 1 /* CPU Core subversion */
|
|
#define CONFIG_MACH_SHEEVAPLUG /* Machine type */
|
|
|
|
/*
|
|
* Commands configuration
|
|
*/
|
|
#define CONFIG_CMD_MMC
|
|
|
|
/*
|
|
* Standard filesystems
|
|
*/
|
|
#define CONFIG_SYS_MVFS
|
|
|
|
/*
|
|
* mv-plug-common.h should be defined after CMD configs since it used them
|
|
* to enable certain macros
|
|
*/
|
|
#include "mv-plug-common.h"
|
|
|
|
/*
|
|
* Environment variables configurations
|
|
*/
|
|
#ifdef CONFIG_CMD_NAND
|
|
#define CONFIG_ENV_IS_IN_NAND 1
|
|
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K */
|
|
#else
|
|
#define CONFIG_ENV_IS_NOWHERE 1 /* if env in SDRAM */
|
|
#endif
|
|
/*
|
|
* max 4k env size is enough, but in case of nand
|
|
* it has to be rounded to sector size
|
|
*/
|
|
#define CONFIG_ENV_SIZE 0x20000 /* 128k */
|
|
#define CONFIG_ENV_ADDR 0x80000
|
|
#define CONFIG_ENV_OFFSET 0x80000 /* env starts here */
|
|
|
|
/*
|
|
* Default environment variables
|
|
*/
|
|
#define CONFIG_BOOTCOMMAND "${x_bootcmd_kernel}; " \
|
|
"setenv bootargs ${x_bootargs} ${x_bootargs_root}; " \
|
|
"bootm 0x6400000;"
|
|
|
|
#define CONFIG_MTDPARTS \
|
|
"orion_nand:512K(uboot)," \
|
|
"512K(env),4M(kernel)," \
|
|
"-(rootfs)\0"
|
|
|
|
#define CONFIG_EXTRA_ENV_SETTINGS "x_bootargs=console" \
|
|
"=ttyS0,115200 mtdparts="CONFIG_MTDPARTS \
|
|
"x_bootcmd_kernel=nand read 0x6400000 0x100000 0x400000\0" \
|
|
"x_bootcmd_usb=usb start\0" \
|
|
"x_bootargs_root=root=/dev/mtdblock3 rw rootfstype=jffs2\0"
|
|
|
|
#define MTDIDS_DEFAULT "nand0=orion_nand"
|
|
|
|
#define MTDPARTS_DEFAULT \
|
|
"mtdparts="CONFIG_MTDPARTS
|
|
|
|
/*
|
|
* Ethernet Driver configuration
|
|
*/
|
|
#ifdef CONFIG_CMD_NET
|
|
#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */
|
|
#define CONFIG_PHY_BASE_ADR 0
|
|
#endif /* CONFIG_CMD_NET */
|
|
|
|
/*
|
|
* SDIO/MMC Card Configuration
|
|
*/
|
|
#ifdef CONFIG_CMD_MMC
|
|
#define CONFIG_MMC
|
|
#define CONFIG_GENERIC_MMC
|
|
#define CONFIG_MVEBU_MMC
|
|
#define CONFIG_SYS_MMC_BASE KW_SDIO_BASE
|
|
#endif /* CONFIG_CMD_MMC */
|
|
|
|
/*
|
|
* SATA driver configuration
|
|
*/
|
|
#ifdef CONFIG_CMD_IDE
|
|
#define __io
|
|
#define CONFIG_IDE_PREINIT
|
|
#define CONFIG_DOS_PARTITION
|
|
#define CONFIG_MVSATA_IDE_USE_PORT0
|
|
#define CONFIG_MVSATA_IDE_USE_PORT1
|
|
#define CONFIG_SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET
|
|
#define CONFIG_SYS_ATA_IDE1_OFFSET MV_SATA_PORT1_OFFSET
|
|
#endif /* CONFIG_CMD_IDE */
|
|
|
|
#endif /* _CONFIG_SHEEVAPLUG_H */
|