mucmc52, uc101: delete ata@3a00 node, if no CF card is detected
PATCH v6 2/2 mucmc52, uc101: delete ata@3a00 node, if no CF card is detected
U-Boot can detect if an IDE device is present or not. If not, and this new config option is activated, U-Boot removes the ATA node from the DTS before booting Linux, so the Linux IDE driver does not probe the device and crash. This is needed for buggy hardware (uc101) where no pull down resistor is connected to the signal IDE5V_DD7.
---
changes since v1:
- added comment from Wolfgang Denk, to move this to a more common place, so others can also use it, and made it therefore per CONFIG_OF_IDE_FIXUP selectable.
changes since v2:
- add CONFIG_OF_IDE_FIXUP to mpc5200-common.h
changes since v3:
- correct spelling in README and commit message, as Detlev Zundel suggested
changes since v4:
- added comments from Stefan Roese
Coding Style corrections
do not longer include the global variable, instead call ide_device_present()
- added comment from Jerry Van Baren
correct README entry
changes since v5:
delete ata node if !ide_device_present() instead of ide_device_present()
README | 9 +++++++++ common/cmd_ide.c | 8 ++++++++ cpu/mpc5xxx/cpu.c | 20 ++++++++++++++++++++ include/configs/manroland/mpc5200-common.h | 1 + include/ide.h | 3 +++ 5 files changed, 41 insertions(+), 0 deletions(-)
README +9 -0
@@ -386,6 +386,15 @@ The following options need to be configured: This define fills in the correct boot CPU in the boot param header, the default value is zero if undefined. + CONFIG_OF_IDE_FIXUP + + U-Boot can detect if an IDE device is present or not. + If not, and this new config option is activated, U-Boot + removes the ATA node from the DTS before booting Linux, + so the Linux IDE driver does not probe the device and + crash. This is needed for buggy hardware (uc101) where + no pull down resistor is connected to the signal IDE5V_DD7. + - vxWorks boot parameters: bootvx constructs a valid bootline using the following
common/cmd_ide.c +8 -0
@@ -1624,6 +1624,14 @@ static void ide_led (uchar led, uchar status)#endif /* CONFIG_IDE_LED */ +#if defined(CONFIG_OF_IDE_FIXUP ) +int ide_device_present (int dev) +{ +if (dev >=CONFIG_SYS_IDE_MAXBUS ) +return 0 ; +return (ide_dev_desc[dev].type ==DEV_TYPE_UNKNOWN ?0 :1 ); +} +#endif /* ------------------------------------------------------------------------- */ #ifdef CONFIG_ATAPI
cpu/mpc5xxx/cpu.c +20 -0
@@ -40,6 +40,10 @@#include <fdt_support.h> #endif +#if defined(CONFIG_OF_IDE_FIXUP ) +#include <ide.h> +#endif +DECLARE_GLOBAL_DATA_PTR ;int checkcpu (void )
@@ -137,6 +141,22 @@ void ft_cpu_setup(void *blob, bd_t *bd)do_fixup_by_path (blob, eth_path,"mac-address" , enetaddr,6 ,0 );do_fixup_by_path (blob, eth_path,"local-mac-address" , enetaddr,6 ,0 );#endif +#if defined(CONFIG_OF_IDE_FIXUP ) +if (!ide_device_present (0 )) { +/* NO CF card detected -> delete ata node in DTS */ +int nodeoffset =0 ; +char nodename[] ="/soc5200 at f0000000/ata at 3a00" ; + + nodeoffset =fdt_path_offset (blob, nodename); +if (nodeoffset >=0 ) { +fdt_del_node (blob, nodeoffset); + }else { +printf ("%s: cannot find %s node err:%s\n" , + __func__, nodename,fdt_strerror (nodeoffset)); + } + } + +#endif }#endif
include/configs/manroland/mpc5200-common.h +1 -0
@@ -225,5 +225,6 @@#define OF_SOC "soc5200 at f0000000"#define OF_TBCLK (bd->bi_busfreq / 4)#define OF_STDOUT_PATH "/soc5200 at f0000000/serial at 2000" +#define CONFIG_OF_IDE_FIXUP #endif /* __MANROLAND_MPC52XX__COMMON_H */
include/ide.h +3 -0
@@ -54,4 +54,7 @@ void ide_init(void);ulong ide_read (int device,lbaint_t blknr,ulong blkcnt,void *buffer);ulong ide_write (int device,lbaint_t blknr,ulong blkcnt,void *buffer); +#if defined(CONFIG_OF_IDE_FIXUP ) +int ide_device_present (int dev); +#endif #endif /* _IDE_H */
Signature · 5 lines
1.6.0.6 -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Wolfgang Denk
AppliedPATCH v6 2/2 mucmc52, uc101: delete ata@3a00 node, if no CF card is detected
Dear Heiko Schocher,
Quoted 34 lines · In message <[email protected]> you wrote:
U-Boot can detect if an IDE device is present or not. If not, and this new config option is activated, U-Boot removes the ATA node from the DTS before booting Linux, so the Linux IDE driver does not probe the device and crash. This is needed for buggy hardware (uc101) where no pull down resistor is connected to the signal
IDE5V_DD7.Signed-off-by Heiko Schocher <[email protected]>---
changes since v1:
- added comment from Wolfgang Denk, to move this to a more common place, so others can also use it, and made it therefore perCONFIG_OF_IDE_FIXUPselectable.changes since v2:
- addCONFIG_OF_IDE_FIXUPtompc5200-common.hchanges since v3:
- correct spelling in README and commit message, as Detlev Zundel suggestedchanges since v4:
- added comments from Stefan Roese
Coding Style corrections
do not longer include the global variable, instead callide_device_present()
- added comment from Jerry Van Baren
correct README entrychanges since v5:
delete ata node if !ide_device_present() instead ofide_device_present()
Quoted 6 lines
README | 9 +++++++++ common/cmd_ide.c | 8 ++++++++ cpu/mpc5xxx/cpu.c | 20 ++++++++++++++++++++ include/configs/manroland/mpc5200-common.h | 1 + include/ide.h | 3 +++ 5 files changed, 41 insertions(+), 0 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
Signature · 4 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de Computers are not intelligent. They only think they are.