nrhw20: cleanup board config file

- Remove clock synthesizer
- Cleanup and formatting

include/configs/am335x_nrhw20.h

@@ -19,7 +19,6 @@
 
 #include <configs/ti_am335x_common.h>
 
-/*#define CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC*/
 #undef CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC
 
 #undef CONFIG_HW_WATCHDOG
@@ -43,18 +42,18 @@
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_ARP_TIMEOUT	    200
+#define CONFIG_ARP_TIMEOUT		200
 #undef CONFIG_NET_RETRY_COUNT
-#define CONFIG_NET_RETRY_COUNT	5
+#define CONFIG_NET_RETRY_COUNT		5
 #define CONFIG_BOOTP_MAY_FAIL
 
 #ifndef CONFIG_SPL_BUILD
-#define KERNEL_ADDR "0x80000000"
+#define KERNEL_ADDR			"0x80000000"
-#define LOAD_ADDR "0x83000000"
+#define LOAD_ADDR			"0x83000000"
-#define FDT_ADDR "0x82000000"
+#define FDT_ADDR			"0x82000000"
-#define PXE_ADDR "0x82800000"
+#define PXE_ADDR			"0x82800000"
-#define FDT_HIGH_ADDR "0x87000000"
+#define FDT_HIGH_ADDR			"0x87000000"
-#define INIT_RD_ADDR "0x88000000"
+#define INIT_RD_ADDR			"0x88000000"
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"kernel_image=kernel.bin\0"	\
@@ -101,8 +100,8 @@
 #endif
 
 /* UART Configuration */
-#define CONFIG_SYS_NS16550_COM1		0x44e09000	/* UART0: XModem Boot, Shield */
+#define CONFIG_SYS_NS16550_COM1			0x44e09000	/* UART0: XModem Boot, Shield */
-#define CONFIG_SYS_NS16550_COM2		0x48022000	/* UART1: eMMC Boot, User UART */
+#define CONFIG_SYS_NS16550_COM2			0x48022000	/* UART1: eMMC Boot, User UART */
 
 #define CONFIG_I2C
 #define CONFIG_I2C_MULTI_BUS
@@ -114,30 +113,24 @@
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS       4
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS   50	/* TODO: Can this be reduced to 20ms */
 
-#if 0
+#define CONFIG_PCA953X
-#define CONFIG_ENV_IS_IN_EEPROM
+#define CONFIG_SYS_I2C_PCA953X_BUS		2
-#define CONFIG_I2C_ENV_EEPROM_BUS		0
+#define CONFIG_SYS_I2C_PCA953X_ADDR		0x74
-/* TODO: Broken, access to EEPROM is incredibly slow.
+#define CONFIG_SYS_I2C_PCA953X_WIDTH		{ {0x74, 16} }
- * Reads byte per byte with 50ms delay...
+#define CONFIG_CMD_PCA953X
- * Workaround: Set bus to 0 so no EEPROM is found and no loading takes place.
+#define CONFIG_CMD_PCA953X_INFO
- */
-#define CONFIG_ENV_OFFSET			0x1000  /* The Environment is located at 4k */
-#define CONFIG_ENV_SIZE				0x800	/* The maximum size is 2k */
-#endif
 
-#if 1 /* TODO: Check env in eMMC */
+
+/* Put Environment in eMMC */
 #define CONFIG_ENV_OFFSET			(512 * 128)	/* @ 512*256 SPL starts */
 #define CONFIG_ENV_SIZE				(4 * 1024)
 #define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV			1
-#endif
 
 #if 0
-
+#define CONFIG_SYS_MMC_ENV_PART			2
-#define CONFIG_SYS_MMC_ENV_PART		2
+#define CONFIG_ENV_OFFSET_REDUND		(CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
-#define CONFIG_ENV_OFFSET_REDUND	(CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
-
 #endif
 
 
@@ -145,7 +138,6 @@
 #undef CONFIG_SPL_NAND_SUPPORT
 #undef CONFIG_SPL_ONENAND_SUPPORT
 
