mpc83xx: Migrate LBLAW_* to Kconfig

The LBLAW_* values determine the window configuration of the memory
controller. Hence, they must be known at compile time, and cannot be
implemented in the DT mechanism.

Configuration of this crucial variable should still be somewhat
comfortable. Hence, make its fields configurable in Kconfig, and
assemble the final value from these.

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

diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig
index f7f625aea1f1876e22268e40d117be9d8b261849..8c84196b978f258797fcf6fbb4b5a1e5b2d7cec3 100644 (file)
--- a/arch/powerpc/cpu/mpc83xx/Kconfig
+++ b/arch/powerpc/cpu/mpc83xx/Kconfig
@@ -284,6 +284,7 @@ config ARCH_MPC837X
 
 source "arch/powerpc/cpu/mpc83xx/hrcw/Kconfig"
 source "arch/powerpc/cpu/mpc83xx/bats/Kconfig"
+source "arch/powerpc/cpu/mpc83xx/lblaw/Kconfig"
 
 menu "Legacy options"
 

diff --git a/arch/powerpc/cpu/mpc83xx/cpu_init.c b/arch/powerpc/cpu/mpc83xx/cpu_init.c
index 7c378671feb40a90baf1b0b6cb44afff93ca45bd..91451e7b304b924596c5d0e39e7a3f3cc9db6a93 100644 (file)
--- a/arch/powerpc/cpu/mpc83xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc83xx/cpu_init.c
@@ -12,6 +12,8 @@
 #include <usb/ehci-ci.h>
 #endif
 
+#include "lblaw/lblaw.h"
+
 DECLARE_GLOBAL_DATA_PTR;
 
 #ifdef CONFIG_QE

diff --git a/arch/powerpc/cpu/mpc83xx/lblaw/Kconfig b/arch/powerpc/cpu/mpc83xx/lblaw/Kconfig
new file mode 100644 (file)
index 0000000..b20f68b
--- /dev/null
+++ b/arch/powerpc/cpu/mpc83xx/lblaw/Kconfig
@@ -0,0 +1,519 @@
+menu "LBLAW setup"
+
+choice
+       prompt "NAND LAWBAR for NAND SPL"
+
+config NAND_LBLAWBAR_PRELIM_NONE
+       bool "None"
+
+config NAND_LBLAWBAR_PRELIM_0
+       bool "0"
+       depends on LBLAW0
+
+config NAND_LBLAWBAR_PRELIM_1
+       bool "1"
+       depends on LBLAW1
+
+config NAND_LBLAWBAR_PRELIM_2
+       bool "2"
+       depends on LBLAW2
+
+config NAND_LBLAWBAR_PRELIM_3
+       bool "3"
+       depends on LBLAW3
+
+endchoice
+
+menuconfig LBLAW0
+       bool "LBLAW0"
+
+if LBLAW0
+
+config LBLAW0_ENABLE
+       bool "Window enable"
+       default "y"
+
+if !LBLAW0_ENABLE
+
+config LBLAW0_BASE
+       hex
+       default 0x0
+
+endif
+
+if LBLAW0_ENABLE
+
+config LBLAW0_NAME
+       string "Identifier"
+
+config LBLAW0_BASE
+       hex "Window base"
+
+choice
+       prompt "Window size"
+
+config LBLAW0_LENGTH_4_KBYTES
+       bool "4 kb"
+
+config LBLAW0_LENGTH_8_KBYTES
+       bool "8 kb"
+
+config LBLAW0_LENGTH_16_KBYTES
+       bool "16 kb"
+
+config LBLAW0_LENGTH_32_KBYTES
+       bool "32 kb"
+
+config LBLAW0_LENGTH_64_KBYTES
+       bool "64 kb"
+
+config LBLAW0_LENGTH_128_KBYTES
+       bool "128 kb"
+
+config LBLAW0_LENGTH_256_KBYTES
+       bool "256 kb"
+
+config LBLAW0_LENGTH_512_KBYTES
+       bool "512 kb"
+
+config LBLAW0_LENGTH_1_MBYTES
+       bool "1 mb"
+
+config LBLAW0_LENGTH_2_MBYTES
+       bool "2 mb"
+
+config LBLAW0_LENGTH_4_MBYTES
+       bool "4 mb"
+
+config LBLAW0_LENGTH_8_MBYTES
+       bool "8 mb"
+
+config LBLAW0_LENGTH_16_MBYTES
+       bool "16 mb"
+
+config LBLAW0_LENGTH_32_MBYTES
+       bool "32 mb"
+
+config LBLAW0_LENGTH_64_MBYTES
+       bool "64 mb"
+
+config LBLAW0_LENGTH_128_MBYTES
+       bool "128 mb"
+
+config LBLAW0_LENGTH_256_MBYTES
+       bool "256 mb"
+
+config LBLAW0_LENGTH_512_MBYTES
+       bool "512 mb"
+
+config LBLAW0_LENGTH_1_GBYTES
+       bool "1 gb"
+
+config LBLAW0_LENGTH_2_GBYTES
+       bool "2 gb"
+
+endchoice
+
+endif # LBLAW0_ENABLE
+
+endif # LBLAW0
+
+config LBLAW0_ENABLE_BIT
+       hex
+       default 0x0 if !LBLAW0_ENABLE
+       default 0x80000000 if LBLAW0_ENABLE
+
+config LBLAW0_LENGTH
+       hex
+       default 0x0 if !LBLAW0_ENABLE
+       default 0x0000000B if LBLAW0_LENGTH_4_KBYTES
+       default 0x0000000C if LBLAW0_LENGTH_8_KBYTES
+       default 0x0000000D if LBLAW0_LENGTH_16_KBYTES
+       default 0x0000000E if LBLAW0_LENGTH_32_KBYTES
+       default 0x0000000F if LBLAW0_LENGTH_64_KBYTES
+       default 0x00000010 if LBLAW0_LENGTH_128_KBYTES
+       default 0x00000011 if LBLAW0_LENGTH_256_KBYTES
+       default 0x00000012 if LBLAW0_LENGTH_512_KBYTES
+       default 0x00000013 if LBLAW0_LENGTH_1_MBYTES
+       default 0x00000014 if LBLAW0_LENGTH_2_MBYTES
+       default 0x00000015 if LBLAW0_LENGTH_4_MBYTES
+       default 0x00000016 if LBLAW0_LENGTH_8_MBYTES
+       default 0x00000017 if LBLAW0_LENGTH_16_MBYTES
+       default 0x00000018 if LBLAW0_LENGTH_32_MBYTES
+       default 0x00000019 if LBLAW0_LENGTH_64_MBYTES
+       default 0x0000001A if LBLAW0_LENGTH_128_MBYTES
+       default 0x0000001B if LBLAW0_LENGTH_256_MBYTES
+       default 0x0000001C if LBLAW0_LENGTH_512_MBYTES
+       default 0x0000001D if LBLAW0_LENGTH_1_GBYTES
+       default 0x0000001E if LBLAW0_LENGTH_2_GBYTES
+
+menuconfig LBLAW1
+       bool "LBLAW1"
+
+if LBLAW1
+
+config LBLAW1_ENABLE
+       bool "Window enable"
+       default "y"
+
+if !LBLAW1_ENABLE
+
+config LBLAW1_BASE
+       hex
+       default 0x0
+
+endif
+
+if LBLAW1_ENABLE
+
+config LBLAW1_NAME
+       string "Identifier"
+
+config LBLAW1_BASE
+       hex "Window base"
+
+choice
+       prompt "Window size"
+
+config LBLAW1_LENGTH_4_KBYTES
+       bool "4 kb"
+
+config LBLAW1_LENGTH_8_KBYTES
+       bool "8 kb"
+
+config LBLAW1_LENGTH_16_KBYTES
+       bool "16 kb"
+
+config LBLAW1_LENGTH_32_KBYTES
+       bool "32 kb"
+
+config LBLAW1_LENGTH_64_KBYTES
+       bool "64 kb"
+
+config LBLAW1_LENGTH_128_KBYTES
+       bool "128 kb"
+
+config LBLAW1_LENGTH_256_KBYTES
+       bool "256 kb"
+
+config LBLAW1_LENGTH_512_KBYTES
+       bool "512 kb"
+
+config LBLAW1_LENGTH_1_MBYTES
+       bool "1 mb"
+
+config LBLAW1_LENGTH_2_MBYTES
+       bool "2 mb"
+
+config LBLAW1_LENGTH_4_MBYTES
+       bool "4 mb"
+
+config LBLAW1_LENGTH_8_MBYTES
+       bool "8 mb"
+
+config LBLAW1_LENGTH_16_MBYTES
+       bool "16 mb"
+
+config LBLAW1_LENGTH_32_MBYTES
+       bool "32 mb"
+
+config LBLAW1_LENGTH_64_MBYTES
+       bool "64 mb"
+
+config LBLAW1_LENGTH_128_MBYTES
+       bool "128 mb"
+
+config LBLAW1_LENGTH_256_MBYTES
+       bool "256 mb"
+
+config LBLAW1_LENGTH_512_MBYTES
+       bool "512 mb"
+
+config LBLAW1_LENGTH_1_GBYTES
+       bool "1 gb"
+
+config LBLAW1_LENGTH_2_GBYTES
+       bool "2 gb"
+
+endchoice
+
+endif # LBLAW1_ENABLE
+
+endif # LBLAW1
+
+config LBLAW1_ENABLE_BIT
+       hex
+       default 0x0 if !LBLAW1_ENABLE
+       default 0x80000000 if LBLAW1_ENABLE
+
+config LBLAW1_LENGTH
+       hex
+       default 0x0 if !LBLAW1_ENABLE
+       default 0x0000000B if LBLAW1_LENGTH_4_KBYTES
+       default 0x0000000C if LBLAW1_LENGTH_8_KBYTES
+       default 0x0000000D if LBLAW1_LENGTH_16_KBYTES
+       default 0x0000000E if LBLAW1_LENGTH_32_KBYTES
+       default 0x0000000F if LBLAW1_LENGTH_64_KBYTES
+       default 0x00000010 if LBLAW1_LENGTH_128_KBYTES
+       default 0x00000011 if LBLAW1_LENGTH_256_KBYTES
+       default 0x00000012 if LBLAW1_LENGTH_512_KBYTES
+       default 0x00000013 if LBLAW1_LENGTH_1_MBYTES
+       default 0x00000014 if LBLAW1_LENGTH_2_MBYTES
+       default 0x00000015 if LBLAW1_LENGTH_4_MBYTES
+       default 0x00000016 if LBLAW1_LENGTH_8_MBYTES
+       default 0x00000017 if LBLAW1_LENGTH_16_MBYTES
+       default 0x00000018 if LBLAW1_LENGTH_32_MBYTES
+       default 0x00000019 if LBLAW1_LENGTH_64_MBYTES
+       default 0x0000001A if LBLAW1_LENGTH_128_MBYTES
+       default 0x0000001B if LBLAW1_LENGTH_256_MBYTES
+       default 0x0000001C if LBLAW1_LENGTH_512_MBYTES
+       default 0x0000001D if LBLAW1_LENGTH_1_GBYTES
+       default 0x0000001E if LBLAW1_LENGTH_2_GBYTES
+
+menuconfig LBLAW2
+       bool "LBLAW2"
+
+if LBLAW2
+
+config LBLAW2_ENABLE
+       bool "Window enable"
+       default "y"
+
+if !LBLAW2_ENABLE
+
+config LBLAW2_BASE
+       hex
+       default 0x0
+
+endif
+
+if LBLAW2_ENABLE
+
+config LBLAW2_NAME
+       string "Identifier"
+
+config LBLAW2_BASE
+       hex "Window base"
+
+choice
+       prompt "Window size"
+
+config LBLAW2_LENGTH_4_KBYTES
+       bool "4 kb"
+
+config LBLAW2_LENGTH_8_KBYTES
+       bool "8 kb"
+
+config LBLAW2_LENGTH_16_KBYTES
+       bool "16 kb"
+
+config LBLAW2_LENGTH_32_KBYTES
+       bool "32 kb"
+
+config LBLAW2_LENGTH_64_KBYTES
+       bool "64 kb"
+
+config LBLAW2_LENGTH_128_KBYTES
+       bool "128 kb"
+
+config LBLAW2_LENGTH_256_KBYTES
+       bool "256 kb"
+
+config LBLAW2_LENGTH_512_KBYTES
+       bool "512 kb"
+
+config LBLAW2_LENGTH_1_MBYTES
+       bool "1 mb"
+
+config LBLAW2_LENGTH_2_MBYTES
+       bool "2 mb"
+
+config LBLAW2_LENGTH_4_MBYTES
+       bool "4 mb"
+
+config LBLAW2_LENGTH_8_MBYTES
+       bool "8 mb"
+
+config LBLAW2_LENGTH_16_MBYTES
+       bool "16 mb"
+
+config LBLAW2_LENGTH_32_MBYTES
+       bool "32 mb"
+
+config LBLAW2_LENGTH_64_MBYTES
+       bool "64 mb"
+
+config LBLAW2_LENGTH_128_MBYTES
+       bool "128 mb"
+
+config LBLAW2_LENGTH_256_MBYTES
+       bool "256 mb"
+
+config LBLAW2_LENGTH_512_MBYTES
+       bool "512 mb"
+
+config LBLAW2_LENGTH_1_GBYTES
+       bool "1 gb"
+
+config LBLAW2_LENGTH_2_GBYTES
+       bool "2 gb"
+
+endchoice
+
+endif # LBLAW2_ENABLE
+
+endif # LBLAW2
+
+config LBLAW2_ENABLE_BIT
+       hex
+       default 0x0 if !LBLAW2_ENABLE
+       default 0x80000000 if LBLAW2_ENABLE
+
+config LBLAW2_LENGTH
+       hex
+       default 0x0 if !LBLAW2_ENABLE
+       default 0x0000000B if LBLAW2_LENGTH_4_KBYTES
+       default 0x0000000C if LBLAW2_LENGTH_8_KBYTES
+       default 0x0000000D if LBLAW2_LENGTH_16_KBYTES
+       default 0x0000000E if LBLAW2_LENGTH_32_KBYTES
+       default 0x0000000F if LBLAW2_LENGTH_64_KBYTES
+       default 0x00000010 if LBLAW2_LENGTH_128_KBYTES
+       default 0x00000011 if LBLAW2_LENGTH_256_KBYTES
+       default 0x00000012 if LBLAW2_LENGTH_512_KBYTES
+       default 0x00000013 if LBLAW2_LENGTH_1_MBYTES
+       default 0x00000014 if LBLAW2_LENGTH_2_MBYTES
+       default 0x00000015 if LBLAW2_LENGTH_4_MBYTES
+       default 0x00000016 if LBLAW2_LENGTH_8_MBYTES
+       default 0x00000017 if LBLAW2_LENGTH_16_MBYTES
+       default 0x00000018 if LBLAW2_LENGTH_32_MBYTES
+       default 0x00000019 if LBLAW2_LENGTH_64_MBYTES
+       default 0x0000001A if LBLAW2_LENGTH_128_MBYTES
+       default 0x0000001B if LBLAW2_LENGTH_256_MBYTES
+       default 0x0000001C if LBLAW2_LENGTH_512_MBYTES
+       default 0x0000001D if LBLAW2_LENGTH_1_GBYTES
+       default 0x0000001E if LBLAW2_LENGTH_2_GBYTES
+
+menuconfig LBLAW3
+       bool "LBLAW3"
+
+if LBLAW3
+
+config LBLAW3_ENABLE
+       bool "Window enable"
+       default "y"
+
+if !LBLAW3_ENABLE
+
+config LBLAW3_BASE
+       hex
+       default 0x0
+
+endif
+
+if LBLAW3_ENABLE
+
+config LBLAW3_NAME
+       string "Identifier"
+
+config LBLAW3_BASE
+       hex "Window base"
+
+choice
+       prompt "Window size"
+
+config LBLAW3_LENGTH_4_KBYTES
+       bool "4 kb"
+
+config LBLAW3_LENGTH_8_KBYTES
+       bool "8 kb"
+
+config LBLAW3_LENGTH_16_KBYTES
+       bool "16 kb"
+
+config LBLAW3_LENGTH_32_KBYTES
+       bool "32 kb"
+
+config LBLAW3_LENGTH_64_KBYTES
+       bool "64 kb"
+
+config LBLAW3_LENGTH_128_KBYTES
+       bool "128 kb"
+
+config LBLAW3_LENGTH_256_KBYTES
+       bool "256 kb"
+
+config LBLAW3_LENGTH_512_KBYTES
+       bool "512 kb"
+
+config LBLAW3_LENGTH_1_MBYTES
+       bool "1 mb"
+
+config LBLAW3_LENGTH_2_MBYTES
+       bool "2 mb"
+
+config LBLAW3_LENGTH_4_MBYTES
+       bool "4 mb"
+
+config LBLAW3_LENGTH_8_MBYTES
+       bool "8 mb"
+
+config LBLAW3_LENGTH_16_MBYTES
+       bool "16 mb"
+
+config LBLAW3_LENGTH_32_MBYTES
+       bool "32 mb"
+
+config LBLAW3_LENGTH_64_MBYTES
+       bool "64 mb"
+
+config LBLAW3_LENGTH_128_MBYTES
+       bool "128 mb"
+
+config LBLAW3_LENGTH_256_MBYTES
+       bool "256 mb"
+
+config LBLAW3_LENGTH_512_MBYTES
+       bool "512 mb"
+
+config LBLAW3_LENGTH_1_GBYTES
+       bool "1 gb"
+
+config LBLAW3_LENGTH_2_GBYTES
+       bool "2 gb"
+
+endchoice
+
+endif # LBLAW3_ENABLE
+
+endif # LBLAW3
+
+config LBLAW3_ENABLE_BIT
+       hex
+       default 0x0 if !LBLAW3_ENABLE
+       default 0x80000000 if LBLAW3_ENABLE
+
+config LBLAW3_LENGTH
+       hex
+       default 0x0 if !LBLAW3_ENABLE
+       default 0x0000000B if LBLAW3_LENGTH_4_KBYTES
+       default 0x0000000C if LBLAW3_LENGTH_8_KBYTES
+       default 0x0000000D if LBLAW3_LENGTH_16_KBYTES
+       default 0x0000000E if LBLAW3_LENGTH_32_KBYTES
+       default 0x0000000F if LBLAW3_LENGTH_64_KBYTES
+       default 0x00000010 if LBLAW3_LENGTH_128_KBYTES
+       default 0x00000011 if LBLAW3_LENGTH_256_KBYTES
+       default 0x00000012 if LBLAW3_LENGTH_512_KBYTES
+       default 0x00000013 if LBLAW3_LENGTH_1_MBYTES
+       default 0x00000014 if LBLAW3_LENGTH_2_MBYTES
+       default 0x00000015 if LBLAW3_LENGTH_4_MBYTES
+       default 0x00000016 if LBLAW3_LENGTH_8_MBYTES
+       default 0x00000017 if LBLAW3_LENGTH_16_MBYTES
+       default 0x00000018 if LBLAW3_LENGTH_32_MBYTES
+       default 0x00000019 if LBLAW3_LENGTH_64_MBYTES
+       default 0x0000001A if LBLAW3_LENGTH_128_MBYTES
+       default 0x0000001B if LBLAW3_LENGTH_256_MBYTES
+       default 0x0000001C if LBLAW3_LENGTH_512_MBYTES
+       default 0x0000001D if LBLAW3_LENGTH_1_GBYTES
+       default 0x0000001E if LBLAW3_LENGTH_2_GBYTES
+
+endmenu

