mpc83xx: Migrate HID config to Kconfig

Mirate the HID configuration settings 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 474572f245ea76d6107cce3380987caf740f15ef..5fb4228076e0560591077b9e75e7ad83ef26fb33 100644 (file)
--- a/arch/powerpc/cpu/mpc83xx/Kconfig
+++ b/arch/powerpc/cpu/mpc83xx/Kconfig
@@ -286,6 +286,7 @@ source "arch/powerpc/cpu/mpc83xx/hrcw/Kconfig"
 source "arch/powerpc/cpu/mpc83xx/bats/Kconfig"
 source "arch/powerpc/cpu/mpc83xx/lblaw/Kconfig"
 source "arch/powerpc/cpu/mpc83xx/elbc/Kconfig"
+source "arch/powerpc/cpu/mpc83xx/hid/Kconfig"
 
 menu "Legacy options"
 

diff --git a/arch/powerpc/cpu/mpc83xx/hid/Kconfig b/arch/powerpc/cpu/mpc83xx/hid/Kconfig
new file mode 100644 (file)
index 0000000..c367ad2
--- /dev/null
+++ b/arch/powerpc/cpu/mpc83xx/hid/Kconfig
@@ -0,0 +1,565 @@
+menu "HID setup"
+
+menu "HID0 initial"
+
+config HID0_INIT_EMCP
+       bool "Enable machine check int on mcp"
+
+config HID0_INIT_ECPE
+       bool "Enable cache parity errors"
+
+config HID0_INIT_EBA
+       bool "Enable address parity checking"
+
+config HID0_INIT_EBD
+       bool "Enable data parity checking"
+
+choice
+       prompt "HID0 clock configuration"
+
+config HID0_INIT_CLKOUT_OFF
+       bool "Clock output off"
+
+config HID0_INIT_CLKOUT_CORE_HALF
+       bool "Core clock / 2"
+
+config HID0_INIT_CLKOUT_CORE
+       bool "Core clock"
+
+config HID0_INIT_CLKOUT_BUS
+       bool "Bus clock"
+
+endchoice
+
+config HID0_INIT_PAR
+       bool "Disable precharge of artry_out"
+
+config HID0_INIT_DOZE
+       bool "Enable doze mode"
+
+config HID0_INIT_NAP
+       bool "Enable nap mode"
+
+config HID0_INIT_SLEEP
+       bool "Enable sleep mode"
+
+config HID0_INIT_DPM
+       bool "Enable dynamic power management"
+
+config HID0_INIT_ICE
+       bool "Enable instruction cache"
+
+config HID0_INIT_DCE
+       bool "Enable data cache"
+
+config HID0_INIT_ILOCK
+       bool "Lock instruction cache"
+
+config HID0_INIT_DLOCK
+       bool "Lock data cache"
+
+config HID0_INIT_ICFI
+       bool "Flash invalidate instruction cache"
+
+config HID0_INIT_DCFI
+       bool "Flash invalidate data cache"
+
+config HID0_INIT_IFEM
+       bool "Enable m bit on bus for instruction fetches"
+
+config HID0_INIT_DECAREN
+       bool "Decrementer auto reload"
+
+config HID0_INIT_FBIOB
+       bool "Force indirect branch on the bus"
+
+config HID0_INIT_ABE
+       bool "Enable address broadcast"
+
+config HID0_INIT_NOOPTI
+       bool "No-op data cache touch intructions"
+
+endmenu
+
+menu "HID0 final"
+
+config HID0_FINAL_EMCP
+       bool "Enable machine check int on mcp"
+
+config HID0_FINAL_ECPE
+       bool "Enable cache parity errors"
+
+config HID0_FINAL_EBA
+       bool "Enable address parity checking"
+
+config HID0_FINAL_EBD
+       bool "Enable data parity checking"
+
+choice
+       prompt "HID0 clock configuration"
+
+config HID0_FINAL_CLKOUT_OFF
+       bool "Clock output off"
+
+config HID0_FINAL_CLKOUT_CORE_HALF
+       bool "Core clock / 2"
+
+config HID0_FINAL_CLKOUT_CORE
+       bool "Core clock"
+
+config HID0_FINAL_CLKOUT_BUS
+       bool "Bus clock"
+
+endchoice
+
+config HID0_FINAL_PAR
+       bool "Disable precharge of artry_out"
+
+config HID0_FINAL_DOZE
+       bool "Enable doze mode"
+
+config HID0_FINAL_NAP
+       bool "Enable nap mode"
+
+config HID0_FINAL_SLEEP
+       bool "Enable sleep mode"
+
+config HID0_FINAL_DPM
+       bool "Enable dynamic power management"
+
+config HID0_FINAL_ICE
+       bool "Enable instruction cache"
+
+config HID0_FINAL_DCE
+       bool "Enable data cache"
+
+config HID0_FINAL_ILOCK
+       bool "Lock instruction cache"
+
+config HID0_FINAL_DLOCK
+       bool "Lock data cache"
+
+config HID0_FINAL_ICFI
+       bool "Flash invalidate instruction cache"
+
+config HID0_FINAL_DCFI
+       bool "Flash invalidate data cache"
+
+config HID0_FINAL_IFEM
+       bool "Enable m bit on bus for instruction fetches"
+
+config HID0_FINAL_DECAREN
+       bool "Decrementer auto reload"
+
+config HID0_FINAL_FBIOB
+       bool "Force indirect branch on the bus"
+
+config HID0_FINAL_ABE
+       bool "Enable address broadcast"
+
+config HID0_FINAL_NOOPTI
+       bool "No-op data cache touch intructions"
+
+endmenu
+
+config HID0_INIT_EMCP_BIT
+       hex
+       default 0x0 if !HID0_INIT_EMCP
+       default 0x80000000 if HID0_INIT_EMCP
+
+config HID0_INIT_ECPE_BIT
+       hex
+       default 0x0 if !HID0_INIT_ECPE
+       default 0x40000000 if HID0_INIT_ECPE
+
+config HID0_INIT_EBA_BIT
+       hex
+       default 0x0 if !HID0_INIT_EBA
+       default 0x20000000 if HID0_INIT_EBA
+
+config HID0_INIT_EBD_BIT
+       hex
+       default 0x0 if !HID0_INIT_EBD
+       default 0x10000000 if HID0_INIT_EBD
+
+config HID0_INIT_CLKOUT
+       hex
+       default 0x0 if HID0_INIT_CLKOUT_OFF
+       default 0x8000000 if HID0_INIT_CLKOUT_CORE_HALF
+       default 0x2000000 if HID0_INIT_CLKOUT_CORE
+       default 0xa000000 if HID0_INIT_CLKOUT_BUS
+
+config HID0_INIT_PAR_BIT
+       hex
+       default 0x0 if !HID0_INIT_PAR
+       default 0x1000000 if HID0_INIT_PAR
+
+config HID0_INIT_DOZE_BIT
+       hex
+       default 0x0 if !HID0_INIT_DOZE
+       default 0x800000 if HID0_INIT_DOZE
+
+config HID0_INIT_NAP_BIT
+       hex
+       default 0x0 if !HID0_INIT_NAP
+       default 0x400000 if HID0_INIT_NAP
+
+config HID0_INIT_SLEEP_BIT
+       hex
+       default 0x0 if !HID0_INIT_SLEEP
+       default 0x200000 if HID0_INIT_SLEEP
+
+config HID0_INIT_DPM_BIT
+       hex
+       default 0x0 if !HID0_INIT_DPM
+       default 0x100000 if HID0_INIT_DPM
+
+config HID0_INIT_ICE_BIT
+       hex
+       default 0x0 if !HID0_INIT_ICE
+       default 0x8000 if HID0_INIT_ICE
+
+config HID0_INIT_DCE_BIT
+       hex
+       default 0x0 if !HID0_INIT_DCE
+       default 0x4000 if HID0_INIT_DCE
+
+config HID0_INIT_ILOCK_BIT
+       hex
+       default 0x0 if !HID0_INIT_ILOCK
+       default 0x2000 if HID0_INIT_ILOCK
+
+config HID0_INIT_DLOCK_BIT
+       hex
+       default 0x0 if !HID0_INIT_DLOCK
+       default 0x1000 if HID0_INIT_DLOCK
+
+config HID0_INIT_ICFI_BIT
+       hex
+       default 0x0 if !HID0_INIT_ICFI
+       default 0x800 if HID0_INIT_ICFI
+
+config HID0_INIT_DCFI_BIT
+       hex
+       default 0x0 if !HID0_INIT_DCFI
+       default 0x400 if HID0_INIT_DCFI
+
+config HID0_INIT_IFEM_BIT
+       hex
+       default 0x0 if !HID0_INIT_IFEM
+       default 0x80 if HID0_INIT_IFEM
+
+config HID0_INIT_DECAREN_BIT
+       hex
+       default 0x0 if !HID0_INIT_DECAREN
+       default 0x40 if HID0_INIT_DECAREN
+
+config HID0_INIT_FBIOB_BIT
+       hex
+       default 0x0 if !HID0_INIT_FBIOB
+       default 0x10 if HID0_INIT_FBIOB
+
+config HID0_INIT_ABE_BIT
+       hex
+       default 0x0 if !HID0_INIT_ABE
+       default 0x8 if HID0_INIT_ABE
+
+config HID0_INIT_NOOPTI_BIT
+       hex
+       default 0x0 if !HID0_INIT_NOOPTI
+       default 0x1 if HID0_INIT_NOOPTI
+
+config HID0_FINAL_EMCP_BIT
+       hex
+       default 0x0 if !HID0_FINAL_EMCP
+       default 0x80000000 if HID0_FINAL_EMCP
+
+config HID0_FINAL_ECPE_BIT
+       hex
+       default 0x0 if !HID0_FINAL_ECPE
+       default 0x40000000 if HID0_FINAL_ECPE
+
+config HID0_FINAL_EBA_BIT
+       hex
+       default 0x0 if !HID0_FINAL_EBA
+       default 0x20000000 if HID0_FINAL_EBA
+
+config HID0_FINAL_EBD_BIT
+       hex
+       default 0x0 if !HID0_FINAL_EBD
+       default 0x10000000 if HID0_FINAL_EBD
+
+config HID0_FINAL_CLKOUT
+       hex
+       default 0x0 if HID0_FINAL_CLKOUT_OFF
+       default 0x8000000 if HID0_FINAL_CLKOUT_CORE_HALF
+       default 0x2000000 if HID0_FINAL_CLKOUT_CORE
+       default 0xa000000 if HID0_FINAL_CLKOUT_BUS
+
+config HID0_FINAL_SBCLK_BIT
+       hex
+       default 0x0 if !HID0_FINAL_SBCLK
+       default 0x8000000 if HID0_FINAL_SBCLK
+
+config HID0_FINAL_ECLK_BIT
+       hex
+       default 0x0 if !HID0_FINAL_ECLK
+       default 0x2000000 if HID0_FINAL_ECLK
+
+config HID0_FINAL_PAR_BIT
+       hex
+       default 0x0 if !HID0_FINAL_PAR
+       default 0x1000000 if HID0_FINAL_PAR
+
+config HID0_FINAL_DOZE_BIT
+       hex
+       default 0x0 if !HID0_FINAL_DOZE
+       default 0x800000 if HID0_FINAL_DOZE
+
+config HID0_FINAL_NAP_BIT
+       hex
+       default 0x0 if !HID0_FINAL_NAP
+       default 0x400000 if HID0_FINAL_NAP
+
+config HID0_FINAL_SLEEP_BIT
+       hex
+       default 0x0 if !HID0_FINAL_SLEEP
+       default 0x200000 if HID0_FINAL_SLEEP
+
+config HID0_FINAL_DPM_BIT
+       hex
+       default 0x0 if !HID0_FINAL_DPM
+       default 0x100000 if HID0_FINAL_DPM
+
+config HID0_FINAL_ICE_BIT
+       hex
+       default 0x0 if !HID0_FINAL_ICE
+       default 0x8000 if HID0_FINAL_ICE
+
+config HID0_FINAL_DCE_BIT
+       hex
+       default 0x0 if !HID0_FINAL_DCE
+       default 0x4000 if HID0_FINAL_DCE
+
+config HID0_FINAL_ILOCK_BIT
+       hex
+       default 0x0 if !HID0_FINAL_ILOCK
+       default 0x2000 if HID0_FINAL_ILOCK
+
+config HID0_FINAL_DLOCK_BIT
+       hex
+       default 0x0 if !HID0_FINAL_DLOCK
+       default 0x1000 if HID0_FINAL_DLOCK
+
+config HID0_FINAL_ICFI_BIT
+       hex
+       default 0x0 if !HID0_FINAL_ICFI
+       default 0x800 if HID0_FINAL_ICFI
+
+config HID0_FINAL_DCFI_BIT
+       hex
+       default 0x0 if !HID0_FINAL_DCFI
+       default 0x400 if HID0_FINAL_DCFI
+
+config HID0_FINAL_IFEM_BIT
+       hex
+       default 0x0 if !HID0_FINAL_IFEM
+       default 0x80 if HID0_FINAL_IFEM
+
+config HID0_FINAL_DECAREN_BIT
+       hex
+       default 0x0 if !HID0_FINAL_DECAREN
+       default 0x40 if HID0_FINAL_DECAREN
+
+config HID0_FINAL_FBIOB_BIT
+       hex
+       default 0x0 if !HID0_FINAL_FBIOB
+       default 0x10 if HID0_FINAL_FBIOB
+
+config HID0_FINAL_ABE_BIT
+       hex
+       default 0x0 if !HID0_FINAL_ABE
+       default 0x8 if HID0_FINAL_ABE
+
+config HID0_FINAL_NOOPTI_BIT
+       hex
+       default 0x0 if !HID0_FINAL_NOOPTI
+       default 0x1 if HID0_FINAL_NOOPTI
+
+menu "HID2"
+
+config HID2_LET
+       bool "True little-endian mode"
+
+config HID2_IFEB
+       bool "Instruction fetch burst extension"
+
+config HID2_MESISTATE
+       bool "MESI state enable"
+
+config HID2_IFEC
+       bool "Instruction fetch cancel extension"
+
+config HID2_EBQS
+       bool "BIU queue sharing"
+
+config HID2_EBPX
+       bool "BIU pipeline extension"
+
+if !ARCH_MPC8360
+
+config HID2_ELRW
+       bool "Weighted LRU"
+
+config HID2_NOKS
+       bool "No kill for snoop"
+
+endif
+
+config HID2_HBE
+       bool "High bat enable"
+
+choice
+       prompt "Instruction cache way-lock"
+
+config HID2_IWLCK_NONE
+       bool "No ways locked"
+
+config HID2_IWLCK_0
+       bool "Way 0 locked"
+
+config HID2_IWLCK_1
+       bool "Way 0 through 1 locked"
+
+config HID2_IWLCK_2
+       bool "Way 0 through 2 locked"
+
+if ARCH_MPC8349 || ARCH_MPC8360 || ARCH_MPC8379
+
+config HID2_IWLCK_3
+       bool "Way 0 through 3 locked"
+
+config HID2_IWLCK_4
+       bool "Way 0 through 4 locked"
+
+config HID2_IWLCK_5
+       bool "Way 0 through 5 locked"
+
+config HID2_IWLCK_6
+       bool "Way 0 through 6 locked"
+
+endif
+
+endchoice
+
+config HID2_ICWP
+       bool "Instruction cache way protection"
+
+choice
+       prompt "Data cache way-lock"
+
+config HID2_DWLCK_NONE
+       bool "No ways locked"
+
+config HID2_DWLCK_0
+       bool "Way 0 locked"
+
+config HID2_DWLCK_1
+       bool "Way 0 through 1 locked"
+
+config HID2_DWLCK_2
+       bool "Way 0 through 2 locked"
+
+if ARCH_MPC8349 || ARCH_MPC8360 || ARCH_MPC8379
+
+config HID2_DWLCK_3
+       bool "Way 0 through 3 locked"
+
+config HID2_DWLCK_4
+       bool "Way 0 through 4 locked"
+
+config HID2_DWLCK_5
+       bool "Way 0 through 5 locked"
+
+config HID2_DWLCK_6
+       bool "Way 0 through 6 locked"
+
+endif
+
+endchoice
+
+config HID2_LET_BIT
+       hex
+       default 0x0 if !HID2_LET
+       default 0x8000000 if HID2_LET
+
+config HID2_IFEB_BIT
+       hex
+       default 0x0 if !HID2_IFEB
+       default 0x4000000 if HID2_IFEB
+
+config HID2_MESISTATE_BIT
+       hex
+       default 0x0 if !HID2_MESISTATE
+       default 0x1000000 if HID2_MESISTATE
+
+config HID2_IFEC_BIT
+       hex
+       default 0x0 if !HID2_IFEC
+       default 0x800000 if HID2_IFEC
+
+config HID2_EBQS_BIT
+       hex
+       default 0x0 if !HID2_EBQS
+       default 0x400000 if HID2_EBQS
+
+config HID2_EBPX_BIT
+       hex
+       default 0x0 if !HID2_EBPX
+       default 0x200000 if HID2_EBPX
+
+config HID2_ELRW_BIT
+       hex
+       default 0x0 if !HID2_ELRW
+       default 0x100000 if HID2_ELRW
+
+config HID2_NOKS_BIT
+       hex
+       default 0x0 if !HID2_NOKS
+       default 0x80000 if HID2_NOKS
+
+config HID2_HBE_BIT
+       hex
+       default 0x0 if !HID2_HBE
+       default 0x40000 if HID2_HBE
+
+config HID2_IWLCK
+       hex
+       default 0x0 if HID2_IWLCK_NONE
+       default 0x2000 if HID2_IWLCK_0
+       default 0x4000 if HID2_IWLCK_1
+       default 0x6000 if HID2_IWLCK_2
+       default 0x8000 if HID2_IWLCK_3
+       default 0xA000 if HID2_IWLCK_4
+       default 0xC000 if HID2_IWLCK_5
+       default 0xE000 if HID2_IWLCK_6
+
+config HID2_ICWP_BIT
+       hex
+       default 0x0 if !HID2_ICWP
+       default 0x1000 if HID2_ICWP
+
+config HID2_DWLCK
+       hex
+       default 0x0 if HID2_DWLCK_NONE
+       default 0x20 if HID2_DWLCK_0
+       default 0x40 if HID2_DWLCK_1
+       default 0x60 if HID2_DWLCK_2
+       default 0x80 if HID2_DWLCK_3
+       default 0xA0 if HID2_DWLCK_4
+       default 0xC0 if HID2_DWLCK_5
+       default 0xE0 if HID2_DWLCK_6
+
+endmenu
+
+endmenu

