hc
2024-12-19 9370bb92b2d16684ee45cf24e879c93c509162da
kernel/arch/mips/fw/lib/cmdline.c
....@@ -16,6 +16,7 @@
1616 int *_fw_argv;
1717 int *_fw_envp;
1818
19
+#ifndef CONFIG_HAVE_PLAT_FW_INIT_CMDLINE
1920 void __init fw_init_cmdline(void)
2021 {
2122 int i;
....@@ -41,6 +42,7 @@
4142 strlcat(arcs_cmdline, " ", COMMAND_LINE_SIZE);
4243 }
4344 }
45
+#endif
4446
4547 char * __init fw_getcmdline(void)
4648 {
....@@ -51,7 +53,7 @@
5153 {
5254 char *result = NULL;
5355
54
- if (_fw_envp != NULL) {
56
+ if (_fw_envp != NULL && fw_envp(0) != NULL) {
5557 /*
5658 * Return a pointer to the given environment variable.
5759 * YAMON uses "name", "value" pairs, while U-Boot uses