diff --git a/arch/powerpc/cpu/mpc83xx/lblaw/lblaw.h b/arch/powerpc/cpu/mpc83xx/lblaw/lblaw.h
new file mode 100644 (file)
index 0000000..6972afc
--- /dev/null
+++ b/arch/powerpc/cpu/mpc83xx/lblaw/lblaw.h
@@ -0,0 +1,55 @@
+#if defined(CONFIG_LBLAW0)
+#define CONFIG_SYS_LBLAWBAR0_PRELIM \
+       CONFIG_LBLAW0_BASE
+#define CONFIG_SYS_LBLAWAR0_PRELIM (\
+       CONFIG_LBLAW0_ENABLE_BIT |\
+       CONFIG_LBLAW0_LENGTH \
+)
+#endif
+
+#if defined(CONFIG_LBLAW1)
+#define CONFIG_SYS_LBLAWBAR1_PRELIM \
+       CONFIG_LBLAW1_BASE
+#define CONFIG_SYS_LBLAWAR1_PRELIM (\
+       CONFIG_LBLAW1_ENABLE_BIT |\
+       CONFIG_LBLAW1_LENGTH \
+)
+#endif
+
+#if defined(CONFIG_LBLAW2)
+#define CONFIG_SYS_LBLAWBAR2_PRELIM \
+       CONFIG_LBLAW2_BASE
+#define CONFIG_SYS_LBLAWAR2_PRELIM (\
+       CONFIG_LBLAW2_ENABLE_BIT |\
+       CONFIG_LBLAW2_LENGTH \
+)
+#endif
+
+#if defined(CONFIG_LBLAW3)
+#define CONFIG_SYS_LBLAWBAR3_PRELIM \
+       CONFIG_LBLAW3_BASE
+#define CONFIG_SYS_LBLAWAR3_PRELIM (\
+       CONFIG_LBLAW3_ENABLE_BIT |\
+       CONFIG_LBLAW3_LENGTH \
+)
+#endif
+
+#ifdef CONFIG_NAND_LBLAWBAR_PRELIM_0
+#define CONFIG_SYS_NAND_LBLAWBAR_PRELIM CONFIG_SYS_LBLAWBAR0_PRELIM
+#define CONFIG_SYS_NAND_LBLAWAR_PRELIM CONFIG_SYS_LBLAWAR0_PRELIM
+#endif
+
+#ifdef CONFIG_NAND_LBLAWBAR_PRELIM_1
+#define CONFIG_SYS_NAND_LBLAWBAR_PRELIM CONFIG_SYS_LBLAWBAR1_PRELIM
+#define CONFIG_SYS_NAND_LBLAWAR_PRELIM CONFIG_SYS_LBLAWAR1_PRELIM
+#endif
+
+#ifdef CONFIG_NAND_LBLAWBAR_PRELIM_2
+#define CONFIG_SYS_NAND_LBLAWBAR_PRELIM CONFIG_SYS_LBLAWBAR2_PRELIM
+#define CONFIG_SYS_NAND_LBLAWAR_PRELIM CONFIG_SYS_LBLAWAR2_PRELIM
+#endif
+
+#ifdef CONFIG_NAND_LBLAWBAR_PRELIM_3
+#define CONFIG_SYS_NAND_LBLAWBAR_PRELIM CONFIG_SYS_LBLAWBAR3_PRELIM
+#define CONFIG_SYS_NAND_LBLAWAR_PRELIM CONFIG_SYS_LBLAWAR3_PRELIM
+#endif

diff --git a/arch/powerpc/cpu/mpc83xx/spl_minimal.c b/arch/powerpc/cpu/mpc83xx/spl_minimal.c
index 2d6ba12e2d95d28a26083cd3e762bdcc5dd2c7ca..75eb65010ecc131dbf15d42476566a2e1f7de9b3 100644 (file)
--- a/arch/powerpc/cpu/mpc83xx/spl_minimal.c
+++ b/arch/powerpc/cpu/mpc83xx/spl_minimal.c
@@ -6,6 +6,8 @@
 #include <common.h>
 #include <mpc83xx.h>
 
