diff options
author | John Crispin <blogic@openwrt.org> | 2014-12-02 15:25:37 +0000 |
---|---|---|
committer | John Crispin <blogic@openwrt.org> | 2014-12-02 15:25:37 +0000 |
commit | 606804741a49efd0af39b54e9278b792575229a1 (patch) | |
tree | ac50f8a805253a876114b635a9126fabe120f422 /package/boot/uboot-oxnas/patches/150-spl-block.patch | |
parent | ab7a23e72add2ea4d7f00a8cea7f7b9440e14523 (diff) | |
download | master-187ad058-606804741a49efd0af39b54e9278b792575229a1.tar.gz master-187ad058-606804741a49efd0af39b54e9278b792575229a1.tar.bz2 master-187ad058-606804741a49efd0af39b54e9278b792575229a1.zip |
uboot-oxnas: bump to U-Boot 2014.10
A few trivial changes were needed to adapt to upstream framework changes.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43499 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/boot/uboot-oxnas/patches/150-spl-block.patch')
-rw-r--r-- | package/boot/uboot-oxnas/patches/150-spl-block.patch | 6 |
1 files changed, 3 insertions, 3 deletions
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 |