[U-Boot,4/7] igep0033: Rename to igep003x

Rename igep0033 to igep003x as IGEP SMARC AM335x module (igep0034)
can use the same source files.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
 arch/arm/Kconfig                                         | 2 +-
 arch/arm/mach-omap2/am33xx/Kconfig                       | 4 ++--
 board/isee/{igep0033 => igep003x}/Kconfig                | 6 +++---
 board/isee/{igep0033 => igep003x}/MAINTAINERS            | 6 +++---
 board/isee/{igep0033 => igep003x}/Makefile               | 0
 board/isee/{igep0033 => igep003x}/board.c                | 0
 board/isee/{igep0033 => igep003x}/board.h                | 0
 board/isee/{igep0033 => igep003x}/mux.c                  | 0
 configs/am335x_igep0033_defconfig                        | 5 ++++-
 include/configs/{am335x_igep0033.h => am335x_igep003x.h} | 9 +++------
 10 files changed, 16 insertions(+), 16 deletions(-)

Tested-by: Pau Pajuelo <ppajuel@gmail.com>

2017-04-01 17:17 GMT+02:00 Ladislav Michl <ladis@linux-mips.org>:
>
> Rename igep0033 to igep003x as IGEP SMARC AM335x module (igep0034)
> can use the same source files.
>
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> ---
>  arch/arm/Kconfig                                         | 2 +-
>  arch/arm/mach-omap2/am33xx/Kconfig                       | 4 ++--
>  board/isee/{igep0033 => igep003x}/Kconfig                | 6 +++---
>  board/isee/{igep0033 => igep003x}/MAINTAINERS            | 6 +++---
>  board/isee/{igep0033 => igep003x}/Makefile               | 0
>  board/isee/{igep0033 => igep003x}/board.c                | 0
>  board/isee/{igep0033 => igep003x}/board.h                | 0
>  board/isee/{igep0033 => igep003x}/mux.c                  | 0
>  configs/am335x_igep0033_defconfig                        | 5 ++++-
>  include/configs/{am335x_igep0033.h => am335x_igep003x.h} | 9 +++------
>  10 files changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index dacfe9a13f..a9658930c7 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -1290,7 +1290,7 @@ source "board/gumstix/pepper/Kconfig"
>  source "board/h2200/Kconfig"
>  source "board/hisilicon/hikey/Kconfig"
>  source "board/imx31_phycore/Kconfig"
> -source "board/isee/igep0033/Kconfig"
> +source "board/isee/igep003x/Kconfig"
>  source "board/olimex/mx23_olinuxino/Kconfig"
>  source "board/phytec/pcm051/Kconfig"
>  source "board/ppcag/bg0900/Kconfig"
> diff --git a/arch/arm/mach-omap2/am33xx/Kconfig b/arch/arm/mach-omap2/am33xx/Kconfig
> index cf5d95a26d..387d488c47 100644
> --- a/arch/arm/mach-omap2/am33xx/Kconfig
> +++ b/arch/arm/mach-omap2/am33xx/Kconfig
> @@ -44,8 +44,8 @@ config TARGET_AM335X_BALTOS
>         select DM_SERIAL
>         select DM_GPIO
>
> -config TARGET_AM335X_IGEP0033
> -       bool "Support am335x_igep0033"
> +config TARGET_AM335X_IGEP003X
> +       bool "Support am335x_igep003x"
>         select DM
>         select DM_SERIAL
>         select DM_GPIO
> diff --git a/board/isee/igep0033/Kconfig b/board/isee/igep003x/Kconfig
> similarity index 61%
> rename from board/isee/igep0033/Kconfig
> rename to board/isee/igep003x/Kconfig
> index e989e4b15c..68a68fc52f 100644
> --- a/board/isee/igep0033/Kconfig
> +++ b/board/isee/igep003x/Kconfig
> @@ -1,7 +1,7 @@
> -if TARGET_AM335X_IGEP0033
> +if TARGET_AM335X_IGEP003X
>
>  config SYS_BOARD
> -       default "igep0033"
> +       default "igep003x"
>
>  config SYS_VENDOR
>         default "isee"
> @@ -10,6 +10,6 @@ config SYS_SOC
>         default "am33xx"
>
>  config SYS_CONFIG_NAME
> -       default "am335x_igep0033"
> +       default "am335x_igep003x"
>
>  endif
> diff --git a/board/isee/igep0033/MAINTAINERS b/board/isee/igep003x/MAINTAINERS
> similarity index 56%
> rename from board/isee/igep0033/MAINTAINERS
> rename to board/isee/igep003x/MAINTAINERS
> index bd8a1f2eb4..748b189c4e 100644
> --- a/board/isee/igep0033/MAINTAINERS
> +++ b/board/isee/igep003x/MAINTAINERS
> @@ -1,6 +1,6 @@
> -IGEP0033 BOARD
> +IGEP003X BOARD
>  M:     Enric Balletbo i Serra <eballetbo@gmail.com>
>  S:     Maintained
> -F:     board/isee/igep0033/
> -F:     include/configs/am335x_igep0033.h
> +F:     board/isee/igep003x/
> +F:     include/configs/am335x_igep003x.h
>  F:     configs/am335x_igep0033_defconfig
> diff --git a/board/isee/igep0033/Makefile b/board/isee/igep003x/Makefile
> similarity index 100%
> rename from board/isee/igep0033/Makefile
> rename to board/isee/igep003x/Makefile
> diff --git a/board/isee/igep0033/board.c b/board/isee/igep003x/board.c
> similarity index 100%
> rename from board/isee/igep0033/board.c
> rename to board/isee/igep003x/board.c
> diff --git a/board/isee/igep0033/board.h b/board/isee/igep003x/board.h
> similarity index 100%
> rename from board/isee/igep0033/board.h
> rename to board/isee/igep003x/board.h
> diff --git a/board/isee/igep0033/mux.c b/board/isee/igep003x/mux.c
> similarity index 100%
> rename from board/isee/igep0033/mux.c
> rename to board/isee/igep003x/mux.c
> diff --git a/configs/am335x_igep0033_defconfig b/configs/am335x_igep0033_defconfig
> index a1991de4ff..12f04c68f9 100644
> --- a/configs/am335x_igep0033_defconfig
> +++ b/configs/am335x_igep0033_defconfig
> @@ -3,7 +3,8 @@ CONFIG_AM33XX=y
>  CONFIG_SPL_GPIO_SUPPORT=y
>  CONFIG_SPL_LIBCOMMON_SUPPORT=y
>  CONFIG_SPL_LIBGENERIC_SUPPORT=y
> -CONFIG_TARGET_AM335X_IGEP0033=y
> +CONFIG_SYS_MALLOC_F_LEN=0x2000
> +CONFIG_TARGET_AM335X_IGEP003X=y
>  CONFIG_SPL_MMC_SUPPORT=y
>  CONFIG_SPL_SERIAL_SUPPORT=y
>  CONFIG_SPL_LIBDISK_SUPPORT=y
> @@ -12,6 +13,7 @@ CONFIG_SPL_WATCHDOG_SUPPORT=y
>  CONFIG_SPL_FAT_SUPPORT=y
>  CONFIG_SPL_POWER_SUPPORT=y
>  CONFIG_SPL_STACK_R_ADDR=0x82000000
> +CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0033"
>  CONFIG_SYS_CONSOLE_INFO_QUIET=y
>  CONFIG_VERSION_VARIABLE=y
>  CONFIG_SPL=y
> @@ -44,3 +46,4 @@ CONFIG_EFI_PARTITION=y
>  CONFIG_MMC_OMAP_HS=y
>  CONFIG_SYS_NS16550=y
>  CONFIG_OF_LIBFDT=y
> +# CONFIG_GENERATE_SMBIOS_TABLE is not set
> diff --git a/include/configs/am335x_igep0033.h b/include/configs/am335x_igep003x.h
> similarity index 96%
> rename from include/configs/am335x_igep0033.h
> rename to include/configs/am335x_igep003x.h
> index 2b61405345..348b16f3e8 100644
> --- a/include/configs/am335x_igep0033.h
> +++ b/include/configs/am335x_igep003x.h
> @@ -11,15 +11,12 @@
>   * GNU General Public License for more details.
>   */
>
> -#ifndef __CONFIG_IGEP0033_H
> -#define __CONFIG_IGEP0033_H
> +#ifndef __CONFIG_IGEP003X_H
> +#define __CONFIG_IGEP003X_H
>
>  #define CONFIG_NAND
>  #include <configs/ti_am335x_common.h>
>
> -/* Mach type */
> -#define CONFIG_MACH_TYPE               MACH_TYPE_IGEP0033
> -
>  /* Clock defines */
>  #define V_OSCK                         24000000  /* Clock output from T2 */
>  #define V_SCLK                         (V_OSCK)
> @@ -146,4 +143,4 @@
>
>  #define CONFIG_SYS_NAND_U_BOOT_OFFS    0x80000
>
> -#endif /* ! __CONFIG_IGEP0033_H */
> +#endif /* ! __CONFIG_IGEP003X_H */
> --
> 2.11.0
>

On Sat, Apr 01, 2017 at 05:17:16PM +0200, Ladislav Michl wrote:

> Rename igep0033 to igep003x as IGEP SMARC AM335x module (igep0034)
> can use the same source files.
> 
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> Tested-by: Pau Pajuelo <ppajuel@gmail.com>

Applied to u-boot/master, thanks!