diff options
author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2016-06-09 12:44:24 +0200 |
---|---|---|
committer | Max Krummenacher <max.krummenacher@toradex.com> | 2016-06-22 14:36:49 +0200 |
commit | e8265fb50a99a1c400fc194a3c272c86434cf565 (patch) | |
tree | 8e5769622874a41034fe7eef17d7e2504ffaa26f | |
parent | 7bf0f5d1e202cbca1facfbbf8bd118a819eb87a3 (diff) |
apalis-tk1: change (file) names from apalis_tk1 to apalis-tk1
Change file and other names resp. strings to apalis-tk1 rather than
apalis_tk1 due to upstream Linux kernel device tree maintainers no
longer allowing any underscores to be used in any such.
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
-rw-r--r-- | arch/arm/dts/tegra124-apalis.dts | 2 | ||||
-rw-r--r-- | arch/arm/mach-tegra/tegra124/Kconfig | 2 | ||||
-rw-r--r-- | board/toradex/apalis-tk1/Kconfig (renamed from board/toradex/apalis_tk1/Kconfig) | 4 | ||||
-rw-r--r-- | board/toradex/apalis-tk1/MAINTAINERS (renamed from board/toradex/apalis_tk1/MAINTAINERS) | 6 | ||||
-rw-r--r-- | board/toradex/apalis-tk1/Makefile (renamed from board/toradex/apalis_tk1/Makefile) | 2 | ||||
-rw-r--r-- | board/toradex/apalis-tk1/apalis-tk1.c (renamed from board/toradex/apalis_tk1/apalis_tk1.c) | 2 | ||||
-rw-r--r-- | board/toradex/apalis-tk1/as3722_init.c (renamed from board/toradex/apalis_tk1/as3722_init.c) | 0 | ||||
-rw-r--r-- | board/toradex/apalis-tk1/as3722_init.h (renamed from board/toradex/apalis_tk1/as3722_init.h) | 0 | ||||
-rw-r--r-- | board/toradex/apalis-tk1/pinmux-config-apalis-tk1.h (renamed from board/toradex/apalis_tk1/pinmux-config-apalis_tk1.h) | 0 | ||||
-rw-r--r-- | configs/apalis-tk1_defconfig (renamed from configs/apalis_tk1_defconfig) | 0 | ||||
-rw-r--r-- | include/configs/apalis-tk1.h (renamed from include/configs/apalis_tk1.h) | 2 |
11 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/dts/tegra124-apalis.dts b/arch/arm/dts/tegra124-apalis.dts index 368be9a2aaa..595aae8cdd1 100644 --- a/arch/arm/dts/tegra124-apalis.dts +++ b/arch/arm/dts/tegra124-apalis.dts @@ -4,7 +4,7 @@ / { model = "Toradex Apalis TK1"; - compatible = "toradex,apalis_tk1", "nvidia,tegra124"; + compatible = "toradex,apalis-tk1", "nvidia,tegra124"; chosen { stdout-path = &uarta; diff --git a/arch/arm/mach-tegra/tegra124/Kconfig b/arch/arm/mach-tegra/tegra124/Kconfig index 64341d7b592..2a5a2f42eb2 100644 --- a/arch/arm/mach-tegra/tegra124/Kconfig +++ b/arch/arm/mach-tegra/tegra124/Kconfig @@ -26,7 +26,7 @@ endchoice config SYS_SOC default "tegra124" -source "board/toradex/apalis_tk1/Kconfig" +source "board/toradex/apalis-tk1/Kconfig" source "board/nvidia/jetson-tk1/Kconfig" source "board/nvidia/nyan-big/Kconfig" source "board/nvidia/venice2/Kconfig" diff --git a/board/toradex/apalis_tk1/Kconfig b/board/toradex/apalis-tk1/Kconfig index 3d0e7ebcb90..0da23be41b9 100644 --- a/board/toradex/apalis_tk1/Kconfig +++ b/board/toradex/apalis-tk1/Kconfig @@ -1,13 +1,13 @@ if TARGET_APALIS_TK1 config SYS_BOARD - default "apalis_tk1" + default "apalis-tk1" config SYS_VENDOR default "toradex" config SYS_CONFIG_NAME - default "apalis_tk1" + default "apalis-tk1" config TRDX_CFG_BLOCK default y diff --git a/board/toradex/apalis_tk1/MAINTAINERS b/board/toradex/apalis-tk1/MAINTAINERS index 24c28875254..4375090122c 100644 --- a/board/toradex/apalis_tk1/MAINTAINERS +++ b/board/toradex/apalis-tk1/MAINTAINERS @@ -3,7 +3,7 @@ M: Marcel Ziswiler <marcel.ziswiler@toradex.com> M: Toradex ARM Support <support.arm@toradex.com> W: http://developer.toradex.com/software-resources/arm-family/linux S: Maintained -F: board/toradex/apalis_tk1/ -F: include/configs/apalis_tk1.h -F: configs/apalis_tk1_defconfig +F: board/toradex/apalis-tk1/ +F: include/configs/apalis-tk1.h +F: configs/apalis-tk1_defconfig F: arch/arm/dts/tegra124-apalis.dtb diff --git a/board/toradex/apalis_tk1/Makefile b/board/toradex/apalis-tk1/Makefile index 678efc313ab..088f8259b23 100644 --- a/board/toradex/apalis_tk1/Makefile +++ b/board/toradex/apalis-tk1/Makefile @@ -4,4 +4,4 @@ include $(srctree)/board/nvidia/common/common.mk obj-y += as3722_init.o -obj-y += apalis_tk1.o +obj-y += apalis-tk1.o diff --git a/board/toradex/apalis_tk1/apalis_tk1.c b/board/toradex/apalis-tk1/apalis-tk1.c index c9e9b27964f..2f097056f35 100644 --- a/board/toradex/apalis_tk1/apalis_tk1.c +++ b/board/toradex/apalis-tk1/apalis-tk1.c @@ -14,7 +14,7 @@ #include <asm/arch/gpio.h> #include <asm/arch/pinmux.h> -#include "pinmux-config-apalis_tk1.h" +#include "pinmux-config-apalis-tk1.h" #define LAN_RESET_N GPIO_PS2 diff --git a/board/toradex/apalis_tk1/as3722_init.c b/board/toradex/apalis-tk1/as3722_init.c index 6726114c4ec..6726114c4ec 100644 --- a/board/toradex/apalis_tk1/as3722_init.c +++ b/board/toradex/apalis-tk1/as3722_init.c diff --git a/board/toradex/apalis_tk1/as3722_init.h b/board/toradex/apalis-tk1/as3722_init.h index 75b4d42aa7b..75b4d42aa7b 100644 --- a/board/toradex/apalis_tk1/as3722_init.h +++ b/board/toradex/apalis-tk1/as3722_init.h diff --git a/board/toradex/apalis_tk1/pinmux-config-apalis_tk1.h b/board/toradex/apalis-tk1/pinmux-config-apalis-tk1.h index 666ead8ee2a..666ead8ee2a 100644 --- a/board/toradex/apalis_tk1/pinmux-config-apalis_tk1.h +++ b/board/toradex/apalis-tk1/pinmux-config-apalis-tk1.h diff --git a/configs/apalis_tk1_defconfig b/configs/apalis-tk1_defconfig index 49d9a7bbe1b..49d9a7bbe1b 100644 --- a/configs/apalis_tk1_defconfig +++ b/configs/apalis-tk1_defconfig diff --git a/include/configs/apalis_tk1.h b/include/configs/apalis-tk1.h index b51036e66db..6a58e823638 100644 --- a/include/configs/apalis_tk1.h +++ b/include/configs/apalis-tk1.h @@ -100,7 +100,7 @@ "run usbboot; echo; echo usbboot failed; " \ "run nfsboot; echo; echo nfsboot failed" -#define DFU_ALT_EMMC_INFO "apalis_tk1.img raw 0x0 0x500 mmcpart 1; " \ +#define DFU_ALT_EMMC_INFO "apalis-tk1.img raw 0x0 0x500 mmcpart 1; " \ "boot part 0 1 mmcpart 0; " \ "rootfs part 0 2 mmcpart 0; " \ "uImage fat 0 1 mmcpart 0; " \ |