diff --git a/arch/powerpc/cpu/mpc83xx/hid/hid.h b/arch/powerpc/cpu/mpc83xx/hid/hid.h
new file mode 100644 (file)
index 0000000..9f5260c
--- /dev/null
+++ b/arch/powerpc/cpu/mpc83xx/hid/hid.h
@@ -0,0 +1,72 @@
+#define CONFIG_SYS_HID0_FINAL ( \
+       CONFIG_HID0_FINAL_ABE_BIT |\
+       CONFIG_HID0_FINAL_CLKOUT |\
+       CONFIG_HID0_FINAL_DCE_BIT |\
+       CONFIG_HID0_FINAL_DCFI_BIT |\
+       CONFIG_HID0_FINAL_DECAREN_BIT |\
+       CONFIG_HID0_FINAL_DLOCK_BIT |\
+       CONFIG_HID0_FINAL_DOZE_BIT |\
+       CONFIG_HID0_FINAL_DPM_BIT |\
+       CONFIG_HID0_FINAL_EBA_BIT |\
+       CONFIG_HID0_FINAL_EBD_BIT |\
+       CONFIG_HID0_FINAL_ECLK_BIT |\
+       CONFIG_HID0_FINAL_ECPE_BIT |\
+       CONFIG_HID0_FINAL_EMCP_BIT |\
+       CONFIG_HID0_FINAL_FBIOB_BIT |\
+       CONFIG_HID0_FINAL_ICE_BIT |\
+       CONFIG_HID0_FINAL_ICFI_BIT |\
+       CONFIG_HID0_FINAL_IFEM_BIT |\
+       CONFIG_HID0_FINAL_ILOCK_BIT |\
+       CONFIG_HID0_FINAL_NAP_BIT |\
+       CONFIG_HID0_FINAL_NOOPTI_BIT |\
+       CONFIG_HID0_FINAL_PAR_BIT |\
+       CONFIG_HID0_FINAL_SBCLK_BIT |\
+       CONFIG_HID0_FINAL_SLEEP_BIT \
+)
+
+#define CONFIG_SYS_HID0_INIT ( \
+       CONFIG_HID0_INIT_ABE_BIT |\
+       CONFIG_HID0_INIT_CLKOUT |\
+       CONFIG_HID0_INIT_DCE_BIT |\
+       CONFIG_HID0_INIT_DCFI_BIT |\
+       CONFIG_HID0_INIT_DECAREN_BIT |\
+       CONFIG_HID0_INIT_DLOCK_BIT |\
+       CONFIG_HID0_INIT_DOZE_BIT |\
+       CONFIG_HID0_INIT_DPM_BIT |\
+       CONFIG_HID0_INIT_EBA_BIT |\
+       CONFIG_HID0_INIT_EBD_BIT |\
+       CONFIG_HID0_INIT_ECPE_BIT |\
+       CONFIG_HID0_INIT_EMCP_BIT |\
+       CONFIG_HID0_INIT_FBIOB_BIT |\
+       CONFIG_HID0_INIT_ICE_BIT |\
+       CONFIG_HID0_INIT_ICFI_BIT |\
+       CONFIG_HID0_INIT_IFEM_BIT |\
+       CONFIG_HID0_INIT_ILOCK_BIT |\
+       CONFIG_HID0_INIT_NAP_BIT |\
+       CONFIG_HID0_INIT_NOOPTI_BIT |\
+       CONFIG_HID0_INIT_PAR_BIT |\
+       CONFIG_HID0_INIT_SLEEP_BIT \
+)
+
+#ifdef CONFIG_TARGET_IDS8313
+/* IDS8313 defines a reserved bit; keep to not break compatibility */
+#define CONFIG_HID2_SPECIAL 0x00020000
+#else
+#define CONFIG_HID2_SPECIAL 0x0
+#endif
+
+#define CONFIG_SYS_HID2 ( \
+       CONFIG_HID2_LET_BIT |\
+       CONFIG_HID2_IFEB_BIT |\
+       CONFIG_HID2_MESISTATE_BIT |\
+       CONFIG_HID2_IFEC_BIT |\
+       CONFIG_HID2_EBQS_BIT |\
+       CONFIG_HID2_EBPX_BIT |\
+       CONFIG_HID2_ELRW_BIT |\
+       CONFIG_HID2_NOKS_BIT |\
+       CONFIG_HID2_HBE_BIT |\
+       CONFIG_HID2_IWLCK |\
+       CONFIG_HID2_ICWP_BIT |\
+       CONFIG_HID2_DWLCK |\
+       CONFIG_HID2_SPECIAL \
+)

