From: Ralph Kondziella rk@argos-messtechnik.de
Fix compiler warnings, sort lists, update (C) entries.
Signed-off-by: Ralph Kondziella rk@argos-messtechnik.de Signed-off-by: Wolfgang Denk wd@denx.de --- board/ads5121/ads5121.c | 34 +++++++++++++++++----------------- common/cmd_ide.c | 2 +- cpu/mpc512x/speed.c | 2 +- include/asm-ppc/global_data.h | 2 +- include/asm-ppc/immap_512x.h | 2 +- include/configs/ads5121.h | 12 ++++++------ 6 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/board/ads5121/ads5121.c b/board/ads5121/ads5121.c index 1e19f32..8bf862d 100644 --- a/board/ads5121/ads5121.c +++ b/board/ads5121/ads5121.c @@ -1,5 +1,5 @@ /* - * (C) Copyright 2007 DENX Software Engineering + * (C) Copyright 2007-2008 DENX Software Engineering * * See file CREDITS for list of people who contributed to this * project. @@ -34,20 +34,20 @@ DECLARE_GLOBAL_DATA_PTR;
/* Clocks in use */ -#define SCCR1_CLOCKS_EN (CLOCK_SCCR1_CFG_EN | \ - CLOCK_SCCR1_LPC_EN | \ - CLOCK_SCCR1_PSC_EN(CONFIG_PSC_CONSOLE) | \ - CLOCK_SCCR1_PSCFIFO_EN | \ - CLOCK_SCCR1_DDR_EN | \ - CLOCK_SCCR1_FEC_EN | \ - CLOCK_SCCR1_PATA_EN | \ - CLOCK_SCCR1_PCI_EN | \ - CLOCK_SCCR1_TPR_EN) - -#define SCCR2_CLOCKS_EN (CLOCK_SCCR2_MEM_EN | \ - CLOCK_SCCR2_SPDIF_EN | \ - CLOCK_SCCR2_DIU_EN | \ - CLOCK_SCCR2_I2C_EN) +#define SCCR1_CLOCKS_EN (CLOCK_SCCR1_CFG_EN | \ + CLOCK_SCCR1_DDR_EN | \ + CLOCK_SCCR1_FEC_EN | \ + CLOCK_SCCR1_LPC_EN | \ + CLOCK_SCCR1_PATA_EN | \ + CLOCK_SCCR1_PCI_EN | \ + CLOCK_SCCR1_PSCFIFO_EN | \ + CLOCK_SCCR1_PSC_EN(CONFIG_PSC_CONSOLE) | \ + CLOCK_SCCR1_TPR_EN ) + +#define SCCR2_CLOCKS_EN (CLOCK_SCCR2_DIU_EN | \ + CLOCK_SCCR2_I2C_EN | \ + CLOCK_SCCR2_MEM_EN | \ + CLOCK_SCCR2_SPDIF_EN )
#define CSAW_START(start) ((start) & 0xFFFF0000) #define CSAW_STOP(start, size) (((start) + (size) - 1) >> 16) @@ -225,14 +225,14 @@ int misc_init_r(void) /* Verify if enabled */ tmp_val = 0; i2c_read(0x38, 0x08, 1, &tmp_val, sizeof(tmp_val)); - debug("DVI Encoder Read: 0x%02lx\n", tmp_val); + debug("DVI Encoder Read: 0x%02x\n", tmp_val);
tmp_val = 0x10; i2c_write(0x38, 0x0A, 1, &tmp_val, sizeof(tmp_val)); /* Verify if enabled */ tmp_val = 0; i2c_read(0x38, 0x0A, 1, &tmp_val, sizeof(tmp_val)); - debug("DVI Encoder Read: 0x%02lx\n", tmp_val); + debug("DVI Encoder Read: 0x%02x\n", tmp_val);
#ifdef CONFIG_FSL_DIU_FB #if !(defined(CONFIG_VIDEO) || defined(CONFIG_CFB_CONSOLE)) diff --git a/common/cmd_ide.c b/common/cmd_ide.c index 0eb5366..bf8f7f9 100644 --- a/common/cmd_ide.c +++ b/common/cmd_ide.c @@ -1,5 +1,5 @@ /* - * (C) Copyright 2000-2005 + * (C) Copyright 2000-2008 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * See file CREDITS for list of people who contributed to this diff --git a/cpu/mpc512x/speed.c b/cpu/mpc512x/speed.c index 24ec062..d6b7001 100644 --- a/cpu/mpc512x/speed.c +++ b/cpu/mpc512x/speed.c @@ -1,5 +1,5 @@ /* - * (C) Copyright 2000-2007 + * (C) Copyright 2000-2008 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * Copyright (C) 2004-2006 Freescale Semiconductor, Inc. diff --git a/include/asm-ppc/global_data.h b/include/asm-ppc/global_data.h index d1d075f..c7346b9 100644 --- a/include/asm-ppc/global_data.h +++ b/include/asm-ppc/global_data.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2002 + * (C) Copyright 2002-2008 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * See file CREDITS for list of people who contributed to this diff --git a/include/asm-ppc/immap_512x.h b/include/asm-ppc/immap_512x.h index 489dbe4..d63ef6d 100644 --- a/include/asm-ppc/immap_512x.h +++ b/include/asm-ppc/immap_512x.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2007 DENX Software Engineering + * (C) Copyright 2007-2008 DENX Software Engineering * * MPC512x Internal Memory Map * diff --git a/include/configs/ads5121.h b/include/configs/ads5121.h index d9fe795..c200335 100644 --- a/include/configs/ads5121.h +++ b/include/configs/ads5121.h @@ -340,16 +340,16 @@ #include <config_cmd_default.h>
#define CONFIG_CMD_ASKENV +#define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP +#define CONFIG_CMD_EEPROM +#define CONFIG_CMD_EXT2 #define CONFIG_CMD_I2C +#define CONFIG_CMD_IDE #define CONFIG_CMD_MII #define CONFIG_CMD_NFS #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO -#define CONFIG_CMD_EEPROM -#define CONFIG_CMD_DATE -#define CONFIG_CMD_IDE -#define CONFIG_CMD_EXT2
#if defined(CONFIG_PCI) #define CONFIG_CMD_PCI @@ -378,9 +378,9 @@ #define CFG_PROMPT "=> " /* Monitor Command Prompt */
#ifdef CONFIG_CMD_KGDB - #define CFG_CBSIZE 1024 /* Console I/O Buffer Size */ +# define CFG_CBSIZE 1024 /* Console I/O Buffer Size */ #else - #define CFG_CBSIZE 256 /* Console I/O Buffer Size */ +# define CFG_CBSIZE 256 /* Console I/O Buffer Size */ #endif