f21cd96400
U-Boot now requires GCC > 5 Catch up with upstream and move some configuration options from the header files to the corresponding defconfig files. Also move some options of patch 010 affecting the whole platform to 010's device only. Signed-off-by: Paul Wassi <p.wassi@gmx.at>
168 lines
3.8 KiB
Diff
168 lines
3.8 KiB
Diff
--- a/arch/arm/mach-kirkwood/Kconfig
|
|
+++ b/arch/arm/mach-kirkwood/Kconfig
|
|
@@ -94,4 +94,7 @@ source "board/zyxel/nsa310/Kconfig"
|
|
source "board/zyxel/nsa310s/Kconfig"
|
|
source "board/zyxel/nsa325/Kconfig"
|
|
|
|
+config SECOND_STAGE
|
|
+ bool "OpenWrt second stage hack"
|
|
+
|
|
endif
|
|
--- a/include/configs/dockstar.h
|
|
+++ b/include/configs/dockstar.h
|
|
@@ -68,4 +68,6 @@
|
|
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
|
|
#define CONFIG_MTD_PARTITIONS
|
|
|
|
+#include "openwrt-kirkwood-common.h"
|
|
+
|
|
#endif /* _CONFIG_DOCKSTAR_H */
|
|
--- a/include/configs/ib62x0.h
|
|
+++ b/include/configs/ib62x0.h
|
|
@@ -87,4 +87,6 @@
|
|
#define CONFIG_RTC_MV
|
|
#endif /* CONFIG_CMD_DATE */
|
|
|
|
+#include "openwrt-kirkwood-common.h"
|
|
+
|
|
#endif /* _CONFIG_IB62x0_H */
|
|
--- a/include/configs/iconnect.h
|
|
+++ b/include/configs/iconnect.h
|
|
@@ -76,4 +76,6 @@
|
|
#define CONFIG_MTD_DEVICE
|
|
#define CONFIG_MTD_PARTITIONS
|
|
|
|
+#include "openwrt-kirkwood-common.h"
|
|
+
|
|
#endif /* _CONFIG_ICONNECT_H */
|
|
--- /dev/null
|
|
+++ b/include/configs/openwrt-kirkwood-common.h
|
|
@@ -0,0 +1,31 @@
|
|
+/*
|
|
+ * Copyright (C) 2013 Luka Perkov <luka@openwrt.org>
|
|
+ *
|
|
+ * SPDX-License-Identifier: GPL-2.0+
|
|
+ */
|
|
+
|
|
+#ifndef __OPENWRT_KIRKWOOD_COMMON_H
|
|
+#define __OPENWRT_KIRKWOOD_COMMON_H
|
|
+
|
|
+/* 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
|
|
+
|
|
+/* Various */
|
|
+#define CONFIG_BZIP2
|
|
+
|
|
+/* 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
|
|
@@ -76,4 +76,6 @@
|
|
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
|
|
#define CONFIG_MTD_PARTITIONS
|
|
|
|
+#include "openwrt-kirkwood-common.h"
|
|
+
|
|
#endif /* _CONFIG_POGO_E02_H */
|
|
--- a/include/configs/goflexhome.h
|
|
+++ b/include/configs/goflexhome.h
|
|
@@ -101,4 +101,6 @@
|
|
#define CONFIG_RTC_MV
|
|
#endif /* CONFIG_CMD_DATE */
|
|
|
|
+#include "openwrt-kirkwood-common.h"
|
|
+
|
|
#endif /* _CONFIG_GOFLEXHOME_H */
|
|
--- a/include/configs/nsa310.h
|
|
+++ b/include/configs/nsa310.h
|
|
@@ -116,4 +116,6 @@
|
|
#define CONFIG_RTC_MV
|
|
#endif /* CONFIG_CMD_DATE */
|
|
|
|
+#include "openwrt-kirkwood-common.h"
|
|
+
|
|
#endif /* _CONFIG_NSA310_H */
|
|
--- a/configs/dockstar_defconfig
|
|
+++ b/configs/dockstar_defconfig
|
|
@@ -26,3 +26,8 @@ CONFIG_USB=y
|
|
CONFIG_USB_EHCI_HCD=y
|
|
CONFIG_USB_STORAGE=y
|
|
CONFIG_OF_LIBFDT=y
|
|
+CONFIG_CMD_BOOTZ=y
|
|
+CONFIG_FIT=y
|
|
+CONFIG_FIT_VERBOSE=y
|
|
+CONFIG_LZMA=y
|
|
+CONFIG_LZO=y
|
|
--- a/configs/goflexhome_defconfig
|
|
+++ b/configs/goflexhome_defconfig
|
|
@@ -32,3 +32,8 @@ CONFIG_USB=y
|
|
CONFIG_USB_EHCI_HCD=y
|
|
CONFIG_USB_STORAGE=y
|
|
CONFIG_OF_LIBFDT=y
|
|
+CONFIG_CMD_BOOTZ=y
|
|
+CONFIG_FIT=y
|
|
+CONFIG_FIT_VERBOSE=y
|
|
+CONFIG_LZMA=y
|
|
+CONFIG_LZO=y
|
|
--- a/configs/ib62x0_defconfig
|
|
+++ b/configs/ib62x0_defconfig
|
|
@@ -29,5 +29,8 @@ CONFIG_SYS_NS16550=y
|
|
CONFIG_USB=y
|
|
CONFIG_USB_EHCI_HCD=y
|
|
CONFIG_USB_STORAGE=y
|
|
-CONFIG_LZMA=y
|
|
CONFIG_OF_LIBFDT=y
|
|
+CONFIG_FIT=y
|
|
+CONFIG_FIT_VERBOSE=y
|
|
+CONFIG_LZMA=y
|
|
+CONFIG_LZO=y
|
|
--- a/configs/iconnect_defconfig
|
|
+++ b/configs/iconnect_defconfig
|
|
@@ -25,5 +25,9 @@ CONFIG_SYS_NS16550=y
|
|
CONFIG_USB=y
|
|
CONFIG_USB_EHCI_HCD=y
|
|
CONFIG_USB_STORAGE=y
|
|
-CONFIG_LZMA=y
|
|
CONFIG_OF_LIBFDT=y
|
|
+CONFIG_CMD_BOOTZ=y
|
|
+CONFIG_FIT=y
|
|
+CONFIG_FIT_VERBOSE=y
|
|
+CONFIG_LZMA=y
|
|
+CONFIG_LZO=y
|
|
--- a/configs/nsa310_defconfig
|
|
+++ b/configs/nsa310_defconfig
|
|
@@ -32,6 +32,9 @@ CONFIG_CMD_UBI=y
|
|
CONFIG_USB=y
|
|
CONFIG_USB_EHCI_HCD=y
|
|
CONFIG_USB_STORAGE=y
|
|
+CONFIG_CMD_BOOTZ=y
|
|
+CONFIG_FIT=y
|
|
+CONFIG_FIT_VERBOSE=y
|
|
CONFIG_LZMA=y
|
|
CONFIG_LZO=y
|
|
CONFIG_SYS_LONGHELP=y
|
|
--- a/configs/pogo_e02_defconfig
|
|
+++ b/configs/pogo_e02_defconfig
|
|
@@ -26,3 +26,8 @@ CONFIG_USB=y
|
|
CONFIG_USB_EHCI_HCD=y
|
|
CONFIG_USB_STORAGE=y
|
|
CONFIG_OF_LIBFDT=y
|
|
+CONFIG_CMD_BOOTZ=y
|
|
+CONFIG_FIT=y
|
|
+CONFIG_FIT_VERBOSE=y
|
|
+CONFIG_LZMA=y
|
|
+CONFIG_LZO=y
|