fix comments with new drivers organization

Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>

diff --git a/README b/README
index 9a8b3b903d1f6a6689e9b20fa859da1efa853e58..57fc01a90968f873dfa2c972d40df81a94d958f3 100644 (file)
--- a/README
+++ b/README
@@ -924,7 +924,7 @@ The following options need to be configured:
                (i.e. setenv videomode 317; saveenv; reset;)
 
                - "videomode=bootargs" all the video parameters are parsed
-               from the bootargs. (See drivers/videomodes.c)
+               from the bootargs. (See drivers/video/videomodes.c)
 
 
                CONFIG_VIDEO_SED13806
@@ -1353,7 +1353,7 @@ The following options need to be configured:
                CONFIG_FSL_I2C
 
                Define this option if you want to use Freescale's I2C driver in
-               drivers/fsl_i2c.c.
+               drivers/i2c/fsl_i2c.c.
 
 
 - SPI Support: CONFIG_SPI

diff --git a/board/sc3/sc3.c b/board/sc3/sc3.c
index 363a77d8a4e2ca92a99170b5d118aa9976556bc8..09407647ab1a0d8236b0e588f8e801403e8edcc0 100644 (file)
--- a/board/sc3/sc3.c
+++ b/board/sc3/sc3.c
@@ -757,7 +757,7 @@ static struct pci_config_table pci_solidcard3_config_table[] =
 };
 
 /*-------------------------------------------------------------------------+
- | pci_init_board (Called from pci_init() in drivers/pci.c)
+ | pci_init_board (Called from pci_init() in drivers/pci/pci.c)
  |
  | Init the PCI part of the SolidCard III
  |

diff --git a/board/ssv/common/cmd_sled.c b/board/ssv/common/cmd_sled.c
index 713ed65568cdf088bd48dfe3e63d4e04233b4756..2208580faec53eacd45438a2647d7f7707b6df7d 100644 (file)
--- a/board/ssv/common/cmd_sled.c
+++ b/board/ssv/common/cmd_sled.c
@@ -32,8 +32,8 @@
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  * !!!!!                                                !!!!!
  * !!!!! Next type definition was coming from original  !!!!!
- * !!!!! status LED driver drivers/status_led.c and     !!!!!
- * !!!!! should exported for using here.                !!!!!
+ * !!!!! status LED driver drivers/misc/status_led.c    !!!!!
+ * !!!!! and should be exported for using it here.      !!!!!
  * !!!!!                                                !!!!!
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
 

diff --git a/common/env_nand.c b/common/env_nand.c
index 38a07f8993f7ab1226044ed2497f05788ee9bfc5..ce0a2514db458f8bd7cac293ccd7ecdf21ea7d42 100644 (file)
--- a/common/env_nand.c
+++ b/common/env_nand.c
@@ -57,7 +57,7 @@ int nand_legacy_rw (struct nand_chip* nand, int cmd,
            size_t start, size_t len,
            size_t * retlen, u_char * buf);
 
-/* info for NAND chips, defined in drivers/nand/nand.c */
+/* info for NAND chips, defined in drivers/mtd/nand/nand.c */
 extern nand_info_t nand_info[];
 
 /* references to names in env_common.c */

