summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2012-03-04 15:11:32 +0000
committerWolfgang Denk <wd@denx.de>2012-06-21 20:53:09 +0200
commitb37d41aa24aedd84f718d019e5b7a27a06aa73fc (patch)
treee12a4ccd3275a88b8075e6ef592dd0091b631f03 /common
parent3648ff2d9d352b175008dd5637c9e8b85b85e844 (diff)
downloadblackbird-obmc-uboot-b37d41aa24aedd84f718d019e5b7a27a06aa73fc.tar.gz
blackbird-obmc-uboot-b37d41aa24aedd84f718d019e5b7a27a06aa73fc.zip
Block: Remove MG DISK support
This driver is unused and obsolete. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Wolfgang Denk <wd@denx.de> Cc: unsik Kim <donari75@gmail.com>
Diffstat (limited to 'common')
-rw-r--r--common/Makefile2
-rw-r--r--common/cmd_mgdisk.c71
-rw-r--r--common/cmd_nvedit.c3
-rw-r--r--common/env_mgdisk.c76
4 files changed, 1 insertions, 151 deletions
diff --git a/common/Makefile b/common/Makefile
index 6e23baaf61..31175e34d3 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -52,7 +52,6 @@ COBJS-$(CONFIG_ENV_IS_IN_EEPROM) += env_embedded.o
XCOBJS-$(CONFIG_ENV_IS_IN_FLASH) += env_embedded.o
COBJS-$(CONFIG_ENV_IS_IN_NVRAM) += env_embedded.o
COBJS-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o
-COBJS-$(CONFIG_ENV_IS_IN_MG_DISK) += env_mgdisk.o
COBJS-$(CONFIG_ENV_IS_IN_MMC) += env_mmc.o
COBJS-$(CONFIG_ENV_IS_IN_FAT) += env_fat.o
COBJS-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o
@@ -115,7 +114,6 @@ COBJS-$(CONFIG_ID_EEPROM) += cmd_mac.o
COBJS-$(CONFIG_CMD_MD5SUM) += cmd_md5sum.o
COBJS-$(CONFIG_CMD_MEMORY) += cmd_mem.o
COBJS-$(CONFIG_CMD_MFSL) += cmd_mfsl.o
-COBJS-$(CONFIG_CMD_MG_DISK) += cmd_mgdisk.o
COBJS-$(CONFIG_MII) += miiphyutil.o
COBJS-$(CONFIG_CMD_MII) += miiphyutil.o
COBJS-$(CONFIG_PHYLIB) += miiphyutil.o
diff --git a/common/cmd_mgdisk.c b/common/cmd_mgdisk.c
deleted file mode 100644
index 3bd2429c78..0000000000
--- a/common/cmd_mgdisk.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * (C) Copyright 2009 mGine co.
- * unsik Kim <donari75@gmail.com>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#include <common.h>
-#include <command.h>
-
-#include <mg_disk.h>
-
-int do_mg_disk_cmd (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
-{
- u32 from, to, size;
-
- switch (argc) {
- case 2:
- if (!strcmp(argv[1], "init"))
- mg_disk_init();
- else
- return 1;
- break;
- case 5:
- from = simple_strtoul(argv[2], NULL, 0);
- to = simple_strtoul(argv[3], NULL, 0);
- size = simple_strtoul(argv[4], NULL, 0);
-
- if (!strcmp(argv[1], "read"))
- mg_disk_read(from, (u8 *)to, size);
- else if (!strcmp(argv[1], "write"))
- mg_disk_write(to, (u8 *)from, size);
- else if (!strcmp(argv[1], "readsec"))
- mg_disk_read_sects((void *)to, from, size);
- else if (!strcmp(argv[1], "writesec"))
- mg_disk_write_sects((void *)from, to, size);
- else
- return 1;
- break;
- default:
- return CMD_RET_USAGE;
- }
- return 0;
-}
-
-U_BOOT_CMD(
- mgd, 5, 0, do_mg_disk_cmd,
- "mgine m[g]flash command\n",
- ": mgine mflash IO mode (disk) command\n"
- " - initialize : mgd init\n"
- " - random read : mgd read [from] [to] [size]\n"
- " - random write : mgd write [from] [to] [size]\n"
- " - sector read : mgd readsec [sector] [to] [counts]\n"
- " - sector write : mgd writesec [from] [sector] [counts]"
-);
diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index 271200266c..fd05e725d7 100644
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -59,7 +59,6 @@ DECLARE_GLOBAL_DATA_PTR;
#if !defined(CONFIG_ENV_IS_IN_EEPROM) && \
!defined(CONFIG_ENV_IS_IN_FLASH) && \
!defined(CONFIG_ENV_IS_IN_DATAFLASH) && \
- !defined(CONFIG_ENV_IS_IN_MG_DISK) && \
!defined(CONFIG_ENV_IS_IN_MMC) && \
!defined(CONFIG_ENV_IS_IN_FAT) && \
!defined(CONFIG_ENV_IS_IN_NAND) && \
@@ -69,7 +68,7 @@ DECLARE_GLOBAL_DATA_PTR;
!defined(CONFIG_ENV_IS_IN_REMOTE) && \
!defined(CONFIG_ENV_IS_NOWHERE)
# error Define one of CONFIG_ENV_IS_IN_{EEPROM|FLASH|DATAFLASH|ONENAND|\
-SPI_FLASH|MG_DISK|NVRAM|MMC|FAT|REMOTE} or CONFIG_ENV_IS_NOWHERE
+SPI_FLASH|NVRAM|MMC|FAT|REMOTE} or CONFIG_ENV_IS_NOWHERE
#endif
#define XMK_STR(x) #x
diff --git a/common/env_mgdisk.c b/common/env_mgdisk.c
deleted file mode 100644
index d00e141d5b..0000000000
--- a/common/env_mgdisk.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * (C) Copyright 2009 mGine co.
- * unsik Kim <donari75@gmail.com>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#include <common.h>
-#include <command.h>
-#include <environment.h>
-#include <linux/stddef.h>
-#include <mg_disk.h>
-
-char *env_name_spec = "MG_DISK";
-
-env_t *env_ptr;
-
-DECLARE_GLOBAL_DATA_PTR;
-
-void env_relocate_spec(void)
-{
- char buf[CONFIG_ENV_SIZE];
- unsigned int err, rc;
-
- err = mg_disk_init();
- if (err) {
- set_default_env("!mg_disk_init error");
- return;
- }
-
- err = mg_disk_read(CONFIG_ENV_ADDR, buf, CONFIG_ENV_SIZE);
- if (err) {
- set_default_env("!mg_disk_read error");
- return;
- }
-
- env_import(buf, 1);
-}
-
-int saveenv(void)
-{
- unsigned int err;
-
- env_ptr->crc = crc32(0, env_ptr->data, ENV_SIZE);
- err = mg_disk_write(CONFIG_ENV_ADDR, (u_char *)env_ptr,
- CONFIG_ENV_SIZE);
- if (err)
- puts("*** Warning - mg_disk_write error\n\n");
-
- return err;
-}
-
-int env_init(void)
-{
- /* use default */
- gd->env_addr = (ulong)&default_environment[0];
- gd->env_valid = 1;
-
- return 0;
-}
OpenPOWER on IntegriCloud