diff options
| author | Pavel Herrmann <morpheus.ibis@gmail.com> | 2012-10-09 07:01:56 +0000 | 
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-10-17 07:59:08 -0700 | 
| commit | 8d1165e11a7aad00a2bbb05f20bacf021f6d1c12 (patch) | |
| tree | 0f87522d48fc98c0b67c6bf9482cb9efaad67537 /include/configs | |
| parent | 94fa029a6d1fcf58c4cecc46326f766425bdb918 (diff) | |
| download | olio-uboot-2014.01-8d1165e11a7aad00a2bbb05f20bacf021f6d1c12.tar.xz olio-uboot-2014.01-8d1165e11a7aad00a2bbb05f20bacf021f6d1c12.zip | |
split mpc8xx hooks from cmd_ide.c
move most of mpc8xx hooks from cmd_ide.c into ide_preinit() and newly created
ide_init_postreset() (invoked after calling ide_reset after ide_preinit),
some cleanup to make checkpatch happy, enable IDE init hooks in configs of
affected boards.
confusingly, these hooks are used by more than just mpc8xx-based boards, and
therefore are placed in arch/ppc/lib/
note: checkpatch still emits warnings about using volatile
Signed-off-by: Pavel Herrmann <morpheus.ibis@gmail.com>
Diffstat (limited to 'include/configs')
35 files changed, 39 insertions, 0 deletions
| diff --git a/include/configs/CPC45.h b/include/configs/CPC45.h index fc226f198..e102c365c 100644 --- a/include/configs/CPC45.h +++ b/include/configs/CPC45.h @@ -480,6 +480,7 @@   *-----------------------------------------------------------------------   */ +#define CONFIG_IDE_PREINIT	1	/* Use preinit IDE hook */  #define	CONFIG_IDE_8xx_PCCARD	1	/* Use IDE with PC Card	Adapter	*/  #undef	CONFIG_IDE_8xx_DIRECT		/* Direct IDE    not supported	*/ diff --git a/include/configs/ICU862.h b/include/configs/ICU862.h index 81f219c9b..b58b6f638 100644 --- a/include/configs/ICU862.h +++ b/include/configs/ICU862.h @@ -349,6 +349,7 @@   *-----------------------------------------------------------------------   */ +#define CONFIG_IDE_PREINIT	1	/* Use preinit IDE hook */  #define	CONFIG_IDE_8xx_PCCARD	1	/* Use IDE with PC Card	Adapter	*/  #undef	CONFIG_IDE_8xx_DIRECT		/* Direct IDE    not supported	*/ diff --git a/include/configs/IVML24.h b/include/configs/IVML24.h index f98a66bf2..092fcf064 100644 --- a/include/configs/IVML24.h +++ b/include/configs/IVML24.h @@ -318,6 +318,8 @@   * IDE/ATA stuff   *-----------------------------------------------------------------------   */ +#define CONFIG_IDE_PREINIT	1	/* Use preinit IDE hook */ +#define CONFIG_IDE_INIT_POSTRESET	1	/* Use postreset IDE hook */  #define CONFIG_IDE_8xx_DIRECT	1	/* PCMCIA interface required	*/  #define CONFIG_IDE_RESET	1	/* reset for ide supported	*/ diff --git a/include/configs/IVMS8.h b/include/configs/IVMS8.h index d6e9b2381..38837cab4 100644 --- a/include/configs/IVMS8.h +++ b/include/configs/IVMS8.h @@ -312,6 +312,8 @@   * IDE/ATA stuff   *-----------------------------------------------------------------------   */ +#define CONFIG_IDE_PREINIT	1	/* Use preinit IDE hook */ +#define CONFIG_IDE_INIT_POSTRESET	1	/* Use postreset IDE hook */  #define CONFIG_IDE_8xx_DIRECT	1	/* PCMCIA interface required	*/  #define CONFIG_IDE_RESET	1	/* reset for ide supported	*/ diff --git a/include/configs/KUP4K.h b/include/configs/KUP4K.h index c0035e65d..dae9b8c07 100644 --- a/include/configs/KUP4K.h +++ b/include/configs/KUP4K.h @@ -353,6 +353,7 @@   *-----------------------------------------------------------------------   */ +#define CONFIG_IDE_PREINIT	1	/* Use preinit IDE hook */  #define CONFIG_IDE_8xx_PCCARD	1	/* Use IDE with PC Card Adapter */  #undef	CONFIG_IDE_8xx_DIRECT		/* Direct IDE	 not supported	*/ diff --git a/include/configs/KUP4X.h b/include/configs/KUP4X.h index 5084cccad..cceee9674 100644 --- a/include/configs/KUP4X.h +++ b/include/configs/KUP4X.h @@ -366,6 +366,7 @@   *-----------------------------------------------------------------------   */ +#define CONFIG_IDE_PREINIT	1	/* Use preinit IDE hook */  #define CONFIG_IDE_8xx_PCCARD	1	/* Use IDE with PC Card Adapter */  #undef	CONFIG_IDE_8xx_DIRECT		/* Direct IDE	 not supported	*/ diff --git a/include/configs/MBX.h b/include/configs/MBX.h index e8d0cd775..7145cc444 100644 --- a/include/configs/MBX.h +++ b/include/configs/MBX.h @@ -276,6 +276,7 @@   *-----------------------------------------------------------------------   */ +#define CONFIG_IDE_PREINIT	1	/* Use preinit IDE hook */  #define CONFIG_IDE_8xx_PCCARD	1	/* Use IDE with PC Card Adapter */  #undef	CONFIG_IDE_8xx_DIRECT		/* Direct IDE	 not supported	*/ diff --git a/include/configs/NETTA.h b/include/configs/NETTA.h index 604938d8b..074e01f0f 100644 --- a/include/configs/NETTA.h +++ b/include/configs/NETTA.h @@ -629,6 +629,7 @@   *-----------------------------------------------------------------------   */ +#define CONFIG_IDE_PREINIT	1	/* Use preinit IDE hook */  #define	CONFIG_IDE_8xx_PCCARD	1	/* Use IDE with PC Card	Adapter	*/  #undef	CONFIG_IDE_8xx_DIRECT		/* Direct IDE    not supported	*/ diff --git a/include/configs/NSCU.h b/include/configs/NSCU.h index 9f462f4b5..f4184fcd8 100644 --- a/include/configs/NSCU.h +++ b/include/configs/NSCU.h @@ -318,6 +318,7 @@   *-----------------------------------------------------------------------   */ +#define CONFIG_IDE_PREINIT	1	/* Use preinit IDE hook */  #define	CONFIG_IDE_8xx_PCCARD	1	/* Use IDE with PC Card	Adapter	*/  #undef	CONFIG_IDE_8xx_DIRECT		/* Direct IDE    not supported	*/ diff --git a/include/configs/R360MPI.h b/include/configs/R360MPI.h index 9befacbab..868a0b804 100644 --- a/include/configs/R360MPI.h +++ b/include/configs/R360MPI.h @@ -329,6 +329,7 @@   */  #if 1 +#define CONFIG_IDE_PREINIT	1	/* Use preinit IDE hook */  #define	CONFIG_IDE_8xx_PCCARD	1	/* Use IDE with PC Card	Adapter	*/  #undef	CONFIG_IDE_8xx_DIRECT		/* Direct IDE    not supported	*/ diff --git a/include/configs/RPXClassic.h b/include/configs/RPXClassic.h index b215c2d64..3595200c4 100644 --- a/include/configs/RPXClassic.h +++ b/include/configs/RPXClassic.h @@ -314,6 +314,7 @@   *-----------------------------------------------------------------------   */ +#define CONFIG_IDE_PREINIT	1	/* Use preinit IDE hook */  #define	CONFIG_IDE_8xx_PCCARD	1	/* Use IDE with PC Card	Adapter	*/  #undef	CONFIG_IDE_8xx_DIRECT		/* Direct IDE    not supported	*/ diff --git a/include/configs/RPXlite.h b/include/configs/RPXlite.h index 8ffb014fe..563abea95 100644 --- a/include/configs/RPXlite.h +++ b/include/configs/RPXlite.h @@ -249,6 +249,7 @@   *-----------------------------------------------------------------------   */ +#define CONFIG_IDE_PREINIT	1	/* Use preinit IDE hook */  #define	CONFIG_IDE_8xx_PCCARD	1	/* Use IDE with PC Card	Adapter	*/  #undef	CONFIG_IDE_8xx_DIRECT		/* Direct IDE    not supported	*/ diff --git a/include/configs/RPXlite_DW.h b/include/configs/RPXlite_DW.h index f8bcf0fae..67ab1e962 100644 --- a/include/configs/RPXlite_DW.h +++ b/include/configs/RPXlite_DW.h @@ -335,6 +335,7 @@   * IDE/ATA stuff (Supports IDE harddisk on PCMCIA Adapter)   *-----------------------------------------------------------------------   */ +#define CONFIG_IDE_PREINIT	1	/* Use preinit IDE hook */  #define CONFIG_IDE_8xx_PCCARD	1	/* Use IDE with PC Card Adapter */  #undef	CONFIG_IDE_8xx_DIRECT		/* Direct IDE	 not supported	*/ diff --git a/include/configs/RRvision.h b/include/configs/RRvision.h index 671d52168..e2b22f0ba 100644 --- a/include/configs/RRvision.h +++ b/include/configs/RRvision.h @@ -329,6 +329,7 @@   *-----------------------------------------------------------------------   */ +#define CONFIG_IDE_PREINIT	1	/* Use preinit IDE hook */  #define	CONFIG_IDE_8xx_PCCARD	1	/* Use IDE with PC Card	Adapter	*/  #undef	CONFIG_IDE_8xx_DIRECT		/* Direct IDE    not supported	*/ diff --git a/include/configs/SPD823TS.h b/include/configs/SPD823TS.h index cffeb1144..72ea217e5 100644 --- a/include/configs/SPD823TS.h +++ b/include/configs/SPD823TS.h @@ -303,6 +303,8 @@   * IDE/ATA stuff   *-----------------------------------------------------------------------   */ +#define CONFIG_IDE_PREINIT	1	/* Use preinit IDE hook */ +#define CONFIG_IDE_INIT_POSTRESET	1	/* Use postreset IDE hook */  #define CONFIG_IDE_8xx_DIRECT	1	/* PCMCIA interface required	*/  #define CONFIG_IDE_LED		1	/* LED   for ide supported	*/  #define CONFIG_IDE_RESET	1	/* reset for ide supported	*/ diff --git a/include/configs/TK885D.h b/include/configs/TK885D.h index 4176c7fe5..623cb6636 100644 --- a/include/configs/TK885D.h +++ b/include/configs/TK885D.h @@ -343,6 +343,7 @@   *-----------------------------------------------------------------------   */ +#define CONFIG_IDE_PREINIT	1	/* Use preinit IDE hook */  #define CONFIG_IDE_8xx_PCCARD	1	/* Use IDE with PC Card Adapter */  #undef	CONFIG_IDE_8xx_DIRECT		/* Direct IDE	 not supported	*/ diff --git a/include/configs/TQM823L.h b/include/configs/TQM823L.h index a01b4a6be..9fac5d15c 100644 --- a/include/configs/TQM823L.h +++ b/include/configs/TQM823L.h @@ -335,6 +335,7 @@   *-----------------------------------------------------------------------   */ +#define CONFIG_IDE_PREINIT	1	/* Use preinit IDE hook */  #define	CONFIG_IDE_8xx_PCCARD	1	/* Use IDE with PC Card	Adapter	*/  #undef	CONFIG_IDE_8xx_DIRECT		/* Direct IDE    not supported	*/ diff --git a/include/configs/TQM823M.h b/include/configs/TQM823M.h index 1da4acd45..932f158b2 100644 --- a/include/configs/TQM823M.h +++ b/include/configs/TQM823M.h @@ -331,6 +331,7 @@   *-----------------------------------------------------------------------   */ +#define CONFIG_IDE_PREINIT	1	/* Use preinit IDE hook */  #define	CONFIG_IDE_8xx_PCCARD	1	/* Use IDE with PC Card	Adapter	*/  #undef	CONFIG_IDE_8xx_DIRECT		/* Direct IDE    not supported	*/ diff --git a/include/configs/TQM850L.h b/include/configs/TQM850L.h index 1c054f0bc..eb08de281 100644 --- a/include/configs/TQM850L.h +++ b/include/configs/TQM850L.h @@ -320,6 +320,7 @@   *-----------------------------------------------------------------------   */ +#define CONFIG_IDE_PREINIT	1	/* Use preinit IDE hook */  #define	CONFIG_IDE_8xx_PCCARD	1	/* Use IDE with PC Card	Adapter	*/  #undef	CONFIG_IDE_8xx_DIRECT		/* Direct IDE    not supported	*/ diff --git a/include/configs/TQM850M.h b/include/configs/TQM850M.h index 46066dfb4..bf3a76ca8 100644 --- a/include/configs/TQM850M.h +++ b/include/configs/TQM850M.h @@ -322,6 +322,7 @@   *-----------------------------------------------------------------------   */ +#define CONFIG_IDE_PREINIT	1	/* Use preinit IDE hook */  #define	CONFIG_IDE_8xx_PCCARD	1	/* Use IDE with PC Card	Adapter	*/  #undef	CONFIG_IDE_8xx_DIRECT		/* Direct IDE    not supported	*/ diff --git a/include/configs/TQM855L.h b/include/configs/TQM855L.h index dd2da9410..43dd64356 100644 --- a/include/configs/TQM855L.h +++ b/include/configs/TQM855L.h @@ -324,6 +324,7 @@   *-----------------------------------------------------------------------   */ +#define CONFIG_IDE_PREINIT	1	/* Use preinit IDE hook */  #define	CONFIG_IDE_8xx_PCCARD	1	/* Use IDE with PC Card	Adapter	*/  #undef	CONFIG_IDE_8xx_DIRECT		/* Direct IDE    not supported	*/ diff --git a/include/configs/TQM855M.h b/include/configs/TQM855M.h index 95bc4d964..e7fd2db28 100644 --- a/include/configs/TQM855M.h +++ b/include/configs/TQM855M.h @@ -359,6 +359,7 @@   *-----------------------------------------------------------------------   */ +#define CONFIG_IDE_PREINIT	1	/* Use preinit IDE hook */  #define	CONFIG_IDE_8xx_PCCARD	1	/* Use IDE with PC Card	Adapter	*/  #undef	CONFIG_IDE_8xx_DIRECT		/* Direct IDE    not supported	*/ diff --git a/include/configs/TQM860L.h b/include/configs/TQM860L.h index 487666ce5..81e1b91ee 100644 --- a/include/configs/TQM860L.h +++ b/include/configs/TQM860L.h @@ -323,6 +323,7 @@   *-----------------------------------------------------------------------   */ +#define CONFIG_IDE_PREINIT	1	/* Use preinit IDE hook */  #define	CONFIG_IDE_8xx_PCCARD	1	/* Use IDE with PC Card	Adapter	*/  #undef	CONFIG_IDE_8xx_DIRECT		/* Direct IDE    not supported	*/ diff --git a/include/configs/TQM860M.h b/include/configs/TQM860M.h index e8b77ea71..ed496a182 100644 --- a/include/configs/TQM860M.h +++ b/include/configs/TQM860M.h @@ -324,6 +324,7 @@   *-----------------------------------------------------------------------   */ +#define CONFIG_IDE_PREINIT	1	/* Use preinit IDE hook */  #define	CONFIG_IDE_8xx_PCCARD	1	/* Use IDE with PC Card	Adapter	*/  #undef	CONFIG_IDE_8xx_DIRECT		/* Direct IDE    not supported	*/ diff --git a/include/configs/TQM862L.h b/include/configs/TQM862L.h index 334b7ecc1..1559336ec 100644 --- a/include/configs/TQM862L.h +++ b/include/configs/TQM862L.h @@ -327,6 +327,7 @@   *-----------------------------------------------------------------------   */ +#define CONFIG_IDE_PREINIT	1	/* Use preinit IDE hook */  #define	CONFIG_IDE_8xx_PCCARD	1	/* Use IDE with PC Card	Adapter	*/  #undef	CONFIG_IDE_8xx_DIRECT		/* Direct IDE    not supported	*/ diff --git a/include/configs/TQM862M.h b/include/configs/TQM862M.h index 1e2ad40d9..61dcf627d 100644 --- a/include/configs/TQM862M.h +++ b/include/configs/TQM862M.h @@ -328,6 +328,7 @@   *-----------------------------------------------------------------------   */ +#define CONFIG_IDE_PREINIT	1	/* Use preinit IDE hook */  #define	CONFIG_IDE_8xx_PCCARD	1	/* Use IDE with PC Card	Adapter	*/  #undef	CONFIG_IDE_8xx_DIRECT		/* Direct IDE    not supported	*/ diff --git a/include/configs/TQM866M.h b/include/configs/TQM866M.h index a13c16aa5..7d0ae99cb 100644 --- a/include/configs/TQM866M.h +++ b/include/configs/TQM866M.h @@ -356,6 +356,7 @@   *-----------------------------------------------------------------------   */ +#define CONFIG_IDE_PREINIT	1	/* Use preinit IDE hook */  #define CONFIG_IDE_8xx_PCCARD	1	/* Use IDE with PC Card Adapter */  #undef	CONFIG_IDE_8xx_DIRECT		/* Direct IDE	 not supported	*/ diff --git a/include/configs/TQM885D.h b/include/configs/TQM885D.h index 7df76fbf0..7941631b5 100644 --- a/include/configs/TQM885D.h +++ b/include/configs/TQM885D.h @@ -341,6 +341,7 @@   *-----------------------------------------------------------------------   */ +#define CONFIG_IDE_PREINIT	1	/* Use preinit IDE hook */  #define CONFIG_IDE_8xx_PCCARD	1	/* Use IDE with PC Card Adapter */  #undef	CONFIG_IDE_8xx_DIRECT		/* Direct IDE	 not supported	*/ diff --git a/include/configs/atc.h b/include/configs/atc.h index 75f950b94..538a16752 100644 --- a/include/configs/atc.h +++ b/include/configs/atc.h @@ -482,6 +482,7 @@   *-----------------------------------------------------------------------   */ +#define CONFIG_IDE_PREINIT	1	/* Use preinit IDE hook */  #define CONFIG_IDE_8xx_PCCARD	1	/* Use IDE with PC Card Adapter */  #undef	CONFIG_IDE_8xx_DIRECT		/* Direct IDE	 not supported	*/ diff --git a/include/configs/c2mon.h b/include/configs/c2mon.h index 566c42b6b..41ff00847 100644 --- a/include/configs/c2mon.h +++ b/include/configs/c2mon.h @@ -302,6 +302,7 @@   *-----------------------------------------------------------------------   */ +#define CONFIG_IDE_PREINIT	1	/* Use preinit IDE hook */  #define	CONFIG_IDE_8xx_PCCARD	1	/* Use IDE with PC Card	Adapter	*/  #undef	CONFIG_IDE_8xx_DIRECT		/* Direct IDE    not supported	*/ diff --git a/include/configs/lwmon.h b/include/configs/lwmon.h index ab8605303..df4978161 100644 --- a/include/configs/lwmon.h +++ b/include/configs/lwmon.h @@ -494,6 +494,7 @@   *-----------------------------------------------------------------------   */ +#define CONFIG_IDE_PREINIT	1	/* Use preinit IDE hook */  #define CONFIG_IDE_8xx_PCCARD	1	/* Use IDE with PC Card Adapter */  #undef	CONFIG_IDE_8xx_DIRECT		/* Direct IDE	 not supported	*/ diff --git a/include/configs/quantum.h b/include/configs/quantum.h index 4f246510f..072bd9c7e 100644 --- a/include/configs/quantum.h +++ b/include/configs/quantum.h @@ -317,6 +317,7 @@   *-----------------------------------------------------------------------   */ +#define CONFIG_IDE_PREINIT	1	/* Use preinit IDE hook */  #define CONFIG_IDE_8xx_PCCARD	1	/* Use IDE with PC Card Adapter */  #undef	CONFIG_IDE_8xx_DIRECT		/* Direct IDE	 not supported	*/ diff --git a/include/configs/svm_sc8xx.h b/include/configs/svm_sc8xx.h index 91686d66a..2b24997f8 100644 --- a/include/configs/svm_sc8xx.h +++ b/include/configs/svm_sc8xx.h @@ -359,6 +359,8 @@  #undef	CONFIG_IDE_8xx_PCCARD		/* Use IDE with PC Card	Adapter	*/ +#define CONFIG_IDE_PREINIT	1	/* Use preinit IDE hook */ +#define CONFIG_IDE_INIT_POSTRESET	1	/* Use postreset IDE hook */  #define	CONFIG_IDE_8xx_DIRECT	1	/* Direct IDE    not supported	*/  #undef	CONFIG_IDE_LED			/* LED   for ide not supported	*/  #undef	CONFIG_IDE_RESET		/* reset for ide not supported	*/ diff --git a/include/configs/uc100.h b/include/configs/uc100.h index 8c8fb5ae6..450c98bd3 100644 --- a/include/configs/uc100.h +++ b/include/configs/uc100.h @@ -331,6 +331,7 @@   *-----------------------------------------------------------------------   */ +#define CONFIG_IDE_PREINIT	1	/* Use preinit IDE hook */  #define	CONFIG_IDE_8xx_PCCARD	1	/* Use IDE with PC Card	Adapter	*/  #undef	CONFIG_IDE_8xx_DIRECT		/* Direct IDE    not supported	*/ diff --git a/include/configs/virtlab2.h b/include/configs/virtlab2.h index 4bb96cc1a..c2c0d1d24 100644 --- a/include/configs/virtlab2.h +++ b/include/configs/virtlab2.h @@ -329,6 +329,7 @@   *-----------------------------------------------------------------------   */ +#define CONFIG_IDE_PREINIT	1	/* Use preinit IDE hook */  #define	CONFIG_IDE_8xx_PCCARD	1	/* Use IDE with PC Card	Adapter	*/  #undef	CONFIG_IDE_8xx_DIRECT		/* Direct IDE    not supported	*/ |