diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2010-09-20 15:14:58 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2010-10-02 16:00:39 -0400 |
| commit | 56f0c57b4be8da1e0bbfb52e8aa0fa93f8f8a4e9 (patch) | |
| tree | 846fe88d16ba936faad17f3fd338bb4f0c8ac612 | |
| parent | 73b6f4046ba79a313b98aa1132344a1221fc1c4d (diff) | |
| download | u-boot-56f0c57b4be8da1e0bbfb52e8aa0fa93f8f8a4e9.tar.gz u-boot-56f0c57b4be8da1e0bbfb52e8aa0fa93f8f8a4e9.tar.xz u-boot-56f0c57b4be8da1e0bbfb52e8aa0fa93f8f8a4e9.zip | |
Blackfin: adi config: allow boards to tweak a little more
Let people easily override bootdelay and network settings.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| -rw-r--r-- | include/configs/bfin_adi_common.h | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h index 55b8b0be34..22312f5f5c 100644 --- a/include/configs/bfin_adi_common.h +++ b/include/configs/bfin_adi_common.h @@ -119,10 +119,12 @@ /* * Env Settings */ -#if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_UART) -# define CONFIG_BOOTDELAY -1 -#else -# define CONFIG_BOOTDELAY 5 +#ifndef CONFIG_BOOTDELAY +# if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_UART) +# define CONFIG_BOOTDELAY -1 +# else +# define CONFIG_BOOTDELAY 5 +# endif #endif #ifndef CONFIG_BOOTCOMMAND # define CONFIG_BOOTCOMMAND "run ramboot" @@ -244,11 +246,15 @@ * Network Settings */ #ifdef CONFIG_CMD_NET -# define CONFIG_IPADDR 192.168.0.15 # define CONFIG_NETMASK 255.255.255.0 -# define CONFIG_GATEWAYIP 192.168.0.1 -# define CONFIG_SERVERIP 192.168.0.2 -# define CONFIG_ROOTPATH /romfs +# ifndef CONFIG_IPADDR +# define CONFIG_IPADDR 192.168.0.15 +# define CONFIG_GATEWAYIP 192.168.0.1 +# define CONFIG_SERVERIP 192.168.0.2 +# endif +# ifndef CONFIG_ROOTPATH +# define CONFIG_ROOTPATH /romfs +# endif # ifdef CONFIG_CMD_DHCP # ifndef CONFIG_SYS_AUTOLOAD # define CONFIG_SYS_AUTOLOAD "no" |