diff options
author | Tom Rini <trini@ti.com> | 2014-10-07 07:38:39 -0400 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2014-10-07 07:38:39 -0400 |
commit | dd0204e48d05f41480743a798b94d5484b664639 (patch) | |
tree | 0dada741b0dc5b60dcc63ae0dfe783b6935e7eba /include/configs/sheevaplug.h | |
parent | 742de9076e8a8f44b77794b43e6175d86b897996 (diff) | |
parent | c19a8bc5711ec63e905ef91f045a1489f0aa3cb0 (diff) | |
download | u-boot-imx-dd0204e48d05f41480743a798b94d5484b664639.zip u-boot-imx-dd0204e48d05f41480743a798b94d5484b664639.tar.gz u-boot-imx-dd0204e48d05f41480743a798b94d5484b664639.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include/configs/sheevaplug.h')
-rw-r--r-- | include/configs/sheevaplug.h | 46 |
1 files changed, 41 insertions, 5 deletions
diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index 4747adf..71be823 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -1,5 +1,6 @@ /* - * (C) Copyright 2009 + * (C) Copyright 2009-2014 + * Gerald Kerma <dreagle@doukki.net> * Marvell Semiconductor <www.marvell.com> * Written-by: Prafulla Wadaskar <prafulla@marvell.com> * @@ -23,12 +24,26 @@ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ /* + * Compression configuration + */ +#define CONFIG_BZIP2 +#define CONFIG_LZMA +#define CONFIG_LZO + +/* + * Miscellaneous configurable options + */ +#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ + +/* * Commands configuration */ #define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ #include <config_cmd_default.h> +#define CONFIG_CMD_BOOTZ #define CONFIG_CMD_DHCP #define CONFIG_CMD_ENV +#define CONFIG_CMD_IDE #define CONFIG_CMD_MII #define CONFIG_CMD_MMC #define CONFIG_CMD_NAND @@ -54,8 +69,8 @@ * it has to be rounded to sector size */ #define CONFIG_ENV_SIZE 0x20000 /* 128k */ -#define CONFIG_ENV_ADDR 0x60000 -#define CONFIG_ENV_OFFSET 0x60000 /* env starts here */ +#define CONFIG_ENV_ADDR 0x80000 +#define CONFIG_ENV_OFFSET 0x80000 /* env starts here */ /* * Default environment variables @@ -64,8 +79,10 @@ "setenv bootargs ${x_bootargs} ${x_bootargs_root}; " \ "${x_bootcmd_usb}; bootm 0x6400000;" -#define CONFIG_MTDPARTS "orion_nand:512k(uboot)," \ - "3m@1m(kernel),1m@4m(psm),13m@5m(rootfs) rw\0" +#define CONFIG_MTDPARTS \ + "mtdparts=orion_nand:512K(uboot)," \ + "512K(env),1M(script),6M(kernel)," \ + "12M(ramdisk),4M(spare),-(rootfs)" #define CONFIG_EXTRA_ENV_SETTINGS "x_bootargs=console" \ "=ttyS0,115200 mtdparts="CONFIG_MTDPARTS \ @@ -73,6 +90,11 @@ "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 */ @@ -92,9 +114,23 @@ #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 */ + +/* * File system */ #define CONFIG_CMD_EXT2 +#define CONFIG_CMD_EXT4 #define CONFIG_CMD_FAT #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_UBI |