-
 /* We need to disable SPI to not confuse the eeprom env driver */
 #undef CONFIG_SPI
 #undef CONFIG_SPI_BOOT
@@ -198,7 +190,6 @@
 #endif /* CONFIG_USB_MUSB_GADGET */
 
 
-
 /*
  * Disable MMC DM for SPL build and can be re-enabled after adding
  * DM support in SPL
@@ -216,64 +207,22 @@
 #undef CONFIG_EFI_PARTITION
 #endif
 
-/* USB Device Firmware Update support */
-#if 0
-#ifndef CONFIG_SPL_BUILD
-
-/* TODO: Check -> Remove */
-#define CONFIG_USB_FUNCTION_DFU
-#define CONFIG_DFU_MMC
-#define DFU_ALT_INFO_MMC \
-	"dfu_alt_info_mmc=" \
-	"boot part 0 1;" \
-	"rootfs part 0 2;" \
-	"MLO fat 0 1;" \
-	"MLO.raw raw 0x100 0x100;" \
-	"u-boot.img.raw raw 0x300 0x400;" \
-	"spl-os-args.raw raw 0x80 0x80;" \
-	"spl-os-image.raw raw 0x900 0x2000;" \
-	"spl-os-args fat 0 1;" \
-	"spl-os-image fat 0 1;" \
-	"u-boot.img fat 0 1;" \
-	"uEnv.txt fat 0 1\0"
-#define DFU_ALT_INFO_NAND ""
-#define CONFIG_DFU_RAM
-#define DFU_ALT_INFO_RAM \
-	"dfu_alt_info_ram=" \
-	"kernel ram 0x80200000 0xD80000;" \
-	"fdt ram 0x80F80000 0x80000;" \
-	"ramdisk ram 0x81000000 0x4000000\0"
-#define DFUARGS \
-	"dfu_alt_info_emmc=rawemmc raw 0 3751936\0" \
-	DFU_ALT_INFO_MMC \
-	DFU_ALT_INFO_RAM \
-	DFU_ALT_INFO_NAND
-
-#endif
-#endif
-
 /* Network. */
 #define CONFIG_PHYLIB
 
-#ifdef CONFIG_DRIVER_TI_CPSW
+/* Ethernet Switch Support */
-#define CONFIG_CLOCK_SYNTHESIZER
+#define CONFIG_MV88E60XX_SWITCH
-#define CLK_SYNTHESIZER_I2C_ADDR 0x65
+#define CONFIG_MV88E60XX_PHY_PORTS	0x0F
-#endif
+#define CONFIG_MV88E60XX_CPU_PORT	5
+
 
 #define CONFIG_SYS_MEMTEST_START    0x80000000
 #define CONFIG_SYS_MEMTEST_END      0x87900000
 
-/* TODO: Check/remove */
-
 #if 0
-/* Enable support for TPS 65218 */
 #define CONFIG_POWER
 #define CONFIG_POWER_I2C
-
+#define CONFIG_POWER_DA9063	/* TODO: Provide driver */
-#define CONFIG_POWER_TPS65218
-/* For compatibility reasons (BeagleBone) */
-#define CONFIG_POWER_TPS65217
-#define CONFIG_POWER_TPS62362
 #endif
 
 #define CONFIG_CMD_PXE
@@ -285,17 +234,6 @@
 #undef CONFIG_ISO_PARTITION
 
 
-/* TODO: Switch Support */
-#define CONFIG_MV88E60XX_SWITCH
-#define CONFIG_MV88E60XX_PHY_PORTS	0x0F
-#define CONFIG_MV88E60XX_CPU_PORT	5
-
-#define CONFIG_PCA953X
-#define CONFIG_SYS_I2C_PCA953X_BUS	2
-#define CONFIG_SYS_I2C_PCA953X_ADDR	0x74
-#define CONFIG_SYS_I2C_PCA953X_WIDTH	{ {0x74, 16} }
-#define CONFIG_CMD_PCA953X
-#define CONFIG_CMD_PCA953X_INFO
 
 
 #endif	/* ! __CONFIG_AM335X_NRHW20_H */