cm-t35: cleanup the config file

Remove values from boolean defines, fix indentation, etc.. No functional changes. Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il> Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>

cm-t35: cleanup the config file
Remove values from boolean defines, fix indentation, etc.. No functional changes. Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il> Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Nikita Kiryanov · Albert ARIBAUD
1 parent fe7104b307
Showing 1 changed file with 39 additions and 39 deletions Side-by-side Diff
include/configs/cm_t35.h
 /*
- * (C) Copyright 2011
- * CompuLab, Ltd.
+ * (C) Copyright 2011 CompuLab, Ltd.
  * Mike Rapoport <mike@compulab.co.il>
  * Igor Grinberg <grinberg@compulab.co.il>
  *
@@ -36,9 +35,9 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_OMAP		1	/* in a TI OMAP core */
-#define CONFIG_OMAP34XX		1	/* which is a 34XX */
-#define CONFIG_CM_T3X		1	/* working with CM-T35 and CM-T3730 */
+#define CONFIG_OMAP	/* in a TI OMAP core */
+#define CONFIG_OMAP34XX	/* which is a 34XX */
+#define CONFIG_CM_T3X	/* working with CM-T35 and CM-T3730 */
  
 #define CONFIG_SYS_TEXT_BASE	0x80008000
  
@@ -50,8 +49,8 @@
 /*
  * Display CPU and Board information
  */
-#define CONFIG_DISPLAY_CPUINFO		1
-#define CONFIG_DISPLAY_BOARDINFO	1
+#define CONFIG_DISPLAY_CPUINFO
+#define CONFIG_DISPLAY_BOARDINFO
  
 /* Clock Defines */
 #define V_OSCK			26000000	/* Clock output from T2 */
  
@@ -69,17 +68,17 @@
  */
 #define CONFIG_SYS_BOOTMAPSZ	        0x4000
  
-#define CONFIG_CMDLINE_TAG		1	/* enable passing of ATAGs */
-#define CONFIG_SETUP_MEMORY_TAGS	1
-#define CONFIG_INITRD_TAG		1
-#define CONFIG_REVISION_TAG		1
+#define CONFIG_CMDLINE_TAG		/* enable passing of ATAGs */
+#define CONFIG_SETUP_MEMORY_TAGS
+#define CONFIG_INITRD_TAG
+#define CONFIG_REVISION_TAG
  
 /*
  * Size of malloc() pool
  */
-#define CONFIG_ENV_SIZE			(128 << 10)	/* 128 KiB */
-						/* Sector */
-#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + (128 << 10))
+#define CONFIG_ENV_SIZE		(128 << 10)	/* 128 KiB */
+					/* Sector */
+#define CONFIG_SYS_MALLOC_LEN	(CONFIG_ENV_SIZE + (128 << 10))
  
 /*
  * Hardware drivers
  
  
  
@@ -107,20 +106,21 @@
 #define CONFIG_BAUDRATE			115200
 #define CONFIG_SYS_BAUDRATE_TABLE	{4800, 9600, 19200, 38400, 57600,\
 					115200}
-#define CONFIG_GENERIC_MMC		1
-#define CONFIG_MMC			1
-#define CONFIG_OMAP_HSMMC		1
-#define CONFIG_DOS_PARTITION		1
  
+#define CONFIG_GENERIC_MMC
+#define CONFIG_MMC
+#define CONFIG_OMAP_HSMMC
+#define CONFIG_DOS_PARTITION
+
 /* USB */
-#define CONFIG_MUSB_UDC			1
-#define CONFIG_USB_OMAP3		1
-#define CONFIG_TWL4030_USB		1
+#define CONFIG_MUSB_UDC
+#define CONFIG_USB_OMAP3
+#define CONFIG_TWL4030_USB
  
 /* USB device configuration */
-#define CONFIG_USB_DEVICE		1
-#define CONFIG_USB_TTY			1
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV	1
+#define CONFIG_USB_DEVICE
+#define CONFIG_USB_TTY
+#define CONFIG_SYS_CONSOLE_IS_IN_ENV
  
 /* commands to include */
 #include <config_cmd_default.h>
@@ -131,10 +131,10 @@
 #define CONFIG_CMD_JFFS2	/* JFFS2 Support		*/
 #define CONFIG_CMD_MTDPARTS	/* Enable MTD parts commands */
 #define CONFIG_MTD_DEVICE	/* needed for mtdparts commands */
-#define MTDIDS_DEFAULT			"nand0=nand"
-#define MTDPARTS_DEFAULT		"mtdparts=nand:512k(x-loader),"\
-					"1920k(u-boot),128k(u-boot-env),"\
-					"4m(kernel),-(fs)"
+#define MTDIDS_DEFAULT		"nand0=nand"
+#define MTDPARTS_DEFAULT	"mtdparts=nand:512k(x-loader),"\
+				"1920k(u-boot),128k(u-boot-env),"\
+				"4m(kernel),-(fs)"
  
 #define CONFIG_CMD_I2C		/* I2C serial bus support	*/
 #define CONFIG_CMD_MMC		/* MMC support			*/
  
  
  
  
@@ -147,30 +147,30 @@
 #undef CONFIG_CMD_IMLS		/* List all found images	*/
  
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_HARD_I2C			1
+#define CONFIG_HARD_I2C
 #define CONFIG_SYS_I2C_SPEED		100000
 #define CONFIG_SYS_I2C_SLAVE		1
 #define CONFIG_SYS_I2C_BUS		0
 #define CONFIG_SYS_I2C_BUS_SELECT	1
-#define CONFIG_DRIVER_OMAP34XX_I2C	1
+#define CONFIG_DRIVER_OMAP34XX_I2C
  
 /*
  * TWL4030
  */
-#define CONFIG_TWL4030_POWER		1
-#define CONFIG_TWL4030_LED		1
+#define CONFIG_TWL4030_POWER
+#define CONFIG_TWL4030_LED
  
 /*
  * Board NAND Info.
  */
-#define CONFIG_SYS_NAND_QUIET_TEST	1
+#define CONFIG_SYS_NAND_QUIET_TEST
 #define CONFIG_NAND_OMAP_GPMC
 #define CONFIG_SYS_NAND_ADDR		NAND_BASE	/* physical address */
 							/* to access nand */
 #define CONFIG_SYS_NAND_BASE		NAND_BASE	/* physical address */
 							/* to access nand at */
 							/* CS0 */
-#define GPMC_NAND_ECC_LP_x16_LAYOUT	1
+#define GPMC_NAND_ECC_LP_x16_LAYOUT
  
 #define CONFIG_SYS_MAX_NAND_DEVICE	1		/* Max number of NAND */
 							/* devices */
@@ -244,7 +244,7 @@
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_TIMESTAMP
-#define CONFIG_SYS_AUTOLOAD     "no"
+#define CONFIG_SYS_AUTOLOAD		"no"
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 #define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser */
 #define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
@@ -308,7 +308,7 @@
 #define CONFIG_SYS_MONITOR_BASE		CONFIG_SYS_FLASH_BASE
 #define CONFIG_SYS_ONENAND_BASE		ONENAND_MAP
  
-#define CONFIG_ENV_IS_IN_NAND		1
+#define CONFIG_ENV_IS_IN_NAND
 #define ONENAND_ENV_OFFSET		0x260000 /* environment starts here */
 #define SMNAND_ENV_OFFSET		0x260000 /* environment starts here */
  
@@ -333,8 +333,8 @@
 					 GENERATED_GBL_DATA_SIZE)
  
 /* Status LED */
-#define CONFIG_STATUS_LED		1 /* Status LED enabled */
-#define CONFIG_BOARD_SPECIFIC_LED	1
+#define CONFIG_STATUS_LED		/* Status LED enabled */
+#define CONFIG_BOARD_SPECIFIC_LED
 #define STATUS_LED_GREEN		0
 #define STATUS_LED_BIT			STATUS_LED_GREEN
 #define STATUS_LED_STATE		STATUS_LED_ON
@@ -344,7 +344,7 @@
  
 /* GPIO banks */
 #ifdef CONFIG_STATUS_LED
-#define CONFIG_OMAP3_GPIO_6		1 /* GPIO186 is in GPIO bank 6  */
+#define CONFIG_OMAP3_GPIO_6	/* GPIO186 is in GPIO bank 6  */
 #endif
  
 #endif /* __CONFIG_H */
