X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fconfigs%2Fam335x_shc.h;h=ee6f62275a8c9511b65c6403cec01172496344c3;hb=454712f67cc0531599bea16dbaf0abab56ba1a86;hp=6e1a40c678f10a82579d67f92fe253c8dcb00269;hpb=c27178ba3649f539c9f1890ea147f4c5415f63b5;p=platform%2Fkernel%2Fu-boot.git

diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h
index 6e1a40c..ee6f622 100644
--- a/include/configs/am335x_shc.h
+++ b/include/configs/am335x_shc.h
@@ -15,51 +15,13 @@
 #include <configs/ti_am335x_common.h>
 
 /* settings we don;t want on this board */
-#undef CONFIG_CMD_SPI
-
-#define CONFIG_CMD_CACHE
-
-#ifndef CONFIG_SPL_BUILD
-# define CONFIG_TIMESTAMP
-#endif
-
-#define CONFIG_SYS_BOOTM_LEN		(16 << 20)
 
 /* Clock Defines */
 #define V_OSCK				24000000  /* Clock output from T2 */
 #define V_SCLK				(V_OSCK)
 
-/*
- * in case of SD Card or Network boot we want to have a possibility to
- * debrick the shc, therefore do not read environment from eMMC
- */
-#if defined(CONFIG_SHC_SDBOOT) || defined(CONFIG_SHC_NETBOOT)
-#define CONFIG_SYS_MMC_ENV_DEV		0
-#else
-#define CONFIG_SYS_MMC_ENV_DEV		1
-#endif
-
-/*
- * Info when using boot partitions: As environment resides within first
- * 128 kB, MLO must start at 128 kB == 0x20000
- * ENV at MMC Boot0 Partition - 0/Undefined=user, 1=boot0, 2=boot1,
- * 4..7=general0..3
- */
-
-#define CONFIG_HSMMC2_8BIT
-
-#ifndef CONFIG_SHC_ICT
-/*
- * In builds other than ICT, reset to retry after timeout
- * Define a timeout after which a stopped bootloader continues autoboot
- * (only works with CONFIG_RESET_TO_RETRY)
- */
-# define CONFIG_BOOT_RETRY_TIME 30
-# define CONFIG_RESET_TO_RETRY
-#endif
-
 #ifndef CONFIG_SPL_BUILD
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"loadaddr=0x80200000\0" \
 	"kloadaddr=0x84000000\0" \
 	"fdtaddr=0x85000000\0" \
@@ -159,97 +121,24 @@
 
 #if defined CONFIG_SHC_NETBOOT
 /* Network Boot */
-# define CONFIG_BOOTCOMMAND \
-	"run fusecmd; " \
-	"if run netboot; then " \
-		"echo Booting from network; " \
-	"else " \
-		"echo ERROR: Cannot boot from network!; " \
-		"panic; " \
-	"fi; "
 
 #elif defined CONFIG_SHC_SDBOOT /* !defined CONFIG_SHC_NETBOOT */
 /* SD-Card Boot */
-# define CONFIG_BOOTCOMMAND \
-	"if mmc dev 0; mmc rescan; then " \
-		"run sd_setup; " \
-	"else " \
-		"echo ERROR: SD/MMC-Card not detected!; " \
-		"panic; " \
-	"fi; " \
-	"if run loaduimage; then " \
-		"echo Bootable SD/MMC-Card inserted, booting from it!; " \
-		"run mmcboot; " \
-	"else " \
-		"echo ERROR: Unable to load uImage from SD/MMC-Card!; " \
-		"panic; " \
-	"fi; "
 
 #elif defined CONFIG_SHC_ICT
 /* ICT adapter boots only u-boot and does HW partitioning */
-# define CONFIG_BOOTCOMMAND \
-	"if mmc dev 0; mmc rescan; then " \
-		"run sd_setup; " \
-	"else " \
-		"echo ERROR: SD/MMC-Card not detected!; " \
-		"panic; " \
-	"fi; " \
-	"run fusecmd; "
 
 #else /* !defined CONFIG_SHC_NETBOOT, !defined CONFIG_SHC_SDBOOT */
 /* Regular Boot from internal eMMC */
-# define CONFIG_BOOTCOMMAND \
-	"if mmc dev 1; mmc rescan; then " \
-		"run emmc_setup; " \
-	"else " \
-		"echo ERROR: eMMC device not detected!; " \
-		"panic; " \
-	"fi; " \
-	"if run loaduimage; then " \
-		"run mmcboot; " \
-	"else " \
-		"echo ERROR Unable to load uImage from eMMC!; " \
-		"echo Performing Rollback!; " \
-		"setenv _active_ ${active_root}; " \
-		"setenv _inactive_ ${inactive_root}; " \
-		"setenv active_root ${_inactive_}; " \
-		"setenv inactive_root ${_active_}; " \
-		"saveenv; " \
-		"reset; " \
-	"fi; "
 
 #endif /* Regular Boot */
 
 /* NS16550 Configuration */
-#define CONFIG_SYS_NS16550_COM1		0x44e09000	/* UART0 */
-#define CONFIG_SYS_NS16550_COM2		0x48022000	/* UART1 */
-#define CONFIG_SYS_NS16550_COM3		0x48024000	/* UART2 */
-#define CONFIG_SYS_NS16550_COM4		0x481a6000	/* UART3 */
-#define CONFIG_SYS_NS16550_COM5		0x481a8000	/* UART4 */
-#define CONFIG_SYS_NS16550_COM6		0x481aa000	/* UART5 */
-
-/* PMIC support */
-#define CONFIG_POWER_TPS65217
-
-/* SPL */
-
-/*
- * Disable MMC DM for SPL build and can be re-enabled after adding
- * DM support in SPL
- */
-#ifdef CONFIG_SPL_BUILD
-#undef CONFIG_DM_MMC
-#undef CONFIG_TIMER
-#endif
-
-#define CONFIG_BOOTP_DEFAULT
-#define CONFIG_BOOTP_DNS2
-#define CONFIG_BOOTP_SEND_HOSTNAME
-#define CONFIG_NET_RETRY_COUNT         10
+#define CFG_SYS_NS16550_COM1		0x44e09000	/* UART0 */
+#define CFG_SYS_NS16550_COM2		0x48022000	/* UART1 */
+#define CFG_SYS_NS16550_COM3		0x48024000	/* UART2 */
+#define CFG_SYS_NS16550_COM4		0x481a6000	/* UART3 */
+#define CFG_SYS_NS16550_COM5		0x481a8000	/* UART4 */
+#define CFG_SYS_NS16550_COM6		0x481aa000	/* UART5 */
 
-/* I2C configuration */
-#define CONFIG_SYS_I2C_EEPROM_ADDR	0x50	/* Main EEPROM */
-#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN	2
-#define CONFIG_SYS_I2C_SPEED		400000
-#define CONFIG_SYS_I2C_SLAVE		1
 #endif	/* ! __CONFIG_AM335X_SHC_H */