diff options
author | Tom Rini <trini@konsulko.com> | 2015-12-19 22:05:31 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2015-12-19 22:05:31 -0500 |
commit | 34059d8f502dec034af2387c7d00a56ccab99a9e (patch) | |
tree | 0227cccae15473da34e95acf35140ef8be3f4643 /include/configs/socfpga_sockit.h | |
parent | 1c0e84ca829a09948a61107744402296566aa076 (diff) | |
parent | 48275c96ff4deaeca10d9e18c78f6a1e3653efa2 (diff) | |
download | u-boot-imx-34059d8f502dec034af2387c7d00a56ccab99a9e.zip u-boot-imx-34059d8f502dec034af2387c7d00a56ccab99a9e.tar.gz u-boot-imx-34059d8f502dec034af2387c7d00a56ccab99a9e.tar.bz2 |
Merge branch 'master' of git://www.denx.de/git/u-boot-socfpga
Diffstat (limited to 'include/configs/socfpga_sockit.h')
-rw-r--r-- | include/configs/socfpga_sockit.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/include/configs/socfpga_sockit.h b/include/configs/socfpga_sockit.h index 5bcee05..6cbe367 100644 --- a/include/configs/socfpga_sockit.h +++ b/include/configs/socfpga_sockit.h @@ -37,40 +37,21 @@ #define CONFIG_BOOTDELAY 3 #define CONFIG_BOOTFILE "fitImage" #define CONFIG_BOOTARGS "console=ttyS0," __stringify(CONFIG_BAUDRATE) -#ifdef CONFIG_SOCFPGA_VIRTUAL_TARGET -#define CONFIG_BOOTCOMMAND "run ramboot" -#else #define CONFIG_BOOTCOMMAND "run mmcload; run mmcboot" -#endif #define CONFIG_LOADADDR 0x01000000 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR /* Ethernet on SoC (EMAC) */ #if defined(CONFIG_CMD_NET) - -/* PHY */ #define CONFIG_PHY_MICREL #define CONFIG_PHY_MICREL_KSZ9021 -#define CONFIG_KSZ9021_CLK_SKEW_ENV "micrel-ksz9021-clk-skew" -#define CONFIG_KSZ9021_CLK_SKEW_VAL 0xf0f0 -#define CONFIG_KSZ9021_DATA_SKEW_ENV "micrel-ksz9021-data-skew" -#define CONFIG_KSZ9021_DATA_SKEW_VAL 0x0 - #endif #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 /* device 0 */ #define CONFIG_ENV_OFFSET 512 /* just after the MBR */ -/* USB */ -#ifdef CONFIG_CMD_USB -#define CONFIG_USB_DWC2_REG_ADDR SOCFPGA_USB1_ADDRESS -#endif -#define CONFIG_G_DNL_MANUFACTURER "Terasic" - /* Extra Environment */ -#define CONFIG_HOSTNAME socfpga_sockit - #define CONFIG_EXTRA_ENV_SETTINGS \ "verify=n\0" \ "loadaddr= " __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ |