diff options
| author | Tom Rini <trini@konsulko.com> | 2016-09-18 16:12:04 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-09-18 18:05:30 (GMT) |
| commit | 9a6535e05f17acf03e891266a650cb6029124743 (patch) | |
| tree | fec0cd46e0f050812deecf89b8bb349c8fdffd0e /include | |
| parent | b58d3512442357cb023bce69f55c08b9fd21beaa (diff) | |
| parent | f9d7e17e844f9e94c39a8c95f73a4454097a6948 (diff) | |
| download | u-boot-9a6535e05f17acf03e891266a650cb6029124743.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/uniphier.h | 3 | ||||
| -rw-r--r-- | include/fdtdec.h | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 7dbfb7b..29be00a 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -31,9 +31,6 @@ #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO -#define CONFIG_MISC_INIT_F -#define CONFIG_BOARD_EARLY_INIT_F -#define CONFIG_BOARD_EARLY_INIT_R #define CONFIG_BOARD_LATE_INIT #define CONFIG_SYS_MALLOC_LEN (4 * 1024 * 1024) diff --git a/include/fdtdec.h b/include/fdtdec.h index aeb6bab..27887c8 100644 --- a/include/fdtdec.h +++ b/include/fdtdec.h @@ -148,7 +148,6 @@ enum fdt_compat_id { COMPAT_INTEL_MICROCODE, /* Intel microcode update */ COMPAT_AMS_AS3722, /* AMS AS3722 PMIC */ COMPAT_INTEL_QRK_MRC, /* Intel Quark MRC */ - COMPAT_SOCIONEXT_XHCI, /* Socionext UniPhier xHCI */ COMPAT_ALTERA_SOCFPGA_DWMAC, /* SoCFPGA Ethernet controller */ COMPAT_ALTERA_SOCFPGA_DWMMC, /* SoCFPGA DWMMC controller */ COMPAT_ALTERA_SOCFPGA_DWC2USB, /* SoCFPGA DWC2 USB controller */ |