diff --git a/arch/powerpc/cpu/mpc83xx/start.S b/arch/powerpc/cpu/mpc83xx/start.S
index f7fc922af0b8eb81bfc9687e08b1a1c7615db1c4..9fbbf59ce211e939d99dbfb43ee51bf17a2df205 100644 (file)
--- a/arch/powerpc/cpu/mpc83xx/start.S
+++ b/arch/powerpc/cpu/mpc83xx/start.S
@@ -26,6 +26,7 @@
 
 #include "hrcw/hrcw.h"
 #include "bats/bats.h"
+#include "hid/hid.h"
 
 /* We don't want the  MMU yet.
  */

diff --git a/configs/MPC8308RDB_defconfig b/configs/MPC8308RDB_defconfig
index c38ac328d2adeb1eddca112998d70a159455882a..e674848a6c41f426ca2a349285c44f6d57027c18 100644 (file)
--- a/configs/MPC8308RDB_defconfig
+++ b/configs/MPC8308RDB_defconfig
@@ -58,6 +58,10 @@ CONFIG_LBLAW2=y
 CONFIG_LBLAW2_BASE=0xF0000000
 CONFIG_LBLAW2_NAME="VSC7385"
 CONFIG_LBLAW2_LENGTH_128_KBYTES=y
+CONFIG_HID0_FINAL_EMCP=y
+CONFIG_HID0_FINAL_DPM=y
+CONFIG_HID0_FINAL_ICE=y
+CONFIG_HID2_HBE=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 1588adf3d66eae35ddd734d35e70f793e30a2e8b..732beab2e1c7eb0617b367cc07a9e5a1d3fe0e7e 100644 (file)
--- a/configs/MPC8313ERDB_33_defconfig
+++ b/configs/MPC8313ERDB_33_defconfig
@@ -73,6 +73,10 @@ CONFIG_LBLAW3=y
 CONFIG_LBLAW3_BASE=0xFA000000
 CONFIG_LBLAW3_NAME="BCSR"
 CONFIG_LBLAW3_LENGTH_32_KBYTES=y
+CONFIG_HID0_FINAL_EMCP=y
+CONFIG_HID0_FINAL_DPM=y
+CONFIG_HID0_FINAL_ICE=y
+CONFIG_HID2_HBE=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 2425256ee3064042a271390cceb9e41fb1ff949b..f2ec6cc7db0ecef939b3833aa4befc4996e1d7ab 100644 (file)
--- a/configs/MPC8313ERDB_66_defconfig
+++ b/configs/MPC8313ERDB_66_defconfig
@@ -72,6 +72,10 @@ CONFIG_LBLAW3=y
 CONFIG_LBLAW3_BASE=0xFA000000
 CONFIG_LBLAW3_NAME="BCSR"
 CONFIG_LBLAW3_LENGTH_32_KBYTES=y
+CONFIG_HID0_FINAL_EMCP=y
+CONFIG_HID0_FINAL_DPM=y
+CONFIG_HID0_FINAL_ICE=y
+CONFIG_HID2_HBE=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 8ee257a54ec166c62901d14664ed9b7cc40c0b4d..95d8ff438ec769efcffb259b53d23be402f4b0a5 100644 (file)
--- a/configs/MPC8313ERDB_NAND_33_defconfig
+++ b/configs/MPC8313ERDB_NAND_33_defconfig
@@ -75,6 +75,10 @@ CONFIG_LBLAW3=y
 CONFIG_LBLAW3_BASE=0xFA000000
 CONFIG_LBLAW3_NAME="BCSR"
 CONFIG_LBLAW3_LENGTH_32_KBYTES=y
+CONFIG_HID0_FINAL_EMCP=y
+CONFIG_HID0_FINAL_DPM=y
+CONFIG_HID0_FINAL_ICE=y
+CONFIG_HID2_HBE=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 baca3d799da17cf374600ced7ef8999b3568a9ee..c51713ab90917856986fadad78710e08f4fc0c87 100644 (file)
--- a/configs/MPC8313ERDB_NAND_66_defconfig
+++ b/configs/MPC8313ERDB_NAND_66_defconfig
@@ -74,6 +74,10 @@ CONFIG_LBLAW3=y
 CONFIG_LBLAW3_BASE=0xFA000000
 CONFIG_LBLAW3_NAME="BCSR"
 CONFIG_LBLAW3_LENGTH_32_KBYTES=y
+CONFIG_HID0_FINAL_EMCP=y
+CONFIG_HID0_FINAL_DPM=y
+CONFIG_HID0_FINAL_ICE=y
+CONFIG_HID2_HBE=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 b9539893ff73425eb799db5f857d3c87eb5f66fb..d19e7977311a42f09d5062d09d95fbe6412e4fde 100644 (file)
--- a/configs/MPC8315ERDB_defconfig
+++ b/configs/MPC8315ERDB_defconfig
@@ -76,6 +76,10 @@ CONFIG_LBLAW1=y
 CONFIG_LBLAW1_BASE=0xE0600000
 CONFIG_LBLAW1_NAME="NAND"
 CONFIG_LBLAW1_LENGTH_32_KBYTES=y
+CONFIG_HID0_FINAL_EMCP=y
+CONFIG_HID0_FINAL_DPM=y
+CONFIG_HID0_FINAL_ICE=y
+CONFIG_HID2_HBE=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 64e6f58f38c13a29111ae2f7528db2a176787305..19425abb1d594b0faf3907c2d168684774587676 100644 (file)
--- a/configs/MPC8323ERDB_defconfig
+++ b/configs/MPC8323ERDB_defconfig
@@ -70,6 +70,9 @@ CONFIG_LBLAW0=y
 CONFIG_LBLAW0_BASE=0xFE000000
 CONFIG_LBLAW0_NAME="FLASH"
 CONFIG_LBLAW0_LENGTH_32_MBYTES=y
+CONFIG_HID0_FINAL_EMCP=y
+CONFIG_HID0_FINAL_ICE=y
+CONFIG_HID2_HBE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_BOOTDELAY=6

diff --git a/configs/MPC832XEMDS_ATM_defconfig b/configs/MPC832XEMDS_ATM_defconfig
index ffc82260ec3c67b4d010d48adfabdb2d683b92ed..807d3e391a3739f7600a9da7856de23e51f116e1 100644 (file)
--- a/configs/MPC832XEMDS_ATM_defconfig
+++ b/configs/MPC832XEMDS_ATM_defconfig
@@ -68,6 +68,9 @@ CONFIG_LBLAW3=y
 CONFIG_LBLAW3_BASE=0xF8008000
 CONFIG_LBLAW3_NAME="PIB"
 CONFIG_LBLAW3_LENGTH_64_KBYTES=y
+CONFIG_HID0_FINAL_EMCP=y
+CONFIG_HID0_FINAL_ICE=y
+CONFIG_HID2_HBE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PQ_MDS_PIB=1,PQ_MDS_PIB_ATM=1"

diff --git a/configs/MPC832XEMDS_HOST_33_defconfig b/configs/MPC832XEMDS_HOST_33_defconfig
index 911f62de65300a6b15f8791b432935afc75cd4ed..e328deb9fe42840a19153e915e955242b79cb8e4 100644 (file)
--- a/configs/MPC832XEMDS_HOST_33_defconfig
+++ b/configs/MPC832XEMDS_HOST_33_defconfig
@@ -88,6 +88,9 @@ CONFIG_LBLAW3=y
 CONFIG_LBLAW3_BASE=0xF8008000
 CONFIG_LBLAW3_NAME="PIB"
 CONFIG_LBLAW3_LENGTH_64_KBYTES=y
+CONFIG_HID0_FINAL_EMCP=y
+CONFIG_HID0_FINAL_ICE=y
+CONFIG_HID2_HBE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PCI_33M,PQ_MDS_PIB=1"

diff --git a/configs/MPC832XEMDS_HOST_66_defconfig b/configs/MPC832XEMDS_HOST_66_defconfig
index 7dd02a95c92c12ac0b7a9804747e77c76fb25912..d5bf354eeca79fe778a2053f76dd869b8dc7948f 100644 (file)
--- a/configs/MPC832XEMDS_HOST_66_defconfig
+++ b/configs/MPC832XEMDS_HOST_66_defconfig
@@ -88,6 +88,9 @@ CONFIG_LBLAW3=y
 CONFIG_LBLAW3_BASE=0xF8008000
 CONFIG_LBLAW3_NAME="PIB"
 CONFIG_LBLAW3_LENGTH_64_KBYTES=y
+CONFIG_HID0_FINAL_EMCP=y
+CONFIG_HID0_FINAL_ICE=y
+CONFIG_HID2_HBE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PCI_66M,PQ_MDS_PIB=1"

diff --git a/configs/MPC832XEMDS_SLAVE_defconfig b/configs/MPC832XEMDS_SLAVE_defconfig
index 3e3c82b2ef5412143ea4dacc4283aae435fbc59e..9d9d905118934860df4e149cc6253cb1f998d4d7 100644 (file)
--- a/configs/MPC832XEMDS_SLAVE_defconfig
+++ b/configs/MPC832XEMDS_SLAVE_defconfig
@@ -85,6 +85,9 @@ CONFIG_LBLAW3=y
 CONFIG_LBLAW3_BASE=0xF8008000
 CONFIG_LBLAW3_NAME="PIB"
 CONFIG_LBLAW3_LENGTH_64_KBYTES=y
+CONFIG_HID0_FINAL_EMCP=y
+CONFIG_HID0_FINAL_ICE=y
+CONFIG_HID2_HBE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PCISLAVE"

diff --git a/configs/MPC832XEMDS_defconfig b/configs/MPC832XEMDS_defconfig
index 4cfa01074d11d412ae560fba83a6fb591cbfd73b..518f7114d790c593b9a909999ef5e91c42f983b5 100644 (file)
--- a/configs/MPC832XEMDS_defconfig
+++ b/configs/MPC832XEMDS_defconfig
@@ -68,6 +68,9 @@ CONFIG_LBLAW3=y
 CONFIG_LBLAW3_BASE=0xF8008000
 CONFIG_LBLAW3_NAME="PIB"
 CONFIG_LBLAW3_LENGTH_64_KBYTES=y
