projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
configs: at91sam9260ek/9g20ek: Update for DT and DM
[oweals/u-boot.git]
/
include
/
configs
/
sheevaplug.h
diff --git
a/include/configs/sheevaplug.h
b/include/configs/sheevaplug.h
index c529636a66def1c894330942a8fc657bc8d8f033..a1110573134a7abaa02dd742e9386dc7cfcbe914 100644
(file)
--- a/
include/configs/sheevaplug.h
+++ b/
include/configs/sheevaplug.h
@@
-10,12
+10,6
@@
#ifndef _CONFIG_SHEEVAPLUG_H
#define _CONFIG_SHEEVAPLUG_H
#ifndef _CONFIG_SHEEVAPLUG_H
#define _CONFIG_SHEEVAPLUG_H
-
-/*
- * Version number information
- */
-#define CONFIG_IDENT_STRING "\nMarvell-Sheevaplug"
-
/*
* High Level Configuration Options (easy to change)
*/
/*
* High Level Configuration Options (easy to change)
*/
@@
-25,7
+19,6
@@
/*
* Commands configuration
*/
/*
* Commands configuration
*/
-#define CONFIG_CMD_MMC
/*
* Standard filesystems
/*
* Standard filesystems
@@
-64,12
+57,12
@@
#define CONFIG_MTDPARTS \
"orion_nand:512K(uboot)," \
#define CONFIG_MTDPARTS \
"orion_nand:512K(uboot)," \
- "512K(env),
1M(script),6M(kernel),"
\
- "
12M(ramdisk),4M(spare),
-(rootfs)\0"
+ "512K(env),
4M(kernel),"
\
+ "-(rootfs)\0"
#define CONFIG_EXTRA_ENV_SETTINGS "x_bootargs=console" \
"=ttyS0,115200 mtdparts="CONFIG_MTDPARTS \
#define CONFIG_EXTRA_ENV_SETTINGS "x_bootargs=console" \
"=ttyS0,115200 mtdparts="CONFIG_MTDPARTS \
- "x_bootcmd_kernel=nand read 0x6400000 0x100000 0x
3
00000\0" \
+ "x_bootcmd_kernel=nand read 0x6400000 0x100000 0x
4
00000\0" \
"x_bootcmd_usb=usb start\0" \
"x_bootargs_root=root=/dev/mtdblock3 rw rootfstype=jffs2\0"
"x_bootcmd_usb=usb start\0" \
"x_bootargs_root=root=/dev/mtdblock3 rw rootfstype=jffs2\0"
@@
-90,8
+83,6
@@
* SDIO/MMC Card Configuration
*/
#ifdef CONFIG_CMD_MMC
* 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 */
#define CONFIG_MVEBU_MMC
#define CONFIG_SYS_MMC_BASE KW_SDIO_BASE
#endif /* CONFIG_CMD_MMC */
@@
-102,7
+93,6
@@
#ifdef CONFIG_CMD_IDE
#define __io
#define CONFIG_IDE_PREINIT
#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_MVSATA_IDE_USE_PORT0
#define CONFIG_MVSATA_IDE_USE_PORT1
#define CONFIG_SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET