From patchwork Sun Jul 7 23:49:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: DrEagle X-Patchwork-Id: 257452 X-Patchwork-Delegate: sr@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id A03912C009A for ; Mon, 8 Jul 2013 09:49:39 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3EE524A0F8; Mon, 8 Jul 2013 01:49:38 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KGlLZDb9lkAA; Mon, 8 Jul 2013 01:49:38 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D82984A0ED; Mon, 8 Jul 2013 01:49:35 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B81ED4A0BF for ; Mon, 8 Jul 2013 01:49:29 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EAVHbgtrhy30 for ; Mon, 8 Jul 2013 01:49:29 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from milenium.gk2.net (unknown [88.178.80.34]) by theia.denx.de (Postfix) with ESMTP id 0FC2D4A090 for ; Mon, 8 Jul 2013 01:49:27 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by milenium.gk2.net (Postfix) with ESMTP id F2E742D40A4; Mon, 8 Jul 2013 01:49:26 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at milenium.gk2.net Received: from milenium.gk2.net ([127.0.0.1]) by localhost (milenium.gk2.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id x0uZSKAI2-Ga; Mon, 8 Jul 2013 01:49:20 +0200 (CEST) Received: from [192.168.1.101] (astree.gk2.net [109.190.23.135]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: gek@milenium.gk2.net) by milenium.gk2.net (Postfix) with ESMTPSA id E26E82D407A; Mon, 8 Jul 2013 01:49:19 +0200 (CEST) Message-ID: <51D9FE7F.9080404@doukki.net> Date: Mon, 08 Jul 2013 01:49:19 +0200 From: DrEagle User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130623 Thunderbird/17.0.7 MIME-Version: 1.0 To: "u-boot@lists.denx.de" References: <51D3437F.9040000@doukki.net> <20130705230848.457e1e24@lilith> In-Reply-To: <20130705230848.457e1e24@lilith> X-Enigmail-Version: 1.6a1pre Cc: Lior Amsalem , Maen Suleiman , "uboot@doukki.net" , afleming@gmail.com Subject: [U-Boot] [PATCH 8/8] arm kirkwood update sheevaplug defaults config X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de - update defaults sheevaplug config Signed-off-by: drEagle 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 #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@1m(kernel),1m@4m(psm),13m@5m(rootfs) rw\0" +#define CONFIG_MTDPARTS \ + "mtdparts=orion_nand:" \ + "768k(uboot),256k(uboot_env)," \ + "11m@1m(kernel),-@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 */