diff --git a/cpu/ppc4xx/4xx_pci.c b/cpu/ppc4xx/4xx_pci.c
index a68c419b1ba58e399be73ace32a08e0b7cd45a18..a5b9690bec3fceeeca1a894f641ab575e141ea17 100644 (file)
--- a/cpu/ppc4xx/4xx_pci.c
+++ b/cpu/ppc4xx/4xx_pci.c
@@ -339,7 +339,7 @@ void pci_405gp_init(struct pci_controller *hose)
 }
 
 /*
- * drivers/pci.c skips every host bridge but the 405GP since it could
+ * drivers/pci/pci.c skips every host bridge but the 405GP since it could
  * be set as an Adapter.
  *
  * I (Andrew May) don't know what we should do here, but I don't want

diff --git a/doc/README.generic_usb_ohci b/doc/README.generic_usb_ohci
index 494dd1f5d92bfa404d47671ae27f6525394f2698..c44c5014743e614990fa280a581acbf0b757180b 100644 (file)
--- a/doc/README.generic_usb_ohci
+++ b/doc/README.generic_usb_ohci
@@ -1,7 +1,7 @@
 Notes on the the generic USB-OHCI driver
 ========================================
 
-This driver (drivers/usb_ohci.[ch]) is the result of the merge of
+This driver (drivers/usb/usb_ohci.[ch]) is the result of the merge of
 various existing OHCI drivers that were basically identical beside
 cpu/board dependant initalization. This initalization has been moved
 into cpu/board directories and are called via the hooks below.

diff --git a/doc/README.modnet50 b/doc/README.modnet50
index 30338ce8cc74cde0c1ae7cb91b4d636193dccdd5..f7bb254e16d0858316853c0ddb77aaca968b2664 100644 (file)
--- a/doc/README.modnet50
+++ b/doc/README.modnet50
@@ -51,8 +51,8 @@ board/modnet50/lowlevel_init.S   .. memory setup for ModNET50
 board/modnet50/flash.c     .. flash routines
 board/modnet50/modnet50.c   .. some board init stuff
 
-drivers/netarm_eth.c       .. ethernet driver for the NET+50 CPU
-drivers/netarm_eth.h       .. header for ethernet driver
+drivers/net/netarm_eth.c    .. ethernet driver for the NET+50 CPU
+drivers/net/netarm_eth.h    .. header for ethernet driver
 
 include/configs/modnet50.h  .. configuration file for ModNET50
 

diff --git a/drivers/mtd/nand/nand_util.c b/drivers/mtd/nand/nand_util.c
index 4fd4e166e6ad6c36ed9d7ac9a8178b36e8ec6d9b..6c5624a49a4b5b7c8e7ad4f63f3f17feccbc1cdf 100644 (file)
--- a/drivers/mtd/nand/nand_util.c
+++ b/drivers/mtd/nand/nand_util.c
@@ -1,5 +1,5 @@
 /*
- * drivers/nand/nand_util.c
+ * drivers/mtd/nand/nand_util.c
  *
  * Copyright (C) 2006 by Weiss-Electronic GmbH.
  * All rights reserved.

diff --git a/drivers/net/sk98lin/Makefile b/drivers/net/sk98lin/Makefile
index a7d4a3b7a7ea95dc3f22c46d3b9798731a347ccb..8b83faeb15e3bb547e9a57e62a2565b296b42741 100644 (file)
--- a/drivers/net/sk98lin/Makefile
+++ b/drivers/net/sk98lin/Makefile
@@ -20,7 +20,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston,
 # MA 02111-1307 USA
 #
-# File: drivers/sk98lin/Makefile
+# File: drivers/net/sk98lin/Makefile
 #
 # Makefile for the SysKonnect SK-98xx device driver.
 #

diff --git a/drivers/usb/isp116x-hcd.c b/drivers/usb/isp116x-hcd.c
index b21af10d0ba090ef504911befa970ec96133b4d4..ac6703056c901d6be2e4d3be6fd03156a3bfb6ce 100644 (file)
--- a/drivers/usb/isp116x-hcd.c
+++ b/drivers/usb/isp116x-hcd.c
@@ -20,7 +20,7 @@
  * MA 02111-1307 USA
  *
  *
- * Derived in part from the SL811 HCD driver "u-boot/drivers/sl811_usb.c"
+ * Derived in part from the SL811 HCD driver "u-boot/drivers/usb/sl811_usb.c"
  * (original copyright message follows):
  *
  *    (C) Copyright 2004

diff --git a/drivers/usb/usbdcore_mpc8xx.c b/drivers/usb/usbdcore_mpc8xx.c
index d4c409656565bf61fb59c5754f0b563b35afc60e..122793c023cfcddb6508f308f48c1bb7dfabbdd1 100644 (file)
--- a/drivers/usb/usbdcore_mpc8xx.c
+++ b/drivers/usb/usbdcore_mpc8xx.c
@@ -3,7 +3,8 @@
  * bodonoghue@CodeHermit.ie
  *
  * References
- * DasUBoot/drivers/usbdcore_omap1510.c, for design and implementation ideas.
+ * DasUBoot/drivers/usb/usbdcore_omap1510.c, for design and implementation
+ * ideas.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index bcf877194e0fdbc5b08514f017c33de8e7decf19..82cc0c76c3066ac4df072e1e870ef642e950eff2 100644 (file)
--- a/drivers/video/cfb_console.c
+++ b/drivers/video/cfb_console.c
@@ -187,9 +187,9 @@ CONFIG_VIDEO_HW_CURSOR:          - Uses the hardware cursor capability of the
 
 /*****************************************************************************/
 /* Cursor definition:                                                       */
