summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRamneek Mehresh <ramneek.mehresh@freescale.com>2011-06-07 10:10:43 +0000
committerKumar Gala <galak@kernel.crashing.org>2011-07-11 13:24:21 -0500
commit68d4230c3ccce96a72c5b99e48399bf1796fe3c6 (patch)
tree46c8e9f1103c3bbb7b1678daef3aa8bb5a2cc636
parent80e5c83a7e9d93a17ec14e4bbbbd1bc23e46b720 (diff)
downloadu-boot-imx-68d4230c3ccce96a72c5b99e48399bf1796fe3c6.zip
u-boot-imx-68d4230c3ccce96a72c5b99e48399bf1796fe3c6.tar.gz
u-boot-imx-68d4230c3ccce96a72c5b99e48399bf1796fe3c6.tar.bz2
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>
-rw-r--r--include/configs/MPC8536DS.h3
-rw-r--r--include/configs/P1_P2_RDB.h2
-rw-r--r--include/configs/P2020DS.h3
-rw-r--r--include/configs/corenet_ds.h9
4 files changed, 13 insertions, 4 deletions
diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index 7f7ff9f..783ed51 100644
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -262,6 +262,7 @@
#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 PIXIS_BASE 0xffdf0000 /* PIXIS registers */
#ifdef CONFIG_PHYS_64BIT
@@ -782,7 +783,7 @@
"fdtaddr=c00000\0" \
"fdtfile=8536ds/mpc8536ds.dtb\0" \
"bdev=sda3\0" \
- "usb_phy_type=ulpi\0"
+ "hwconfig=usb1:dr_mode=host,phy_type=ulpi\0"
#define CONFIG_HDBOOT \
"setenv bootargs root=/dev/$bdev rw " \
diff --git a/include/configs/P1_P2_RDB.h b/include/configs/P1_P2_RDB.h
index 4f1bdfe..df88b79 100644
--- a/include/configs/P1_P2_RDB.h
+++ b/include/configs/P1_P2_RDB.h
@@ -689,7 +689,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
"nandfdtaddr=80000\0" \
"nandimgsize=400000\0" \
"nandfdtsize=80000\0" \
- "usb_phy_type=ulpi\0" \
+ "hwconfig=usb1:dr_mode=host,phy_type=ulpi\0" \
"vscfw_addr=ef000000\0" \
"othbootargs=ramdisk_size=600000\0" \
"usbfatboot=setenv bootargs root=/dev/ram rw " \
diff --git a/include/configs/P2020DS.h b/include/configs/P2020DS.h
index b5db0b3..90fe7c4 100644
--- a/include/configs/P2020DS.h
+++ b/include/configs/P2020DS.h
@@ -752,7 +752,8 @@
#define CONFIG_EXTRA_ENV_SETTINGS \
"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" \
"uboot=" MK_STR(CONFIG_UBOOTPATH) "\0" \
"tftpflash=tftpboot $loadaddr $uboot; " \
diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index 52ef06e..c9cc22a 100644
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -639,9 +639,16 @@
#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 \
"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" \
"uboot=" MK_STR(CONFIG_UBOOTPATH) "\0" \
"ubootaddr=" MK_STR(CONFIG_SYS_TEXT_BASE) "\0" \