OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire fileIgnore whitespace
Rev 2 Rev 3
Line 147... Line 147...
147   147  
148 config TARGET_SQUASHFS_BLOCK_SIZE 148 config TARGET_SQUASHFS_BLOCK_SIZE
149 int "Block size (in KiB)" 149 int "Block size (in KiB)"
150 depends on TARGET_ROOTFS_SQUASHFS 150 depends on TARGET_ROOTFS_SQUASHFS
151 default 64 if LOW_MEMORY_FOOTPRINT -  
152 default 1024 if (SMALL_FLASH && !LOW_MEMORY_FOOTPRINT) 151 default 64 if LOW_MEMORY_FOOTPRINT
Line 153... Line 152...
153 default 256 152 default 256
154   153  
155 menuconfig TARGET_ROOTFS_UBIFS 154 menuconfig TARGET_ROOTFS_UBIFS
Line 195... Line 194...
195 default y 194 default y
Line 196... Line 195...
196   195  
197 config GRUB_CONSOLE 196 config GRUB_CONSOLE
198 bool "Use Console Terminal (in addition to Serial)" 197 bool "Use Console Terminal (in addition to Serial)"
-   198 depends on GRUB_IMAGES
199 depends on GRUB_IMAGES 199 default n if (TARGET_x86_generic_Soekris45xx || TARGET_x86_generic_Soekris48xx || TARGET_x86_net5501 || TARGET_x86_geos || TARGET_x86_alix2)
Line 200... Line 200...
200 default y 200 default y
201   201  
202 config GRUB_SERIAL 202 config GRUB_SERIAL
-   203 string "Serial port device"
203 string "Serial port device" 204 depends on GRUB_IMAGES
Line 204... Line 205...
204 depends on GRUB_IMAGES 205 default "hvc0" if TARGET_x86_xen_domu
205 default "ttyS0" 206 default "ttyS0" if ! TARGET_x86_xen_domu
206   207  
207 config GRUB_BAUDRATE 208 config GRUB_BAUDRATE
Line 216... Line 217...
216 default n 217 default n
Line 217... Line 218...
217   218  
218 config GRUB_BOOTOPTS 219 config GRUB_BOOTOPTS
219 string "Extra kernel boot options" 220 string "Extra kernel boot options"
-   221 depends on GRUB_IMAGES
220 depends on GRUB_IMAGES 222 default "xencons=hvc" if TARGET_x86_xen_domu
221 help 223 help
Line 222... Line 224...
222 If you don't know, just leave it blank. 224 If you don't know, just leave it blank.
223   225  
224 config GRUB_TIMEOUT 226 config GRUB_TIMEOUT
225 string "Seconds to wait before booting the default entry" 227 string "Seconds to wait before booting the default entry"
226 depends on GRUB_IMAGES 228 depends on GRUB_IMAGES
227 default "5" 229 default "5"
Line 228... Line -...
228 help -  
229 If you don't know, 5 seconds is a reasonable default. -  
230   -  
231 config GRUB_TITLE -  
232 string "Title for the menu entry in GRUB" -  
233 depends on GRUB_IMAGES -  
234 default "OpenWrt" -  
235 help -  
236 This is the title of the GRUB menu entry. 230 help
237 If unspecified, it defaults to OpenWrt. 231 If you don't know, 5 seconds is a reasonable default.
238   232  
239 config VDI_IMAGES 233 config VDI_IMAGES
240 bool "Build VirtualBox image files (VDI)" 234 bool "Build VirtualBox image files (VDI)"
241 depends on TARGET_x86 235 depends on TARGET_x86 || TARGET_x86_64
Line 242... Line 236...
242 select GRUB_IMAGES 236 select GRUB_IMAGES
243 select TARGET_IMAGES_PAD 237 select TARGET_IMAGES_PAD
244 select PACKAGE_kmod-e1000 238 select PACKAGE_kmod-e1000
245   239  
246 config VMDK_IMAGES 240 config VMDK_IMAGES
247 bool "Build VMware image files (VMDK)" 241 bool "Build VMware image files (VMDK)"
Line 248... Line 242...
248 depends on TARGET_x86 242 depends on TARGET_x86 || TARGET_x86_64
Line 263... Line 257...
263   257  
Line 264... Line 258...
264 source "target/linux/*/image/Config.in" 258 source "target/linux/*/image/Config.in"
265   259  
266 config TARGET_KERNEL_PARTSIZE 260 config TARGET_KERNEL_PARTSIZE
267 int "Kernel partition size (in MB)" -  
268 depends on GRUB_IMAGES || USES_BOOT_PART -  
269 default 8 if TARGET_apm821xx_sata 261 int "Kernel partition size (in MB)"
Line 270... Line 262...
270 default 20 if TARGET_brcm2708 262 depends on GRUB_IMAGES
271 default 16 263 default 16
272   264  
273 config TARGET_ROOTFS_PARTSIZE 265 config TARGET_ROOTFS_PARTSIZE
274 int "Root filesystem partition size (in MB)" 266 int "Root filesystem partition size (in MB)"
275 depends on GRUB_IMAGES || USES_ROOTFS_PART || TARGET_ROOTFS_EXT4FS || TARGET_mvebu || TARGET_omap || TARGET_rb532 || TARGET_sunxi || TARGET_uml 267 depends on GRUB_IMAGES || TARGET_ROOTFS_EXT4FS || TARGET_rb532 || TARGET_mvebu || TARGET_uml
Line 276... Line 268...
276 default 256 268 default 256