-/* CONFIG_CONSOLE_CURSOR:  Uses a timer function (see drivers/i8042.c) to    */
-/*                        let the cursor blink. Uses the macros CURSOR_OFF  */
-/*                        and CURSOR_ON.                                    */
+/* CONFIG_CONSOLE_CURSOR:  Uses a timer function (see drivers/input/i8042.c) */
+/*                         to let the cursor blink. Uses the macros         */
+/*                         CURSOR_OFF and CURSOR_ON.                        */
 /* CONFIG_VIDEO_SW_CURSOR: Draws a cursor after the last character. No      */
 /*                        blinking is provided. Uses the macros CURSOR_SET  */
 /*                        and CURSOR_OFF.                                   */
@@ -217,7 +217,7 @@ void        console_cursor (int state);
 #define CURSOR_OFF console_cursor(0);
 #define CURSOR_SET
 #ifndef CONFIG_I8042_KBD
-#warning Cursor drawing on/off needs timer function s.a. drivers/i8042.c
+#warning Cursor drawing on/off needs timer function s.a. drivers/input/i8042.c
 #endif
 #else
 #ifdef CONFIG_CONSOLE_TIME

diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c
index 53166683fd07b4266c41cec782002b404b64c816..69f53eabcf0e39d1573009b984523d0c8e961b6b 100644 (file)
--- a/fs/jffs2/jffs2_1pass.c
+++ b/fs/jffs2/jffs2_1pass.c
@@ -165,7 +165,7 @@ static struct part_info *current_part;
 int read_jffs2_nand(size_t start, size_t len,
                size_t * retlen, u_char * buf, int nanddev);
 #else
-/* info for NAND chips, defined in drivers/nand/nand.c */
+/* info for NAND chips, defined in drivers/mtd/nand/nand.c */
 extern nand_info_t nand_info[];
 #endif
 

diff --git a/include/configs/CATcenter.h b/include/configs/CATcenter.h
index 0321650f3d2103e69fdc047af57ae7e1e32e5e4b..1603c9c0bdada1f4a7865f1f57226906681690cd 100644 (file)
--- a/include/configs/CATcenter.h
+++ b/include/configs/CATcenter.h
@@ -473,7 +473,7 @@
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 /* This is the base address (on 405EP-side) used to generate I/O accesses on PCI bus */
 #define CFG_ISA_IO 0xE8000000
-/* see also drivers/videomodes.c */
+/* see also drivers/video/videomodes.c */
 #define CFG_DEFAULT_VIDEO_MODE 0x303
 #endif
 

diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h
index c9a9c83f220601193740b3d4b91eed7811786d77..7bc4e2743670fd0a746823eaf91d32f14e371627 100644 (file)
--- a/include/configs/MPC8313ERDB.h
+++ b/include/configs/MPC8313ERDB.h
@@ -192,7 +192,7 @@
 
 #define CFG_LBC_MRTPR  0x20000000  /*TODO */   /* LB refresh timer prescal, 266MHz/32 */
 
-/* drivers/nand/nand.c */
+/* drivers/mtd/nand/nand.c */
 #define CFG_NAND_BASE          0xE2800000      /* 0xF0000000 */
 #define CFG_MAX_NAND_DEVICE    1
 #define NAND_MAX_CHIPS         1

