siemens,am33x,thuban: rename dxr2 to thuban

Update new naming scheme.

Signed-off-by: Samuel Egli <samuel.egli@siemens.com>
Acked-by: Heiko Schocher <hs@denx.de>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 13f579a02d0eef78e59dc0aae9e0f5792820b5cd..08292353336ebb2a070128178dbe1a99ac90b6cc 100644 (file)
--- 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 67fa320c872b4cd523e2515283fad53244e63bec..819d187087f7ab631600b352cca6884b5e66b6ba 100644 (file)
--- 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 6d9544af17d09a49f94f8541b27d9152b2b11bc0..484dd739c1fe017709e2ea1e593f71480bbe5e85 100644 (file)
--- 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/dxr2_defconfig
deleted file mode 100644 (file)
index 1041031..0000000
--- a/configs/dxr2_defconfig
+++ /dev/null
@@ -1,7 +0,0 @@
-CONFIG_ARM=y
-CONFIG_TARGET_DXR2=y
-CONFIG_CMD_NET=y
-CONFIG_SPL=y
-CONFIG_AUTOBOOT_KEYED=y
-CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc><Esc>\" to stop\n"
-CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b"

diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig
new file mode 100644 (file)
index 0000000..5fab571
--- /dev/null
+++ b/configs/thuban_defconfig
@@ -0,0 +1,7 @@
+CONFIG_ARM=y
+CONFIG_TARGET_THUBAN=y
+CONFIG_CMD_NET=y
+CONFIG_SPL=y
+CONFIG_AUTOBOOT_KEYED=y
+CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc><Esc>\" to stop\n"
+CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b"

diff --git a/include/configs/dxr2.h b/include/configs/dxr2.h
deleted file mode 100644 (file)
index fa74070..0000000
--- a/include/configs/dxr2.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * (C) Copyright 2013 Siemens Schweiz AG
- * (C) Heiko Schocher, DENX Software Engineering, hs@denx.de.
- *
- * Based on:
- * U-Boot file:/include/configs/am335x_evm.h
- *
- * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
- *
- * 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
-
-#include "siemens-am33x-common.h"
-
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_SYS_MPUCLK      300
-#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 GPIO_LAN9303_NRST      88      /* GPIO2_24 = gpio88 */
-
-#define CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
-       "button_dfu0=27\0" \
-       "led0=103,1,0\0" \
-       "led1=64,0,1\0"
-
-#undef CONFIG_DOS_PARTITION
-#undef CONFIG_CMD_FAT
-
-#define CONFIG_BOARD_LATE_INIT
-
- /* Physical Memory Map */
-#define CONFIG_MAX_RAM_BANK_SIZE       (1024 << 20)    /* 1GB */
-
-/* I2C Configuration */
-#define CONFIG_SYS_I2C_SPEED           100000
-
-#define CONFIG_SYS_I2C_EEPROM_ADDR              0x50
-#define EEPROM_ADDR_DDR3 0x90
-#define EEPROM_ADDR_CHIP 0x120
-
-#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS     0x300
-
-#undef CONFIG_SPL_NET_SUPPORT
-#undef CONFIG_SPL_NET_VCI_STRING
-#undef CONFIG_SPL_ETH_SUPPORT
-
-#undef CONFIG_MII
-#undef CONFIG_PHY_GIGE
-#define CONFIG_PHY_SMSC
-
-#define CONFIG_FACTORYSET
-
-/* Watchdog */
-#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 MTDPARTS_DEFAULT       MTDPARTS_DEFAULT_V2
-
-#ifndef CONFIG_SPL_BUILD
-
-/* Default env settings */
-#define CONFIG_EXTRA_ENV_SETTINGS \
-       "hostname=dxr2\0" \
-       "nand_img_size=0x400000\0" \
-       "optargs=\0" \
-       "preboot=draco_led 0\0" \
-       CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
-       CONFIG_ENV_SETTINGS_V2 \
-       CONFIG_ENV_SETTINGS_NAND_V2
-
-#ifndef CONFIG_RESTORE_FLASH
-/* set to negative value for no autoboot */
-#define CONFIG_BOOTDELAY               3
-
-#define CONFIG_BOOTCOMMAND \
-"if dfubutton; then " \
-       "run dfu_start; " \
-       "reset; " \
-"fi;" \
-"run nand_boot;" \
-"run nand_boot_backup;" \
-"reset;"
-
-
-#else
-#define CONFIG_BOOTDELAY               0
-
-#define CONFIG_BOOTCOMMAND                     \
-       "setenv autoload no; "                  \
-       "dhcp; "                                \
-       "if tftp 80000000 debrick.scr; then "   \
-               "source 80000000; "             \
-       "fi"
-#endif
-#endif /* CONFIG_SPL_BUILD */
-#endif /* ! __CONFIG_DXR2_H */