1	1	/*
2		- * (C) Copyright 2011
3		- * CompuLab, Ltd.
	2	+ * (C) Copyright 2011 CompuLab, Ltd.
4	3	* Mike Rapoport <mike@compulab.co.il>
5	4	* Igor Grinberg <grinberg@compulab.co.il>
6	5	*
...	...	@@ -36,9 +35,9 @@
36	35	/*
37	36	* High Level Configuration Options
38	37	*/
39		-#define CONFIG_OMAP 1 /* in a TI OMAP core */
40		-#define CONFIG_OMAP34XX 1 /* which is a 34XX */
41		-#define CONFIG_CM_T3X 1 /* working with CM-T35 and CM-T3730 */
	38	+#define CONFIG_OMAP /* in a TI OMAP core */
	39	+#define CONFIG_OMAP34XX /* which is a 34XX */
	40	+#define CONFIG_CM_T3X /* working with CM-T35 and CM-T3730 */
42	41
43	42	#define CONFIG_SYS_TEXT_BASE 0x80008000
44	43
...	...	@@ -50,8 +49,8 @@
50	49	/*
51	50	* Display CPU and Board information
52	51	*/
53		-#define CONFIG_DISPLAY_CPUINFO 1
54		-#define CONFIG_DISPLAY_BOARDINFO 1
	52	+#define CONFIG_DISPLAY_CPUINFO
	53	+#define CONFIG_DISPLAY_BOARDINFO
55	54
56	55	/* Clock Defines */
57	56	#define V_OSCK 26000000 /* Clock output from T2 */
58	57
...	...	@@ -69,17 +68,17 @@
69	68	*/
70	69	#define CONFIG_SYS_BOOTMAPSZ 0x4000
71	70
72		-#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */
73		-#define CONFIG_SETUP_MEMORY_TAGS 1
74		-#define CONFIG_INITRD_TAG 1
75		-#define CONFIG_REVISION_TAG 1
	71	+#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
	72	+#define CONFIG_SETUP_MEMORY_TAGS
	73	+#define CONFIG_INITRD_TAG
	74	+#define CONFIG_REVISION_TAG
76	75
77	76	/*
78	77	* Size of malloc() pool
79	78	*/
80		-#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */
81		- /* Sector */
82		-#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128 << 10))
	79	+#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */
	80	+ /* Sector */
	81	+#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128 << 10))
83	82
84	83	/*
85	84	* Hardware drivers
86	85
87	86
88	87
...	...	@@ -107,20 +106,21 @@
107	106	#define CONFIG_BAUDRATE 115200
108	107	#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\
109	108	115200}
110		-#define CONFIG_GENERIC_MMC 1
111		-#define CONFIG_MMC 1
112		-#define CONFIG_OMAP_HSMMC 1
113		-#define CONFIG_DOS_PARTITION 1
114	109
	110	+#define CONFIG_GENERIC_MMC
	111	+#define CONFIG_MMC
	112	+#define CONFIG_OMAP_HSMMC
	113	+#define CONFIG_DOS_PARTITION
	114	+
115	115	/* USB */
116		-#define CONFIG_MUSB_UDC 1
117		-#define CONFIG_USB_OMAP3 1
118		-#define CONFIG_TWL4030_USB 1
	116	+#define CONFIG_MUSB_UDC
	117	+#define CONFIG_USB_OMAP3
	118	+#define CONFIG_TWL4030_USB
119	119
120	120	/* USB device configuration */
121		-#define CONFIG_USB_DEVICE 1
122		-#define CONFIG_USB_TTY 1
123		-#define CONFIG_SYS_CONSOLE_IS_IN_ENV 1
	121	+#define CONFIG_USB_DEVICE
	122	+#define CONFIG_USB_TTY
	123	+#define CONFIG_SYS_CONSOLE_IS_IN_ENV
124	124
125	125	/* commands to include */
126	126	#include <config_cmd_default.h>
...	...	@@ -131,10 +131,10 @@
131	131	#define CONFIG_CMD_JFFS2 /* JFFS2 Support */
132	132	#define CONFIG_CMD_MTDPARTS /* Enable MTD parts commands */
133	133	#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
134		-#define MTDIDS_DEFAULT "nand0=nand"
135		-#define MTDPARTS_DEFAULT "mtdparts=nand:512k(x-loader),"\
136		- "1920k(u-boot),128k(u-boot-env),"\
137		- "4m(kernel),-(fs)"
	134	+#define MTDIDS_DEFAULT "nand0=nand"
	135	+#define MTDPARTS_DEFAULT "mtdparts=nand:512k(x-loader),"\
	136	+ "1920k(u-boot),128k(u-boot-env),"\
	137	+ "4m(kernel),-(fs)"