+CONFIG_HID0_FINAL_EMCP=y
+CONFIG_HID0_FINAL_ICE=y
+CONFIG_HID2_HBE=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 a29d3268f79c0f96bbcc8d3d6ab931ad22d6862c..fef4f3435797cbfbf5384696ce26e4f49b03851b 100644 (file)
--- a/configs/MPC8349EMDS_PCI64_defconfig
+++ b/configs/MPC8349EMDS_PCI64_defconfig
@@ -53,6 +53,9 @@ CONFIG_LBLAW1=y
 CONFIG_LBLAW1_BASE=0xE2400000
 CONFIG_LBLAW1_NAME="BCSR"
 CONFIG_LBLAW1_LENGTH_32_KBYTES=y
+CONFIG_HID0_FINAL_EMCP=y
+CONFIG_HID0_FINAL_ICE=y
+CONFIG_HID2_HBE=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 e3058f0b5e86910b7c4e29b4dd0e18778ae65ca4..d0774431a398e3407393d10197d58b2d62ae366e 100644 (file)
--- a/configs/MPC8349EMDS_SDRAM_defconfig
+++ b/configs/MPC8349EMDS_SDRAM_defconfig
@@ -57,6 +57,9 @@ CONFIG_LBLAW2=y
 CONFIG_LBLAW2_BASE=0xF0000000
 CONFIG_LBLAW2_NAME="SDRAM"
 CONFIG_LBLAW2_LENGTH_64_MBYTES=y
+CONFIG_HID0_FINAL_EMCP=y
+CONFIG_HID0_FINAL_ICE=y
+CONFIG_HID2_HBE=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 d45b6489b473ade903d5c34dd14e10d9e6e76fdf..429d273e4e915f6919e4a8489eae287c9a783831 100644 (file)
--- a/configs/MPC8349EMDS_SLAVE_defconfig
+++ b/configs/MPC8349EMDS_SLAVE_defconfig
@@ -51,6 +51,9 @@ CONFIG_LBLAW1=y
 CONFIG_LBLAW1_BASE=0xE2400000
 CONFIG_LBLAW1_NAME="BCSR"
 CONFIG_LBLAW1_LENGTH_32_KBYTES=y
+CONFIG_HID0_FINAL_EMCP=y
+CONFIG_HID0_FINAL_ICE=y
+CONFIG_HID2_HBE=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 e3ca6811ccfec2f1df8642bc807729143c681a88..8c09cd90eecad7d6a706e4f89c1ebe0c87b1fe80 100644 (file)
--- a/configs/MPC8349EMDS_defconfig
+++ b/configs/MPC8349EMDS_defconfig
@@ -53,6 +53,9 @@ CONFIG_LBLAW1=y
 CONFIG_LBLAW1_BASE=0xE2400000
 CONFIG_LBLAW1_NAME="BCSR"
 CONFIG_LBLAW1_LENGTH_32_KBYTES=y
+CONFIG_HID0_FINAL_EMCP=y
+CONFIG_HID0_FINAL_ICE=y
+CONFIG_HID2_HBE=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 cf4ce83307a8eddfa4a4ae672bf50b344632b931..c32c8f0d74c0f449721feadb972215e504e2019e 100644 (file)
--- a/configs/MPC8349ITXGP_defconfig
+++ b/configs/MPC8349ITXGP_defconfig
@@ -97,6 +97,8 @@ CONFIG_LBLAW3=y
 CONFIG_LBLAW3_BASE=0xF0000000
 CONFIG_LBLAW3_NAME="CF"
 CONFIG_LBLAW3_LENGTH_64_KBYTES=y
+CONFIG_HID0_FINAL_ICE=y
+CONFIG_HID2_HBE=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 e0185191bc7383842944f7087543a9fd840ee2da..4d55fd0088283df0f03e7f59c85c71d418d1fae4 100644 (file)
--- a/configs/MPC8349ITX_LOWBOOT_defconfig
+++ b/configs/MPC8349ITX_LOWBOOT_defconfig
@@ -97,6 +97,8 @@ CONFIG_LBLAW3=y
 CONFIG_LBLAW3_BASE=0xF0000000
 CONFIG_LBLAW3_NAME="CF"
 CONFIG_LBLAW3_LENGTH_64_KBYTES=y
+CONFIG_HID0_FINAL_ICE=y
+CONFIG_HID2_HBE=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 0187f4f1280eab3b5d2fdcc4eff14c77448dfdb5..697567f53edcc814c71af9f330e259d344a30a94 100644 (file)
--- a/configs/MPC8349ITX_defconfig
+++ b/configs/MPC8349ITX_defconfig
@@ -96,6 +96,8 @@ CONFIG_LBLAW3=y
 CONFIG_LBLAW3_BASE=0xF0000000
 CONFIG_LBLAW3_NAME="CF"
 CONFIG_LBLAW3_LENGTH_64_KBYTES=y
+CONFIG_HID0_FINAL_ICE=y
+CONFIG_HID2_HBE=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 b048d5b5d00ea528d3489f2bba929358e92fef87..45b2ee74f4c484bacb490c0fa63d80d28a9e492b 100644 (file)
--- a/configs/MPC837XEMDS_HOST_defconfig
+++ b/configs/MPC837XEMDS_HOST_defconfig
@@ -101,6 +101,9 @@ CONFIG_LBLAW3=y
 CONFIG_LBLAW3_BASE=0xE0600000
 CONFIG_LBLAW3_NAME="NAND"
 CONFIG_LBLAW3_LENGTH_32_KBYTES=y
+CONFIG_HID0_FINAL_EMCP=y
+CONFIG_HID0_FINAL_ICE=y
+CONFIG_HID2_HBE=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 9e2966b371f79dcaf8acb33872dc4a98d989f5ea..5d5811b85a240938eda5d8a73727b5c44ea5785d 100644 (file)
--- a/configs/MPC837XEMDS_SLAVE_defconfig
+++ b/configs/MPC837XEMDS_SLAVE_defconfig
@@ -61,6 +61,9 @@ CONFIG_LBLAW3=y
 CONFIG_LBLAW3_BASE=0xE0600000
 CONFIG_LBLAW3_NAME="NAND"
 CONFIG_LBLAW3_LENGTH_32_KBYTES=y
+CONFIG_HID0_FINAL_EMCP=y
+CONFIG_HID0_FINAL_ICE=y
+CONFIG_HID2_HBE=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 9256aac17cde8473c05233932a30021cb24739b7..70f9df7e76f5d52c6305f7314efc165fcfa67bae 100644 (file)
--- a/configs/MPC837XEMDS_defconfig
+++ b/configs/MPC837XEMDS_defconfig
@@ -81,6 +81,9 @@ CONFIG_LBLAW3=y
 CONFIG_LBLAW3_BASE=0xE0600000
 CONFIG_LBLAW3_NAME="NAND"
 CONFIG_LBLAW3_LENGTH_32_KBYTES=y
+CONFIG_HID0_FINAL_EMCP=y
+CONFIG_HID0_FINAL_ICE=y
+CONFIG_HID2_HBE=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 95400114f2f2da7b27e403f233901c7708fc7c65..1b8f33ab0115c13c8da24a8b680a28c7dbda246d 100644 (file)
--- a/configs/MPC837XERDB_SLAVE_defconfig
+++ b/configs/MPC837XERDB_SLAVE_defconfig
@@ -61,6 +61,9 @@ CONFIG_LBLAW2=y
 CONFIG_LBLAW2_BASE=0xF0000000
 CONFIG_LBLAW2_NAME="VSC7385"
 CONFIG_LBLAW2_LENGTH_128_KBYTES=y
+CONFIG_HID0_FINAL_EMCP=y
+CONFIG_HID0_FINAL_ICE=y
+CONFIG_HID2_HBE=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 a8c69eb6bcb85173c7c05532842099951b933e62..40eaf93ac54952e51c911b86d838dc319c37abe7 100644 (file)
--- a/configs/MPC837XERDB_defconfig
+++ b/configs/MPC837XERDB_defconfig
@@ -101,6 +101,9 @@ CONFIG_LBLAW2=y
 CONFIG_LBLAW2_BASE=0xF0000000
 CONFIG_LBLAW2_NAME="VSC7385"
 CONFIG_LBLAW2_LENGTH_128_KBYTES=y
+CONFIG_HID0_FINAL_EMCP=y
+CONFIG_HID0_FINAL_ICE=y
+CONFIG_HID2_HBE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PCIE"

diff --git a/configs/TQM834x_defconfig b/configs/TQM834x_defconfig
index 49f0916663dd730d8c0a524ecd0d116dcf6c4915..e85bfaea31593e3b85c0382e89552fb7080a635b 100644 (file)
--- a/configs/TQM834x_defconfig
+++ b/configs/TQM834x_defconfig
@@ -102,6 +102,8 @@ CONFIG_LBLAW2=y
 # CONFIG_LBLAW2_ENABLE is not set
 CONFIG_LBLAW3=y
 # CONFIG_LBLAW3_ENABLE is not set
+CONFIG_HID0_FINAL_ICE=y
+CONFIG_HID2_HBE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_BOOTDELAY=6

diff --git a/configs/caddy2_defconfig b/configs/caddy2_defconfig
index e2ea71d11a7f298fad17da3afda9ac2bb7d7eca4..192c3442ceefb25e065afd7ac1e27bda4888f7e1 100644 (file)
--- a/configs/caddy2_defconfig
+++ b/configs/caddy2_defconfig
@@ -71,6 +71,9 @@ CONFIG_LBLAW1=y
 CONFIG_LBLAW1_BASE=0xF0000000
 CONFIG_LBLAW1_NAME="WINDOW1"
 CONFIG_LBLAW1_LENGTH_256_KBYTES=y
+CONFIG_HID0_FINAL_EMCP=y
+CONFIG_HID0_FINAL_ICE=y
+CONFIG_HID2_HBE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_BOOTDELAY=6

diff --git a/configs/hrcon_defconfig b/configs/hrcon_defconfig
index 7b17f602b6d74e5be89b48deaa5c3167d782f97b..2046b6067ddf447a8e410a8857f37dd2185c2d09 100644 (file)
--- a/configs/hrcon_defconfig
+++ b/configs/hrcon_defconfig
@@ -54,6 +54,10 @@ CONFIG_LBLAW1=y
 CONFIG_LBLAW1_BASE=0xE0600000
 CONFIG_LBLAW1_NAME="FPGA0"
 CONFIG_LBLAW1_LENGTH_1_MBYTES=y
+CONFIG_HID0_FINAL_EMCP=y
+CONFIG_HID0_FINAL_DPM=y
+CONFIG_HID0_FINAL_ICE=y
+CONFIG_HID2_HBE=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 9a20a0d069020fe350a188d0d131ce0b7cf48c8f..e9d427be366ec2ea1718670688872d0b3b7fdbd0 100644 (file)
--- a/configs/hrcon_dh_defconfig
+++ b/configs/hrcon_dh_defconfig
@@ -54,6 +54,10 @@ CONFIG_LBLAW1=y
 CONFIG_LBLAW1_BASE=0xE0600000
 CONFIG_LBLAW1_NAME="FPGA0"
 CONFIG_LBLAW1_LENGTH_1_MBYTES=y
