uboot-kirkwood: update to 2017.09

[openwrt/openwrt.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 0831f1092a2ab69385c20d7a9a71ca0447474b21..10d8d4405c952bdff3c6c1c3d01a1f27ced9e32f 100644 (file)
--- a/package/boot/uboot-kirkwood/patches/007-nsa310-uboot-generic.patch
+++ b/package/boot/uboot-kirkwood/patches/007-nsa310-uboot-generic.patch
@@ -27,23 +27,23 @@ 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
-@@ -53,6 +53,9 @@ config TARGET_GOFLEXHOME
+@@ -56,6 +56,9 @@ config TARGET_GOFLEXHOME
  config TARGET_NAS220
-       bool "BlackArmor NAS220"
-
+       bool "BlackArmor NAS220"
+ 
 +config TARGET_NSA310
 +      bool "Zyxel NSA310 Board"
 +
  config TARGET_NSA310S
-       bool "Zyxel NSA310S"
-
-@@ -77,6 +80,7 @@ source "board/raidsonic/ib62x0/Kconfig"
+       bool "Zyxel NSA310S"
+ 
+@@ -80,6 +83,7 @@ source "board/raidsonic/ib62x0/Kconfig"
  source "board/Seagate/dockstar/Kconfig"
  source "board/Seagate/goflexhome/Kconfig"
  source "board/Seagate/nas220/Kconfig"
 +source "board/zyxel/nsa310/Kconfig"
  source "board/zyxel/nsa310s/Kconfig"
-
+ 
  endif
 diff --git a/board/zyxel/nsa310/Kconfig b/board/zyxel/nsa310/Kconfig
 new file mode 100644
@@ -528,7 +528,7 @@ new file mode 100644
 index 0000000..d26ef35
 --- /dev/null
 +++ b/configs/nsa310_defconfig
-@@ -0,0 +1,22 @@
+@@ -0,0 +1,34 @@
 +CONFIG_ARM=y
 +CONFIG_KIRKWOOD=y
 +CONFIG_TARGET_NSA310=y
@@ -544,19 +544,31 @@ index 0000000..d26ef35
 +CONFIG_CMD_DHCP=y
 +CONFIG_CMD_MII=y
 +CONFIG_CMD_PING=y
++CONFIG_CMD_DNS=y
++CONFIG_CMD_SNTP=y
 +CONFIG_CMD_USB=y
++CONFIG_CMD_DATE=y
 +CONFIG_CMD_EXT2=y
++CONFIG_CMD_EXT4=y
 +CONFIG_CMD_FAT=y
++CONFIG_CMD_JFFS2=y
++CONFIG_CMD_MTDPARTS=y
++CONFIG_CMD_ENV=y
++CONFIG_CMD_NAND=y
 +CONFIG_EFI_PARTITION=y
++CONFIG_ENV_IS_IN_NAND=y
 +CONFIG_CMD_UBI=y
 +CONFIG_USB=y
++CONFIG_USB_EHCI_HCD=y
 +CONFIG_USB_STORAGE=y
++CONFIG_LZMA=y
++CONFIG_LZO=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,144 @@
+@@ -0,0 +1,126 @@
 +/* Copyright (C) 2015-2016 bodhi <mibodhi@gmail.com>
 + *
 + * Based on
@@ -594,7 +606,7 @@ index 0000000..86ef825
 + */
 +#define CONFIG_FEROCEON_88FR131               /* CPU Core subversion */
 +#define CONFIG_KW88F6281              /* SOC Name */
-+#define CONFIG_MACH_NSA310            /* Machine type */
++
 +#define CONFIG_SKIP_LOWLEVEL_INIT     /* disable board lowlevel_init */
 +
 +/*
@@ -605,14 +617,8 @@ index 0000000..86ef825
 +/*
 + * Commands configuration
 + */
-+#define CONFIG_CMD_ENV
-+#define CONFIG_CMD_IDE
-+#define CONFIG_CMD_NAND
-+#define CONFIG_CMD_DATE
 +#define CONFIG_SYS_LONGHELP
 +#define CONFIG_PREBOOT
-+#define CONFIG_SYS_HUSH_PARSER
-+#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 +
 +/*
 + * mv-common.h should be defined after CMD configs since it used them
@@ -624,10 +630,7 @@ index 0000000..86ef825
 + * Environment variables configurations
 + */
 +#ifdef CONFIG_CMD_NAND
-+#define CONFIG_ENV_IS_IN_NAND           1
 +#define CONFIG_ENV_SECT_SIZE            0x20000         /* 128K */
-+#else
-+#define CONFIG_ENV_IS_NOWHERE           1               /* if env in SDRAM */
 +#endif
 +
 +/* max 4k env size is enough, but in case of nand
@@ -665,7 +668,6 @@ index 0000000..86ef825
 +#define CONFIG_NET_MULTI
 +#define CONFIG_MVGBE_PORTS            {1, 0}  /* enable port 0 only */
 +#define CONFIG_PHY_BASE_ADR           0x1
-+#define CONFIG_PHY_GIGE
 +#define CONFIG_RESET_PHY_R
 +#endif /* CONFIG_CMD_NET */
 +
@@ -680,24 +682,16 @@ index 0000000..86ef825
 +/*
 + * File system
 + */
-+#define CONFIG_CMD_EXT4
-+#define CONFIG_CMD_JFFS2
 +#define CONFIG_JFFS2_NAND
 +#define CONFIG_JFFS2_LZO
-+#define CONFIG_CMD_UBIFS
-+#define CONFIG_RBTREE
 +#define CONFIG_MTD_DEVICE               /* needed for mtdparts commands */
 +#define CONFIG_MTD_PARTITIONS
-+#define CONFIG_CMD_MTDPARTS
-+#define CONFIG_LZO
 +
 +/*
 + *  Date Time
 + */
 +#ifdef CONFIG_CMD_DATE
 +#define CONFIG_RTC_MV
-+#define CONFIG_CMD_SNTP
-+#define CONFIG_CMD_DNS
 +#endif /* CONFIG_CMD_DATE */
 +
 +#endif /* _CONFIG_NSA310_H */