cmd: move mac command

Board specific implementations of the 'mac' command differ concerning the
supported sub-commands.

Move the Freescale specific mac command definition to the board code.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>

diff --git a/board/freescale/common/sys_eeprom.c b/board/freescale/common/sys_eeprom.c
index 431f8caeb03496e6ff4cbc3034186d9be045181b..d4a00fe920532abb235a96be5ca6c588b6fa5e47 100644 (file)
--- a/board/freescale/common/sys_eeprom.c
+++ b/board/freescale/common/sys_eeprom.c
@@ -623,3 +623,25 @@ unsigned int get_cpu_board_revision(void)
        return MPC85XX_CPU_BOARD_REV(be.major, be.minor);
 }
 #endif
+
+U_BOOT_CMD(
+       mac, 3, 1,  do_mac,
+       "display and program the system ID and MAC addresses in EEPROM",
+       "[read|save|id|num|errata|date|ports|port_number]\n"
+       "mac read\n"
+       "    - read EEPROM content into memory data structure\n"
+       "mac save\n"
+       "    - save memory data structure to the EEPROM\n"
+       "mac id\n"
+       "    - program system id per hard coded value\n"
+       "mac num string\n"
+       "    - program system serial number to value string\n"
+       "mac errata string\n"
+       "    - program errata data to value string\n"
+       "mac date YYMMDDhhmmss\n"
+       "    - program date to string value YYMMDDhhmmss\n"
+       "mac ports N\n"
+       "    - program the number of network ports to integer N\n"
+       "mac X string\n"
+       "    - program MAC addr for port X [X=0,1..] to colon separated string"
+);

diff --git a/cmd/Makefile b/cmd/Makefile
index 971f78a7fbd46f01fff3c86eb2c0e3ab8c5af026..83a4481cc9ed905858f44db836744d30f21b186c 100644 (file)
--- a/cmd/Makefile
+++ b/cmd/Makefile
@@ -108,7 +108,6 @@ obj-$(CONFIG_CMD_LICENSE) += license.o
 obj-y += load.o
 obj-$(CONFIG_CMD_LOG) += log.o
 obj-$(CONFIG_CMD_LSBLK) += lsblk.o
-obj-$(CONFIG_ID_EEPROM) += mac.o
 obj-$(CONFIG_CMD_MD5SUM) += md5sum.o
 obj-$(CONFIG_CMD_MEMORY) += mem.o
 obj-$(CONFIG_CMD_IO) += io.o

diff --git a/cmd/mac.c b/cmd/mac.c
deleted file mode 100644 (file)
index a39e116..0000000
--- a/cmd/mac.c
+++ /dev/null
@@ -1,33 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright 2006 Freescale Semiconductor
- * York Sun (yorksun@freescale.com)
- */
-
-#include <common.h>
-#include <command.h>
-
-extern int do_mac(struct cmd_tbl *cmdtp, int flag, int argc,
-                 char *const argv[]);
-
-U_BOOT_CMD(
-       mac, 3, 1,  do_mac,
-       "display and program the system ID and MAC addresses in EEPROM",
-       "[read|save|id|num|errata|date|ports|port_number]\n"
-       "mac read\n"
-       "    - read EEPROM content into memory data structure\n"
-       "mac save\n"
-       "    - save memory data structure to the EEPROM\n"
-       "mac id\n"
-       "    - program system id per hard coded value\n"
-       "mac num string\n"
-       "    - program system serial number to value string\n"
-       "mac errata string\n"
-       "    - program errata data to value string\n"
-       "mac date YYMMDDhhmmss\n"
-       "    - program date to string value YYMMDDhhmmss\n"
-       "mac ports N\n"
-       "    - program the number of network ports to integer N\n"
-       "mac X string\n"
-       "    - program MAC addr for port X [X=0,1..] to colon separated string"
-);