package/boot/uboot-kirkwood: fix build errors for nsa310 and nsa325

[openwrt/staging/wigyori.git] / package / boot / uboot-kirkwood / patches / 007-nsa310-uboot-generic.patch

diff --git a/package/boot/uboot-kirkwood/patches/007-nsa310-uboot-generic.patch b/package/boot/uboot-kirkwood/patches/007-nsa310-uboot-generic.patch
index b9fb78d66d2f1de64e134b31f0a2c8c5ec11e447..0831f1092a2ab69385c20d7a9a71ca0447474b21 100644 (file)
--- a/package/boot/uboot-kirkwood/patches/007-nsa310-uboot-generic.patch
+++ b/package/boot/uboot-kirkwood/patches/007-nsa310-uboot-generic.patch
@@ -1,3 +1,4 @@
+
 arm: kirkwood: add ZyXEL NSA310 device
 
 This patch add ZyXEL NSA310 1-Bay Media Server
@@ -26,7 +27,7 @@ diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
 index 9205b1e..819bd3b 100644
 --- a/arch/arm/mach-kirkwood/Kconfig
 +++ b/arch/arm/mach-kirkwood/Kconfig
-@@ -49,6 +49,9 @@ config TARGET_GOFLEXHOME
+@@ -53,6 +53,9 @@ config TARGET_GOFLEXHOME
  config TARGET_NAS220
        bool "BlackArmor NAS220"
 
@@ -36,7 +37,7 @@ index 9205b1e..819bd3b 100644
  config TARGET_NSA310S
        bool "Zyxel NSA310S"
 
-@@ -72,6 +75,7 @@ source "board/raidsonic/ib62x0/Kconfig"
+@@ -77,6 +80,7 @@ source "board/raidsonic/ib62x0/Kconfig"
  source "board/Seagate/dockstar/Kconfig"
  source "board/Seagate/goflexhome/Kconfig"
  source "board/Seagate/nas220/Kconfig"
@@ -527,10 +528,11 @@ new file mode 100644
 index 0000000..d26ef35
 --- /dev/null
 +++ b/configs/nsa310_defconfig
-@@ -0,0 +1,18 @@
+@@ -0,0 +1,22 @@
 +CONFIG_ARM=y
 +CONFIG_KIRKWOOD=y
 +CONFIG_TARGET_NSA310=y
++CONFIG_IDENT_STRING="\nZyXEL NSA310 1-Bay Power Media Server"
 +CONFIG_BOOTDELAY=3
 +CONFIG_SYS_PROMPT="NSA310> "
 +# CONFIG_CMD_IMLS is not set
@@ -540,18 +542,21 @@ index 0000000..d26ef35
 +CONFIG_OF_LIBFDT=y
 +CONFIG_CMD_SETEXPR=y
 +CONFIG_CMD_DHCP=y
-+CONFIG_CMD_NAND=y
++CONFIG_CMD_MII=y
 +CONFIG_CMD_PING=y
 +CONFIG_CMD_USB=y
 +CONFIG_CMD_EXT2=y
 +CONFIG_CMD_FAT=y
++CONFIG_EFI_PARTITION=y
++CONFIG_CMD_UBI=y
++CONFIG_USB=y
 +CONFIG_USB_STORAGE=y
 diff --git a/include/configs/nsa310.h b/include/configs/nsa310.h
 new file mode 100644
 index 0000000..86ef825
 --- /dev/null
 +++ b/include/configs/nsa310.h
-@@ -0,0 +1,168 @@
+@@ -0,0 +1,144 @@
 +/* Copyright (C) 2015-2016 bodhi <mibodhi@gmail.com>
 + *
 + * Based on
@@ -585,12 +590,6 @@ index 0000000..86ef825
 +#define _CONFIG_NSA310_H
 +
 +/*
-+ * Version number information
-+ */
-+
-+#define CONFIG_IDENT_STRING   "\nZyXEL NSA310 1-Bay Power Media Server \n"
-+
-+/*
 + * High Level Configuration Options (easy to change)
 + */
 +#define CONFIG_FEROCEON_88FR131               /* CPU Core subversion */
@@ -606,15 +605,9 @@ index 0000000..86ef825
 +/*
 + * Commands configuration
 + */
-+#define CONFIG_SYS_NO_FLASH           /* Declare no flash (NOR/SPI) */
-+#define CONFIG_SYS_MVFS                 /* Picks up Filesystem from mv-common.h */
-+#define CONFIG_CMD_DHCP
 +#define CONFIG_CMD_ENV
 +#define CONFIG_CMD_IDE
-+#define CONFIG_CMD_MII
 +#define CONFIG_CMD_NAND
-+#define CONFIG_CMD_PING
-+#define CONFIG_CMD_USB
 +#define CONFIG_CMD_DATE
 +#define CONFIG_SYS_LONGHELP
 +#define CONFIG_PREBOOT
@@ -627,10 +620,6 @@ index 0000000..86ef825
 + */
 +#include "mv-common.h"
 +
-+/* Remove or override few declarations from mv-common.h */
-+#undef CONFIG_SYS_PROMPT      /* previously defined in mv-common.h */
-+#define CONFIG_SYS_PROMPT     "NSA310> "      /* Command Prompt */
-+
 +/*
 + * Environment variables configurations
 + */
@@ -691,13 +680,10 @@ index 0000000..86ef825
 +/*
 + * File system
 + */
-+#define CONFIG_CMD_EXT2
 +#define CONFIG_CMD_EXT4
-+#define CONFIG_CMD_FAT
 +#define CONFIG_CMD_JFFS2
 +#define CONFIG_JFFS2_NAND
 +#define CONFIG_JFFS2_LZO
-+#define CONFIG_CMD_UBI
 +#define CONFIG_CMD_UBIFS
 +#define CONFIG_RBTREE
 +#define CONFIG_MTD_DEVICE               /* needed for mtdparts commands */
@@ -706,11 +692,6 @@ index 0000000..86ef825
 +#define CONFIG_LZO
 +
 +/*
-+ * EFI partition
-+ */
-+#define CONFIG_EFI_PARTITION
-+
-+/*
 + *  Date Time
 + */
 +#ifdef CONFIG_CMD_DATE