[U-Boot] [PATCH 8/8] arm kirkwood update sheevaplug defaults config
DrEagle
dreagle at doukki.net
Mon Jul 8 01:49:19 CEST 2013
- update defaults sheevaplug config
Signed-off-by: drEagle <uboot at doukki.net>
include/configs/mv-common.h |
include/configs/sheevaplug.h |
diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h
index 405a842..e917e6f 100644
--- a/include/configs/mv-common.h
+++ b/include/configs/mv-common.h
@@ -72,7 +72,10 @@
#define CONFIG_BAUDRATE 115200
#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, \
115200,230400, 460800, 921600 }
-/* auto boot */
+/*
+ * Miscellaneous configurable options
+ */
+#define CONFIG_ENV_OVERWRITE
#define CONFIG_BOOTDELAY 3 /* default enable autoboot */
/*
@@ -98,6 +101,7 @@
* Other required minimal configurations
*/
#define CONFIG_SYS_LONGHELP
+#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */
#define CONFIG_AUTO_COMPLETE
#define CONFIG_CMDLINE_EDITING
#define CONFIG_CONSOLE_INFO_QUIET /* some code reduction */
diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h
index 83dd8ff..270fd56 100644
--- a/include/configs/sheevaplug.h
+++ b/include/configs/sheevaplug.h
@@ -28,7 +28,8 @@
/*
* Version number information
*/
-#define CONFIG_IDENT_STRING "\nMarvell-Sheevaplug"
+
+#define CONFIG_IDENT_STRING "\nMarvell-Sheevaplug - eSATA - SD/MMC"
/*
* High Level Configuration Options (easy to change)
@@ -39,17 +40,24 @@
#define CONFIG_MACH_SHEEVAPLUG /* Machine type */
#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */
+#define CONFIG_ARCH_DEV_ID 1
+
/*
* Commands configuration
*/
+
#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */
+#define CONFIG_SYS_MVFS
#include <config_cmd_default.h>
#define CONFIG_CMD_DHCP
#define CONFIG_CMD_ENV
#define CONFIG_CMD_IDE
#define CONFIG_CMD_MII
#define CONFIG_CMD_MMC
#define CONFIG_CMD_NAND
#define CONFIG_CMD_PING
#define CONFIG_CMD_USB
+
/*
* mv-common.h should be defined after CMD configs since it used them
* to enable certain macros
@@ -57,6 +65,11 @@
#include "mv-common.h"
/*
+ * Miscellaneous configurable options
+ */
+#undef CONFIG_CONSOLE_INFO_QUIET
+
+/*
* Environment variables configurations
*/
#ifdef CONFIG_CMD_NAND
@@ -65,29 +78,56 @@
#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 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
*/
-#define CONFIG_BOOTCOMMAND "${x_bootcmd_kernel}; " \
- "setenv bootargs ${x_bootargs} ${x_bootargs_root}; " \
- "${x_bootcmd_usb}; bootm 0x6400000;"
+#define CONFIG_BOOTCOMMAND \
+ "run x_bootcmd; run z_bootstrap; reset;"
-#define CONFIG_MTDPARTS "orion_nand:512k(uboot)," \
- "3m at 1m(kernel),1m at 4m(psm),13m at 5m(rootfs) rw\0"
+#define CONFIG_MTDPARTS \
+ "mtdparts=orion_nand:" \
+ "768k(uboot),256k(uboot_env)," \
+ "11m at 1m(kernel),- at 12m(rootfs)\0"
-#define CONFIG_EXTRA_ENV_SETTINGS "x_bootargs=console" \
- "=ttyS0,115200 mtdparts="CONFIG_MTDPARTS \
- "x_bootcmd_kernel=nand read 0x6400000 0x100000 0x300000\0" \
- "x_bootcmd_usb=usb start\0" \
- "x_bootargs_root=root=/dev/mtdblock3 rw rootfstype=jffs2\0"
+#define CONFIG_EXTRA_ENV_SETTINGS \
+ "console=console=ttyS0,115200n8\0" \
+ "mtdids=nand0=orion_nand\0" \
+ "mtdparts="CONFIG_MTDPARTS \
+ "kerneladdr=0x00800000\0" \
+ "kernelfile=/boot/uImage.bin\0" \
+ "scriptaddr=0x00800000\0" \
+ "scriptfile=/boot/boot.scr\0" \
+ "x_bootargs=console=ttyS0,115200n8 "CONFIG_MTDPARTS \
+ "x_bootargs_root=root=LABEL=plug-rootfs rw rootwait panic=5\0" \
+ "x_bootcmd=${x_bootcmd_kernel}; setenv bootargs ${x_bootargs}" \
+ " ${x_bootargs_root}; run z_bootinit;\0" \
+ "x_bootcmd_kernel=echo ====== BootStrap start ======\0" \
+ "x_bootstrap_scr=for device in \"mmc usb ide\"; do for fs in" \
+ " \"ext2 fat\"; do setenv loadcmd \"${fs}load ${device} 0:1\";" \
+ " if ${loadcmd} ${scriptaddr} ${scriptfile}; then;" \
+ " run z_bootscr; fi; done; done;\0" \
+ "x_bootstrap_cmd=for device in \"mmc usb ide\"; do for fs in" \
+ " \"ext2 fat\"; do setenv loadcmd \"${fs}load ${device} 0:1\";" \
+ " if ${loadcmd} ${kerneladdr} ${kernelfile}; then;" \
+ " run z_bootcmd; fi; done; done;\0" \
+ "x_bootcmd_mtd=nand read.e ${kerneladdr} kernel 0x00b00000;\0" \
+ "z_bootinit=mmc rescan; usb reset; ide reset;\0" \
+ "z_bootcmd=if imi ${kerneladdr}; then; bootm ${kerneladdr};" \
+ " else; echo --- next bootcmd device try ---; fi;\0" \
+ "z_bootscr=if imi ${scriptaddr}; then; autoscr ${scriptaddr};" \
+ " else; echo --- next bootscr device try ---; fi;\0" \
+ "z_bootstrap=run z_bootinit; run x_bootstrap_scr;" \
+ " run x_bootstrap_cmd; run x_bootcmd_mtd; run z_bootfail;\0" \
+ "z_bootfail=echo ====== BootStrap end ======\0"
/*
* Ethernet Driver configuration
@@ -98,17 +138,20 @@
#endif /* CONFIG_CMD_NET */
/*
- * File system
+ * RTC driver configuration
+ */
+#ifdef CONFIG_CMD_DATE
+#define CONFIG_RTC_MV
+#endif /* CONFIG_CMD_DATE */
+
+/*
+ * SDIO/MMC Card Configuration
*/
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_FAT
-#define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
-#define CONFIG_RBTREE
-#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
-#define CONFIG_MTD_PARTITIONS
-#define CONFIG_CMD_MTDPARTS
-#define CONFIG_LZO
+#ifdef CONFIG_CMD_MMC
+#define CONFIG_MMC
+#define CONFIG_GENERIC_MMC
+#define CONFIG_MRVL_MMC
+#define CONFIG_SYS_MMC_BASE KW_SDIO_BASE
+#endif /* CONFIG_CMD_MMC */
#endif /* _CONFIG_SHEEVAPLUG_H */
More information about the U-Boot
mailing list