+#include "lblaw/lblaw.h"
+
 DECLARE_GLOBAL_DATA_PTR;
 
 /*

diff --git a/configs/MPC8308RDB_defconfig b/configs/MPC8308RDB_defconfig
index 14136f6b673b9efd1a415b7aa90531af5894cf7b..38c5d8d532793f73c39c21ebcaf01f2fdc52b9cb 100644 (file)
--- a/configs/MPC8308RDB_defconfig
+++ b/configs/MPC8308RDB_defconfig
@@ -46,6 +46,18 @@ CONFIG_BAT3_BASE=0xE6000000
 CONFIG_BAT3_ACCESS_RW=y
 CONFIG_BAT3_USER_MODE_VALID=y
 CONFIG_BAT3_SUPERVISOR_MODE_VALID=y
+CONFIG_LBLAW0=y
+CONFIG_LBLAW0_BASE=0xFE000000
+CONFIG_LBLAW0_NAME="FLASH"
+CONFIG_LBLAW0_LENGTH_8_MBYTES=y
+CONFIG_LBLAW1=y
+CONFIG_LBLAW1_BASE=0xE0600000
+CONFIG_LBLAW1_NAME="NAND"
+CONFIG_LBLAW1_LENGTH_32_KBYTES=y
+CONFIG_LBLAW2=y
+CONFIG_LBLAW2_BASE=0xF0000000
+CONFIG_LBLAW2_NAME="VSC7385"
+CONFIG_LBLAW2_LENGTH_128_KBYTES=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 8e34ee2c2baefe83cd2de9f0bd1b7679c985f616..5783165e5d1da79e13048d6554565e90fa967082 100644 (file)
--- a/configs/MPC8313ERDB_33_defconfig
+++ b/configs/MPC8313ERDB_33_defconfig
@@ -57,6 +57,22 @@ CONFIG_BAT6_ICACHE_GUARDED=y
 CONFIG_BAT6_DCACHE_GUARDED=y
 CONFIG_BAT6_USER_MODE_VALID=y
 CONFIG_BAT6_SUPERVISOR_MODE_VALID=y
+CONFIG_LBLAW0=y
+CONFIG_LBLAW0_BASE=0xFE000000
+CONFIG_LBLAW0_NAME="FLASH"
+CONFIG_LBLAW0_LENGTH_16_MBYTES=y
+CONFIG_LBLAW1=y
+CONFIG_LBLAW1_BASE=0xE2800000
+CONFIG_LBLAW1_NAME="NAND"
+CONFIG_LBLAW1_LENGTH_32_KBYTES=y
+CONFIG_LBLAW2=y
+CONFIG_LBLAW2_BASE=0xF0000000
+CONFIG_LBLAW2_NAME="VSC7385"
+CONFIG_LBLAW2_LENGTH_128_KBYTES=y
+CONFIG_LBLAW3=y
+CONFIG_LBLAW3_BASE=0xFA000000
+CONFIG_LBLAW3_NAME="BCSR"
+CONFIG_LBLAW3_LENGTH_32_KBYTES=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 a2f7eb5837e6e9c33dd0aec65b4b2bd9431d4e09..2395b8e3978b910df7d2381dca9d1ac7acb3b67a 100644 (file)
--- a/configs/MPC8313ERDB_66_defconfig
+++ b/configs/MPC8313ERDB_66_defconfig
@@ -56,6 +56,22 @@ CONFIG_BAT6_ICACHE_GUARDED=y
 CONFIG_BAT6_DCACHE_GUARDED=y
 CONFIG_BAT6_USER_MODE_VALID=y
 CONFIG_BAT6_SUPERVISOR_MODE_VALID=y
+CONFIG_LBLAW0=y
+CONFIG_LBLAW0_BASE=0xFE000000
+CONFIG_LBLAW0_NAME="FLASH"
+CONFIG_LBLAW0_LENGTH_16_MBYTES=y
+CONFIG_LBLAW1=y
+CONFIG_LBLAW1_BASE=0xE2800000
+CONFIG_LBLAW1_NAME="NAND"
+CONFIG_LBLAW1_LENGTH_32_KBYTES=y
+CONFIG_LBLAW2=y
+CONFIG_LBLAW2_BASE=0xF0000000
+CONFIG_LBLAW2_NAME="VSC7385"
+CONFIG_LBLAW2_LENGTH_128_KBYTES=y
+CONFIG_LBLAW3=y
+CONFIG_LBLAW3_BASE=0xFA000000
+CONFIG_LBLAW3_NAME="BCSR"
+CONFIG_LBLAW3_LENGTH_32_KBYTES=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 9946bf965eaf6183e8310b441e1dd1f5a60ba3ab..ce97914934650710e7d11756258c2f7fe3f1bb6c 100644 (file)
--- a/configs/MPC8313ERDB_NAND_33_defconfig
+++ b/configs/MPC8313ERDB_NAND_33_defconfig
@@ -58,6 +58,23 @@ CONFIG_BAT6_ICACHE_GUARDED=y
 CONFIG_BAT6_DCACHE_GUARDED=y
 CONFIG_BAT6_USER_MODE_VALID=y
 CONFIG_BAT6_SUPERVISOR_MODE_VALID=y
+CONFIG_NAND_LBLAWBAR_PRELIM_1=y
+CONFIG_LBLAW0=y
+CONFIG_LBLAW0_BASE=0xFE000000
+CONFIG_LBLAW0_NAME="FLASH"
+CONFIG_LBLAW0_LENGTH_16_MBYTES=y
+CONFIG_LBLAW1=y
+CONFIG_LBLAW1_BASE=0xE2800000
+CONFIG_LBLAW1_NAME="NAND"
+CONFIG_LBLAW1_LENGTH_32_KBYTES=y
+CONFIG_LBLAW2=y
+CONFIG_LBLAW2_BASE=0xF0000000
+CONFIG_LBLAW2_NAME="VSC7385"
+CONFIG_LBLAW2_LENGTH_128_KBYTES=y
+CONFIG_LBLAW3=y
+CONFIG_LBLAW3_BASE=0xFA000000
+CONFIG_LBLAW3_NAME="BCSR"
+CONFIG_LBLAW3_LENGTH_32_KBYTES=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 ffa22bfb8361e8eac4e2d3ef1e9e3af506d4eaa9..92d33b07db26df6c462a0619e72e2388a0f0d83a 100644 (file)
--- a/configs/MPC8313ERDB_NAND_66_defconfig
+++ b/configs/MPC8313ERDB_NAND_66_defconfig
@@ -57,6 +57,23 @@ CONFIG_BAT6_ICACHE_GUARDED=y
 CONFIG_BAT6_DCACHE_GUARDED=y
 CONFIG_BAT6_USER_MODE_VALID=y
 CONFIG_BAT6_SUPERVISOR_MODE_VALID=y
+CONFIG_NAND_LBLAWBAR_PRELIM_1=y
+CONFIG_LBLAW0=y
+CONFIG_LBLAW0_BASE=0xFE000000
+CONFIG_LBLAW0_NAME="FLASH"
+CONFIG_LBLAW0_LENGTH_16_MBYTES=y
+CONFIG_LBLAW1=y
+CONFIG_LBLAW1_BASE=0xE2800000
+CONFIG_LBLAW1_NAME="NAND"
+CONFIG_LBLAW1_LENGTH_32_KBYTES=y
+CONFIG_LBLAW2=y
+CONFIG_LBLAW2_BASE=0xF0000000
+CONFIG_LBLAW2_NAME="VSC7385"
+CONFIG_LBLAW2_LENGTH_128_KBYTES=y
+CONFIG_LBLAW3=y
+CONFIG_LBLAW3_BASE=0xFA000000
+CONFIG_LBLAW3_NAME="BCSR"
+CONFIG_LBLAW3_LENGTH_32_KBYTES=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 43daee1f19f8b82585c44dca55bf42ce68c3bd45..b6e43b66aacf0d3ae3e5bd717a7c8c91152a126c 100644 (file)
--- a/configs/MPC8315ERDB_defconfig
+++ b/configs/MPC8315ERDB_defconfig
@@ -68,6 +68,14 @@ CONFIG_BAT5_DCACHE_INHIBITED=y
 CONFIG_BAT5_DCACHE_GUARDED=y
 CONFIG_BAT5_USER_MODE_VALID=y
 CONFIG_BAT5_SUPERVISOR_MODE_VALID=y
+CONFIG_LBLAW0=y
+CONFIG_LBLAW0_BASE=0xFE000000
+CONFIG_LBLAW0_NAME="FLASH"
+CONFIG_LBLAW0_LENGTH_8_MBYTES=y
+CONFIG_LBLAW1=y
+CONFIG_LBLAW1_BASE=0xE0600000
+CONFIG_LBLAW1_NAME="NAND"
+CONFIG_LBLAW1_LENGTH_32_KBYTES=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 9039652d4b6d8cbaf9ccd5d9b13ab433bbb7f505..7243cf67f964ddff62f731cf905956df9c5fed1b 100644 (file)
--- a/configs/MPC8323ERDB_defconfig
+++ b/configs/MPC8323ERDB_defconfig
@@ -66,6 +66,10 @@ CONFIG_BAT6_DCACHE_INHIBITED=y
 CONFIG_BAT6_DCACHE_GUARDED=y
 CONFIG_BAT6_USER_MODE_VALID=y
 CONFIG_BAT6_SUPERVISOR_MODE_VALID=y
+CONFIG_LBLAW0=y
+CONFIG_LBLAW0_BASE=0xFE000000
+CONFIG_LBLAW0_NAME="FLASH"
+CONFIG_LBLAW0_LENGTH_32_MBYTES=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 aefb01f150e3ba24fd03ccf37da55d64bb962dd8..8cbc14022b63c3f387a34b6bdf782085353a52a0 100644 (file)
--- a/configs/MPC832XEMDS_ATM_defconfig
+++ b/configs/MPC832XEMDS_ATM_defconfig
@@ -56,6 +56,18 @@ CONFIG_BAT5_BASE=0xE6000000
 CONFIG_BAT5_ACCESS_RW=y
 CONFIG_BAT5_USER_MODE_VALID=y
 CONFIG_BAT5_SUPERVISOR_MODE_VALID=y
+CONFIG_LBLAW0=y
+CONFIG_LBLAW0_BASE=0xFE000000
+CONFIG_LBLAW0_NAME="FLASH"
+CONFIG_LBLAW0_LENGTH_32_MBYTES=y
+CONFIG_LBLAW1=y
+CONFIG_LBLAW1_BASE=0xF8000000
+CONFIG_LBLAW1_NAME="BCSR"
+CONFIG_LBLAW1_LENGTH_32_KBYTES=y
+CONFIG_LBLAW3=y
+CONFIG_LBLAW3_BASE=0xF8008000
+CONFIG_LBLAW3_NAME="PIB"
+CONFIG_LBLAW3_LENGTH_64_KBYTES=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 f410f8dac00a596e6c0a031b61ac0222eebe1778..487d1d85442e715d298ddf6ac7fc4a018082ec78 100644 (file)
--- a/configs/MPC832XEMDS_HOST_33_defconfig
+++ b/configs/MPC832XEMDS_HOST_33_defconfig
@@ -76,6 +76,18 @@ CONFIG_BAT7_DCACHE_INHIBITED=y
 CONFIG_BAT7_DCACHE_GUARDED=y
 CONFIG_BAT7_USER_MODE_VALID=y
 CONFIG_BAT7_SUPERVISOR_MODE_VALID=y
+CONFIG_LBLAW0=y
+CONFIG_LBLAW0_BASE=0xFE000000
+CONFIG_LBLAW0_NAME="FLASH"
+CONFIG_LBLAW0_LENGTH_32_MBYTES=y
+CONFIG_LBLAW1=y
+CONFIG_LBLAW1_BASE=0xF8000000
+CONFIG_LBLAW1_NAME="BCSR"
+CONFIG_LBLAW1_LENGTH_32_KBYTES=y
+CONFIG_LBLAW3=y
+CONFIG_LBLAW3_BASE=0xF8008000
+CONFIG_LBLAW3_NAME="PIB"
+CONFIG_LBLAW3_LENGTH_64_KBYTES=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 dac8f28a4d349a5cbdc7d522e4772d07fc929589..10ea03422c7367d3598de4d10c5974cdd190f2c5 100644 (file)
--- a/configs/MPC832XEMDS_HOST_66_defconfig
+++ b/configs/MPC832XEMDS_HOST_66_defconfig
@@ -76,6 +76,18 @@ CONFIG_BAT7_DCACHE_INHIBITED=y
 CONFIG_BAT7_DCACHE_GUARDED=y
 CONFIG_BAT7_USER_MODE_VALID=y
 CONFIG_BAT7_SUPERVISOR_MODE_VALID=y
+CONFIG_LBLAW0=y
+CONFIG_LBLAW0_BASE=0xFE000000
+CONFIG_LBLAW0_NAME="FLASH"
+CONFIG_LBLAW0_LENGTH_32_MBYTES=y
+CONFIG_LBLAW1=y
+CONFIG_LBLAW1_BASE=0xF8000000
+CONFIG_LBLAW1_NAME="BCSR"
+CONFIG_LBLAW1_LENGTH_32_KBYTES=y
+CONFIG_LBLAW3=y
+CONFIG_LBLAW3_BASE=0xF8008000
+CONFIG_LBLAW3_NAME="PIB"
+CONFIG_LBLAW3_LENGTH_64_KBYTES=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 c1cb69ad9346e012b3f62ad1b5ff723e9f9a99ef..b1afa2fa47426f59049dddcd42dbf48a06c6873f 100644 (file)
--- a/configs/MPC832XEMDS_SLAVE_defconfig
+++ b/configs/MPC832XEMDS_SLAVE_defconfig
@@ -73,6 +73,18 @@ CONFIG_BAT7_DCACHE_INHIBITED=y
 CONFIG_BAT7_DCACHE_GUARDED=y
 CONFIG_BAT7_USER_MODE_VALID=y
 CONFIG_BAT7_SUPERVISOR_MODE_VALID=y
+CONFIG_LBLAW0=y
+CONFIG_LBLAW0_BASE=0xFE000000
+CONFIG_LBLAW0_NAME="FLASH"
+CONFIG_LBLAW0_LENGTH_32_MBYTES=y
+CONFIG_LBLAW1=y
+CONFIG_LBLAW1_BASE=0xF8000000
+CONFIG_LBLAW1_NAME="BCSR"
+CONFIG_LBLAW1_LENGTH_32_KBYTES=y
+CONFIG_LBLAW3=y
+CONFIG_LBLAW3_BASE=0xF8008000
+CONFIG_LBLAW3_NAME="PIB"
+CONFIG_LBLAW3_LENGTH_64_KBYTES=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 38e0b7f6deb456337820f8a25b06cdb59394ff30..a9bb8a77139ba6f90bb217d38ff282f141be0a16 100644 (file)
--- a/configs/MPC832XEMDS_defconfig
+++ b/configs/MPC832XEMDS_defconfig
@@ -56,6 +56,18 @@ CONFIG_BAT5_BASE=0xE6000000
 CONFIG_BAT5_ACCESS_RW=y
 CONFIG_BAT5_USER_MODE_VALID=y
 CONFIG_BAT5_SUPERVISOR_MODE_VALID=y
+CONFIG_LBLAW0=y
+CONFIG_LBLAW0_BASE=0xFE000000
+CONFIG_LBLAW0_NAME="FLASH"
+CONFIG_LBLAW0_LENGTH_32_MBYTES=y
+CONFIG_LBLAW1=y
+CONFIG_LBLAW1_BASE=0xF8000000
+CONFIG_LBLAW1_NAME="BCSR"
+CONFIG_LBLAW1_LENGTH_32_KBYTES=y
+CONFIG_LBLAW3=y
+CONFIG_LBLAW3_BASE=0xF8008000
+CONFIG_LBLAW3_NAME="PIB"
+CONFIG_LBLAW3_LENGTH_64_KBYTES=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 6daab44b62008ae88eeb2a9bf72312625f117af7..28779bbeb74244f37bf13a02fb1cb4097c6bac9e 100644 (file)
--- a/configs/MPC8349EMDS_PCI64_defconfig
+++ b/configs/MPC8349EMDS_PCI64_defconfig
@@ -45,6 +45,14 @@ CONFIG_BAT6_DCACHE_MEMORYCOHERENCE=y
 CONFIG_BAT6_DCACHE_GUARDED=y
 CONFIG_BAT6_USER_MODE_VALID=y
 CONFIG_BAT6_SUPERVISOR_MODE_VALID=y
+CONFIG_LBLAW0=y
+CONFIG_LBLAW0_BASE=0xFE000000
+CONFIG_LBLAW0_NAME="FLASH"
+CONFIG_LBLAW0_LENGTH_32_MBYTES=y
+CONFIG_LBLAW1=y
+CONFIG_LBLAW1_BASE=0xE2400000
+CONFIG_LBLAW1_NAME="BCSR"
+CONFIG_LBLAW1_LENGTH_32_KBYTES=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 d3f42f99e02503d5b0c185697e4fe39ee1af3126..a157066968d9000864754b2fc0a6ebde03d532f8 100644 (file)
--- a/configs/MPC8349EMDS_SDRAM_defconfig
+++ b/configs/MPC8349EMDS_SDRAM_defconfig
@@ -45,6 +45,18 @@ CONFIG_BAT6_DCACHE_MEMORYCOHERENCE=y
 CONFIG_BAT6_DCACHE_GUARDED=y
 CONFIG_BAT6_USER_MODE_VALID=y
 CONFIG_BAT6_SUPERVISOR_MODE_VALID=y
+CONFIG_LBLAW0=y
+CONFIG_LBLAW0_BASE=0xFE000000
+CONFIG_LBLAW0_NAME="FLASH"
+CONFIG_LBLAW0_LENGTH_32_MBYTES=y
+CONFIG_LBLAW1=y
+CONFIG_LBLAW1_BASE=0xE2400000
+CONFIG_LBLAW1_NAME="BCSR"
+CONFIG_LBLAW1_LENGTH_32_KBYTES=y
+CONFIG_LBLAW2=y
+CONFIG_LBLAW2_BASE=0xF0000000
+CONFIG_LBLAW2_NAME="SDRAM"
+CONFIG_LBLAW2_LENGTH_64_MBYTES=y
 CONFIG_PCI_ONE_PCI1=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y

diff --git a/configs/MPC8349EMDS_SLAVE_defconfig b/configs/MPC8349EMDS_SLAVE_defconfig
index c264f7b53d613cf74ac432ef46a8cf6fd6a4017d..588d9420f16a8b274d48c467f1f8ca31ebe452c2 100644 (file)
--- a/configs/MPC8349EMDS_SLAVE_defconfig
+++ b/configs/MPC8349EMDS_SLAVE_defconfig
@@ -43,6 +43,14 @@ CONFIG_BAT6_DCACHE_MEMORYCOHERENCE=y
 CONFIG_BAT6_DCACHE_GUARDED=y
 CONFIG_BAT6_USER_MODE_VALID=y
 CONFIG_BAT6_SUPERVISOR_MODE_VALID=y
+CONFIG_LBLAW0=y
+CONFIG_LBLAW0_BASE=0xFE000000
+CONFIG_LBLAW0_NAME="FLASH"
+CONFIG_LBLAW0_LENGTH_32_MBYTES=y
+CONFIG_LBLAW1=y
+CONFIG_LBLAW1_BASE=0xE2400000
+CONFIG_LBLAW1_NAME="BCSR"
+CONFIG_LBLAW1_LENGTH_32_KBYTES=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 4018d81825669dee9aaf6085838884217821e940..a38edb52939e9ab92d96bca1a0c29e32f611e498 100644 (file)
--- a/configs/MPC8349EMDS_defconfig
+++ b/configs/MPC8349EMDS_defconfig
@@ -45,6 +45,14 @@ CONFIG_BAT6_DCACHE_MEMORYCOHERENCE=y
 CONFIG_BAT6_DCACHE_GUARDED=y
 CONFIG_BAT6_USER_MODE_VALID=y
 CONFIG_BAT6_SUPERVISOR_MODE_VALID=y
+CONFIG_LBLAW0=y
+CONFIG_LBLAW0_BASE=0xFE000000
+CONFIG_LBLAW0_NAME="FLASH"
+CONFIG_LBLAW0_LENGTH_32_MBYTES=y
+CONFIG_LBLAW1=y
+CONFIG_LBLAW1_BASE=0xE2400000
+CONFIG_LBLAW1_NAME="BCSR"
+CONFIG_LBLAW1_LENGTH_32_KBYTES=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 0434118419f3d6beb8f6911449be234b62ba8d2b..844b8973295dd1bbc878d3c27a8c9336e577e839 100644 (file)
--- a/configs/MPC8349ITXGP_defconfig
+++ b/configs/MPC8349ITXGP_defconfig
@@ -85,6 +85,18 @@ CONFIG_BAT6_DCACHE_MEMORYCOHERENCE=y
 CONFIG_BAT6_DCACHE_GUARDED=y
 CONFIG_BAT6_USER_MODE_VALID=y
 CONFIG_BAT6_SUPERVISOR_MODE_VALID=y
+CONFIG_LBLAW0=y
+CONFIG_LBLAW0_BASE=0xFE000000
+CONFIG_LBLAW0_NAME="FLASH"
+CONFIG_LBLAW0_LENGTH_16_MBYTES=y
+CONFIG_LBLAW1=y
+CONFIG_LBLAW1_BASE=0xF8000000
+CONFIG_LBLAW1_NAME="VSC7385"
+CONFIG_LBLAW1_LENGTH_128_KBYTES=y
+CONFIG_LBLAW3=y
+CONFIG_LBLAW3_BASE=0xF0000000
+CONFIG_LBLAW3_NAME="CF"
+CONFIG_LBLAW3_LENGTH_64_KBYTES=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 de97bb15b2b4368d7f5982c0e082300c2af227a8..91ed6686f816156715676d32533e51043e01bf8f 100644 (file)
--- a/configs/MPC8349ITX_LOWBOOT_defconfig
+++ b/configs/MPC8349ITX_LOWBOOT_defconfig
@@ -85,6 +85,18 @@ CONFIG_BAT6_DCACHE_MEMORYCOHERENCE=y
 CONFIG_BAT6_DCACHE_GUARDED=y
 CONFIG_BAT6_USER_MODE_VALID=y
 CONFIG_BAT6_SUPERVISOR_MODE_VALID=y
+CONFIG_LBLAW0=y
+CONFIG_LBLAW0_BASE=0xFE000000
+CONFIG_LBLAW0_NAME="FLASH"
+CONFIG_LBLAW0_LENGTH_16_MBYTES=y
+CONFIG_LBLAW1=y
+CONFIG_LBLAW1_BASE=0xF8000000
+CONFIG_LBLAW1_NAME="VSC7385"
+CONFIG_LBLAW1_LENGTH_128_KBYTES=y
+CONFIG_LBLAW3=y
+CONFIG_LBLAW3_BASE=0xF0000000
+CONFIG_LBLAW3_NAME="CF"
+CONFIG_LBLAW3_LENGTH_64_KBYTES=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 b1e687ceab100b62939b5ac73986f4a8173631ed..cfa31c723077dd9a7097c660be4ac026a01fc833 100644 (file)
--- a/configs/MPC8349ITX_defconfig
+++ b/configs/MPC8349ITX_defconfig
@@ -84,6 +84,18 @@ CONFIG_BAT6_DCACHE_MEMORYCOHERENCE=y
 CONFIG_BAT6_DCACHE_GUARDED=y
 CONFIG_BAT6_USER_MODE_VALID=y
 CONFIG_BAT6_SUPERVISOR_MODE_VALID=y
+CONFIG_LBLAW0=y
+CONFIG_LBLAW0_BASE=0xFE000000
+CONFIG_LBLAW0_NAME="FLASH"
+CONFIG_LBLAW0_LENGTH_16_MBYTES=y
+CONFIG_LBLAW1=y
+CONFIG_LBLAW1_BASE=0xF8000000
+CONFIG_LBLAW1_NAME="VSC7385"
+CONFIG_LBLAW1_LENGTH_128_KBYTES=y
+CONFIG_LBLAW3=y
+CONFIG_LBLAW3_BASE=0xF0000000
+CONFIG_LBLAW3_NAME="CF"
+CONFIG_LBLAW3_LENGTH_64_KBYTES=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 86b9f6071a070d8b5b9479e502fd2a75d331a3f1..4cc36a5c7fb4f1eec9a452dcb5034f0705b14bac 100644 (file)
--- a/configs/MPC837XEMDS_HOST_defconfig
+++ b/configs/MPC837XEMDS_HOST_defconfig
@@ -89,6 +89,18 @@ CONFIG_BAT7_DCACHE_INHIBITED=y
 CONFIG_BAT7_DCACHE_GUARDED=y
 CONFIG_BAT7_USER_MODE_VALID=y
 CONFIG_BAT7_SUPERVISOR_MODE_VALID=y
+CONFIG_LBLAW0=y
+CONFIG_LBLAW0_BASE=0xFE000000
+CONFIG_LBLAW0_NAME="FLASH"
+CONFIG_LBLAW0_LENGTH_32_MBYTES=y
+CONFIG_LBLAW1=y
+CONFIG_LBLAW1_BASE=0xF8000000
+CONFIG_LBLAW1_NAME="BCSR"
+CONFIG_LBLAW1_LENGTH_32_KBYTES=y
+CONFIG_LBLAW3=y
+CONFIG_LBLAW3_BASE=0xE0600000
+CONFIG_LBLAW3_NAME="NAND"
+CONFIG_LBLAW3_LENGTH_32_KBYTES=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 44c23eade50a566d2fbbf17964ab1a3d659b74ff..ba58e49ba242532021fd618af7d948211cf42790 100644 (file)
--- a/configs/MPC837XEMDS_SLAVE_defconfig
+++ b/configs/MPC837XEMDS_SLAVE_defconfig
@@ -49,6 +49,18 @@ CONFIG_BAT3_DCACHE_INHIBITED=y
 CONFIG_BAT3_DCACHE_GUARDED=y
 CONFIG_BAT3_USER_MODE_VALID=y
 CONFIG_BAT3_SUPERVISOR_MODE_VALID=y
+CONFIG_LBLAW0=y
+CONFIG_LBLAW0_BASE=0xFE000000
+CONFIG_LBLAW0_NAME="FLASH"
+CONFIG_LBLAW0_LENGTH_32_MBYTES=y
+CONFIG_LBLAW1=y
+CONFIG_LBLAW1_BASE=0xF8000000
+CONFIG_LBLAW1_NAME="BCSR"
+CONFIG_LBLAW1_LENGTH_32_KBYTES=y
+CONFIG_LBLAW3=y
+CONFIG_LBLAW3_BASE=0xE0600000
+CONFIG_LBLAW3_NAME="NAND"
+CONFIG_LBLAW3_LENGTH_32_KBYTES=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 f21cdbd179371cdbfd6b76fd46173607fff83127..b3c1c87824a2ced5120fdbb069c35a1179b2c012 100644 (file)
--- a/configs/MPC837XEMDS_defconfig
+++ b/configs/MPC837XEMDS_defconfig
@@ -69,6 +69,18 @@ CONFIG_BAT5_BASE=0xE6000000
 CONFIG_BAT5_ACCESS_RW=y
 CONFIG_BAT5_USER_MODE_VALID=y
 CONFIG_BAT5_SUPERVISOR_MODE_VALID=y
+CONFIG_LBLAW0=y
+CONFIG_LBLAW0_BASE=0xFE000000
+CONFIG_LBLAW0_NAME="FLASH"
+CONFIG_LBLAW0_LENGTH_32_MBYTES=y
+CONFIG_LBLAW1=y
+CONFIG_LBLAW1_BASE=0xF8000000
+CONFIG_LBLAW1_NAME="BCSR"
+CONFIG_LBLAW1_LENGTH_32_KBYTES=y
+CONFIG_LBLAW3=y
+CONFIG_LBLAW3_BASE=0xE0600000
+CONFIG_LBLAW3_NAME="NAND"
+CONFIG_LBLAW3_LENGTH_32_KBYTES=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 d1455b0e9ddb457618df63f75d80cb16fa6f557b..07016936d626b666d69ed73241e0f6dbcb949a3d 100644 (file)
--- a/configs/MPC837XERDB_SLAVE_defconfig
+++ b/configs/MPC837XERDB_SLAVE_defconfig
@@ -49,6 +49,18 @@ CONFIG_BAT3_DCACHE_INHIBITED=y
 CONFIG_BAT3_DCACHE_GUARDED=y
 CONFIG_BAT3_USER_MODE_VALID=y
 CONFIG_BAT3_SUPERVISOR_MODE_VALID=y
+CONFIG_LBLAW0=y
+CONFIG_LBLAW0_BASE=0xFE000000
+CONFIG_LBLAW0_NAME="FLASH"
+CONFIG_LBLAW0_LENGTH_8_MBYTES=y
+CONFIG_LBLAW1=y
+CONFIG_LBLAW1_BASE=0xE0600000
+CONFIG_LBLAW1_NAME="NAND"
+CONFIG_LBLAW1_LENGTH_32_KBYTES=y
+CONFIG_LBLAW2=y
+CONFIG_LBLAW2_BASE=0xF0000000
+CONFIG_LBLAW2_NAME="VSC7385"
+CONFIG_LBLAW2_LENGTH_128_KBYTES=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 e6138c06fc34b7ec431750ce0beaf4015f916561..59d591fa05bcb8375b1813f3b2d5777f22c6fa12 100644 (file)
--- a/configs/MPC837XERDB_defconfig
+++ b/configs/MPC837XERDB_defconfig
@@ -89,6 +89,18 @@ CONFIG_BAT7_DCACHE_INHIBITED=y
 CONFIG_BAT7_DCACHE_GUARDED=y
 CONFIG_BAT7_USER_MODE_VALID=y
 CONFIG_BAT7_SUPERVISOR_MODE_VALID=y
+CONFIG_LBLAW0=y
+CONFIG_LBLAW0_BASE=0xFE000000
+CONFIG_LBLAW0_NAME="FLASH"
+CONFIG_LBLAW0_LENGTH_8_MBYTES=y
+CONFIG_LBLAW1=y
+CONFIG_LBLAW1_BASE=0xE0600000
+CONFIG_LBLAW1_NAME="NAND"
+CONFIG_LBLAW1_LENGTH_32_KBYTES=y
+CONFIG_LBLAW2=y
+CONFIG_LBLAW2_BASE=0xF0000000
+CONFIG_LBLAW2_NAME="VSC7385"
+CONFIG_LBLAW2_LENGTH_128_KBYTES=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 677f0513a359423967146cf8c10c392d7d3b9281..fdaded2970456503cef5ba57ec0a0f33e56f87ae 100644 (file)
--- a/configs/TQM834x_defconfig
+++ b/configs/TQM834x_defconfig
@@ -92,6 +92,16 @@ CONFIG_BAT7_DCACHE_INHIBITED=y
 CONFIG_BAT7_DCACHE_GUARDED=y
 CONFIG_BAT7_USER_MODE_VALID=y
 CONFIG_BAT7_SUPERVISOR_MODE_VALID=y
+CONFIG_LBLAW0=y
+CONFIG_LBLAW0_BASE=0x80000000
+CONFIG_LBLAW0_NAME="FLASH"
+CONFIG_LBLAW0_LENGTH_1_GBYTES=y
+CONFIG_LBLAW1=y
+# CONFIG_LBLAW1_ENABLE is not set
+CONFIG_LBLAW2=y
+# CONFIG_LBLAW2_ENABLE is not set
+CONFIG_LBLAW3=y
+# CONFIG_LBLAW3_ENABLE is not set
 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 2665e72573091a643904a611acea621bfb3c9990..12721f8db421e7041d36b3c6a9e777079b5b1c62 100644 (file)
--- a/configs/caddy2_defconfig
+++ b/configs/caddy2_defconfig
@@ -63,6 +63,14 @@ CONFIG_BAT6_ICACHE_MEMORYCOHERENCE=y
 CONFIG_BAT6_DCACHE_MEMORYCOHERENCE=y
 CONFIG_BAT6_USER_MODE_VALID=y
 CONFIG_BAT6_SUPERVISOR_MODE_VALID=y
+CONFIG_LBLAW0=y
+CONFIG_LBLAW0_BASE=0xFFC00000
+CONFIG_LBLAW0_NAME="FLASH"
+CONFIG_LBLAW0_LENGTH_4_MBYTES=y
+CONFIG_LBLAW1=y
+CONFIG_LBLAW1_BASE=0xF0000000
+CONFIG_LBLAW1_NAME="WINDOW1"
+CONFIG_LBLAW1_LENGTH_256_KBYTES=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 deed831c11a58b3ad2943dcf9992dfed0ca061af..f1aa24683c0607d462965af3cc7170770ac78c3a 100644 (file)
--- a/configs/hrcon_defconfig
+++ b/configs/hrcon_defconfig
@@ -46,6 +46,14 @@ CONFIG_BAT3_BASE=0xE6000000
 CONFIG_BAT3_ACCESS_RW=y
 CONFIG_BAT3_USER_MODE_VALID=y
 CONFIG_BAT3_SUPERVISOR_MODE_VALID=y
+CONFIG_LBLAW0=y
+CONFIG_LBLAW0_BASE=0xFE000000
+CONFIG_LBLAW0_NAME="FLASH"
+CONFIG_LBLAW0_LENGTH_8_MBYTES=y
+CONFIG_LBLAW1=y
+CONFIG_LBLAW1_BASE=0xE0600000
+CONFIG_LBLAW1_NAME="FPGA0"
+CONFIG_LBLAW1_LENGTH_1_MBYTES=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 c1135434724a2a7d10a367cce124c2f4087f48dc..22689ef0acab698c6ea4152c9d82a01a5411a6bc 100644 (file)
--- a/configs/hrcon_dh_defconfig
+++ b/configs/hrcon_dh_defconfig
@@ -46,6 +46,14 @@ CONFIG_BAT3_BASE=0xE6000000
 CONFIG_BAT3_ACCESS_RW=y
 CONFIG_BAT3_USER_MODE_VALID=y
 CONFIG_BAT3_SUPERVISOR_MODE_VALID=y
+CONFIG_LBLAW0=y
+CONFIG_LBLAW0_BASE=0xFE000000
+CONFIG_LBLAW0_NAME="FLASH"
+CONFIG_LBLAW0_LENGTH_8_MBYTES=y
+CONFIG_LBLAW1=y
+CONFIG_LBLAW1_BASE=0xE0600000
+CONFIG_LBLAW1_NAME="FPGA0"
+CONFIG_LBLAW1_LENGTH_1_MBYTES=y
 CONFIG_CMD_IOLOOP=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y

diff --git a/configs/ids8313_defconfig b/configs/ids8313_defconfig
index 4afed470331de0280cbd392b92c84b8c9f824ae7..168564606c0f307689e41fb2a34ce1ceb4f34e93 100644 (file)
--- a/configs/ids8313_defconfig
+++ b/configs/ids8313_defconfig
@@ -53,6 +53,23 @@ CONFIG_BAT6_ICACHE_GUARDED=y
 CONFIG_BAT6_DCACHE_GUARDED=y
 CONFIG_BAT6_USER_MODE_VALID=y
 CONFIG_BAT6_SUPERVISOR_MODE_VALID=y
+CONFIG_NAND_LBLAWBAR_PRELIM_1=y
+CONFIG_LBLAW0=y
+CONFIG_LBLAW0_BASE=0xFF800000
+CONFIG_LBLAW0_NAME="FLASH"
+CONFIG_LBLAW0_LENGTH_8_MBYTES=y
+CONFIG_LBLAW1=y
+CONFIG_LBLAW1_BASE=0xE1000000
+CONFIG_LBLAW1_NAME="NAND"
+CONFIG_LBLAW1_LENGTH_32_KBYTES=y
+CONFIG_LBLAW2=y
+CONFIG_LBLAW2_BASE=0xE2000000
+CONFIG_LBLAW2_NAME="MRAM"
+CONFIG_LBLAW2_LENGTH_128_KBYTES=y
+CONFIG_LBLAW3=y
+CONFIG_LBLAW3_BASE=0xE3000000
+CONFIG_LBLAW3_NAME="CPLD"
+CONFIG_LBLAW3_LENGTH_32_KBYTES=y
 CONFIG_FIT=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_IMAGE_FORMAT_LEGACY=y

diff --git a/configs/kmcoge5ne_defconfig b/configs/kmcoge5ne_defconfig
index a358e28886c3233c3578453a1f74d000d590a660..088dee63ba02b2c6f50e4f651966cf102a9d51a8 100644 (file)
--- a/configs/kmcoge5ne_defconfig
+++ b/configs/kmcoge5ne_defconfig
@@ -92,6 +92,18 @@ CONFIG_BAT7_DCACHE_INHIBITED=y
 CONFIG_BAT7_DCACHE_GUARDED=y
 CONFIG_BAT7_USER_MODE_VALID=y
 CONFIG_BAT7_SUPERVISOR_MODE_VALID=y
+CONFIG_LBLAW0=y
+CONFIG_LBLAW0_BASE=0xF0000000
+CONFIG_LBLAW0_NAME="FLASH"
+CONFIG_LBLAW0_LENGTH_256_MBYTES=y
+CONFIG_LBLAW1=y
+CONFIG_LBLAW1_BASE=0xE8000000
+CONFIG_LBLAW1_NAME="KMBEC_FPGA"
+CONFIG_LBLAW1_LENGTH_128_MBYTES=y
+CONFIG_LBLAW3=y
+CONFIG_LBLAW3_BASE=0xA0000000
+CONFIG_LBLAW3_NAME="PAXE"
+CONFIG_LBLAW3_LENGTH_512_MBYTES=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 10f7fdf1109dcf89d4021b59bc63d309b4b0ad2d..64ea83fd128d0e4583e5ab66af284d89484a2573 100644 (file)
--- a/configs/kmeter1_defconfig
+++ b/configs/kmeter1_defconfig
@@ -65,6 +65,18 @@ CONFIG_BAT5_DCACHE_INHIBITED=y
 CONFIG_BAT5_DCACHE_GUARDED=y
 CONFIG_BAT5_USER_MODE_VALID=y
 CONFIG_BAT5_SUPERVISOR_MODE_VALID=y
+CONFIG_LBLAW0=y
+CONFIG_LBLAW0_BASE=0xF0000000
+CONFIG_LBLAW0_NAME="FLASH"
+CONFIG_LBLAW0_LENGTH_256_MBYTES=y
+CONFIG_LBLAW1=y
+CONFIG_LBLAW1_BASE=0xE8000000
+CONFIG_LBLAW1_NAME="KMBEC_FPGA"
+CONFIG_LBLAW1_LENGTH_128_MBYTES=y
+CONFIG_LBLAW3=y
+CONFIG_LBLAW3_BASE=0xA0000000
+CONFIG_LBLAW3_NAME="PAXE"
+CONFIG_LBLAW3_LENGTH_512_MBYTES=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 b32b39113fa9c887e5211d3339c2d3a6fa9d1dc0..3a88b6a0276c9b0cfdf24e1893a7d8ee2181d1bb 100644 (file)
--- a/configs/kmopti2_defconfig
+++ b/configs/kmopti2_defconfig
@@ -76,6 +76,22 @@ CONFIG_BAT6_DCACHE_INHIBITED=y
 CONFIG_BAT6_DCACHE_GUARDED=y
 CONFIG_BAT6_USER_MODE_VALID=y
 CONFIG_BAT6_SUPERVISOR_MODE_VALID=y
+CONFIG_LBLAW0=y
+CONFIG_LBLAW0_BASE=0xF0000000
+CONFIG_LBLAW0_NAME="FLASH"
+CONFIG_LBLAW0_LENGTH_256_MBYTES=y
+CONFIG_LBLAW1=y
+CONFIG_LBLAW1_BASE=0xE8000000
+CONFIG_LBLAW1_NAME="KMBEC_FPGA"
+CONFIG_LBLAW1_LENGTH_128_MBYTES=y
+CONFIG_LBLAW2=y
+CONFIG_LBLAW2_BASE=0xA0000000
+CONFIG_LBLAW2_NAME="APP1"
+CONFIG_LBLAW2_LENGTH_256_MBYTES=y
+CONFIG_LBLAW3=y
+CONFIG_LBLAW3_BASE=0xB0000000
+CONFIG_LBLAW3_NAME="APP2"
+CONFIG_LBLAW3_LENGTH_256_MBYTES=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 cc94d174f038c5615ff0ba52f5d482d654d2410d..c818d7e4a12ccd28aa225917467704fc54cf73a6 100644 (file)
--- a/configs/kmsupx5_defconfig
+++ b/configs/kmsupx5_defconfig
@@ -66,6 +66,18 @@ CONFIG_BAT5_DCACHE_INHIBITED=y
 CONFIG_BAT5_DCACHE_GUARDED=y
 CONFIG_BAT5_USER_MODE_VALID=y
 CONFIG_BAT5_SUPERVISOR_MODE_VALID=y
+CONFIG_LBLAW0=y
+CONFIG_LBLAW0_BASE=0xF0000000
+CONFIG_LBLAW0_NAME="FLASH"
+CONFIG_LBLAW0_LENGTH_256_MBYTES=y
+CONFIG_LBLAW1=y
+CONFIG_LBLAW1_BASE=0xE8000000
+CONFIG_LBLAW1_NAME="KMBEC_FPGA"
+CONFIG_LBLAW1_LENGTH_128_MBYTES=y
+CONFIG_LBLAW2=y
+CONFIG_LBLAW2_BASE=0xA0000000
+CONFIG_LBLAW2_NAME="APP1"
+CONFIG_LBLAW2_LENGTH_256_MBYTES=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 994e1525f79dd7b200d9c92834750886828c2cc6..640e0c7c3c3da9ce9364242ca0dcfbf47eaa699f 100644 (file)
--- a/configs/kmtegr1_defconfig
+++ b/configs/kmtegr1_defconfig
@@ -67,6 +67,18 @@ CONFIG_BAT6_DCACHE_INHIBITED=y
 CONFIG_BAT6_DCACHE_GUARDED=y
 CONFIG_BAT6_USER_MODE_VALID=y
 CONFIG_BAT6_SUPERVISOR_MODE_VALID=y
+CONFIG_LBLAW0=y
+CONFIG_LBLAW0_BASE=0xF0000000
+CONFIG_LBLAW0_NAME="FLASH"
+CONFIG_LBLAW0_LENGTH_256_MBYTES=y
+CONFIG_LBLAW1=y
+CONFIG_LBLAW1_BASE=0xE8000000
+CONFIG_LBLAW1_NAME="KMBEC_FPGA"
+CONFIG_LBLAW1_LENGTH_128_MBYTES=y
+CONFIG_LBLAW3=y
+CONFIG_LBLAW3_BASE=0xB0000000
+CONFIG_LBLAW3_NAME="APP2"
+CONFIG_LBLAW3_LENGTH_256_MBYTES=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 bb23786057824bbef5a68e26f74713f151e24946..81579c6b02f143037a33f74cc1aed0dcd13a15dc 100644 (file)
--- a/configs/kmtepr2_defconfig
+++ b/configs/kmtepr2_defconfig
@@ -76,6 +76,22 @@ CONFIG_BAT6_DCACHE_INHIBITED=y
 CONFIG_BAT6_DCACHE_GUARDED=y
 CONFIG_BAT6_USER_MODE_VALID=y
 CONFIG_BAT6_SUPERVISOR_MODE_VALID=y
+CONFIG_LBLAW0=y
+CONFIG_LBLAW0_BASE=0xF0000000
+CONFIG_LBLAW0_NAME="FLASH"
+CONFIG_LBLAW0_LENGTH_256_MBYTES=y
+CONFIG_LBLAW1=y
+CONFIG_LBLAW1_BASE=0xE8000000
+CONFIG_LBLAW1_NAME="KMBEC_FPGA"
+CONFIG_LBLAW1_LENGTH_128_MBYTES=y
+CONFIG_LBLAW2=y
+CONFIG_LBLAW2_BASE=0xA0000000
+CONFIG_LBLAW2_NAME="APP1"
+CONFIG_LBLAW2_LENGTH_256_MBYTES=y
+CONFIG_LBLAW3=y
+CONFIG_LBLAW3_BASE=0xB0000000
+CONFIG_LBLAW3_NAME="APP2"
+CONFIG_LBLAW3_LENGTH_256_MBYTES=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 666dbf32cc969c22e72b10f2389ab14a98ab3df1..709947b5391f0c5497d15b6e1a5d24145ffe91f8 100644 (file)
--- a/configs/kmvect1_defconfig
+++ b/configs/kmvect1_defconfig
@@ -77,6 +77,22 @@ CONFIG_BAT6_DCACHE_INHIBITED=y
 CONFIG_BAT6_DCACHE_GUARDED=y
 CONFIG_BAT6_USER_MODE_VALID=y
 CONFIG_BAT6_SUPERVISOR_MODE_VALID=y
+CONFIG_LBLAW0=y
+CONFIG_LBLAW0_BASE=0xF0000000
+CONFIG_LBLAW0_NAME="FLASH"
+CONFIG_LBLAW0_LENGTH_256_MBYTES=y
+CONFIG_LBLAW1=y
+CONFIG_LBLAW1_BASE=0xE8000000
+CONFIG_LBLAW1_NAME="KMBEC_FPGA"
+CONFIG_LBLAW1_LENGTH_128_MBYTES=y
+CONFIG_LBLAW2=y
+CONFIG_LBLAW2_BASE=0xA0000000
+CONFIG_LBLAW2_NAME="APP1"
+CONFIG_LBLAW2_LENGTH_256_MBYTES=y
+CONFIG_LBLAW3=y
+CONFIG_LBLAW3_BASE=0xB0000000
+CONFIG_LBLAW3_NAME="APP2"
+CONFIG_LBLAW3_LENGTH_256_MBYTES=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 f583fa922e34b462afdc27a967e38c90a397e6c5..b44e04e1ae208299096673d7f6aedb618728ff9b 100644 (file)
--- a/configs/mpc8308_p1m_defconfig
+++ b/configs/mpc8308_p1m_defconfig
@@ -44,6 +44,18 @@ CONFIG_BAT3_BASE=0xE6000000
 CONFIG_BAT3_ACCESS_RW=y
 CONFIG_BAT3_USER_MODE_VALID=y
 CONFIG_BAT3_SUPERVISOR_MODE_VALID=y
+CONFIG_LBLAW0=y
+CONFIG_LBLAW0_BASE=0xFC000000
+CONFIG_LBLAW0_NAME="FLASH"
+CONFIG_LBLAW0_LENGTH_64_MBYTES=y
+CONFIG_LBLAW1=y
+CONFIG_LBLAW1_BASE=0xFBFF0000
+CONFIG_LBLAW1_NAME="SJA1000"
+CONFIG_LBLAW1_LENGTH_32_KBYTES=y
+CONFIG_LBLAW2=y
+CONFIG_LBLAW2_BASE=0xFBFF8000
+CONFIG_LBLAW2_NAME="CPLD"
+CONFIG_LBLAW2_LENGTH_32_KBYTES=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 f8ce30937611becd2d3e8bb1db70f139e2866ee5..6f407d56d56492b6cd138cc62f6ad36fe68dc674 100644 (file)
--- a/configs/sbc8349_PCI_33_defconfig
+++ b/configs/sbc8349_PCI_33_defconfig
@@ -65,6 +65,10 @@ CONFIG_BAT6_DCACHE_MEMORYCOHERENCE=y
 CONFIG_BAT6_DCACHE_GUARDED=y
 CONFIG_BAT6_USER_MODE_VALID=y
 CONFIG_BAT6_SUPERVISOR_MODE_VALID=y
+CONFIG_LBLAW0=y
+CONFIG_LBLAW0_BASE=0xFF800000
+CONFIG_LBLAW0_NAME="FLASH"
+CONFIG_LBLAW0_LENGTH_8_MBYTES=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 bc9e2288941e3e355cf00a51baf1c836962345a8..9c0b30f446c29d598fbe2a15d10d4cf8429c0681 100644 (file)
--- a/configs/sbc8349_PCI_66_defconfig
+++ b/configs/sbc8349_PCI_66_defconfig
@@ -65,6 +65,10 @@ CONFIG_BAT6_DCACHE_MEMORYCOHERENCE=y
 CONFIG_BAT6_DCACHE_GUARDED=y
 CONFIG_BAT6_USER_MODE_VALID=y
 CONFIG_BAT6_SUPERVISOR_MODE_VALID=y
+CONFIG_LBLAW0=y
+CONFIG_LBLAW0_BASE=0xFF800000
+CONFIG_LBLAW0_NAME="FLASH"
+CONFIG_LBLAW0_LENGTH_8_MBYTES=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 d8e60da7be1911dce34a6bbeb16d6d4d50e14d07..05361f76fcbc8e5fbc66e12fb1815f3cc62a88dd 100644 (file)
--- a/configs/sbc8349_defconfig
+++ b/configs/sbc8349_defconfig
@@ -45,6 +45,10 @@ CONFIG_BAT6_DCACHE_MEMORYCOHERENCE=y
 CONFIG_BAT6_DCACHE_GUARDED=y
 CONFIG_BAT6_USER_MODE_VALID=y
 CONFIG_BAT6_SUPERVISOR_MODE_VALID=y
+CONFIG_LBLAW0=y
+CONFIG_LBLAW0_BASE=0xFF800000
+CONFIG_LBLAW0_NAME="FLASH"
+CONFIG_LBLAW0_LENGTH_8_MBYTES=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 508ffe201ab459aa9f79fda99d0861da8c8c20ed..196c44470a2a14be0edeaa7cda1435a921cdc1c3 100644 (file)
--- a/configs/strider_con_defconfig
+++ b/configs/strider_con_defconfig
@@ -45,6 +45,14 @@ CONFIG_BAT3_BASE=0xE6000000
 CONFIG_BAT3_ACCESS_RW=y
 CONFIG_BAT3_USER_MODE_VALID=y
 CONFIG_BAT3_SUPERVISOR_MODE_VALID=y
+CONFIG_LBLAW0=y
+CONFIG_LBLAW0_BASE=0xFE000000
+CONFIG_LBLAW0_NAME="FLASH"
+CONFIG_LBLAW0_LENGTH_8_MBYTES=y
+CONFIG_LBLAW1=y
+CONFIG_LBLAW1_BASE=0xE0600000
+CONFIG_LBLAW1_NAME="FPGA0"
+CONFIG_LBLAW1_LENGTH_1_MBYTES=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 514db1c21338e5df4d87e3b5bf3508d1c8a4d9e6..c407bed189d2b4b617b687e3f214373816e08321 100644 (file)
--- a/configs/strider_con_dp_defconfig
+++ b/configs/strider_con_dp_defconfig
@@ -45,6 +45,14 @@ CONFIG_BAT3_BASE=0xE6000000
 CONFIG_BAT3_ACCESS_RW=y
 CONFIG_BAT3_USER_MODE_VALID=y
 CONFIG_BAT3_SUPERVISOR_MODE_VALID=y
+CONFIG_LBLAW0=y
+CONFIG_LBLAW0_BASE=0xFE000000
+CONFIG_LBLAW0_NAME="FLASH"
+CONFIG_LBLAW0_LENGTH_8_MBYTES=y
+CONFIG_LBLAW1=y
+CONFIG_LBLAW1_BASE=0xE0600000
+CONFIG_LBLAW1_NAME="FPGA0"
+CONFIG_LBLAW1_LENGTH_1_MBYTES=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 a998585f3a86f145d87a955e5338d218ce37f2cb..1128950ace25584d9b09ce4ac9ba828e51a8d315 100644 (file)
--- a/configs/strider_cpu_defconfig
+++ b/configs/strider_cpu_defconfig
@@ -45,6 +45,14 @@ CONFIG_BAT3_BASE=0xE6000000
 CONFIG_BAT3_ACCESS_RW=y
 CONFIG_BAT3_USER_MODE_VALID=y
 CONFIG_BAT3_SUPERVISOR_MODE_VALID=y
+CONFIG_LBLAW0=y
+CONFIG_LBLAW0_BASE=0xFE000000
+CONFIG_LBLAW0_NAME="FLASH"
+CONFIG_LBLAW0_LENGTH_8_MBYTES=y
+CONFIG_LBLAW1=y
+CONFIG_LBLAW1_BASE=0xE0600000
+CONFIG_LBLAW1_NAME="FPGA0"
+CONFIG_LBLAW1_LENGTH_1_MBYTES=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 48579c756337a067caa478767127c2c719ba057d..f0b2c44efb1441f48d4644914ef9cf2a305b45db 100644 (file)
--- a/configs/strider_cpu_dp_defconfig
+++ b/configs/strider_cpu_dp_defconfig
@@ -45,6 +45,14 @@ CONFIG_BAT3_BASE=0xE6000000
 CONFIG_BAT3_ACCESS_RW=y
 CONFIG_BAT3_USER_MODE_VALID=y
 CONFIG_BAT3_SUPERVISOR_MODE_VALID=y
+CONFIG_LBLAW0=y
+CONFIG_LBLAW0_BASE=0xFE000000
+CONFIG_LBLAW0_NAME="FLASH"
+CONFIG_LBLAW0_LENGTH_8_MBYTES=y
+CONFIG_LBLAW1=y
+CONFIG_LBLAW1_BASE=0xE0600000
+CONFIG_LBLAW1_NAME="FPGA0"
+CONFIG_LBLAW1_LENGTH_1_MBYTES=y
 CONFIG_CMD_IOLOOP=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y

diff --git a/configs/suvd3_defconfig b/configs/suvd3_defconfig
index 4dd36cac919006ccbef33299883fdd6794dae711..10a32178f13639cc5f71f44bf394f31bd413ebfd 100644 (file)
--- a/configs/suvd3_defconfig
+++ b/configs/suvd3_defconfig
@@ -76,6 +76,22 @@ CONFIG_BAT6_DCACHE_INHIBITED=y
 CONFIG_BAT6_DCACHE_GUARDED=y
 CONFIG_BAT6_USER_MODE_VALID=y
 CONFIG_BAT6_SUPERVISOR_MODE_VALID=y
+CONFIG_LBLAW0=y
+CONFIG_LBLAW0_BASE=0xF0000000
+CONFIG_LBLAW0_NAME="FLASH"
+CONFIG_LBLAW0_LENGTH_256_MBYTES=y
+CONFIG_LBLAW1=y
+CONFIG_LBLAW1_BASE=0xE8000000
+CONFIG_LBLAW1_NAME="KMBEC_FPGA"
+CONFIG_LBLAW1_LENGTH_128_MBYTES=y
+CONFIG_LBLAW2=y
+CONFIG_LBLAW2_BASE=0xA0000000
+CONFIG_LBLAW2_NAME="APP1"
+CONFIG_LBLAW2_LENGTH_256_MBYTES=y
+CONFIG_LBLAW3=y
+CONFIG_LBLAW3_BASE=0xB0000000
+CONFIG_LBLAW3_NAME="APP2"
+CONFIG_LBLAW3_LENGTH_256_MBYTES=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 7db157bf210fb01df50f9388fd2aebb1ddd2e4a1..6fada9bdf709d49e800d8d52dfa9cd17878b73aa 100644 (file)
--- a/configs/tuge1_defconfig
+++ b/configs/tuge1_defconfig
@@ -66,6 +66,18 @@ CONFIG_BAT5_DCACHE_INHIBITED=y
 CONFIG_BAT5_DCACHE_GUARDED=y
 CONFIG_BAT5_USER_MODE_VALID=y
 CONFIG_BAT5_SUPERVISOR_MODE_VALID=y
+CONFIG_LBLAW0=y
+CONFIG_LBLAW0_BASE=0xF0000000
+CONFIG_LBLAW0_NAME="FLASH"
+CONFIG_LBLAW0_LENGTH_256_MBYTES=y
+CONFIG_LBLAW1=y
+CONFIG_LBLAW1_BASE=0xE8000000
+CONFIG_LBLAW1_NAME="KMBEC_FPGA"
+CONFIG_LBLAW1_LENGTH_128_MBYTES=y
+CONFIG_LBLAW2=y
+CONFIG_LBLAW2_BASE=0xA0000000
+CONFIG_LBLAW2_NAME="APP1"
+CONFIG_LBLAW2_LENGTH_256_MBYTES=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 e0c1366291c70f87bba57cb294acfc00d0d8a224..1eb21e0e5af8fc31e6cb01551729f67d16317bba 100644 (file)
--- a/configs/tuxx1_defconfig
+++ b/configs/tuxx1_defconfig
@@ -76,6 +76,22 @@ CONFIG_BAT6_DCACHE_INHIBITED=y
 CONFIG_BAT6_DCACHE_GUARDED=y
 CONFIG_BAT6_USER_MODE_VALID=y
 CONFIG_BAT6_SUPERVISOR_MODE_VALID=y
+CONFIG_LBLAW0=y
+CONFIG_LBLAW0_BASE=0xF0000000
+CONFIG_LBLAW0_NAME="FLASH"
+CONFIG_LBLAW0_LENGTH_256_MBYTES=y
+CONFIG_LBLAW1=y
+CONFIG_LBLAW1_BASE=0xE8000000
+CONFIG_LBLAW1_NAME="KMBEC_FPGA"
+CONFIG_LBLAW1_LENGTH_128_MBYTES=y
+CONFIG_LBLAW2=y
+CONFIG_LBLAW2_BASE=0xA0000000
+CONFIG_LBLAW2_NAME="APP1"
+CONFIG_LBLAW2_LENGTH_256_MBYTES=y
+CONFIG_LBLAW3=y
+CONFIG_LBLAW3_BASE=0xB0000000
+CONFIG_LBLAW3_NAME="APP2"
+CONFIG_LBLAW3_LENGTH_256_MBYTES=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 517c4aa854e74973260819a547c2feff9eb5aff7..1df5195e97732f9f01523774baf17288ae0e94ed 100644 (file)
--- a/configs/ve8313_defconfig
+++ b/configs/ve8313_defconfig
@@ -65,6 +65,15 @@ CONFIG_BAT7_ICACHE_GUARDED=y
 CONFIG_BAT7_DCACHE_GUARDED=y
 CONFIG_BAT7_USER_MODE_VALID=y
 CONFIG_BAT7_SUPERVISOR_MODE_VALID=y
+CONFIG_NAND_LBLAWBAR_PRELIM_1=y
+CONFIG_LBLAW0=y
+CONFIG_LBLAW0_BASE=0xFE000000
+CONFIG_LBLAW0_NAME="FLASH"
+CONFIG_LBLAW0_LENGTH_32_MBYTES=y
+CONFIG_LBLAW1=y
+CONFIG_LBLAW1_BASE=0x61000000
+CONFIG_LBLAW1_NAME="NAND"
+CONFIG_LBLAW1_LENGTH_32_KBYTES=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 b7cf6a44bc8a45bec66002570d90f5a24ce64a86..9336dfac5cb3758565e5911f30f0584b6dfacf3e 100644 (file)
--- a/configs/vme8349_defconfig
+++ b/configs/vme8349_defconfig
@@ -63,6 +63,14 @@ CONFIG_BAT6_ICACHE_MEMORYCOHERENCE=y
 CONFIG_BAT6_DCACHE_MEMORYCOHERENCE=y
 CONFIG_BAT6_USER_MODE_VALID=y
 CONFIG_BAT6_SUPERVISOR_MODE_VALID=y
+CONFIG_LBLAW0=y
+CONFIG_LBLAW0_BASE=0xF8000000
+CONFIG_LBLAW0_NAME="FLASH"
+CONFIG_LBLAW0_LENGTH_128_MBYTES=y
+CONFIG_LBLAW1=y
+CONFIG_LBLAW1_BASE=0xF0000000
+CONFIG_LBLAW1_NAME="WINDOW1"
+CONFIG_LBLAW1_LENGTH_256_KBYTES=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 dc7a8b8aa850cc86c304f44f091a46b650074f24..1953d18e8780fd2cc6053d02d119dccf8b993dbe 100644 (file)
--- a/include/configs/MPC8308RDB.h
+++ b/include/configs/MPC8308RDB.h
@@ -176,9 +176,6 @@
 #define CONFIG_SYS_FLASH_SIZE          8 /* FLASH size is 8M */
 
 /* Window base at flash base */
