add chaos_calmer branch
[15.05/openwrt.git] / package / boot / uboot-kirkwood / patches / 200-openwrt-config.patch
1 --- a/arch/arm/cpu/arm926ejs/kirkwood/Kconfig
2 +++ b/arch/arm/cpu/arm926ejs/kirkwood/Kconfig
3 @@ -84,4 +84,7 @@
4  source "board/Seagate/dockstar/Kconfig"
5  source "board/Seagate/goflexhome/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 @@ -115,4 +115,6 @@
14  #define CONFIG_CMD_MTDPARTS
15  #define CONFIG_LZO
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 @@ -145,4 +145,6 @@
23  #define CONFIG_MTD_PARTITIONS
24  #define CONFIG_CMD_MTDPARTS
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 @@ -118,4 +118,6 @@
32  #define CONFIG_MTD_PARTITIONS
33  #define CONFIG_CMD_MTDPARTS
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,52 @@
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 +/* Commands */
51 +#define CONFIG_CMD_BOOTZ
52 +
53 +#if defined(CONFIG_CMD_NET)
54 +#define CONFIG_CMD_DHCP
55 +#define CONFIG_CMD_PING
56 +#endif
57 +
58 +/* Auto boot */
59 +#undef CONFIG_BOOTDELAY
60 +#define CONFIG_BOOTDELAY       3
61 +
62 +/* Ethernet */
63 +#if defined(CONFIG_CMD_NET)
64 +#define CONFIG_SERVERIP                192.168.1.2
65 +#define CONFIG_IPADDR          192.168.1.1
66 +#endif
67 +
68 +/* second stage loader */
69 +#if defined(CONFIG_SECOND_STAGE)
70 +#undef CONFIG_ENV_IS_IN_NAND
71 +#undef CONFIG_ENV_SECT_SIZE
72 +#define CONFIG_ENV_IS_NOWHERE
73 +#endif
74 +
75 +/* Flattened Device Tree */
76 +#define CONFIG_OF_LIBFDT
77 +
78 +/* Flattened uImage Tree */
79 +#define CONFIG_FIT
80 +#define CONFIG_FIT_VERBOSE
81 +
82 +/* Various */
83 +#define CONFIG_BZIP2
84 +#define CONFIG_LZMA
85 +#define CONFIG_LZO
86 +
87 +/* Unnecessary */
88 +#undef CONFIG_BOOTM_NETBSD
89 +#undef CONFIG_BOOTM_PLAN9
90 +#undef CONFIG_BOOTM_RTEMS
91 +
92 +#endif /* __OPENWRT_KIRKWOOD_COMMON_H */
93 --- a/include/configs/pogo_e02.h
94 +++ b/include/configs/pogo_e02.h
95 @@ -115,4 +115,6 @@
96  #define CONFIG_CMD_MTDPARTS
97  #define CONFIG_LZO
98  
99 +#include "openwrt-kirkwood-common.h"
100 +
101  #endif /* _CONFIG_POGO_E02_H */
102 --- a/include/configs/sheevaplug.h
103 +++ b/include/configs/sheevaplug.h
104 @@ -143,4 +143,6 @@
105  #define CONFIG_CMD_MTDPARTS
106  #define CONFIG_LZO
107  
108 +#include "openwrt-kirkwood-common.h"
109 +
110  #endif /* _CONFIG_SHEEVAPLUG_H */