From f8ef738abb241dc5b2f514e993fe0f2e821092cc Mon Sep 17 00:00:00 2001 From: Cyril Jourdan Date: Tue, 29 Jan 2013 16:49:59 +0100 Subject: common/tools/genNVRAM: remove 500-200 specific config, refs #3694 --- common/tools/genNVRAM/genNVRAM.c | 4 - common/tools/genNVRAM/iomux_cfg.h | 98 +++------------------- .../tools/genNVRAM/nvram_mcr500-ddr2_200_01.conf | 25 ------ .../tools/genNVRAM/nvram_mcr510-ddr1_200_01.conf | 22 ----- .../tools/genNVRAM/nvram_mcr510-ddr2_200_01.conf | 22 ----- .../tools/genNVRAM/nvram_msk500-ddr1_200_01.conf | 21 ----- .../tools/genNVRAM/nvram_msk500-ddr2_200_01.conf | 21 ----- .../tools/genNVRAM/nvram_msk501-ddr2_200_01.conf | 21 ----- 8 files changed, 10 insertions(+), 224 deletions(-) delete mode 100644 common/tools/genNVRAM/nvram_mcr500-ddr2_200_01.conf delete mode 100644 common/tools/genNVRAM/nvram_mcr510-ddr1_200_01.conf delete mode 100644 common/tools/genNVRAM/nvram_mcr510-ddr2_200_01.conf delete mode 100644 common/tools/genNVRAM/nvram_msk500-ddr1_200_01.conf delete mode 100644 common/tools/genNVRAM/nvram_msk500-ddr2_200_01.conf delete mode 100644 common/tools/genNVRAM/nvram_msk501-ddr2_200_01.conf (limited to 'common/tools') diff --git a/common/tools/genNVRAM/genNVRAM.c b/common/tools/genNVRAM/genNVRAM.c index 4d088a5aef..db92fb5771 100644 --- a/common/tools/genNVRAM/genNVRAM.c +++ b/common/tools/genNVRAM/genNVRAM.c @@ -242,18 +242,14 @@ static const struct iomux_config_table_t iomux_config_table[] = { "msk500-ddr2_1", iomux_config_msk500_ddr2_1 }, { "msk500-ddr2_2", iomux_config_msk500_ddr2_2 }, { "msk500-ddr2_3", iomux_config_msk500_ddr2_3 }, - { "msk500-ddr2_4", iomux_config_msk500_ddr2_4 }, { "msk500-ddr1_1", iomux_config_msk500_ddr1_1 }, { "msk500-ddr1_2", iomux_config_msk500_ddr1_2 }, { "msk501-ddr2_1", iomux_config_msk501_ddr2_1 }, { "msk501-ddr2_2", iomux_config_msk501_ddr2_2 }, { "mcr510-ddr2", iomux_config_mcr510_ddr2 }, - { "mcr510-ddr2_2", iomux_config_mcr510_ddr2_2 }, { "mcr510-ddr1_1", iomux_config_mcr510_ddr1_1 }, - { "mcr510-ddr1_2", iomux_config_mcr510_ddr1_2 }, { "mpr520_1", iomux_config_mpr520_1 }, { "mcr500-ddr2_1", iomux_config_mcr500_ddr2_1 }, - { "mcr500-ddr2_2", iomux_config_mcr500_ddr2_2 }, { NULL }, }; diff --git a/common/tools/genNVRAM/iomux_cfg.h b/common/tools/genNVRAM/iomux_cfg.h index 2fcc3ecb4b..369851f755 100644 --- a/common/tools/genNVRAM/iomux_cfg.h +++ b/common/tools/genNVRAM/iomux_cfg.h @@ -36,6 +36,7 @@ * - UART2 = ARM uart2 * - ARM GPIO = 1,3 * - LEON GPIO = 0,2 + * - PLC 200 GPO on * * This is the default configuration. */ @@ -43,7 +44,7 @@ uint32_t iomux_config_msk500_ddr2_1[] = { 0x00000000, 0x0000, 0xFFFF, 0x00000050, 0x1025, 0x1477, - 0x00000080, 0x0500, 0x0F00, + 0x00000080, 0x0501, 0x0F0F, 0x00000084, 0x0002, 0x0002, 0x0000003C, 0x0004, 0x0004, 0x00000048, 0x000F, 0x000F, @@ -59,12 +60,13 @@ uint32_t iomux_config_msk500_ddr2_1[] = * - UART2 = LEON uart * - ARM GPIO = 1,3 * - LEON GPIO = 0,2 + * - PLC 200 GPO on */ uint32_t iomux_config_msk500_ddr2_2[] = { 0x00000000, 0x0000, 0xFFFF, 0x00000050, 0x1025, 0x1477, - 0x00000080, 0x0500, 0x0F00, + 0x00000080, 0x0501, 0x0F0F, 0x00000084, 0x0002, 0x0002, 0x0000003C, 0x0004, 0x0004, 0x00000048, 0x0010, 0x0010, @@ -80,38 +82,16 @@ uint32_t iomux_config_msk500_ddr2_2[] = * - UART2 = LEON uart * - ARM GPIO = 1,3 * - LEON GPIO = 0,2 - */ -uint32_t iomux_config_msk500_ddr2_3[] = -{ - 0x00000000, 0x0000, 0xFFFF, - 0x00000050, 0x1025, 0x1477, - 0x00000080, 0x0500, 0x0F00, - 0x00000084, 0x0002, 0x0002, - 0x0000003C, 0x0004, 0x0004, - 0x00000048, 0x0090, 0x0090, - (uint32_t)-1 -}; - -/* - * MSK500-DDR2 dev board with : - * - ETH1 RGMII mode - * - ETH2 RMII mode - * - Internal AFE - * - UART1 = ARM uart1 - * - UART2 = ARM uart2 - * - ARM GPIO = 1,3 * - PLC 200 GPO on - * - * This is the default configuration. */ -uint32_t iomux_config_msk500_ddr2_4[] = +uint32_t iomux_config_msk500_ddr2_3[] = { 0x00000000, 0x0000, 0xFFFF, 0x00000050, 0x1025, 0x1477, 0x00000080, 0x0501, 0x0F0F, 0x00000084, 0x0002, 0x0002, 0x0000003C, 0x0004, 0x0004, - 0x00000048, 0x000F, 0x000F, + 0x00000048, 0x0090, 0x0090, (uint32_t)-1 }; @@ -209,29 +189,11 @@ uint32_t iomux_config_msk501_ddr2_2[] = * - UART1 = ARM uart1 * - ARM GPIO = 1,3 * - LEON GPIO = 0,2 + * - PLC 200 GPO on * * This is the default configuration. */ uint32_t iomux_config_mcr510_ddr2[] = -{ - 0x00000000, 0x0000, 0xFFFF, - 0x00000050, 0x1022, 0x1677, - 0x00000080, 0x0500, 0x0F00, - 0x00000084, 0x0002, 0x0002, - 0x0000003C, 0x0004, 0x0004, - 0x00000048, 0x000F, 0x000F, - (uint32_t)-1 -}; - -/* - * MCR510-DDR2 ref design with : - * - ETH1 RMII mode - * - UART1 = ARM uart1 - * - ARM GPIO = 1,3 - * - LEON GPIO = 0,2 - * - PLC 200 GPO on - */ -uint32_t iomux_config_mcr510_ddr2_2[] = { 0x00000000, 0x0000, 0xFFFF, 0x00000050, 0x1022, 0x1677, @@ -248,30 +210,11 @@ uint32_t iomux_config_mcr510_ddr2_2[] = * - UART1 = ARM uart1 * - ARM GPIO = 1,3 * - LEON GPIO = 0,2 + * - PLC 200 GPO on * * This is the default configuration. */ uint32_t iomux_config_mcr510_ddr1_1[] = -{ - 0x00000000, 0x0000, 0xFFFF, - 0x00000050, 0x1022, 0x1677, - 0x00000080, 0x0500, 0x0F00, - 0x00000084, 0x0002, 0x0002, - 0x0000003C, 0x0004, 0x0004, - 0x00000048, 0x000F, 0x000F, - (uint32_t)-1 -}; - -/* - * MCR510-DDR1 ref design with : - * - ETH1 RMII mode - * - UART1 = ARM uart1 - * - ARM GPIO = 1,3 - * - LEON GPIO = 0,2 - * - PLC 200 GPO on - * - */ -uint32_t iomux_config_mcr510_ddr1_2[] = { 0x00000000, 0x0000, 0xFFFF, 0x00000050, 0x1022, 0x1677, @@ -313,33 +256,11 @@ uint32_t iomux_config_mpr520_1[] = * - UART2 = ARM uart2 * - ARM GPIO = 1,3 * - LEON GPIO = 0,2 + * - PLC 200 GPO on * * This is the default configuration. */ uint32_t iomux_config_mcr500_ddr2_1[] = -{ - 0x00000000, 0x0000, 0xFFFF, - 0x00000050, 0x1025, 0x1477, - 0x00000080, 0x0500, 0x0F00, - 0x00000084, 0x0002, 0x0002, - 0x0000003C, 0x0004, 0x0004, - 0x00000048, 0x000F, 0x000F, - (uint32_t)-1 -}; - -/* - * MCR500-DDR2 ref design with : - * - ETH1 RGMII mode - * - ETH2 RMII mode - * - Internal AFE - * - UART1 = ARM uart1 - * - UART2 = ARM uart2 - * - ARM GPIO = 1,3 - * - LEON GPIO = 0,2 - * - PLC 200 GPO on - * - */ -uint32_t iomux_config_mcr500_ddr2_2[] = { 0x00000000, 0x0000, 0xFFFF, 0x00000050, 0x1025, 0x1477, @@ -349,4 +270,5 @@ uint32_t iomux_config_mcr500_ddr2_2[] = 0x00000048, 0x000F, 0x000F, (uint32_t)-1 }; + #endif /* __IOMUX_CFG_H */ diff --git a/common/tools/genNVRAM/nvram_mcr500-ddr2_200_01.conf b/common/tools/genNVRAM/nvram_mcr500-ddr2_200_01.conf deleted file mode 100644 index c8a28e664e..0000000000 --- a/common/tools/genNVRAM/nvram_mcr500-ddr2_200_01.conf +++ /dev/null @@ -1,25 +0,0 @@ -pkgcfg=0x0000170f -iomux_config = mcr500-ddr2_2 -gpiodir=0x00000084 -miu_config = h5ps5162gfr-s6c_4l -forg=0x00000007 -img0off=0x00140000 -imgmaxsize=0x360000 -phy1=0x2 -ethernet1=00:13:D7:15:10:01 -portnb1=1 -phy2=0x1 -ethernet2=00:13:D7:15:20:01 -portnb2=1 -name=MCR500-DDR2 -plc=00:13:D7:15:00:01 -nbimg=2 -dpw=SPIDCOM-MCR500-DDR2-01 -serial=MCR500-DDR2-01 -desc=MCR500-DDR2 reference design -oem=SPiDCOM -factory=SPiDCOM -brddesc=MCR500-DDR2 reference design -ssize=64 -brdid=1 -brdnb=1 diff --git a/common/tools/genNVRAM/nvram_mcr510-ddr1_200_01.conf b/common/tools/genNVRAM/nvram_mcr510-ddr1_200_01.conf deleted file mode 100644 index 1befbffafb..0000000000 --- a/common/tools/genNVRAM/nvram_mcr510-ddr1_200_01.conf +++ /dev/null @@ -1,22 +0,0 @@ -pkgcfg=0x0000150f -iomux_config = mcr510-ddr1_2 -gpiodir=0x00000084 -miu_config = h5du5162etr-fac -forg=0x00000006 -img0off=0x000b0000 -imgmaxsize=0x1b0000 -phy1=0x5 -ethernet1=00:13:D7:16:10:01 -portnb1=2 -name=MCR510-DDR1 -plc=00:13:D7:16:00:01 -nbimg=2 -dpw=SPIDCOM-MCR510-DDR1-01 -serial=MCR510-DDR1-01 -desc=MCR510 DDR1 reference design -oem=SPiDCOM -factory=SPiDCOM -brddesc=MCR510-DDR1 demo board -ssize=64 -brdid=1 -brdnb=1 diff --git a/common/tools/genNVRAM/nvram_mcr510-ddr2_200_01.conf b/common/tools/genNVRAM/nvram_mcr510-ddr2_200_01.conf deleted file mode 100644 index 810bb177e8..0000000000 --- a/common/tools/genNVRAM/nvram_mcr510-ddr2_200_01.conf +++ /dev/null @@ -1,22 +0,0 @@ -pkgcfg=0x0000150f -iomux_config=mcr510-ddr2_2 -gpiodir=0x00000084 -miu_config=h5ps5162gfr-s6c_2l -forg=0x00000006 -img0off=0x000b0000 -imgmaxsize=0x1b0000 -phy1=0x5 -ethernet1=00:13:D7:12:10:01 -portnb1=2 -name=MCR510-DDR2 -plc=00:13:D7:12:00:01 -nbimg=2 -dpw=SPIDCOM-MCR510-DDR2-01 -serial=MCR510-DDR2-01 -desc=MCR510 DDR2 reference design -oem=SPiDCOM -factory=SPiDCOM -brddesc=MSK500-DDR2 development board -ssize=64 -brdid=1 -brdnb=1 diff --git a/common/tools/genNVRAM/nvram_msk500-ddr1_200_01.conf b/common/tools/genNVRAM/nvram_msk500-ddr1_200_01.conf deleted file mode 100644 index 3ddee5b834..0000000000 --- a/common/tools/genNVRAM/nvram_msk500-ddr1_200_01.conf +++ /dev/null @@ -1,21 +0,0 @@ -pkgcfg=0x0000170f -iomux_config=msk500-ddr1_1 -miu_config=h5du5162etr-fac -forg=0x00000008 -img0off=0x00140000 -imgmaxsize=0x360000 -phy1=0x2 -ethernet1=00:13:D7:13:10:01 -portnb1=1 -name=MSK500-DDR1 -plc=00:13:D7:13:00:01 -nbimg=2 -dpw=SPIDCOM-MSK500-DDR1-01 -serial=MSK500-DDR1-01 -desc=MSK500-DDR1 development board -oem=SPiDCOM -factory=SPiDCOM -brddesc=MSK500-DDR1 development board -ssize=128 -brdid=1 -brdnb=1 diff --git a/common/tools/genNVRAM/nvram_msk500-ddr2_200_01.conf b/common/tools/genNVRAM/nvram_msk500-ddr2_200_01.conf deleted file mode 100644 index 41fa4d66b4..0000000000 --- a/common/tools/genNVRAM/nvram_msk500-ddr2_200_01.conf +++ /dev/null @@ -1,21 +0,0 @@ -pkgcfg=0x0000170f -iomux_config=msk500-ddr2_4 -miu_config=h5ps1g63jfr-s6c -forg=0x00000008 -img0off=0x00140000 -imgmaxsize=0x360000 -phy1=0x2 -ethernet1=00:13:D7:11:10:01 -portnb1=1 -name=MSK500-DDR2 -plc=00:13:D7:11:00:01 -nbimg=2 -dpw=SPIDCOM-MSK500-DDR2-01 -serial=MSK500-DDR2-01 -desc=MSK500-DDR2 development board -oem=SPiDCOM -factory=SPiDCOM -brddesc=MSK500-DDR2 development board -ssize=128 -brdid=1 -brdnb=1 diff --git a/common/tools/genNVRAM/nvram_msk501-ddr2_200_01.conf b/common/tools/genNVRAM/nvram_msk501-ddr2_200_01.conf deleted file mode 100644 index 3773e27e74..0000000000 --- a/common/tools/genNVRAM/nvram_msk501-ddr2_200_01.conf +++ /dev/null @@ -1,21 +0,0 @@ -pkgcfg=0x00001f0f -iomux_config=msk501-ddr2_1 -miu_config=h5ps1g63jfr-s6c -forg=0x00000008 -img0off=0x00140000 -imgmaxsize=0x360000 -phy1=0x2 -ethernet1=00:13:D7:14:10:01 -portnb1=1 -name=MSK500-DDR2 -plc=00:13:D7:14:00:01 -nbimg=1 -dpw=SPIDCOM-MSK501-DDR2-01 -serial=MSK501-DDR2-01 -desc=MSK501-DDR2 development board -oem=SPiDCOM -factory=SPiDCOM -brddesc=MSK501-DDR2 development board -ssize=128 -brdid=1 -brdnb=1 -- cgit v1.2.3