1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 94275a7..ed1aac6 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -467,6 +467,9 @@ extern int soft_i2c_gpio_scl;
#define BOOTENV_DEV_NAME_FEL(devtypeu, devtypel, instance) \
"fel "
+/* Enable Extlinux boot support */
+#define CONFIG_CMD_PXE
+#define CONFIG_MENU
#define BOOT_TARGET_DEVICES(func) \
func(FEL, fel, na) \
BOOT_TARGET_DEVICES_MMC(func) \
@@ -475,6 +478,7 @@ extern int soft_i2c_gpio_scl;
BOOT_TARGET_DEVICES_USB(func) \
func(PXE, pxe, na) \
func(DHCP, dhcp, na)
+#include <config_distro_bootcmd.h>
#ifdef CONFIG_OLD_SUNXI_KERNEL_COMPAT
#define BOOTCMD_SUNXI_COMPAT \
@@ -492,8 +496,6 @@ extern int soft_i2c_gpio_scl;
#define BOOTCMD_SUNXI_COMPAT
#endif
-#include <config_distro_bootcmd.h>
-
#ifdef CONFIG_USB_KEYBOARD
#define CONSOLE_STDIN_SETTINGS \
"preboot=usb start\0" \
@@ -518,13 +520,13 @@ extern int soft_i2c_gpio_scl;
CONSOLE_STDOUT_SETTINGS
#define CONFIG_EXTRA_ENV_SETTINGS \
+ BOOTENV \
CONSOLE_ENV_SETTINGS \
MEM_LAYOUT_ENV_SETTINGS \
DFU_ALT_INFO_RAM \
"fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
"console=ttyS0,115200\0" \
- BOOTCMD_SUNXI_COMPAT \
- BOOTENV
+ BOOTCMD_SUNXI_COMPAT
#else /* ifndef CONFIG_SPL_BUILD */
#define CONFIG_EXTRA_ENV_SETTINGS
--
2.8.3
|
