[U-Boot] [PATCH v1 0/2] Rename all B&R boards to more meaningful name
We've internally decided to name all B&R boards to be related in the final product where they are built in, which is more meaningful than the name of the circuit board itself.
Hannes Schmelzer (2): board/BuR: rename tseries board to brppt1 board/BuR: rename kwb board to brxre1
arch/arm/Kconfig | 12 ++++++------ board/BuR/{kwb => brppt1}/Kconfig | 6 +++--- board/BuR/brppt1/MAINTAINERS | 8 ++++++++ board/BuR/{tseries => brppt1}/Makefile | 0 board/BuR/{tseries => brppt1}/board.c | 2 +- board/BuR/{tseries => brppt1}/mux.c | 2 +- board/BuR/{tseries => brxre1}/Kconfig | 6 +++--- board/BuR/brxre1/MAINTAINERS | 6 ++++++ board/BuR/{kwb => brxre1}/Makefile | 0 board/BuR/{kwb => brxre1}/board.c | 6 +++--- board/BuR/{kwb => brxre1}/mux.c | 0 board/BuR/kwb/MAINTAINERS | 6 ------ board/BuR/tseries/MAINTAINERS | 8 -------- configs/{tseries_mmc_defconfig => brppt1_mmc_defconfig} | 2 +- configs/{tseries_nand_defconfig => brppt1_nand_defconfig} | 2 +- configs/{tseries_spi_defconfig => brppt1_spi_defconfig} | 2 +- configs/{kwb_defconfig => brxre1_defconfig} | 2 +- include/configs/{tseries.h => brppt1.h} | 8 ++++---- include/configs/{kwb.h => brxre1.h} | 8 ++++---- 19 files changed, 43 insertions(+), 43 deletions(-) rename board/BuR/{kwb => brppt1}/Kconfig (68%) create mode 100644 board/BuR/brppt1/MAINTAINERS rename board/BuR/{tseries => brppt1}/Makefile (100%) rename board/BuR/{tseries => brppt1}/board.c (99%) rename board/BuR/{tseries => brppt1}/mux.c (99%) rename board/BuR/{tseries => brxre1}/Kconfig (67%) create mode 100644 board/BuR/brxre1/MAINTAINERS rename board/BuR/{kwb => brxre1}/Makefile (100%) rename board/BuR/{kwb => brxre1}/board.c (98%) rename board/BuR/{kwb => brxre1}/mux.c (100%) delete mode 100644 board/BuR/kwb/MAINTAINERS delete mode 100644 board/BuR/tseries/MAINTAINERS rename configs/{tseries_mmc_defconfig => brppt1_mmc_defconfig} (97%) rename configs/{tseries_nand_defconfig => brppt1_nand_defconfig} (97%) rename configs/{tseries_spi_defconfig => brppt1_spi_defconfig} (97%) rename configs/{kwb_defconfig => brxre1_defconfig} (97%) rename include/configs/{tseries.h => brppt1.h} (98%) rename include/configs/{kwb.h => brxre1.h} (97%)
Rename B&R tseries board to brppt1
Signed-off-by: Hannes Schmelzer oe5hpm@oevsv.at ---
arch/arm/Kconfig | 6 +++--- board/BuR/{tseries => brppt1}/Kconfig | 6 +++--- board/BuR/brppt1/MAINTAINERS | 8 ++++++++ board/BuR/{tseries => brppt1}/Makefile | 0 board/BuR/{tseries => brppt1}/board.c | 2 +- board/BuR/{tseries => brppt1}/mux.c | 2 +- board/BuR/tseries/MAINTAINERS | 8 -------- configs/{tseries_mmc_defconfig => brppt1_mmc_defconfig} | 2 +- configs/{tseries_nand_defconfig => brppt1_nand_defconfig} | 2 +- configs/{tseries_spi_defconfig => brppt1_spi_defconfig} | 2 +- include/configs/{tseries.h => brppt1.h} | 8 ++++---- 11 files changed, 23 insertions(+), 23 deletions(-) rename board/BuR/{tseries => brppt1}/Kconfig (67%) create mode 100644 board/BuR/brppt1/MAINTAINERS rename board/BuR/{tseries => brppt1}/Makefile (100%) rename board/BuR/{tseries => brppt1}/board.c (99%) rename board/BuR/{tseries => brppt1}/mux.c (99%) delete mode 100644 board/BuR/tseries/MAINTAINERS rename configs/{tseries_mmc_defconfig => brppt1_mmc_defconfig} (97%) rename configs/{tseries_nand_defconfig => brppt1_nand_defconfig} (97%) rename configs/{tseries_spi_defconfig => brppt1_spi_defconfig} (97%) rename include/configs/{tseries.h => brppt1.h} (98%)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index e9d2fc9..3c2c755 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -309,8 +309,8 @@ config TARGET_KWB select CPU_V7 select SUPPORT_SPL
-config TARGET_TSERIES - bool "Support tseries" +config TARGET_BRPPT1 + bool "Support BRPPT1" select CPU_V7 select SUPPORT_SPL
@@ -909,7 +909,7 @@ source "arch/arm/imx-common/Kconfig"
source "board/bosch/shc/Kconfig" source "board/BuR/kwb/Kconfig" -source "board/BuR/tseries/Kconfig" +source "board/BuR/brppt1/Kconfig" source "board/CarMediaLab/flea3/Kconfig" source "board/Marvell/aspenite/Kconfig" source "board/Marvell/gplugd/Kconfig" diff --git a/board/BuR/tseries/Kconfig b/board/BuR/brppt1/Kconfig similarity index 67% rename from board/BuR/tseries/Kconfig rename to board/BuR/brppt1/Kconfig index ed48300..e006c80 100644 --- a/board/BuR/tseries/Kconfig +++ b/board/BuR/brppt1/Kconfig @@ -1,7 +1,7 @@ -if TARGET_TSERIES +if TARGET_BRPPT1
config SYS_BOARD - default "tseries" + default "brppt1"
config SYS_VENDOR default "BuR" @@ -10,6 +10,6 @@ config SYS_SOC default "am33xx"
config SYS_CONFIG_NAME - default "tseries" + default "brppt1"
endif diff --git a/board/BuR/brppt1/MAINTAINERS b/board/BuR/brppt1/MAINTAINERS new file mode 100644 index 0000000..9eddab4 --- /dev/null +++ b/board/BuR/brppt1/MAINTAINERS @@ -0,0 +1,8 @@ +BRPPT1 BOARD +M: Hannes Schmelzer hannes.schmelzer@br-automation.com +S: Maintained +F: board/BuR/brppt1/ +F: include/configs/brppt1.h +F: configs/brppt1_mmc_defconfig +F: configs/brppt1_nand_defconfig +F: configs/brppt1_spi_defconfig diff --git a/board/BuR/tseries/Makefile b/board/BuR/brppt1/Makefile similarity index 100% rename from board/BuR/tseries/Makefile rename to board/BuR/brppt1/Makefile diff --git a/board/BuR/tseries/board.c b/board/BuR/brppt1/board.c similarity index 99% rename from board/BuR/tseries/board.c rename to board/BuR/brppt1/board.c index bc119e6..a227221 100644 --- a/board/BuR/tseries/board.c +++ b/board/BuR/brppt1/board.c @@ -1,7 +1,7 @@ /* * board.c * - * Board functions for B&R LEIT Board + * Board functions for B&R BRPPT1 * * Copyright (C) 2013 Hannes Schmelzer oe5hpm@oevsv.at * Bernecker & Rainer Industrieelektronik GmbH - http://www.br-automation.com diff --git a/board/BuR/tseries/mux.c b/board/BuR/brppt1/mux.c similarity index 99% rename from board/BuR/tseries/mux.c rename to board/BuR/brppt1/mux.c index 349788a..ab3788f 100644 --- a/board/BuR/tseries/mux.c +++ b/board/BuR/brppt1/mux.c @@ -1,7 +1,7 @@ /* * mux.c * - * Pinmux Setting for B&R LEIT Board(s) + * Pinmux Setting for B&R BRPPT1 Board(s) * * Copyright (C) 2013 Hannes Schmelzer oe5hpm@oevsv.at * Bernecker & Rainer Industrieelektronik GmbH - http://www.br-automation.com diff --git a/board/BuR/tseries/MAINTAINERS b/board/BuR/tseries/MAINTAINERS deleted file mode 100644 index e2e67e6..0000000 --- a/board/BuR/tseries/MAINTAINERS +++ /dev/null @@ -1,8 +0,0 @@ -TSERIES BOARD -M: Hannes Schmelzer hannes.schmelzer@br-automation.com -S: Maintained -F: board/BuR/tseries/ -F: include/configs/tseries.h -F: configs/tseries_mmc_defconfig -F: configs/tseries_nand_defconfig -F: configs/tseries_spi_defconfig diff --git a/configs/tseries_mmc_defconfig b/configs/brppt1_mmc_defconfig similarity index 97% rename from configs/tseries_mmc_defconfig rename to configs/brppt1_mmc_defconfig index 337404b..f8d9de5 100644 --- a/configs/tseries_mmc_defconfig +++ b/configs/brppt1_mmc_defconfig @@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_TARGET_TSERIES=y +CONFIG_TARGET_BRPPT1=y CONFIG_SPL=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,EMMC_BOOT" diff --git a/configs/tseries_nand_defconfig b/configs/brppt1_nand_defconfig similarity index 97% rename from configs/tseries_nand_defconfig rename to configs/brppt1_nand_defconfig index 4dc0296..85ddbe7 100644 --- a/configs/tseries_nand_defconfig +++ b/configs/brppt1_nand_defconfig @@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_TARGET_TSERIES=y +CONFIG_TARGET_BRPPT1=y CONFIG_SPL=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND" diff --git a/configs/tseries_spi_defconfig b/configs/brppt1_spi_defconfig similarity index 97% rename from configs/tseries_spi_defconfig rename to configs/brppt1_spi_defconfig index 5b52bf6..37b8bc9 100644 --- a/configs/tseries_spi_defconfig +++ b/configs/brppt1_spi_defconfig @@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_TARGET_TSERIES=y +CONFIG_TARGET_BRPPT1=y CONFIG_SPL=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,SPI_BOOT,EMMC_BOOT" diff --git a/include/configs/tseries.h b/include/configs/brppt1.h similarity index 98% rename from include/configs/tseries.h rename to include/configs/brppt1.h index 8ed9eb0..6a239b5 100644 --- a/include/configs/tseries.h +++ b/include/configs/brppt1.h @@ -1,5 +1,5 @@ /* - * tseries.h + * brtpp1.h * * specific parts for B&R T-Series Motherboard * @@ -9,8 +9,8 @@ * SPDX-License-Identifier: GPL-2.0+ */
-#ifndef __CONFIG_TSERIES_H__ -#define __CONFIG_TSERIES_H__ +#ifndef __CONFIG_BRPPT1_H__ +#define __CONFIG_BRPPT1_H__
#include <configs/bur_cfg_common.h> #include <configs/bur_am335x_common.h> @@ -301,4 +301,4 @@ MMCARGS #define CONFIG_EXT4_WRITE #endif /* CONFIG_MMC, ... */
-#endif /* ! __CONFIG_TSERIES_H__ */ +#endif /* ! __CONFIG_BRPPT1_H__ */
On Wed, Jun 22, 2016 at 12:36:13PM +0200, Hannes Schmelzer wrote:
Rename B&R tseries board to brppt1
Signed-off-by: Hannes Schmelzer oe5hpm@oevsv.at
Reviewed-by: Tom Rini trini@konsulko.com
On Wed, Jun 22, 2016 at 12:36:13PM +0200, Hannes Schmelzer wrote:
Rename B&R tseries board to brppt1
Signed-off-by: Hannes Schmelzer oe5hpm@oevsv.at Reviewed-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
Rename B&R kwb board to brxre1
Signed-off-by: Hannes Schmelzer oe5hpm@oevsv.at ---
arch/arm/Kconfig | 6 +++--- board/BuR/{kwb => brxre1}/Kconfig | 6 +++--- board/BuR/brxre1/MAINTAINERS | 6 ++++++ board/BuR/{kwb => brxre1}/Makefile | 0 board/BuR/{kwb => brxre1}/board.c | 6 +++--- board/BuR/{kwb => brxre1}/mux.c | 0 board/BuR/kwb/MAINTAINERS | 6 ------ configs/{kwb_defconfig => brxre1_defconfig} | 2 +- include/configs/{kwb.h => brxre1.h} | 8 ++++---- 9 files changed, 20 insertions(+), 20 deletions(-) rename board/BuR/{kwb => brxre1}/Kconfig (68%) create mode 100644 board/BuR/brxre1/MAINTAINERS rename board/BuR/{kwb => brxre1}/Makefile (100%) rename board/BuR/{kwb => brxre1}/board.c (98%) rename board/BuR/{kwb => brxre1}/mux.c (100%) delete mode 100644 board/BuR/kwb/MAINTAINERS rename configs/{kwb_defconfig => brxre1_defconfig} (97%) rename include/configs/{kwb.h => brxre1.h} (97%)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 3c2c755..3237a74 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -304,8 +304,8 @@ config TARGET_VEXPRESS_CA9X4 bool "Support vexpress_ca9x4" select CPU_V7
-config TARGET_KWB - bool "Support kwb" +config TARGET_BRXRE1 + bool "Support BRXRE1" select CPU_V7 select SUPPORT_SPL
@@ -908,7 +908,7 @@ source "arch/arm/cpu/armv8/Kconfig" source "arch/arm/imx-common/Kconfig"
source "board/bosch/shc/Kconfig" -source "board/BuR/kwb/Kconfig" +source "board/BuR/brxre1/Kconfig" source "board/BuR/brppt1/Kconfig" source "board/CarMediaLab/flea3/Kconfig" source "board/Marvell/aspenite/Kconfig" diff --git a/board/BuR/kwb/Kconfig b/board/BuR/brxre1/Kconfig similarity index 68% rename from board/BuR/kwb/Kconfig rename to board/BuR/brxre1/Kconfig index 4beefbf..389e523 100644 --- a/board/BuR/kwb/Kconfig +++ b/board/BuR/brxre1/Kconfig @@ -1,7 +1,7 @@ -if TARGET_KWB +if TARGET_BRXRE1
config SYS_BOARD - default "kwb" + default "brxre1"
config SYS_VENDOR default "BuR" @@ -10,6 +10,6 @@ config SYS_SOC default "am33xx"
config SYS_CONFIG_NAME - default "kwb" + default "brxre1"
endif diff --git a/board/BuR/brxre1/MAINTAINERS b/board/BuR/brxre1/MAINTAINERS new file mode 100644 index 0000000..a10d9c1 --- /dev/null +++ b/board/BuR/brxre1/MAINTAINERS @@ -0,0 +1,6 @@ +BRXRE1 BOARD +M: Hannes Schmelzer hannes.schmelzer@br-automation.com +S: Maintained +F: board/BuR/brxre1/ +F: include/configs/brxre1.h +F: configs/brxre1_defconfig diff --git a/board/BuR/kwb/Makefile b/board/BuR/brxre1/Makefile similarity index 100% rename from board/BuR/kwb/Makefile rename to board/BuR/brxre1/Makefile diff --git a/board/BuR/kwb/board.c b/board/BuR/brxre1/board.c similarity index 98% rename from board/BuR/kwb/board.c rename to board/BuR/brxre1/board.c index ad74ff2..f4bfa41 100644 --- a/board/BuR/kwb/board.c +++ b/board/BuR/brxre1/board.c @@ -1,7 +1,7 @@ /* * board.c * - * Board functions for B&R KWB Board + * Board functions for B&R BRXRE1 Board * * Copyright (C) 2013 Hannes Schmelzer oe5hpm@oevsv.at * Bernecker & Rainer Industrieelektronik GmbH - http://www.br-automation.com @@ -101,7 +101,7 @@ void am33xx_spl_board_init(void) */ u32 *const clk_domains[] = { 0 };
- u32 *const clk_modules_kwbspecific[] = { + u32 *const clk_modules_xre1specific[] = { &cmwkup->wkup_adctscctrl, &cmper->spi1clkctrl, &cmper->dcan0clkctrl, @@ -113,7 +113,7 @@ void am33xx_spl_board_init(void) &cmper->lcdcclkstctrl, 0 }; - do_enable_clocks(clk_domains, clk_modules_kwbspecific, 1); + do_enable_clocks(clk_domains, clk_modules_xre1specific, 1); /* setup LCD-Pixel Clock */ writel(0x2, CM_DPLL + 0x34); /* power-OFF LCD-Display */ diff --git a/board/BuR/kwb/mux.c b/board/BuR/brxre1/mux.c similarity index 100% rename from board/BuR/kwb/mux.c rename to board/BuR/brxre1/mux.c diff --git a/board/BuR/kwb/MAINTAINERS b/board/BuR/kwb/MAINTAINERS deleted file mode 100644 index ca7d329..0000000 --- a/board/BuR/kwb/MAINTAINERS +++ /dev/null @@ -1,6 +0,0 @@ -KWB BOARD -M: Hannes Schmelzer hannes.schmelzer@br-automation.com -S: Maintained -F: board/BuR/kwb/ -F: include/configs/kwb.h -F: configs/kwb_defconfig diff --git a/configs/kwb_defconfig b/configs/brxre1_defconfig similarity index 97% rename from configs/kwb_defconfig rename to configs/brxre1_defconfig index 790292e..13617d3 100644 --- a/configs/kwb_defconfig +++ b/configs/brxre1_defconfig @@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_TARGET_KWB=y +CONFIG_TARGET_BRXRE1=y CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1" CONFIG_BOOTDELAY=0 diff --git a/include/configs/kwb.h b/include/configs/brxre1.h similarity index 97% rename from include/configs/kwb.h rename to include/configs/brxre1.h index 2bddc6b..11f56bf 100644 --- a/include/configs/kwb.h +++ b/include/configs/brxre1.h @@ -1,5 +1,5 @@ /* - * kwb.h + * brxre1.h * * specific parts for B&R KWB Motherboard * @@ -9,8 +9,8 @@ * SPDX-License-Identifier: GPL-2.0+ */
-#ifndef __CONFIG_KWB_H__ -#define __CONFIG_KWB_H__ +#ifndef __CONFIG_BRXRE1_H__ +#define __CONFIG_BRXRE1_H__
#include <configs/bur_cfg_common.h> #include <configs/bur_am335x_common.h> @@ -140,4 +140,4 @@ BUR_COMMON_ENV \ #define CONFIG_FAT_WRITE #endif /* CONFIG_MMC, ... */
-#endif /* __CONFIG_KWB_H__ */ +#endif /* __CONFIG_BRXRE1_H__ */
On Wed, Jun 22, 2016 at 12:36:14PM +0200, Hannes Schmelzer wrote:
Rename B&R kwb board to brxre1
Signed-off-by: Hannes Schmelzer oe5hpm@oevsv.at
Reviewed-by: Tom Rini trini@konsulko.com
On Wed, Jun 22, 2016 at 12:36:14PM +0200, Hannes Schmelzer wrote:
Rename B&R kwb board to brxre1
Signed-off-by: Hannes Schmelzer oe5hpm@oevsv.at Reviewed-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
participants (2)
-
Hannes Schmelzer -
Tom Rini