+CONFIG_HID0_FINAL_EMCP=y
+CONFIG_HID0_FINAL_DPM=y
+CONFIG_HID0_FINAL_ICE=y
+CONFIG_HID2_HBE=y
 CONFIG_CMD_IOLOOP=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y

diff --git a/configs/ids8313_defconfig b/configs/ids8313_defconfig
index 14104a441bf2d10ac22b0de98f80b5223714b9f7..24590d1448b9b6885109f83d62abefc07e73a17a 100644 (file)
--- a/configs/ids8313_defconfig
+++ b/configs/ids8313_defconfig
@@ -70,6 +70,9 @@ CONFIG_LBLAW3=y
 CONFIG_LBLAW3_BASE=0xE3000000
 CONFIG_LBLAW3_NAME="CPLD"
 CONFIG_LBLAW3_LENGTH_32_KBYTES=y
+CONFIG_HID0_FINAL_EMCP=y
+CONFIG_HID0_FINAL_ICE=y
+CONFIG_HID2_HBE=y
 CONFIG_FIT=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_IMAGE_FORMAT_LEGACY=y

diff --git a/configs/kmcoge5ne_defconfig b/configs/kmcoge5ne_defconfig
index 6740c4c8a9772a8f488a8c00447c61a9902e41c6..30af114c8c6e665bd7285506a4a0ff151af8951f 100644 (file)
--- a/configs/kmcoge5ne_defconfig
+++ b/configs/kmcoge5ne_defconfig
@@ -104,6 +104,9 @@ CONFIG_LBLAW3=y
 CONFIG_LBLAW3_BASE=0xA0000000
 CONFIG_LBLAW3_NAME="PAXE"
 CONFIG_LBLAW3_LENGTH_512_MBYTES=y
+CONFIG_HID0_FINAL_EMCP=y
+CONFIG_HID0_FINAL_ICE=y
+CONFIG_HID2_HBE=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 182fa477f887b3e80a22d72f5922d6f77c18c233..e673d6c4dbb03b6c61e28b21416be76438753e2a 100644 (file)
--- a/configs/kmeter1_defconfig
+++ b/configs/kmeter1_defconfig
@@ -77,6 +77,9 @@ CONFIG_LBLAW3=y
 CONFIG_LBLAW3_BASE=0xA0000000
 CONFIG_LBLAW3_NAME="PAXE"
 CONFIG_LBLAW3_LENGTH_512_MBYTES=y
+CONFIG_HID0_FINAL_EMCP=y
+CONFIG_HID0_FINAL_ICE=y
+CONFIG_HID2_HBE=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 678900d05ceab8804334eb6347060ef2a34467a0..fb4bd417481d83e2c2de94c9135c469c7bd44ff6 100644 (file)
--- a/configs/kmopti2_defconfig
+++ b/configs/kmopti2_defconfig
@@ -92,6 +92,9 @@ CONFIG_LBLAW3=y
 CONFIG_LBLAW3_BASE=0xB0000000
 CONFIG_LBLAW3_NAME="APP2"
 CONFIG_LBLAW3_LENGTH_256_MBYTES=y
+CONFIG_HID0_FINAL_EMCP=y
+CONFIG_HID0_FINAL_ICE=y
+CONFIG_HID2_HBE=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 49780b4b19bc68ec44ebfc1996eefe6670eb18a0..8f5e8aececa56c54ceb098648b33d62a716f9922 100644 (file)
--- a/configs/kmsupx5_defconfig
+++ b/configs/kmsupx5_defconfig
@@ -78,6 +78,9 @@ CONFIG_LBLAW2=y
 CONFIG_LBLAW2_BASE=0xA0000000
 CONFIG_LBLAW2_NAME="APP1"
 CONFIG_LBLAW2_LENGTH_256_MBYTES=y
+CONFIG_HID0_FINAL_EMCP=y
+CONFIG_HID0_FINAL_ICE=y
+CONFIG_HID2_HBE=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 9a57e43d7845b77887bd351c91953f2a3d084adb..e3d721e093ed4629ca1f9936c80fb3d159f53b7b 100644 (file)
--- a/configs/kmtegr1_defconfig
+++ b/configs/kmtegr1_defconfig
@@ -79,6 +79,9 @@ CONFIG_LBLAW3=y
 CONFIG_LBLAW3_BASE=0xB0000000
 CONFIG_LBLAW3_NAME="APP2"
 CONFIG_LBLAW3_LENGTH_256_MBYTES=y
+CONFIG_HID0_FINAL_EMCP=y
+CONFIG_HID0_FINAL_ICE=y
+CONFIG_HID2_HBE=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 78f7de9899abb0e4e59702d840d0a23c207301d4..749b38586f2c40f63e2f74d0f2debb6da5aa6a6a 100644 (file)
--- a/configs/kmtepr2_defconfig
+++ b/configs/kmtepr2_defconfig
@@ -92,6 +92,9 @@ CONFIG_LBLAW3=y
 CONFIG_LBLAW3_BASE=0xB0000000
 CONFIG_LBLAW3_NAME="APP2"
 CONFIG_LBLAW3_LENGTH_256_MBYTES=y
+CONFIG_HID0_FINAL_EMCP=y
+CONFIG_HID0_FINAL_ICE=y
+CONFIG_HID2_HBE=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 7256750ea0b7a22d4616778e9411a8eb9dcb6e44..e8bb547b6f4d29b6c872ccd689aaa5a5599b2fc1 100644 (file)
--- a/configs/kmvect1_defconfig
+++ b/configs/kmvect1_defconfig
@@ -93,6 +93,9 @@ CONFIG_LBLAW3=y
 CONFIG_LBLAW3_BASE=0xB0000000
 CONFIG_LBLAW3_NAME="APP2"
 CONFIG_LBLAW3_LENGTH_256_MBYTES=y
+CONFIG_HID0_FINAL_EMCP=y
+CONFIG_HID0_FINAL_ICE=y
+CONFIG_HID2_HBE=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 ec2e30709cae87957e33cafb7250519c7461a400..b0da1c07047e765360ffd48c47efdd600c6290c1 100644 (file)
--- a/configs/mpc8308_p1m_defconfig
+++ b/configs/mpc8308_p1m_defconfig
@@ -56,6 +56,10 @@ CONFIG_LBLAW2=y
 CONFIG_LBLAW2_BASE=0xFBFF8000
 CONFIG_LBLAW2_NAME="CPLD"
 CONFIG_LBLAW2_LENGTH_32_KBYTES=y
+CONFIG_HID0_FINAL_EMCP=y
+CONFIG_HID0_FINAL_DPM=y
+CONFIG_HID0_FINAL_ICE=y
+CONFIG_HID2_HBE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_BOOTDELAY=5

diff --git a/configs/sbc8349_PCI_33_defconfig b/configs/sbc8349_PCI_33_defconfig
index 453f85a0e33dd9080e27d47dc437037434f1e001..a213f038ee4937adbfef3f1f4728c8b9a6cdd785 100644 (file)
--- a/configs/sbc8349_PCI_33_defconfig
+++ b/configs/sbc8349_PCI_33_defconfig
@@ -69,6 +69,9 @@ CONFIG_LBLAW0=y
 CONFIG_LBLAW0_BASE=0xFF800000
 CONFIG_LBLAW0_NAME="FLASH"
 CONFIG_LBLAW0_LENGTH_8_MBYTES=y
+CONFIG_HID0_FINAL_EMCP=y
+CONFIG_HID0_FINAL_ICE=y
+CONFIG_HID2_HBE=y
 CONFIG_PCI_64BIT=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y

diff --git a/configs/sbc8349_PCI_66_defconfig b/configs/sbc8349_PCI_66_defconfig
index b30461563025f0886684f3e05a15edfcf63421dc..321c3d40735a7fbf49ddcd58886649fa5fc2f04e 100644 (file)
--- a/configs/sbc8349_PCI_66_defconfig
+++ b/configs/sbc8349_PCI_66_defconfig
@@ -69,6 +69,9 @@ CONFIG_LBLAW0=y
 CONFIG_LBLAW0_BASE=0xFF800000
 CONFIG_LBLAW0_NAME="FLASH"
 CONFIG_LBLAW0_LENGTH_8_MBYTES=y
+CONFIG_HID0_FINAL_EMCP=y
+CONFIG_HID0_FINAL_ICE=y
+CONFIG_HID2_HBE=y
 CONFIG_PCI_64BIT=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y

diff --git a/configs/sbc8349_defconfig b/configs/sbc8349_defconfig
index 4ec51af9f2e2943ff2743e2032b57035e78e6887..865a3ef74a542232a5cf2e8d4510f56ca04ecab3 100644 (file)
--- a/configs/sbc8349_defconfig
+++ b/configs/sbc8349_defconfig
@@ -49,6 +49,9 @@ CONFIG_LBLAW0=y
 CONFIG_LBLAW0_BASE=0xFF800000
 CONFIG_LBLAW0_NAME="FLASH"
 CONFIG_LBLAW0_LENGTH_8_MBYTES=y
+CONFIG_HID0_FINAL_EMCP=y
+CONFIG_HID0_FINAL_ICE=y
+CONFIG_HID2_HBE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_BOOTDELAY=6

diff --git a/configs/strider_con_defconfig b/configs/strider_con_defconfig
index a806e9957f71aab5b53bb292c3aa6ff85cd19ecb..82db1696735d403c5ead81f46648379f7053503b 100644 (file)
--- a/configs/strider_con_defconfig
+++ b/configs/strider_con_defconfig
@@ -53,6 +53,10 @@ CONFIG_LBLAW1=y
 CONFIG_LBLAW1_BASE=0xE0600000
 CONFIG_LBLAW1_NAME="FPGA0"
 CONFIG_LBLAW1_LENGTH_1_MBYTES=y
+CONFIG_HID0_FINAL_EMCP=y
+CONFIG_HID0_FINAL_DPM=y
+CONFIG_HID0_FINAL_ICE=y
+CONFIG_HID2_HBE=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 3687a28fc3aacb64d40a6fafab933cfd0f2e1c9d..b9f43273b0ebf6baba7622893cc024c65fc3a155 100644 (file)
--- a/configs/strider_con_dp_defconfig
+++ b/configs/strider_con_dp_defconfig
@@ -53,6 +53,10 @@ CONFIG_LBLAW1=y
 CONFIG_LBLAW1_BASE=0xE0600000
 CONFIG_LBLAW1_NAME="FPGA0"
 CONFIG_LBLAW1_LENGTH_1_MBYTES=y
+CONFIG_HID0_FINAL_EMCP=y
+CONFIG_HID0_FINAL_DPM=y
+CONFIG_HID0_FINAL_ICE=y
+CONFIG_HID2_HBE=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 4231a431b8899f6ebe81c7c6db0b16e095de815a..5dc1ddf9230501547d5d3c5b41f4b3240cc8ba79 100644 (file)
--- a/configs/strider_cpu_defconfig
+++ b/configs/strider_cpu_defconfig
@@ -53,6 +53,10 @@ CONFIG_LBLAW1=y
 CONFIG_LBLAW1_BASE=0xE0600000
 CONFIG_LBLAW1_NAME="FPGA0"
 CONFIG_LBLAW1_LENGTH_1_MBYTES=y
