diff options
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/R360MPI.h | 1 | ||||
| -rw-r--r-- | include/configs/RBC823.h | 1 | ||||
| -rw-r--r-- | include/configs/RPXlite_DW.h | 1 | ||||
| -rw-r--r-- | include/configs/RRvision.h | 4 | ||||
| -rw-r--r-- | include/configs/TQM823L.h | 1 | ||||
| -rw-r--r-- | include/configs/TQM823M.h | 1 | ||||
| -rw-r--r-- | include/configs/am335x_evm.h | 52 | ||||
| -rw-r--r-- | include/configs/lubbock.h | 1 | ||||
| -rw-r--r-- | include/configs/lwmon.h | 1 | ||||
| -rw-r--r-- | include/configs/nokia_rx51.h | 40 | ||||
| -rw-r--r-- | include/configs/palmld.h | 1 | ||||
| -rw-r--r-- | include/configs/palmtc.h | 1 | ||||
| -rw-r--r-- | include/configs/pxa255_idp.h | 1 | ||||
| -rw-r--r-- | include/configs/svm_sc8xx.h | 1 | ||||
| -rw-r--r-- | include/configs/v37.h | 1 | ||||
| -rw-r--r-- | include/configs/zipitz2.h | 1 | 
16 files changed, 103 insertions, 6 deletions
| diff --git a/include/configs/R360MPI.h b/include/configs/R360MPI.h index 868a0b804..60cccffc4 100644 --- a/include/configs/R360MPI.h +++ b/include/configs/R360MPI.h @@ -39,6 +39,7 @@  #define	CONFIG_SYS_TEXT_BASE	0x40000000  #define CONFIG_LCD +#define CONFIG_MPC8XX_LCD  #undef  CONFIG_EDT32F10  #define CONFIG_SHARP_LQ057Q3DC02 diff --git a/include/configs/RBC823.h b/include/configs/RBC823.h index b042c6702..d4bcc62e4 100644 --- a/include/configs/RBC823.h +++ b/include/configs/RBC823.h @@ -47,6 +47,7 @@  #endif  #define CONFIG_KEYBOARD		1	/* This board has a custom keybpard */  #define CONFIG_LCD		1	/* use LCD controller ...	*/ +#define CONFIG_MPC8XX_LCD  #define CONFIG_HITACHI_SP19X001_Z1A	/* The LCD type we use */  #define	CONFIG_8xx_CONS_SMC2	1	/* Console is on SMC2		*/ diff --git a/include/configs/RPXlite_DW.h b/include/configs/RPXlite_DW.h index 67ab1e962..d8e28d5ea 100644 --- a/include/configs/RPXlite_DW.h +++ b/include/configs/RPXlite_DW.h @@ -54,6 +54,7 @@  #define	CONFIG_SYS_TEXT_BASE	0xff000000  #ifdef	CONFIG_LCD			/* with LCD controller ?	*/ +#define CONFIG_MPC8XX_LCD  #define CONFIG_SPLASH_SCREEN		/* ... with splashscreen support*/  #endif diff --git a/include/configs/RRvision.h b/include/configs/RRvision.h index e2b22f0ba..e2ea01638 100644 --- a/include/configs/RRvision.h +++ b/include/configs/RRvision.h @@ -110,7 +110,9 @@  #define	CONFIG_RTC_MPC8xx		/* use internal RTC of MPC8xx	*/ -#ifndef CONFIG_LCD +#ifdef CONFIG_LCD +#define CONFIG_MPC8XX_LCD +#else  #define CONFIG_VIDEO		1	/* To enable the video initialization */  /* Video related */ diff --git a/include/configs/TQM823L.h b/include/configs/TQM823L.h index 9fac5d15c..cccf3afb6 100644 --- a/include/configs/TQM823L.h +++ b/include/configs/TQM823L.h @@ -39,6 +39,7 @@  #define	CONFIG_SYS_TEXT_BASE	0x40000000  #ifdef	CONFIG_LCD			/* with LCD controller ?	*/ +#define CONFIG_MPC8XX_LCD  #define CONFIG_LCD_LOGO		1	/* print our logo on the LCD	*/  #define CONFIG_LCD_INFO		1	/* ... and some board info	*/  #define	CONFIG_SPLASH_SCREEN		/* ... with splashscreen support*/ diff --git a/include/configs/TQM823M.h b/include/configs/TQM823M.h index 932f158b2..b2d1af0dd 100644 --- a/include/configs/TQM823M.h +++ b/include/configs/TQM823M.h @@ -39,6 +39,7 @@  #define	CONFIG_SYS_TEXT_BASE	0x40000000  #ifdef	CONFIG_LCD			/* with LCD controller ?	*/ +#define CONFIG_MPC8XX_LCD  /* #define CONFIG_NEC_NL6448BC20 1 / * use NEC NL6448BC20 display	*/  #endif diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index dbd5ef327..ef00306a5 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -39,6 +39,8 @@  #define CONFIG_SETUP_MEMORY_TAGS  #define CONFIG_INITRD_TAG +#define CONFIG_SYS_CACHELINE_SIZE       64 +  /* commands to include */  #include <config_cmd_default.h> @@ -60,6 +62,11 @@  	"fdtfile=\0" \  	"console=ttyO0,115200n8\0" \  	"optargs=\0" \ +	"mtdids=" MTDIDS_DEFAULT "\0" \ +	"mtdparts=" MTDPARTS_DEFAULT "\0" \ +	"dfu_alt_info_mmc=" DFU_ALT_INFO_MMC "\0" \ +	"dfu_alt_info_emmc=rawemmc mmc 0 3751936\0" \ +	"dfu_alt_info_nand=" DFU_ALT_INFO_NAND "\0" \  	"mmcdev=0\0" \  	"mmcroot=/dev/mmcblk0p2 ro\0" \  	"mmcrootfstype=ext4 rootwait\0" \ @@ -167,8 +174,8 @@  #define CONFIG_CMD_ECHO -/* max number of command args */ -#define CONFIG_SYS_MAXARGS		16 +/* We set the max number of command args high to avoid HUSH bugs. */ +#define CONFIG_SYS_MAXARGS		64  /* Console I/O Buffer Size */  #define CONFIG_SYS_CBSIZE		512 @@ -197,6 +204,7 @@  #define CONFIG_CMD_MMC  #define CONFIG_DOS_PARTITION  #define CONFIG_CMD_FAT +#define CONFIG_FAT_WRITE  #define CONFIG_CMD_EXT2  #define CONFIG_CMD_EXT4  #define CONFIG_CMD_FS_GENERIC @@ -209,6 +217,38 @@  #define CONFIG_CMD_SF  #define CONFIG_SF_DEFAULT_SPEED		(24000000) +/* USB Composite download gadget - g_dnl */ +#define CONFIG_USB_GADGET +#define CONFIG_USBDOWNLOAD_GADGET + +/* USB TI's IDs */ +#define CONFIG_USBD_HS +#define CONFIG_G_DNL_VENDOR_NUM 0x0403 +#define CONFIG_G_DNL_PRODUCT_NUM 0xBD00 +#define CONFIG_G_DNL_MANUFACTURER "Texas Instruments" + +/* USB Device Firmware Update support */ +#define CONFIG_DFU_FUNCTION +#define CONFIG_DFU_MMC +#define CONFIG_DFU_NAND +#define CONFIG_CMD_DFU +#define DFU_ALT_INFO_MMC \ +	"boot part 0 1;" \ +	"rootfs part 0 2;" \ +	"MLO fat 0 1;" \ +	"MLO.raw mmc 100 100;" \ +	"u-boot.img.raw mmc 300 3C0;" \ +	"u-boot.img fat 0 1;" \ +	"uEnv.txt fat 0 1" +#define DFU_ALT_INFO_NAND \ +	"SPL part 0 1;" \ +	"SPL.backup1 part 0 2;" \ +	"SPL.backup2 part 0 3;" \ +	"SPL.backup3 part 0 4;" \ +	"u-boot part 0 5;" \ +	"kernel part 0 7;" \ +	"rootfs part 0 8" +   /* Physical Memory Map */  #define CONFIG_NR_DRAM_BANKS		1		/*  1 bank of DRAM */  #define PHYS_DRAM_1			0x80000000	/* DRAM Bank #1 */ @@ -354,6 +394,7 @@  #define CONFIG_MUSB_PIO_ONLY  #define CONFIG_MUSB_DISABLE_BULK_COMBINE_SPLIT  #define CONFIG_USB_GADGET_DUALSPEED +#define CONFIG_USB_GADGET_VBUS_DRAW	2  #define CONFIG_MUSB_HOST  #define CONFIG_AM335X_USB0  #define CONFIG_AM335X_USB0_MODE	MUSB_PERIPHERAL @@ -425,6 +466,13 @@  /* NAND support */  #ifdef CONFIG_NAND  #define CONFIG_CMD_NAND +#define CONFIG_CMD_MTDPARTS +#define MTDIDS_DEFAULT			"nand0=omap2-nand.0" +#define MTDPARTS_DEFAULT		"mtdparts=omap2-nand.0:128k(SPL)," \ +					"128k(SPL.backup1)," \ +					"128k(SPL.backup2)," \ +					"128k(SPL.backup3),1920k(u-boot)," \ +					"128k(u-boot-env),5m(kernel),-(rootfs)"  #define CONFIG_NAND_OMAP_GPMC  #define GPMC_NAND_ECC_LP_x16_LAYOUT	1  #define CONFIG_SYS_NAND_BASE		(0x08000000)	/* physical address */ diff --git a/include/configs/lubbock.h b/include/configs/lubbock.h index 5886a155d..b99a05690 100644 --- a/include/configs/lubbock.h +++ b/include/configs/lubbock.h @@ -38,6 +38,7 @@  #define CONFIG_LUBBOCK		1	/* on an LUBBOCK Board	    */  #define CONFIG_LCD		1  #ifdef CONFIG_LCD +#define CONFIG_PXA_LCD  #define CONFIG_SHARP_LM8V31  #endif  #define CONFIG_MMC diff --git a/include/configs/lwmon.h b/include/configs/lwmon.h index df4978161..3c02b73d8 100644 --- a/include/configs/lwmon.h +++ b/include/configs/lwmon.h @@ -54,6 +54,7 @@  #define CONFIG_MISC_INIT_R	1	/* Call misc_init_r()		*/  #define CONFIG_LCD		1	/* use LCD controller ...	*/ +#define CONFIG_MPC8XX_LCD  #define CONFIG_HLD1045		1	/* ... with a HLD1045 display	*/  #define CONFIG_LCD_LOGO		1	/* print our logo on the LCD	*/ diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index 8506604a7..965330aa3 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -148,6 +148,7 @@  #define CONFIG_CMDLINE_EDITING		/* add command line history */  #define CONFIG_AUTO_COMPLETE		/* add autocompletion support */ +#define CONFIG_CMD_BOOTMENU		/* ANSI terminal Boot Menu */  #define CONFIG_CMD_CLEAR		/* ANSI terminal clear screen command */  #ifdef ONENAND_SUPPORT @@ -287,8 +288,6 @@ int rx51_kp_getc(void);  #endif  /* Environment information */ -#define CONFIG_BOOTDELAY		3 -  #define CONFIG_EXTRA_ENV_SETTINGS \  	"mtdparts=" MTDPARTS_DEFAULT "\0" \  	"usbtty=cdc_acm\0" \ @@ -360,10 +359,40 @@ int rx51_kp_getc(void);  		"fi\0" \  	"emmcboot=setenv mmcnum 1; run trymmcboot\0" \  	"sdboot=setenv mmcnum 0; run trymmcboot\0" \ +	"menucmd=bootmenu\0" \ +	"bootmenu_0=Attached kernel=run attachboot\0" \ +	"bootmenu_1=Internal eMMC=run emmcboot\0" \ +	"bootmenu_2=External SD card=run sdboot\0" \ +	"bootmenu_3=U-Boot boot order=boot\0" \ +	"bootmenu_delay=30\0" \  	""  #define CONFIG_PREBOOT \ -	"if run slide; then true; else run attachboot; fi;" \ +	"setenv mmcnum 1; setenv mmcpart 1;" \ +	"setenv mmcscriptfile bootmenu.scr;" \ +	"if run switchmmc; then " \ +		"setenv mmcdone true;" \ +		"setenv mmctype fat;" \ +		"if run scriptload; then true; else " \ +			"setenv mmctype ext2;" \ +			"if run scriptload; then true; else " \ +				"setenv mmctype ext4;" \ +				"if run scriptload; then true; else " \ +					"setenv mmcdone false;" \ +				"fi;" \ +			"fi;" \ +		"fi;" \ +		"if ${mmcdone}; then " \ +			"run scriptboot;" \ +		"fi;" \ +	"fi;" \ +	"if run slide; then true; else " \ +		"setenv bootmenu_delay 0;" \ +		"setenv bootdelay 0;" \ +	"fi" + +#define CONFIG_POSTBOOTMENU \ +	"echo;" \  	"echo Extra commands:;" \  	"echo run sercon - Use serial port for control.;" \  	"echo run usbcon - Use usbtty for control.;" \ @@ -379,6 +408,11 @@ int rx51_kp_getc(void);  	"run attachboot;" \  	"echo" +#define CONFIG_BOOTDELAY 30 +#define CONFIG_AUTOBOOT_KEYED +#define CONFIG_MENU +#define CONFIG_MENU_SHOW +  /*   * Miscellaneous configurable options   */ diff --git a/include/configs/palmld.h b/include/configs/palmld.h index 3f9802ca0..4ee2e46cd 100644 --- a/include/configs/palmld.h +++ b/include/configs/palmld.h @@ -72,6 +72,7 @@  #define	CONFIG_CMD_MMC  #define	CONFIG_CMD_IDE  #define	CONFIG_LCD +#define	CONFIG_PXA_LCD  /*   * MMC Card Configuration diff --git a/include/configs/palmtc.h b/include/configs/palmtc.h index 64771e7e8..70fe05c51 100644 --- a/include/configs/palmtc.h +++ b/include/configs/palmtc.h @@ -74,6 +74,7 @@  #define	CONFIG_CMD_ENV  #define	CONFIG_CMD_MMC  #define	CONFIG_LCD +#define	CONFIG_PXA_LCD  /*   * MMC Card Configuration diff --git a/include/configs/pxa255_idp.h b/include/configs/pxa255_idp.h index 5a15af6b6..39c167fc6 100644 --- a/include/configs/pxa255_idp.h +++ b/include/configs/pxa255_idp.h @@ -59,6 +59,7 @@  #undef CONFIG_LCD  #ifdef CONFIG_LCD +#define CONFIG_PXA_LCD  #define CONFIG_SHARP_LM8V31  #endif diff --git a/include/configs/svm_sc8xx.h b/include/configs/svm_sc8xx.h index 2b24997f8..3c8c74d59 100644 --- a/include/configs/svm_sc8xx.h +++ b/include/configs/svm_sc8xx.h @@ -38,6 +38,7 @@  /* SC85T,SC860T, FEL8xx-AT(855T/860T) */  /*#define CONFIG_FEL8xx_AT */  /*#define CONFIG_LCD */ +/*#define CONFIG_MPC8XX_LCD*/  /* if core > 50MHz , un-comment CONFIG_BUS_DIV2 */  /* #define CONFIG_50MHz */  /* #define CONFIG_66MHz */ diff --git a/include/configs/v37.h b/include/configs/v37.h index e36d2491c..f9965db3c 100644 --- a/include/configs/v37.h +++ b/include/configs/v37.h @@ -39,6 +39,7 @@  #define	CONFIG_SYS_TEXT_BASE	0x40000000  #define CONFIG_LCD +#define CONFIG_MPC8XX_LCD  #define CONFIG_SHARP_LQ084V1DG21  #undef CONFIG_LCD_LOGO diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h index b92f70b53..f79dd3bbd 100644 --- a/include/configs/zipitz2.h +++ b/include/configs/zipitz2.h @@ -103,6 +103,7 @@  #ifdef	CONFIG_CMD_SPI  #define	CONFIG_SOFT_SPI  #define	CONFIG_LCD +#define	CONFIG_PXA_LCD  #define	CONFIG_LMS283GF05  #define	CONFIG_VIDEO_LOGO  #define	CONFIG_CMD_BMP |