-#define CONFIG_SYS_LBLAWBAR0_PRELIM    CONFIG_SYS_FLASH_BASE
-#define CONFIG_SYS_LBLAWAR0_PRELIM     (LBLAWAR_EN | LBLAWAR_8MB)
-
 #define CONFIG_SYS_BR0_PRELIM  (CONFIG_SYS_FLASH_BASE \
                                | BR_PS_16      /* 16 bit port */ \
                                | BR_MS_GPCM    /* MSEL = GPCM */ \
@@ -218,9 +215,6 @@
                                | OR_FCM_EHTR)
                                /* 0xFFFF8396 */
 
-#define CONFIG_SYS_LBLAWBAR1_PRELIM    CONFIG_SYS_NAND_BASE
-#define CONFIG_SYS_LBLAWAR1_PRELIM     (LBLAWAR_EN | LBLAWAR_32KB)
-
 #ifdef CONFIG_VSC7385_ENET
 #define CONFIG_TSEC2
                                        /* VSC7385 Base address on CS2 */
@@ -239,10 +233,6 @@
                                        | OR_GPCM_TRLX_SET \
                                        | OR_GPCM_EHTR_SET)
                                        /* 0xFFFE09FF */
-/* Access window base at VSC7385 base */
-#define CONFIG_SYS_LBLAWBAR2_PRELIM    CONFIG_SYS_VSC7385_BASE
-/* Access window size 128K */
-#define CONFIG_SYS_LBLAWAR2_PRELIM     (LBLAWAR_EN | LBLAWAR_128KB)
 /* The flash address and size of the VSC7385 firmware image */
 #define CONFIG_VSC7385_IMAGE           0xFE7FE000
 #define CONFIG_VSC7385_IMAGE_SIZE      8192

