Merge branch 'master' of git://git.denx.de/u-boot-net

[platform/kernel/u-boot.git] / include / configs / nsa310s.h

diff --git a/include/configs/nsa310s.h b/include/configs/nsa310s.h
index 9c84acc..1ca9a01 100644 (file)
--- a/include/configs/nsa310s.h
+++ b/include/configs/nsa310s.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2015
  * Gerald Kerma <dreagle@doukki.net>
  * Tony Dinh <mibodhi@gmail.com>
  * Luka Perkov <luka.perkov@sartura.hr>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef _CONFIG_NSA310S_H
@@ -23,7 +22,6 @@
 #define CONFIG_BZIP2
 
 /* commands configuration */
-#define CONFIG_SYS_MVFS
 
 /*
  * mv-common.h should be defined after CMD configs since it used them
@@ -49,17 +47,10 @@
        "fdt addr 0x700000; fdt resize; fdt chosen; " \
        "bootz 0x800000 - 0x700000"
 
-#define CONFIG_MTDPARTS \
-       "mtdparts=orion_nand:" \
-       "0xe0000@0x0(uboot)," \
-       "0x20000@0xe0000(uboot_env)," \
-       "0x100000@0x100000(second_stage_uboot)," \
-       "-@0x200000(root)\0"
-
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "console=console=ttyS0,115200\0" \
        "mtdids=nand0=orion_nand\0" \
-       "mtdparts="CONFIG_MTDPARTS \
+       "mtdparts="CONFIG_MTDPARTS_DEFAULT \
        "kernel=/boot/zImage\0" \
        "fdt=/boot/nsa310s.dtb\0" \
        "bootargs_root=ubi.mtd=3 root=ubi0:rootfs rootfstype=ubifs rw\0"