The SOC family symbol CONFIG_AM57XX was removed by the commit 3891a54: "ARM: DRA7x/AM57xx: Get rid of CONFIG_AM57XX".
The symbol is needed by the XHCI OMAP USB driver. Without the symbol all the AM57x targets symbols should be ored in the ifdef'ery. Signed-off-by: Uri Mashiach <uri.mashi...@compulab.co.il> --- V1 -> V2: Replace the commit "fix XHCI registers base address". include/configs/am57xx_evm.h | 1 + include/configs/cl-som-am57x.h | 1 + include/linux/usb/xhci-omap.h | 2 +- scripts/config_whitelist.txt | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h index 3d8b996..2896628 100644 --- a/include/configs/am57xx_evm.h +++ b/include/configs/am57xx_evm.h @@ -15,6 +15,7 @@ #include <environment/ti/dfu.h> #define CONFIG_DRA7XX +#define CONFIG_AM57XX #ifdef CONFIG_SPL_BUILD #define CONFIG_IODELAY_RECALIBRATION diff --git a/include/configs/cl-som-am57x.h b/include/configs/cl-som-am57x.h index e1f724b..4d1ceff 100644 --- a/include/configs/cl-som-am57x.h +++ b/include/configs/cl-som-am57x.h @@ -12,6 +12,7 @@ #define __CONFIG_CL_SOM_AM57X_H #define CONFIG_DRA7XX +#define CONFIG_AM57XX #define CONFIG_NR_DRAM_BANKS 2 diff --git a/include/linux/usb/xhci-omap.h b/include/linux/usb/xhci-omap.h index 9de80d7..ba21d60 100644 --- a/include/linux/usb/xhci-omap.h +++ b/include/linux/usb/xhci-omap.h @@ -14,7 +14,7 @@ #define OMAP_XHCI_BASE 0x488d0000 #define OMAP_OCP1_SCP_BASE 0x4A081000 #define OMAP_OTG_WRAPPER_BASE 0x488c0000 -#elif defined CONFIG_TARGET_AM57XX_EVM +#elif defined CONFIG_AM57XX #define OMAP_XHCI_BASE 0x48890000 #define OMAP_OCP1_SCP_BASE 0x4A084c00 #define OMAP_OTG_WRAPPER_BASE 0x48880000 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index d21589b..7c7f372 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -85,6 +85,7 @@ CONFIG_AM335X_USB0_MODE CONFIG_AM335X_USB1 CONFIG_AM335X_USB1_MODE CONFIG_AM437X_USB2PHY2_HOST +CONFIG_AM57XX CONFIG_AMBAPP_IOAREA CONFIG_AMCC_DEF_ENV CONFIG_AMCC_DEF_ENV_NOR_UPD -- 2.7.4 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
