projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cmd: Convert CONFIG_CMD_ELF to Kconfig
[platform/kernel/u-boot.git]
/
include
/
config_distro_defaults.h
diff --git
a/include/config_distro_defaults.h
b/include/config_distro_defaults.h
index
5d18a4b
..
9d1de55
100644
(file)
--- a/
include/config_distro_defaults.h
+++ b/
include/config_distro_defaults.h
@@
-10,7
+10,7
@@
/*
* List of all commands and options that when defined enables support for
* features required by distros to support boards in a standardised and
/*
* List of all commands and options that when defined enables support for
* features required by distros to support boards in a standardised and
- * consi
ta
nt manner.
+ * consi
ste
nt manner.
*/
#define CONFIG_BOOTP_BOOTPATH
*/
#define CONFIG_BOOTP_BOOTPATH
@@
-20,26
+20,40
@@
#define CONFIG_BOOTP_PXE
#define CONFIG_BOOTP_SUBNETMASK
#define CONFIG_BOOTP_PXE
#define CONFIG_BOOTP_SUBNETMASK
-#if defined(__arm__)
+#if defined(__arm__)
|| defined(__aarch64__)
#define CONFIG_BOOTP_PXE_CLIENTARCH 0x100
#if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__)
#define CONFIG_BOOTP_PXE_CLIENTARCH 0x100
#if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__)
+#if !defined(CONFIG_BOOTP_VCI_STRING)
#define CONFIG_BOOTP_VCI_STRING "U-boot.armv7"
#define CONFIG_BOOTP_VCI_STRING "U-boot.armv7"
+#endif
+#elif defined(__aarch64__)
+#if !defined(CONFIG_BOOTP_VCI_STRING)
+#define CONFIG_BOOTP_VCI_STRING "U-boot.armv8"
+#endif
#else
#else
+#if !defined(CONFIG_BOOTP_VCI_STRING)
#define CONFIG_BOOTP_VCI_STRING "U-boot.arm"
#endif
#endif
#define CONFIG_BOOTP_VCI_STRING "U-boot.arm"
#endif
#endif
+#elif defined(__i386__)
+#define CONFIG_BOOTP_PXE_CLIENTARCH 0x0
+#elif defined(__x86_64__)
+#define CONFIG_BOOTP_PXE_CLIENTARCH 0x9
+#endif
#define CONFIG_OF_LIBFDT
#define CONFIG_OF_LIBFDT
+#ifdef CONFIG_ARM64
+#define CONFIG_CMD_BOOTI
+#else
#define CONFIG_CMD_BOOTZ
#define CONFIG_CMD_BOOTZ
+#endif
#define CONFIG_CMD_DHCP
#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
#define CONFIG_CMD_EXT2
#define CONFIG_CMD_EXT4
#define CONFIG_CMD_FAT
#define CONFIG_CMD_FS_GENERIC
#define CONFIG_CMD_MII
#define CONFIG_CMD_EXT2
#define CONFIG_CMD_EXT4
#define CONFIG_CMD_FAT
#define CONFIG_CMD_FS_GENERIC
#define CONFIG_CMD_MII
-#define CONFIG_CMD_NET
#define CONFIG_CMD_PING
#define CONFIG_CMD_PXE
#define CONFIG_CMD_PING
#define CONFIG_CMD_PXE