diff options
| author | Matwey V. Kornilov <matwey.kornilov@gmail.com> | 2015-10-29 21:54:15 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-11-12 18:12:56 -0500 |
| commit | 755324c432f62306487786f89efce96398291a03 (patch) | |
| tree | 43c8b5ce43cfcf317069c50041a03a23b0bba082 /include | |
| parent | daa75b34828d45b7c1d63009188d45f4a32d06ba (diff) | |
configs: Use config_distro_defaults.h in ti_armv7_common.h
CONFIG_BOOTDELAY is defined in config_distro_defaults.h
Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com>
[trini: Drop omap3_logic.h settings which were a warning and no longer
correct usage].
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/omap3_logic.h | 9 | ||||
| -rw-r--r-- | include/configs/ti_armv7_common.h | 7 |
2 files changed, 2 insertions, 14 deletions
diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index ecd56158597..7b60f29bd27 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -272,13 +272,4 @@ #endif /* (CONFIG_CMD_NET) */ -/* - * BOOTP fields - */ - -#define CONFIG_BOOTP_SUBNETMASK 0x00000001 -#define CONFIG_BOOTP_GATEWAY 0x00000002 -#define CONFIG_BOOTP_HOSTNAME 0x00000004 -#define CONFIG_BOOTP_BOOTPATH 0x00000010 - #endif /* __CONFIG_H */ diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index 32bb805f781..7810dd6c302 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -67,11 +67,6 @@ "rootfstype=${mmcrootfstype}\0" /* - * Default to a quick boot delay. - */ -#define CONFIG_BOOTDELAY 1 - -/* * DDR information. If the CONFIG_NR_DRAM_BANKS is not defined, * we say (for simplicity) that we have 1 bank, always, even when * we have more. We always start at 0x80000000, and we place the @@ -288,4 +283,6 @@ #define NETARGS "" #endif +#include <config_distro_defaults.h> + #endif /* __CONFIG_TI_ARMV7_COMMON_H__ */ |