Commit bc09f767 authored by Tom Rini's avatar Tom Rini Committed by Paul Mackerras

Allow the data cache to be turned off on MPC8260 systems.

Due to HW bugs on older systems the data-cache must be turned off on these
systems.  From Wolfgang Denk <wd@denx.de>.
parent 874a642a
...@@ -22,3 +22,6 @@ CONFIG_SCC1_ENET ...@@ -22,3 +22,6 @@ CONFIG_SCC1_ENET
CONFIG_SCC2_ENET CONFIG_SCC2_ENET
Use MPC8xx serial communications controller 2 to drive Ethernet. Use MPC8xx serial communications controller 2 to drive Ethernet.
CONFIG_DCACHE_DISABLE
This option allows you to run the kernel with data cache disabled.
Say Y if you experience CPM lock-ups.
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# MPC8260 Communication options # MPC8260 Communication options
# #
mainmenu_option next_comment mainmenu_option next_comment
comment 'MPC8260 Communication Options' comment 'MPC8260 CPM Options'
bool 'Enable SCC Console' CONFIG_SCC_CONSOLE bool 'Enable SCC Console' CONFIG_SCC_CONSOLE
if [ "$CONFIG_NET_ETHERNET" = "y" ]; then if [ "$CONFIG_NET_ETHERNET" = "y" ]; then
mainmenu_option next_comment mainmenu_option next_comment
...@@ -32,4 +32,7 @@ if [ "$CONFIG_NET_ETHERNET" = "y" ]; then ...@@ -32,4 +32,7 @@ if [ "$CONFIG_NET_ETHERNET" = "y" ]; then
fi fi
fi fi
fi fi
comment 'Generic MPC8260 Options'
bool 'Disable data cache' CONFIG_DCACHE_DISABLE
endmenu endmenu
...@@ -421,6 +421,7 @@ CONFIG_PARTITION_ADVANCED=y ...@@ -421,6 +421,7 @@ CONFIG_PARTITION_ADVANCED=y
CONFIG_SCC_ENET=y CONFIG_SCC_ENET=y
CONFIG_SCC1_ENET=y CONFIG_SCC1_ENET=y
# CONFIG_FEC_ENET is not set # CONFIG_FEC_ENET is not set
# CONFIG_DCACHE_DISABLE is not set
# #
# USB support # USB support
......
...@@ -1272,7 +1272,11 @@ _GLOBAL(__setup_cpu_generic) ...@@ -1272,7 +1272,11 @@ _GLOBAL(__setup_cpu_generic)
setup_common_caches: setup_common_caches:
mfspr r11,HID0 mfspr r11,HID0
andi. r0,r11,HID0_DCE andi. r0,r11,HID0_DCE
#ifdef CONFIG_DCACHE_DISABLE
ori r11,r11,HID0_ICE
#else
ori r11,r11,HID0_ICE|HID0_DCE ori r11,r11,HID0_ICE|HID0_DCE
#endif
ori r8,r11,HID0_ICFI ori r8,r11,HID0_ICFI
bne 1f /* don't invalidate the D-cache */ bne 1f /* don't invalidate the D-cache */
ori r8,r8,HID0_DCI /* unless it wasn't enabled */ ori r8,r8,HID0_DCI /* unless it wasn't enabled */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment