Re: [U-Boot] [PATCH 02/17] am335x_evm: Update config for common usage

2012-08-02 Thread Tom Rini
On Mon, Jul 30, 2012 at 09:48:48AM -0700, Tom Rini wrote:

> - Add default commands
> - Add HUSH parser
> - Make environment, malloc areas larger
> - Add ATAGS and OF_LIBFDT
> - Add defaults to boot ramdisk and MMC, use uEnv.txt
> 
> Signed-off-by: Tom Rini 

I plan to commit this with the following minor addition:

diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index e915f56..36f9152 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -48,6 +48,7 @@
 #define CONFIG_BOOTDELAY   3
 #define CONFIG_EXTRA_ENV_SETTINGS \
"loadaddr=0x8020\0" \
+   "dtbaddr=0x80F8\0" \
"rdaddr=0x8100\0" \
"bootfile=/boot/uImage\0" \
"console=ttyO0,115200n8\0" \

This still leaves a ton of room between the kernel load and
ramdisk/device tree, and sets aside as much room as the PowerPC boards
have been.

-- 
Tom
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


[U-Boot] [PATCH 02/17] am335x_evm: Update config for common usage

2012-07-30 Thread Tom Rini
- Add default commands
- Add HUSH parser
- Make environment, malloc areas larger
- Add ATAGS and OF_LIBFDT
- Add defaults to boot ramdisk and MMC, use uEnv.txt

Signed-off-by: Tom Rini 
---
 include/configs/am335x_evm.h |   69 --
 1 file changed, 59 insertions(+), 10 deletions(-)

diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index d0fbc88..32a7441 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -17,32 +17,81 @@
 #define __CONFIG_AM335X_EVM_H
 
 #define CONFIG_AM33XX
-#define CONFIG_CMD_MEMORY  /* for mtest */
-#undef CONFIG_GZIP
-#undef CONFIG_ZLIB
-#undef CONFIG_SYS_HUSH_PARSER
 #undef CONFIG_CMD_NET
 
 #include 
 #include 
 
-#define CONFIG_ENV_SIZE0x400
-#define CONFIG_SYS_MALLOC_LEN  (CONFIG_ENV_SIZE + (8 * 1024))
+#define CONFIG_ENV_SIZE(128 << 10) /* 128 KiB */
+#define CONFIG_SYS_MALLOC_LEN  (1024 << 10)
+#define CONFIG_SYS_LONGHELP/* undef to save memory */
+#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */
 #define CONFIG_SYS_PROMPT  "U-Boot# "
 #define CONFIG_SYS_NO_FLASH
 #define MACH_TYPE_TIAM335EVM   3589/* Until the next sync */
 #define CONFIG_MACH_TYPE   MACH_TYPE_TIAM335EVM
 
+#define CONFIG_OF_LIBFDT
+#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
+#define CONFIG_SETUP_MEMORY_TAGS
+#define CONFIG_INITRD_TAG
+
+/* commands to include */
+#include 
+
 #define CONFIG_CMD_ASKENV
 #define CONFIG_VERSION_VARIABLE
 
 /* set to negative value for no autoboot */
 #define CONFIG_BOOTDELAY   3
-#define CONFIG_SYS_AUTOLOAD"no"
-#define CONFIG_BOOTFILE"uImage"
 #define CONFIG_EXTRA_ENV_SETTINGS \
-   "verify=yes\0" \
-   "ramdisk_file=ramdisk.gz\0" \
+   "loadaddr=0x8020\0" \
+   "rdaddr=0x8100\0" \
+   "bootfile=/boot/uImage\0" \
+   "console=ttyO0,115200n8\0" \
+   "optargs=\0" \
+   "mmcdev=0\0" \
+   "mmcroot=/dev/mmcblk0p2 rw\0" \
+   "mmcrootfstype=ext3 rootwait\0" \
+   "ramroot=/dev/ram0 rw ramdisk_size=65536 initrd=${rdaddr},64M\0" \
+   "ramrootfstype=ext2\0" \
+   "mmcargs=setenv bootargs console=${console} " \
+   "${optargs} " \
+   "root=${mmcroot} " \
+   "rootfstype=${mmcrootfstype}\0" \
+   "bootenv=uEnv.txt\0" \
+   "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
+   "importbootenv=echo Importing environment from mmc ...; " \
+   "env import -t $loadaddr $filesize\0" \
+   "ramargs=setenv bootargs console=${console} " \
+   "${optargs} " \
+   "root=${ramroot} " \
+   "rootfstype=${ramrootfstype}\0" \
+   "loadramdisk=fatload mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \
+   "loaduimagefat=fatload mmc ${mmcdev} ${loadaddr} ${bootfile}\0" \
+   "loaduimage=ext2load mmc ${mmcdev}:2 ${loadaddr} ${bootfile}\0" \
+   "mmcboot=echo Booting from mmc ...; " \
+   "run mmcargs; " \
+   "bootm ${loadaddr}\0" \
+   "ramboot=echo Booting from ramdisk ...; " \
+   "run ramargs; " \
+   "bootm ${loadaddr}\0" \
+
+#define CONFIG_BOOTCOMMAND \
+   "if mmc rescan ${mmcdev}; then " \
+   "echo SD/MMC found on device ${mmcdev};" \
+   "if run loadbootenv; then " \
+   "echo Loaded environment from ${bootenv};" \
+   "run importbootenv;" \
+   "fi;" \
+   "if test -n $uenvcmd; then " \
+   "echo Running uenvcmd ...;" \
+   "run uenvcmd;" \
+   "fi;" \
+   "if run loaduimage; then " \
+   "run mmcboot;" \
+   "fi;" \
+   "fi;" \
 
 /* Clock Defines */
 #define V_OSCK 2400  /* Clock output from T2 */
-- 
1.7.9.5

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot