aboutsummaryrefslogtreecommitdiffstats
path: root/package/boot/uboot-oxnas/files/include
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2014-12-02 15:25:37 +0000
committerJohn Crispin <john@openwrt.org>2014-12-02 15:25:37 +0000
commit283d7789eea8cb57e31bc6a06d47c5813ebba283 (patch)
tree619c254c97177f391a09333a8c9a25879a250b0f /package/boot/uboot-oxnas/files/include
parenta122c1c9c9e68be04ca39763a9638fc43fb96c99 (diff)
downloadupstream-283d7789eea8cb57e31bc6a06d47c5813ebba283.tar.gz
upstream-283d7789eea8cb57e31bc6a06d47c5813ebba283.tar.bz2
upstream-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/files/include')
-rw-r--r--package/boot/uboot-oxnas/files/include/configs/ox820.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/package/boot/uboot-oxnas/files/include/configs/ox820.h b/package/boot/uboot-oxnas/files/include/configs/ox820.h
index 7ade1dc46f..e3c71e61e4 100644
--- a/package/boot/uboot-oxnas/files/include/configs/ox820.h
+++ b/package/boot/uboot-oxnas/files/include/configs/ox820.h
@@ -4,6 +4,8 @@
/* High Level Configuration Options */
#define CONFIG_ARM1136
#define CONFIG_OX820
+#define CONFIG_SYS_GENERIC_BOARD
+#define CONFIG_BOARD_EARLY_INIT_F
#include <asm/arch/cpu.h> /* get chip and board defs */
@@ -50,7 +52,7 @@
#define CONFIG_SYS_ATA_REG_OFFSET 0
#define CONFIG_SYS_ATA_ALT_OFFSET 0
#define CONFIG_IDE_PLX
-#define CONFIG_SYS_IDE_MAXDEVICE 1
+#define CONFIG_SYS_IDE_MAXDEVICE 2
#define CONFIG_SYS_IDE_MAXBUS 1
#define CONFIG_IDE_PREINIT
#define CONFIG_LBA48
@@ -340,7 +342,6 @@
#define CONFIG_CMD_ZIP
#define CONFIG_CMD_UNZIP
#define CONFIG_CMD_TIME
-#define CONFIG_CMD_TERMINAL
#define CONFIG_CMD_SETEXPR
#define CONFIG_CMD_MD5SUM
#define CONFIG_CMD_HASH