mpc83xx: Migrate arbiter config to Kconfig

Migrate the arbiter configuration to Kconfig.

Signed-off-by: Mario Six <mario.six@gdsys.cc>

diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig
index 9f7b3a2e0197656931b82da4e50479cb19d31900..8a3bb10466c64c4f562f51ff254799c7f6826181 100644 (file)
--- a/arch/powerpc/cpu/mpc83xx/Kconfig
+++ b/arch/powerpc/cpu/mpc83xx/Kconfig
@@ -295,6 +295,7 @@ source "arch/powerpc/cpu/mpc83xx/lblaw/Kconfig"
 source "arch/powerpc/cpu/mpc83xx/elbc/Kconfig"
 source "arch/powerpc/cpu/mpc83xx/hid/Kconfig"
 source "arch/powerpc/cpu/mpc83xx/sysio/Kconfig"
+source "arch/powerpc/cpu/mpc83xx/arbiter/Kconfig"
 
 menu "Legacy options"
 

diff --git a/arch/powerpc/cpu/mpc83xx/arbiter/Kconfig b/arch/powerpc/cpu/mpc83xx/arbiter/Kconfig
new file mode 100644 (file)
index 0000000..f562476
--- /dev/null
+++ b/arch/powerpc/cpu/mpc83xx/arbiter/Kconfig
@@ -0,0 +1,139 @@
+menu "Arbiter"
+
+choice
+       prompt "Pipeline depth"
+
+config ACR_PIPE_DEP_UNSET
+       bool "Don't set value"
+
+config ACR_PIPE_DEP_1
+       bool "1"
+
+config ACR_PIPE_DEP_2
+       bool "2"
+
+config ACR_PIPE_DEP_3
+       bool "3"
+
+config ACR_PIPE_DEP_4
+       bool "4"
+
+endchoice
+
+choice
+       prompt "Repeat count"
+
+config ACR_RPTCNT_UNSET
+       bool "Don't set value"
+
+config ACR_RPTCNT_1
+       bool "1"
+
+config ACR_RPTCNT_2
+       bool "2"
+
+config ACR_RPTCNT_3
+       bool "3"
+
+config ACR_RPTCNT_4
+       bool "4"
+
+config ACR_RPTCNT_5
+       bool "5"
+
+config ACR_RPTCNT_6
+       bool "6"
+
+config ACR_RPTCNT_7
+       bool "7"
+
+config ACR_RPTCNT_8
+       bool "8"
+
+endchoice
+
+choice
+       prompt "Address parking"
+
+config ACR_APARK_UNSET
+       bool "Don't set value"
+
+config ACR_APARK_MASTER
+       bool "Park to master"
+
+config ACR_APARK_LAST
+       bool "Park to last owner"
+
+config ACR_APARK_DISABLE
+       bool "Disabled"
+
+endchoice
+
+choice
+       prompt "Parking master"
+
+config ACR_PARKM_UNSET
+       bool "Don't set value"
+
+config ACR_PARKM_E300
+       bool "e300 core"
+
+config ACR_PARKM_TSEC_1_2
+       bool "TSEC1, TSEC2"
+
+config ACR_PARKM_USB_I2C1_BOOT
+       bool "USB/I2C1_BOOT"
+
+config ACR_PARKM_DMA_ESDHC_USB
+       bool "DMA, ESDHC, USB"
+
+config ACR_PARKM_PEX
+       bool "PCI Express"
+
+if MPC83XX_QUICC_ENGINE
+
+config ACR_PARKM_ENC_CORE
+       bool "Encryption core"
+
+endif
+
+endchoice
+
+config ACR_PIPE_DEP
+       hex
+       default 0x0 if ACR_PIPE_DEP_UNSET
+       default 0x0 if ACR_PIPE_DEP_1
+       default 0x10000 if ACR_PIPE_DEP_2
+       default 0x20000 if ACR_PIPE_DEP_3
+       default 0x30000 if ACR_PIPE_DEP_4
+
+config ACR_RPTCNT
+       hex
+       default 0x0 if ACR_RPTCNT_UNSET
+       default 0x0 if ACR_RPTCNT_1
+       default 0x100 if ACR_RPTCNT_2
+       default 0x200 if ACR_RPTCNT_3
+       default 0x300 if ACR_RPTCNT_4
+       default 0x400 if ACR_RPTCNT_5
+       default 0x500 if ACR_RPTCNT_6
+       default 0x600 if ACR_RPTCNT_7
+       default 0x700 if ACR_RPTCNT_8
+
+config ACR_APARK
+       hex
+       default 0x0 if ACR_APARK_UNSET
+       default 0x0 if ACR_APARK_MASTER
+       default 0x10 if ACR_APARK_LAST
+       default 0x20 if ACR_APARK_DISABLE
+
+config ACR_PARKM
+       hex
+       default 0x0 if ACR_PARKM_UNSET
+       default 0x0 if ACR_PARKM_E300
+       default 0x2 if ACR_PARKM_TSEC_1_2
+       default 0x3 if ACR_PARKM_USB_I2C1_BOOT
+       default 0x4 if ACR_PARKM_DMA_ESDHC_USB
+       default 0x5 if ACR_PARKM_PEX
+       default 0x5 if ACR_PARKM_ENC_CORE
+
+endmenu

diff --git a/arch/powerpc/cpu/mpc83xx/arbiter/arbiter.h b/arch/powerpc/cpu/mpc83xx/arbiter/arbiter.h
new file mode 100644 (file)
index 0000000..10a47e4
--- /dev/null
+++ b/arch/powerpc/cpu/mpc83xx/arbiter/arbiter.h
@@ -0,0 +1,28 @@
+       const __be32 acr_mask =
+#ifndef CONFIG_ACR_PIPE_DEP_UNSET
+               ACR_PIPE_DEP |
+#endif
+#ifndef CONFIG_ACR_RPTCNT_UNSET
+               ACR_RPTCNT |
+#endif
+#ifndef CONFIG_ACR_APARK_UNSET
+               ACR_APARK |
+#endif
+#ifndef CONFIG_ACR_PARKM_UNSET
+               ACR_PARKM |
+#endif
+               0;
+       const __be32 acr_val =
+#ifndef CONFIG_ACR_PIPE_DEP_UNSET
+               CONFIG_ACR_PIPE_DEP |
+#endif
+#ifndef CONFIG_ACR_RPTCNT_UNSET
+               CONFIG_ACR_RPTCNT |
+#endif
+#ifndef CONFIG_ACR_APARK_UNSET
+               CONFIG_ACR_APARK |
+#endif
+#ifndef CONFIG_ACR_PARKM_UNSET
+               CONFIG_ACR_PARKM |
+#endif
+               0;

diff --git a/arch/powerpc/cpu/mpc83xx/cpu_init.c b/arch/powerpc/cpu/mpc83xx/cpu_init.c
index 3df01ee1ca10fb257f774b507440385266bfd76c..77502567a70630d600b4ef8a39afd7f790dea0f6 100644 (file)
--- a/arch/powerpc/cpu/mpc83xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc83xx/cpu_init.c
@@ -15,6 +15,7 @@
 #include "lblaw/lblaw.h"
 #include "elbc/elbc.h"
 #include "sysio/sysio.h"