+CONFIG_HID0_FINAL_EMCP=y
+CONFIG_HID0_FINAL_DPM=y
+CONFIG_HID0_FINAL_ICE=y
+CONFIG_HID2_HBE=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 afb991ce1e27e9164976dbf25e4925ec85a0205b..093f3e6b8bd081134ab9cef897372c277533326c 100644 (file)
--- a/configs/strider_cpu_dp_defconfig
+++ b/configs/strider_cpu_dp_defconfig
@@ -53,6 +53,10 @@ CONFIG_LBLAW1=y
 CONFIG_LBLAW1_BASE=0xE0600000
 CONFIG_LBLAW1_NAME="FPGA0"
 CONFIG_LBLAW1_LENGTH_1_MBYTES=y
+CONFIG_HID0_FINAL_EMCP=y
+CONFIG_HID0_FINAL_DPM=y
+CONFIG_HID0_FINAL_ICE=y
+CONFIG_HID2_HBE=y
 CONFIG_CMD_IOLOOP=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y

diff --git a/configs/suvd3_defconfig b/configs/suvd3_defconfig
index 2b16ceb52422d8b1f441773bdd460addd4ee214b..fcd5741092789734a1d3606de28c17f3ae38ed9b 100644 (file)
--- a/configs/suvd3_defconfig
+++ b/configs/suvd3_defconfig
@@ -92,6 +92,9 @@ CONFIG_LBLAW3=y
 CONFIG_LBLAW3_BASE=0xB0000000
 CONFIG_LBLAW3_NAME="APP2"
 CONFIG_LBLAW3_LENGTH_256_MBYTES=y
+CONFIG_HID0_FINAL_EMCP=y
+CONFIG_HID0_FINAL_ICE=y
+CONFIG_HID2_HBE=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 07666c3b50b4a93cfc6f07913bd50e20117fab70..5f7f2289f13ff76a10f97db5f9c7aa5e84a70af8 100644 (file)
--- a/configs/tuge1_defconfig
+++ b/configs/tuge1_defconfig
@@ -78,6 +78,9 @@ CONFIG_LBLAW2=y
 CONFIG_LBLAW2_BASE=0xA0000000
 CONFIG_LBLAW2_NAME="APP1"
 CONFIG_LBLAW2_LENGTH_256_MBYTES=y
+CONFIG_HID0_FINAL_EMCP=y
+CONFIG_HID0_FINAL_ICE=y
+CONFIG_HID2_HBE=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 627bf2febf3e0d13f18185a761ca967a85ea44d2..600c6f36e05fa70f29559babd67bce5cf3bd181f 100644 (file)
--- a/configs/tuxx1_defconfig
+++ b/configs/tuxx1_defconfig
@@ -92,6 +92,9 @@ CONFIG_LBLAW3=y
 CONFIG_LBLAW3_BASE=0xB0000000
 CONFIG_LBLAW3_NAME="APP2"
 CONFIG_LBLAW3_LENGTH_256_MBYTES=y
+CONFIG_HID0_FINAL_EMCP=y
+CONFIG_HID0_FINAL_ICE=y
+CONFIG_HID2_HBE=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 365c4ea8587e576643afd5b369be91a6a841719c..42e0098a1c75405c0382d12808b7fa5d601b73ba 100644 (file)
--- a/configs/ve8313_defconfig
+++ b/configs/ve8313_defconfig
@@ -74,6 +74,9 @@ CONFIG_LBLAW1=y
 CONFIG_LBLAW1_BASE=0x61000000
 CONFIG_LBLAW1_NAME="NAND"
 CONFIG_LBLAW1_LENGTH_32_KBYTES=y
+CONFIG_HID0_FINAL_EMCP=y
+CONFIG_HID0_FINAL_ICE=y
+CONFIG_HID2_HBE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_BOOTDELAY=6

diff --git a/configs/vme8349_defconfig b/configs/vme8349_defconfig
index 072674cbeb65805888713befe51725643d1f54e0..9ac88c0a4ba1984234fdc8f3483f6988787e6f6a 100644 (file)
--- a/configs/vme8349_defconfig
+++ b/configs/vme8349_defconfig
@@ -71,6 +71,9 @@ CONFIG_LBLAW1=y
 CONFIG_LBLAW1_BASE=0xF0000000
 CONFIG_LBLAW1_NAME="WINDOW1"
 CONFIG_LBLAW1_LENGTH_256_KBYTES=y
+CONFIG_HID0_FINAL_EMCP=y
+CONFIG_HID0_FINAL_ICE=y
+CONFIG_HID2_HBE=y
 CONFIG_PCI_64BIT=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y

diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h
index cd78836bcd574cd487ed88047862e72dc490d765..9c4de054403f59d5a28ccea856abb1f66f4eaba7 100644 (file)
--- a/include/configs/MPC8308RDB.h
+++ b/include/configs/MPC8308RDB.h
@@ -331,15 +331,6 @@
 #define CONFIG_SYS_BOOTMAPSZ   (256 << 20) /* Initial Memory map for Linux */
 #define CONFIG_SYS_BOOTM_LEN   (64 << 20)      /* Increase max gunzip size */
 
-/*
- * Core HID Setup
- */
-#define CONFIG_SYS_HID0_INIT   0x000000000
-#define CONFIG_SYS_HID0_FINAL  (HID0_ENABLE_MACHINE_CHECK | \
-                                HID0_ENABLE_INSTRUCTION_CACHE | \
-                                HID0_ENABLE_DYNAMIC_POWER_MANAGMENT)
-#define CONFIG_SYS_HID2                HID2_HBE
-
 /*
  * Environment Configuration
  */

diff --git a/include/configs/MPC8313ERDB_NAND.h b/include/configs/MPC8313ERDB_NAND.h
index 93b553c90502d34621993f9c16c8b2a3528d95e0..2f48b135c46e4c6145226a75ade4afa6605e07f1 100644 (file)
--- a/include/configs/MPC8313ERDB_NAND.h
+++ b/include/configs/MPC8313ERDB_NAND.h
@@ -362,13 +362,6 @@
                        /* Enable Internal USB Phy and GPIO on LCD Connector */
 #define CONFIG_SYS_SICRL       (SICRL_USBDR_10 | SICRL_LBC)
 
-#define CONFIG_SYS_HID0_INIT   0x000000000
-#define CONFIG_SYS_HID0_FINAL  (HID0_ENABLE_MACHINE_CHECK | \
-                                HID0_ENABLE_INSTRUCTION_CACHE | \
-                                HID0_ENABLE_DYNAMIC_POWER_MANAGMENT)
-
-#define CONFIG_SYS_HID2 HID2_HBE
-
 /*
  * Environment Configuration
  */

diff --git a/include/configs/MPC8313ERDB_NOR.h b/include/configs/MPC8313ERDB_NOR.h
index 18e056e1b24a6676cbaec7aecac8fe1215e9e67e..bd1e54feec32342c9eaae2a443d82c2527a9dffa 100644 (file)
--- a/include/configs/MPC8313ERDB_NOR.h
+++ b/include/configs/MPC8313ERDB_NOR.h
@@ -335,13 +335,6 @@
                        /* Enable Internal USB Phy and GPIO on LCD Connector */
 #define CONFIG_SYS_SICRL       (SICRL_USBDR_10 | SICRL_LBC)
 
-#define CONFIG_SYS_HID0_INIT   0x000000000
-#define CONFIG_SYS_HID0_FINAL  (HID0_ENABLE_MACHINE_CHECK | \
-                                HID0_ENABLE_INSTRUCTION_CACHE | \
-                                HID0_ENABLE_DYNAMIC_POWER_MANAGMENT)
-
-#define CONFIG_SYS_HID2 HID2_HBE
-
 /*
  * Environment Configuration
  */

diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h
index 708829dae80f66e1e27efac133ef32c61d97672f..5ce213f59495cdccb0eeb4f22c436008e254a184 100644 (file)
--- a/include/configs/MPC8315ERDB.h
+++ b/include/configs/MPC8315ERDB.h
@@ -356,15 +356,6 @@
 #define CONFIG_SYS_BOOTMAPSZ   (256 << 20) /* Initial Memory map for Linux */
 #define CONFIG_SYS_BOOTM_LEN   (64 << 20)      /* Increase max gunzip size */
 
-/*
- * Core HID Setup
- */
-#define CONFIG_SYS_HID0_INIT   0x000000000
-#define CONFIG_SYS_HID0_FINAL  (HID0_ENABLE_MACHINE_CHECK | \
-                                HID0_ENABLE_INSTRUCTION_CACHE | \
-                                HID0_ENABLE_DYNAMIC_POWER_MANAGMENT)
-#define CONFIG_SYS_HID2                HID2_HBE
-
 /*
  * MMU Setup
  */

diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h
index c66e33a247e701f7e0ce4543611e545cce6f0ac4..abc62f7e6995ab5e398581d343da1ea0b1da6102 100644 (file)
--- a/include/configs/MPC8323ERDB.h
+++ b/include/configs/MPC8323ERDB.h
@@ -272,14 +272,6 @@
 #define CONFIG_SYS_BOOTMAPSZ           (256 << 20)
 #define CONFIG_SYS_BOOTM_LEN   (64 << 20)      /* Increase max gunzip size */
 
-/*
- * Core HID Setup
- */
-#define CONFIG_SYS_HID0_INIT   0x000000000
-#define CONFIG_SYS_HID0_FINAL  (HID0_ENABLE_MACHINE_CHECK | \
-                                HID0_ENABLE_INSTRUCTION_CACHE)
-#define CONFIG_SYS_HID2                HID2_HBE
-
 #if (CONFIG_CMD_KGDB)
 #define CONFIG_KGDB_BAUDRATE   230400  /* speed of kgdb serial port */
 #endif

diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h
index ed47bcd5b4233fe12e99516909132daa190c0df7..a138bd6724f1d3f5fcc8fb90e58fb145e04bbd90 100644 (file)
--- a/include/configs/MPC832XEMDS.h
+++ b/include/configs/MPC832XEMDS.h
@@ -290,14 +290,6 @@
 #define CONFIG_SYS_BOOTMAPSZ           (256 << 20)
 #define CONFIG_SYS_BOOTM_LEN   (64 << 20)      /* Increase max gunzip size */
 
-/*
- * Core HID Setup
- */
-#define CONFIG_SYS_HID0_INIT   0x000000000
-#define CONFIG_SYS_HID0_FINAL  (HID0_ENABLE_MACHINE_CHECK | \
-                                HID0_ENABLE_INSTRUCTION_CACHE)
-#define CONFIG_SYS_HID2                HID2_HBE
-
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_KGDB_BAUDRATE   230400  /* speed of kgdb serial port */
 #endif

diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index 3e0907dae4e5eeea2048961d0a9eba5e9af27894..d0d6eaf6c215e7207167347afb2ef7bc9d42ef06 100644 (file)
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -341,17 +341,6 @@
 #define CONFIG_SYS_SICRH 0
 #define CONFIG_SYS_SICRL SICRL_LDP_A
 
