blob: 83743ad5c4c52026c89c1050a8290c6bd9d141b6 (
plain)
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
|
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index b01d1c3c84..d28019801d 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -416,6 +416,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 \
@@ -433,8 +434,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" \
@@ -498,6 +497,7 @@ extern int soft_i2c_gpio_scl;
#endif
#define CONFIG_EXTRA_ENV_SETTINGS \
+ BOOTENV \
CONSOLE_ENV_SETTINGS \
MEM_LAYOUT_ENV_SETTINGS \
DFU_ALT_INFO_RAM \
@@ -508,8 +508,7 @@ extern int soft_i2c_gpio_scl;
"uuid_gpt_esp=" UUID_GPT_ESP "\0" \
"uuid_gpt_system=" UUID_GPT_SYSTEM "\0" \
"partitions=" PARTS_DEFAULT "\0" \
- BOOTCMD_SUNXI_COMPAT \
- BOOTENV
+ BOOTCMD_SUNXI_COMPAT
#else /* ifndef CONFIG_SPL_BUILD */
#define CONFIG_EXTRA_ENV_SETTINGS
|
