diff options
| author | John Crispin <john@openwrt.org> | 2014-12-02 15:25:37 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2014-12-02 15:25:37 +0000 |
| commit | 283d7789eea8cb57e31bc6a06d47c5813ebba283 (patch) | |
| tree | 619c254c97177f391a09333a8c9a25879a250b0f /package/boot/uboot-oxnas/patches/150-spl-block.patch | |
| parent | a122c1c9c9e68be04ca39763a9638fc43fb96c99 (diff) | |
| download | master-31e0f0ae-283d7789eea8cb57e31bc6a06d47c5813ebba283.tar.gz master-31e0f0ae-283d7789eea8cb57e31bc6a06d47c5813ebba283.tar.bz2 master-31e0f0ae-283d7789eea8cb57e31bc6a06d47c5813ebba283.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>
SVN-Revision: 43499
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 |