diff options
| -rw-r--r-- | arch/arm/cpu/armv7/start.S | 2 | ||||
| -rw-r--r-- | arch/arm/lib/memcpy.S | 1 | ||||
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/speed.c | 2 | ||||
| -rw-r--r-- | arch/x86/cpu/sc520/sc520.c | 1 | ||||
| -rw-r--r-- | board/freescale/common/sdhc_boot.c | 1 | ||||
| -rw-r--r-- | board/ti/beagle/led.c | 1 | ||||
| -rw-r--r-- | common/cmd_led.c | 2 | ||||
| -rw-r--r-- | doc/README.arm-relocation | 4 | ||||
| -rw-r--r-- | doc/README.p1022ds | 1 | ||||
| -rw-r--r-- | drivers/misc/fsl_law.c | 4 | ||||
| -rw-r--r-- | drivers/mmc/mmc.c | 8 | ||||
| -rw-r--r-- | drivers/net/phy/generic_10g.c | 1 | ||||
| -rw-r--r-- | drivers/net/tsec.c | 1 | ||||
| -rw-r--r-- | include/configs/P3041DS.h | 1 | ||||
| -rw-r--r-- | include/configs/P5020DS.h | 1 | ||||
| -rw-r--r-- | include/fsl_mdio.h | 1 |
16 files changed, 11 insertions, 21 deletions
diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S index 2929fc7e3..d91ae12cb 100644 --- a/arch/arm/cpu/armv7/start.S +++ b/arch/arm/cpu/armv7/start.S @@ -79,7 +79,7 @@ _TEXT_BASE: */ .globl _armboot_start _armboot_start: - .word _start + .word _start #endif /* diff --git a/arch/arm/lib/memcpy.S b/arch/arm/lib/memcpy.S index 40db90e5f..3b5aeec4c 100644 --- a/arch/arm/lib/memcpy.S +++ b/arch/arm/lib/memcpy.S @@ -238,4 +238,3 @@ memcpy: 17: forward_copy_shift pull=16 push=16 18: forward_copy_shift pull=24 push=8 - diff --git a/arch/powerpc/cpu/mpc85xx/speed.c b/arch/powerpc/cpu/mpc85xx/speed.c index c4c156d73..a83dfeb84 100644 --- a/arch/powerpc/cpu/mpc85xx/speed.c +++ b/arch/powerpc/cpu/mpc85xx/speed.c @@ -112,7 +112,7 @@ void get_sys_info (sys_info_t * sysInfo) #if (CONFIG_SYS_FSL_NUM_CC_PLLS == 2) #define HWA_CC_PLL 1 #elif (CONFIG_SYS_FSL_NUM_CC_PLLS == 4) -#define HWA_CC_PLL 2 +#define HWA_CC_PLL 2 #else #error CONFIG_SYS_FSL_NUM_CC_PLLS not set or unknown case #endif diff --git a/arch/x86/cpu/sc520/sc520.c b/arch/x86/cpu/sc520/sc520.c index 8c410a233..726a32535 100644 --- a/arch/x86/cpu/sc520/sc520.c +++ b/arch/x86/cpu/sc520/sc520.c @@ -64,4 +64,3 @@ int cpu_init_r(void) return x86_cpu_init_r(); } - diff --git a/board/freescale/common/sdhc_boot.c b/board/freescale/common/sdhc_boot.c index 964c6b830..e4323181f 100644 --- a/board/freescale/common/sdhc_boot.c +++ b/board/freescale/common/sdhc_boot.c @@ -61,4 +61,3 @@ int mmc_get_env_addr(struct mmc *mmc, u32 *env_addr) return 0; } - diff --git a/board/ti/beagle/led.c b/board/ti/beagle/led.c index df2655298..08f95a0a1 100644 --- a/board/ti/beagle/led.c +++ b/board/ti/beagle/led.c @@ -88,4 +88,3 @@ void __led_set (led_id_t mask, int state) } #endif } - diff --git a/common/cmd_led.c b/common/cmd_led.c index f1e8a62cb..c53195f1a 100644 --- a/common/cmd_led.c +++ b/common/cmd_led.c @@ -96,7 +96,7 @@ int do_led (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) } for (i = 0; led_commands[i].string; i++) { - if ((strcmp("all", argv[1]) == 0) || + if ((strcmp("all", argv[1]) == 0) || (strcmp(led_commands[i].string, argv[1]) == 0)) { if (led_commands[i].on) { if (state) { diff --git a/doc/README.arm-relocation b/doc/README.arm-relocation index 45f5ea714..5a9a2fb07 100644 --- a/doc/README.arm-relocation +++ b/doc/README.arm-relocation @@ -177,9 +177,9 @@ ip_addr = XXXXXXXXXX baudrate = XXXXXXXXXX TLB addr = XXXXXXXXXX relocaddr = 0x8ff08000 - ^^^^^^^^^^ + ^^^^^^^^^^ reloc off = XXXXXXXXXX -irq_sp = XXXXXXXXXX +irq_sp = XXXXXXXXXX sp start = XXXXXXXXXX FB base = XXXXXXXXXX diff --git a/doc/README.p1022ds b/doc/README.p1022ds index 473ecf621..04d919707 100644 --- a/doc/README.p1022ds +++ b/doc/README.p1022ds @@ -21,4 +21,3 @@ and AUDIO codec clock sources only setting as 11MHz or 12MHz ! 'setenv hwconfig 'audclk:12;tdm' --- error ! 'setenv hwconfig 'audclk:11;tdm' --- error ! 'setenv hwconfig 'audclk:10' --- error ! - diff --git a/drivers/misc/fsl_law.c b/drivers/misc/fsl_law.c index 3233ff2e4..a7d04b7ea 100644 --- a/drivers/misc/fsl_law.c +++ b/drivers/misc/fsl_law.c @@ -247,13 +247,13 @@ void init_laws(void) #error FSL_HW_NUM_LAWS can not be greater than 32 w/o code changes #endif - /* + /* * Any LAWs that were set up before we booted assume they are meant to * be around and mark them used. */ for (i = 0; i < FSL_HW_NUM_LAWS; i++) { u32 lawar = in_be32(LAWAR_ADDR(i)); - + if (lawar & LAW_EN) gd->used_laws |= (1 << i); } diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 1d089a7d1..21aedbaa3 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -434,14 +434,14 @@ int mmc_send_op_cond(struct mmc *mmc) cmd.resp_type = MMC_RSP_R3; cmd.cmdarg = 0; cmd.flags = 0; - + err = mmc_send_cmd(mmc, &cmd, NULL); - + if (err) return err; - + udelay(1000); - + do { cmd.cmdidx = MMC_CMD_SEND_OP_COND; cmd.resp_type = MMC_RSP_R3; diff --git a/drivers/net/phy/generic_10g.c b/drivers/net/phy/generic_10g.c index 315c50867..60dec457b 100644 --- a/drivers/net/phy/generic_10g.c +++ b/drivers/net/phy/generic_10g.c @@ -102,4 +102,3 @@ struct phy_driver gen10g_driver = { .startup = gen10g_startup, .shutdown = gen10g_shutdown, }; - diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c index 06e5834a9..78ffc95c5 100644 --- a/drivers/net/tsec.c +++ b/drivers/net/tsec.c @@ -593,4 +593,3 @@ int tsec_standard_init(bd_t *bis) return tsec_eth_init(bis, tsec_info, ARRAY_SIZE(tsec_info)); } - diff --git a/include/configs/P3041DS.h b/include/configs/P3041DS.h index 46f91ccfc..d9e8f5193 100644 --- a/include/configs/P3041DS.h +++ b/include/configs/P3041DS.h @@ -34,4 +34,3 @@ #define CONFIG_ICS307_REFCLK_HZ 25000000 /* ICS307 ref clk freq */ #include "corenet_ds.h" - diff --git a/include/configs/P5020DS.h b/include/configs/P5020DS.h index 6d279b393..dd8d442e3 100644 --- a/include/configs/P5020DS.h +++ b/include/configs/P5020DS.h @@ -34,4 +34,3 @@ #define CONFIG_ICS307_REFCLK_HZ 25000000 /* ICS307 ref clk freq */ #include "corenet_ds.h" - diff --git a/include/fsl_mdio.h b/include/fsl_mdio.h index 17ca79c90..ea8b54b56 100644 --- a/include/fsl_mdio.h +++ b/include/fsl_mdio.h @@ -59,4 +59,3 @@ struct fsl_pq_mdio_info { int fsl_pq_mdio_init(bd_t *bis, struct fsl_pq_mdio_info *info); #endif /* __FSL_PHY_H__ */ - |