diff --git a/include/configs/PPChameleonEVB.h b/include/configs/PPChameleonEVB.h
index c2aa2cc098469e66ea07dfd10e6e6c641d2b00dc..cf98324344c06cbed4f27c77cfb0393a5e2d8537 100644 (file)
--- a/include/configs/PPChameleonEVB.h
+++ b/include/configs/PPChameleonEVB.h
@@ -496,7 +496,7 @@
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 /* This is the base address (on 405EP-side) used to generate I/O accesses on PCI bus */
 #define CFG_ISA_IO 0xE8000000
-/* see also drivers/videomodes.c */
+/* see also drivers/video/videomodes.c */
 #define CFG_DEFAULT_VIDEO_MODE 0x303
 #endif
 

diff --git a/include/configs/SX1.h b/include/configs/SX1.h
index 05cef873e5febc3536b13aaaf1d78435fc6ece3b..50ad7dd598de2d18806a2dc0ef1191ffae3eabbe 100644 (file)
--- a/include/configs/SX1.h
+++ b/include/configs/SX1.h
@@ -181,7 +181,7 @@
  * FLASH driver setup
  */
 #define CFG_FLASH_CFI          1       /* Flash memory is CFI compliant */
-#define CFG_FLASH_CFI_DRIVER   1       /* Use drivers/cfi_flash.c */
+#define CFG_FLASH_CFI_DRIVER   1       /* Use drivers/mtd/cfi_flash.c */
 #define CFG_FLASH_USE_BUFFER_WRITE 1   /* Use buffered writes (~10x faster) */
 #define CFG_FLASH_PROTECTION   1       /* Use hardware sector protection */
 

diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h
index 69310d4dfbc56aaab0f0808c52e61dadbb9e592f..e1d1483b719d583e77e14b477f74e13dbaf3f9e0 100644 (file)
--- a/include/configs/integratorcp.h
+++ b/include/configs/integratorcp.h
@@ -168,7 +168,7 @@ SIB at Block62 End Block62 address 0x24f80000
 /*
  * Move up the U-Boot & monitor area if more flash is fitted.
  * If this U-Boot is to be run on Integrators with varying flash sizes,
- * drivers/cfi_flash.c::flash_init() can read the Integrator CP_FLASHPROG
+ * drivers/mtd/cfi_flash.c::flash_init() can read the Integrator CP_FLASHPROG
  * register and dynamically assign CFG_ENV_ADDR & CFG_MONITOR_BASE
  * - CFG_MONITOR_BASE is set to indicate that the environment is not
  * embedded in the boot monitor(s) area

diff --git a/include/configs/omap1510inn.h b/include/configs/omap1510inn.h
index 8623ed3cc88d7b6ec3121a288ce9f844f1e99b3e..0be46eacec77fb5c6833fbeaaede3f90d1d62131 100644 (file)
--- a/include/configs/omap1510inn.h
+++ b/include/configs/omap1510inn.h
@@ -179,7 +179,7 @@
  * FLASH driver setup
  */
 #define CFG_FLASH_CFI          1       /* Flash memory is CFI compliant */
-#define CFG_FLASH_CFI_DRIVER   1       /* Use drivers/cfi_flash.c */
+#define CFG_FLASH_CFI_DRIVER   1       /* Use drivers/mtd/cfi_flash.c */
 #define CFG_FLASH_USE_BUFFER_WRITE     1       /* Use buffered writes (~10x faster) */
 #define CFG_FLASH_PROTECTION   1       /* Use hardware sector protection */
 

diff --git a/include/configs/omap2420h4.h b/include/configs/omap2420h4.h
index 8ae8efeb8171b931c7e79d958670f1feae57ad0a..88a3f6eb95b73daaa366f2dd031133293ef9386e 100644 (file)
--- a/include/configs/omap2420h4.h
+++ b/include/configs/omap2420h4.h
@@ -283,7 +283,7 @@
  * CFI FLASH driver setup
  */
 #define CFG_FLASH_CFI          1       /* Flash memory is CFI compliant */
