LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "NRHW18 - refactoring of names and definitions" 

This reverts commit 65d5c76786.

NRSW branch also renamed the dts and config names. To avoid merge
conflicts, we need to revert this commits.

BugzID: 77953
This commit is contained in:
Alexandre Bard 2022-05-05 11:48:32 +02:00
parent eda2a82ae7
commit 3c44468569
30 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/dts/Makefile
View File

@ -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 \

4
arch/arm/dts/armada-385-nrhw18-common.dtsi → arch/arm/dts/armada-385-nbhw18-common.dtsi
View File

@ -14,8 +14,8 @@
#include <dt-bindings/gpio/gpio.h>
/ {
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 */

6
arch/arm/dts/armada-385-nrhw18-spl.dts → arch/arm/dts/armada-385-nbhw18-spl.dts
View File

@ -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";
};

6
arch/arm/dts/armada-385-nrhw18-v1.dts → arch/arm/dts/armada-385-nbhw18-v1.dts
View File

@ -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 {

6
arch/arm/dts/armada-385-nrhw18-v2.dts → arch/arm/dts/armada-385-nbhw18-v2.dts
View File

@ -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 {

20
arch/arm/mach-mvebu/Kconfig
View File

@ -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

0
board/nm/nrhw18_v1/MAINTAINERS → board/nm/nbhw18_v1/MAINTAINERS
View File

0
board/nm/nrhw18_v1/Makefile → board/nm/nbhw18_v1/Makefile
View File

0
board/nm/nrhw18_v1/README → board/nm/nbhw18_v1/README
View File

6
board/nm/nrhw18_v1/board.c → board/nm/nbhw18_v1/board.c
View File

@ -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 */

0
board/nm/nrhw18_v1/kwbimage.cfg → board/nm/nbhw18_v1/kwbimage.cfg
View File

0
board/nm/nrhw18_v1/nbhw_fpga_config.c → board/nm/nbhw18_v1/nbhw_fpga_config.c
View File

0
board/nm/nrhw18_v1/nbhw_gpio.c → board/nm/nbhw18_v1/nbhw_gpio.c
View File

0
board/nm/nrhw18_v1/nbhw_gpio.h → board/nm/nbhw18_v1/nbhw_gpio.h
View File

0
board/nm/nrhw18_v1/nbhw_sim.c → board/nm/nbhw18_v1/nbhw_sim.c
View File

0
board/nm/nrhw18_v2/MAINTAINERS → board/nm/nbhw18_v2/MAINTAINERS
View File

0
board/nm/nrhw18_v2/Makefile → board/nm/nbhw18_v2/Makefile
View File

0
board/nm/nrhw18_v2/README → board/nm/nbhw18_v2/README
View File

6
board/nm/nrhw18_v2/board.c → board/nm/nbhw18_v2/board.c
View File

@ -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 */

0
board/nm/nrhw18_v2/da9063.h → board/nm/nbhw18_v2/da9063.h
View File

0
board/nm/nrhw18_v2/kwbimage.cfg → board/nm/nbhw18_v2/kwbimage.cfg
View File

0
board/nm/nrhw18_v2/nbhw_fpga_config.c → board/nm/nbhw18_v2/nbhw_fpga_config.c
View File

0
board/nm/nrhw18_v2/nbhw_gpio.c → board/nm/nbhw18_v2/nbhw_gpio.c
View File

0
board/nm/nrhw18_v2/nbhw_gpio.h → board/nm/nbhw18_v2/nbhw_gpio.h
View File

0
board/nm/nrhw18_v2/nbhw_mvswitch.c → board/nm/nbhw18_v2/nbhw_mvswitch.c
View File

0
board/nm/nrhw18_v2/nbhw_sim.c → board/nm/nbhw18_v2/nbhw_sim.c
View File

10
configs/armada-385-nrhw18-v1_defconfig → configs/armada-385-nbhw18-v1_defconfig
View File

@ -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

10
configs/armada-385-nrhw18-v2_defconfig → configs/armada-385-nbhw18-v2_defconfig
View File

@ -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

2
include/configs/armada-385-nrhw18-v1.h → include/configs/armada-385-nbhw18-v1.h
View File

@ -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" \

6
include/configs/armada-385-nrhw18-v2.h → include/configs/armada-385-nbhw18-v2.h
View File

@ -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" \