]> git.ipfire.org Git - people/ms/u-boot.git/blame - CHANGELOG
* Patches by Thomas Viehweger, 16 Mar 2004:
[people/ms/u-boot.git] / CHANGELOG
CommitLineData
c83bf6a2 1======================================================================
b2daeb8e 2Changes for U-Boot 1.0.2:
c83bf6a2
WD
3======================================================================
4
4b9206ed
WD
5* Patches by Thomas Viehweger, 16 Mar 2004:
6 - show PCI clock frequency on MPC8260 systems
7 - add FCC_PSMR_RMII flag for HiP7 processors
8 - in do_jffs2_fsload(), take load address from load_addr if not set
9 explicit, update load_addr otherwise
10 - replaced printf by putc/puts when no formatting is needed
11 (smaller code size, faster execution)
12
109c0e3a
WD
13* Patch by Phillippe Robin, 16 Mar 2004:
14 avoid dereferencing NULL pointer in lib_arm/armlinux.c
15
16* Patch by Stephen Williams, 15 Mar 2004:
17 Fix CONFIG_SERIAL_SOFTWARE_FIFO documentation
18
19* Patch by Tolunay Orkun, 15 Mar 2004:
20 Initialize bi_opbfreq to real OPB frequency via get_OPB_freq()
21
22* Patch by Travis Sawyer, 15 Mar 2004:
23 Update CREDITS & MAINTAINERS files for PPC440GX & Ocotea port
24
efa329cb
WD
25* Add start-up delay to make sure power has stabilized before
26 attempting to switch on USB on SX1 board.
27
28* Patch by Josef Wagner, 18 Mar 2004:
29 - Add support for MicroSys XM250 board (PXA255)
30 - Add support for MicroSys PM828 board (MPC8280)
31 - Add support for 32 MB Flash on PM825/826
32 - new SDRAM refresh rate for PM825/PM826
33 - added support for MicroSys PM520 (MPC5200)
34 - replaced Query by Identify command in CPU86/flash.c
35 to support 28F160F3B
36
37* Fix wrap around problem with udelay() on ARM920T
38
39* Add support for Macronix flash on TRAB board
40
7d7ce412
WD
41* Patch by Pierre Aubert, 15 Mar 2004:
42 Fix buffer overflow in IDE identification
43
44* Fix power-off of LCD for out-of-band temperatures on LWMON board
45
46* Remove redundand #define in IceCube.h
47
d9df1f4e
WD
48* Patch by Steven Scholz, 27 Feb 2004:
49 - Adding get_ticks() and get_tbclk() for AT91RM9200
50 - Many white space fixes in cpu/at91rm9200/interrupts.c
51
52* Patches by Steven Scholz, 20 Feb 2004:
53 some cleanup in AT91RM9200 related code
54
855a496f
WD
55* Patches by Travis Sawyer, 12 Mar 2004:
56 - Fix Gigabit Ethernet support for 440GX
57 - Add Gigabit Ethernet Support to MII PHY utilities
58
59* Patch by Brad Kemp, 12 Mar 2004:
60 Fixes for drivers/cfi_flash.c:
61 - Better support for x8/x16 implementations
62 - Added failure for AMD chips attempting to use CFG_FLASH_USE_BUFFER_WRITE
63 - Added defines for AMD command and address constants
64
65* Patch by Leon Kukovec, 12 Mar 2004:
66 Fix get_dentfromdir() to correctly handle deleted dentries
42dfe7a1 67
855a496f
WD
68* Patch by George G. Davis, 11 Mar 2004:
69 Remove hard coded network settings in TI OMAP1610 H2
70 default board config
71
72* Patch by George G. Davis, 11 Mar 2004:
73 add support for ADS GraphicsClient+ board.
74
7d7ce412 75* Patch by Pierre Aubert, 11 Mar 2004:
4b248f3f
WD
76 - add bitmap command and splash screen support in cfb console
77 - add [optional] origin in the bitmap display command
78
79* Patch by Travis Sawyer, 11 Mar 2004:
80 Fix ocotea board early init interrupt setup.
81
82* Patch by Thomas Viehweger, 11 Mar 2004:
83 Remove redundand code; add PCI-specific bits to include/mpc8260.h
84
aaf224ab
WD
85* Patch by Stephan Linz, 09 Mar 2004
86 - Add support for the SSV ADNP/ESC1 (Nios Softcore)
87
88* Patch by George G. Davis, 9 Mar 2004:
89 fix recent build failure for SA1100 target
90
91* Patch by Travis Sawyer, 09 Mar 2004:
92 Support native interrupt mode for the IBM440GX.
93 Previously it was running in 440GP compatibility mode.
94
3d3befa7
WD
95* Patch by Philippe Robin, 09 Mar 2004:
96 Added ARM Integrator AP, CP and Versatile PB926EJ-S Reference
97 Platform support.
98
99* Patch by Masami Komiya, 08 Mar 2004:
100 Don't overwrite server IP address or boot file name
101 when the boot server does not return values
102
7d7ce412 103* Patch by Tolunay Orkun, 5 Mar 2004:
3d3befa7
WD
104 Removed compile time restriction on CFG_I2C_SPEED for DS1338 RTC
105
4d13cbad
WD
106* Patch by Tolunay Orkun, 5 Mar 2004:
107 Fix early board initialization for Cogent CSB272 board
108
109* Patch by Ed Okerson, 3 Mar 2004:
110 fix CFI flash writes for little endian systems
111
112* Patch by Reinhard Meyer, 01 Mar 2004:
113 generalize USB and IDE support for MPC5200 with according
114 changes to IceCube.h and TOP5200.h
115 add Am29LV256 256 MBit FLASH support for TOP5200 boards
116 add info about USB and IDE to README
117
c3f9d493
WD
118* Patch by Yuli Barcohen, 4 Mar 2004:
119 Fix problems with GCC 3.3.x which changed handling of global
120 variables explicitly initialized to zero (now in .bss instead of
121 .data as before).
122
123* Patch by Leon Kukovec, 02 Mar 2004:
124 add strswab() to fix IDE LBA capacity, firmware and model numbers
125 on little endian machines
126
127* Patch by Masami Komiya, 02 Mar 2004:
128 - Remove get_ticks() from NFS code
129 - Add verification of RPC transaction ID
130
131* Patch by Pierre Aubert, 02 Mar 2004:
132 cleanup for IDE and USB drivers for MPC5200
133
134* Patch by Travis Sawyer, 01 Mar 2004:
0e6d798c
WD
135 Ocotea:
136 - Add IBM PPC440GX Ref Platform support (Ocotea)
137 Original code by Paul Reynolds <PaulReynolds@lhsolutions.com>
138 Adapted to U-Boot and 440GX port
139 440gx_enet.c:
140 - Add gracious handling of all Ethernet Pin Selections for 440GX
141 - Add RGMII selection for Cicada CIS8201 Gigabit PHY
142 ppc440.h:
143 - Add needed bit definitions
144 - Fix formatting
145
146* Patch by Carl Riechers, 1 Mar 2004:
147 Add PPC440GX prbdv0 divider to fix memory clock calculation.
148
149* Patch by Stephan Linz, 27 Feb 2004
150 - avoid problems for targets without NFS download support
151
c40b2956
WD
152* Patch by Rune Torgersen, 27 Feb 2004:
153 - Added LBA48 support (CONFIG_LBA48 & CFG_64BIT_LBA)
154 - Added support for 64bit printing in vsprintf (CFG_64BIT_VSPRINTF)
155 - Added support for 64bit strtoul (CFG_64BIT_STRTOUL)
156
157* Patch by Masami Komiya, 27 Feb 2004:
158 Fix rarpboot: add autoload by NFS
159
160* Patch by Dan Eisenhut, 26 Feb 2004:
161 fix flash_write return value in saveenv
162
163* Patch by Stephan Linz, 11 Dec 2003
164 expand config.mk to avoid trigraph warnings on NIOS
165
166* Rename "BMS2003" board into "HMI10"
167
6629d2f2
WD
168* SX1 patches: use "serial#" for USB serial #; use redundand environment
169 storage; auto-set console on USB port (using preboot command)
170
232c150a
WD
171* Add support for SX1 mobile phone; add support for USB-based console
172 (enable with "setenv stdout usbtty; setenv stdin usbtty")
173
79d696fc
WD
174* Fix LOWBOOT configuration for MPC5200 with DDR memory
175
f8d813e3
WD
176* Fix SDRAM timings for LITE5200 / IceCube board
177
178* Handle Auti-MDIX / connection status for INCA-IP
179
180* Fix USB problems when attempting to read 0 bytes
181
e7c85689
WD
182* Patch by Travis Sawyer, 26 Feb 2004:
183 Fix broken compile for XPEDITE1K target.
184
185* Patch by Stephan Linz, 26 Feb 2004:
186 Bug fix for NFS code on NIOS targets
232c150a 187
e7c85689
WD
188* Patch by Stephen Williams, 26 Feb 2004:
189 Break up SystemACE reads of large block counts
190
132ba5fd
WD
191* Patch by Pierre Aubert, 26 Feb 2004
192 add IDE support for MPC5200
193
194* Patch by Masami Komiya, 26 Feb 2004:
195 add autoload via NFS
196
197* Patch by Stephen Williams
198 Use of CONFIG_SERIAL_SOFTWARE_FIFO in board.c consistent with uses
199 elsewhere in the source.
200
11dadd54
WD
201* Patch by Steven Scholz, 25 Feb 2004:
202 - Timeouts in FPGA code should be based on CFG_HZ
203 - Minor cleanup in code for Altera FPGA ACEX1K
204
205* Patch by Steven Scholz, 25 Feb 2004:
206 Changed "Directory Hierarchy" section in README
207
208* Patch by Masami Komiya, 25 Feb 2004:
209 Reduce copy count in nfs_read_reply() of NFS code
210
80885a9d
WD
211* Patch by Markus Pietrek, 24 Feb 2004:
212 NS9750 DevBoard added
213
132ba5fd 214* Patch by Pierre Aubert, 24 Feb 2004
80885a9d
WD
215 add USB support for MPC5200
216
217* Patch by Steven Scholz, 24 Feb 2004:
218 - fix MII commands to use values from last command
219
220* Patch by Torsten Demke, 24 Feb 2004:
221 Add support for the eXalion platform (SPSW-8240, F-30, F-300)
222
0c852a28
WD
223* Patch by Rahul Shanbhag, 19 Feb 2004:
224 Fixes for for OMAP1610 board:
225 - shift some IRQ specific code to platform.S file
226 - remove duplicatewatchdog reset code from start.S
227
228* Make Auto-MDIX Support configurable on INCA-IP board
229
230* Fix license for mkimage tool
231
a084f7da
WD
232* Patch by Masami Komiya, 24 Feb 2004:
233 Update NetBootFileXferSize in NFS code
234
235* Patch by Scott McNutt, 24 Feb 2004:
236 fix packet length in NFS code
237
cbd8a35c
WD
238* Patch by Masami Komiy, 22 Feb 2004:
239 Add support for NFS for file download
240
074cff0d
WD
241* Patch by Andrea Scian, 17 Feb 2004:
242 Add support for S3C44B0 processor and DAVE B2 board
243
244* Patch by Steven Scholz, 20 Feb 2004:
245 - Add support for MII commands on AT91RM9200 boards
246 - some cleanup in AT91RM9200 ethernet code
247
028ab6b5
WD
248* Patch by Peter Ryser, 20 Feb 2004:
249 Add support for the Xilinx ML300 platform
250
251* Patch by Stephan Linz, 17 Feb 2004:
252 Fix watchdog support for NIOS
253
254* Patch by Josh Fryman, 16 Feb 2004:
255 Fix byte-swapping for cfi_flash.c for different bus widths
256
257* Patch by Jon Diekema, 14 Jeb 2004:
258 Remove duplicate "FPGA Support" notes from the README file
259
63e73c9a
WD
260* Patches by Reinhard Meyer, 14 Feb 2004:
261 - update board/emk tree; use common flash driver
262 - Corrected tested bits in machine check exception in cpu/mpc5xxx/traps.c
263 [adapted for other PPC CPUs -- wd]
264 - Added support for the M48T08 on the EVAL5200 board in rtc/mk48t59.c
265
266* Patch by Jon Diekema, 13 Feb 2004:
267 Call show_boot_progress() whenever POST "FAILED" is printed.
268
269* Patch by Nishant Kamat, 13 Feb 2004:
270 Add support for TI OMAP1610 H2 Board
271 Fixes for cpu/arm926ejs/interrupt.c
272 (based on Richard Woodruff's patch for arm925, 16 Oct 03)
273 Fix for a timer bug in OMAP1610 Innovator
274 Add support for CS0 (ROM)/CS3 (Flash) boot in OMAP1610 Innovator and H2
275
276* Patches by Stephan Linz, 12 Feb 2004:
277 - add support for NIOS timer with variable period preload counter value
278 - prepare POST framework support for NIOS targets
279
280* Patch by Denis Peter, 11 Feb 2004:
281 add POST support for the MIP405 board
282
cd0a9de6
WD
283* Patch by Laurent Mohin, 10 Feb 2004:
284 Fix buffer overflow in common/usb.c
285
286* Patch by Tolunay Orkun, 10 Feb 2004:
287 Add support for Cogent CSB272 board
288
2d1a537d
WD
289* Patch by Thomas Elste, 10 Feb 2004:
290 Add support for NET+50 CPU and ModNET50 board
291
292* Patch by Sam Song, 10 Feb 2004:
293 Fix typos in cfi_flash.c
294
295* Patch by Leon Kukovec, 10 Feb 2004
296 Fixed long dir entry slot id calculation in get_vfatname
297
298* Patch by Robin Gilks, 10 Feb 2004:
299 add "itest" command (operators: -eq, -ne, -lt, -gt, -le, -ge, ==,
300 !=, <>, <, >, <=, >=)
301
3f85ce27
WD
302* Fix problem with side effects in macros in include/usb.h
303
304* Patch by David Benson, 13 Nov 2003:
305 bug 841358 - fix TFTP download size limit
306
307* Fixing bug 850768:
308 improper flush_cache() in load_serial()
309
310* Fixing bug 834943:
311 MPC8540 - missing volatile declarations
312
313* Patch by Stephen Williams, 09 Feb 2004:
314 Add support for Xilinx SystemACE chip:
315 - New files common/cmd_ace.c and include/systemace.h
316 - Hook systemace support into cmd_fat and the partition manager
317
318* Patch by Travis Sawyer, 09 Feb 2004:
319 Add bi_opbfreq & bi_iic_fast to 440GX bd_info as needed for Linux
320
3c74e32a
WD
321* Patch by Travis Sawyer, 09 Feb 2004:
322 o 440GX:
323 - Fix PCI Indirect access for type 1 config cycles with ppc440.
324 - Add phymode for 440 enet
325 - fix pci pre init
326 o XPedite1K:
327 - Change board_pre_init to board_early_init_f
328 - Add user flash to bus controller setup
329 - Fix pci pre init
330 - Fix is_pci_host to check GPIO for monarch bit
331 - Force xpedite1k to pci conventional mode (via #define option)
332
333* Patch by Brad Kemp, 4 Feb 2004:
334 - handle the machine check that is generated during the PCI scans
335 on 82xx processors.
336 - define the registers used in the IMMR by the PCI subsystem.
337
338* Patch by Pierre Aubert, 03 Feb 2004:
339 cpu/mpc5xxx/start.S: copy MBAR into SPR311
340
341* Patch by Jeff Angielski, 03 Feb 2004:
342 Fix copy & paste error in cpu/mpc8260/pci.c
343
344* Patch by Reinhard Meyer, 24 Jan 2004:
345 Fix typo in cpu/mpc5xxx/pci_mpc5200.c
346
cf56e110
WD
347* Add Auto-MDIX support for INCA-IP
348
bf9e3b38
WD
349* Some code cleanup
350
351* Patch by Josef Baumgartner, 10 Feb 2004:
352 Fixes for Coldfire port
353
354* Patch by Brad Kemp, 11 Feb 2004:
355 Fix CFI flash driver problems
356
a2d18bb7
WD
357* Make sure to use a bus clock divider of 2 only when running TQM8xxM
358 modules at CPU clock frequencies above 66 MHz.
bf9e3b38 359
a2d18bb7
WD
360* Optimize flash programming speed for LWMON (by another 100% :-)
361
cd37d9e6
WD
362* Patch by Jian Zhang, 3 Feb 2004:
363 - Changed the incorrect FAT12BUFSIZE
364 - data_begin in fsdata can be negative. Changed it to be short.
365
ec4c544b
WD
366* Patches by Stephan Linz, 30 Jan 2004:
367 1: - board/altera/common/flash.c:flash_erase():
368 o allow interrupts befor get_timer() call
369 o check-up each erased sector and avoid unexpected timeouts
370 - board/altera/dk1c20/dk1s10.c:board_early_init_f():
371 o enclose sevenseg_set() in cpp condition
372 - remove the ASMI configuration for DK1S10_standard_32 (never present)
373 - fix some typed in mistakes in the NIOS documentation
374 2: - split DK1C20 configuration into several header files:
375 o two new files for each NIOS CPU description
376 o U-Boot related part is remaining in DK1C20.h
377 3: - split DK1S10 configuration into several header files:
378 o two new files for each NIOS CPU description
379 o U-Boot related part is remaining in DK1S10.h
380 4: - Add support for the Microtronix Linux Development Kit
381 NIOS CPU configuration at the Altera Nios Development Kit,
382 Stratix Edition (DK-1S10)
383 5: - Add documentation for the Altera Nios Development Kit,
384 Stratix Edition (DK-1S10)
385 6: - Add support for the Nios Serial Peripharel Interface (SPI)
386 (master only)
387 7: - Add support for the common U-Boot SPI framework at
388 RTC driver DS1306
389
b98fff1d
WD
390* Patch by Rahul Shanbhag, 28 Jan 2004:
391 Fix flash protection/locking handling for OMAP1610 innovator board.
392
393* Patch by Rolf Peukert, 28 Jan 2004:
394 fix flash write problems on CSB226 board (write with 32 bit bus width)
395
396* Patches by Mark Jonas, 16 Jan 2004:
397 - fix rounding error when calculating baudrates for MPC5200 PSCs
398 - make sure CFG_RAMBOOT and CFG_LOWBOOT are not enabled at the same
399 time which is not supported
400
5653fc33
WD
401* Patch by Yuli Barcohen, 26 Jan 2004:
402 Allow bzip2 compression for small memory footprint boards
403
404* Patch by Brad Kemp, 21 Jan 2004:
405 Add support for CFI flash driver for both the Intel and the AMD
406 command sets.
407
408* Patch by Travis Sawyer, 20 Jan 2004:
409 Fix pci bridge auto enumeration of sibling p2p bridges.
410
411* Patch by Tolunay Orkun, 12 Jan 2004:
412 Add some delays as needed for Intel LXT971A PHY support
413
414* Patches by Stephan Linz, 09 Jan 2004:
415 - avoid warning: unused variable `piop' in board/altera/common/sevenseg.c
416 - make DK1C20 board configuration related to ASMI conform to
417 documentation
418
f6e20fc6
WD
419* Patch by Anders Larsen, 09 Jan 2004:
420
421 ARM memory layout fixes: the abort-stack is now set up in the
422 correct RAM area, and the BSS is zeroed out as it should be.
423
424 Furthermore, the magic variables 'armboot_end' and 'armboot_end_data'
425 of the linker scripts are replaced by '__bss_start' and '_end',
426 resp., which is a further step to eliminate unnecessary differences
427 between the implementation of the CPU architectures.
428
f4863a7a
WD
429* Patch by liang a lei, 9 Jan 2004:
430 Fix Intel 28F128J3 ID in include/flash.h
431
432* Patch by Masami Komiya, 09 Jan 2004:
433 add support for TB0229 board (NEC VR4131 MIPS processor)
434
435* Patch by Leon Kukovec, 12 Dec 2003:
436 changed extern __inline__ into static __inline__ in
437 include/linux/byteorder/swab.h
438
ba56f625
WD
439* Patch by Travis Sawyer, 30 Dec 2003:
440 Add support for IBM PPC440GX. Multiple EMAC Ethernet devices,
441 select MDI port based on enabled EMAC device.
442 Add support for XES Inc <http://www.xes-inc.com> XPedite1000 440GX
443 base PrPMC board.
444
a6cccaea
WD
445* Patch by Wolter Kamphuis, 15 Dec 2003:
446 made CONFIG_SILENT_CONSOLE usable on all architectures
447
448* Disable date command on TQM866M - there is no RTC on MPC866
449
75d1ea7f
WD
450* Fix variable CPU clock for MPC859/866 systems for low CPU clocks
451
68766094
WD
452* Implement adaptive SDRAM timing configuration based on actual CPU
453 clock frequency for INCA-IP; fix problem with board hanging when
454 switching from 150MHz to 100MHz
455
456* Add PCMCIA CS support for BMS2003 board
457
c178d3da
WD
458* Add variable CPU clock for MPC859/866 systems (so far only TQM866M):
459 see doc/README.MPC866 for details;
460 implement workaround for "SIU4" and "SIU9" silicon bugs on MPC866;
461 calculate CPU clock frequency from PLL register values.
462
463* Add support for 128 MB RAM on TQM8xxL/M modules
464
ef978730
WD
465* Fix PS/2 keyboard problem caused by statically initialized variable
466 pointing to a location in flash
467
468* Fix INCA-IP clock calculation: 400/3 = 133.3 MHz, not 130.
469
c837dcb1
WD
470* The PS/2 mux on the BMS2003 board needs 450 ms after power on
471 before we can access it; add delay in case we are faster (with no
472 CF card inserted)
473
474* Cleanup of some init functions
475
476* Make sure SCC Ethernet is always stopped by the time we boot Linux
477 to avoid Linux crashes by early packets coming in.
478
479* Accelerate flash accesses on LWMON board by using buffered writes
480
b0aef11c
WD
481* Fix typo in Makefile;
482 fix problem with PARTNUM detection
483
1c43771b
WD
484* Patch by Reinhard Meyer, 09 Jan 2004:
485 - add RTC support for MPC5200 based boards (requires RTC_XTAL)
486
487* Add support for IDE LED on BMS2003 board
488 (exclusive with status LED!)
489
490* Add support for PS/2 keyboard (used with PS/2 multiplexor on
491 BMS2003 board)
492
493* Patches by Reinhard Meyer, 4 Jan 2004 + 7 Jan 2004:
494 Add common files for "emk" boards
495
c83bf6a2
WD
496* Add a common get_ram_size() function and modify the the
497 board-specific files to invoke that common implementation.
498
5cf9da48 499======================================================================
b34ff81d 500Changes for U-Boot 1.0.1:
5cf9da48
WD
501======================================================================
502
b34ff81d
WD
503* Set default clock for INCA-IP to 150 MHz
504
a522fa0e
WD
505* Make BMS2003 use a separate config file to avoid #ifdef mess;
506 add I2C support; add support for DS1337 RTC
507
508* Add CompactFlash support for BMS2003 board
509
510* Add support for status LED on BMS2003 board
511
180d3f74
WD
512* Patch by Scott McNutt, 02 Jan 2004:
513 Add support for the Nios Active Serial Memory Interface (ASMI)
514 on Cyclone devices
515
516* Patch by Andrea Marson, 16 Dec 2003:
517 Add support for the PPChameleon ME and HI modules
518
519* Patch by Yuli Barcohen, 22 Dec 2003:
520 Add support for Motorola DUET ADS board (MPC87x/88x)
521
dd875c76
WD
522* Patch by Robert Schwebel, 15 Dec 2003:
523 add support for cramfs (uses JFFS2 command interface)
524
c935d3bd
WD
525* Patches by Stephan Linz, 11 Dec 2003:
526 - more documentation for NIOS port
527 - new struct nios_pio_t, struct nios_spi_t
528 - Reconfiguration for NIOS Development Kit DK1C20:
529 o move board related code from board/dk1c20
530 to board/altera/dk1c20
531 o create a new common source path board/altera/common
532 and move generic flash access stuff into it
533 o change/expand configuration file DK1C20.h
534 - Add support for NIOS Development Kit DK1S10
535 - Add status LED support for NIOS systems
536 - Add dual 7-segment LED support for Altera NIOS DevKits
537
3a473b2a
WD
538* Patch by Ronen Shitrit, 10 Dec 2003:
539 Add support for the Marvell DB64360 / DB64460 development boards
540
541* Patch by Detlev Zundel, 10 Dec 2003:
542 fix dependency problem in examples/Makefile
543
b6e4c403
WD
544* Patch by Denis Peter, 8 Dec 2003
545 - add support for the PATI board (MPC555)
546 - add SPI support for the MPC5xx
547
548* Patch by Anders Larsen, 08 Dec 2003:
549 add configuration options CONFIG_SERIAL_TAG and CONFIG_REVISION_TAG
550 to pass ATAG_SERIAL and ATAG_REVISION, resp., to the ARM target;
551 cleanup some redundand #defines
552
63f34912
WD
553