+#include "arbiter/arbiter.h"
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -51,34 +52,6 @@ static void config_qe_ioports(void)
  */
 void cpu_init_f (volatile immap_t * im)
 {
-       __be32 acr_mask =
-#ifdef CONFIG_SYS_ACR_PIPE_DEP /* Arbiter pipeline depth */
-               ACR_PIPE_DEP |
-#endif
-#ifdef CONFIG_SYS_ACR_RPTCNT /* Arbiter repeat count */
-               ACR_RPTCNT |
-#endif
-#ifdef CONFIG_SYS_ACR_APARK    /* Arbiter address parking mode */
-               ACR_APARK |
-#endif
-#ifdef CONFIG_SYS_ACR_PARKM    /* Arbiter parking master */
-               ACR_PARKM |
-#endif
-               0;
-       __be32 acr_val =
-#ifdef CONFIG_SYS_ACR_PIPE_DEP /* Arbiter pipeline depth */
-               (CONFIG_SYS_ACR_PIPE_DEP << ACR_PIPE_DEP_SHIFT) |
-#endif
-#ifdef CONFIG_SYS_ACR_RPTCNT /* Arbiter repeat count */
-               (CONFIG_SYS_ACR_RPTCNT << ACR_RPTCNT_SHIFT) |
-#endif
-#ifdef CONFIG_SYS_ACR_APARK    /* Arbiter address parking mode */
-               (CONFIG_SYS_ACR_APARK << ACR_APARK_SHIFT) |
-#endif
-#ifdef CONFIG_SYS_ACR_PARKM    /* Arbiter parking master */
-               (CONFIG_SYS_ACR_PARKM << ACR_PARKM_SHIFT) |
-#endif
-               0;
        __be32 spcr_mask =
 #ifdef CONFIG_SYS_SPCR_OPT /* Optimize transactions between CSB and other dev */
                SPCR_OPT |

diff --git a/arch/powerpc/cpu/mpc83xx/spl_minimal.c b/arch/powerpc/cpu/mpc83xx/spl_minimal.c
index b4e2fb1119dfb5920796dc89f9b19ece756fe335..133f7abc31aca4bdaecd9bc330d6cb43abcfcf6e 100644 (file)
--- a/arch/powerpc/cpu/mpc83xx/spl_minimal.c
+++ b/arch/powerpc/cpu/mpc83xx/spl_minimal.c
@@ -27,16 +27,16 @@ void cpu_init_f (volatile immap_t * im)
 
        /* system performance tweaking */
 
-#ifdef CONFIG_SYS_ACR_PIPE_DEP
+#ifndef CONFIG_ACR_PIPE_DEP_UNSET
        /* Arbiter pipeline depth */
        im->arbiter.acr = (im->arbiter.acr & ~ACR_PIPE_DEP) |
-                         (CONFIG_SYS_ACR_PIPE_DEP << ACR_PIPE_DEP_SHIFT);
+                         CONFIG_ACR_PIPE_DEP;
 #endif
 
-#ifdef CONFIG_SYS_ACR_RPTCNT
+#ifndef CONFIG_ACR_RPTCNT_UNSET
        /* Arbiter repeat count */
        im->arbiter.acr = (im->arbiter.acr & ~(ACR_RPTCNT)) |
-                         (CONFIG_SYS_ACR_RPTCNT << ACR_RPTCNT_SHIFT);
+                         CONFIG_ACR_RPTCNT;
 #endif
 
 #ifdef CONFIG_SYS_SPCR_OPT

diff --git a/configs/MPC8308RDB_defconfig b/configs/MPC8308RDB_defconfig
index 9be515567c14ffb2d804fa38ff261db4079fd359..00feaccc3058a2b4530a36720e11736bd95f9a78 100644 (file)
--- a/configs/MPC8308RDB_defconfig
+++ b/configs/MPC8308RDB_defconfig
@@ -70,6 +70,8 @@ CONFIG_SICR_GTM_GPIO=y
 CONFIG_SICR_GPIOSEL_IEEE1588=y
 CONFIG_SICR_TMSOBI1_2_5_V=y
 CONFIG_SICR_TMSOBI2_2_5_V=y
+CONFIG_ACR_PIPE_DEP_4=y
+CONFIG_ACR_RPTCNT_4=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y

diff --git a/configs/MPC8313ERDB_33_defconfig b/configs/MPC8313ERDB_33_defconfig
index 732beab2e1c7eb0617b367cc07a9e5a1d3fe0e7e..b368aee9663ab818471d4fd03021bb089e5f98af 100644 (file)
--- a/configs/MPC8313ERDB_33_defconfig
+++ b/configs/MPC8313ERDB_33_defconfig
@@ -77,6 +77,8 @@ CONFIG_HID0_FINAL_EMCP=y
 CONFIG_HID0_FINAL_DPM=y
 CONFIG_HID0_FINAL_ICE=y
 CONFIG_HID2_HBE=y
+CONFIG_ACR_PIPE_DEP_4=y
+CONFIG_ACR_RPTCNT_4=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_33MHZ"

diff --git a/configs/MPC8313ERDB_66_defconfig b/configs/MPC8313ERDB_66_defconfig
index f2ec6cc7db0ecef939b3833aa4befc4996e1d7ab..ddf9060df42afebccf4a7f432dbb0a24c4180439 100644 (file)
--- a/configs/MPC8313ERDB_66_defconfig
+++ b/configs/MPC8313ERDB_66_defconfig
@@ -76,6 +76,8 @@ CONFIG_HID0_FINAL_EMCP=y
 CONFIG_HID0_FINAL_DPM=y
 CONFIG_HID0_FINAL_ICE=y
 CONFIG_HID2_HBE=y
+CONFIG_ACR_PIPE_DEP_4=y
+CONFIG_ACR_RPTCNT_4=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_66MHZ"

diff --git a/configs/MPC8313ERDB_NAND_33_defconfig b/configs/MPC8313ERDB_NAND_33_defconfig
index 95d8ff438ec769efcffb259b53d23be402f4b0a5..7c16364d3fc1f0954022707cdb8c2452900e8f92 100644 (file)
--- a/configs/MPC8313ERDB_NAND_33_defconfig
+++ b/configs/MPC8313ERDB_NAND_33_defconfig
@@ -79,6 +79,8 @@ CONFIG_HID0_FINAL_EMCP=y
 CONFIG_HID0_FINAL_DPM=y
 CONFIG_HID0_FINAL_ICE=y
 CONFIG_HID2_HBE=y
+CONFIG_ACR_PIPE_DEP_4=y
+CONFIG_ACR_RPTCNT_4=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_33MHZ"

diff --git a/configs/MPC8313ERDB_NAND_66_defconfig b/configs/MPC8313ERDB_NAND_66_defconfig
index c51713ab90917856986fadad78710e08f4fc0c87..ab8e315e0d6f06f0cebc002dc1af066a0ea3d5ba 100644 (file)
--- a/configs/MPC8313ERDB_NAND_66_defconfig
+++ b/configs/MPC8313ERDB_NAND_66_defconfig
@@ -78,6 +78,8 @@ CONFIG_HID0_FINAL_EMCP=y
 CONFIG_HID0_FINAL_DPM=y
 CONFIG_HID0_FINAL_ICE=y
 CONFIG_HID2_HBE=y
+CONFIG_ACR_PIPE_DEP_4=y
+CONFIG_ACR_RPTCNT_4=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_66MHZ"

diff --git a/configs/MPC8315ERDB_defconfig b/configs/MPC8315ERDB_defconfig
index d19e7977311a42f09d5062d09d95fbe6412e4fde..2263b9cb51b98be8abc2e9f68280106a8e681054 100644 (file)
--- a/configs/MPC8315ERDB_defconfig
+++ b/configs/MPC8315ERDB_defconfig
@@ -80,6 +80,8 @@ CONFIG_HID0_FINAL_EMCP=y
 CONFIG_HID0_FINAL_DPM=y
 CONFIG_HID0_FINAL_ICE=y
 CONFIG_HID2_HBE=y
+CONFIG_ACR_PIPE_DEP_4=y
+CONFIG_ACR_RPTCNT_4=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_BOOTDELAY=6

diff --git a/configs/MPC8323ERDB_defconfig b/configs/MPC8323ERDB_defconfig
index 19425abb1d594b0faf3907c2d168684774587676..b52d1fd62a54d800da06c0faa323d2c417269cc5 100644 (file)
--- a/configs/MPC8323ERDB_defconfig
+++ b/configs/MPC8323ERDB_defconfig
@@ -73,6 +73,8 @@ CONFIG_LBLAW0_LENGTH_32_MBYTES=y
 CONFIG_HID0_FINAL_EMCP=y
 CONFIG_HID0_FINAL_ICE=y
 CONFIG_HID2_HBE=y
+CONFIG_ACR_PIPE_DEP_4=y
+CONFIG_ACR_RPTCNT_4=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_BOOTDELAY=6

diff --git a/configs/MPC8349EMDS_PCI64_defconfig b/configs/MPC8349EMDS_PCI64_defconfig
index fef4f3435797cbfbf5384696ce26e4f49b03851b..9108275f3c22771f78c9f33c4dcc6833c3a10eb3 100644 (file)
--- a/configs/MPC8349EMDS_PCI64_defconfig
+++ b/configs/MPC8349EMDS_PCI64_defconfig
@@ -56,6 +56,8 @@ CONFIG_LBLAW1_LENGTH_32_KBYTES=y
 CONFIG_HID0_FINAL_EMCP=y
 CONFIG_HID0_FINAL_ICE=y
 CONFIG_HID2_HBE=y
+CONFIG_ACR_PIPE_DEP_4=y
+CONFIG_ACR_RPTCNT_4=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_BOOTDELAY=6

diff --git a/configs/MPC8349EMDS_SDRAM_defconfig b/configs/MPC8349EMDS_SDRAM_defconfig
index d0774431a398e3407393d10197d58b2d62ae366e..8589470b2e395f5d69ba55e9ee427edb23a056c3 100644 (file)
--- a/configs/MPC8349EMDS_SDRAM_defconfig
+++ b/configs/MPC8349EMDS_SDRAM_defconfig
@@ -60,6 +60,8 @@ CONFIG_LBLAW2_LENGTH_64_MBYTES=y
 CONFIG_HID0_FINAL_EMCP=y
 CONFIG_HID0_FINAL_ICE=y
 CONFIG_HID2_HBE=y
+CONFIG_ACR_PIPE_DEP_4=y
+CONFIG_ACR_RPTCNT_4=y
 CONFIG_ELBC_BR0_OR0=y
 CONFIG_BR0_OR0_NAME="FLASH"
 CONFIG_BR0_OR0_BASE=0xFE000000

diff --git a/configs/MPC8349EMDS_SLAVE_defconfig b/configs/MPC8349EMDS_SLAVE_defconfig
index 429d273e4e915f6919e4a8489eae287c9a783831..7454dd64f1a7c80baf0efd318a75a9e89696e829 100644 (file)
--- a/configs/MPC8349EMDS_SLAVE_defconfig
+++ b/configs/MPC8349EMDS_SLAVE_defconfig
@@ -54,6 +54,8 @@ CONFIG_LBLAW1_LENGTH_32_KBYTES=y
 CONFIG_HID0_FINAL_EMCP=y
 CONFIG_HID0_FINAL_ICE=y
 CONFIG_HID2_HBE=y
+CONFIG_ACR_PIPE_DEP_4=y
+CONFIG_ACR_RPTCNT_4=y
 CONFIG_PCI_ONE_PCI1=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y

diff --git a/configs/MPC8349EMDS_defconfig b/configs/MPC8349EMDS_defconfig
index 8c09cd90eecad7d6a706e4f89c1ebe0c87b1fe80..328c3aa567eaf974690c562e610228c08160ef7a 100644 (file)
--- a/configs/MPC8349EMDS_defconfig
+++ b/configs/MPC8349EMDS_defconfig
@@ -56,6 +56,8 @@ CONFIG_LBLAW1_LENGTH_32_KBYTES=y
 CONFIG_HID0_FINAL_EMCP=y
 CONFIG_HID0_FINAL_ICE=y
 CONFIG_HID2_HBE=y
+CONFIG_ACR_PIPE_DEP_4=y
+CONFIG_ACR_RPTCNT_4=y
 CONFIG_PCI_ONE_PCI1=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y

diff --git a/configs/MPC8349ITXGP_defconfig b/configs/MPC8349ITXGP_defconfig
index c32c8f0d74c0f449721feadb972215e504e2019e..fa121d721ae5ddcdac6dc881722d18007625d1dd 100644 (file)
--- a/configs/MPC8349ITXGP_defconfig
+++ b/configs/MPC8349ITXGP_defconfig
@@ -99,6 +99,8 @@ CONFIG_LBLAW3_NAME="CF"
 CONFIG_LBLAW3_LENGTH_64_KBYTES=y
 CONFIG_HID0_FINAL_ICE=y
 CONFIG_HID2_HBE=y
+CONFIG_ACR_PIPE_DEP_4=y
+CONFIG_ACR_RPTCNT_4=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xFE000000"

diff --git a/configs/MPC8349ITX_LOWBOOT_defconfig b/configs/MPC8349ITX_LOWBOOT_defconfig
index 4d55fd0088283df0f03e7f59c85c71d418d1fae4..0a79d1e625481a6ab2ebab7fa5646e72e95492e8 100644 (file)
--- a/configs/MPC8349ITX_LOWBOOT_defconfig
+++ b/configs/MPC8349ITX_LOWBOOT_defconfig
@@ -99,6 +99,8 @@ CONFIG_LBLAW3_NAME="CF"
 CONFIG_LBLAW3_LENGTH_64_KBYTES=y
 CONFIG_HID0_FINAL_ICE=y
 CONFIG_HID2_HBE=y
+CONFIG_ACR_PIPE_DEP_4=y
+CONFIG_ACR_RPTCNT_4=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_BOOTDELAY=6

diff --git a/configs/MPC8349ITX_defconfig b/configs/MPC8349ITX_defconfig
index 697567f53edcc814c71af9f330e259d344a30a94..e7461072edfa56fdd7cc47bd325e2b45c1bdf929 100644 (file)
--- a/configs/MPC8349ITX_defconfig
+++ b/configs/MPC8349ITX_defconfig
@@ -98,6 +98,8 @@ CONFIG_LBLAW3_NAME="CF"
 CONFIG_LBLAW3_LENGTH_64_KBYTES=y
 CONFIG_HID0_FINAL_ICE=y
 CONFIG_HID2_HBE=y
+CONFIG_ACR_PIPE_DEP_4=y
+CONFIG_ACR_RPTCNT_4=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_BOOTDELAY=6

diff --git a/configs/MPC837XEMDS_HOST_defconfig b/configs/MPC837XEMDS_HOST_defconfig
index 45b2ee74f4c484bacb490c0fa63d80d28a9e492b..0df5bdb2c5a4114365eeb7926a4a14d1b6085cb6 100644 (file)
--- a/configs/MPC837XEMDS_HOST_defconfig
+++ b/configs/MPC837XEMDS_HOST_defconfig
@@ -104,6 +104,8 @@ CONFIG_LBLAW3_LENGTH_32_KBYTES=y
 CONFIG_HID0_FINAL_EMCP=y
 CONFIG_HID0_FINAL_ICE=y
 CONFIG_HID2_HBE=y
+CONFIG_ACR_PIPE_DEP_4=y
+CONFIG_ACR_RPTCNT_4=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_BOOTDELAY=6

diff --git a/configs/MPC837XEMDS_SLAVE_defconfig b/configs/MPC837XEMDS_SLAVE_defconfig
index 5d5811b85a240938eda5d8a73727b5c44ea5785d..99f206e719fd371d8ad52ccc1e18ae7aa2970044 100644 (file)
--- a/configs/MPC837XEMDS_SLAVE_defconfig
+++ b/configs/MPC837XEMDS_SLAVE_defconfig
@@ -64,6 +64,8 @@ CONFIG_LBLAW3_LENGTH_32_KBYTES=y
 CONFIG_HID0_FINAL_EMCP=y
 CONFIG_HID0_FINAL_ICE=y
 CONFIG_HID2_HBE=y
+CONFIG_ACR_PIPE_DEP_4=y
+CONFIG_ACR_RPTCNT_4=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PCISLAVE"

diff --git a/configs/MPC837XEMDS_defconfig b/configs/MPC837XEMDS_defconfig
index 70f9df7e76f5d52c6305f7314efc165fcfa67bae..98dc6ca7848b42b725c67e21a673b849f78f8d3a 100644 (file)
--- a/configs/MPC837XEMDS_defconfig
+++ b/configs/MPC837XEMDS_defconfig
@@ -84,6 +84,8 @@ CONFIG_LBLAW3_LENGTH_32_KBYTES=y
 CONFIG_HID0_FINAL_EMCP=y
 CONFIG_HID0_FINAL_ICE=y
 CONFIG_HID2_HBE=y
+CONFIG_ACR_PIPE_DEP_4=y
+CONFIG_ACR_RPTCNT_4=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_BOOTDELAY=6

diff --git a/configs/MPC837XERDB_SLAVE_defconfig b/configs/MPC837XERDB_SLAVE_defconfig
index 1b8f33ab0115c13c8da24a8b680a28c7dbda246d..11a33d982f0384eaed321c0cac765c825d334270 100644 (file)
--- a/configs/MPC837XERDB_SLAVE_defconfig
+++ b/configs/MPC837XERDB_SLAVE_defconfig
@@ -64,6 +64,8 @@ CONFIG_LBLAW2_LENGTH_128_KBYTES=y
 CONFIG_HID0_FINAL_EMCP=y
 CONFIG_HID0_FINAL_ICE=y
 CONFIG_HID2_HBE=y
+CONFIG_ACR_PIPE_DEP_4=y
+CONFIG_ACR_RPTCNT_4=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PCISLAVE,PCIE"

diff --git a/configs/MPC837XERDB_defconfig b/configs/MPC837XERDB_defconfig
index 40eaf93ac54952e51c911b86d838dc319c37abe7..d43b364910a3d82f675ebd603cb7a1491f35900d 100644 (file)
--- a/configs/MPC837XERDB_defconfig
+++ b/configs/MPC837XERDB_defconfig
@@ -104,6 +104,8 @@ CONFIG_LBLAW2_LENGTH_128_KBYTES=y
 CONFIG_HID0_FINAL_EMCP=y
 CONFIG_HID0_FINAL_ICE=y
 CONFIG_HID2_HBE=y
+CONFIG_ACR_PIPE_DEP_4=y
+CONFIG_ACR_RPTCNT_4=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PCIE"

diff --git a/configs/hrcon_defconfig b/configs/hrcon_defconfig
index 3442c9c797eb881442f360616ca292a87396aed1..3dad033be02be78ecd01231aced9970123ab4123 100644 (file)
--- a/configs/hrcon_defconfig
+++ b/configs/hrcon_defconfig
@@ -67,6 +67,8 @@ CONFIG_SICR_ETSEC2_GPIO=y
 CONFIG_SICR_GPIOSEL_IEEE1588=y
 CONFIG_SICR_TMSOBI1_2_5_V=y
 CONFIG_SICR_TMSOBI2_2_5_V=y
+CONFIG_ACR_PIPE_DEP_4=y
+CONFIG_ACR_RPTCNT_4=y
 CONFIG_CMD_IOLOOP=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y

diff --git a/configs/hrcon_dh_defconfig b/configs/hrcon_dh_defconfig
index 5de0eaa4d0fd2e287f564df19dfdff8d7453bf3e..4fb7cb5ffdb5b28db3f681f3edc643c9ee53fbc8 100644 (file)
--- a/configs/hrcon_dh_defconfig
+++ b/configs/hrcon_dh_defconfig
@@ -67,6 +67,8 @@ CONFIG_SICR_ETSEC2_GPIO=y
 CONFIG_SICR_GPIOSEL_IEEE1588=y
 CONFIG_SICR_TMSOBI1_2_5_V=y
 CONFIG_SICR_TMSOBI2_2_5_V=y
+CONFIG_ACR_PIPE_DEP_4=y
+CONFIG_ACR_RPTCNT_4=y
 CONFIG_CMD_IOLOOP=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y

diff --git a/configs/ids8313_defconfig b/configs/ids8313_defconfig
index 9c16a1231c67718bc04d235f1be9aa4cd6279c02..f835868209f9de5e2f242c80d84a3f48e7b074c7 100644 (file)
--- a/configs/ids8313_defconfig
+++ b/configs/ids8313_defconfig
@@ -74,6 +74,8 @@ CONFIG_LBLAW3_LENGTH_32_KBYTES=y
 CONFIG_HID0_FINAL_EMCP=y
 CONFIG_HID0_FINAL_ICE=y
 CONFIG_HID2_HBE=y
+CONFIG_ACR_PIPE_DEP_4=y
+CONFIG_ACR_RPTCNT_4=y
 CONFIG_FIT=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_IMAGE_FORMAT_LEGACY=y

diff --git a/configs/kmcoge5ne_defconfig b/configs/kmcoge5ne_defconfig
index 30af114c8c6e665bd7285506a4a0ff151af8951f..7751e5a8989b641cb3296ce14975dfe369fb6178 100644 (file)
--- a/configs/kmcoge5ne_defconfig
+++ b/configs/kmcoge5ne_defconfig
@@ -107,6 +107,10 @@ CONFIG_LBLAW3_LENGTH_512_MBYTES=y
 CONFIG_HID0_FINAL_EMCP=y
 CONFIG_HID0_FINAL_ICE=y
 CONFIG_HID2_HBE=y
+CONFIG_ACR_PIPE_DEP_4=y
+CONFIG_ACR_RPTCNT_4=y
+CONFIG_ACR_APARK_MASTER=y
+CONFIG_ACR_PARKM_USB_I2C1_BOOT=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_MISC_INIT_R=y

diff --git a/configs/kmeter1_defconfig b/configs/kmeter1_defconfig
index e673d6c4dbb03b6c61e28b21416be76438753e2a..2bb31588734e7a05bd37c8c3ac090f891b9ec05b 100644 (file)
--- a/configs/kmeter1_defconfig
+++ b/configs/kmeter1_defconfig
@@ -80,6 +80,10 @@ CONFIG_LBLAW3_LENGTH_512_MBYTES=y
 CONFIG_HID0_FINAL_EMCP=y
 CONFIG_HID0_FINAL_ICE=y
 CONFIG_HID2_HBE=y
+CONFIG_ACR_PIPE_DEP_4=y
+CONFIG_ACR_RPTCNT_4=y
+CONFIG_ACR_APARK_MASTER=y
+CONFIG_ACR_PARKM_USB_I2C1_BOOT=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_MISC_INIT_R=y

diff --git a/configs/kmopti2_defconfig b/configs/kmopti2_defconfig
index fb4bd417481d83e2c2de94c9135c469c7bd44ff6..5eb5c939ebbe6180e7d15dccfac097bf59633024 100644 (file)
--- a/configs/kmopti2_defconfig
+++ b/configs/kmopti2_defconfig
@@ -95,6 +95,10 @@ CONFIG_LBLAW3_LENGTH_256_MBYTES=y
 CONFIG_HID0_FINAL_EMCP=y
 CONFIG_HID0_FINAL_ICE=y
 CONFIG_HID2_HBE=y
+CONFIG_ACR_PIPE_DEP_4=y
+CONFIG_ACR_RPTCNT_4=y
+CONFIG_ACR_APARK_MASTER=y
+CONFIG_ACR_PARKM_USB_I2C1_BOOT=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_MISC_INIT_R=y

diff --git a/configs/kmsupx5_defconfig b/configs/kmsupx5_defconfig
index 8f5e8aececa56c54ceb098648b33d62a716f9922..0ad8801df955fbde31853c146460d6cb408c8c6b 100644 (file)
--- a/configs/kmsupx5_defconfig
+++ b/configs/kmsupx5_defconfig
@@ -81,6 +81,10 @@ CONFIG_LBLAW2_LENGTH_256_MBYTES=y
 CONFIG_HID0_FINAL_EMCP=y
 CONFIG_HID0_FINAL_ICE=y
 CONFIG_HID2_HBE=y
+CONFIG_ACR_PIPE_DEP_4=y
+CONFIG_ACR_RPTCNT_4=y
+CONFIG_ACR_APARK_MASTER=y
+CONFIG_ACR_PARKM_USB_I2C1_BOOT=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_MISC_INIT_R=y

diff --git a/configs/kmtegr1_defconfig b/configs/kmtegr1_defconfig
index e3d721e093ed4629ca1f9936c80fb3d159f53b7b..8dfc4438add1428eec633e0ec3e8ade4c211a168 100644 (file)
--- a/configs/kmtegr1_defconfig
+++ b/configs/kmtegr1_defconfig
@@ -82,6 +82,10 @@ CONFIG_LBLAW3_LENGTH_256_MBYTES=y
 CONFIG_HID0_FINAL_EMCP=y
 CONFIG_HID0_FINAL_ICE=y
 CONFIG_HID2_HBE=y
+CONFIG_ACR_PIPE_DEP_4=y
+CONFIG_ACR_RPTCNT_4=y
+CONFIG_ACR_APARK_MASTER=y
+CONFIG_ACR_PARKM_USB_I2C1_BOOT=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="KMTEGR1"

diff --git a/configs/kmtepr2_defconfig b/configs/kmtepr2_defconfig
index 749b38586f2c40f63e2f74d0f2debb6da5aa6a6a..1a84ff5e0bb2d6518235b0357cb9d63e665f36e2 100644 (file)
--- a/configs/kmtepr2_defconfig
+++ b/configs/kmtepr2_defconfig
@@ -95,6 +95,10 @@ CONFIG_LBLAW3_LENGTH_256_MBYTES=y
 CONFIG_HID0_FINAL_EMCP=y
 CONFIG_HID0_FINAL_ICE=y
 CONFIG_HID2_HBE=y
+CONFIG_ACR_PIPE_DEP_4=y
+CONFIG_ACR_RPTCNT_4=y
+CONFIG_ACR_APARK_MASTER=y
+CONFIG_ACR_PARKM_USB_I2C1_BOOT=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_MISC_INIT_R=y

diff --git a/configs/kmvect1_defconfig b/configs/kmvect1_defconfig
index e8bb547b6f4d29b6c872ccd689aaa5a5599b2fc1..a746f195e65a6de0eba7b4da0aa48e8ed9e56cc3 100644 (file)
--- a/configs/kmvect1_defconfig
+++ b/configs/kmvect1_defconfig
@@ -96,6 +96,10 @@ CONFIG_LBLAW3_LENGTH_256_MBYTES=y
 CONFIG_HID0_FINAL_EMCP=y
 CONFIG_HID0_FINAL_ICE=y
 CONFIG_HID2_HBE=y
+CONFIG_ACR_PIPE_DEP_4=y
+CONFIG_ACR_RPTCNT_4=y
+CONFIG_ACR_APARK_MASTER=y
+CONFIG_ACR_PARKM_USB_I2C1_BOOT=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="KMVECT1"

diff --git a/configs/mpc8308_p1m_defconfig b/configs/mpc8308_p1m_defconfig
index 26601ff0a682225b674ebf9d63ffa76e523b6d88..f73084c0e1f59962c9c3f1095b141c8cb00a056a 100644 (file)
--- a/configs/mpc8308_p1m_defconfig
+++ b/configs/mpc8308_p1m_defconfig
@@ -68,6 +68,8 @@ CONFIG_SICR_GPIO_B_TSEC2=y
 CONFIG_SICR_IEEE1588_A_GPIO=y
 CONFIG_SICR_GTM_GPIO=y
 CONFIG_SICR_GPIOSEL_IEEE1588=y
+CONFIG_ACR_PIPE_DEP_4=y
+CONFIG_ACR_RPTCNT_4=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_BOOTDELAY=5

diff --git a/configs/strider_con_defconfig b/configs/strider_con_defconfig
index 1244652c79ca007b617395b3a9b7ab7ce1b1395e..722f25d63e95de751529eadd6b5c0f6203ede3d3 100644 (file)
--- a/configs/strider_con_defconfig
+++ b/configs/strider_con_defconfig
@@ -66,6 +66,8 @@ CONFIG_SICR_ETSEC2_GPIO=y
 CONFIG_SICR_GPIOSEL_IEEE1588=y
 CONFIG_SICR_TMSOBI1_2_5_V=y
 CONFIG_SICR_TMSOBI2_2_5_V=y
+CONFIG_ACR_PIPE_DEP_4=y
+CONFIG_ACR_RPTCNT_4=y
 CONFIG_CMD_IOLOOP=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y

diff --git a/configs/strider_con_dp_defconfig b/configs/strider_con_dp_defconfig
index 05040b056e4645d10c3469a66b798958984039d1..dd3c83d4fcd805cf40604f882081a082065fb484 100644 (file)
--- a/configs/strider_con_dp_defconfig
+++ b/configs/strider_con_dp_defconfig
@@ -66,6 +66,8 @@ CONFIG_SICR_ETSEC2_GPIO=y
 CONFIG_SICR_GPIOSEL_IEEE1588=y
 CONFIG_SICR_TMSOBI1_2_5_V=y
 CONFIG_SICR_TMSOBI2_2_5_V=y
+CONFIG_ACR_PIPE_DEP_4=y
+CONFIG_ACR_RPTCNT_4=y
 CONFIG_CMD_IOLOOP=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y

diff --git a/configs/strider_cpu_defconfig b/configs/strider_cpu_defconfig
index fbae6546d72480c71a2d3efadf251a18ab661e68..1a35132987294f45af6963f0247644663af2105a 100644 (file)
--- a/configs/strider_cpu_defconfig
+++ b/configs/strider_cpu_defconfig
@@ -66,6 +66,8 @@ CONFIG_SICR_ETSEC2_GPIO=y
 CONFIG_SICR_GPIOSEL_IEEE1588=y
 CONFIG_SICR_TMSOBI1_2_5_V=y
 CONFIG_SICR_TMSOBI2_2_5_V=y
+CONFIG_ACR_PIPE_DEP_4=y
+CONFIG_ACR_RPTCNT_4=y
 CONFIG_CMD_IOLOOP=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y

diff --git a/configs/strider_cpu_dp_defconfig b/configs/strider_cpu_dp_defconfig
index e3405707e53447957d6ee3400210a3a151551453..79fdc140e5a4b2435f56a9c3e243285801ad0338 100644 (file)
--- a/configs/strider_cpu_dp_defconfig
+++ b/configs/strider_cpu_dp_defconfig
@@ -66,6 +66,8 @@ CONFIG_SICR_ETSEC2_GPIO=y
 CONFIG_SICR_GPIOSEL_IEEE1588=y
 CONFIG_SICR_TMSOBI1_2_5_V=y
 CONFIG_SICR_TMSOBI2_2_5_V=y
+CONFIG_ACR_PIPE_DEP_4=y
+CONFIG_ACR_RPTCNT_4=y
 CONFIG_CMD_IOLOOP=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y

diff --git a/configs/suvd3_defconfig b/configs/suvd3_defconfig
index fcd5741092789734a1d3606de28c17f3ae38ed9b..28e386db24632953886f8f299dff7f4a766f773f 100644 (file)
--- a/configs/suvd3_defconfig
+++ b/configs/suvd3_defconfig
@@ -95,6 +95,10 @@ CONFIG_LBLAW3_LENGTH_256_MBYTES=y
 CONFIG_HID0_FINAL_EMCP=y
 CONFIG_HID0_FINAL_ICE=y
 CONFIG_HID2_HBE=y
+CONFIG_ACR_PIPE_DEP_4=y
+CONFIG_ACR_RPTCNT_4=y
+CONFIG_ACR_APARK_MASTER=y
+CONFIG_ACR_PARKM_USB_I2C1_BOOT=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="SUVD3"

diff --git a/configs/tuge1_defconfig b/configs/tuge1_defconfig
index 5f7f2289f13ff76a10f97db5f9c7aa5e84a70af8..fb18a46ec618e91ade8048aae597b545a0738c3b 100644 (file)
--- a/configs/tuge1_defconfig
+++ b/configs/tuge1_defconfig
@@ -81,6 +81,10 @@ CONFIG_LBLAW2_LENGTH_256_MBYTES=y
 CONFIG_HID0_FINAL_EMCP=y
 CONFIG_HID0_FINAL_ICE=y
 CONFIG_HID2_HBE=y
+CONFIG_ACR_PIPE_DEP_4=y
+CONFIG_ACR_RPTCNT_4=y
+CONFIG_ACR_APARK_MASTER=y
+CONFIG_ACR_PARKM_USB_I2C1_BOOT=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_MISC_INIT_R=y

diff --git a/configs/tuxx1_defconfig b/configs/tuxx1_defconfig
index 600c6f36e05fa70f29559babd67bce5cf3bd181f..a034f302b23e8e4f6d129c22d7053a3a63994d55 100644 (file)
--- a/configs/tuxx1_defconfig
+++ b/configs/tuxx1_defconfig
@@ -95,6 +95,10 @@ CONFIG_LBLAW3_LENGTH_256_MBYTES=y
 CONFIG_HID0_FINAL_EMCP=y
 CONFIG_HID0_FINAL_ICE=y
 CONFIG_HID2_HBE=y
+CONFIG_ACR_PIPE_DEP_4=y
+CONFIG_ACR_RPTCNT_4=y
+CONFIG_ACR_APARK_MASTER=y
+CONFIG_ACR_PARKM_USB_I2C1_BOOT=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_MISC_INIT_R=y

diff --git a/configs/ve8313_defconfig b/configs/ve8313_defconfig
index 42e0098a1c75405c0382d12808b7fa5d601b73ba..79f6430f913628a9187d7451023d7bd02ed33da3 100644 (file)
--- a/configs/ve8313_defconfig
+++ b/configs/ve8313_defconfig
@@ -77,6 +77,8 @@ CONFIG_LBLAW1_LENGTH_32_KBYTES=y
 CONFIG_HID0_FINAL_EMCP=y
 CONFIG_HID0_FINAL_ICE=y
 CONFIG_HID2_HBE=y
+CONFIG_ACR_PIPE_DEP_4=y
+CONFIG_ACR_RPTCNT_4=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_BOOTDELAY=6

diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h
index 7ba44044f77b9ad83a92c767bf2665b8481c552e..60c6b920f92ecb0d0e6fdea8d306a246b0f6d1c7 100644 (file)
--- a/include/configs/MPC8308RDB.h
+++ b/include/configs/MPC8308RDB.h
@@ -33,11 +33,6 @@
 #define CONFIG_FSL_SERDES
 #define CONFIG_FSL_SERDES1     0xe3000
 
-/*
- * Arbiter Setup
- */
-#define CONFIG_SYS_ACR_PIPE_DEP        3 /* Arbiter pipeline depth is 4 */
-#define CONFIG_SYS_ACR_RPTCNT  3 /* Arbiter repeat count is 4 */
 #define CONFIG_SYS_SPCR_TSECEP 3 /* eTSEC emergency priority is highest */
 
 /*

diff --git a/include/configs/MPC8313ERDB_NAND.h b/include/configs/MPC8313ERDB_NAND.h
index e23df14ec171edf902820324dbcfcc8e79885178..aaf92fe37ab3d5feeef7d94764cf8cff45299a87 100644 (file)
--- a/include/configs/MPC8313ERDB_NAND.h
+++ b/include/configs/MPC8313ERDB_NAND.h
@@ -67,9 +67,6 @@
  */
 #define CONFIG_SYS_8313ERDB_BROKEN_PMC 1
 
-#define CONFIG_SYS_ACR_PIPE_DEP        3       /* Arbiter pipeline depth (0-3) */
-#define CONFIG_SYS_ACR_RPTCNT          3       /* Arbiter repeat count (0-7) */
-
 /*
  * Device configurations
  */

diff --git a/include/configs/MPC8313ERDB_NOR.h b/include/configs/MPC8313ERDB_NOR.h
index 17cd8adc8591509f340b74e948bcf699fb3d1eb8..608565a139c4220091f901979b540539a9b029d1 100644 (file)
--- a/include/configs/MPC8313ERDB_NOR.h
+++ b/include/configs/MPC8313ERDB_NOR.h
@@ -39,9 +39,6 @@
  */
 #define CONFIG_SYS_8313ERDB_BROKEN_PMC 1
 
-#define CONFIG_SYS_ACR_PIPE_DEP        3       /* Arbiter pipeline depth (0-3) */
-#define CONFIG_SYS_ACR_RPTCNT          3       /* Arbiter repeat count (0-7) */
-
 /*
  * Device configurations
  */

diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h
index fbba2fbb50bada52588d6d9933cd8cfade4211f8..9531be30721ac8bdae4ae861541f85d70d189d3d 100644 (file)
--- a/include/configs/MPC8315ERDB.h
+++ b/include/configs/MPC8315ERDB.h
@@ -31,11 +31,6 @@
 
 #define CONFIG_HWCONFIG
 
-/*
- * Arbiter Setup
- */
-#define CONFIG_SYS_ACR_PIPE_DEP        3 /* Arbiter pipeline depth is 4 */
-#define CONFIG_SYS_ACR_RPTCNT  3 /* Arbiter repeat count is 4 */
 #define CONFIG_SYS_SPCR_TSECEP 3 /* eTSEC emergency priority is highest */
 
 /*

diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h
index b528c2901b4b55994af7037625048590cdda9931..23496518b311833eff75f0dfa518876f74ab3708 100644 (file)
--- a/include/configs/MPC8323ERDB.h
+++ b/include/configs/MPC8323ERDB.h
@@ -20,11 +20,6 @@
  */
 #define CONFIG_SYS_SICRL               0x00000000
 
-/*
- * System performance
- */
-#define CONFIG_SYS_ACR_PIPE_DEP        3       /* Arbiter pipeline depth (0-3) */
-#define CONFIG_SYS_ACR_RPTCNT  3       /* Arbiter repeat count (0-7) */
 /* (0-1) Optimize transactions between CSB and the SEC and QUICC Engine block */
 #define CONFIG_SYS_SPCR_OPT    1
 

diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index 14ebc8ead3d7edc50ddcfe1c67d7770e171b952f..51c47a8221b9cb5d1eb48aec372679ac477fedbe 100644 (file)
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -328,8 +328,6 @@
 /*
  * System performance
  */
-#define CONFIG_SYS_ACR_PIPE_DEP        3       /* Arbiter pipeline depth (0-3) */
-#define CONFIG_SYS_ACR_RPTCNT  3       /* Arbiter repeat count (0-7) */
 #define CONFIG_SYS_SPCR_TSEC1EP        3       /* TSEC1 emergency priority (0-3) */
 #define CONFIG_SYS_SPCR_TSEC2EP        3       /* TSEC2 emergency priority (0-3) */
 #define CONFIG_SYS_SCCR_TSEC1CM        1       /* TSEC1 clock mode (0-3) */

diff --git a/include/configs/MPC8349EMDS_SDRAM.h b/include/configs/MPC8349EMDS_SDRAM.h
index 67f3a9bd65f7c3526366b5c31d4a75ddce8e2c8e..35210ccfd2494bd13f9ca84c9b268503895279cf 100644 (file)
--- a/include/configs/MPC8349EMDS_SDRAM.h
+++ b/include/configs/MPC8349EMDS_SDRAM.h
@@ -383,8 +383,6 @@
 /*
  * System performance
  */
-#define CONFIG_SYS_ACR_PIPE_DEP        3       /* Arbiter pipeline depth (0-3) */
-#define CONFIG_SYS_ACR_RPTCNT  3       /* Arbiter repeat count (0-7) */
 #define CONFIG_SYS_SPCR_TSEC1EP        3       /* TSEC1 emergency priority (0-3) */
 #define CONFIG_SYS_SPCR_TSEC2EP        3       /* TSEC2 emergency priority (0-3) */
 #define CONFIG_SYS_SCCR_TSEC1CM        1       /* TSEC1 clock mode (0-3) */

diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h
index eef1bdec63a083e3882354bec8f3ab58edd6bb38..1c8574a40f374c5a275db23ddcef4fc44a6aa675 100644 (file)
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@ -403,8 +403,6 @@ boards, we say we have two, but don't display a message if we find only one. */
 /*
  * System performance
  */
-#define CONFIG_SYS_ACR_PIPE_DEP        3       /* Arbiter pipeline depth (0-3) */
-#define CONFIG_SYS_ACR_RPTCNT  3       /* Arbiter repeat count (0-7) */
 #define CONFIG_SYS_SPCR_TSEC1EP        3       /* TSEC1 emergency priority (0-3) */
 #define CONFIG_SYS_SPCR_TSEC2EP        3       /* TSEC2 emergency priority (0-3) */
 #define CONFIG_SYS_SCCR_TSEC1CM        1       /* TSEC1 clock mode (0-3) */

diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h
index c1973703c4a3a1b5079e46b3fc731f0bdbe59ee9..d8a02b8e06212ad47c68dd3712d2ee55ede6b813 100644 (file)
--- a/include/configs/MPC837XEMDS.h
+++ b/include/configs/MPC837XEMDS.h
@@ -12,10 +12,6 @@
  */
 #define CONFIG_E300            1 /* E300 family */
 
-/* Arbiter Configuration Register */
-#define CONFIG_SYS_ACR_PIPE_DEP        3       /* Arbiter pipeline depth is 4 */
-#define CONFIG_SYS_ACR_RPTCNT  3       /* Arbiter repeat count is 4 */
-
 /* System Priority Control Register */
 #define CONFIG_SYS_SPCR_TSECEP 3 /* eTSEC1/2 emergency has highest priority */
 

diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index e8173da3233c97174de5e27ebfba94bf8aa0fe33..6fa57ebee45c9fce66fd5cf3353e2bea16951b41 100644 (file)
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -23,10 +23,6 @@
 /* System performance - define the value i.e. CONFIG_SYS_XXX
 */
 
-/* Arbiter Configuration Register */
-#define CONFIG_SYS_ACR_PIPE_DEP        3       /* Arbiter pipeline depth (0-3) */
-#define CONFIG_SYS_ACR_RPTCNT  3       /* Arbiter repeat count (0-7) */
-
 /* System Priority Control Regsiter */
 #define CONFIG_SYS_SPCR_TSECEP 3       /* eTSEC1&2 emergency priority (0-3) */
 

diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h
index 23e0da9624aafe1f62eededf15455e1652fa9a77..76b28e07f4ec5eb9efa1231d9a22845eec62ca37 100644 (file)
--- a/include/configs/hrcon.h
+++ b/include/configs/hrcon.h
@@ -21,11 +21,6 @@
 #define CONFIG_FSL_SERDES
 #define CONFIG_FSL_SERDES1     0xe3000
 
-/*
- * Arbiter Setup
- */
-#define CONFIG_SYS_ACR_PIPE_DEP        3 /* Arbiter pipeline depth is 4 */
-#define CONFIG_SYS_ACR_RPTCNT  3 /* Arbiter repeat count is 4 */
 #define CONFIG_SYS_SPCR_TSECEP 3 /* eTSEC emergency priority is highest */
 
 /*

diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h
index b4acee058caa644e965c57d6d8a0a035ab901947..bd8f786a5802932c8c171eb9b212b9f5cd0e292f 100644 (file)
--- a/include/configs/ids8313.h
+++ b/include/configs/ids8313.h
@@ -20,9 +20,6 @@
 #define CONFIG_BOOT_RETRY_MIN          30
 #define CONFIG_RESET_TO_RETRY
 
-#define CONFIG_SYS_ACR_PIPE_DEP        3       /* Arbiter pipeline depth (0-3) */
-#define CONFIG_SYS_ACR_RPTCNT          3       /* Arbiter repeat count (0-7) */
-
 #define CONFIG_SYS_SICRH       0x00000000
 #define CONFIG_SYS_SICRL       (SICRL_LBC | SICRL_SPI_D)
 

diff --git a/include/configs/kmcoge5ne.h b/include/configs/kmcoge5ne.h
index 8e09160f92acba6a6ef970a83c2240baffff136b..08185894b8e8fc7ee3001b015f3377db1dc1a187 100644 (file)
--- a/include/configs/kmcoge5ne.h
+++ b/include/configs/kmcoge5ne.h
@@ -40,14 +40,6 @@
 #define CONFIG_SYS_CLK_FREQ            66000000
 #define CONFIG_83XX_PCICLK             66000000
 
-/*
- * Bus Arbitration Configuration Register (ACR)
- */
-#define CONFIG_SYS_ACR_PIPE_DEP 3       /* pipeline depth 4 transactions */
-#define CONFIG_SYS_ACR_RPTCNT   3       /* 4 consecutive transactions */
-#define CONFIG_SYS_ACR_APARK    0       /* park bus to master (below) */
-#define CONFIG_SYS_ACR_PARKM    3       /* parking master = QuiccEngine */
-
 /*
  * DDR Setup
  */

diff --git a/include/configs/kmeter1.h b/include/configs/kmeter1.h
index 48a6172349d1ea44562c4c536fadb32aafeb67fa..e0c3065ac6a8ba4eb6bb61d592b28dd5ee4c6584 100644 (file)
--- a/include/configs/kmeter1.h
+++ b/include/configs/kmeter1.h
@@ -25,14 +25,6 @@
 #include "km/keymile-common.h"
 #include "km/km-powerpc.h"
 
-/*
- * Bus Arbitration Configuration Register (ACR)
- */
-#define CONFIG_SYS_ACR_PIPE_DEP 3       /* pipeline depth 4 transactions */
-#define CONFIG_SYS_ACR_RPTCNT   3       /* 4 consecutive transactions */
-#define CONFIG_SYS_ACR_APARK    0       /* park bus to master (below) */
-#define CONFIG_SYS_ACR_PARKM    3       /* parking master = QuiccEngine */
-
 /*
  * DDR Setup
  */

diff --git a/include/configs/kmopti2.h b/include/configs/kmopti2.h
index e34f26e55d67bed8def28132232558edc0ea01ca..c2f4188a2246048a7455c967943c60e855ec7880 100644 (file)
--- a/include/configs/kmopti2.h
+++ b/include/configs/kmopti2.h
@@ -45,14 +45,6 @@
 #define CONFIG_SYS_CLK_FREQ            66000000
 #define CONFIG_83XX_PCICLK             66000000
 
-/*
- * Bus Arbitration Configuration Register (ACR)
- */
-#define CONFIG_SYS_ACR_PIPE_DEP 3       /* pipeline depth 4 transactions */
-#define CONFIG_SYS_ACR_RPTCNT   3       /* 4 consecutive transactions */
-#define CONFIG_SYS_ACR_APARK    0       /* park bus to master (below) */
-#define CONFIG_SYS_ACR_PARKM    3       /* parking master = QuiccEngine */
-
 /*
  * DDR Setup
  */

diff --git a/include/configs/kmsupx5.h b/include/configs/kmsupx5.h
index 96e10325f0f7ba7a41652ad6a325f5543e756af4..b1ba474e786dfe860fcd050057e0fd7b712ac1d5 100644 (file)
--- a/include/configs/kmsupx5.h
+++ b/include/configs/kmsupx5.h
@@ -45,14 +45,6 @@
 #define CONFIG_SYS_CLK_FREQ            66000000
 #define CONFIG_83XX_PCICLK             66000000
 
-/*
- * Bus Arbitration Configuration Register (ACR)
- */
-#define CONFIG_SYS_ACR_PIPE_DEP 3       /* pipeline depth 4 transactions */
-#define CONFIG_SYS_ACR_RPTCNT   3       /* 4 consecutive transactions */
-#define CONFIG_SYS_ACR_APARK    0       /* park bus to master (below) */
-#define CONFIG_SYS_ACR_PARKM    3       /* parking master = QuiccEngine */
-
 /*
  * DDR Setup
  */

diff --git a/include/configs/kmtegr1.h b/include/configs/kmtegr1.h
index 4b407af0364709bad11b6480e45865d48912a281..d3f7c2c4d347fce7e6d578c64e145cf1d79f73f8 100644 (file)
--- a/include/configs/kmtegr1.h
+++ b/include/configs/kmtegr1.h
@@ -52,14 +52,6 @@
 #define CONFIG_SYS_CLK_FREQ            66000000
 #define CONFIG_83XX_PCICLK             66000000
 
-/*
- * Bus Arbitration Configuration Register (ACR)
- */
-#define CONFIG_SYS_ACR_PIPE_DEP 3       /* pipeline depth 4 transactions */
-#define CONFIG_SYS_ACR_RPTCNT   3       /* 4 consecutive transactions */
-#define CONFIG_SYS_ACR_APARK    0       /* park bus to master (below) */
-#define CONFIG_SYS_ACR_PARKM    3       /* parking master = QuiccEngine */
-
 /*
  * DDR Setup
  */

diff --git a/include/configs/kmtepr2.h b/include/configs/kmtepr2.h
index 20cbc1318abb459e670eaada0e08ed55ee2cb8db..796040995d5862fd2bdae759a924e44ac649cf43 100644 (file)
--- a/include/configs/kmtepr2.h
+++ b/include/configs/kmtepr2.h
@@ -45,14 +45,6 @@
 #define CONFIG_SYS_CLK_FREQ            66000000
 #define CONFIG_83XX_PCICLK             66000000
 
-/*
- * Bus Arbitration Configuration Register (ACR)
- */
-#define CONFIG_SYS_ACR_PIPE_DEP 3       /* pipeline depth 4 transactions */
-#define CONFIG_SYS_ACR_RPTCNT   3       /* 4 consecutive transactions */
-#define CONFIG_SYS_ACR_APARK    0       /* park bus to master (below) */
-#define CONFIG_SYS_ACR_PARKM    3       /* parking master = QuiccEngine */
-
 /*
  * DDR Setup
  */

diff --git a/include/configs/kmvect1.h b/include/configs/kmvect1.h
index 37acb0245b69de16b0e89f77c6c5a53e645087e6..cfbf150b11967328d5ffdb9dc04f38b0db2bc5c2 100644 (file)
--- a/include/configs/kmvect1.h
+++ b/include/configs/kmvect1.h
@@ -44,14 +44,6 @@
 #define CONFIG_SYS_CLK_FREQ            66000000
 #define CONFIG_83XX_PCICLK             66000000
 
-/*
- * Bus Arbitration Configuration Register (ACR)
- */
-#define CONFIG_SYS_ACR_PIPE_DEP 3       /* pipeline depth 4 transactions */
-#define CONFIG_SYS_ACR_RPTCNT   3       /* 4 consecutive transactions */
-#define CONFIG_SYS_ACR_APARK    0       /* park bus to master (below) */
-#define CONFIG_SYS_ACR_PARKM    3       /* parking master = QuiccEngine */
-
 /*
  * DDR Setup
  */

diff --git a/include/configs/mpc8308_p1m.h b/include/configs/mpc8308_p1m.h
index d0eac0a2efedf89955e76882256028beaea01e86..60871b757d54dcbbb467e39aad4ca121511d0449 100644 (file)
--- a/include/configs/mpc8308_p1m.h
+++ b/include/configs/mpc8308_p1m.h
@@ -36,11 +36,6 @@
 #define CONFIG_FSL_SERDES
 #define CONFIG_FSL_SERDES1     0xe3000
 
-/*
- * Arbiter Setup
- */
-#define CONFIG_SYS_ACR_PIPE_DEP        3 /* Arbiter pipeline depth is 4 */
-#define CONFIG_SYS_ACR_RPTCNT  3 /* Arbiter repeat count is 4 */
 #define CONFIG_SYS_SPCR_TSECEP 3 /* eTSEC emergency priority is highest */
 
 /*

diff --git a/include/configs/strider.h b/include/configs/strider.h
index 8afd17d1b00048a28a530c6151b15447181efde1..95bc20203f52f52a4e7c39effabe3181323c0c41 100644 (file)
--- a/include/configs/strider.h
+++ b/include/configs/strider.h
@@ -21,11 +21,6 @@
 #define CONFIG_FSL_SERDES
 #define CONFIG_FSL_SERDES1     0xe3000
 
-/*
- * Arbiter Setup
- */
-#define CONFIG_SYS_ACR_PIPE_DEP        3 /* Arbiter pipeline depth is 4 */
-#define CONFIG_SYS_ACR_RPTCNT  3 /* Arbiter repeat count is 4 */
 #define CONFIG_SYS_SPCR_TSECEP 3 /* eTSEC emergency priority is highest */
 
 /*

diff --git a/include/configs/suvd3.h b/include/configs/suvd3.h
index 82ebbca4db1f549617498c0407b6a8d965b81401..e3653ea924aeb62787525aa54ce37f31ef04d7b0 100644 (file)
--- a/include/configs/suvd3.h
+++ b/include/configs/suvd3.h
@@ -42,14 +42,6 @@
 #define CONFIG_SYS_CLK_FREQ            66000000
 #define CONFIG_83XX_PCICLK             66000000
 
-/*
- * Bus Arbitration Configuration Register (ACR)
- */
-#define CONFIG_SYS_ACR_PIPE_DEP 3       /* pipeline depth 4 transactions */
-#define CONFIG_SYS_ACR_RPTCNT   3       /* 4 consecutive transactions */
-#define CONFIG_SYS_ACR_APARK    0       /* park bus to master (below) */
-#define CONFIG_SYS_ACR_PARKM    3       /* parking master = QuiccEngine */
-
 /*
  * DDR Setup
  */

diff --git a/include/configs/tuge1.h b/include/configs/tuge1.h
index b196c77c4e73077eaef1bedf6c37cd4c1a432b51..81e11d2236117cf1cb312caf7fd61ed5fa16ef77 100644 (file)
--- a/include/configs/tuge1.h
+++ b/include/configs/tuge1.h
@@ -45,14 +45,6 @@
 #define CONFIG_SYS_CLK_FREQ            66000000
 #define CONFIG_83XX_PCICLK             66000000
 
-/*
- * Bus Arbitration Configuration Register (ACR)
- */
-#define CONFIG_SYS_ACR_PIPE_DEP 3       /* pipeline depth 4 transactions */
-#define CONFIG_SYS_ACR_RPTCNT   3       /* 4 consecutive transactions */
-#define CONFIG_SYS_ACR_APARK    0       /* park bus to master (below) */
-#define CONFIG_SYS_ACR_PARKM    3       /* parking master = QuiccEngine */
-
 /*
  * DDR Setup
  */

diff --git a/include/configs/tuxx1.h b/include/configs/tuxx1.h
index 0ce848c911dfe49a6f93cde02e6f28d28e200f75..28416af225d481bb95e1569fcf6a21d8328ab53d 100644 (file)
--- a/include/configs/tuxx1.h
+++ b/include/configs/tuxx1.h
@@ -45,14 +45,6 @@
 #define CONFIG_SYS_CLK_FREQ            66000000
 #define CONFIG_83XX_PCICLK             66000000
 
-/*
- * Bus Arbitration Configuration Register (ACR)
- */
-#define CONFIG_SYS_ACR_PIPE_DEP 3       /* pipeline depth 4 transactions */
-#define CONFIG_SYS_ACR_RPTCNT   3       /* 4 consecutive transactions */
-#define CONFIG_SYS_ACR_APARK    0       /* park bus to master (below) */
-#define CONFIG_SYS_ACR_PARKM    3       /* parking master = QuiccEngine */
-
 /*
  * DDR Setup
  */

diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h
index 1ac6cbefd6c8e0a6cf86b4ca0b026cd3d2d9f7e0..76fe3be446067eab749319db69a9b67cd7fc8e25 100644 (file)
--- a/include/configs/ve8313.h
+++ b/include/configs/ve8313.h
@@ -27,9 +27,6 @@
 #define CONFIG_SYS_MEMTEST_START       0x00001000
 #define CONFIG_SYS_MEMTEST_END         0x07000000
 
-#define CONFIG_SYS_ACR_PIPE_DEP                3       /* Arbiter pipeline depth */
-#define CONFIG_SYS_ACR_RPTCNT          3       /* Arbiter repeat count */
-
 /*
  * Device configurations
  */

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index bde1af251be88905375f2367a2e6ef4cc375c1ac..ae07c8da24bb8476ff6bbf7330e381279fee52de 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1919,10 +1919,6 @@ CONFIG_SYS_64BIT_VSPRINTF
 CONFIG_SYS_66MHZ
 CONFIG_SYS_8313ERDB_BROKEN_PMC
 CONFIG_SYS_83XX_DDR_USES_CS0
-CONFIG_SYS_ACR_APARK
-CONFIG_SYS_ACR_PARKM
-CONFIG_SYS_ACR_PIPE_DEP
-CONFIG_SYS_ACR_RPTCNT
 CONFIG_SYS_ADDRESS_MAP_A
 CONFIG_SYS_ADV7611_I2C
 CONFIG_SYS_ALT_BOOT