mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 00:41:17 +00:00
67da6a7c5e
Upgrade uboot-kirkwood to upstream release 2017.09 Catch up with upstream and move configuration options from simple defines to Kconfig, as otherwise dependencies would not be resolved and code would not compile. Tested-by: Alberto Bursi <alberto.bursi@outlook.it> Signed-off-by: Paul Wassi <p.wassi@gmx.at>
190 lines
4.3 KiB
Diff
190 lines
4.3 KiB
Diff
--- a/arch/arm/mach-kirkwood/Kconfig
|
|
+++ b/arch/arm/mach-kirkwood/Kconfig
|
|
@@ -90,4 +90,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
|
|
@@ -76,4 +76,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
|
|
@@ -94,4 +94,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
|
|
@@ -83,4 +83,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
|
|
@@ -83,4 +83,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/sheevaplug.h
|
|
+++ b/include/configs/sheevaplug.h
|
|
@@ -96,4 +96,6 @@
|
|
#define CONFIG_SYS_ATA_IDE1_OFFSET MV_SATA_PORT1_OFFSET
|
|
#endif /* CONFIG_IDE */
|
|
|
|
+#include "openwrt-kirkwood-common.h"
|
|
+
|
|
#endif /* _CONFIG_SHEEVAPLUG_H */
|
|
--- a/include/configs/goflexhome.h
|
|
+++ b/include/configs/goflexhome.h
|
|
@@ -105,4 +105,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
|
|
@@ -123,4 +123,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
|
|
@@ -25,3 +25,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
|
|
@@ -29,3 +29,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
|
|
@@ -27,5 +27,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/iconnect_defconfig
|
|
+++ b/configs/iconnect_defconfig
|
|
@@ -24,5 +24,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
|
|
@@ -30,5 +30,8 @@ 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
|
|
--- a/configs/pogo_e02_defconfig
|
|
+++ b/configs/pogo_e02_defconfig
|
|
@@ -25,3 +25,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/sheevaplug_defconfig
|
|
+++ b/configs/sheevaplug_defconfig
|
|
@@ -28,5 +28,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
|