X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;ds=sidebyside;f=package%2Fboot%2Fuboot-oxnas%2Fpatches%2F150-spl-block.patch;h=5d76084859dae7a51d58397fb257804544c88570;hb=HEAD;hp=a258f3fe0cee828dd33dfddbea28437bbe3244ff;hpb=fed0eac76252f5619c68132e4a34a1918bbd3429;p=openwrt-working-2016%2F.git

diff --git a/package/boot/uboot-oxnas/patches/150-spl-block.patch b/package/boot/uboot-oxnas/patches/150-spl-block.patch
index a258f3fe0c..5d76084859 100644
--- a/package/boot/uboot-oxnas/patches/150-spl-block.patch
+++ b/package/boot/uboot-oxnas/patches/150-spl-block.patch
@@ -25,7 +25,7 @@
  #ifdef CONFIG_SPL_ETH_DEVICE
 --- a/common/cmd_nvedit.c
 +++ b/common/cmd_nvedit.c
-@@ -47,6 +47,7 @@ DECLARE_GLOBAL_DATA_PTR;
+@@ -49,6 +49,7 @@ DECLARE_GLOBAL_DATA_PTR;
  	!defined(CONFIG_ENV_IS_IN_SPI_FLASH)	&& \
  	!defined(CONFIG_ENV_IS_IN_REMOTE)	&& \
  	!defined(CONFIG_ENV_IS_IN_UBI)		&& \
@@ -35,7 +35,7 @@
  SPI_FLASH|NVRAM|MMC|FAT|REMOTE|UBI} or CONFIG_ENV_IS_NOWHERE
 --- a/common/Makefile
 +++ b/common/Makefile
-@@ -45,6 +45,7 @@ obj-$(CONFIG_ENV_IS_IN_ONENAND) += env_o
+@@ -63,6 +63,7 @@ obj-$(CONFIG_ENV_IS_IN_ONENAND) += env_o
  obj-$(CONFIG_ENV_IS_IN_SPI_FLASH) += env_sf.o
  obj-$(CONFIG_ENV_IS_IN_REMOTE) += env_remote.o
  obj-$(CONFIG_ENV_IS_IN_UBI) += env_ubi.o
@@ -43,7 +43,7 @@
  obj-$(CONFIG_ENV_IS_NOWHERE) += env_nowhere.o
  
  # command
-@@ -191,6 +192,8 @@ obj-$(CONFIG_UPDATE_TFTP) += update.o
+@@ -213,6 +214,8 @@ obj-$(CONFIG_UPDATE_TFTP) += update.o
  obj-$(CONFIG_USB_KEYBOARD) += usb_kbd.o
  obj-$(CONFIG_CMD_DFU) += cmd_dfu.o
  obj-$(CONFIG_CMD_GPT) += cmd_gpt.o