diff options
| author | Tom Rini <trini@konsulko.com> | 2018-01-27 14:48:41 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-01-27 14:48:41 -0500 |
| commit | d61639e39a9f1a5c0a05b384196c60a4f75ec93a (patch) | |
| tree | 2c06975159570bd554107abe14d18ae38a2a56c8 /include/configs/socfpga_common.h | |
| parent | 0163c9186b161682a46bd7ae3c2e6ffe275bb1f8 (diff) | |
| parent | 92962b3caf17f5e64075601a466b3ac00dbd0a88 (diff) | |
Merge git://git.denx.de/u-boot-socfpga
Diffstat (limited to 'include/configs/socfpga_common.h')
| -rw-r--r-- | include/configs/socfpga_common.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index f6607b101e..d343a6ec0a 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -65,9 +65,6 @@ #define CONFIG_SYS_HOSTNAME CONFIG_SYS_BOARD #endif -#define CONFIG_CMD_PXE -#define CONFIG_MENU - /* * Cache */ @@ -304,6 +301,12 @@ unsigned int cm_get_qspi_controller_clk_hz(void); #ifndef CONFIG_SPL_BUILD #include <config_distro_defaults.h> +#ifdef CONFIG_CMD_DHCP +#define BOOT_TARGET_DEVICES_DHCP(func) func(DHCP, dhcp, na) +#else +#define BOOT_TARGET_DEVICES_DHCP(func) +#endif + #ifdef CONFIG_CMD_PXE #define BOOT_TARGET_DEVICES_PXE(func) func(PXE, pxe, na) #else @@ -319,7 +322,7 @@ unsigned int cm_get_qspi_controller_clk_hz(void); #define BOOT_TARGET_DEVICES(func) \ BOOT_TARGET_DEVICES_MMC(func) \ BOOT_TARGET_DEVICES_PXE(func) \ - func(DHCP, dhcp, na) + BOOT_TARGET_DEVICES_DHCP(func) #include <config_distro_bootcmd.h> |