diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/MPC8544DS.h | 1 | ||||
| -rw-r--r-- | include/configs/MPC8572DS.h | 1 | ||||
| -rw-r--r-- | include/configs/efi-x86.h | 1 | ||||
| -rw-r--r-- | include/configs/uniphier.h | 8 | ||||
| -rw-r--r-- | include/configs/x86-common.h | 1 |
5 files changed, 1 insertions, 11 deletions
diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h index e8a6fdf23f..77c3910326 100644 --- a/include/configs/MPC8544DS.h +++ b/include/configs/MPC8544DS.h @@ -347,7 +347,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); */ #ifdef CONFIG_USB_EHCI_HCD -#define CONFIG_USB_EHCI_PCI #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_PCI_EHCI_DEVICE 0 #endif diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index 1959fa5b01..218d212608 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -545,7 +545,6 @@ */ #ifdef CONFIG_USB_EHCI_HCD -#define CONFIG_USB_EHCI_PCI #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_PCI_EHCI_DEVICE 0 #endif diff --git a/include/configs/efi-x86.h b/include/configs/efi-x86.h index fa263632a2..43935bf4b4 100644 --- a/include/configs/efi-x86.h +++ b/include/configs/efi-x86.h @@ -12,7 +12,6 @@ #undef CONFIG_TPM_TIS_BASE_ADDRESS #undef CONFIG_SCSI_AHCI -#undef CONFIG_USB_EHCI_PCI #define CONFIG_STD_DEVICES_SETTINGS "stdin=usbkbd,vga,serial\0" \ "stdout=vga,serial\0" \ diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 6f5313931a..9a64063c3e 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -88,13 +88,8 @@ #define CONFIG_NAND_DENALI_ECC_SIZE 1024 -#ifdef CONFIG_ARCH_UNIPHIER_SLD3 -#define CONFIG_SYS_NAND_REGS_BASE 0xf8100000 -#define CONFIG_SYS_NAND_DATA_BASE 0xf8000000 -#else #define CONFIG_SYS_NAND_REGS_BASE 0x68100000 #define CONFIG_SYS_NAND_DATA_BASE 0x68000000 -#endif #define CONFIG_SYS_NAND_BASE (CONFIG_SYS_NAND_DATA_BASE + 0x10) @@ -249,8 +244,7 @@ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE) /* only for SPL */ -#if defined(CONFIG_ARCH_UNIPHIER_SLD3) || \ - defined(CONFIG_ARCH_UNIPHIER_LD4) || \ +#if defined(CONFIG_ARCH_UNIPHIER_LD4) || \ defined(CONFIG_ARCH_UNIPHIER_SLD8) #define CONFIG_SPL_TEXT_BASE 0x00040000 #else diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 687f8df450..49fcbc5b9f 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -118,7 +118,6 @@ /*----------------------------------------------------------------------- * USB configuration */ -#define CONFIG_USB_EHCI_PCI #define CONFIG_SYS_USB_EVENT_POLL #define CONFIG_USB_HOST_ETHER |