mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-10 23:24:38 +00:00
powerpc/85xx: Add default usb mode and phy type to hwconfig
Move to use hwconfig for usb mode & phy type instead of magic 'usb_phy_type' environment variable on the following platforms: MPC8536DS, P1020RDB, P1020RDB-PC, P1010RDB, P2020RDB, P2020RDB-PC, P2020RDB, P3041DS, P4080DS, & P5020DS. Signed-off-by: Ramneek Mehresh <ramneek.mehresh@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
parent
80e5c83a7e
commit
68d4230c3c
4 changed files with 13 additions and 4 deletions
|
@ -262,6 +262,7 @@
|
||||||
|
|
||||||
#define CONFIG_BOARD_EARLY_INIT_R /* call board_early_init_r function */
|
#define CONFIG_BOARD_EARLY_INIT_R /* call board_early_init_r function */
|
||||||
|
|
||||||
|
#define CONFIG_HWCONFIG /* enable hwconfig */
|
||||||
#define CONFIG_FSL_PIXIS 1 /* use common PIXIS code */
|
#define CONFIG_FSL_PIXIS 1 /* use common PIXIS code */
|
||||||
#define PIXIS_BASE 0xffdf0000 /* PIXIS registers */
|
#define PIXIS_BASE 0xffdf0000 /* PIXIS registers */
|
||||||
#ifdef CONFIG_PHYS_64BIT
|
#ifdef CONFIG_PHYS_64BIT
|
||||||
|
@ -782,7 +783,7 @@
|
||||||
"fdtaddr=c00000\0" \
|
"fdtaddr=c00000\0" \
|
||||||
"fdtfile=8536ds/mpc8536ds.dtb\0" \
|
"fdtfile=8536ds/mpc8536ds.dtb\0" \
|
||||||
"bdev=sda3\0" \
|
"bdev=sda3\0" \
|
||||||
"usb_phy_type=ulpi\0"
|
"hwconfig=usb1:dr_mode=host,phy_type=ulpi\0"
|
||||||
|
|
||||||
#define CONFIG_HDBOOT \
|
#define CONFIG_HDBOOT \
|
||||||
"setenv bootargs root=/dev/$bdev rw " \
|
"setenv bootargs root=/dev/$bdev rw " \
|
||||||
|
|
|
@ -689,7 +689,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
|
||||||
"nandfdtaddr=80000\0" \
|
"nandfdtaddr=80000\0" \
|
||||||
"nandimgsize=400000\0" \
|
"nandimgsize=400000\0" \
|
||||||
"nandfdtsize=80000\0" \
|
"nandfdtsize=80000\0" \
|
||||||
"usb_phy_type=ulpi\0" \
|
"hwconfig=usb1:dr_mode=host,phy_type=ulpi\0" \
|
||||||
"vscfw_addr=ef000000\0" \
|
"vscfw_addr=ef000000\0" \
|
||||||
"othbootargs=ramdisk_size=600000\0" \
|
"othbootargs=ramdisk_size=600000\0" \
|
||||||
"usbfatboot=setenv bootargs root=/dev/ram rw " \
|
"usbfatboot=setenv bootargs root=/dev/ram rw " \
|
||||||
|
|
|
@ -752,7 +752,8 @@
|
||||||
|
|
||||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||||
"perf_mode=performance\0" \
|
"perf_mode=performance\0" \
|
||||||
"hwconfig=fsl_ddr:ctlr_intlv=bank,bank_intlv=cs0_cs1\0" \
|
"hwconfig=fsl_ddr:ctlr_intlv=bank,bank_intlv=cs0_cs1;" \
|
||||||
|
"usb1:dr_mode=host,phy_type=ulpi\0" \
|
||||||
"netdev=eth0\0" \
|
"netdev=eth0\0" \
|
||||||
"uboot=" MK_STR(CONFIG_UBOOTPATH) "\0" \
|
"uboot=" MK_STR(CONFIG_UBOOTPATH) "\0" \
|
||||||
"tftpflash=tftpboot $loadaddr $uboot; " \
|
"tftpflash=tftpboot $loadaddr $uboot; " \
|
||||||
|
|
|
@ -639,9 +639,16 @@
|
||||||
|
|
||||||
#define CONFIG_BAUDRATE 115200
|
#define CONFIG_BAUDRATE 115200
|
||||||
|
|
||||||
|
#if defined(CONFIG_P4080DS)
|
||||||
|
#define __USB_PHY_TYPE ulpi
|
||||||
|
#else
|
||||||
|
#define __USB_PHY_TYPE utmi
|
||||||
|
#endif
|
||||||
|
|
||||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||||
"hwconfig=fsl_ddr:ctlr_intlv=cacheline," \
|
"hwconfig=fsl_ddr:ctlr_intlv=cacheline," \
|
||||||
"bank_intlv=cs0_cs1\0" \
|
"bank_intlv=cs0_cs1;" \
|
||||||
|
"usb1:dr_mode=host,phy_type=" MK_STR(__USB_PHY_TYPE) "\0"\
|
||||||
"netdev=eth0\0" \
|
"netdev=eth0\0" \
|
||||||
"uboot=" MK_STR(CONFIG_UBOOTPATH) "\0" \
|
"uboot=" MK_STR(CONFIG_UBOOTPATH) "\0" \
|
||||||
"ubootaddr=" MK_STR(CONFIG_SYS_TEXT_BASE) "\0" \
|
"ubootaddr=" MK_STR(CONFIG_SYS_TEXT_BASE) "\0" \
|
||||||
|
|
Loading…
Reference in a new issue