ARM: tegra: use numeric versioning for p2771-0000
The board ID EEPROM and board ID stickers on p2771-0000 will use a numeric
versioning scheme, with version numbers such as 000/100/200/300/400/500.
Within NVIDIA, these versions are also known as A00/A01/A02/A03/A04/B00.
However, that numbering scheme is not easily visible outside of NVIDIA,
and so does not make much sense to use. Convert U-Boot to use the readily
visible numeric scheme.
Also, it turns out that the current A02 DT actually applies to board
versions 000/100/200 (A00..A02). Consequently rename this to 000 not 200
so that all U-Boot builds are named after the first version of the HW they
support.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 7d1944f..7d52654 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -58,8 +58,8 @@
tegra124-jetson-tk1.dtb \
tegra124-nyan-big.dtb \
tegra124-venice2.dtb \
- tegra186-p2771-0000-a02.dtb \
- tegra186-p2771-0000-b00.dtb \
+ tegra186-p2771-0000-000.dtb \
+ tegra186-p2771-0000-500.dtb \
tegra210-e2220-1170.dtb \
tegra210-p2371-0000.dtb \
tegra210-p2371-2180.dtb \
diff --git a/arch/arm/dts/tegra186-p2771-0000-a02.dts b/arch/arm/dts/tegra186-p2771-0000-000.dts
similarity index 82%
rename from arch/arm/dts/tegra186-p2771-0000-a02.dts
rename to arch/arm/dts/tegra186-p2771-0000-000.dts
index 36a3c21..d97c6fd 100644
--- a/arch/arm/dts/tegra186-p2771-0000-a02.dts
+++ b/arch/arm/dts/tegra186-p2771-0000-000.dts
@@ -3,8 +3,8 @@
#include "tegra186-p2771-0000.dtsi"
/ {
- model = "NVIDIA P2771-0000 A02";
- compatible = "nvidia,p2771-0000-a02", "nvidia,p2771-0000", "nvidia,tegra186";
+ model = "NVIDIA P2771-0000-000";
+ compatible = "nvidia,p2771-0000-000", "nvidia,p2771-0000", "nvidia,tegra186";
sdhci@3400000 {
cd-gpios = <&gpio_main TEGRA_MAIN_GPIO(P, 6) GPIO_ACTIVE_LOW>;
diff --git a/arch/arm/dts/tegra186-p2771-0000-b00.dts b/arch/arm/dts/tegra186-p2771-0000-500.dts
similarity index 82%
rename from arch/arm/dts/tegra186-p2771-0000-b00.dts
rename to arch/arm/dts/tegra186-p2771-0000-500.dts
index 0f1d0e8..393a8b2 100644
--- a/arch/arm/dts/tegra186-p2771-0000-b00.dts
+++ b/arch/arm/dts/tegra186-p2771-0000-500.dts
@@ -3,8 +3,8 @@
#include "tegra186-p2771-0000.dtsi"
/ {
- model = "NVIDIA P2771-0000 B00";
- compatible = "nvidia,p2771-0000-b00", "nvidia,p2771-0000", "nvidia,tegra186";
+ model = "NVIDIA P2771-0000-500";
+ compatible = "nvidia,p2771-0000-500", "nvidia,p2771-0000", "nvidia,tegra186";
sdhci@3400000 {
cd-gpios = <&gpio_main TEGRA_MAIN_GPIO(P, 5) GPIO_ACTIVE_LOW>;
diff --git a/configs/p2771-0000-b00_defconfig b/configs/p2771-0000-000_defconfig
similarity index 87%
rename from configs/p2771-0000-b00_defconfig
rename to configs/p2771-0000-000_defconfig
index 27393f3..25ff8ae 100644
--- a/configs/p2771-0000-b00_defconfig
+++ b/configs/p2771-0000-000_defconfig
@@ -2,10 +2,10 @@
CONFIG_TEGRA=y
CONFIG_TEGRA186=y
CONFIG_TARGET_P2771_0000=y
-CONFIG_DEFAULT_DEVICE_TREE="tegra186-p2771-0000-b00"
+CONFIG_DEFAULT_DEVICE_TREE="tegra186-p2771-0000-000"
CONFIG_OF_SYSTEM_SETUP=y
CONFIG_HUSH_PARSER=y
-CONFIG_SYS_PROMPT="Tegra186 (P2771-0000 B00) # "
+CONFIG_SYS_PROMPT="Tegra186 (P2771-0000-000) # "
# CONFIG_CMD_IMI is not set
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
diff --git a/configs/p2771-0000-b00_defconfig b/configs/p2771-0000-500_defconfig
similarity index 87%
copy from configs/p2771-0000-b00_defconfig
copy to configs/p2771-0000-500_defconfig
index 27393f3..9432a13 100644
--- a/configs/p2771-0000-b00_defconfig
+++ b/configs/p2771-0000-500_defconfig
@@ -2,10 +2,10 @@
CONFIG_TEGRA=y
CONFIG_TEGRA186=y
CONFIG_TARGET_P2771_0000=y
-CONFIG_DEFAULT_DEVICE_TREE="tegra186-p2771-0000-b00"
+CONFIG_DEFAULT_DEVICE_TREE="tegra186-p2771-0000-500"
CONFIG_OF_SYSTEM_SETUP=y
CONFIG_HUSH_PARSER=y
-CONFIG_SYS_PROMPT="Tegra186 (P2771-0000 B00) # "
+CONFIG_SYS_PROMPT="Tegra186 (P2771-0000-500) # "
# CONFIG_CMD_IMI is not set
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
diff --git a/configs/p2771-0000-a02_defconfig b/configs/p2771-0000-a02_defconfig
deleted file mode 100644
index 5ce369c..0000000
--- a/configs/p2771-0000-a02_defconfig
+++ /dev/null
@@ -1,37 +0,0 @@
-CONFIG_ARM=y
-CONFIG_TEGRA=y
-CONFIG_TEGRA186=y
-CONFIG_TARGET_P2771_0000=y
-CONFIG_DEFAULT_DEVICE_TREE="tegra186-p2771-0000-a02"
-CONFIG_OF_SYSTEM_SETUP=y
-CONFIG_HUSH_PARSER=y
-CONFIG_SYS_PROMPT="Tegra186 (P2771-0000 A02) # "
-# CONFIG_CMD_IMI is not set
-# CONFIG_CMD_IMLS is not set
-# CONFIG_CMD_FLASH is not set
-CONFIG_CMD_MMC=y
-CONFIG_CMD_SF=y
-CONFIG_CMD_SPI=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_USB=y
-# CONFIG_CMD_FPGA is not set
-CONFIG_CMD_GPIO=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_DHCP=y
-# CONFIG_CMD_NFS is not set
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_EXT2=y
-CONFIG_CMD_EXT4=y
-CONFIG_CMD_EXT4_WRITE=y
-CONFIG_CMD_FAT=y
-CONFIG_CMD_FS_GENERIC=y
-CONFIG_RTL8169=y
-CONFIG_E1000=y
-CONFIG_PCI_TEGRA=y
-CONFIG_TEGRA186_BPMP_I2C=y
-CONFIG_SYS_NS16550=y
-CONFIG_USB=y
-CONFIG_DM_USB=y
-CONFIG_POWER_DOMAIN=y
-CONFIG_TEGRA186_POWER_DOMAIN=y