Update new naming scheme.
Signed-off-by: Samuel Egli <samuel.e...@siemens.com>
Acked-by: Heiko Schocher <h...@denx.de>
---
arch/arm/Kconfig | 4 ++--
board/siemens/draco/Kconfig | 4 ++--
board/siemens/draco/MAINTAINERS | 4 ++--
configs/{dxr2_defconfig => thuban_defconfig} | 2 +-
include/configs/{dxr2.h => thuban.h} | 22 ++++++++--------------
5 files changed, 15 insertions(+), 21 deletions(-)
rename configs/{dxr2_defconfig => thuban_defconfig} (88%)
rename include/configs/{dxr2.h => thuban.h} (81%)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 6d7e8c7..51da85b 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -346,8 +346,8 @@ config TARGET_DRACO
select CPU_V7
select SUPPORT_SPL
-config TARGET_DXR2
- bool "Support dxr2"
+config TARGET_THUBAN
+ bool "Support thuban"
select CPU_V7
select SUPPORT_SPL
diff --git a/board/siemens/draco/Kconfig b/board/siemens/draco/Kconfig
index 67fa320..819d187 100644
--- a/board/siemens/draco/Kconfig
+++ b/board/siemens/draco/Kconfig
@@ -14,7 +14,7 @@ config SYS_CONFIG_NAME
endif
-if TARGET_DXR2
+if TARGET_THUBAN
config SYS_BOARD
default "draco"
@@ -26,7 +26,7 @@ config SYS_SOC
default "am33xx"
config SYS_CONFIG_NAME
- default "dxr2"
+ default "thuban"
endif
diff --git a/board/siemens/draco/MAINTAINERS b/board/siemens/draco/MAINTAINERS
index 6d9544a..484dd73 100644
--- a/board/siemens/draco/MAINTAINERS
+++ b/board/siemens/draco/MAINTAINERS
@@ -4,7 +4,7 @@ S: Maintained
F: board/siemens/draco/
F: include/configs/draco.h
F: configs/draco_defconfig
-F: include/configs/dxr2.h
-F: configs/dxr2_defconfig
+F: include/configs/thuban.h
+F: configs/thuban_defconfig
F: include/configs/rastaban.h
F: configs/rastaban_defconfig
diff --git a/configs/dxr2_defconfig b/configs/thuban_defconfig
similarity index 88%
rename from configs/dxr2_defconfig
rename to configs/thuban_defconfig
index 1041031..5fab571 100644
--- a/configs/dxr2_defconfig
+++ b/configs/thuban_defconfig
@@ -1,5 +1,5 @@
CONFIG_ARM=y
-CONFIG_TARGET_DXR2=y
+CONFIG_TARGET_THUBAN=y
CONFIG_CMD_NET=y
CONFIG_SPL=y
CONFIG_AUTOBOOT_KEYED=y
diff --git a/include/configs/dxr2.h b/include/configs/thuban.h
similarity index 81%
rename from include/configs/dxr2.h
rename to include/configs/thuban.h
index fa74070..4024468 100644
--- a/include/configs/dxr2.h
+++ b/include/configs/thuban.h
@@ -10,12 +10,8 @@
* SPDX-License-Identifier: GPL-2.0+
*/
-#ifndef __CONFIG_DXR2_H
-#define __CONFIG_DXR2_H
-
-#define CONFIG_SIEMENS_DXR2
-#define MACH_TYPE_DXR2 4315
-#define CONFIG_SIEMENS_MACH_TYPE MACH_TYPE_DXR2
+#ifndef __CONFIG_THUBAN_H
+#define __CONFIG_THUBAN_H
#include "siemens-am33x-common.h"
@@ -24,9 +20,7 @@
#define DDR_PLL_FREQ 303
#undef CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC
-#define BOARD_DFU_BUTTON_GPIO 27
-#define BOARD_DFU_BUTTON_LED 64 /* red LED */
-#define BOARD_STATUS_LED 103 /* green LED */
+#define BOARD_DFU_BUTTON_GPIO 27 /* Use as default */
#define GPIO_LAN9303_NRST 88 /* GPIO2_24 = gpio88 */
#define CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
@@ -65,9 +59,9 @@
#define CONFIG_OMAP_WATCHDOG
/* Define own nand partitions */
-#define CONFIG_ENV_OFFSET_REDUND 0x2E0000
-#define CONFIG_ENV_SIZE_REDUND 0x2000
-#define CONFIG_ENV_RANGE (4 * CONFIG_SYS_ENV_SECT_SIZE)
+#define CONFIG_ENV_OFFSET_REDUND 0x2E0000
+#define CONFIG_ENV_SIZE_REDUND 0x2000
+#define CONFIG_ENV_RANGE (4 * CONFIG_SYS_ENV_SECT_SIZE)
#define MTDPARTS_DEFAULT MTDPARTS_DEFAULT_V2
@@ -76,7 +70,7 @@
/* Default env settings */
#define CONFIG_EXTRA_ENV_SETTINGS \
- "hostname=dxr2\0" \
+ "hostname=thuban\0" \
"nand_img_size=0x400000\0" \
"optargs=\0" \
"preboot=draco_led 0\0" \
@@ -109,4 +103,4 @@
"fi"
#endif
#endif /* CONFIG_SPL_BUILD */
-#endif /* ! __CONFIG_DXR2_H */
+#endif /* ! __CONFIG_THUBAN_H */
--
2.1.0
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
