kirkwood: kconfig: refactor Kconfig and defconfig

[oweals/u-boot.git] / include / configs / dockstar.h

diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h
index 249f93bf130f3baa8206a20093096cb5a68c4df6..46a42b30874492f970aabf6b0420ea11d57d7dbc 100644 (file)
--- a/include/configs/dockstar.h
+++ b/include/configs/dockstar.h
@@ -6,23 +6,7 @@
  * (C) Copyright 2009
  * Marvell Semiconductor <www.marvell.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., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef _CONFIG_DOCKSTAR_H
@@ -37,7 +21,6 @@
  * High Level Configuration Options (easy to change)
  */
 #define CONFIG_FEROCEON_88FR131        1       /* CPU Core subversion */
-#define CONFIG_KIRKWOOD                1       /* SOC Family Name */
 #define CONFIG_KW88F6281       1       /* SOC Name */
 #define CONFIG_MACH_DOCKSTAR   /* Machine type */
 #define CONFIG_SKIP_LOWLEVEL_INIT      /* disable board lowlevel_init */
@@ -85,7 +68,7 @@
 #define CONFIG_BOOTCOMMAND \
        "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; "     \
        "ubi part root; " \
-       "ubifsmount root; " \
+       "ubifsmount ubi:root; " \
        "ubifsload 0x800000 ${kernel}; " \
        "ubifsload 0x1100000 ${initrd}; " \
        "bootm 0x800000 0x1100000"