[PATCH v3 3/3] ARM: OMAP: TI814X: Create board support and enable build for TI8148 EVM

[Igor Grinberg]

Hi Hemant,

On 09/29/11 04:09, Hemant Pedanekar wrote:
> This patch adds minimal support and build configuration for TI8148 EVM. Also
> adds support for low level debugging on UART1 console on the EVM.
> 
> Note that existing TI8168 EVM file (board-ti8168evm.c) is updated with machine
> info for TI8148 EVM and renamed as board-ti81xxevm.c.

Should we really rename the existing file?
Shouldn't we just stick to the name of the file submitted first?
(e.g. board-ti8168evm.c) and just add the support for the new
TI8148 EVM in to the existing file?
Because, I don't see any real necessity in renaming that file.
Also, it will spare the changes in Makefile.

> 
> Signed-off-by: Hemant Pedanekar <hemantp at ti.com>
> ---
>  arch/arm/mach-omap2/Kconfig                        |    5 ++++
>  arch/arm/mach-omap2/Makefile                       |    3 +-
>  .../{board-ti8168evm.c => board-ti81xxevm.c}       |   22 ++++++++++++++-----
>  arch/arm/plat-omap/include/plat/uncompress.h       |    3 ++
>  4 files changed, 26 insertions(+), 7 deletions(-)
>  rename arch/arm/mach-omap2/{board-ti8168evm.c => board-ti81xxevm.c} (66%)
> 
> diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
> index a3b9227..cc4f213 100644
> --- a/arch/arm/mach-omap2/Kconfig
> +++ b/arch/arm/mach-omap2/Kconfig
> @@ -316,6 +316,11 @@ config MACH_TI8168EVM
>  	depends on SOC_OMAPTI81XX
>  	default y
>  
> +config MACH_TI8148EVM
> +	bool "TI8148 Evaluation Module"
> +	depends on SOC_OMAPTI81XX
> +	default y
> +
>  config MACH_OMAP_4430SDP
>  	bool "OMAP 4430 SDP board"
>  	default y
> diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
> index 5ee4cd6..1dc2c6b 100644
> --- a/arch/arm/mach-omap2/Makefile
> +++ b/arch/arm/mach-omap2/Makefile
> @@ -239,7 +239,8 @@ obj-$(CONFIG_MACH_OMAP3517EVM)		+= board-am3517evm.o \
>  obj-$(CONFIG_MACH_CRANEBOARD)		+= board-am3517crane.o
>  
>  obj-$(CONFIG_MACH_SBC3530)		+= board-omap3stalker.o
> -obj-$(CONFIG_MACH_TI8168EVM)		+= board-ti8168evm.o
> +obj-$(CONFIG_MACH_TI8168EVM)		+= board-ti81xxevm.o
> +obj-$(CONFIG_MACH_TI8148EVM)		+= board-ti81xxevm.o
>  
>  # Platform specific device init code
>  
> diff --git a/arch/arm/mach-omap2/board-ti8168evm.c b/arch/arm/mach-omap2/board-ti81xxevm.c
> similarity index 66%
> rename from arch/arm/mach-omap2/board-ti8168evm.c
> rename to arch/arm/mach-omap2/board-ti81xxevm.c
> index 7935fc9..b858921 100644
> --- a/arch/arm/mach-omap2/board-ti8168evm.c
> +++ b/arch/arm/mach-omap2/board-ti81xxevm.c
> @@ -1,5 +1,5 @@
>  /*
> - * Code for TI8168 EVM.
> + * Code for TI8168/TI8148 EVM.
>   *
>   * Copyright (C) 2010 Texas Instruments, Inc. - http://www.ti.com/
>   *
> @@ -24,15 +24,15 @@
>  #include <plat/board.h>
>  #include <plat/common.h>
>  
> -static struct omap_board_config_kernel ti8168_evm_config[] __initdata = {
> +static struct omap_board_config_kernel ti81xx_evm_config[] __initdata = {
>  };
>  
> -static void __init ti8168_evm_init(void)
> +static void __init ti81xx_evm_init(void)
>  {
>  	omap_serial_init();
>  	omap_sdrc_init(NULL, NULL);
> -	omap_board_config = ti8168_evm_config;
> -	omap_board_config_size = ARRAY_SIZE(ti8168_evm_config);
> +	omap_board_config = ti81xx_evm_config;
> +	omap_board_config_size = ARRAY_SIZE(ti81xx_evm_config);
>  }
>  
>  MACHINE_START(TI8168EVM, "ti8168evm")
> @@ -42,5 +42,15 @@ MACHINE_START(TI8168EVM, "ti8168evm")
>  	.init_early	= ti81xx_init_early,
>  	.init_irq	= ti81xx_init_irq,
>  	.timer		= &omap3_timer,
> -	.init_machine	= ti8168_evm_init,
> +	.init_machine	= ti81xx_evm_init,
> +MACHINE_END
> +
> +MACHINE_START(TI8148EVM, "ti8148evm")
> +	/* Maintainer: Texas Instruments */
> +	.atag_offset	= 0x100,
> +	.map_io		= ti81xx_map_io,
> +	.init_early	= ti81xx_init_early,
> +	.init_irq	= ti81xx_init_irq,
> +	.timer		= &omap3_timer,
> +	.init_machine	= ti81xx_evm_init,
>  MACHINE_END
> diff --git a/arch/arm/plat-omap/include/plat/uncompress.h b/arch/arm/plat-omap/include/plat/uncompress.h
> index 40336ad..8d052e7 100644
> --- a/arch/arm/plat-omap/include/plat/uncompress.h
> +++ b/arch/arm/plat-omap/include/plat/uncompress.h
> @@ -175,6 +175,9 @@ static inline void __arch_decomp_setup(unsigned long arch_id)
>  		/* TI8168 base boards using UART3 */
>  		DEBUG_LL_TI81XX(3, ti8168evm);
>  
> +		/* TI8148 base boards using UART1 */
> +		DEBUG_LL_TI81XX(1, ti8148evm);
> +
>  	} while (0);
>  }
>  

-- 
Regards,
Igor.