diff --git a/include/configs/thuban.h b/include/configs/thuban.h
new file mode 100644 (file)
index 0000000..4024468
--- /dev/null
+++ b/include/configs/thuban.h
@@ -0,0 +1,106 @@
+/*
+ * (C) Copyright 2013 Siemens Schweiz AG
+ * (C) Heiko Schocher, DENX Software Engineering, hs@denx.de.
+ *
+ * Based on:
+ * U-Boot file:/include/configs/am335x_evm.h
+ *
+ * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#ifndef __CONFIG_THUBAN_H
+#define __CONFIG_THUBAN_H
+
+#include "siemens-am33x-common.h"
+
+#define CONFIG_DISPLAY_CPUINFO
+#define CONFIG_SYS_MPUCLK      300
+#define DDR_PLL_FREQ   303
+#undef CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC
+
+#define BOARD_DFU_BUTTON_GPIO  27      /* Use as default */
+#define GPIO_LAN9303_NRST      88      /* GPIO2_24 = gpio88 */
+
+#define CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+       "button_dfu0=27\0" \
+       "led0=103,1,0\0" \
+       "led1=64,0,1\0"
+
+#undef CONFIG_DOS_PARTITION
+#undef CONFIG_CMD_FAT
+
+#define CONFIG_BOARD_LATE_INIT
+
+ /* Physical Memory Map */
+#define CONFIG_MAX_RAM_BANK_SIZE       (1024 << 20)    /* 1GB */
+
+/* I2C Configuration */
+#define CONFIG_SYS_I2C_SPEED           100000
+
+#define CONFIG_SYS_I2C_EEPROM_ADDR              0x50
+#define EEPROM_ADDR_DDR3 0x90
+#define EEPROM_ADDR_CHIP 0x120
+
+#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS     0x300
+
+#undef CONFIG_SPL_NET_SUPPORT
+#undef CONFIG_SPL_NET_VCI_STRING
+#undef CONFIG_SPL_ETH_SUPPORT
+
+#undef CONFIG_MII
+#undef CONFIG_PHY_GIGE
+#define CONFIG_PHY_SMSC
+
+#define CONFIG_FACTORYSET
+
+/* Watchdog */
+#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 MTDPARTS_DEFAULT       MTDPARTS_DEFAULT_V2
+
+#ifndef CONFIG_SPL_BUILD
+
+/* Default env settings */
+#define CONFIG_EXTRA_ENV_SETTINGS \
+       "hostname=thuban\0" \
+       "nand_img_size=0x400000\0" \
+       "optargs=\0" \
+       "preboot=draco_led 0\0" \
+       CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+       CONFIG_ENV_SETTINGS_V2 \
+       CONFIG_ENV_SETTINGS_NAND_V2
+
+#ifndef CONFIG_RESTORE_FLASH
+/* set to negative value for no autoboot */
+#define CONFIG_BOOTDELAY               3
+
+#define CONFIG_BOOTCOMMAND \
+"if dfubutton; then " \
+       "run dfu_start; " \
+       "reset; " \
+"fi;" \
+"run nand_boot;" \
+"run nand_boot_backup;" \
+"reset;"
+
+
+#else
+#define CONFIG_BOOTDELAY               0
+
+#define CONFIG_BOOTCOMMAND                     \
+       "setenv autoload no; "                  \
+       "dhcp; "                                \
+       "if tftp 80000000 debrick.scr; then "   \
+               "source 80000000; "             \
+       "fi"
+#endif
+#endif /* CONFIG_SPL_BUILD */
+#endif /* ! __CONFIG_THUBAN_H */