diff options
| author | Simon Goldschmidt <sgoldschmidt@de.pepperl-fuchs.com> | 2018-01-25 07:18:27 +0100 |
|---|---|---|
| committer | Marek Vasut <marex@denx.de> | 2018-01-25 09:59:37 +0100 |
| commit | 1c7fa79314ee77443c56ad80303de55710cede29 (patch) | |
| tree | 5568d8dcf860ff084a534d1f1ff984b6dadfcb8f /include/configs/socfpga_common.h | |
| parent | fb4413295c765aa8c013650984dc2d908964c81d (diff) | |
arm: socfpga: allow configs without network support
Currently, socfpga_common.h does not allow configurations without
network support. This is because CONFIG_CMD_PXE is defined in this
file and distro mode has DHCP hard-coded as available.
Fix this by moving CONFIG_CMD_PXE and CONFIG_MENU to the defconfigs
and by making DHCP optional in BOOT_TARGET_DEVICES(func).
Signed-off-by: Simon Goldschmidt <sgoldschmidt@de.pepperl-fuchs.com>
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 66e7c4fc8b..40e5fd2bf7 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 */ @@ -306,6 +303,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 @@ -321,7 +324,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> |