X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fconfigs%2Fsiemens-am33x-common.h;h=15dfeec98cc94dcf1402af24d2f3d2383224a58f;hb=d021e942107a1f7304a879cec99286ca462f7be3;hp=1997c2dd5ae4d84e1bb03afc1d4dee03ed5ac9ea;hpb=26f9184e094541b672f83f23652e2e737d5d0729;p=platform%2Fkernel%2Fu-boot.git

diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index 1997c2d..15dfeec 100644
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -21,7 +21,6 @@
 
 #define CONFIG_ENV_SIZE			(0x2000)
 #define CONFIG_SYS_MALLOC_LEN		(16 * 1024 * 1024)
-#define CONFIG_SYS_LONGHELP		/* undef to save memory */
 #ifdef CONFIG_SIEMENS_MACH_TYPE
 #define CONFIG_MACH_TYPE		CONFIG_SIEMENS_MACH_TYPE
 #endif
@@ -32,16 +31,12 @@
 
 /* commands to include */
 
-#define CONFIG_ENV_VARS_UBOOT_CONFIG
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_ROOTPATH		"/opt/eldk"
 #endif
 
 #define CONFIG_ENV_OVERWRITE		1
 
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_AUTOLOAD	"yes"
 
 /* Clock Defines */
@@ -97,11 +92,8 @@
 /* I2C Configuration */
 #define CONFIG_I2C
 #define CONFIG_SYS_I2C
-#define CONFIG_SYS_OMAP24_I2C_SPEED	100000
-#define CONFIG_SYS_OMAP24_I2C_SLAVE	1
 
 /* Defines for SPL */
-#define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_TEXT_BASE		0x402F0400
 #define CONFIG_SPL_MAX_SIZE		(SRAM_SCRATCH_SPACE_ADDR - \
 					 CONFIG_SPL_TEXT_BASE)
@@ -115,7 +107,6 @@
 #define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	0x20000
 
-#define CONFIG_SPL_NAND_AM33XX_BCH
 #define CONFIG_SPL_NAND_BASE
 #define CONFIG_SPL_NAND_DRIVERS
 #define CONFIG_SPL_NAND_ECC
@@ -153,7 +144,6 @@
  * header. That is 0x800FFFC0--0x80100000 should not be used for any
  * other needs.
  */
-#define CONFIG_SYS_TEXT_BASE		0x80100000
 #define CONFIG_SYS_SPL_MALLOC_START	0x80208000
 #define CONFIG_SYS_SPL_MALLOC_SIZE	0x100000
 
@@ -169,8 +159,6 @@
 /*
  * USB configuration
  */
-#define CONFIG_USB_MUSB_DSPS
-#define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 
 #define CONFIG_AM335X_USB0
@@ -208,11 +196,8 @@
 #define CONFIG_DRIVER_TI_CPSW
 #define CONFIG_MII
 #define CONFIG_BOOTP_DEFAULT
-#define CONFIG_BOOTP_DNS
 #define CONFIG_BOOTP_DNS2
 #define CONFIG_BOOTP_SEND_HOSTNAME
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_SUBNETMASK
 #define CONFIG_NET_RETRY_COUNT         10
 
 /* NAND support */
@@ -306,10 +291,8 @@
  *|      mtdoops |   8.000 MiB | 0x  c80000..0x 147ffff |
  *|       rootfs | 235.500 MiB | 0x 1480000..0x fffffff |
  *-------------------------------------------------------
- */
-#define MTDIDS_NAME_STR		"omap2-nand.0"
-#define MTDIDS_DEFAULT		"nand0=" MTDIDS_NAME_STR
-#define MTDPARTS_DEFAULT_V1	"mtdparts=" MTDIDS_NAME_STR ":" \
+
+					"mtdparts=omap2-nand.0:" \
 					"128k(spl),"		\
 					"128k(spl.backup1),"	\
 					"128k(spl.backup2),"	\
@@ -320,6 +303,7 @@
 					"5120k(kernel_b),"	\
 					"8192k(mtdoops),"	\
 					"-(rootfs)"
+ */
 
 #define DFU_ALT_INFO_NAND_V1 \
 	"spl part 0 1;" \
@@ -382,7 +366,7 @@
 		"bootm ${kloadaddr}\0"
 
 /*
- * Variant 2 partition layout
+ * Variant 2 partition layout (default)
  * chip-size = 256MiB or 512 MiB
  *|         name |        size |           address area |
  *-------------------------------------------------------
@@ -399,17 +383,6 @@
  *-------------------------------------------------------
  */
 
-#define MTDPARTS_DEFAULT_V2	"mtdparts=" MTDIDS_NAME_STR ":" \
-					"128k(spl)," \
-					"128k(spl.backup1)," \
-					"128k(spl.backup2)," \
-					"128k(spl.backup3)," \
-					"1920k(u-boot)," \
-					"512k(u-boot.env0)," \
-					"512k(u-boot.env1)," \
-					"512k(mtdoops)," \
-					"-(rootfs)"
-
 #define DFU_ALT_INFO_NAND_V2 \
 	"spl part 0 1;" \
 	"spl.backup1 part 0 2;" \
@@ -487,9 +460,8 @@
  *|      mtdoops | 512.000 KiB | 0x12f60000..0x12fdffff |
  *|configuration | 104.125 MiB | 0x12fe0000..0x1fffffff |
  *-------------------------------------------------------
- */
 
-#define MTDPARTS_DEFAULT_V3	"mtdparts=" MTDIDS_NAME_STR ":" \
+					"mtdparts=omap2-nand.0:" \
 					"128k(spl),"		\
 					"128k(spl.backup1),"	\
 					"128k(spl.backup2),"	\
@@ -501,8 +473,8 @@
 					"512k(mtdoops),"	\
 					"-(configuration)"
 
-#define CONFIG_NAND_OMAP_GPMC
-#define CONFIG_NAND_OMAP_ELM
+ */
+
 #define CONFIG_SYS_NAND_BASE		(0x08000000)	/* physical address */
 							/* to access nand at */
 							/* CS0 */
@@ -518,7 +490,6 @@
 #define CONFIG_RESET_TO_RETRY
 #define CONFIG_BOOT_RETRY_TIME 60
 
-#define CONFIG_BOOTCOUNT_LIMIT
 #define CONFIG_BOOTCOUNT_ENV
 
 #endif	/* ! __CONFIG_SIEMENS_AM33X_COMMON_H */