From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heiko Schocher Date: Mon, 14 Sep 2009 17:36:59 +0200 Subject: [U-Boot] [PATCH v4 2/2] mucmc52, uc101: delete ata@3a00 node, if no CF card is detected In-Reply-To: <200909141708.12055.sr@denx.de> References: <4AA755D4.1020207@denx.de> <4AAE5C06.9070000@denx.de> <200909141708.12055.sr@denx.de> Message-ID: <4AAE631B.8010401@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hello Stefan, Stefan Roese wrote: > Hi Heiko, > > and another nitpicking comment below: > > On Monday 14 September 2009 17:06:46 Heiko Schocher wrote: > > > >> diff --git a/cpu/mpc5xxx/cpu.c b/cpu/mpc5xxx/cpu.c >> index f6258c7..a2fc323 100644 >> --- a/cpu/mpc5xxx/cpu.c >> +++ b/cpu/mpc5xxx/cpu.c >> @@ -125,6 +125,9 @@ void ft_cpu_setup(void *blob, bd_t *bd) >> uchar enetaddr[6]; >> char * eth_path = "/" OF_SOC "/ethernet at 3000"; >> #endif >> +#if defined(CONFIG_OF_IDE_FIXUP) >> + extern block_dev_desc_t ide_dev_desc[CONFIG_SYS_IDE_MAXDEVICE]; >> +#endif >> >> do_fixup_by_path_u32(blob, cpu_path, "timebase-frequency", OF_TBCLK, 1); >> do_fixup_by_path_u32(blob, cpu_path, "bus-frequency", bd->bi_busfreq, 1); >> @@ -137,6 +140,21 @@ 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_dev_desc[0].type == DEV_TYPE_UNKNOWN) { >> + /* 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); > > Please use consistent styles in one file, in this case func() without a space > before the "(". Fixed, thanks. bye Heiko -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany