package/boot/uboot-kirkwood/patches/200-openwrt-config.patch

   1 --- a/arch/arm/mach-kirkwood/Kconfig
   2 +++ b/arch/arm/mach-kirkwood/Kconfig
   3 @@ -90,4 +90,7 @@ source "board/zyxel/nsa310/Kconfig"
   4  source "board/zyxel/nsa310s/Kconfig"
   5  source "board/zyxel/nsa325/Kconfig"
   6
   7 +config SECOND_STAGE
   8 +       bool "OpenWrt second stage hack"
   9 +
  10  endif
  11 --- a/include/configs/dockstar.h
  12 +++ b/include/configs/dockstar.h
  13 @@ -76,4 +76,6 @@
  14  #define CONFIG_MTD_DEVICE               /* needed for mtdparts commands */
  15  #define CONFIG_MTD_PARTITIONS
  16
  17 +#include "openwrt-kirkwood-common.h"
  18 +
  19  #endif /* _CONFIG_DOCKSTAR_H */
  20 --- a/include/configs/ib62x0.h
  21 +++ b/include/configs/ib62x0.h
  22 @@ -94,4 +94,6 @@
  23  #define CONFIG_RTC_MV
  24  #endif /* CONFIG_CMD_DATE */
  25
  26 +#include "openwrt-kirkwood-common.h"
  27 +
  28  #endif /* _CONFIG_IB62x0_H */
  29 --- a/include/configs/iconnect.h
  30 +++ b/include/configs/iconnect.h
  31 @@ -83,4 +83,6 @@
  32  #define CONFIG_MTD_DEVICE
  33  #define CONFIG_MTD_PARTITIONS
  34
  35 +#include "openwrt-kirkwood-common.h"
  36 +
  37  #endif /* _CONFIG_ICONNECT_H */
  38 --- /dev/null
  39 +++ b/include/configs/openwrt-kirkwood-common.h
  40 @@ -0,0 +1,31 @@
  41 +/*
  42 + * Copyright (C) 2013 Luka Perkov <luka@openwrt.org>
  43 + *
  44 + * SPDX-License-Identifier:    GPL-2.0+
  45 + */
  46 +
  47 +#ifndef __OPENWRT_KIRKWOOD_COMMON_H
  48 +#define __OPENWRT_KIRKWOOD_COMMON_H
  49 +
  50 +/* Ethernet */
  51 +#if defined(CONFIG_CMD_NET)
  52 +#define CONFIG_SERVERIP                192.168.1.2
  53 +#define CONFIG_IPADDR          192.168.1.1
  54 +#endif
  55 +
  56 +/* second stage loader */
  57 +#if defined(CONFIG_SECOND_STAGE)
  58 +#undef CONFIG_ENV_IS_IN_NAND
  59 +#undef CONFIG_ENV_SECT_SIZE
  60 +#define CONFIG_ENV_IS_NOWHERE
  61 +#endif
  62 +
  63 +/* Various */
  64 +#define CONFIG_BZIP2
  65 +
  66 +/* Unnecessary */
  67 +#undef CONFIG_BOOTM_NETBSD
  68 +#undef CONFIG_BOOTM_PLAN9
  69 +#undef CONFIG_BOOTM_RTEMS
  70 +
  71 +#endif /* __OPENWRT_KIRKWOOD_COMMON_H */
  72 --- a/include/configs/pogo_e02.h
  73 +++ b/include/configs/pogo_e02.h
  74 @@ -83,4 +83,6 @@
  75  #define CONFIG_MTD_DEVICE               /* needed for mtdparts commands */
  76  #define CONFIG_MTD_PARTITIONS
  77
  78 +#include "openwrt-kirkwood-common.h"
  79 +
  80  #endif /* _CONFIG_POGO_E02_H */
  81 --- a/include/configs/sheevaplug.h
  82 +++ b/include/configs/sheevaplug.h
  83 @@ -96,4 +96,6 @@
  84  #define CONFIG_SYS_ATA_IDE1_OFFSET     MV_SATA_PORT1_OFFSET
  85  #endif /* CONFIG_IDE */
  86
  87 +#include "openwrt-kirkwood-common.h"
  88 +
  89  #endif /* _CONFIG_SHEEVAPLUG_H */
  90 --- a/include/configs/goflexhome.h
  91 +++ b/include/configs/goflexhome.h
  92 @@ -105,4 +105,6 @@
  93  #define CONFIG_RTC_MV
  94  #endif /* CONFIG_CMD_DATE */
  95
  96 +#include "openwrt-kirkwood-common.h"
  97 +
  98  #endif /* _CONFIG_GOFLEXHOME_H */
  99 --- a/include/configs/nsa310.h
 100 +++ b/include/configs/nsa310.h
 101 @@ -123,4 +123,6 @@
 102  #define CONFIG_RTC_MV
 103  #endif /* CONFIG_CMD_DATE */
 104
 105 +#include "openwrt-kirkwood-common.h"
 106 +
 107  #endif /* _CONFIG_NSA310_H */
 108 --- a/configs/dockstar_defconfig
 109 +++ b/configs/dockstar_defconfig
 110 @@ -25,3 +25,8 @@ CONFIG_USB=y
 111  CONFIG_USB_EHCI_HCD=y
 112  CONFIG_USB_STORAGE=y
 113  CONFIG_OF_LIBFDT=y
 114 +CONFIG_CMD_BOOTZ=y
 115 +CONFIG_FIT=y
 116 +CONFIG_FIT_VERBOSE=y
 117 +CONFIG_LZMA=y
 118 +CONFIG_LZO=y
 119 --- a/configs/goflexhome_defconfig
 120 +++ b/configs/goflexhome_defconfig
 121 @@ -29,3 +29,8 @@ CONFIG_USB=y
 122  CONFIG_USB_EHCI_HCD=y
 123  CONFIG_USB_STORAGE=y
 124  CONFIG_OF_LIBFDT=y
 125 +CONFIG_CMD_BOOTZ=y
 126 +CONFIG_FIT=y
 127 +CONFIG_FIT_VERBOSE=y
 128 +CONFIG_LZMA=y
 129 +CONFIG_LZO=y
 130 --- a/configs/ib62x0_defconfig
 131 +++ b/configs/ib62x0_defconfig
 132 @@ -27,5 +27,9 @@ CONFIG_SYS_NS16550=y
 133  CONFIG_USB=y
 134  CONFIG_USB_EHCI_HCD=y
 135  CONFIG_USB_STORAGE=y
 136 -CONFIG_LZMA=y
 137  CONFIG_OF_LIBFDT=y
 138 +CONFIG_CMD_BOOTZ=y
 139 +CONFIG_FIT=y
 140 +CONFIG_FIT_VERBOSE=y
 141 +CONFIG_LZMA=y
 142 +CONFIG_LZO=y
 143 --- a/configs/iconnect_defconfig
 144 +++ b/configs/iconnect_defconfig
 145 @@ -24,5 +24,9 @@ CONFIG_SYS_NS16550=y
 146  CONFIG_USB=y
 147  CONFIG_USB_EHCI_HCD=y
 148  CONFIG_USB_STORAGE=y
 149 -CONFIG_LZMA=y
 150  CONFIG_OF_LIBFDT=y
 151 +CONFIG_CMD_BOOTZ=y
 152 +CONFIG_FIT=y
 153 +CONFIG_FIT_VERBOSE=y
 154 +CONFIG_LZMA=y
 155 +CONFIG_LZO=y
 156 --- a/configs/nsa310_defconfig
 157 +++ b/configs/nsa310_defconfig
 158 @@ -30,5 +30,8 @@ CONFIG_CMD_UBI=y
 159  CONFIG_USB=y
 160  CONFIG_USB_EHCI_HCD=y
 161  CONFIG_USB_STORAGE=y
 162 +CONFIG_CMD_BOOTZ=y
 163 +CONFIG_FIT=y
 164 +CONFIG_FIT_VERBOSE=y
 165  CONFIG_LZMA=y
 166  CONFIG_LZO=y
 167 --- a/configs/pogo_e02_defconfig
 168 +++ b/configs/pogo_e02_defconfig
 169 @@ -25,3 +25,8 @@ CONFIG_USB=y
 170  CONFIG_USB_EHCI_HCD=y
 171  CONFIG_USB_STORAGE=y
 172  CONFIG_OF_LIBFDT=y
 173 +CONFIG_CMD_BOOTZ=y
 174 +CONFIG_FIT=y
 175 +CONFIG_FIT_VERBOSE=y
 176 +CONFIG_LZMA=y
 177 +CONFIG_LZO=y
 178 --- a/configs/sheevaplug_defconfig
 179 +++ b/configs/sheevaplug_defconfig
 180 @@ -28,5 +28,8 @@ CONFIG_SYS_NS16550=y
 181  CONFIG_USB=y
 182  CONFIG_USB_EHCI_HCD=y
 183  CONFIG_USB_STORAGE=y
 184 -CONFIG_LZMA=y
 185  CONFIG_OF_LIBFDT=y
 186 +CONFIG_FIT=y
 187 +CONFIG_FIT_VERBOSE=y
 188 +CONFIG_LZMA=y
 189 +CONFIG_LZO=y