From a4d799939fdb08ce4d7464578734316cdd0bf452 Mon Sep 17 00:00:00 2001 From: Hannes Schmelzer Date: Wed, 22 Jun 2016 12:36:14 +0200 Subject: [PATCH] board/BuR: rename kwb board to brxre1 Rename B&R kwb board to brxre1 Signed-off-by: Hannes Schmelzer Reviewed-by: Tom Rini --- 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 3c2c7557ea..3237a74f72 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 4beefbf771..389e523f60 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 0000000000..a10d9c1d71 --- /dev/null +++ b/board/BuR/brxre1/MAINTAINERS @@ -0,0 +1,6 @@ +BRXRE1 BOARD +M: Hannes Schmelzer +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 ad74ff299c..f4bfa410cc 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 * 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 ca7d329144..0000000000 --- a/board/BuR/kwb/MAINTAINERS +++ /dev/null @@ -1,6 +0,0 @@ -KWB BOARD -M: Hannes Schmelzer -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 790292e738..13617d31be 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 2bddc6b7df..11f56bfb4d 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 #include @@ -140,4 +140,4 @@ BUR_COMMON_ENV \ #define CONFIG_FAT_WRITE #endif /* CONFIG_MMC, ... */ -#endif /* __CONFIG_KWB_H__ */ +#endif /* __CONFIG_BRXRE1_H__ */ -- 2.39.5