-#define CONFIG_SYS_HID0_INIT   0x000000000
-#define CONFIG_SYS_HID0_FINAL  (HID0_ENABLE_MACHINE_CHECK \
-                               | HID0_ENABLE_INSTRUCTION_CACHE)
-
-/* #define CONFIG_SYS_HID0_FINAL       (\
-       HID0_ENABLE_INSTRUCTION_CACHE |\
-       HID0_ENABLE_M_BIT |\
-       HID0_ENABLE_ADDRESS_BROADCAST) */
-
-#define CONFIG_SYS_HID2 HID2_HBE
-
 #ifdef CONFIG_PCI
 #define CONFIG_PCI_INDIRECT_BRIDGE
 #endif

diff --git a/include/configs/MPC8349EMDS_SDRAM.h b/include/configs/MPC8349EMDS_SDRAM.h
index e401c29d6b713a0e9c0eec8b66548dd1f701edce..976c1e80638a95aca2b19d470ce67232ea8bb5f6 100644 (file)
--- a/include/configs/MPC8349EMDS_SDRAM.h
+++ b/include/configs/MPC8349EMDS_SDRAM.h
@@ -396,17 +396,6 @@
 #define CONFIG_SYS_SICRH 0
 #define CONFIG_SYS_SICRL SICRL_LDP_A
 
-#define CONFIG_SYS_HID0_INIT   0x000000000
-#define CONFIG_SYS_HID0_FINAL  (HID0_ENABLE_MACHINE_CHECK \
-                               | HID0_ENABLE_INSTRUCTION_CACHE)
-
-/* #define CONFIG_SYS_HID0_FINAL       (\
-       HID0_ENABLE_INSTRUCTION_CACHE |\
-       HID0_ENABLE_M_BIT |\
-       HID0_ENABLE_ADDRESS_BROADCAST) */
-
-#define CONFIG_SYS_HID2 HID2_HBE
-
 #ifdef CONFIG_PCI
 #define CONFIG_PCI_INDIRECT_BRIDGE
 #endif

diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h
index cc62fc3213565bb196372730612d72299404a1a0..f37b086b1f1b9ccce425ee8f2d312d69687a4f81 100644 (file)
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@ -425,11 +425,6 @@ boards, we say we have two, but don't display a message if we find only one. */
                                /* USB DR as device + USB MPH as host */
 #define CONFIG_SYS_SICRL       (SICRL_LDP_A | SICRL_USB1)
 
-#define CONFIG_SYS_HID0_INIT   0x00000000
-#define CONFIG_SYS_HID0_FINAL  HID0_ENABLE_INSTRUCTION_CACHE
-
-#define CONFIG_SYS_HID2        HID2_HBE
-
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_KGDB_BAUDRATE   230400  /* speed of kgdb serial port */
 #endif

diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h
index a244ae87a222b91e1636faf441a9bbb11daee0dd..7361f0e2f671b69ad9b177acad7e8b9acc6ca2dc 100644 (file)
--- a/include/configs/MPC837XEMDS.h
+++ b/include/configs/MPC837XEMDS.h
@@ -361,14 +361,6 @@ extern int board_pci_host_broken(void);
 #define CONFIG_SYS_BOOTMAPSZ   (256 << 20) /* Initial Memory map for Linux */
 #define CONFIG_SYS_BOOTM_LEN   (64 << 20)      /* Increase max gunzip size */
 
-/*
- * Core HID Setup
- */
-#define CONFIG_SYS_HID0_INIT   0x000000000
-#define CONFIG_SYS_HID0_FINAL  (HID0_ENABLE_MACHINE_CHECK | \
-                                HID0_ENABLE_INSTRUCTION_CACHE)
-#define CONFIG_SYS_HID2                HID2_HBE
-
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_KGDB_BAUDRATE   230400  /* speed of kgdb serial port */
 #endif

diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 006279a58c35096a9223b9c8a8c482a94e0feee6..3f17574cee9d99c34605d79e4ccaa15ffcb8ff7a 100644 (file)
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -382,14 +382,6 @@
 #define CONFIG_SYS_BOOTMAPSZ   (256 << 20) /* Initial Memory map for Linux */
 #define CONFIG_SYS_BOOTM_LEN   (64 << 20)      /* Increase max gunzip size */
 
-/*
- * Core HID Setup
- */
-#define CONFIG_SYS_HID0_INIT   0x000000000
-#define CONFIG_SYS_HID0_FINAL  (HID0_ENABLE_MACHINE_CHECK \
-                               | HID0_ENABLE_INSTRUCTION_CACHE)
-#define CONFIG_SYS_HID2                HID2_HBE
-
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_KGDB_BAUDRATE   230400  /* speed of kgdb serial port */
 #endif

diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index af03c037865ca241ae047361448bed8f2c173156..dc2bba828c3e2ab3a771a4d0ba3cbdad3f4442d6 100644 (file)
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -237,12 +237,6 @@
 #define CONFIG_SYS_SICRH       0
 #define CONFIG_SYS_SICRL       SICRL_LDP_A
 
-/* i-cache and d-cache disabled */
-#define CONFIG_SYS_HID0_INIT   0x000000000
-#define CONFIG_SYS_HID0_FINAL  (CONFIG_SYS_HID0_INIT | \
-                                HID0_ENABLE_INSTRUCTION_CACHE)
-#define CONFIG_SYS_HID2        HID2_HBE
-
 /* PCI */
 #ifdef CONFIG_PCI
 #define CONFIG_PCI_INDIRECT_BRIDGE

diff --git a/include/configs/caddy2.h b/include/configs/caddy2.h
index e9cfeae64d895a47cfa2349cc3ca7cd1bcf83400..016477c04fb1c395167a3730cd2430d981f8bf5c 100644 (file)
--- a/include/configs/caddy2.h
+++ b/include/configs/caddy2.h
@@ -263,12 +263,6 @@
 #define CONFIG_SYS_SICRH 0
 #define CONFIG_SYS_SICRL SICRL_LDP_A
 
-#define CONFIG_SYS_HID0_INIT   0x000000000
-#define CONFIG_SYS_HID0_FINAL  (HID0_ENABLE_MACHINE_CHECK | \
-                                HID0_ENABLE_INSTRUCTION_CACHE)
-
-#define CONFIG_SYS_HID2                HID2_HBE
-
 #define CONFIG_SYS_GPIO1_PRELIM
 #define CONFIG_SYS_GPIO1_DIR   0x00100000
 #define CONFIG_SYS_GPIO1_DAT   0x00100000

diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h
index 4001a0a16b02d357806402d2c285c8007dd531a0..b28f3c1d45a0f834442f4780b5d9a5a9fabdfdb6 100644 (file)
--- a/include/configs/hrcon.h
+++ b/include/configs/hrcon.h
@@ -440,15 +440,6 @@ void fpga_control_clear(unsigned int bus, int pin);
  */
 #define CONFIG_SYS_BOOTMAPSZ   (256 << 20) /* Initial Memory map for Linux */
 
-/*
- * Core HID Setup
- */
-#define CONFIG_SYS_HID0_INIT   0x000000000
-#define CONFIG_SYS_HID0_FINAL  (HID0_ENABLE_MACHINE_CHECK | \
-                                HID0_ENABLE_INSTRUCTION_CACHE | \
-                                HID0_ENABLE_DYNAMIC_POWER_MANAGMENT)
-#define CONFIG_SYS_HID2                HID2_HBE
-
 /*
  * Environment Configuration
  */

diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h
index d86dda18fb1b7a9c614d76e63b1dc0d033e49d8d..1637ed9646baf2a9c6ccf143fe9ad64574d2e8c4 100644 (file)
--- a/include/configs/ids8313.h
+++ b/include/configs/ids8313.h
@@ -30,13 +30,6 @@
 
 #define CONFIG_HWCONFIG
 
-#define CONFIG_SYS_HID0_INIT   0x000000000
-#define CONFIG_SYS_HID0_FINAL  (HID0_ENABLE_MACHINE_CHECK |\
-                                HID0_ENABLE_INSTRUCTION_CACHE |\
-                                HID0_DISABLE_DYNAMIC_POWER_MANAGMENT)
-
-#define CONFIG_SYS_HID2        (HID2_HBE | 0x00020000)
-
 /*
  * Definitions for initial stack pointer and data area (in DCACHE )
  */

diff --git a/include/configs/kmcoge5ne.h b/include/configs/kmcoge5ne.h
index ede8ae6ba5f442c2ff698f1354497ea9100f0269..f3f78de8de16abaa5a48dcbd3be7f0fc049a1038 100644 (file)
--- a/include/configs/kmcoge5ne.h
+++ b/include/configs/kmcoge5ne.h
@@ -203,14 +203,6 @@
  */
 #define CONFIG_SYS_BOOTMAPSZ           (8 << 20)
 
-/*
- * Core HID Setup
- */
-#define CONFIG_SYS_HID0_INIT           0x000000000
-#define CONFIG_SYS_HID0_FINAL          (HID0_ENABLE_MACHINE_CHECK | \
-                                        HID0_ENABLE_INSTRUCTION_CACHE)
-#define CONFIG_SYS_HID2                        HID2_HBE
-
 /*
  * Internal Definitions
  */

diff --git a/include/configs/kmeter1.h b/include/configs/kmeter1.h
index 728c9b199f2c46a828bbbe4dbfef052560725ff6..aaa0607ed5ee3deeeff81fdfc1fd7dd720cefcb2 100644 (file)
--- a/include/configs/kmeter1.h
+++ b/include/configs/kmeter1.h
@@ -189,14 +189,6 @@
  */
 #define CONFIG_SYS_BOOTMAPSZ           (8 << 20)
 
-/*
- * Core HID Setup
- */
-#define CONFIG_SYS_HID0_INIT           0x000000000
-#define CONFIG_SYS_HID0_FINAL          (HID0_ENABLE_MACHINE_CHECK | \
-                                        HID0_ENABLE_INSTRUCTION_CACHE)
-#define CONFIG_SYS_HID2                        HID2_HBE
-
 /*
  * Internal Definitions
  */

diff --git a/include/configs/kmopti2.h b/include/configs/kmopti2.h
index f39dbe05b7e65ebdbc72386ca0510599af572a95..e9bb3f798351c3c6808168faaa0d42bf9c98175d 100644 (file)
--- a/include/configs/kmopti2.h
+++ b/include/configs/kmopti2.h
@@ -208,14 +208,6 @@
  */
 #define CONFIG_SYS_BOOTMAPSZ           (8 << 20)
 
-/*
- * Core HID Setup
- */
-#define CONFIG_SYS_HID0_INIT           0x000000000
-#define CONFIG_SYS_HID0_FINAL          (HID0_ENABLE_MACHINE_CHECK | \
-                                        HID0_ENABLE_INSTRUCTION_CACHE)
-#define CONFIG_SYS_HID2                        HID2_HBE
-
 /*
  * Internal Definitions
  */

diff --git a/include/configs/kmsupx5.h b/include/configs/kmsupx5.h
index 19e415619a5bb8036515ef2de57467c5282bd060..182357b0c0db272f6d9783486c8da6febba9f400 100644 (file)
--- a/include/configs/kmsupx5.h
+++ b/include/configs/kmsupx5.h
@@ -208,14 +208,6 @@
  */
 #define CONFIG_SYS_BOOTMAPSZ           (8 << 20)
 
