From 3c4446856976114bf35a762efa86c1344ce4095c Mon Sep 17 00:00:00 2001 From: Alexandre Bard Date: Thu, 5 May 2022 11:48:32 +0200 Subject: [PATCH] Revert "NRHW18 - refactoring of names and definitions" This reverts commit 65d5c767866db22c8929415dff454e2372f7c5ea. NRSW branch also renamed the dts and config names. To avoid merge conflicts, we need to revert this commits. BugzID: 77953 --- arch/arm/dts/Makefile | 6 +++--- ...mon.dtsi => armada-385-nbhw18-common.dtsi} | 4 ++-- ...hw18-spl.dts => armada-385-nbhw18-spl.dts} | 6 +++--- ...nrhw18-v1.dts => armada-385-nbhw18-v1.dts} | 6 +++--- ...nrhw18-v2.dts => armada-385-nbhw18-v2.dts} | 6 +++--- arch/arm/mach-mvebu/Kconfig | 20 +++++++++---------- board/nm/{nrhw18_v1 => nbhw18_v1}/MAINTAINERS | 0 board/nm/{nrhw18_v1 => nbhw18_v1}/Makefile | 0 board/nm/{nrhw18_v1 => nbhw18_v1}/README | 0 board/nm/{nrhw18_v1 => nbhw18_v1}/board.c | 6 +++--- .../nm/{nrhw18_v1 => nbhw18_v1}/kwbimage.cfg | 0 .../nbhw_fpga_config.c | 0 board/nm/{nrhw18_v1 => nbhw18_v1}/nbhw_gpio.c | 0 board/nm/{nrhw18_v1 => nbhw18_v1}/nbhw_gpio.h | 0 board/nm/{nrhw18_v1 => nbhw18_v1}/nbhw_sim.c | 0 board/nm/{nrhw18_v2 => nbhw18_v2}/MAINTAINERS | 0 board/nm/{nrhw18_v2 => nbhw18_v2}/Makefile | 0 board/nm/{nrhw18_v2 => nbhw18_v2}/README | 0 board/nm/{nrhw18_v2 => nbhw18_v2}/board.c | 6 +++--- board/nm/{nrhw18_v2 => nbhw18_v2}/da9063.h | 0 .../nm/{nrhw18_v2 => nbhw18_v2}/kwbimage.cfg | 0 .../nbhw_fpga_config.c | 0 board/nm/{nrhw18_v2 => nbhw18_v2}/nbhw_gpio.c | 0 board/nm/{nrhw18_v2 => nbhw18_v2}/nbhw_gpio.h | 0 .../{nrhw18_v2 => nbhw18_v2}/nbhw_mvswitch.c | 0 board/nm/{nrhw18_v2 => nbhw18_v2}/nbhw_sim.c | 0 ...fconfig => armada-385-nbhw18-v1_defconfig} | 10 +++++----- ...fconfig => armada-385-nbhw18-v2_defconfig} | 10 +++++----- ...385-nrhw18-v1.h => armada-385-nbhw18-v1.h} | 2 +- ...385-nrhw18-v2.h => armada-385-nbhw18-v2.h} | 6 +++--- 30 files changed, 44 insertions(+), 44 deletions(-) rename arch/arm/dts/{armada-385-nrhw18-common.dtsi => armada-385-nbhw18-common.dtsi} (98%) rename arch/arm/dts/{armada-385-nrhw18-spl.dts => armada-385-nbhw18-spl.dts} (78%) rename arch/arm/dts/{armada-385-nrhw18-v1.dts => armada-385-nbhw18-v1.dts} (76%) rename arch/arm/dts/{armada-385-nrhw18-v2.dts => armada-385-nbhw18-v2.dts} (83%) rename board/nm/{nrhw18_v1 => nbhw18_v1}/MAINTAINERS (100%) rename board/nm/{nrhw18_v1 => nbhw18_v1}/Makefile (100%) rename board/nm/{nrhw18_v1 => nbhw18_v1}/README (100%) rename board/nm/{nrhw18_v1 => nbhw18_v1}/board.c (98%) rename board/nm/{nrhw18_v1 => nbhw18_v1}/kwbimage.cfg (100%) rename board/nm/{nrhw18_v1 => nbhw18_v1}/nbhw_fpga_config.c (100%) rename board/nm/{nrhw18_v1 => nbhw18_v1}/nbhw_gpio.c (100%) rename board/nm/{nrhw18_v1 => nbhw18_v1}/nbhw_gpio.h (100%) rename board/nm/{nrhw18_v1 => nbhw18_v1}/nbhw_sim.c (100%) rename board/nm/{nrhw18_v2 => nbhw18_v2}/MAINTAINERS (100%) rename board/nm/{nrhw18_v2 => nbhw18_v2}/Makefile (100%) rename board/nm/{nrhw18_v2 => nbhw18_v2}/README (100%) rename board/nm/{nrhw18_v2 => nbhw18_v2}/board.c (99%) rename board/nm/{nrhw18_v2 => nbhw18_v2}/da9063.h (100%) rename board/nm/{nrhw18_v2 => nbhw18_v2}/kwbimage.cfg (100%) rename board/nm/{nrhw18_v2 => nbhw18_v2}/nbhw_fpga_config.c (100%) rename board/nm/{nrhw18_v2 => nbhw18_v2}/nbhw_gpio.c (100%) rename board/nm/{nrhw18_v2 => nbhw18_v2}/nbhw_gpio.h (100%) rename board/nm/{nrhw18_v2 => nbhw18_v2}/nbhw_mvswitch.c (100%) rename board/nm/{nrhw18_v2 => nbhw18_v2}/nbhw_sim.c (100%) rename configs/{armada-385-nrhw18-v1_defconfig => armada-385-nbhw18-v1_defconfig} (87%) rename configs/{armada-385-nrhw18-v2_defconfig => armada-385-nbhw18-v2_defconfig} (87%) rename include/configs/{armada-385-nrhw18-v1.h => armada-385-nbhw18-v1.h} (99%) rename include/configs/{armada-385-nrhw18-v2.h => armada-385-nbhw18-v2.h} (98%) diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 469a7280be..444c4cbe66 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -83,9 +83,9 @@ dtb-$(CONFIG_TEGRA) += tegra20-harmony.dtb \ tegra210-p2571.dtb dtb-$(CONFIG_ARCH_MVEBU) += \ - armada-385-nrhw18-v1.dtb \ - armada-385-nrhw18-v2.dtb \ - armada-385-nbhw17-v1.dtb \ + armada-385-nbhw18-v1.dtb \ + armada-385-nbhw18-v2.dtb \ + armada-385-nbhw17-v1.dtb \ armada-3720-db.dtb \ armada-3720-espressobin.dtb \ armada-375-db.dtb \ diff --git a/arch/arm/dts/armada-385-nrhw18-common.dtsi b/arch/arm/dts/armada-385-nbhw18-common.dtsi similarity index 98% rename from arch/arm/dts/armada-385-nrhw18-common.dtsi rename to arch/arm/dts/armada-385-nbhw18-common.dtsi index c47166d9ec..dd738591c6 100644 --- a/arch/arm/dts/armada-385-nrhw18-common.dtsi +++ b/arch/arm/dts/armada-385-nbhw18-common.dtsi @@ -14,8 +14,8 @@ #include / { - model = "NetModule Router NRHW18 with Armada A385"; - compatible = "marvell,aramda385-nrhw18", "marvell,armada385", "marvell,armada380"; + model = "NetModule Router NBHW18 with Armada A385"; + compatible = "marvell,aramda385-nbhw18", "marvell,armada385", "marvell,armada380"; aliases { /* So that mvebu u-boot can update the MAC addresses */ diff --git a/arch/arm/dts/armada-385-nrhw18-spl.dts b/arch/arm/dts/armada-385-nbhw18-spl.dts similarity index 78% rename from arch/arm/dts/armada-385-nrhw18-spl.dts rename to arch/arm/dts/armada-385-nbhw18-spl.dts index 352f01d100..26dbcb5a1d 100644 --- a/arch/arm/dts/armada-385-nrhw18-spl.dts +++ b/arch/arm/dts/armada-385-nbhw18-spl.dts @@ -1,5 +1,5 @@ /* - * Device Tree file for the NetModule NRHW18 (NB1800) base variant + * Device Tree file for the NetModule NBHW18 (NB1800) base variant * * Copyright (C) 2016 NetModule * @@ -11,10 +11,10 @@ */ /dts-v1/; -#include "armada-385-nrhw18-common.dtsi" +#include "armada-385-nbhw18-common.dtsi" / { - model = "NetModule Router NRHW18 with Armada A385 (NB1800)"; + model = "NetModule Router NBHW18 with Armada A385 (NB1800)"; chosen { stdout-path = "serial0:115200n8"; }; diff --git a/arch/arm/dts/armada-385-nrhw18-v1.dts b/arch/arm/dts/armada-385-nbhw18-v1.dts similarity index 76% rename from arch/arm/dts/armada-385-nrhw18-v1.dts rename to arch/arm/dts/armada-385-nbhw18-v1.dts index ae0f432393..5f15137922 100755 --- a/arch/arm/dts/armada-385-nrhw18-v1.dts +++ b/arch/arm/dts/armada-385-nbhw18-v1.dts @@ -1,5 +1,5 @@ /* - * Device Tree file for the NetModule NRHW18 v1 (NB1800) base variant + * Device Tree file for the NetModule NBHW17 (NB2800) base variant * * Copyright (C) 2016 NetModule * @@ -11,10 +11,10 @@ */ /dts-v1/; -#include "armada-385-nrhw18-common.dtsi" +#include "armada-385-nbhw18-common.dtsi" / { - model = "NetModule Router NRHW18 v1 with Armada A385 (NB1800)"; + model = "NetModule Router NBHW18 with Armada A385 (NB2800)"; soc { gpiofpga: gpio@fd0000000 { diff --git a/arch/arm/dts/armada-385-nrhw18-v2.dts b/arch/arm/dts/armada-385-nbhw18-v2.dts similarity index 83% rename from arch/arm/dts/armada-385-nrhw18-v2.dts rename to arch/arm/dts/armada-385-nbhw18-v2.dts index 42ccf2472f..5e6bdde4b7 100755 --- a/arch/arm/dts/armada-385-nrhw18-v2.dts +++ b/arch/arm/dts/armada-385-nbhw18-v2.dts @@ -1,5 +1,5 @@ /* - * Device Tree file for the NetModule NRHW18-V2 (NB1800) base variant + * Device Tree file for the NetModule NBHW18-V2 (NB1800) base variant * * Copyright (C) 2016 NetModule * @@ -11,10 +11,10 @@ */ /dts-v1/; -#include "armada-385-nrhw18-common.dtsi" +#include "armada-385-nbhw18-common.dtsi" / { - model = "NetModule Router NRHW18 with Armada A385 (NB1800)"; + model = "NetModule Router NBHW18 with Armada A385 (NB1800)"; soc { gpiofpga: gpio@fd0000000 { diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index bde3ed0f46..1470f8708c 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@ -88,12 +88,12 @@ config TARGET_DB_88F6820_GP bool "Support DB-88F6820-GP" select 88F6820 -config TARGET_NM_NRHW18_V1 - bool "Support NRHW18 V1" +config TARGET_NM_NBHW18_V1 + bool "Support NBHW18 V1" select 88F6820 -config TARGET_NM_NRHW18_V2 - bool "Support NRHW18 V2" +config TARGET_NM_NBHW18_V2 + bool "Support NBHW18 V2" select 88F6820 config TARGET_NM_NBHW17_V1 @@ -154,8 +154,8 @@ config SYS_BOARD default "ds414" if TARGET_DS414 default "maxbcm" if TARGET_MAXBCM default "theadorable" if TARGET_THEADORABLE - default "nrhw18_v1" if TARGET_NM_NRHW18_V1 - default "nrhw18_v2" if TARGET_NM_NRHW18_V2 + default "nbhw18_v1" if TARGET_NM_NBHW18_V1 + default "nbhw18_v2" if TARGET_NM_NBHW18_V2 default "nbhw17_v1" if TARGET_NM_NBHW17_V1 config SYS_CONFIG_NAME @@ -170,8 +170,8 @@ config SYS_CONFIG_NAME default "maxbcm" if TARGET_MAXBCM default "theadorable" if TARGET_THEADORABLE default "turris_omnia" if TARGET_TURRIS_OMNIA - default "armada-385-nrhw18-v1" if TARGET_NM_NRHW18_V1 - default "armada-385-nrhw18-v2" if TARGET_NM_NRHW18_V2 + default "armada-385-nbhw18-v1" if TARGET_NM_NBHW18_V1 + default "armada-385-nbhw18-v2" if TARGET_NM_NBHW18_V2 default "armada-385-nbhw17-v1" if TARGET_NM_NBHW17_V1 config SYS_VENDOR @@ -184,8 +184,8 @@ config SYS_VENDOR default "solidrun" if TARGET_CLEARFOG default "Synology" if TARGET_DS414 default "CZ.NIC" if TARGET_TURRIS_OMNIA - default "nm" if TARGET_NM_NRHW18_V1 - default "nm" if TARGET_NM_NRHW18_V2 + default "nm" if TARGET_NM_NBHW18_V1 + default "nm" if TARGET_NM_NBHW18_V2 default "nm" if TARGET_NM_NBHW17_V1 config SYS_SOC diff --git a/board/nm/nrhw18_v1/MAINTAINERS b/board/nm/nbhw18_v1/MAINTAINERS similarity index 100% rename from board/nm/nrhw18_v1/MAINTAINERS rename to board/nm/nbhw18_v1/MAINTAINERS diff --git a/board/nm/nrhw18_v1/Makefile b/board/nm/nbhw18_v1/Makefile similarity index 100% rename from board/nm/nrhw18_v1/Makefile rename to board/nm/nbhw18_v1/Makefile diff --git a/board/nm/nrhw18_v1/README b/board/nm/nbhw18_v1/README similarity index 100% rename from board/nm/nrhw18_v1/README rename to board/nm/nbhw18_v1/README diff --git a/board/nm/nrhw18_v1/board.c b/board/nm/nbhw18_v1/board.c similarity index 98% rename from board/nm/nrhw18_v1/board.c rename to board/nm/nbhw18_v1/board.c index f912c6c8cf..c41dbadd00 100755 --- a/board/nm/nrhw18_v1/board.c +++ b/board/nm/nbhw18_v1/board.c @@ -391,7 +391,7 @@ int board_network_enable(struct mii_dev *bus) int checkboard(void) { - debug("Board: NetModule NRHW18 v1\n"); + debug("Board: NetModule NBHW18\n"); return 0; } @@ -401,11 +401,11 @@ int board_fit_config_name_match(const char *name) #ifdef CONFIG_SPL_BUILD /* SPL has enabled serial0 per default and will output everything * independend of /boot/consoledev */ -#define DEFAULT_DTB_NAME "armada-385-nrhw18-spl" +#define DEFAULT_DTB_NAME "armada-385-nbhw18-spl" #else /* U-Boot will read /boot/consoledev and based on that it * enables its own serial console */ -#define DEFAULT_DTB_NAME "armada-385-nrhw18-v1" +#define DEFAULT_DTB_NAME "armada-385-nbhw18-v1" #endif /* Check if name fits our dts */ diff --git a/board/nm/nrhw18_v1/kwbimage.cfg b/board/nm/nbhw18_v1/kwbimage.cfg similarity index 100% rename from board/nm/nrhw18_v1/kwbimage.cfg rename to board/nm/nbhw18_v1/kwbimage.cfg diff --git a/board/nm/nrhw18_v1/nbhw_fpga_config.c b/board/nm/nbhw18_v1/nbhw_fpga_config.c similarity index 100% rename from board/nm/nrhw18_v1/nbhw_fpga_config.c rename to board/nm/nbhw18_v1/nbhw_fpga_config.c diff --git a/board/nm/nrhw18_v1/nbhw_gpio.c b/board/nm/nbhw18_v1/nbhw_gpio.c similarity index 100% rename from board/nm/nrhw18_v1/nbhw_gpio.c rename to board/nm/nbhw18_v1/nbhw_gpio.c diff --git a/board/nm/nrhw18_v1/nbhw_gpio.h b/board/nm/nbhw18_v1/nbhw_gpio.h similarity index 100% rename from board/nm/nrhw18_v1/nbhw_gpio.h rename to board/nm/nbhw18_v1/nbhw_gpio.h diff --git a/board/nm/nrhw18_v1/nbhw_sim.c b/board/nm/nbhw18_v1/nbhw_sim.c similarity index 100% rename from board/nm/nrhw18_v1/nbhw_sim.c rename to board/nm/nbhw18_v1/nbhw_sim.c diff --git a/board/nm/nrhw18_v2/MAINTAINERS b/board/nm/nbhw18_v2/MAINTAINERS similarity index 100% rename from board/nm/nrhw18_v2/MAINTAINERS rename to board/nm/nbhw18_v2/MAINTAINERS diff --git a/board/nm/nrhw18_v2/Makefile b/board/nm/nbhw18_v2/Makefile similarity index 100% rename from board/nm/nrhw18_v2/Makefile rename to board/nm/nbhw18_v2/Makefile diff --git a/board/nm/nrhw18_v2/README b/board/nm/nbhw18_v2/README similarity index 100% rename from board/nm/nrhw18_v2/README rename to board/nm/nbhw18_v2/README diff --git a/board/nm/nrhw18_v2/board.c b/board/nm/nbhw18_v2/board.c similarity index 99% rename from board/nm/nrhw18_v2/board.c rename to board/nm/nbhw18_v2/board.c index 8901305bcd..790df1448e 100755 --- a/board/nm/nrhw18_v2/board.c +++ b/board/nm/nbhw18_v2/board.c @@ -752,7 +752,7 @@ int board_network_enable(struct mii_dev *bus) int checkboard(void) { - debug("Board: NetModule NRHW18 v2\n"); + debug("Board: NetModule NBHW18\n"); return 0; } @@ -762,11 +762,11 @@ int board_fit_config_name_match(const char *name) #ifdef CONFIG_SPL_BUILD /* SPL has enabled serial0 per default and will output everything * independend of /boot/consoledev */ -#define DEFAULT_DTB_NAME "armada-385-nrhw18-spl" +#define DEFAULT_DTB_NAME "armada-385-nbhw18-spl" #else /* U-Boot will read /boot/consoledev and based on that it * enables its own serial console */ -#define DEFAULT_DTB_NAME "armada-385-nrhw18-v2" +#define DEFAULT_DTB_NAME "armada-385-nbhw18-v2" #endif /* Check if name fits our dts */ diff --git a/board/nm/nrhw18_v2/da9063.h b/board/nm/nbhw18_v2/da9063.h similarity index 100% rename from board/nm/nrhw18_v2/da9063.h rename to board/nm/nbhw18_v2/da9063.h diff --git a/board/nm/nrhw18_v2/kwbimage.cfg b/board/nm/nbhw18_v2/kwbimage.cfg similarity index 100% rename from board/nm/nrhw18_v2/kwbimage.cfg rename to board/nm/nbhw18_v2/kwbimage.cfg diff --git a/board/nm/nrhw18_v2/nbhw_fpga_config.c b/board/nm/nbhw18_v2/nbhw_fpga_config.c similarity index 100% rename from board/nm/nrhw18_v2/nbhw_fpga_config.c rename to board/nm/nbhw18_v2/nbhw_fpga_config.c diff --git a/board/nm/nrhw18_v2/nbhw_gpio.c b/board/nm/nbhw18_v2/nbhw_gpio.c similarity index 100% rename from board/nm/nrhw18_v2/nbhw_gpio.c rename to board/nm/nbhw18_v2/nbhw_gpio.c diff --git a/board/nm/nrhw18_v2/nbhw_gpio.h b/board/nm/nbhw18_v2/nbhw_gpio.h similarity index 100% rename from board/nm/nrhw18_v2/nbhw_gpio.h rename to board/nm/nbhw18_v2/nbhw_gpio.h diff --git a/board/nm/nrhw18_v2/nbhw_mvswitch.c b/board/nm/nbhw18_v2/nbhw_mvswitch.c similarity index 100% rename from board/nm/nrhw18_v2/nbhw_mvswitch.c rename to board/nm/nbhw18_v2/nbhw_mvswitch.c diff --git a/board/nm/nrhw18_v2/nbhw_sim.c b/board/nm/nbhw18_v2/nbhw_sim.c similarity index 100% rename from board/nm/nrhw18_v2/nbhw_sim.c rename to board/nm/nbhw18_v2/nbhw_sim.c diff --git a/configs/armada-385-nrhw18-v1_defconfig b/configs/armada-385-nbhw18-v1_defconfig similarity index 87% rename from configs/armada-385-nrhw18-v1_defconfig rename to configs/armada-385-nbhw18-v1_defconfig index 76171063c9..63be3aaa5e 100644 --- a/configs/armada-385-nrhw18-v1_defconfig +++ b/configs/armada-385-nbhw18-v1_defconfig @@ -3,12 +3,12 @@ CONFIG_ARCH_MVEBU=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SYS_MALLOC_F_LEN=0x2000 -CONFIG_TARGET_NM_NRHW18_V1=y +CONFIG_TARGET_NM_NBHW18_V1=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y -CONFIG_DEFAULT_DEVICE_TREE="armada-385-nrhw18-spl" -CONFIG_SMBIOS_PRODUCT_NAME="nrhw18_v1" +CONFIG_DEFAULT_DEVICE_TREE="armada-385-nbhw18-spl" +CONFIG_SMBIOS_PRODUCT_NAME="nbhw18_v1" CONFIG_BOOTDELAY=3 CONFIG_BOOTSTAGE_STASH_SIZE=4096 CONFIG_PRE_CONSOLE_BUFFER=y @@ -16,7 +16,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_PRE_CON_BUF_SZ=4096 CONFIG_PRE_CON_BUF_ADDR=0x04000000 # CONFIG_CONSOLE_MUX is not set -CONFIG_DEFAULT_FDT_FILE="armada-385-nrhw18-spl" +CONFIG_DEFAULT_FDT_FILE="armada-385-nbhw18-spl" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SPL=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x190 @@ -48,7 +48,7 @@ CONFIG_EFI_PARTITION=y # CONFIG_SPL_PARTITION_UUIDS is not set CONFIG_OF_BOARD_FIXUP=y CONFIG_SPL_OF_TRANSLATE=y -CONFIG_OF_LIST="armada-385-nrhw18-spl armada-385-nrhw18-v1" +CONFIG_OF_LIST="armada-385-nbhw18-spl armada-385-nbhw18-v1" CONFIG_MULTI_DTB_FIT=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y diff --git a/configs/armada-385-nrhw18-v2_defconfig b/configs/armada-385-nbhw18-v2_defconfig similarity index 87% rename from configs/armada-385-nrhw18-v2_defconfig rename to configs/armada-385-nbhw18-v2_defconfig index eefd6b22e0..00ed2bfdce 100755 --- a/configs/armada-385-nrhw18-v2_defconfig +++ b/configs/armada-385-nbhw18-v2_defconfig @@ -3,12 +3,12 @@ CONFIG_ARCH_MVEBU=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SYS_MALLOC_F_LEN=0x2000 -CONFIG_TARGET_NM_NRHW18_V2=y +CONFIG_TARGET_NM_NBHW18_V2=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y -CONFIG_DEFAULT_DEVICE_TREE="armada-385-nrhw18-spl" -CONFIG_SMBIOS_PRODUCT_NAME="nrhw18_v2" +CONFIG_DEFAULT_DEVICE_TREE="armada-385-nbhw18-spl" +CONFIG_SMBIOS_PRODUCT_NAME="nbhw18_v2" CONFIG_BOOTDELAY=3 CONFIG_BOOTSTAGE_STASH_SIZE=4096 CONFIG_PRE_CONSOLE_BUFFER=y @@ -16,7 +16,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_PRE_CON_BUF_SZ=4096 CONFIG_PRE_CON_BUF_ADDR=0x04000000 # CONFIG_CONSOLE_MUX is not set -CONFIG_DEFAULT_FDT_FILE="armada-385-nrhw18-spl" +CONFIG_DEFAULT_FDT_FILE="armada-385-nbhw18-spl" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SPL=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x190 @@ -48,7 +48,7 @@ CONFIG_EFI_PARTITION=y # CONFIG_SPL_PARTITION_UUIDS is not set CONFIG_OF_BOARD_FIXUP=y CONFIG_SPL_OF_TRANSLATE=y -CONFIG_OF_LIST="armada-385-nrhw18-spl armada-385-nrhw18-v2" +CONFIG_OF_LIST="armada-385-nbhw18-spl armada-385-nbhw18-v2" CONFIG_MULTI_DTB_FIT=y CONFIG_FPGA_LATTICE_SSPI=y CONFIG_MMC_SDHCI=y diff --git a/include/configs/armada-385-nrhw18-v1.h b/include/configs/armada-385-nbhw18-v1.h similarity index 99% rename from include/configs/armada-385-nrhw18-v1.h rename to include/configs/armada-385-nbhw18-v1.h index 56e2a42f43..f04988432d 100644 --- a/include/configs/armada-385-nrhw18-v1.h +++ b/include/configs/armada-385-nbhw18-v1.h @@ -86,7 +86,7 @@ "fdt_high=0x12000000\0" \ "initrd_high=0x13000000\0" \ "kernel_image=kernel.bin\0" \ - "fdt_image=armada-385-nrhw18-prod1.dtb\0" \ + "fdt_image=armada-385-nbhw18-prod1.dtb\0" \ "modeboot=sdboot\0" \ "fdt_addr=" FDT_ADDR "\0" \ "kernel_addr=" KERNEL_ADDR "\0" \ diff --git a/include/configs/armada-385-nrhw18-v2.h b/include/configs/armada-385-nbhw18-v2.h similarity index 98% rename from include/configs/armada-385-nrhw18-v2.h rename to include/configs/armada-385-nbhw18-v2.h index dfc945d929..2c954bbd59 100755 --- a/include/configs/armada-385-nrhw18-v2.h +++ b/include/configs/armada-385-nbhw18-v2.h @@ -8,9 +8,9 @@ #define _CONFIG_DB_88F6820_GP_H /* - * Define NRHW18_V1 to run on old V1 hardware + * Define NBHW18_V1 to run on old V1 hardware */ -/*#define NRHW18_V1 1 */ +/*#define NBHW18_V1 1 */ /* * High Level Configuration Options (easy to change) @@ -97,7 +97,7 @@ "fdt_high=0x12000000\0" \ "initrd_high=0x13000000\0" \ "kernel_image=kernel.bin\0" \ - "fdt_image=armada-385-nrhw18-prod3.dtb\0" \ + "fdt_image=armada-385-nbhw18-prod3.dtb\0" \ "modeboot=sdboot\0" \ "fdt_addr=" FDT_ADDR "\0" \ "kernel_addr=" KERNEL_ADDR "\0" \