Merge tag 'u-boot-at91-2022.04-a' of https://source.denx.de/u-boot/custodians/u-boot...

[platform/kernel/u-boot.git] / arch / powerpc / cpu / mpc8xx / Kconfig

diff --git a/arch/powerpc/cpu/mpc8xx/Kconfig b/arch/powerpc/cpu/mpc8xx/Kconfig
index 3e8ea38..091bbaf 100644 (file)
--- a/arch/powerpc/cpu/mpc8xx/Kconfig
+++ b/arch/powerpc/cpu/mpc8xx/Kconfig
@@ -19,16 +19,14 @@ choice
 
 config MPC866
        bool "MPC866"
+       select SYS_CACHE_SHIFT_4
 
 config MPC885
        bool "MPC885"
+       select SYS_CACHE_SHIFT_4
 
 endchoice
 
-#config MPC8xx_WATCHDOG
-#      bool "Watchdog"
-#      select HW_WATCHDOG
-
 config 8xx_GCLK_FREQ
        int "CPU GCLK Frequency"
 
@@ -86,91 +84,6 @@ config SYS_DER
        help
          Debug Event Register (37-47)
 
-comment "Memory mapping"
-
-config SYS_BR0_PRELIM
-       hex "Preliminary value for BR0"
-
-config SYS_OR0_PRELIM
-       hex "Preliminary value for OR0"
-
-config SYS_BR1_PRELIM_BOOL
-       bool "Define Bank 1"
-
-config SYS_BR1_PRELIM
-       hex "Preliminary value for BR1"
-       depends on SYS_BR1_PRELIM_BOOL
-
-config SYS_OR1_PRELIM
-       hex "Preliminary value for OR1"
-       depends on SYS_BR1_PRELIM_BOOL
-
-config SYS_BR2_PRELIM_BOOL
-       bool "Define Bank 2"
-
-config SYS_BR2_PRELIM
-       hex "Preliminary value for BR2"
-       depends on SYS_BR2_PRELIM_BOOL
-
-config SYS_OR2_PRELIM
-       hex "Preliminary value for OR2"
-       depends on SYS_BR2_PRELIM_BOOL
-
-config SYS_BR3_PRELIM_BOOL
-       bool "Define Bank 3"
-
-config SYS_BR3_PRELIM
-       hex "Preliminary value for BR3"
-       depends on SYS_BR3_PRELIM_BOOL
-
-config SYS_OR3_PRELIM
-       hex "Preliminary value for OR3"
-       depends on SYS_BR3_PRELIM_BOOL
-
-config SYS_BR4_PRELIM_BOOL
-       bool "Define Bank 4"
-
-config SYS_BR4_PRELIM
-       hex "Preliminary value for BR4"
-       depends on SYS_BR4_PRELIM_BOOL
-
-config SYS_OR4_PRELIM
-       hex "Preliminary value for OR4"
-       depends on SYS_BR4_PRELIM_BOOL
-
-config SYS_BR5_PRELIM_BOOL
-       bool "Define Bank 5"
-
-config SYS_BR5_PRELIM
-       hex "Preliminary value for BR5"
-       depends on SYS_BR5_PRELIM_BOOL
-
-config SYS_OR5_PRELIM
-       hex "Preliminary value for OR5"
-       depends on SYS_BR5_PRELIM_BOOL
-
-config SYS_BR6_PRELIM_BOOL
-       bool "Define Bank 6"
-
-config SYS_BR6_PRELIM
-       hex "Preliminary value for BR6"
-       depends on SYS_BR6_PRELIM_BOOL
-
-config SYS_OR6_PRELIM
-       hex "Preliminary value for OR6"
-       depends on SYS_BR6_PRELIM_BOOL
-
-config SYS_BR7_PRELIM_BOOL
-       bool "Define Bank 7"
-
-config SYS_BR7_PRELIM
-       hex "Preliminary value for BR7"
-       depends on SYS_BR7_PRELIM_BOOL
-
-config SYS_OR7_PRELIM
-       hex "Preliminary value for OR7"
-       depends on SYS_BR7_PRELIM_BOOL
-
 config SYS_IMMR
        hex "Value for IMMR"