diff --git a/include/configs/MPC8313ERDB_NAND.h b/include/configs/MPC8313ERDB_NAND.h
index 596d39ee5e9a8e3a8f5d47799446d20fb75b3d36..79c7f12baeeb2ab1aab89189628bee907467e9e9 100644 (file)
--- a/include/configs/MPC8313ERDB_NAND.h
+++ b/include/configs/MPC8313ERDB_NAND.h
@@ -180,10 +180,6 @@
                                | OR_GPCM_EHTR \
                                | OR_GPCM_EAD)
                                /* 0xFF006FF7   TODO SLOW 16 MB flash size */
-                                       /* window base at flash base */
-#define CONFIG_SYS_LBLAWBAR0_PRELIM    CONFIG_SYS_FLASH_BASE
-                                       /* 16 MB window size */
-#define CONFIG_SYS_LBLAWAR0_PRELIM     (LBLAWAR_EN | LBLAWAR_16MB)
 
 #define CONFIG_SYS_MAX_FLASH_BANKS     1       /* number of banks */
 #define CONFIG_SYS_MAX_FLASH_SECT      135     /* sectors per device */
@@ -253,12 +249,6 @@
 #define CONFIG_SYS_NAND_BR_PRELIM CONFIG_SYS_BR0_PRELIM
 #define CONFIG_SYS_NAND_OR_PRELIM CONFIG_SYS_OR0_PRELIM
 
-#define CONFIG_SYS_LBLAWBAR1_PRELIM    CONFIG_SYS_NAND_BASE
-#define CONFIG_SYS_LBLAWAR1_PRELIM     (LBLAWAR_EN | LBLAWAR_32KB)
-
-#define CONFIG_SYS_NAND_LBLAWBAR_PRELIM CONFIG_SYS_LBLAWBAR1_PRELIM
-#define CONFIG_SYS_NAND_LBLAWAR_PRELIM CONFIG_SYS_LBLAWAR1_PRELIM
-
 /* local bus write LED / read status buffer (BCSR) mapping */
 #define CONFIG_SYS_BCSR_ADDR           0xFA000000
 #define CONFIG_SYS_BCSR_SIZE           (32 * 1024)     /* 0x00008000 */
@@ -277,9 +267,6 @@
                                        | OR_GPCM_EHTR_SET \
                                        | OR_GPCM_EAD)
                                        /* 0xFFFF8FF7 */
-#define CONFIG_SYS_LBLAWBAR3_PRELIM    CONFIG_SYS_BCSR_ADDR
-#define CONFIG_SYS_LBLAWAR3_PRELIM     (LBLAWAR_EN | LBLAWAR_32KB)
-
 /* Vitesse 7385 */
 
 #ifdef CONFIG_VSC7385_ENET
@@ -301,11 +288,6 @@
                                        | OR_GPCM_EHTR_SET \
                                        | OR_GPCM_EAD)
                                        /* 0xFFFE09FF */
-
-                                       /* Access window base at VSC7385 base */
-#define CONFIG_SYS_LBLAWBAR2_PRELIM    CONFIG_SYS_VSC7385_BASE
-#define CONFIG_SYS_LBLAWAR2_PRELIM     (LBLAWAR_EN | LBLAWAR_128KB)
-
 #endif
 
 #define CONFIG_MPC83XX_GPIO 1

diff --git a/include/configs/MPC8313ERDB_NOR.h b/include/configs/MPC8313ERDB_NOR.h
index 9d1ce200ec554d4b83cb8672ec1aad50149ba2c3..1b2bba96d33c0d174c5214de5e756dd729fd4ee3 100644 (file)
--- a/include/configs/MPC8313ERDB_NOR.h
+++ b/include/configs/MPC8313ERDB_NOR.h
@@ -153,10 +153,6 @@
                                | OR_GPCM_EHTR \
                                | OR_GPCM_EAD)
                                /* 0xFF006FF7   TODO SLOW 16 MB flash size */
-                                       /* window base at flash base */
-#define CONFIG_SYS_LBLAWBAR0_PRELIM    CONFIG_SYS_FLASH_BASE
-                                       /* 16 MB window size */
-#define CONFIG_SYS_LBLAWAR0_PRELIM     (LBLAWAR_EN | LBLAWAR_16MB)
 
 #define CONFIG_SYS_MAX_FLASH_BANKS     1       /* number of banks */
 #define CONFIG_SYS_MAX_FLASH_SECT      135     /* sectors per device */
@@ -222,12 +218,6 @@
 #define CONFIG_SYS_NAND_BR_PRELIM CONFIG_SYS_BR1_PRELIM
 #define CONFIG_SYS_NAND_OR_PRELIM CONFIG_SYS_OR1_PRELIM
 
-#define CONFIG_SYS_LBLAWBAR1_PRELIM    CONFIG_SYS_NAND_BASE
-#define CONFIG_SYS_LBLAWAR1_PRELIM     (LBLAWAR_EN | LBLAWAR_32KB)
-
-#define CONFIG_SYS_NAND_LBLAWBAR_PRELIM CONFIG_SYS_LBLAWBAR1_PRELIM
-#define CONFIG_SYS_NAND_LBLAWAR_PRELIM CONFIG_SYS_LBLAWAR1_PRELIM
-
 /* local bus write LED / read status buffer (BCSR) mapping */
 #define CONFIG_SYS_BCSR_ADDR           0xFA000000
 #define CONFIG_SYS_BCSR_SIZE           (32 * 1024)     /* 0x00008000 */
@@ -246,9 +236,6 @@
                                        | OR_GPCM_EHTR_SET \
                                        | OR_GPCM_EAD)
                                        /* 0xFFFF8FF7 */
-#define CONFIG_SYS_LBLAWBAR3_PRELIM    CONFIG_SYS_BCSR_ADDR
-#define CONFIG_SYS_LBLAWAR3_PRELIM     (LBLAWAR_EN | LBLAWAR_32KB)
-
 /* Vitesse 7385 */
 
 #ifdef CONFIG_VSC7385_ENET
@@ -270,11 +257,6 @@
                                        | OR_GPCM_EHTR_SET \
                                        | OR_GPCM_EAD)
                                        /* 0xFFFE09FF */
-
-                                       /* Access window base at VSC7385 base */
-#define CONFIG_SYS_LBLAWBAR2_PRELIM    CONFIG_SYS_VSC7385_BASE
-#define CONFIG_SYS_LBLAWAR2_PRELIM     (LBLAWAR_EN | LBLAWAR_128KB)
-
 #endif
 
 #define CONFIG_MPC83XX_GPIO 1

diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h
index fb568efe2d4682078ac73bac1e7493967c9a60a4..86491b41d66ac7c438e4306cc8f18bd21672e0bd 100644 (file)
--- a/include/configs/MPC8315ERDB.h
+++ b/include/configs/MPC8315ERDB.h
@@ -146,10 +146,6 @@
 #define CONFIG_SYS_FLASH_BASE          0xFE000000 /* FLASH base address */
 #define CONFIG_SYS_FLASH_SIZE          8       /* FLASH size is 8M */
 
-                                       /* Window base at flash base */
-#define CONFIG_SYS_LBLAWBAR0_PRELIM    CONFIG_SYS_FLASH_BASE
-#define CONFIG_SYS_LBLAWAR0_PRELIM     (LBLAWAR_EN | LBLAWAR_8MB)
-
 #define CONFIG_SYS_MAX_FLASH_BANKS     1 /* number of banks */
 /* 127 64KB sectors and 8 8KB top sectors per device */
 #define CONFIG_SYS_MAX_FLASH_SECT      135
@@ -213,12 +209,6 @@
 #define CONFIG_SYS_NAND_BR_PRELIM CONFIG_SYS_BR1_PRELIM
 #define CONFIG_SYS_NAND_OR_PRELIM CONFIG_SYS_OR1_PRELIM
 
-#define CONFIG_SYS_LBLAWBAR1_PRELIM    CONFIG_SYS_NAND_BASE
-#define CONFIG_SYS_LBLAWAR1_PRELIM     (LBLAWAR_EN | LBLAWAR_32KB)
-
-#define CONFIG_SYS_NAND_LBLAWBAR_PRELIM CONFIG_SYS_LBLAWBAR1_PRELIM
-#define CONFIG_SYS_NAND_LBLAWAR_PRELIM CONFIG_SYS_LBLAWAR1_PRELIM
-
 #if CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE && \
        !defined(CONFIG_NAND_SPL)
 #define CONFIG_SYS_RAMBOOT

diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h
index 489e7c3368c97f498ba70d51b321dce439cb1ffd..cb17c7644de6a32180c994eda70459e2fc3568b6 100644 (file)
--- a/include/configs/MPC8323ERDB.h
+++ b/include/configs/MPC8323ERDB.h
@@ -141,9 +141,6 @@
 #define CONFIG_SYS_FLASH_BASE  0xFE000000      /* FLASH base address */
 #define CONFIG_SYS_FLASH_SIZE          16      /* FLASH size is 16M */
 
-                                       /* Window base at flash base */
-#define CONFIG_SYS_LBLAWBAR0_PRELIM    CONFIG_SYS_FLASH_BASE
-#define CONFIG_SYS_LBLAWAR0_PRELIM     (LBLAWAR_EN | LBLAWAR_32MB)
 
 #define CONFIG_SYS_BR0_PRELIM  (CONFIG_SYS_FLASH_BASE \
                                | BR_PS_16      /* 16 bit port */ \

diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h
index 15fca456cc7bff9b721d5459d042eb298f16260d..d51d5ce06d5b30139870abe133864fb676d0918f 100644 (file)
--- a/include/configs/MPC832XEMDS.h
+++ b/include/configs/MPC832XEMDS.h
@@ -133,10 +133,6 @@
 #define CONFIG_SYS_FLASH_BASE  0xFE000000      /* FLASH base address */
 #define CONFIG_SYS_FLASH_SIZE  16      /* FLASH size is 16M */
 
-                                       /* Window base at flash base */
-#define CONFIG_SYS_LBLAWBAR0_PRELIM    CONFIG_SYS_FLASH_BASE
-#define CONFIG_SYS_LBLAWAR0_PRELIM     (LBLAWAR_EN | LBLAWAR_32MB)
-
 #define CONFIG_SYS_BR0_PRELIM  (CONFIG_SYS_FLASH_BASE \
                                | BR_PS_16      /* 16 bit port */ \
                                | BR_MS_GPCM    /* MSEL = GPCM */ \
@@ -162,8 +158,6 @@
  */
 #define CONFIG_SYS_BCSR                        0xF8000000
                                        /* Access window base at BCSR base */
-#define CONFIG_SYS_LBLAWBAR1_PRELIM    CONFIG_SYS_BCSR
-#define CONFIG_SYS_LBLAWAR1_PRELIM     (LBLAWAR_EN | LBLAWAR_32KB)
 
 #define CONFIG_SYS_BR1_PRELIM          (CONFIG_SYS_BCSR \
                                        | BR_PS_8 \
@@ -185,8 +179,6 @@
                                        /* PIB window base 0xF8008000 */
 #define CONFIG_SYS_PIB_BASE            0xF8008000
 #define CONFIG_SYS_PIB_WINDOW_SIZE     (32 * 1024)
-#define CONFIG_SYS_LBLAWBAR3_PRELIM    CONFIG_SYS_PIB_BASE
-#define CONFIG_SYS_LBLAWAR3_PRELIM     (LBLAWAR_EN | LBLAWAR_64KB)
 
 /*
  * CS2 on Local Bus, to PIB

diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index e4d90589e9ad2793cff749032dd79a45b1dfe4d2..06017a81bc883681daf858fdd8a51c9a7696cd86 100644 (file)
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -137,10 +137,6 @@
                                | OR_GPCM_EHTR_SET \
                                | OR_GPCM_EAD)
 
-                                       /* window base at flash base */
-#define CONFIG_SYS_LBLAWBAR0_PRELIM    CONFIG_SYS_FLASH_BASE
-#define CONFIG_SYS_LBLAWAR0_PRELIM     (LBLAWAR_EN | LBLAWAR_32MB)
-
 #define CONFIG_SYS_MAX_FLASH_BANKS     1       /* number of banks */
 #define CONFIG_SYS_MAX_FLASH_SECT      256     /* max sectors per device */
 
@@ -161,8 +157,6 @@
  */
 #define CONFIG_SYS_BCSR                        0xE2400000
                                        /* Access window base at BCSR base */
-#define CONFIG_SYS_LBLAWBAR1_PRELIM    CONFIG_SYS_BCSR
-#define CONFIG_SYS_LBLAWAR1_PRELIM     (LBLAWAR_EN | LBLAWAR_32KB)
 #define CONFIG_SYS_BR1_PRELIM          (CONFIG_SYS_BCSR \
                                        | BR_PS_8 \
                                        | BR_MS_GPCM \

diff --git a/include/configs/MPC8349EMDS_SDRAM.h b/include/configs/MPC8349EMDS_SDRAM.h
index a24a2011d2ffbe3d5486e08cb27c1da739cd5df5..708a21f1649c3098c62d014c911ef33986a18214 100644 (file)
--- a/include/configs/MPC8349EMDS_SDRAM.h
+++ b/include/configs/MPC8349EMDS_SDRAM.h
@@ -137,10 +137,6 @@
                                | OR_GPCM_EHTR_SET \
                                | OR_GPCM_EAD)
 
-                                       /* window base at flash base */
-#define CONFIG_SYS_LBLAWBAR0_PRELIM    CONFIG_SYS_FLASH_BASE
-#define CONFIG_SYS_LBLAWAR0_PRELIM     (LBLAWAR_EN | LBLAWAR_32MB)
-
 #define CONFIG_SYS_MAX_FLASH_BANKS     1       /* number of banks */
 #define CONFIG_SYS_MAX_FLASH_SECT      256     /* max sectors per device */
 
@@ -161,8 +157,6 @@
  */
 #define CONFIG_SYS_BCSR                        0xE2400000
                                        /* Access window base at BCSR base */
-#define CONFIG_SYS_LBLAWBAR1_PRELIM    CONFIG_SYS_BCSR
-#define CONFIG_SYS_LBLAWAR1_PRELIM     (LBLAWAR_EN | LBLAWAR_32KB)
 #define CONFIG_SYS_BR1_PRELIM          (CONFIG_SYS_BCSR \
                                        | BR_PS_8 \
                                        | BR_MS_GPCM \
@@ -222,8 +216,6 @@
                                        | BR_MS_SDRAM   /* MSEL = SDRAM */ \
                                        | BR_V)         /* Valid */
                                        /* 0xF0001861 */
-#define CONFIG_SYS_LBLAWBAR2_PRELIM    CONFIG_SYS_LBC_SDRAM_BASE
-#define CONFIG_SYS_LBLAWAR2_PRELIM     (LBLAWAR_EN | LBLAWAR_64MB)
 
 /*
  * The SDRAM size in MB, CONFIG_SYS_LBC_SDRAM_SIZE, is 64.

diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h
index aeee6e0408facdac7d969629bf993d4ab71d0962..16d615dcc65fe44127c6de8d2dacd91290a5b0a8 100644 (file)
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@ -226,9 +226,6 @@ boards, we say we have two, but don't display a message if we find only one. */
                                | OR_GPCM_TRLX_SET \
                                | OR_GPCM_EHTR_SET \
                                | OR_GPCM_EAD)
-#define CONFIG_SYS_LBLAWBAR0_PRELIM    CONFIG_SYS_FLASH_BASE
-#define CONFIG_SYS_LBLAWAR0_PRELIM     (LBLAWAR_EN | LBLAWAR_16MB)
-
 /* Vitesse 7385 */
 
 #define CONFIG_SYS_VSC7385_BASE        0xF8000000
@@ -247,10 +244,6 @@ boards, we say we have two, but don't display a message if we find only one. */
                                | OR_GPCM_TRLX_SET \
                                | OR_GPCM_EHTR_SET \
                                | OR_GPCM_EAD)
-
-#define CONFIG_SYS_LBLAWBAR1_PRELIM    CONFIG_SYS_VSC7385_BASE
-#define CONFIG_SYS_LBLAWAR1_PRELIM     (LBLAWAR_EN | LBLAWAR_128KB)
-
 #endif
 
 /* LED */
@@ -281,9 +274,6 @@ boards, we say we have two, but don't display a message if we find only one. */
                                | BR_V)
 #define CONFIG_SYS_OR3_PRELIM  (OR_UPM_AM | OR_UPM_BI)
 
-#define CONFIG_SYS_LBLAWBAR3_PRELIM    CONFIG_SYS_CF_BASE
-#define CONFIG_SYS_LBLAWAR3_PRELIM     (LBLAWAR_EN | LBLAWAR_64KB)
-
 #endif
 
 /*

diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h
index 01a3a77e997e90ccfc07a56a3c0d645d6b5f9a15..9d6dc767ef33b18fe910cf6d6cdb924555689de3 100644 (file)
--- a/include/configs/MPC837XEMDS.h
+++ b/include/configs/MPC837XEMDS.h
@@ -162,10 +162,6 @@
 #define CONFIG_SYS_FLASH_BASE  0xFE000000 /* FLASH base address */
 #define CONFIG_SYS_FLASH_SIZE  32 /* max FLASH size is 32M */
 
-                                       /* Window base at flash base */
-#define CONFIG_SYS_LBLAWBAR0_PRELIM    CONFIG_SYS_FLASH_BASE
-#define CONFIG_SYS_LBLAWAR0_PRELIM     (LBLAWAR_EN | LBLAWAR_32MB)
-
 #define CONFIG_SYS_BR0_PRELIM  (CONFIG_SYS_FLASH_BASE \
                                | BR_PS_16      /* 16 bit port */ \
                                | BR_MS_GPCM    /* MSEL = GPCM */ \
@@ -193,9 +189,6 @@
  */
 #define CONFIG_SYS_BCSR                0xF8000000
                                        /* Access window base at BCSR base */
-#define CONFIG_SYS_LBLAWBAR1_PRELIM    CONFIG_SYS_BCSR
-#define CONFIG_SYS_LBLAWAR1_PRELIM     (LBLAWAR_EN | LBLAWAR_32KB)
-
 #define CONFIG_SYS_BR1_PRELIM  (CONFIG_SYS_BCSR \
                                | BR_PS_8 \
                                | BR_MS_GPCM \
@@ -233,9 +226,6 @@
                                | OR_FCM_EHTR)
                                /* 0xFFFF919E */
 
-#define CONFIG_SYS_LBLAWBAR3_PRELIM    CONFIG_SYS_NAND_BASE
-#define CONFIG_SYS_LBLAWAR3_PRELIM     (LBLAWAR_EN | LBLAWAR_32KB)
-
 /*
  * Serial Port
  */

diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 9a4eeb6390346b0d3be1edd168cb65a8c3c880e0..a1de8acc5c794e43fc67bb5d69647e179476a21f 100644 (file)
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -188,10 +188,6 @@
 
 #define CONFIG_SYS_FLASH_EMPTY_INFO            /* display empty sectors */
 
-                                       /* Window base at flash base */
-#define CONFIG_SYS_LBLAWBAR0_PRELIM    CONFIG_SYS_FLASH_BASE
-#define CONFIG_SYS_LBLAWAR0_PRELIM     0x80000016      /* 8 MB window size */
-
 #define CONFIG_SYS_BR0_PRELIM  (CONFIG_SYS_FLASH_BASE \
                                | BR_PS_16      /* 16 bit port */ \
                                | BR_MS_GPCM    /* MSEL = GPCM */ \
@@ -226,9 +222,6 @@
                                | OR_FCM_SCY_1 \
                                | OR_FCM_TRLX \
                                | OR_FCM_EHTR)
-#define CONFIG_SYS_LBLAWBAR1_PRELIM    CONFIG_SYS_NAND_BASE
-#define CONFIG_SYS_LBLAWAR1_PRELIM     (LBLAWAR_EN | LBLAWAR_32KB)
-
 /* Vitesse 7385 */
 
 #define CONFIG_SYS_VSC7385_BASE        0xF0000000
@@ -249,11 +242,6 @@
                                        | OR_GPCM_EHTR_SET \
                                        | OR_GPCM_EAD)
                                        /* 0xfffe09ff */
-
-                                       /* Access Base */
-#define CONFIG_SYS_LBLAWBAR2_PRELIM    CONFIG_SYS_VSC7385_BASE
-#define CONFIG_SYS_LBLAWAR2_PRELIM     (LBLAWAR_EN | LBLAWAR_128KB)
-
 #endif
 
 /*

diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index c5a6203001b72aecbfa3c4f01f26ca58998ec0de..4479000d25acf4d4c2eba7cfd261d41f63a97356 100644 (file)
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -93,26 +93,15 @@
 #define CONFIG_SYS_OR0_PRELIM          (CONFIG_SYS_PRELIM_OR_AM  \
                                        | CONFIG_SYS_OR_TIMING_FLASH)
 
-#define CONFIG_SYS_LBLAWAR0_PRELIM     (LBLAWAR_EN | LBLAWAR_1GB)
-
-                                       /* Window base at flash base */
-#define CONFIG_SYS_LBLAWBAR0_PRELIM    CONFIG_SYS_FLASH_BASE
-
 /* disable remaining mappings */
 #define CONFIG_SYS_BR1_PRELIM          0x00000000
 #define CONFIG_SYS_OR1_PRELIM          0x00000000
-#define CONFIG_SYS_LBLAWBAR1_PRELIM    0x00000000
-#define CONFIG_SYS_LBLAWAR1_PRELIM     0x00000000
 
 #define CONFIG_SYS_BR2_PRELIM          0x00000000
 #define CONFIG_SYS_OR2_PRELIM          0x00000000
-#define CONFIG_SYS_LBLAWBAR2_PRELIM    0x00000000
-#define CONFIG_SYS_LBLAWAR2_PRELIM     0x00000000
 
 #define CONFIG_SYS_BR3_PRELIM          0x00000000
 #define CONFIG_SYS_OR3_PRELIM          0x00000000
-#define CONFIG_SYS_LBLAWBAR3_PRELIM    0x00000000
-#define CONFIG_SYS_LBLAWAR3_PRELIM     0x00000000
 
 /*
  * Monitor config

diff --git a/include/configs/caddy2.h b/include/configs/caddy2.h
index f4ee22280846b0a13e297742100283d751dc4d30..b355e56355f42db7de35ef956da0418c0b8daad9 100644 (file)
--- a/include/configs/caddy2.h
+++ b/include/configs/caddy2.h
@@ -84,8 +84,6 @@
                                        | OR_GPCM_EHTR_SET \
                                        | OR_GPCM_EAD)
                                        /* 0xffc06ff7 */
-#define CONFIG_SYS_LBLAWBAR0_PRELIM    CONFIG_SYS_FLASH_BASE
-#define CONFIG_SYS_LBLAWAR0_PRELIM     (LBLAWAR_EN | LBLAWAR_4MB)
 
 #define CONFIG_SYS_WINDOW1_BASE                0xf0000000
 #define CONFIG_SYS_BR1_PRELIM          (CONFIG_SYS_WINDOW1_BASE \
@@ -96,8 +94,6 @@
 #define CONFIG_SYS_OR1_PRELIM          (OR_AM_256KB \
                                        | OR_GPCM_SETA)
                                        /* 0xfffc0208 */
-#define CONFIG_SYS_LBLAWBAR1_PRELIM    CONFIG_SYS_WINDOW1_BASE
-#define CONFIG_SYS_LBLAWAR1_PRELIM     (LBLAWAR_EN | LBLAWAR_256KB)
 
 #define CONFIG_SYS_MAX_FLASH_BANKS     1       /* number of banks */
 #define CONFIG_SYS_MAX_FLASH_SECT      1024    /* sectors per device*/

diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h
index c8fabf9da54d713888dee160647753bacf92363d..d86de800db76c3f21bb30cb6db4e7f61f4b2c3ae 100644 (file)
--- a/include/configs/hrcon.h
+++ b/include/configs/hrcon.h
@@ -170,9 +170,6 @@
 #define CONFIG_SYS_FLASH_SIZE          8 /* FLASH size is up to 8M */
 
 /* Window base at flash base */
-#define CONFIG_SYS_LBLAWBAR0_PRELIM    CONFIG_SYS_FLASH_BASE
-#define CONFIG_SYS_LBLAWAR0_PRELIM     (LBLAWAR_EN | LBLAWAR_8MB)
-
 #define CONFIG_SYS_BR0_PRELIM  (CONFIG_SYS_FLASH_BASE \
                                | BR_PS_16      /* 16 bit port */ \
                                | BR_MS_GPCM    /* MSEL = GPCM */ \
@@ -199,9 +196,6 @@
 #define CONFIG_SYS_FPGA0_SIZE          1 /* FPGA size is 1M */
 
 /* Window base at FPGA base */
-#define CONFIG_SYS_LBLAWBAR1_PRELIM    CONFIG_SYS_FPGA0_BASE
-#define CONFIG_SYS_LBLAWAR1_PRELIM     (LBLAWAR_EN | LBLAWAR_1MB)
-
 #define CONFIG_SYS_BR1_PRELIM  (CONFIG_SYS_FPGA0_BASE \
                                | BR_PS_16      /* 16 bit port */ \
                                | BR_MS_GPCM    /* MSEL = GPCM */ \

diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h
index 120eb0a6b71a294e4454d1e6b831648b53c3c072..e930c65637be8d4c839e59c6fc27c74ab4b44047 100644 (file)
--- a/include/configs/ids8313.h
+++ b/include/configs/ids8313.h
@@ -142,9 +142,6 @@
 #define CONFIG_SYS_FLASH_BASE          0xFF800000
 #define CONFIG_SYS_FLASH_SIZE          8
 
-#define CONFIG_SYS_LBLAWBAR0_PRELIM    CONFIG_SYS_FLASH_BASE
-#define CONFIG_SYS_LBLAWAR0_PRELIM     0x80000016
-
 #define CONFIG_SYS_BR0_PRELIM          (CONFIG_SYS_FLASH_BASE |\
                                         BR_PS_8 |\
                                         BR_MS_GPCM |\
@@ -173,11 +170,6 @@
 #define CONFIG_SYS_NAND_BLOCK_SIZE     (128 << 10)
 #define NAND_CACHE_PAGES               64
 
-#define CONFIG_SYS_LBLAWBAR1_PRELIM    CONFIG_SYS_NAND_BASE
-#define CONFIG_SYS_LBLAWAR1_PRELIM     0x8000000E
-#define CONFIG_SYS_NAND_LBLAWBAR_PRELIM CONFIG_SYS_LBLAWBAR1_PRELIM
-#define CONFIG_SYS_NAND_LBLAWAR_PRELIM CONFIG_SYS_LBLAWAR1_PRELIM
-
 #define CONFIG_SYS_BR1_PRELIM  ((CONFIG_SYS_NAND_BASE) |\
                                 (2<<BR_DECC_SHIFT) |\
                                 BR_PS_8 |\
@@ -199,8 +191,6 @@
  */
 #define CONFIG_SYS_MRAM_BASE           0xE2000000
 #define CONFIG_SYS_MRAM_SIZE           0x20000 /* 128 Kb */
-#define CONFIG_SYS_LBLAWBAR2_PRELIM    CONFIG_SYS_MRAM_BASE
-#define CONFIG_SYS_LBLAWAR2_PRELIM     0x80000010      /* 128 Kb  */
 
 #define CONFIG_SYS_OR_TIMING_MRAM
 
@@ -216,8 +206,6 @@
  */
 #define CONFIG_SYS_CPLD_BASE           0xE3000000
 #define CONFIG_SYS_CPLD_SIZE           0x8000
-#define CONFIG_SYS_LBLAWBAR3_PRELIM    CONFIG_SYS_CPLD_BASE
-#define CONFIG_SYS_LBLAWAR3_PRELIM     0x8000000E
 
 #define CONFIG_SYS_OR_TIMING_MRAM
 

diff --git a/include/configs/kmcoge5ne.h b/include/configs/kmcoge5ne.h
index a4a0fb222bccd4d0356931f7b7b789a57d0bdeb6..dcabac5666514d20fbd7c3a04b54677bd4f174bc 100644 (file)
--- a/include/configs/kmcoge5ne.h
+++ b/include/configs/kmcoge5ne.h
@@ -108,9 +108,6 @@
  */
 #define CONFIG_SYS_FLASH_SIZE          256 /* max FLASH size is 256M */
 
-#define CONFIG_SYS_LBLAWBAR0_PRELIM    CONFIG_SYS_FLASH_BASE
-#define CONFIG_SYS_LBLAWAR0_PRELIM     (LBLAWAR_EN | LBLAWAR_256MB)
-
 #define CONFIG_SYS_BR0_PRELIM  (CONFIG_SYS_FLASH_BASE | \
                                BR_PS_16 | /* 16 bit port size */ \
                                BR_MS_GPCM | /* MSEL = GPCM */ \
@@ -129,9 +126,6 @@
  * PRIO1/PIGGY on the local bus CS1
  */
 /* Window base at flash base */
-#define CONFIG_SYS_LBLAWBAR1_PRELIM    CONFIG_SYS_KMBEC_FPGA_BASE
-#define CONFIG_SYS_LBLAWAR1_PRELIM     (LBLAWAR_EN | LBLAWAR_128MB)
-
 #define CONFIG_SYS_BR1_PRELIM  (CONFIG_SYS_KMBEC_FPGA_BASE | \
                                BR_PS_8 | /* 8 bit port size */ \
                                BR_MS_GPCM | /* MSEL = GPCM */ \
@@ -353,10 +347,6 @@
 #define CONFIG_SYS_PAXE_BASE           0xA0000000
 #define CONFIG_SYS_PAXE_SIZE           256
 
-#define CONFIG_SYS_LBLAWBAR3_PRELIM    CONFIG_SYS_PAXE_BASE
-
-#define CONFIG_SYS_LBLAWAR3_PRELIM     0x8000001C /* 512MB window size */
-
 #define CONFIG_SYS_BR3_PRELIM (\
        CONFIG_SYS_PAXE_BASE | \
        (1 << BR_PS_SHIFT) | \

diff --git a/include/configs/kmeter1.h b/include/configs/kmeter1.h
index f6c7cfce43838c88dde764a5602b31aa0538ff4d..1da8df393126431b1a7179ec578c0fc01ae33584 100644 (file)
--- a/include/configs/kmeter1.h
+++ b/include/configs/kmeter1.h
@@ -93,9 +93,6 @@
  */
 #define CONFIG_SYS_FLASH_SIZE          256 /* max FLASH size is 256M */
 
-#define CONFIG_SYS_LBLAWBAR0_PRELIM    CONFIG_SYS_FLASH_BASE
-#define CONFIG_SYS_LBLAWAR0_PRELIM     (LBLAWAR_EN | LBLAWAR_256MB)
-
 #define CONFIG_SYS_BR0_PRELIM  (CONFIG_SYS_FLASH_BASE | \
                                BR_PS_16 | /* 16 bit port size */ \
                                BR_MS_GPCM | /* MSEL = GPCM */ \
@@ -114,9 +111,6 @@
  * PRIO1/PIGGY on the local bus CS1
  */
 /* Window base at flash base */
-#define CONFIG_SYS_LBLAWBAR1_PRELIM    CONFIG_SYS_KMBEC_FPGA_BASE
-#define CONFIG_SYS_LBLAWAR1_PRELIM     (LBLAWAR_EN | LBLAWAR_128MB)
-
 #define CONFIG_SYS_BR1_PRELIM  (CONFIG_SYS_KMBEC_FPGA_BASE | \
                                BR_PS_8 | /* 8 bit port size */ \
                                BR_MS_GPCM | /* MSEL = GPCM */ \
@@ -333,10 +327,6 @@
 #define CONFIG_SYS_PAXE_BASE           0xA0000000
 #define CONFIG_SYS_PAXE_SIZE           256
 
-#define CONFIG_SYS_LBLAWBAR3_PRELIM    CONFIG_SYS_PAXE_BASE
-
-#define CONFIG_SYS_LBLAWAR3_PRELIM     0x8000001C /* 512MB window size */
-
 #define CONFIG_SYS_BR3_PRELIM (\
        CONFIG_SYS_PAXE_BASE | \
        (1 << BR_PS_SHIFT) | \

diff --git a/include/configs/kmopti2.h b/include/configs/kmopti2.h
index 6ac36c0f92183e891d8eb31bab7e8c395fecc02a..e732c2ad022d784b7def1f36500011139bbba69f 100644 (file)
--- a/include/configs/kmopti2.h
+++ b/include/configs/kmopti2.h
@@ -113,9 +113,6 @@
  */
 #define CONFIG_SYS_FLASH_SIZE          256 /* max FLASH size is 256M */
 
-#define CONFIG_SYS_LBLAWBAR0_PRELIM    CONFIG_SYS_FLASH_BASE
-#define CONFIG_SYS_LBLAWAR0_PRELIM     (LBLAWAR_EN | LBLAWAR_256MB)
-
 #define CONFIG_SYS_BR0_PRELIM  (CONFIG_SYS_FLASH_BASE | \
                                BR_PS_16 | /* 16 bit port size */ \
                                BR_MS_GPCM | /* MSEL = GPCM */ \
@@ -134,9 +131,6 @@
  * PRIO1/PIGGY on the local bus CS1
  */
 /* Window base at flash base */
-#define CONFIG_SYS_LBLAWBAR1_PRELIM    CONFIG_SYS_KMBEC_FPGA_BASE
-#define CONFIG_SYS_LBLAWAR1_PRELIM     (LBLAWAR_EN | LBLAWAR_128MB)
-
 #define CONFIG_SYS_BR1_PRELIM  (CONFIG_SYS_KMBEC_FPGA_BASE | \
                                BR_PS_8 | /* 8 bit port size */ \
                                BR_MS_GPCM | /* MSEL = GPCM */ \
@@ -367,11 +361,6 @@
 /*
  * Configuration for C2 on the local bus
  */
-/* Window base at flash base */
-#define CONFIG_SYS_LBLAWBAR2_PRELIM    CONFIG_SYS_APP1_BASE
-/* Window size: 256 MB */
-#define CONFIG_SYS_LBLAWAR2_PRELIM     (LBLAWAR_EN | LBLAWAR_256MB)
-
 #define CONFIG_SYS_BR2_PRELIM  (CONFIG_SYS_APP1_BASE | \
                                 BR_PS_8 | \
                                 BR_MS_GPCM | \
@@ -388,8 +377,6 @@
 /*
  * Configuration for C3 on the local bus
  */
-#define CONFIG_SYS_LBLAWBAR3_PRELIM    CONFIG_SYS_APP2_BASE
-#define CONFIG_SYS_LBLAWAR3_PRELIM     (LBLAWAR_EN | LBLAWAR_256MB)
 #define CONFIG_SYS_BR3_PRELIM  (CONFIG_SYS_APP2_BASE | \
                                 BR_PS_16 |             \
                                 BR_MS_GPCM |           \

diff --git a/include/configs/kmsupx5.h b/include/configs/kmsupx5.h
index 7ee9a914a4602e4e26d1621f2c54f58b912269f4..42fbdbf947f4e7bed24fb80b2fcb66dc827d57dd 100644 (file)
--- a/include/configs/kmsupx5.h
+++ b/include/configs/kmsupx5.h
@@ -113,9 +113,6 @@
  */
 #define CONFIG_SYS_FLASH_SIZE          256 /* max FLASH size is 256M */
 
-#define CONFIG_SYS_LBLAWBAR0_PRELIM    CONFIG_SYS_FLASH_BASE
-#define CONFIG_SYS_LBLAWAR0_PRELIM     (LBLAWAR_EN | LBLAWAR_256MB)
-
 #define CONFIG_SYS_BR0_PRELIM  (CONFIG_SYS_FLASH_BASE | \
                                BR_PS_16 | /* 16 bit port size */ \
                                BR_MS_GPCM | /* MSEL = GPCM */ \
@@ -134,9 +131,6 @@
  * PRIO1/PIGGY on the local bus CS1
  */
 /* Window base at flash base */
-#define CONFIG_SYS_LBLAWBAR1_PRELIM    CONFIG_SYS_KMBEC_FPGA_BASE
-#define CONFIG_SYS_LBLAWAR1_PRELIM     (LBLAWAR_EN | LBLAWAR_128MB)
-
 #define CONFIG_SYS_BR1_PRELIM  (CONFIG_SYS_KMBEC_FPGA_BASE | \
                                BR_PS_8 | /* 8 bit port size */ \
                                BR_MS_GPCM | /* MSEL = GPCM */ \
@@ -365,11 +359,6 @@
 /*
  * Configuration for C2 on the local bus
  */
-/* Window base at flash base */
-#define CONFIG_SYS_LBLAWBAR2_PRELIM    CONFIG_SYS_APP1_BASE
-/* Window size: 256 MB */
-#define CONFIG_SYS_LBLAWAR2_PRELIM     (LBLAWAR_EN | LBLAWAR_256MB)
-
 #define CONFIG_SYS_BR2_PRELIM  (CONFIG_SYS_APP1_BASE | \
                                 BR_PS_8 | \
                                 BR_MS_GPCM | \

diff --git a/include/configs/kmtegr1.h b/include/configs/kmtegr1.h
index 53017faa1cf75684bfee21601c7dd3b9b07ed6ae..222eb72f8eb593a7ac0960519d41590c08917ab7 100644 (file)
--- a/include/configs/kmtegr1.h
+++ b/include/configs/kmtegr1.h
@@ -120,9 +120,6 @@
  */
 #define CONFIG_SYS_FLASH_SIZE          256 /* max FLASH size is 256M */
 
-#define CONFIG_SYS_LBLAWBAR0_PRELIM    CONFIG_SYS_FLASH_BASE
-#define CONFIG_SYS_LBLAWAR0_PRELIM     (LBLAWAR_EN | LBLAWAR_256MB)
-
 #define CONFIG_SYS_BR0_PRELIM  (CONFIG_SYS_FLASH_BASE | \
                                BR_PS_16 | /* 16 bit port size */ \
                                BR_MS_GPCM | /* MSEL = GPCM */ \
@@ -141,9 +138,6 @@
  * PRIO1/PIGGY on the local bus CS1
  */
 /* Window base at flash base */
-#define CONFIG_SYS_LBLAWBAR1_PRELIM    CONFIG_SYS_KMBEC_FPGA_BASE
-#define CONFIG_SYS_LBLAWAR1_PRELIM     (LBLAWAR_EN | LBLAWAR_128MB)
-
 #define CONFIG_SYS_BR1_PRELIM  (CONFIG_SYS_KMBEC_FPGA_BASE | \
                                BR_PS_8 | /* 8 bit port size */ \
                                BR_MS_GPCM | /* MSEL = GPCM */ \
@@ -427,9 +421,6 @@
                                 OR_GPCM_TRLX_CLEAR | \
                                 OR_GPCM_EHTR_CLEAR)
 
-#define CONFIG_SYS_LBLAWBAR3_PRELIM    CONFIG_SYS_APP2_BASE
-#define CONFIG_SYS_LBLAWAR3_PRELIM     (LBLAWAR_EN | LBLAWAR_256MB)
-
 /* ethernet port connected to piggy (UEC2) */
 #define CONFIG_HAS_ETH1
 #define CONFIG_UEC_ETH2

diff --git a/include/configs/kmtepr2.h b/include/configs/kmtepr2.h
index 8f2be980a04983bb4b5721ba71c58fcf5e776fdd..e542158022ad735d57720e57accb95918d8c1cce 100644 (file)
--- a/include/configs/kmtepr2.h
+++ b/include/configs/kmtepr2.h
@@ -113,9 +113,6 @@
  */
 #define CONFIG_SYS_FLASH_SIZE          256 /* max FLASH size is 256M */
 
-#define CONFIG_SYS_LBLAWBAR0_PRELIM    CONFIG_SYS_FLASH_BASE
-#define CONFIG_SYS_LBLAWAR0_PRELIM     (LBLAWAR_EN | LBLAWAR_256MB)
-
 #define CONFIG_SYS_BR0_PRELIM  (CONFIG_SYS_FLASH_BASE | \
                                BR_PS_16 | /* 16 bit port size */ \
                                BR_MS_GPCM | /* MSEL = GPCM */ \
@@ -134,9 +131,6 @@
  * PRIO1/PIGGY on the local bus CS1
  */
 /* Window base at flash base */
-#define CONFIG_SYS_LBLAWBAR1_PRELIM    CONFIG_SYS_KMBEC_FPGA_BASE
-#define CONFIG_SYS_LBLAWAR1_PRELIM     (LBLAWAR_EN | LBLAWAR_128MB)
-
 #define CONFIG_SYS_BR1_PRELIM  (CONFIG_SYS_KMBEC_FPGA_BASE | \
                                BR_PS_8 | /* 8 bit port size */ \
                                BR_MS_GPCM | /* MSEL = GPCM */ \
@@ -367,11 +361,6 @@
 /*
  * Configuration for C2 on the local bus
  */
-/* Window base at flash base */
-#define CONFIG_SYS_LBLAWBAR2_PRELIM    CONFIG_SYS_APP1_BASE
-/* Window size: 256 MB */
-#define CONFIG_SYS_LBLAWAR2_PRELIM     (LBLAWAR_EN | LBLAWAR_256MB)
-
 #define CONFIG_SYS_BR2_PRELIM  (CONFIG_SYS_APP1_BASE | \
                                 BR_PS_8 | \
                                 BR_MS_GPCM | \
@@ -388,8 +377,6 @@
 /*
  * Configuration for C3 on the local bus
  */
-#define CONFIG_SYS_LBLAWBAR3_PRELIM    CONFIG_SYS_APP2_BASE
-#define CONFIG_SYS_LBLAWAR3_PRELIM     (LBLAWAR_EN | LBLAWAR_256MB)
 #define CONFIG_SYS_BR3_PRELIM  (CONFIG_SYS_APP2_BASE | \
                                 BR_PS_16 |             \
                                 BR_MS_GPCM |           \

diff --git a/include/configs/kmvect1.h b/include/configs/kmvect1.h
index 172a28e85043542321b9ae91dd1f184225948be7..3e2cc60f3ede525c3f2b88154306446e9bf03502 100644 (file)
--- a/include/configs/kmvect1.h
+++ b/include/configs/kmvect1.h
@@ -112,9 +112,6 @@
  */
 #define CONFIG_SYS_FLASH_SIZE          256 /* max FLASH size is 256M */
 
-#define CONFIG_SYS_LBLAWBAR0_PRELIM    CONFIG_SYS_FLASH_BASE
-#define CONFIG_SYS_LBLAWAR0_PRELIM     (LBLAWAR_EN | LBLAWAR_256MB)
-
 #define CONFIG_SYS_BR0_PRELIM  (CONFIG_SYS_FLASH_BASE | \
                                BR_PS_16 | /* 16 bit port size */ \
                                BR_MS_GPCM | /* MSEL = GPCM */ \
@@ -133,9 +130,6 @@
  * PRIO1/PIGGY on the local bus CS1
  */
 /* Window base at flash base */
-#define CONFIG_SYS_LBLAWBAR1_PRELIM    CONFIG_SYS_KMBEC_FPGA_BASE
-#define CONFIG_SYS_LBLAWAR1_PRELIM     (LBLAWAR_EN | LBLAWAR_128MB)
-
 #define CONFIG_SYS_BR1_PRELIM  (CONFIG_SYS_KMBEC_FPGA_BASE | \
                                BR_PS_8 | /* 8 bit port size */ \
                                BR_MS_GPCM | /* MSEL = GPCM */ \
