diff options
| author | Tom Rini <trini@konsulko.com> | 2016-11-26 09:26:27 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-11-26 09:26:27 -0500 |
| commit | 8d0898544e0930974f39d9f13de2a874a501aa18 (patch) | |
| tree | e79257510f56afa87294d9dad3638d6df9590113 /include/configs | |
| parent | ce4f2dbe1a066a42a995c6f48280e2e1a5df1c92 (diff) | |
| parent | 6b388f0bed0e3d021128b4fc3c41da4572984e3b (diff) | |
| download | u-boot-8d0898544e0930974f39d9f13de2a874a501aa18.zip u-boot-8d0898544e0930974f39d9f13de2a874a501aa18.tar.gz u-boot-8d0898544e0930974f39d9f13de2a874a501aa18.tar.bz2 | |
Merge git://git.denx.de/u-boot-rockchip
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/rk3036_common.h | 7 | ||||
| -rw-r--r-- | include/configs/rockchip-common.h | 2 | ||||
| -rw-r--r-- | include/configs/veyron.h (renamed from include/configs/chromebook_jerry.h) | 0 |
3 files changed, 8 insertions, 1 deletions
diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h index 4eef3f8..92be29e 100644 --- a/include/configs/rk3036_common.h +++ b/include/configs/rk3036_common.h @@ -79,6 +79,13 @@ #define CONFIG_G_DNL_VENDOR_NUM 0x2207 #define CONFIG_G_DNL_PRODUCT_NUM 0x310a +/* usb host */ +#ifdef CONFIG_CMD_USB +#define CONFIG_USB_DWC2 +#define CONFIG_USB_HOST_ETHER +#define CONFIG_USB_ETHER_SMSC95XX +#define CONFIG_USB_ETHER_ASIX +#endif #define ENV_MEM_LAYOUT_SETTINGS \ "scriptaddr=0x60000000\0" \ "pxefile_addr_r=0x60100000\0" \ diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h index 7ca1696..9ec71c4 100644 --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h @@ -27,7 +27,7 @@ "name=reserved2,size=4M,uuid=${uuid_gpt_reserved2};" \ "name=loader2,size=4MB,uuid=${uuid_gpt_loader2};" \ "name=atf,size=4M,uuid=${uuid_gpt_atf};" \ - "name=boot,size=128M,bootable,uuid=${uuid_gpt_boot};" \ + "name=boot,size=112M,bootable,uuid=${uuid_gpt_boot};" \ "name=rootfs,size=-,uuid=${uuid_gpt_rootfs};\0" \ #endif diff --git a/include/configs/chromebook_jerry.h b/include/configs/veyron.h index b15cc26..b15cc26 100644 --- a/include/configs/chromebook_jerry.h +++ b/include/configs/veyron.h |