summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/tools/genNVRAM/genNVRAM.c6
-rw-r--r--common/tools/genNVRAM/iomux_cfg.h38
-rw-r--r--common/tools/genNVRAM/nvram_mse500_300_bringup.conf25
-rw-r--r--common/tools/genNVRAM/nvram_mse500_500_bringup.conf25
-rw-r--r--common/tools/genNVRAM/nvram_msk500-ddr2_300_01.conf25
-rw-r--r--common/tools/genNVRAM/nvram_msk500-ddr2_500_01.conf25
6 files changed, 88 insertions, 56 deletions
diff --git a/common/tools/genNVRAM/genNVRAM.c b/common/tools/genNVRAM/genNVRAM.c
index 9ea6588968..f5962fdc95 100644
--- a/common/tools/genNVRAM/genNVRAM.c
+++ b/common/tools/genNVRAM/genNVRAM.c
@@ -236,9 +236,9 @@ struct iomux_config_table_t
/* See iomux_cfg.h. */
static const struct iomux_config_table_t iomux_config_table[] =
{
- { "bringup", iomux_config_bringup },
- { "bringup_uart_leon", iomux_config_bringup_uart_leon },
- { "bringup_dsu_uart_leon", iomux_config_bringup_dsu_uart_leon },
+ { "msk500-ddr2_1", iomux_config_msk500_ddr2_1 },
+ { "msk500-ddr2_2", iomux_config_msk500_ddr2_2 },
+ { "msk500-ddr2_3", iomux_config_msk500_ddr2_3 },
NULL
};
diff --git a/common/tools/genNVRAM/iomux_cfg.h b/common/tools/genNVRAM/iomux_cfg.h
index b83787ff45..b7ac8a17e7 100644
--- a/common/tools/genNVRAM/iomux_cfg.h
+++ b/common/tools/genNVRAM/iomux_cfg.h
@@ -27,7 +27,19 @@
* relative to IOMUX_BASE.
*/
-uint32_t iomux_config_bringup[] =
+/*
+ * MSK500-DDR2 dev board with :
+ * - ETH1 RGMII mode
+ * - ETH2 RMII mode
+ * - Internal AFE
+ * - UART1 = ARM uart1
+ * - UART2 = ARM uart2
+ * - ARM GPIO = 1,3
+ * - LEON GPIO = 0,2
+ *
+ * This is the default configuration.
+ */
+uint32_t iomux_config_msk500_ddr2_1[] =
{
0x00000000, 0x0000, 0xFFFF,
0x00000050, 0x1025, 0x1477,
@@ -38,7 +50,17 @@ uint32_t iomux_config_bringup[] =
(uint32_t)-1
};
-uint32_t iomux_config_bringup_uart_leon[] =
+/*
+ * MSK500-DDR2 dev board with :
+ * - ETH1 RGMII mode
+ * - ETH2 RMII mode
+ * - Internal AFE
+ * - UART1 = ARM uart1
+ * - UART2 = LEON uart
+ * - ARM GPIO = 1,3
+ * - LEON GPIO = 0,2
+ */
+uint32_t iomux_config_msk500_ddr2_2[] =
{
0x00000000, 0x0000, 0xFFFF,
0x00000050, 0x1025, 0x1477,
@@ -49,7 +71,17 @@ uint32_t iomux_config_bringup_uart_leon[] =
(uint32_t)-1
};
-uint32_t iomux_config_bringup_dsu_uart_leon[] =
+/*
+ * MSK500-DDR2 dev board with :
+ * - ETH1 RGMII mode
+ * - ETH2 RMII mode
+ * - Internal AFE
+ * - UART1 = LEON DSU
+ * - UART2 = LEON uart
+ * - ARM GPIO = 1,3
+ * - LEON GPIO = 0,2
+ */
+uint32_t iomux_config_msk500_ddr2_3[] =
{
0x00000000, 0x0000, 0xFFFF,
0x00000050, 0x1025, 0x1477,
diff --git a/common/tools/genNVRAM/nvram_mse500_300_bringup.conf b/common/tools/genNVRAM/nvram_mse500_300_bringup.conf
deleted file mode 100644
index e6b7529709..0000000000
--- a/common/tools/genNVRAM/nvram_mse500_300_bringup.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-pkgcfg=0x0000270f
-iomux_config = bringup
-gpiodir=0x00000084
-miu_config = h5ps1g63jfr-s6c
-forg=0x00000008
-img0off=0x00140000
-imgmaxsize=0xec0000
-phy1=0x2
-ethernet1=00:13:D7:01:10:01
-portnb1=1
-phy2=0x1
-ethernet2=00:13:D7:01:20:01
-portnb2=1
-name=MSE500-BRINGUP
-plc=00:13:D7:01:00:01
-nbimg=1
-dpw=SPIDCOM-MSE500BRINGUP-01
-serial=MSE500BRINGUP-1
-desc=MSE500 bringup model
-brddesc=MSE500DINI bringup model
-brdid=0
-oem=spidcom
-ssize=128
-afetype=16
-factory=nothing
diff --git a/common/tools/genNVRAM/nvram_mse500_500_bringup.conf b/common/tools/genNVRAM/nvram_mse500_500_bringup.conf
deleted file mode 100644
index f5c150569c..0000000000
--- a/common/tools/genNVRAM/nvram_mse500_500_bringup.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-pkgcfg=0x0000370f
-iomux_config = bringup
-gpiodir=0x00000084
-miu_config = h5ps1g63jfr-s6c
-forg=0x00000008
-img0off=0x00140000
-imgmaxsize=0xec0000
-phy1=0x2
-ethernet1=00:13:D7:01:10:01
-portnb1=1
-phy2=0x1
-ethernet2=00:13:D7:01:20:01
-portnb2=1
-name=MSE500-BRINGUP
-plc=00:13:D7:01:00:01
-nbimg=1
-dpw=SPIDCOM-MSE500BRINGUP-01
-serial=MSE500BRINGUP-1
-desc=MSE500 bringup model
-brddesc=MSE500DINI bringup model
-brdid=0
-oem=spidcom
-ssize=128
-afetype=16
-factory=nothing
diff --git a/common/tools/genNVRAM/nvram_msk500-ddr2_300_01.conf b/common/tools/genNVRAM/nvram_msk500-ddr2_300_01.conf
new file mode 100644
index 0000000000..48da9a320a
--- /dev/null
+++ b/common/tools/genNVRAM/nvram_msk500-ddr2_300_01.conf
@@ -0,0 +1,25 @@
+pkgcfg=0x0000270f
+iomux_config = msk500-ddr2_1
+gpiodir=0x00000084
+miu_config = h5ps1g63jfr-s6c
+forg=0x00000008
+img0off=0x00140000
+imgmaxsize=0xec0000
+phy1=0x2
+ethernet1=00:13:D7:11:10:01
+portnb1=1
+phy2=0x1
+ethernet2=00:13:D7:11:20:01
+portnb2=1
+name=MSK500-DDR2
+plc=00:13:D7:11:00:01
+nbimg=1
+dpw=SPIDCOM-MSK500-DRR2-01
+serial=MSK500-DDR2-01
+desc=MSK500-DDR2 development board
+brddesc=MSK500-DDR2 development board
+brdid=0
+oem=spidcom
+ssize=128
+afetype=16
+factory=nothing
diff --git a/common/tools/genNVRAM/nvram_msk500-ddr2_500_01.conf b/common/tools/genNVRAM/nvram_msk500-ddr2_500_01.conf
new file mode 100644
index 0000000000..cf10e5e3f1
--- /dev/null
+++ b/common/tools/genNVRAM/nvram_msk500-ddr2_500_01.conf
@@ -0,0 +1,25 @@
+pkgcfg=0x0000370f
+iomux_config = msk500-ddr2_1
+gpiodir=0x00000084
+miu_config = h5ps1g63jfr-s6c
+forg=0x00000008
+img0off=0x00140000
+imgmaxsize=0xec0000
+phy1=0x2
+ethernet1=00:13:D7:11:10:01
+portnb1=1
+phy2=0x1
+ethernet2=00:13:D7:11:20:01
+portnb2=1
+name=MSK500-DDR2
+plc=00:13:D7:11:00:01
+nbimg=1
+dpw=SPIDCOM-MSK500-DRR2-01
+serial=MSK500-DDR2-01
+desc=MSK500-DDR2 development board
+brddesc=MSK500-DDR2 development board
+brdid=0
+oem=spidcom
+ssize=128
+afetype=16
+factory=nothing