diff options
| author | Tom Rini <trini@konsulko.com> | 2017-08-11 11:10:18 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-08-11 11:10:18 (GMT) |
| commit | 7f513e8196589e3b1274132abe3b59e52979e3e5 (patch) | |
| tree | 971e50888e2ce7a42cc409d22d4e2c140e85a48d /include | |
| parent | b24065c4ef21687787a74eef22dfa9232096f965 (diff) | |
| parent | 1c83df6f3f95055ed1c8fb40d1d0604863eab78b (diff) | |
| download | u-boot-fsl-qoriq-7f513e8196589e3b1274132abe3b59e52979e3e5.tar.xz | |
Merge git://git.denx.de/u-boot-fsl-qoriq
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/ls1012aqds.h | 2 | ||||
| -rw-r--r-- | include/configs/ls2080a_common.h | 2 | ||||
| -rw-r--r-- | include/fsl_csu.h | 2 | ||||
| -rw-r--r-- | include/usb/ehci-ci.h | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h index bebb0df..7120111 100644 --- a/include/configs/ls1012aqds.h +++ b/include/configs/ls1012aqds.h @@ -115,6 +115,8 @@ #ifdef CONFIG_HAS_FSL_DR_USB #define CONFIG_USB_EHCI_FSL +#define CONFIG_USB_ULPI +#define CONFIG_USB_ULPI_VIEWPORT #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #endif diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h index 6ae5586..1ec6cb2 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -33,7 +33,7 @@ #define CONFIG_SYS_TEXT_BASE 0x20100000 #define CONFIG_ENV_SIZE 0x2000 /* 8KB */ #define CONFIG_ENV_OFFSET 0x300000 /* 3MB */ -#define CONFIG_ENV_SECT_SIZE 0x10000 +#define CONFIG_ENV_SECT_SIZE 0x40000 #endif #define CONFIG_SUPPORT_RAW_INITRD diff --git a/include/fsl_csu.h b/include/fsl_csu.h index 8582ac0..027a811 100644 --- a/include/fsl_csu.h +++ b/include/fsl_csu.h @@ -30,7 +30,7 @@ struct csu_ns_dev { }; void enable_layerscape_ns_access(void); -void set_devices_ns_access(struct csu_ns_dev *ns_dev, u16 val); +void set_devices_ns_access(unsigned long, u16 val); void set_pcie_ns_access(int pcie, u16 val); #endif diff --git a/include/usb/ehci-ci.h b/include/usb/ehci-ci.h index 847b698..cd3eb47 100644 --- a/include/usb/ehci-ci.h +++ b/include/usb/ehci-ci.h @@ -156,7 +156,7 @@ #elif defined(CONFIG_MPC85xx) #define CONFIG_SYS_FSL_USB1_ADDR CONFIG_SYS_MPC85xx_USB1_ADDR #define CONFIG_SYS_FSL_USB2_ADDR CONFIG_SYS_MPC85xx_USB2_ADDR -#elif defined(CONFIG_ARCH_LS1021A) +#elif defined(CONFIG_LS102XA) || defined(CONFIG_ARCH_LS1012A) #define CONFIG_SYS_FSL_USB1_ADDR CONFIG_SYS_EHCI_USB1_ADDR #define CONFIG_SYS_FSL_USB2_ADDR 0 #endif |