summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/cpu/armv7/omap5/Kconfig2
-rw-r--r--board/ti/am57xx/Kconfig (renamed from board/ti/beagle_x15/Kconfig)4
-rw-r--r--board/ti/am57xx/MAINTAINERS7
-rw-r--r--board/ti/am57xx/Makefile (renamed from board/ti/beagle_x15/Makefile)0
-rw-r--r--board/ti/am57xx/board.c (renamed from board/ti/beagle_x15/board.c)0
-rw-r--r--board/ti/am57xx/mux_data.h (renamed from board/ti/beagle_x15/mux_data.h)0
-rw-r--r--board/ti/beagle_x15/MAINTAINERS6
-rw-r--r--configs/am57xx_evm_nodt_defconfig (renamed from configs/beagle_x15_defconfig)0
-rw-r--r--include/configs/am57xx_evm.h (renamed from include/configs/beagle_x15.h)6
9 files changed, 13 insertions, 12 deletions
diff --git a/arch/arm/cpu/armv7/omap5/Kconfig b/arch/arm/cpu/armv7/omap5/Kconfig
index 20c3bd963b..bfa264eccc 100644
--- a/arch/arm/cpu/armv7/omap5/Kconfig
+++ b/arch/arm/cpu/armv7/omap5/Kconfig
@@ -24,6 +24,6 @@ config SYS_SOC
source "board/compulab/cm_t54/Kconfig"
source "board/ti/omap5_uevm/Kconfig"
source "board/ti/dra7xx/Kconfig"
-source "board/ti/beagle_x15/Kconfig"
+source "board/ti/am57xx/Kconfig"
endif
diff --git a/board/ti/beagle_x15/Kconfig b/board/ti/am57xx/Kconfig
index a305ff1044..bdb779511b 100644
--- a/board/ti/beagle_x15/Kconfig
+++ b/board/ti/am57xx/Kconfig
@@ -1,12 +1,12 @@
if TARGET_BEAGLE_X15
config SYS_BOARD
- default "beagle_x15"
+ default "am57xx"
config SYS_VENDOR
default "ti"
config SYS_CONFIG_NAME
- default "beagle_x15"
+ default "am57xx_evm"
endif
diff --git a/board/ti/am57xx/MAINTAINERS b/board/ti/am57xx/MAINTAINERS
new file mode 100644
index 0000000000..b8ae0199e3
--- /dev/null
+++ b/board/ti/am57xx/MAINTAINERS
@@ -0,0 +1,7 @@
+AM57XX EVM
+M: Felipe Balbi <balbi@ti.com>
+S: Maintained
+F: board/ti/am57xx/
+F: include/configs/am57xx_evm.h
+F: configs/am57xx_evm_defconfig
+F: configs/am57xx_evm_nodt_defconfig
diff --git a/board/ti/beagle_x15/Makefile b/board/ti/am57xx/Makefile
index 5cd6873f5e..5cd6873f5e 100644
--- a/board/ti/beagle_x15/Makefile
+++ b/board/ti/am57xx/Makefile
diff --git a/board/ti/beagle_x15/board.c b/board/ti/am57xx/board.c
index 042f9ab196..042f9ab196 100644
--- a/board/ti/beagle_x15/board.c
+++ b/board/ti/am57xx/board.c
diff --git a/board/ti/beagle_x15/mux_data.h b/board/ti/am57xx/mux_data.h
index 23f22a02be..23f22a02be 100644
--- a/board/ti/beagle_x15/mux_data.h
+++ b/board/ti/am57xx/mux_data.h
diff --git a/board/ti/beagle_x15/MAINTAINERS b/board/ti/beagle_x15/MAINTAINERS
deleted file mode 100644
index 3f84defcee..0000000000
--- a/board/ti/beagle_x15/MAINTAINERS
+++ /dev/null
@@ -1,6 +0,0 @@
-BEAGLE X15
-M: Felipe Balbi <balbi@ti.com>
-S: Maintained
-F: board/ti/beagle_x15/
-F: include/configs/beagle_x15.h
-F: configs/beagle_x15_defconfig
diff --git a/configs/beagle_x15_defconfig b/configs/am57xx_evm_nodt_defconfig
index 3b3c0272bf..3b3c0272bf 100644
--- a/configs/beagle_x15_defconfig
+++ b/configs/am57xx_evm_nodt_defconfig
diff --git a/include/configs/beagle_x15.h b/include/configs/am57xx_evm.h
index d38b7b55cf..6308cab8e6 100644
--- a/include/configs/beagle_x15.h
+++ b/include/configs/am57xx_evm.h
@@ -9,8 +9,8 @@
* SPDX-License-Identifier: GPL-2.0+
*/
-#ifndef __CONFIG_BEAGLE_X15_H
-#define __CONFIG_BEAGLE_X15_H
+#ifndef __CONFIG_AM57XX_EVM_H
+#define __CONFIG_AM57XX_EVM_H
#define CONFIG_AM57XX
@@ -88,4 +88,4 @@
#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
CONFIG_SYS_SCSI_MAX_LUN)
-#endif /* __CONFIG_BEAGLE_X5_H */
+#endif /* __CONFIG_AM57XX_EVM_H */
OpenPOWER on IntegriCloud