-/*
- * Core HID Setup
- */
-#define CONFIG_SYS_HID0_INIT           0x000000000
-#define CONFIG_SYS_HID0_FINAL          (HID0_ENABLE_MACHINE_CHECK | \
-                                        HID0_ENABLE_INSTRUCTION_CACHE)
-#define CONFIG_SYS_HID2                        HID2_HBE
-
 /*
  * Internal Definitions
  */

diff --git a/include/configs/kmtegr1.h b/include/configs/kmtegr1.h
index fe4763ce8ad946fc20e3538238ad0d373b1641a4..0855dd152ce0287e73992d5b16b7958ed35036a7 100644 (file)
--- a/include/configs/kmtegr1.h
+++ b/include/configs/kmtegr1.h
@@ -212,14 +212,6 @@
  */
 #define CONFIG_SYS_BOOTMAPSZ           (8 << 20)
 
-/*
- * Core HID Setup
- */
-#define CONFIG_SYS_HID0_INIT           0x000000000
-#define CONFIG_SYS_HID0_FINAL          (HID0_ENABLE_MACHINE_CHECK | \
-                                        HID0_ENABLE_INSTRUCTION_CACHE)
-#define CONFIG_SYS_HID2                        HID2_HBE
-
 /*
  * Internal Definitions
  */

diff --git a/include/configs/kmtepr2.h b/include/configs/kmtepr2.h
index 9302d35949dc66184b0f037892759881817b845f..7edb573747f77ae5042edc6798d2d21dcf57c2dc 100644 (file)
--- a/include/configs/kmtepr2.h
+++ b/include/configs/kmtepr2.h
@@ -208,14 +208,6 @@
  */
 #define CONFIG_SYS_BOOTMAPSZ           (8 << 20)
 
-/*
- * Core HID Setup
- */
-#define CONFIG_SYS_HID0_INIT           0x000000000
-#define CONFIG_SYS_HID0_FINAL          (HID0_ENABLE_MACHINE_CHECK | \
-                                        HID0_ENABLE_INSTRUCTION_CACHE)
-#define CONFIG_SYS_HID2                        HID2_HBE
-
 /*
  * Internal Definitions
  */

diff --git a/include/configs/kmvect1.h b/include/configs/kmvect1.h
index 06c5923ae1d0ad8b7df1c9e0fb00baa3448730ee..b88f1582656ff01ecac267d35ae15a64f816a39b 100644 (file)
--- a/include/configs/kmvect1.h
+++ b/include/configs/kmvect1.h
@@ -204,14 +204,6 @@
  */
 #define CONFIG_SYS_BOOTMAPSZ           (8 << 20)
 
-/*
- * Core HID Setup
- */
-#define CONFIG_SYS_HID0_INIT           0x000000000
-#define CONFIG_SYS_HID0_FINAL          (HID0_ENABLE_MACHINE_CHECK | \
-                                        HID0_ENABLE_INSTRUCTION_CACHE)
-#define CONFIG_SYS_HID2                        HID2_HBE
-
 /*
  * Internal Definitions
  */

diff --git a/include/configs/mpc8308_p1m.h b/include/configs/mpc8308_p1m.h
index cb7dabd9321a420909e872828813e47033ad18f0..8ea3ea11dc81d99139a97426aeac415131812d8e 100644 (file)
--- a/include/configs/mpc8308_p1m.h
+++ b/include/configs/mpc8308_p1m.h
@@ -309,15 +309,6 @@
  */
 #define CONFIG_SYS_BOOTMAPSZ   (256 << 20) /* Initial Memory map for Linux */
 
-/*
- * Core HID Setup
- */
-#define CONFIG_SYS_HID0_INIT   0x000000000
-#define CONFIG_SYS_HID0_FINAL  (HID0_ENABLE_MACHINE_CHECK | \
-                                HID0_ENABLE_INSTRUCTION_CACHE | \
-                                HID0_ENABLE_DYNAMIC_POWER_MANAGMENT)
-#define CONFIG_SYS_HID2                HID2_HBE
-
 /*
  * Environment Configuration
  */

diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h
index 98770ca0a64f555167644577adeaff6724c0b154..b58628262d3192b568d1a7f9787b5b1deb5dc4d8 100644 (file)
--- a/include/configs/sbc8349.h
+++ b/include/configs/sbc8349.h
@@ -283,17 +283,6 @@
 #define CONFIG_SYS_SICRH 0
 #define CONFIG_SYS_SICRL SICRL_LDP_A
 
-#define CONFIG_SYS_HID0_INIT   0x000000000
-#define CONFIG_SYS_HID0_FINAL  (HID0_ENABLE_MACHINE_CHECK \
-                               | HID0_ENABLE_INSTRUCTION_CACHE)
-
-/* #define CONFIG_SYS_HID0_FINAL       (\
-       HID0_ENABLE_INSTRUCTION_CACHE |\
-       HID0_ENABLE_M_BIT |\
-       HID0_ENABLE_ADDRESS_BROADCAST) */
-
-#define CONFIG_SYS_HID2 HID2_HBE
-
 #ifdef CONFIG_PCI
 #define CONFIG_PCI_INDIRECT_BRIDGE
 #endif

diff --git a/include/configs/strider.h b/include/configs/strider.h
index 94164de06c27163e8c5bfda3eb1c90928e5bd2ee..96b31741fd2f6d56f45b61d9805ca8cb81fd7666 100644 (file)
--- a/include/configs/strider.h
+++ b/include/configs/strider.h
@@ -473,15 +473,6 @@ void fpga_control_clear(unsigned int bus, int pin);
  */
 #define CONFIG_SYS_BOOTMAPSZ   (256 << 20) /* Initial Memory map for Linux */
 
-/*
- * Core HID Setup
- */
-#define CONFIG_SYS_HID0_INIT   0x000000000
-#define CONFIG_SYS_HID0_FINAL  (HID0_ENABLE_MACHINE_CHECK | \
-                                HID0_ENABLE_INSTRUCTION_CACHE | \
-                                HID0_ENABLE_DYNAMIC_POWER_MANAGMENT)
-#define CONFIG_SYS_HID2                HID2_HBE
-
 /*
  * Environment Configuration
  */

diff --git a/include/configs/suvd3.h b/include/configs/suvd3.h
index a65b61bfbf87daef3707cc341bd9d6eeaed1c978..5d7d48dd391dbb13fb0121a0996cc79c9835601a 100644 (file)
--- a/include/configs/suvd3.h
+++ b/include/configs/suvd3.h
@@ -205,14 +205,6 @@
  */
 #define CONFIG_SYS_BOOTMAPSZ           (8 << 20)
 
-/*
- * Core HID Setup
- */
-#define CONFIG_SYS_HID0_INIT           0x000000000
-#define CONFIG_SYS_HID0_FINAL          (HID0_ENABLE_MACHINE_CHECK | \
-                                        HID0_ENABLE_INSTRUCTION_CACHE)
-#define CONFIG_SYS_HID2                        HID2_HBE
-
 /*
  * Internal Definitions
  */

diff --git a/include/configs/tuge1.h b/include/configs/tuge1.h
index 6084e8af60512cba54f42adbdaa51ad40092a165..d95147d1edbf57a992bc9366b3f5123a44d58c7b 100644 (file)
--- a/include/configs/tuge1.h
+++ b/include/configs/tuge1.h
@@ -208,14 +208,6 @@
  */
 #define CONFIG_SYS_BOOTMAPSZ           (8 << 20)
 
-/*
- * Core HID Setup
- */
-#define CONFIG_SYS_HID0_INIT           0x000000000
-#define CONFIG_SYS_HID0_FINAL          (HID0_ENABLE_MACHINE_CHECK | \
-                                        HID0_ENABLE_INSTRUCTION_CACHE)
-#define CONFIG_SYS_HID2                        HID2_HBE
-
 /*
  * Internal Definitions
  */

diff --git a/include/configs/tuxx1.h b/include/configs/tuxx1.h
index 86aec93ee96c0a91daf89ddd2187d052d2a72dd4..e6337d98ac695ede6128c91369a443f1e651eaa1 100644 (file)
--- a/include/configs/tuxx1.h
+++ b/include/configs/tuxx1.h
@@ -208,14 +208,6 @@
  */
 #define CONFIG_SYS_BOOTMAPSZ           (8 << 20)
 
-/*
- * Core HID Setup
- */
-#define CONFIG_SYS_HID0_INIT           0x000000000
-#define CONFIG_SYS_HID0_FINAL          (HID0_ENABLE_MACHINE_CHECK | \
-                                        HID0_ENABLE_INSTRUCTION_CACHE)
-#define CONFIG_SYS_HID2                        HID2_HBE
-
 /*
  * Internal Definitions
  */

diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h
index 4c5dad9dc26798739c9f261368081ef2bf59acc9..87160f2c34172914c6368956306e64c1623cafbf 100644 (file)
--- a/include/configs/ve8313.h
+++ b/include/configs/ve8313.h
@@ -268,12 +268,6 @@
                                SICRL_ETSEC2_A)
                                /* 0x33fc0003) */
 
-#define CONFIG_SYS_HID0_INIT   0x000000000
-#define CONFIG_SYS_HID0_FINAL  (HID0_ENABLE_MACHINE_CHECK | \
-                                HID0_ENABLE_INSTRUCTION_CACHE)
-
-#define CONFIG_SYS_HID2 HID2_HBE
-
 #define CONFIG_NETDEV          eth0
 
 #define CONFIG_HOSTNAME                "ve8313"

diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h
index 9b9c1ff54e22a2e1ae5594a90f55c947caa30f0b..2a14f561ed77246c635b9d6e301473e3c4ad71de 100644 (file)
--- a/include/configs/vme8349.h
+++ b/include/configs/vme8349.h
@@ -263,12 +263,6 @@
 #define CONFIG_SYS_SICRH 0
 #define CONFIG_SYS_SICRL SICRL_LDP_A
 
-#define CONFIG_SYS_HID0_INIT   0x000000000
-#define CONFIG_SYS_HID0_FINAL  (HID0_ENABLE_MACHINE_CHECK | \
-                                HID0_ENABLE_INSTRUCTION_CACHE)
-
-#define CONFIG_SYS_HID2                HID2_HBE
-
 #define CONFIG_SYS_GPIO1_PRELIM
 #define CONFIG_SYS_GPIO1_DIR   0x00100000
 #define CONFIG_SYS_GPIO1_DAT   0x00100000

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 8473c369fe01261bbd3209303642fa212440642e..bde1af251be88905375f2367a2e6ef4cc375c1ac 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -2932,9 +2932,6 @@ CONFIG_SYS_GPSR2_VAL
 CONFIG_SYS_GPSR3_VAL
 CONFIG_SYS_HALT_BEFOR_RAM_JUMP
 CONFIG_SYS_HELP_CMD_WIDTH
-CONFIG_SYS_HID0_FINAL
-CONFIG_SYS_HID0_INIT
-CONFIG_SYS_HID2
 CONFIG_SYS_HIGH
 CONFIG_SYS_HMI_BASE
 CONFIG_SYS_HOSTNAME