X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fconfigs%2Fnsa310s.h;h=35cb5b057cd70ffb6d053e91660499e3638b1be1;hb=80286e8f811341e6054a85b69e2573a778ba42cf;hp=896c32996ce0abf763d5ee1b6ff1f68d780eeba7;hpb=470135be276b2d92c6da464c68839202d4ff0d08;p=u-boot

diff --git a/include/configs/nsa310s.h b/include/configs/nsa310s.h
index 896c32996c..35cb5b057c 100644
--- a/include/configs/nsa310s.h
+++ b/include/configs/nsa310s.h
@@ -49,17 +49,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"
@@ -67,7 +60,6 @@
 /* Ethernet driver configuration */
 #ifdef CONFIG_CMD_NET
 #define CONFIG_NETCONSOLE
-#define CONFIG_NET_MULTI
 #define CONFIG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
 #define CONFIG_PHY_BASE_ADR	1
 #define CONFIG_RESET_PHY_R