summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2023-02-28 19:19:12 +0100
committerTom Rini <trini@konsulko.com>2023-03-29 11:58:26 -0400
commitd5436aad140aa452856509affd99ffc5fceb49d7 (patch)
tree71cfb604f767be626eeb600a11520921f11c166a
parent6ac9131702768343bec150894daac7208963b440 (diff)
iot2050: Migrate settings into board env file
Anything that is not boot-env related is better kept there by now. At this chance, also drop a stale comment from iot2050.h Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
-rw-r--r--board/siemens/iot2050/iot2050.env9
-rw-r--r--include/configs/iot2050.h11
2 files changed, 11 insertions, 9 deletions
diff --git a/board/siemens/iot2050/iot2050.env b/board/siemens/iot2050/iot2050.env
new file mode 100644
index 00000000000..4bd93f0b2f4
--- /dev/null
+++ b/board/siemens/iot2050/iot2050.env
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (c) Siemens AG, 2023
+ *
+ * Authors:
+ * Jan Kiszka <jan.kiszka@siemens.com>
+ */
+
+usb_pgood_delay=900
diff --git a/include/configs/iot2050.h b/include/configs/iot2050.h
index cfff46ce339..8dfeaddf541 100644
--- a/include/configs/iot2050.h
+++ b/include/configs/iot2050.h
@@ -13,12 +13,6 @@
#include <linux/sizes.h>
-/* SPL Loader Configuration */
-
-/* U-Boot general configuration */
-#define EXTRA_ENV_IOT2050_BOARD_SETTINGS \
- "usb_pgood_delay=900\0"
-
#if IS_ENABLED(CONFIG_CMD_USB)
# define BOOT_TARGET_USB(func) \
func(USB, usb, 0) \
@@ -40,10 +34,9 @@
#include <config_distro_bootcmd.h>
-#define CFG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
DEFAULT_LINUX_BOOT_ENV \
- BOOTENV \
- EXTRA_ENV_IOT2050_BOARD_SETTINGS
+ BOOTENV
#include <configs/ti_armv7_common.h>