From: Naresh Medisetty <[email protected]> Currently the auto generated file mach-types.h is checking for MACH_DAVINCI_DM6467_EVM, while it is configured as MACH_DAVINCI_DM646X_EVM in the Kconfigs and defconfigs. So machine_is_davinci_dm6467_evm() always returns FALSE.
Signed-off-by: Naresh Medisetty <[email protected]> --- arch/arm/configs/davinci_all_defconfig | 2 +- arch/arm/configs/davinci_evm_dm646x_defconfig | 2 +- arch/arm/mach-davinci/Kconfig | 6 +++--- arch/arm/mach-davinci/Makefile | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/configs/davinci_all_defconfig b/arch/arm/configs/davinci_all_defconfig index fe0123d..0c0d7d0 100644 --- a/arch/arm/configs/davinci_all_defconfig +++ b/arch/arm/configs/davinci_all_defconfig @@ -187,7 +187,7 @@ CONFIG_ARCH_DAVINCI_DM355=y # DaVinci Board Type # CONFIG_MACH_DAVINCI_EVM=y -CONFIG_MACH_DAVINCI_DM646X_EVM=y +CONFIG_MACH_DAVINCI_DM6467_EVM=y CONFIG_MACH_DAVINCI_DM355_EVM=y CONFIG_MACH_SFFSDR=y CONFIG_DAVINCI_MUX=y diff --git a/arch/arm/configs/davinci_evm_dm646x_defconfig b/arch/arm/configs/davinci_evm_dm646x_defconfig index 6284034..5a45cf4 100644 --- a/arch/arm/configs/davinci_evm_dm646x_defconfig +++ b/arch/arm/configs/davinci_evm_dm646x_defconfig @@ -181,7 +181,7 @@ CONFIG_ARCH_DAVINCI_DM646x=y # # DaVinci Board Type # -CONFIG_MACH_DAVINCI_DM646X_EVM=y +CONFIG_MACH_DAVINCI_DM6467_EVM=y CONFIG_DAVINCI_I2C_EXPANDER=y # CONFIG_DAVINCI_MCBSP is not set # CONFIG_DAVINCI_RESET_CLOCKS is not set diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig index 6dbe7df..decd7b4 100644 --- a/arch/arm/mach-davinci/Kconfig +++ b/arch/arm/mach-davinci/Kconfig @@ -26,13 +26,13 @@ config MACH_DAVINCI_EVM Configure this option to specify the whether the board used for development is a DM644x EVM -config MACH_DAVINCI_DM646X_EVM - bool "TI DM646x EVM" +config MACH_DAVINCI_DM6467_EVM + bool "TI DM6467 EVM" default n depends on ARCH_DAVINCI_DM646x help Configure this option to specify the whether the board used - for development is a DM646x EVM + for development is a DM6467 EVM config MACH_DAVINCI_DM355_EVM bool "TI DM355 EVM" diff --git a/arch/arm/mach-davinci/Makefile b/arch/arm/mach-davinci/Makefile index 370a507..9a26431 100644 --- a/arch/arm/mach-davinci/Makefile +++ b/arch/arm/mach-davinci/Makefile @@ -17,7 +17,7 @@ obj-$(CONFIG_CP_INTC) += cp_intc.o # Board specific obj-$(CONFIG_MACH_DAVINCI_EVM) += board-dm644x-evm.o -obj-$(CONFIG_MACH_DAVINCI_DM646X_EVM) += board-dm646x-evm.o +obj-$(CONFIG_MACH_DAVINCI_DM6467_EVM) += board-dm646x-evm.o obj-$(CONFIG_MACH_DAVINCI_DM355_EVM) += board-dm355-evm.o obj-$(CONFIG_MACH_SFFSDR) += board-sffsdr.o obj-$(CONFIG_MACH_DM355_LEOPARD) += board-dm355-leopard.o -- 1.5.6 _______________________________________________ Davinci-linux-open-source mailing list [email protected] http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
