leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix an ancient CHANGELOG conflict

Browse Source
This commit is contained in:
Markus Klotzbuecher 2007-05-07 16:43:56 +02:00 committed by Markus Klotzbuecher
parent 6ede0c8b69
commit 3a619dd7be
2 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
CHANGELOG
View File

@ -4045,27 +4045,9 @@ Date: Sat Oct 28 02:29:14 2006 +0200
Enable commandline editing and hush shell on all TQM boards. Enable commandline editing and hush shell on all TQM boards.
<<<<<<< master
* Code cleanup
* Various USB related patches
- Add support for mpc8xx USB device.
- Add support for Common Device Class - Abstract Control Model USB console.
- Add support for flow control in USB slave devices.
- Add support for switching between gserial and cdc_acm using environment.
- Minor changes to usbdcore_omap1510.c usbdcore_omap1510.h
- Update usbcore slightly to ease host enumeration.
- Fix non-portable endian problems in usbdcore and usbdcore_ep0.
- Add AdderUSB_config as a defconfig to enable usage of the USB console
by default with the Adder87x U-Boot port.
Patch by Bryan O'Donoghue <bodonoghue@codehermit.ie>, 29 May 2006
* Cleanup trab board for GCC-4.x
=======
commit 8078f1a5f63a739b8533478f6c2b62fb1e2f79d7 commit 8078f1a5f63a739b8533478f6c2b62fb1e2f79d7
Author: Wolfgang Denk <wd@pollux.denx.de> Author: Wolfgang Denk <wd@pollux.denx.de>
Date: Sat Oct 28 02:28:02 2006 +0200 Date: Sat Oct 28 02:28:02 2006 +0200
>>>>>>> trunk
README says CFG_AUTO_COMPLETE, but ocde uses CONFIG_AUTO_COMPLETE README says CFG_AUTO_COMPLETE, but ocde uses CONFIG_AUTO_COMPLETE

14
CHANGELOG-before-U-Boot-1.1.5
View File

@ -438,6 +438,20 @@ Changes for U-Boot 1.1.5:
* Call serial_initialize() before first debug() is used. * Call serial_initialize() before first debug() is used.
* Code cleanup
* Various USB related patches
- Add support for mpc8xx USB device.
- Add support for Common Device Class - Abstract Control Model USB console.
- Add support for flow control in USB slave devices.
- Add support for switching between gserial and cdc_acm using environment.
- Minor changes to usbdcore_omap1510.c usbdcore_omap1510.h
- Update usbcore slightly to ease host enumeration.
- Fix non-portable endian problems in usbdcore and usbdcore_ep0.
- Add AdderUSB_config as a defconfig to enable usage of the USB console
by default with the Adder87x U-Boot port.
Patch by Bryan O'Donoghue <bodonoghue@codehermit.ie>, 29 May 2006
* Cleanup trab board for GCC-4.x * Cleanup trab board for GCC-4.x
* VoiceBlue update: use new MTD flash partitioning methods, use more * VoiceBlue update: use new MTD flash partitioning methods, use more