138	138
139	139	#define CONFIG_CMD_I2C /* I2C serial bus support */
140	140	#define CONFIG_CMD_MMC /* MMC support */
141	141
142	142
143	143
144	144
...	...	@@ -147,30 +147,30 @@
147	147	#undef CONFIG_CMD_IMLS /* List all found images */
148	148
149	149	#define CONFIG_SYS_NO_FLASH
150		-#define CONFIG_HARD_I2C 1
	150	+#define CONFIG_HARD_I2C
151	151	#define CONFIG_SYS_I2C_SPEED 100000
152	152	#define CONFIG_SYS_I2C_SLAVE 1
153	153	#define CONFIG_SYS_I2C_BUS 0
154	154	#define CONFIG_SYS_I2C_BUS_SELECT 1
155		-#define CONFIG_DRIVER_OMAP34XX_I2C 1
	155	+#define CONFIG_DRIVER_OMAP34XX_I2C
156	156
157	157	/*
158	158	* TWL4030
159	159	*/
160		-#define CONFIG_TWL4030_POWER 1
161		-#define CONFIG_TWL4030_LED 1
	160	+#define CONFIG_TWL4030_POWER
	161	+#define CONFIG_TWL4030_LED
162	162
163	163	/*
164	164	* Board NAND Info.
165	165	*/
166		-#define CONFIG_SYS_NAND_QUIET_TEST 1
	166	+#define CONFIG_SYS_NAND_QUIET_TEST
167	167	#define CONFIG_NAND_OMAP_GPMC
168	168	#define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */
169	169	/* to access nand */
170	170	#define CONFIG_SYS_NAND_BASE NAND_BASE /* physical address */
171	171	/* to access nand at */
172	172	/* CS0 */
173		-#define GPMC_NAND_ECC_LP_x16_LAYOUT 1
	173	+#define GPMC_NAND_ECC_LP_x16_LAYOUT
174	174
175	175	#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */
176	176	/* devices */
...	...	@@ -244,7 +244,7 @@
244	244	#define CONFIG_AUTO_COMPLETE
245	245	#define CONFIG_CMDLINE_EDITING
246	246	#define CONFIG_TIMESTAMP
247		-#define CONFIG_SYS_AUTOLOAD "no"
	247	+#define CONFIG_SYS_AUTOLOAD "no"
248	248	#define CONFIG_SYS_LONGHELP /* undef to save memory */
249	249	#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */
250	250	#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
...	...	@@ -308,7 +308,7 @@
308	308	#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
309	309	#define CONFIG_SYS_ONENAND_BASE ONENAND_MAP
310	310
311		-#define CONFIG_ENV_IS_IN_NAND 1
	311	+#define CONFIG_ENV_IS_IN_NAND
312	312	#define ONENAND_ENV_OFFSET 0x260000 /* environment starts here */
313	313	#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */
314	314
...	...	@@ -333,8 +333,8 @@
333	333	GENERATED_GBL_DATA_SIZE)
334	334
335	335	/* Status LED */
336		-#define CONFIG_STATUS_LED 1 /* Status LED enabled */
337		-#define CONFIG_BOARD_SPECIFIC_LED 1
	336	+#define CONFIG_STATUS_LED /* Status LED enabled */
	337	+#define CONFIG_BOARD_SPECIFIC_LED
338	338	#define STATUS_LED_GREEN 0
339	339	#define STATUS_LED_BIT STATUS_LED_GREEN
340	340	#define STATUS_LED_STATE STATUS_LED_ON
...	...	@@ -344,7 +344,7 @@
344	344
345	345	/* GPIO banks */
346	346	#ifdef CONFIG_STATUS_LED
347		-#define CONFIG_OMAP3_GPIO_6 1 /* GPIO186 is in GPIO bank 6 */
	347	+#define CONFIG_OMAP3_GPIO_6 /* GPIO186 is in GPIO bank 6 */
348	348	#endif
349	349
350	350	#endif /* __CONFIG_H */