From a28cffaf0f1e2dcc0b3298eeb278fe1e8d00eaae Mon Sep 17 00:00:00 2001 From: Rene Straub Date: Wed, 25 Sep 2019 10:43:32 +0200 Subject: [PATCH] nmhw24: rename to nrhw24 --- arch/arm/Kconfig | 28 +++++++++---------- board/nm/{nmhw24 => nrhw24}/Kconfig | 8 +++--- board/nm/{nmhw24 => nrhw24}/Makefile | 0 board/nm/{nmhw24 => nrhw24}/board.c | 0 board/nm/{nmhw24 => nrhw24}/board.h | 0 board/nm/{nmhw24 => nrhw24}/da9063.c | 0 board/nm/{nmhw24 => nrhw24}/da9063.h | 0 board/nm/{nmhw24 => nrhw24}/fileaccess.c | 0 board/nm/{nmhw24 => nrhw24}/fileaccess.h | 0 board/nm/{nmhw24 => nrhw24}/mux.c | 0 board/nm/{nmhw24 => nrhw24}/shield.c | 0 board/nm/{nmhw24 => nrhw24}/shield.h | 0 board/nm/{nmhw24 => nrhw24}/shield_can.c | 0 board/nm/{nmhw24 => nrhw24}/shield_can.h | 0 board/nm/{nmhw24 => nrhw24}/shield_comio.c | 0 board/nm/{nmhw24 => nrhw24}/shield_comio.h | 0 board/nm/{nmhw24 => nrhw24}/u-boot.lds | 2 +- ...hw24_defconfig => am335x_nrhw24_defconfig} | 2 +- .../{am335x_nmhw24.h => am335x_nrhw24.h} | 8 +++--- 19 files changed, 24 insertions(+), 24 deletions(-) rename board/nm/{nmhw24 => nrhw24}/Kconfig (83%) rename board/nm/{nmhw24 => nrhw24}/Makefile (100%) rename board/nm/{nmhw24 => nrhw24}/board.c (100%) rename board/nm/{nmhw24 => nrhw24}/board.h (100%) rename board/nm/{nmhw24 => nrhw24}/da9063.c (100%) rename board/nm/{nmhw24 => nrhw24}/da9063.h (100%) rename board/nm/{nmhw24 => nrhw24}/fileaccess.c (100%) rename board/nm/{nmhw24 => nrhw24}/fileaccess.h (100%) rename board/nm/{nmhw24 => nrhw24}/mux.c (100%) rename board/nm/{nmhw24 => nrhw24}/shield.c (100%) rename board/nm/{nmhw24 => nrhw24}/shield.h (100%) rename board/nm/{nmhw24 => nrhw24}/shield_can.c (100%) rename board/nm/{nmhw24 => nrhw24}/shield_can.h (100%) rename board/nm/{nmhw24 => nrhw24}/shield_comio.c (100%) rename board/nm/{nmhw24 => nrhw24}/shield_comio.h (100%) rename board/nm/{nmhw24 => nrhw24}/u-boot.lds (98%) rename configs/{am335x_nmhw24_defconfig => am335x_nrhw24_defconfig} (97%) rename include/configs/{am335x_nmhw24.h => am335x_nrhw24.h} (98%) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 5426fb9108..ef5cc1c86e 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -391,12 +391,12 @@ config TARGET_AM335X_NETBIRD_V2 select DM_GPIO config TARGET_AM335X_NRHW20 - bool "Support am335x_nrhw20" - select CPU_V7 - select SUPPORT_SPL - select DM - select DM_SERIAL - select DM_GPIO + bool "Support am335x_nrhw20" + select CPU_V7 + select SUPPORT_SPL + select DM + select DM_SERIAL + select DM_GPIO config TARGET_AM335X_NMHW21 bool "Support am335x_nmhw21" @@ -406,13 +406,13 @@ config TARGET_AM335X_NMHW21 select DM_SERIAL select DM_GPIO -config TARGET_AM335X_NMHW24 - bool "Support am335x_nmhw24" - select CPU_V7 - select SUPPORT_SPL - select DM - select DM_SERIAL - select DM_GPIO +config TARGET_AM335X_NRHW24 + bool "Support am335x_nrhw24" + select CPU_V7 + select SUPPORT_SPL + select DM + select DM_SERIAL + select DM_GPIO config TARGET_AM335X_SL50 bool "Support am335x_sl50" @@ -914,7 +914,7 @@ source "board/nm/netbird/Kconfig" source "board/nm/netbird_v2/Kconfig" source "board/nm/nrhw20/Kconfig" source "board/nm/nmhw21/Kconfig" -source "board/nm/nmhw24/Kconfig" +source "board/nm/nrhw24/Kconfig" source "board/olimex/mx23_olinuxino/Kconfig" source "board/phytec/pcm051/Kconfig" source "board/phytec/pcm052/Kconfig" diff --git a/board/nm/nmhw24/Kconfig b/board/nm/nrhw24/Kconfig similarity index 83% rename from board/nm/nmhw24/Kconfig rename to board/nm/nrhw24/Kconfig index 900e1835f8..93a3d35d86 100644 --- a/board/nm/nmhw24/Kconfig +++ b/board/nm/nrhw24/Kconfig @@ -1,7 +1,7 @@ -if TARGET_AM335X_NMHW24 +if TARGET_AM335X_NRHW24 config SYS_BOARD - default "nmhw24" + default "nrhw24" config SYS_VENDOR default "nm" @@ -10,12 +10,12 @@ config SYS_SOC default "am33xx" config SYS_CONFIG_NAME - default "am335x_nmhw24" + default "am335x_nrhw24" config CONS_INDEX int "UART used for console" range 1 6 - default 2 + default 2 help The AM335x SoC has a total of 6 UARTs (UART0 to UART5 as referenced in documentation, etc) available to it. Depending on your specific diff --git a/board/nm/nmhw24/Makefile b/board/nm/nrhw24/Makefile similarity index 100% rename from board/nm/nmhw24/Makefile rename to board/nm/nrhw24/Makefile diff --git a/board/nm/nmhw24/board.c b/board/nm/nrhw24/board.c similarity index 100% rename from board/nm/nmhw24/board.c rename to board/nm/nrhw24/board.c diff --git a/board/nm/nmhw24/board.h b/board/nm/nrhw24/board.h similarity index 100% rename from board/nm/nmhw24/board.h rename to board/nm/nrhw24/board.h diff --git a/board/nm/nmhw24/da9063.c b/board/nm/nrhw24/da9063.c similarity index 100% rename from board/nm/nmhw24/da9063.c rename to board/nm/nrhw24/da9063.c diff --git a/board/nm/nmhw24/da9063.h b/board/nm/nrhw24/da9063.h similarity index 100% rename from board/nm/nmhw24/da9063.h rename to board/nm/nrhw24/da9063.h diff --git a/board/nm/nmhw24/fileaccess.c b/board/nm/nrhw24/fileaccess.c similarity index 100% rename from board/nm/nmhw24/fileaccess.c rename to board/nm/nrhw24/fileaccess.c diff --git a/board/nm/nmhw24/fileaccess.h b/board/nm/nrhw24/fileaccess.h similarity index 100% rename from board/nm/nmhw24/fileaccess.h rename to board/nm/nrhw24/fileaccess.h diff --git a/board/nm/nmhw24/mux.c b/board/nm/nrhw24/mux.c similarity index 100% rename from board/nm/nmhw24/mux.c rename to board/nm/nrhw24/mux.c diff --git a/board/nm/nmhw24/shield.c b/board/nm/nrhw24/shield.c similarity index 100% rename from board/nm/nmhw24/shield.c rename to board/nm/nrhw24/shield.c diff --git a/board/nm/nmhw24/shield.h b/board/nm/nrhw24/shield.h similarity index 100% rename from board/nm/nmhw24/shield.h rename to board/nm/nrhw24/shield.h diff --git a/board/nm/nmhw24/shield_can.c b/board/nm/nrhw24/shield_can.c similarity index 100% rename from board/nm/nmhw24/shield_can.c rename to board/nm/nrhw24/shield_can.c diff --git a/board/nm/nmhw24/shield_can.h b/board/nm/nrhw24/shield_can.h similarity index 100% rename from board/nm/nmhw24/shield_can.h rename to board/nm/nrhw24/shield_can.h diff --git a/board/nm/nmhw24/shield_comio.c b/board/nm/nrhw24/shield_comio.c similarity index 100% rename from board/nm/nmhw24/shield_comio.c rename to board/nm/nrhw24/shield_comio.c diff --git a/board/nm/nmhw24/shield_comio.h b/board/nm/nrhw24/shield_comio.h similarity index 100% rename from board/nm/nmhw24/shield_comio.h rename to board/nm/nrhw24/shield_comio.h diff --git a/board/nm/nmhw24/u-boot.lds b/board/nm/nrhw24/u-boot.lds similarity index 98% rename from board/nm/nmhw24/u-boot.lds rename to board/nm/nrhw24/u-boot.lds index 965898ba25..ba0157f6f4 100644 --- a/board/nm/nmhw24/u-boot.lds +++ b/board/nm/nrhw24/u-boot.lds @@ -36,7 +36,7 @@ SECTIONS *(.__image_copy_start) *(.vectors) CPUDIR/start.o (.text*) - board/nm/nmhw24/built-in.o (.text*) + board/nm/nrhw24/built-in.o (.text*) *(.text*) } diff --git a/configs/am335x_nmhw24_defconfig b/configs/am335x_nrhw24_defconfig similarity index 97% rename from configs/am335x_nmhw24_defconfig rename to configs/am335x_nrhw24_defconfig index 2b71316531..a886c4823f 100644 --- a/configs/am335x_nmhw24_defconfig +++ b/configs/am335x_nrhw24_defconfig @@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_TARGET_AM335X_NMHW24=y +CONFIG_TARGET_AM335X_NRHW24=y CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_SPL=y CONFIG_SPL_STACK_R=y diff --git a/include/configs/am335x_nmhw24.h b/include/configs/am335x_nrhw24.h similarity index 98% rename from include/configs/am335x_nmhw24.h rename to include/configs/am335x_nrhw24.h index 8a49b488db..66f0bf7c78 100644 --- a/include/configs/am335x_nmhw24.h +++ b/include/configs/am335x_nrhw24.h @@ -1,5 +1,5 @@ /* - * am335x_nmhw24.h + * am335x_nrhw24.h * * Copyright (C) 2018-2019 NetModule AG - http://www.netmodule.com/ * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ @@ -14,8 +14,8 @@ * GNU General Public License for more details. */ -#ifndef __CONFIG_AM335X_NMHW24_H -#define __CONFIG_AM335X_NMHW24_H +#ifndef __CONFIG_AM335X_NRHW24_H +#define __CONFIG_AM335X_NRHW24_H #include @@ -299,4 +299,4 @@ int eth_phy_timeout(void); /* Never enable ISO it is broken and can lead to a crash */ #undef CONFIG_ISO_PARTITION -#endif /* ! __CONFIG_AM335X_NMHW24_H */ +#endif /* ! __CONFIG_AM335X_NRHW24_H */