[U-Boot] [PATCH 4/6] move beagleboard over to use the generic distro configuation and environment

[Tom Rini]

On Thu, Mar 20, 2014 at 05:12:59PM -0500, Dennis Gilmore wrote:

> port beagleboard to use the generic distro configuation.
> remove duplicated config options, clean up the environment, include new
> environment.
> 
> Signed-off-by: Dennis Gilmore <dennis at ausil.us>
> ---
>  include/configs/am335x_evm.h      | 62 +++++++++------------------------------
>  include/configs/ti_armv7_common.h | 32 ++++++--------------

Changing ti_armv7_common.h changes a ton of other boards which may not
want to opt-in here yet / ever.  So we need to:

>  2 files changed, 23 insertions(+), 71 deletions(-)
> 
> diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
> index 11088b3..1dd4486 100644
> --- a/include/configs/am335x_evm.h
> +++ b/include/configs/am335x_evm.h

Add the generic distro includes here.

> diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
> index fda99fb..96c6bd0 100644
> --- a/include/configs/ti_armv7_common.h
> +++ b/include/configs/ti_armv7_common.h
[snip]
> @@ -60,11 +61,6 @@
>  	"bootm_size=0x20000000\0"
>  
>  /*
> - * Default to a quick boot delay.
> - */
> -#define CONFIG_BOOTDELAY		1

Change this to 2, and leave the rest of the duplicated enables alone.

>  /*
> - * Common filesystems support.  When we have removable storage we
> - * enabled a number of useful commands and support.
> + * Include the generic config options and boot environment when not
> + * building our SPL
>   */
> -#if defined(CONFIG_MMC) || defined(CONFIG_USB_STORAGE)
> -#define CONFIG_DOS_PARTITION
> -#define CONFIG_CMD_FAT
> -#define CONFIG_FAT_WRITE
> -#define CONFIG_CMD_EXT2
> -#define CONFIG_CMD_EXT4
> -#define CONFIG_CMD_FS_GENERIC
> +#ifndef CONFIG_SPL_BUILD
> +#include <config_distro_defaults.h>
> +#include <config_distro_bootcmd.h>
>  #endif
>  
> +#define CONFIG_CMD_FAT

And leave this part out as well.

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140321/951d0705/attachment.pgp>