summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorwdenk <wdenk>2005-01-10 00:01:04 +0000
committerwdenk <wdenk>2005-01-10 00:01:04 +0000
commit082acfd4849d2f0471b0709fe7f5ce1de387437d (patch)
tree788768a43fb5160db87797eb1fe44127b81bfa25 /include
parent652a10c0965bcbc64dc88fc54e34bedf1612e66b (diff)
downloadu-boot-imx-082acfd4849d2f0471b0709fe7f5ce1de387437d.zip
u-boot-imx-082acfd4849d2f0471b0709fe7f5ce1de387437d.tar.gz
u-boot-imx-082acfd4849d2f0471b0709fe7f5ce1de387437d.tar.bz2
Coding Style cleanup
Diffstat (limited to 'include')
-rw-r--r--include/asm-arm/arch-arm1136/bits.h1
-rw-r--r--include/asm-arm/arch-arm1136/clocks.h1
-rw-r--r--include/asm-arm/arch-arm1136/omap2420.h1
-rw-r--r--include/asm-arm/arch-arm1136/rev.h1
-rw-r--r--include/asm-arm/arch-arm1136/sizes.h1
-rw-r--r--include/asm-arm/arch-arm1136/sys_info.h1
-rw-r--r--include/asm-arm/arch-arm1136/sys_proto.h1
-rw-r--r--include/configs/RPXlite_DW.h4
-rw-r--r--include/configs/omap2420h4.h12
9 files changed, 8 insertions, 15 deletions
diff --git a/include/asm-arm/arch-arm1136/bits.h b/include/asm-arm/arch-arm1136/bits.h
index dc3273e..8522335 100644
--- a/include/asm-arm/arch-arm1136/bits.h
+++ b/include/asm-arm/arch-arm1136/bits.h
@@ -46,4 +46,3 @@
#define BIT31 (1<<31)
#endif
-
diff --git a/include/asm-arm/arch-arm1136/clocks.h b/include/asm-arm/arch-arm1136/clocks.h
index d94fdcf..9a88e85 100644
--- a/include/asm-arm/arch-arm1136/clocks.h
+++ b/include/asm-arm/arch-arm1136/clocks.h
@@ -76,4 +76,3 @@
#define LDELAY 12000000
#endif
-
diff --git a/include/asm-arm/arch-arm1136/omap2420.h b/include/asm-arm/arch-arm1136/omap2420.h
index ae2549b..357ad14 100644
--- a/include/asm-arm/arch-arm1136/omap2420.h
+++ b/include/asm-arm/arch-arm1136/omap2420.h
@@ -197,4 +197,3 @@
#endif /* endif CONFIG_2420H4 */
#endif
-
diff --git a/include/asm-arm/arch-arm1136/rev.h b/include/asm-arm/arch-arm1136/rev.h
index 0dba25f..6fceb09 100644
--- a/include/asm-arm/arch-arm1136/rev.h
+++ b/include/asm-arm/arch-arm1136/rev.h
@@ -56,4 +56,3 @@ typedef struct h4_system_data {
#define CPU_2420_ES2 2
#endif
-
diff --git a/include/asm-arm/arch-arm1136/sizes.h b/include/asm-arm/arch-arm1136/sizes.h
index 3dddd8e..aaba18f 100644
--- a/include/asm-arm/arch-arm1136/sizes.h
+++ b/include/asm-arm/arch-arm1136/sizes.h
@@ -47,4 +47,3 @@
#define SZ_2G 0x80000000
#endif /* __sizes_h */
-
diff --git a/include/asm-arm/arch-arm1136/sys_info.h b/include/asm-arm/arch-arm1136/sys_info.h
index 3f77d3b..fe68ccc 100644
--- a/include/asm-arm/arch-arm1136/sys_info.h
+++ b/include/asm-arm/arch-arm1136/sys_info.h
@@ -75,4 +75,3 @@ typedef struct h4_system_data {
#define I2C_MENELAUS 0x72 /* i2c id for companion chip */
#endif
-
diff --git a/include/asm-arm/arch-arm1136/sys_proto.h b/include/asm-arm/arch-arm1136/sys_proto.h
index 67206f6..4a7612f 100644
--- a/include/asm-arm/arch-arm1136/sys_proto.h
+++ b/include/asm-arm/arch-arm1136/sys_proto.h
@@ -45,4 +45,3 @@ u32 get_board_type(void);
void display_board_info(u32);
void update_mux(u32,u32);
#endif
-
diff --git a/include/configs/RPXlite_DW.h b/include/configs/RPXlite_DW.h
index 6f23931..5ff5c85 100644
--- a/include/configs/RPXlite_DW.h
+++ b/include/configs/RPXlite_DW.h
@@ -108,7 +108,7 @@
"lcd=setenv stdout lcd;setenv stdin lcd\0" \
"ser=setenv stdout serial;setenv stdin serial\0" \
"verify=no"
-
+
=======
"kernel_addr=ff080000\0" \
"ramdisk_addr=ff200000\0" \
@@ -209,7 +209,7 @@
<<<<<<< RPXlite_DW.h
#define CFG_RESET_ADDRESS ((ulong)((((immap_t *)CFG_IMMR)->im_clkrst.res)))
-
+
=======
#define CFG_RESET_ADDRESS ((ulong)((((immap_t *)CFG_IMMR)->im_clkrst.res)))
diff --git a/include/configs/omap2420h4.h b/include/configs/omap2420h4.h
index b933c24..da68c1c 100644
--- a/include/configs/omap2420h4.h
+++ b/include/configs/omap2420h4.h
@@ -35,10 +35,10 @@
#define CONFIG_OMAP 1 /* in a TI OMAP core */
#define CONFIG_OMAP2420 1 /* which is in a 2420 */
#define CONFIG_OMAP2420H4 1 /* and on a H4 board */
-//#define CONFIG_APTIX 1 /* define if on APTIX test chip */
-//#define CONFIG_VIRTIO 1 /* Using Virtio simulator */
+/*#define CONFIG_APTIX 1 #* define if on APTIX test chip */
+/*#define CONFIG_VIRTIO 1 #* Using Virtio simulator */
-#define PRCM_CONFIG_II 1
+#define PRCM_CONFIG_II 1
#define CONFIG_PARTIAL_SRAM 1
#include <asm/arch/omap2420.h> /* get chip and board defs */
@@ -70,7 +70,7 @@
/*
* Hardware drivers
*/
-
+
/*
* SMC91c96 Etherent
*/
@@ -114,8 +114,8 @@
#define CONFIG_COMMANDS (CONFIG_CMD_DFL | CFG_CMD_DHCP | CFG_CMD_I2C)
-// I'd like to get to these. Snap kernel loads if we make MMC go //
- // #define CONFIG_COMMANDS (CONFIG_CMD_DFL | CFG_CMD_NAND | CFG_CMD_JFFS2 | CFG_CMD_DHCP | CFG_CMD_MMC | CFG_CMD_FAT | CFG_CMD_I2C)
+/* I'd like to get to these. Snap kernel loads if we make MMC go */
+ /* #define CONFIG_COMMANDS (CONFIG_CMD_DFL | CFG_CMD_NAND | CFG_CMD_JFFS2 | CFG_CMD_DHCP | CFG_CMD_MMC | CFG_CMD_FAT | CFG_CMD_I2C) */
#define CONFIG_BOOTP_MASK CONFIG_BOOTP_DEFAULT