On Thu, Jun 27, 2019 at 12:21 AM Marek Vasut <ma...@denx.de> wrote:
>
> The company Samtec was merged into Softing, migrate the board over to
> the new name and update copyright headers.
>
> Signed-off-by: Marek Vasut <ma...@denx.de>
> Cc: Silvio Fricke <silvio.fri...@softing.com>
> Cc: Simon Goldschmidt <simon.k.r.goldschm...@gmail.com>
Reviewed-by: Simon Goldschmidt <simon.k.r.goldschm...@gmail.com>
> ---
> arch/arm/dts/socfpga_cyclone5_vining_fpga.dts | 2 +-
> arch/arm/mach-socfpga/Kconfig | 10 +++++-----
> board/{samtec => softing}/vining_fpga/MAINTAINERS | 0
> board/{samtec => softing}/vining_fpga/Makefile | 0
> .../vining_fpga/qts/iocsr_config.h | 0
> .../vining_fpga/qts/pinmux_config.h | 0
> .../{samtec => softing}/vining_fpga/qts/pll_config.h | 0
> .../vining_fpga/qts/sdram_config.h | 0
> board/{samtec => softing}/vining_fpga/socfpga.c | 0
> configs/socfpga_vining_fpga_defconfig | 6 +++---
> include/configs/socfpga_vining_fpga.h | 12 ++++++------
> 11 files changed, 15 insertions(+), 15 deletions(-)
> rename board/{samtec => softing}/vining_fpga/MAINTAINERS (100%)
> rename board/{samtec => softing}/vining_fpga/Makefile (100%)
> rename board/{samtec => softing}/vining_fpga/qts/iocsr_config.h (100%)
> rename board/{samtec => softing}/vining_fpga/qts/pinmux_config.h (100%)
> rename board/{samtec => softing}/vining_fpga/qts/pll_config.h (100%)
> rename board/{samtec => softing}/vining_fpga/qts/sdram_config.h (100%)
> rename board/{samtec => softing}/vining_fpga/socfpga.c (100%)
>
> diff --git a/arch/arm/dts/socfpga_cyclone5_vining_fpga.dts
> b/arch/arm/dts/socfpga_cyclone5_vining_fpga.dts
> index ac57f41cb5..be52fbf43d 100644
> --- a/arch/arm/dts/socfpga_cyclone5_vining_fpga.dts
> +++ b/arch/arm/dts/socfpga_cyclone5_vining_fpga.dts
> @@ -8,7 +8,7 @@
> #include <dt-bindings/input/input.h>
>
> / {
> - model = "samtec VIN|ING FPGA";
> + model = "Softing VIN|ING FPGA";
> compatible = "samtec,vining", "altr,socfpga-cyclone5", "altr,socfpga";
>
> chosen {
> diff --git a/arch/arm/mach-socfpga/Kconfig b/arch/arm/mach-socfpga/Kconfig
> index 1d914648e3..5762b425a7 100644
> --- a/arch/arm/mach-socfpga/Kconfig
> +++ b/arch/arm/mach-socfpga/Kconfig
> @@ -100,8 +100,8 @@ config TARGET_SOCFPGA_IS1
> bool "IS1 (Cyclone V)"
> select TARGET_SOCFPGA_CYCLONE5
>
> -config TARGET_SOCFPGA_SAMTEC_VINING_FPGA
> - bool "samtec VIN|ING FPGA (Cyclone V)"
> +config TARGET_SOCFPGA_SOFTING_VINING_FPGA
> + bool "Softing VIN|ING FPGA (Cyclone V)"
> select BOARD_LATE_INIT
> select TARGET_SOCFPGA_CYCLONE5
>
> @@ -145,7 +145,7 @@ config SYS_BOARD
> default "socrates" if TARGET_SOCFPGA_EBV_SOCRATES
> default "sr1500" if TARGET_SOCFPGA_SR1500
> default "stratix10-socdk" if TARGET_SOCFPGA_STRATIX10_SOCDK
> - default "vining_fpga" if TARGET_SOCFPGA_SAMTEC_VINING_FPGA
> + default "vining_fpga" if TARGET_SOCFPGA_SOFTING_VINING_FPGA
>
> config SYS_VENDOR
> default "altera" if TARGET_SOCFPGA_ARRIA5_SOCDK
> @@ -155,7 +155,7 @@ config SYS_VENDOR
> default "aries" if TARGET_SOCFPGA_ARIES_MCVEVK
> default "devboards" if TARGET_SOCFPGA_DEVBOARDS_DBM_SOC1
> default "ebv" if TARGET_SOCFPGA_EBV_SOCRATES
> - default "samtec" if TARGET_SOCFPGA_SAMTEC_VINING_FPGA
> + default "softing" if TARGET_SOCFPGA_SOFTING_VINING_FPGA
> default "terasic" if TARGET_SOCFPGA_TERASIC_DE0_NANO
> default "terasic" if TARGET_SOCFPGA_TERASIC_DE1_SOC
> default "terasic" if TARGET_SOCFPGA_TERASIC_DE10_NANO
> @@ -178,6 +178,6 @@ config SYS_CONFIG_NAME
> default "socfpga_socrates" if TARGET_SOCFPGA_EBV_SOCRATES
> default "socfpga_sr1500" if TARGET_SOCFPGA_SR1500
> default "socfpga_stratix10_socdk" if TARGET_SOCFPGA_STRATIX10_SOCDK
> - default "socfpga_vining_fpga" if TARGET_SOCFPGA_SAMTEC_VINING_FPGA
> + default "socfpga_vining_fpga" if TARGET_SOCFPGA_SOFTING_VINING_FPGA
>
> endif
> diff --git a/board/samtec/vining_fpga/MAINTAINERS
> b/board/softing/vining_fpga/MAINTAINERS
> similarity index 100%
> rename from board/samtec/vining_fpga/MAINTAINERS
> rename to board/softing/vining_fpga/MAINTAINERS
> diff --git a/board/samtec/vining_fpga/Makefile
> b/board/softing/vining_fpga/Makefile
> similarity index 100%
> rename from board/samtec/vining_fpga/Makefile
> rename to board/softing/vining_fpga/Makefile
> diff --git a/board/samtec/vining_fpga/qts/iocsr_config.h
> b/board/softing/vining_fpga/qts/iocsr_config.h
> similarity index 100%
> rename from board/samtec/vining_fpga/qts/iocsr_config.h
> rename to board/softing/vining_fpga/qts/iocsr_config.h
> diff --git a/board/samtec/vining_fpga/qts/pinmux_config.h
> b/board/softing/vining_fpga/qts/pinmux_config.h
> similarity index 100%
> rename from board/samtec/vining_fpga/qts/pinmux_config.h
> rename to board/softing/vining_fpga/qts/pinmux_config.h
> diff --git a/board/samtec/vining_fpga/qts/pll_config.h
> b/board/softing/vining_fpga/qts/pll_config.h
> similarity index 100%
> rename from board/samtec/vining_fpga/qts/pll_config.h
> rename to board/softing/vining_fpga/qts/pll_config.h
> diff --git a/board/samtec/vining_fpga/qts/sdram_config.h
> b/board/softing/vining_fpga/qts/sdram_config.h
> similarity index 100%
> rename from board/samtec/vining_fpga/qts/sdram_config.h
> rename to board/softing/vining_fpga/qts/sdram_config.h
> diff --git a/board/samtec/vining_fpga/socfpga.c
> b/board/softing/vining_fpga/socfpga.c
> similarity index 100%
> rename from board/samtec/vining_fpga/socfpga.c
> rename to board/softing/vining_fpga/socfpga.c
> diff --git a/configs/socfpga_vining_fpga_defconfig
> b/configs/socfpga_vining_fpga_defconfig
> index 958f146e1c..9621f6ec68 100644
> --- a/configs/socfpga_vining_fpga_defconfig
> +++ b/configs/socfpga_vining_fpga_defconfig
> @@ -1,6 +1,6 @@
> CONFIG_ARM=y
> CONFIG_ARCH_SOCFPGA=y
> -CONFIG_TARGET_SOCFPGA_SAMTEC_VINING_FPGA=y
> +CONFIG_TARGET_SOCFPGA_SOFTING_VINING_FPGA=y
> CONFIG_DISTRO_DEFAULTS=y
> CONFIG_FIT=y
> CONFIG_BOOTDELAY=5
> @@ -32,7 +32,7 @@ CONFIG_CMD_CACHE=y
> CONFIG_CMD_TIME=y
> CONFIG_CMD_EXT4_WRITE=y
> CONFIG_MTDIDS_DEFAULT="nor0=ff705000.spi.0"
> -CONFIG_MTDPARTS_DEFAULT="mtdparts=ff705000.spi.0:1m(u-boot),64k(env1),64k(env2),256k(samtec1),256k(samtec2),-(rcvrfs);"
> +CONFIG_MTDPARTS_DEFAULT="mtdparts=ff705000.spi.0:1m(u-boot),64k(env1),64k(env2),256k(softing1),256k(softing2),-(rcvrfs);"
> CONFIG_CMD_UBI=y
> # CONFIG_ISO_PARTITION is not set
> # CONFIG_EFI_PARTITION is not set
> @@ -83,7 +83,7 @@ CONFIG_USB=y
> CONFIG_DM_USB=y
> CONFIG_USB_DWC2=y
> CONFIG_USB_GADGET=y
> -CONFIG_USB_GADGET_MANUFACTURER="samtec"
> +CONFIG_USB_GADGET_MANUFACTURER="softing"
> CONFIG_USB_GADGET_VENDOR_NUM=0x0525
> CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
> CONFIG_USB_GADGET_DWC2_OTG=y
> diff --git a/include/configs/socfpga_vining_fpga.h
> b/include/configs/socfpga_vining_fpga.h
> index 29a92b9146..cdca65ae95 100644
> --- a/include/configs/socfpga_vining_fpga.h
> +++ b/include/configs/socfpga_vining_fpga.h
> @@ -1,9 +1,9 @@
> /* SPDX-License-Identifier: GPL-2.0+ */
> /*
> - * Copyright (C) 2015 Marek Vasut <ma...@denx.de>
> + * Copyright (C) 2015-2019 Marek Vasut <ma...@denx.de>
> */
> -#ifndef __CONFIG_SAMTEC_VINING_FPGA_H__
> -#define __CONFIG_SAMTEC_VINING_FPGA_H__
> +#ifndef __CONFIG_SOFTING_VINING_FPGA_H__
> +#define __CONFIG_SOFTING_VINING_FPGA_H__
>
> #include <asm/arch/base_addr_ac5.h>
>
> @@ -60,8 +60,8 @@
> "1m(u-boot)," \
> "64k(env1)," \
> "64k(env2)," \
> - "256k(samtec1)," \
> - "256k(samtec2)," \
> + "256k(softing1)," \
> + "256k(softing2)," \
> "-(rcvrfs)\0" /* Recovery */ \
> "mtdparts_1=ff705000.spi.1:" \
> "32m(rootfs)," \
> @@ -159,4 +159,4 @@
> /* The rest of the configuration is shared */
> #include <configs/socfpga_common.h>
>
> -#endif /* __CONFIG_SAMTEC_VINING_FPGA_H__ */
> +#endif /* __CONFIG_SOFTING_VINING_FPGA_H__ */
> --
> 2.20.1
>
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
