summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-02-19 07:15:01 +0100
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-02-19 07:15:01 +0100
commita87a0ce7028d5371c81d77ba72c1ba43a1ca77bc (patch)
tree98bff4a88314611dc6f7afea5f88953309940a51 /doc
parentc4d376fd1c2bce8d64cec0431dd3f24957b6dec4 (diff)
parentf8d1086851409ee16344932ef367b8a05c365b09 (diff)
Merge branch 'u-boot-pxa/master' into 'u-boot-arm/master'
Diffstat (limited to 'doc')
-rw-r--r--doc/README.scrapyard5
-rw-r--r--doc/driver-model/UDM-pci.txt4
-rw-r--r--doc/driver-model/UDM-serial.txt4
3 files changed, 5 insertions, 8 deletions
diff --git a/doc/README.scrapyard b/doc/README.scrapyard
index 2aed8559939..6b41445faa0 100644
--- a/doc/README.scrapyard
+++ b/doc/README.scrapyard
@@ -11,6 +11,11 @@ easily if here is something they might want to dig for...
Board Arch CPU Commit Removed Last known maintainer/contact
=================================================================================================
+dvl_host arm ixp - 2014-01-28 Michael Schwingen <michael@schwingen.org>
+actux4 arm ixp - 2014-01-28 Michael Schwingen <michael@schwingen.org>
+actux3 arm ixp - 2014-01-28 Michael Schwingen <michael@schwingen.org>
+actux2 arm ixp - 2014-01-28 Michael Schwingen <michael@schwingen.org>
+actux1 arm ixp - 2014-01-28 Michael Schwingen <michael@schwingen.org>
mx1ads arm arm920t - 2014-01-13
mini2440 arm arm920t - 2014-01-13 Gabriel Huau <contact@huau-gabriel.fr>
omap730p2 arm arm926ejs 79c5c08d 2013-11-11
diff --git a/doc/driver-model/UDM-pci.txt b/doc/driver-model/UDM-pci.txt
index 059a4329fb9..1dce99de3dc 100644
--- a/doc/driver-model/UDM-pci.txt
+++ b/doc/driver-model/UDM-pci.txt
@@ -125,10 +125,6 @@ III) Analysis of in-tree drivers
Shared driver for indirect PCI bridges, several CONFIG macros - will
require significant cleanup.
- pci_ixp.c
- ---------
- Standard driver, specifies all read/write functions separately.
-
pci_sh4.c
---------
Shared init function for SH4 drivers, uses dword for read/write ops.
diff --git a/doc/driver-model/UDM-serial.txt b/doc/driver-model/UDM-serial.txt
index 279e941fc03..ed804a8e7e5 100644
--- a/doc/driver-model/UDM-serial.txt
+++ b/doc/driver-model/UDM-serial.txt
@@ -101,10 +101,6 @@ III) Analysis of in-tree drivers
No support for CONFIG_SERIAL_MULTI. Simple conversion possible. This driver
might be removed in favor of serial_mxc.c .
- serial_ixp.c
- ------------
- No support for CONFIG_SERIAL_MULTI. Simple conversion possible.
-
serial_ks8695.c
---------------
No support for CONFIG_SERIAL_MULTI. Simple conversion possible.