923a59315c
This backports a patch from upstream u-boot to make it compile with gcc-5. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 47537
110 lines
2.4 KiB
Diff
110 lines
2.4 KiB
Diff
--- a/arch/arm/cpu/arm926ejs/kirkwood/Kconfig
|
|
+++ b/arch/arm/cpu/arm926ejs/kirkwood/Kconfig
|
|
@@ -84,4 +84,7 @@ source "board/raidsonic/ib62x0/Kconfig"
|
|
source "board/Seagate/dockstar/Kconfig"
|
|
source "board/Seagate/goflexhome/Kconfig"
|
|
|
|
+config SECOND_STAGE
|
|
+ bool "OpenWrt second stage hack"
|
|
+
|
|
endif
|
|
--- a/include/configs/dockstar.h
|
|
+++ b/include/configs/dockstar.h
|
|
@@ -115,4 +115,6 @@
|
|
#define CONFIG_CMD_MTDPARTS
|
|
#define CONFIG_LZO
|
|
|
|
+#include "openwrt-kirkwood-common.h"
|
|
+
|
|
#endif /* _CONFIG_DOCKSTAR_H */
|
|
--- a/include/configs/ib62x0.h
|
|
+++ b/include/configs/ib62x0.h
|
|
@@ -145,4 +145,6 @@
|
|
#define CONFIG_MTD_PARTITIONS
|
|
#define CONFIG_CMD_MTDPARTS
|
|
|
|
+#include "openwrt-kirkwood-common.h"
|
|
+
|
|
#endif /* _CONFIG_IB62x0_H */
|
|
--- a/include/configs/iconnect.h
|
|
+++ b/include/configs/iconnect.h
|
|
@@ -118,4 +118,6 @@
|
|
#define CONFIG_MTD_PARTITIONS
|
|
#define CONFIG_CMD_MTDPARTS
|
|
|
|
+#include "openwrt-kirkwood-common.h"
|
|
+
|
|
#endif /* _CONFIG_ICONNECT_H */
|
|
--- /dev/null
|
|
+++ b/include/configs/openwrt-kirkwood-common.h
|
|
@@ -0,0 +1,52 @@
|
|
+/*
|
|
+ * Copyright (C) 2013 Luka Perkov <luka@openwrt.org>
|
|
+ *
|
|
+ * SPDX-License-Identifier: GPL-2.0+
|
|
+ */
|
|
+
|
|
+#ifndef __OPENWRT_KIRKWOOD_COMMON_H
|
|
+#define __OPENWRT_KIRKWOOD_COMMON_H
|
|
+
|
|
+/* Commands */
|
|
+#define CONFIG_CMD_BOOTZ
|
|
+
|
|
+#if defined(CONFIG_CMD_NET)
|
|
+#define CONFIG_CMD_DHCP
|
|
+#define CONFIG_CMD_PING
|
|
+#endif
|
|
+
|
|
+/* Auto boot */
|
|
+#undef CONFIG_BOOTDELAY
|
|
+#define CONFIG_BOOTDELAY 3
|
|
+
|
|
+/* Ethernet */
|
|
+#if defined(CONFIG_CMD_NET)
|
|
+#define CONFIG_SERVERIP 192.168.1.2
|
|
+#define CONFIG_IPADDR 192.168.1.1
|
|
+#endif
|
|
+
|
|
+/* second stage loader */
|
|
+#if defined(CONFIG_SECOND_STAGE)
|
|
+#undef CONFIG_ENV_IS_IN_NAND
|
|
+#undef CONFIG_ENV_SECT_SIZE
|
|
+#define CONFIG_ENV_IS_NOWHERE
|
|
+#endif
|
|
+
|
|
+/* Flattened Device Tree */
|
|
+#define CONFIG_OF_LIBFDT
|
|
+
|
|
+/* Flattened uImage Tree */
|
|
+#define CONFIG_FIT
|
|
+#define CONFIG_FIT_VERBOSE
|
|
+
|
|
+/* Various */
|
|
+#define CONFIG_BZIP2
|
|
+#define CONFIG_LZMA
|
|
+#define CONFIG_LZO
|
|
+
|
|
+/* Unnecessary */
|
|
+#undef CONFIG_BOOTM_NETBSD
|
|
+#undef CONFIG_BOOTM_PLAN9
|
|
+#undef CONFIG_BOOTM_RTEMS
|
|
+
|
|
+#endif /* __OPENWRT_KIRKWOOD_COMMON_H */
|
|
--- a/include/configs/pogo_e02.h
|
|
+++ b/include/configs/pogo_e02.h
|
|
@@ -115,4 +115,6 @@
|
|
#define CONFIG_CMD_MTDPARTS
|
|
#define CONFIG_LZO
|
|
|
|
+#include "openwrt-kirkwood-common.h"
|
|
+
|
|
#endif /* _CONFIG_POGO_E02_H */
|
|
--- a/include/configs/sheevaplug.h
|
|
+++ b/include/configs/sheevaplug.h
|
|
@@ -143,4 +143,6 @@
|
|
#define CONFIG_CMD_MTDPARTS
|
|
#define CONFIG_LZO
|
|
|
|
+#include "openwrt-kirkwood-common.h"
|
|
+
|
|
#endif /* _CONFIG_SHEEVAPLUG_H */
|