From mboxrd@z Thu Jan  1 00:00:00 1970
From: Dennis Gilmore <dennis@ausil.us>
Date: Fri, 24 Oct 2014 11:22:23 -0500
Subject: [U-Boot] [RFC PATCH 7/7] Switch am335x_evm.h to use
 config_distro_defaults and config_distro_bootcmd. Add scriptaddr to
 DEFAULT_LINUX_BOOT_ENV,
 as scriptaddr is used for boot scripts in config_distro_bootcmd.
In-Reply-To: <1412374123-6787-8-git-send-email-vagrant@debian.org>
References: <1412374123-6787-1-git-send-email-vagrant@debian.org>
	<1412374123-6787-8-git-send-email-vagrant@debian.org>
Message-ID: <20141024112223.2648ba42@ra.ausil.us>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

On Fri,  3 Oct 2014 15:08:43 -0700
Vagrant Cascadian <vagrant@debian.org> wrote:

> Signed-off-by: Vagrant Cascadian <vagrant@debian.org>
> ---
> 
>  include/configs/am335x_evm.h      | 26 +++++++++++++++++---------
>  include/configs/ti_armv7_common.h |  1 +
>  2 files changed, 18 insertions(+), 9 deletions(-)
> 
> diff --git a/include/configs/am335x_evm.h
> b/include/configs/am335x_evm.h index e2f7ead..b25d990 100644
> --- a/include/configs/am335x_evm.h
> +++ b/include/configs/am335x_evm.h
> @@ -18,6 +18,21 @@
>  
>  #include <configs/ti_am335x_common.h>
>  
> +#include <config_distro_defaults.h>
> +
> +#define BOOTENV_BOOT_PARTITIONS "2"

On Fedora we use partition 1 everywhere for /boot so this should be "1
2" though partition 2 is swap in out standard images. we really need to
read the partition table and find the bootable partition. 

We are defaulting to telling people to put u-boot and the MLO in raw
disk space.

> +
> +#define BOOTENV_INIT_COMMAND "run findfdt ;"
> +#ifdef CONFIG_NAND
> +#define BOOTENV_POST_COMMAND "run nandboot ;"
> +#endif
> +
> +#define BOOT_TARGET_DEVICES(func) \
> +	func(MMC, mmc, 0) \
> +	func(MMC, mmc, 1)
> +
> +#include <config_distro_bootcmd.h>
> +
>  #ifndef CONFIG_SPL_BUILD
>  # define CONFIG_FIT
>  # define CONFIG_TIMESTAMP
> @@ -185,17 +200,10 @@
>  		"if test $fdtfile = undefined; then " \
>  			"echo WARNING: Could not determine device
> tree to use; fi; \0" \ NANDARGS \
> -	DFUARGS
> +	DFUARGS \
> +	BOOTENV
>  #endif
>  
> -#define CONFIG_BOOTCOMMAND \
> -	"run findfdt; " \
> -	"run mmcboot;" \
> -	"setenv mmcdev 1; " \
> -	"setenv bootpart 1:2; " \
> -	"run mmcboot;" \
> -	"run nandboot;"
> -
>  /* NS16550 Configuration */
>  #define CONFIG_SYS_NS16550_COM1		0x44e09000	/*
> Base EVM has UART0 */ #define CONFIG_SYS_NS16550_COM2
> 0x48022000	/* UART1 */ diff --git
> a/include/configs/ti_armv7_common.h
> b/include/configs/ti_armv7_common.h index 85171db..f405fea 100644 ---
> a/include/configs/ti_armv7_common.h +++
> b/include/configs/ti_armv7_common.h @@ -54,6 +54,7 @@
>  #define DEFAULT_LINUX_BOOT_ENV \
>  	"loadaddr=0x82000000\0" \
>  	"kernel_addr_r=0x82000000\0" \
> +	"scriptaddr=0x82000000\0" \
>  	"fdtaddr=0x88000000\0" \
>  	"fdt_addr_r=0x88000000\0" \
>  	"rdaddr=0x88080000\0" \