-#define CFG_FLASH_CFI_DRIVER   1       /* Use drivers/cfi_flash.c */
+#define CFG_FLASH_CFI_DRIVER   1       /* Use drivers/mtd/cfi_flash.c */
 #define CFG_FLASH_USE_BUFFER_WRITE 1   /* Use buffered writes (~10x faster) */
 #define CFG_FLASH_PROTECTION   1       /* Use hardware sector protection */
 

diff --git a/include/configs/omap5912osk.h b/include/configs/omap5912osk.h
index 16ce2f61aec896bb2aa47ba2de5d55fcee539f06..e3bde4ff81d6875b441c68511a8af598e45c1e88 100644 (file)
--- a/include/configs/omap5912osk.h
+++ b/include/configs/omap5912osk.h
@@ -174,7 +174,7 @@
  * FLASH driver setup
  */
 #define CFG_FLASH_CFI          1       /* Flash memory is CFI compliant */
-#define CFG_FLASH_CFI_DRIVER   1       /* Use drivers/cfi_flash.c */
+#define CFG_FLASH_CFI_DRIVER   1       /* Use drivers/mtd/cfi_flash.c */
 
 #define CFG_FLASH_BANKS_LIST { PHYS_FLASH_1, PHYS_FLASH_2 }
 

diff --git a/nand_spl/board/amcc/acadia/Makefile b/nand_spl/board/amcc/acadia/Makefile
index 6e53bea0179292efb5d425ac904baed246d1c7e8..4272108b510d40ffc32b0e39cbb5efb3b6e54a22 100644 (file)
--- a/nand_spl/board/amcc/acadia/Makefile
+++ b/nand_spl/board/amcc/acadia/Makefile
@@ -97,7 +97,7 @@ $(obj)nand_boot.c:
        @rm -f $(obj)nand_boot.c
        ln -s $(SRCTREE)/nand_spl/nand_boot.c $(obj)nand_boot.c
 
-# from drivers/nand directory
+# from drivers/mtd/nand directory
 $(obj)nand_ecc.c:
        @rm -f $(obj)nand_ecc.c
        ln -s $(SRCTREE)/drivers/mtd/nand/nand_ecc.c $(obj)nand_ecc.c

diff --git a/nand_spl/board/amcc/bamboo/Makefile b/nand_spl/board/amcc/bamboo/Makefile
index 3a633fb8871c6b00c3840a8bf4cabc71fbdc4132..aed796070901884ad2ee949455484e4f6d385fad 100644 (file)
--- a/nand_spl/board/amcc/bamboo/Makefile
+++ b/nand_spl/board/amcc/bamboo/Makefile
@@ -79,7 +79,7 @@ $(obj)nand_boot.c:
        @rm -f $(obj)nand_boot.c
        ln -s $(SRCTREE)/nand_spl/nand_boot.c $(obj)nand_boot.c
 
-# from drivers/nand directory
+# from drivers/mtd/nand directory
 $(obj)nand_ecc.c:
        @rm -f $(obj)nand_ecc.c
        ln -s $(SRCTREE)/drivers/mtd/nand/nand_ecc.c $(obj)nand_ecc.c

diff --git a/nand_spl/board/amcc/sequoia/Makefile b/nand_spl/board/amcc/sequoia/Makefile
index dfa0ce39e8222df1278842df2439585fbf956c72..93150aad1bea92c6518fdc8547097f5955f9a6f5 100644 (file)
--- a/nand_spl/board/amcc/sequoia/Makefile
+++ b/nand_spl/board/amcc/sequoia/Makefile
@@ -89,7 +89,7 @@ $(obj)nand_boot.c:
        @rm -f $(obj)nand_boot.c
        ln -s $(SRCTREE)/nand_spl/nand_boot.c $(obj)nand_boot.c
 
-# from drivers/nand directory
+# from drivers/mtd/nand directory
 $(obj)nand_ecc.c:
        @rm -f $(obj)nand_ecc.c
        ln -s $(SRCTREE)/drivers/mtd/nand/nand_ecc.c $(obj)nand_ecc.c