@@ -409,9 +403,6 @@
 /*
  * APP1 on the local bus CS2
  */
-#define CONFIG_SYS_LBLAWBAR2_PRELIM    CONFIG_SYS_APP1_BASE
-#define CONFIG_SYS_LBLAWAR2_PRELIM     (LBLAWAR_EN | LBLAWAR_256MB)
-
 #define CONFIG_SYS_BR2_PRELIM  (CONFIG_SYS_APP1_BASE | \
                                 BR_PS_16 | \
                                 BR_MS_UPMA | \
@@ -431,10 +422,6 @@
 #define CONFIG_SYS_MAMR        (MxMR_GPL_x4DIS | \
                         0x0000c000 | \
                         MxMR_WLFx_2X)
-
-#define CONFIG_SYS_LBLAWBAR3_PRELIM    CONFIG_SYS_APP2_BASE
-#define CONFIG_SYS_LBLAWAR3_PRELIM     (LBLAWAR_EN | LBLAWAR_256MB)
-
 /*
  * QE UEC ethernet configuration
  */

diff --git a/include/configs/mpc8308_p1m.h b/include/configs/mpc8308_p1m.h
index 1bca11bd6e7979c9273eb9a28ab48cb2371dcb52..aa9710f9c21647ebc902d0fd68ad974f7fe09a83 100644 (file)
--- a/include/configs/mpc8308_p1m.h
+++ b/include/configs/mpc8308_p1m.h
@@ -180,9 +180,6 @@
 #define CONFIG_SYS_FLASH_SIZE          64 /* FLASH size is 64M */
 
 /* Window base at flash base */
-#define CONFIG_SYS_LBLAWBAR0_PRELIM    CONFIG_SYS_FLASH_BASE
-#define CONFIG_SYS_LBLAWAR0_PRELIM     (LBLAWAR_EN | LBLAWAR_64MB)
-
 #define CONFIG_SYS_BR0_PRELIM  (CONFIG_SYS_FLASH_BASE \
                                | BR_PS_16      /* 16 bit port */ \
                                | BR_MS_GPCM    /* MSEL = GPCM */ \
@@ -217,9 +214,6 @@
                                | OR_GPCM_EHTR_SET)
                                /* 0xFFFF8052 */
 
-#define CONFIG_SYS_LBLAWBAR1_PRELIM    CONFIG_SYS_SJA1000_BASE
-#define CONFIG_SYS_LBLAWAR1_PRELIM     (LBLAWAR_EN | LBLAWAR_32KB)
-
 /*
  * CPLD on Local Bus
  */
@@ -233,9 +227,6 @@
                                | OR_GPCM_EHTR_SET)
                                /* 0xFFFF8042 */
 
-#define CONFIG_SYS_LBLAWBAR2_PRELIM    CONFIG_SYS_CPLD_BASE
-#define CONFIG_SYS_LBLAWAR2_PRELIM     (LBLAWAR_EN | LBLAWAR_32KB)
-
 /*
  * Serial Port
  */

diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h
index 8179147bc2297584b7b313aa0269b020716bde68..edf76e58519429a9800e33b67460ffb369a22c3b 100644 (file)
--- a/include/configs/sbc8349.h
+++ b/include/configs/sbc8349.h
@@ -114,10 +114,6 @@
                                        | OR_GPCM_EAD)
                                        /* 0xFF806FF7 */
 
-                                       /* window base at flash base */
-#define CONFIG_SYS_LBLAWBAR0_PRELIM    CONFIG_SYS_FLASH_BASE
-#define CONFIG_SYS_LBLAWAR0_PRELIM     (LBLAWAR_EN | LBLAWAR_8MB)
-
 #define CONFIG_SYS_MAX_FLASH_BANKS     1       /* number of banks */
 #define CONFIG_SYS_MAX_FLASH_SECT      64      /* sectors per device */
 
@@ -180,9 +176,6 @@
                                        | BR_MS_SDRAM \
                                        | BR_V)
                                        /* 0xF0001861 */
-#define CONFIG_SYS_LBLAWBAR2_PRELIM    CONFIG_SYS_LBC_SDRAM_BASE
-#define CONFIG_SYS_LBLAWAR2_PRELIM     (LBLAWAR_EN | LBLAWAR_64MB)
-
 /*
  * The SDRAM size in MB, CONFIG_SYS_LBC_SDRAM_SIZE, is 64.
  *

diff --git a/include/configs/strider.h b/include/configs/strider.h
index a716096bed81e9e0d8b2e4ed1838535b1a17e0a4..3b0207488f4aa629518193684329b41bb3fec759 100644 (file)
--- a/include/configs/strider.h
+++ b/include/configs/strider.h
@@ -168,9 +168,6 @@
 #define CONFIG_SYS_FLASH_SIZE          8 /* FLASH size is up to 8M */
 
 /* Window base at flash base */
-#define CONFIG_SYS_LBLAWBAR0_PRELIM    CONFIG_SYS_FLASH_BASE
-#define CONFIG_SYS_LBLAWAR0_PRELIM     (LBLAWAR_EN | LBLAWAR_8MB)
-
 #define CONFIG_SYS_BR0_PRELIM  (CONFIG_SYS_FLASH_BASE \
                                | BR_PS_16      /* 16 bit port */ \
                                | BR_MS_GPCM    /* MSEL = GPCM */ \
@@ -197,9 +194,6 @@
 #define CONFIG_SYS_FPGA0_SIZE          1 /* FPGA size is 1M */
 
 /* Window base at FPGA base */
-#define CONFIG_SYS_LBLAWBAR1_PRELIM    CONFIG_SYS_FPGA0_BASE
-#define CONFIG_SYS_LBLAWAR1_PRELIM     (LBLAWAR_EN | LBLAWAR_1MB)
-
 #define CONFIG_SYS_BR1_PRELIM  (CONFIG_SYS_FPGA0_BASE \
                                | BR_PS_16      /* 16 bit port */ \
                                | BR_MS_GPCM    /* MSEL = GPCM */ \

diff --git a/include/configs/suvd3.h b/include/configs/suvd3.h
index 6a4006ef6ad45470589fa58c144c97c43021cdf3..987b2d77cc1e3d043cd6266ed0fe31ce81221274 100644 (file)
--- a/include/configs/suvd3.h
+++ b/include/configs/suvd3.h
@@ -110,9 +110,6 @@
  */
 #define CONFIG_SYS_FLASH_SIZE          256 /* max FLASH size is 256M */
 
-#define CONFIG_SYS_LBLAWBAR0_PRELIM    CONFIG_SYS_FLASH_BASE
-#define CONFIG_SYS_LBLAWAR0_PRELIM     (LBLAWAR_EN | LBLAWAR_256MB)
-
 #define CONFIG_SYS_BR0_PRELIM  (CONFIG_SYS_FLASH_BASE | \
                                BR_PS_16 | /* 16 bit port size */ \
                                BR_MS_GPCM | /* MSEL = GPCM */ \
@@ -131,9 +128,6 @@
  * PRIO1/PIGGY on the local bus CS1
  */
 /* Window base at flash base */
-#define CONFIG_SYS_LBLAWBAR1_PRELIM    CONFIG_SYS_KMBEC_FPGA_BASE
-#define CONFIG_SYS_LBLAWAR1_PRELIM     (LBLAWAR_EN | LBLAWAR_128MB)
-
 #define CONFIG_SYS_BR1_PRELIM  (CONFIG_SYS_KMBEC_FPGA_BASE | \
                                BR_PS_8 | /* 8 bit port size */ \
                                BR_MS_GPCM | /* MSEL = GPCM */ \
@@ -362,9 +356,6 @@
 /*
  * APP1 on the local bus CS2
  */
-#define CONFIG_SYS_LBLAWBAR2_PRELIM    CONFIG_SYS_APP1_BASE
-#define CONFIG_SYS_LBLAWAR2_PRELIM     (LBLAWAR_EN | LBLAWAR_256MB)
-
 #define CONFIG_SYS_BR2_PRELIM  (CONFIG_SYS_APP1_BASE | \
                                 BR_PS_16 | \
                                 BR_MS_UPMA | \
@@ -384,8 +375,4 @@
 #define CONFIG_SYS_MAMR        (MxMR_GPL_x4DIS | \
                         0x0000c000 | \
                         MxMR_WLFx_2X)
-
-#define CONFIG_SYS_LBLAWBAR3_PRELIM    CONFIG_SYS_APP2_BASE
-#define CONFIG_SYS_LBLAWAR3_PRELIM     (LBLAWAR_EN | LBLAWAR_256MB)
-
 #endif /* __CONFIG_H */

diff --git a/include/configs/tuge1.h b/include/configs/tuge1.h
index 5bb74fd9aebc774590245def211b80f1d49d1f39..5fceac7ae16db50b50a10c2627b3540429ed1101 100644 (file)
--- a/include/configs/tuge1.h
+++ b/include/configs/tuge1.h
@@ -113,9 +113,6 @@
  */
 #define CONFIG_SYS_FLASH_SIZE          256 /* max FLASH size is 256M */
 
-#define CONFIG_SYS_LBLAWBAR0_PRELIM    CONFIG_SYS_FLASH_BASE
-#define CONFIG_SYS_LBLAWAR0_PRELIM     (LBLAWAR_EN | LBLAWAR_256MB)
-
 #define CONFIG_SYS_BR0_PRELIM  (CONFIG_SYS_FLASH_BASE | \
                                BR_PS_16 | /* 16 bit port size */ \
                                BR_MS_GPCM | /* MSEL = GPCM */ \
@@ -134,9 +131,6 @@
  * PRIO1/PIGGY on the local bus CS1
  */
 /* Window base at flash base */
-#define CONFIG_SYS_LBLAWBAR1_PRELIM    CONFIG_SYS_KMBEC_FPGA_BASE
-#define CONFIG_SYS_LBLAWAR1_PRELIM     (LBLAWAR_EN | LBLAWAR_128MB)
-
 #define CONFIG_SYS_BR1_PRELIM  (CONFIG_SYS_KMBEC_FPGA_BASE | \
                                BR_PS_8 | /* 8 bit port size */ \
                                BR_MS_GPCM | /* MSEL = GPCM */ \
@@ -365,11 +359,6 @@
 /*
  * Configuration for C2 on the local bus
  */
-/* Window base at flash base */
-#define CONFIG_SYS_LBLAWBAR2_PRELIM    CONFIG_SYS_APP1_BASE
-/* Window size: 256 MB */
-#define CONFIG_SYS_LBLAWAR2_PRELIM     (LBLAWAR_EN | LBLAWAR_256MB)
-
 #define CONFIG_SYS_BR2_PRELIM  (CONFIG_SYS_APP1_BASE | \
                                 BR_PS_8 | \
                                 BR_MS_GPCM | \

diff --git a/include/configs/tuxx1.h b/include/configs/tuxx1.h
index 49f77efa74ce27b040f28f7581a4f6a344567085..1b97d0fecbd7aaba703da69b4ff9bb0ecbb59643 100644 (file)
--- a/include/configs/tuxx1.h
+++ b/include/configs/tuxx1.h
@@ -113,9 +113,6 @@
  */
 #define CONFIG_SYS_FLASH_SIZE          256 /* max FLASH size is 256M */
 
-#define CONFIG_SYS_LBLAWBAR0_PRELIM    CONFIG_SYS_FLASH_BASE
-#define CONFIG_SYS_LBLAWAR0_PRELIM     (LBLAWAR_EN | LBLAWAR_256MB)
-
 #define CONFIG_SYS_BR0_PRELIM  (CONFIG_SYS_FLASH_BASE | \
                                BR_PS_16 | /* 16 bit port size */ \
                                BR_MS_GPCM | /* MSEL = GPCM */ \
@@ -134,9 +131,6 @@
  * PRIO1/PIGGY on the local bus CS1
  */
 /* Window base at flash base */
-#define CONFIG_SYS_LBLAWBAR1_PRELIM    CONFIG_SYS_KMBEC_FPGA_BASE
-#define CONFIG_SYS_LBLAWAR1_PRELIM     (LBLAWAR_EN | LBLAWAR_128MB)
-
 #define CONFIG_SYS_BR1_PRELIM  (CONFIG_SYS_KMBEC_FPGA_BASE | \
                                BR_PS_8 | /* 8 bit port size */ \
                                BR_MS_GPCM | /* MSEL = GPCM */ \
@@ -367,11 +361,6 @@
 /*
  * Configuration for C2 on the local bus
  */
-/* Window base at flash base */
-#define CONFIG_SYS_LBLAWBAR2_PRELIM    CONFIG_SYS_APP1_BASE
-/* Window size: 256 MB */
-#define CONFIG_SYS_LBLAWAR2_PRELIM     (LBLAWAR_EN | LBLAWAR_256MB)
-
 #define CONFIG_SYS_BR2_PRELIM  (CONFIG_SYS_APP1_BASE | \
                                 BR_PS_8 | \
                                 BR_MS_GPCM | \
@@ -388,11 +377,6 @@
 /*
  * Configuration for C3 on the local bus
  */
-/* Access window base at PINC3 base */
-#define CONFIG_SYS_LBLAWBAR3_PRELIM    CONFIG_SYS_APP2_BASE
-/* Window size: 256 MB */
-#define CONFIG_SYS_LBLAWAR3_PRELIM     (LBLAWAR_EN | LBLAWAR_256MB)
-
 #define CONFIG_SYS_BR3_PRELIM  (CONFIG_SYS_APP2_BASE | \
                                 BR_PS_8 |              \
                                 BR_MS_GPCM |           \

diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h
index 84d2c897d7677aa343df3e090948f100aeca6d72..7dcc150f1955960fbd1a94c4599a30337aa9db60 100644 (file)
--- a/include/configs/ve8313.h
+++ b/include/configs/ve8313.h
@@ -111,9 +111,6 @@
 #define CONFIG_SYS_FLASH_SIZE          32      /* size in MB */
 #define CONFIG_SYS_FLASH_EMPTY_INFO            /* display empty sectors */
 
-#define CONFIG_SYS_LBLAWBAR0_PRELIM    CONFIG_SYS_FLASH_BASE
-#define CONFIG_SYS_LBLAWAR0_PRELIM     (LBLAWAR_EN | LBLAWAR_32MB)
-
 #define CONFIG_SYS_MAX_FLASH_BANKS     1               /* number of banks */
 #define CONFIG_SYS_MAX_FLASH_SECT      256             /* sectors per dev */
 
@@ -186,12 +183,6 @@
 #define CONFIG_SYS_NAND_BR_PRELIM CONFIG_SYS_BR1_PRELIM
 #define CONFIG_SYS_NAND_OR_PRELIM CONFIG_SYS_OR1_PRELIM
 
-#define CONFIG_SYS_LBLAWBAR1_PRELIM    CONFIG_SYS_NAND_BASE
-#define CONFIG_SYS_LBLAWAR1_PRELIM     (LBLAWAR_EN | LBLAWAR_32KB)
-
-#define CONFIG_SYS_NAND_LBLAWBAR_PRELIM CONFIG_SYS_LBLAWBAR1_PRELIM
-#define CONFIG_SYS_NAND_LBLAWAR_PRELIM CONFIG_SYS_LBLAWAR1_PRELIM
-
 /* CS2 NvRAM */
 #define CONFIG_SYS_BR2_PRELIM  (0x60000000 \
                                | BR_PS_8 \

diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h
index 249783720c4036c8e2bf3b45bf828a3c11a1505d..ed02661f82a08030e7d646f8136a5272bec58b7f 100644 (file)
--- a/include/configs/vme8349.h
+++ b/include/configs/vme8349.h
@@ -84,8 +84,6 @@
                                        | OR_GPCM_EHTR_SET \
                                        | OR_GPCM_EAD)
                                        /* 0xf8006ff7 */
-#define CONFIG_SYS_LBLAWBAR0_PRELIM    CONFIG_SYS_FLASH_BASE
-#define CONFIG_SYS_LBLAWAR0_PRELIM     (LBLAWAR_EN | LBLAWAR_128MB)
 
 #define CONFIG_SYS_WINDOW1_BASE                0xf0000000
 #define CONFIG_SYS_BR1_PRELIM          (CONFIG_SYS_WINDOW1_BASE \
@@ -96,8 +94,6 @@
 #define CONFIG_SYS_OR1_PRELIM          (OR_AM_256KB \
                                        | OR_GPCM_SETA)
                                        /* 0xfffc0208 */
-#define CONFIG_SYS_LBLAWBAR1_PRELIM    CONFIG_SYS_WINDOW1_BASE
-#define CONFIG_SYS_LBLAWAR1_PRELIM     (LBLAWAR_EN | LBLAWAR_256KB)
 
 #define CONFIG_SYS_MAX_FLASH_BANKS     1       /* number of banks */
 #define CONFIG_SYS_MAX_FLASH_SECT      1024    /* sectors per device*/

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 4f0e9f75d58f5146905b76d2cecf1fb28e039fde..8473c369fe01261bbd3209303642fa212440642e 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -3208,22 +3208,6 @@ CONFIG_SYS_LBC_NONCACHE_BASE
 CONFIG_SYS_LBC_SDRAM_BASE
 CONFIG_SYS_LBC_SDRAM_BASE_PHYS
 CONFIG_SYS_LBC_SDRAM_SIZE
-CONFIG_SYS_LBLAWAR0_PRELIM
-CONFIG_SYS_LBLAWAR1_PRELIM
-CONFIG_SYS_LBLAWAR2_PRELIM
-CONFIG_SYS_LBLAWAR3_PRELIM
-CONFIG_SYS_LBLAWAR4_PRELIM
-CONFIG_SYS_LBLAWAR5_PRELIM
-CONFIG_SYS_LBLAWAR6_PRELIM
-CONFIG_SYS_LBLAWAR7_PRELIM
-CONFIG_SYS_LBLAWBAR0_PRELIM
-CONFIG_SYS_LBLAWBAR1_PRELIM
-CONFIG_SYS_LBLAWBAR2_PRELIM
-CONFIG_SYS_LBLAWBAR3_PRELIM
-CONFIG_SYS_LBLAWBAR4_PRELIM
-CONFIG_SYS_LBLAWBAR5_PRELIM
-CONFIG_SYS_LBLAWBAR6_PRELIM
-CONFIG_SYS_LBLAWBAR7_PRELIM
 CONFIG_SYS_LB_SDRAM
 CONFIG_SYS_LCD_BASE
 CONFIG_SYS_LCRR_CLKDIV